From ea9a2facc02b05b07ae70ce4d7bec727a8d885cc Mon Sep 17 00:00:00 2001
From: Serenity <34622204+oSerenity@users.noreply.github.com>
Date: Tue, 3 Jun 2025 03:59:32 -0400
Subject: [PATCH] Refactor logging and update function naming conventions

This commit standardizes the logging mechanism by replacing calls to `Logger::NotImplemented()` with the new `LOG_NOTIMPLEMENTED()` macro across multiple files in the Microsoft Xbox Services and Kinect libraries.

Function names in the debug logging macros have been updated to reflect the new naming conventions, changing `ExtractProjectName` to `RetrieveProjectName` and `ExtractFunctionName` to `RetrieveFunctionName`.

Additionally, the `Logger` class has been enhanced to include structured logging capabilities with various log levels and context information for better traceability.

New properties and methods have been introduced in several classes, while many implementations still remain to be completed. Overall, these changes improve maintainability and consistency in the logging framework across the Xbox development environment.
---
 dlls/common/DebugLogger.h                     |   8 +-
 ....AccessibilitySettingsChangedEventArgs.cpp |   2 +-
 ....Xbox.GameChat.ChannelUpdatedEventArgs.cpp |   4 +-
 .../Microsoft.Xbox.GameChat.ChatManager.cpp   |  66 ++++----
 ...soft.Xbox.GameChat.ChatManagerSettings.cpp |  48 +++---
 ...soft.Xbox.GameChat.ChatPacketEventArgs.cpp |  14 +-
 ....Xbox.GameChat.ChatPerformanceCounters.cpp |  16 +-
 ...soft.Xbox.GameChat.ChatPerformanceTime.cpp |   6 +-
 .../Microsoft.Xbox.GameChat.ChatUser.cpp      |  40 ++---
 ...ft.Xbox.GameChat.DebugMessageEventArgs.cpp |   4 +-
 ....GameChat.TextMessageReceivedEventArgs.cpp |   6 +-
 ...Xbox.Services.Achievements.Achievement.cpp |  38 ++---
 ...ces.Achievements.AchievementMediaAsset.cpp |   6 +-
 ...es.Achievements.AchievementProgression.cpp |   4 +-
 ...es.Achievements.AchievementRequirement.cpp |   6 +-
 ...ervices.Achievements.AchievementReward.cpp |  12 +-
 ...rvices.Achievements.AchievementService.cpp |  12 +-
 ...ces.Achievements.AchievementTimeWindow.cpp |   4 +-
 ...hievements.AchievementTitleAssociation.cpp |   4 +-
 ...rvices.Achievements.AchievementsResult.cpp |   6 +-
 .../Microsoft.Xbox.Services.Clubs.Club.cpp    |  84 +++++-----
 ....Xbox.Services.Clubs.ClubActionSetting.cpp |   8 +-
 ...Xbox.Services.Clubs.ClubActionSettings.cpp |  28 ++--
 ...Xbox.Services.Clubs.ClubBooleanSetting.cpp |   4 +-
 ...Xbox.Services.Clubs.ClubPresenceCounts.cpp |   8 +-
 ...rosoft.Xbox.Services.Clubs.ClubProfile.cpp |  34 ++--
 ...Xbox.Services.Clubs.ClubRecommendation.cpp |   4 +-
 ...oft.Xbox.Services.Clubs.ClubRoleRecord.cpp |   8 +-
 ...crosoft.Xbox.Services.Clubs.ClubRoster.cpp |   8 +-
 ....Services.Clubs.ClubSearchAutoComplete.cpp |  16 +-
 ...x.Services.Clubs.ClubSearchFacetResult.cpp |   4 +-
 ....Services.Clubs.ClubStringMultiSetting.cpp |   6 +-
 ....Xbox.Services.Clubs.ClubStringSetting.cpp |   6 +-
 ....Services.Clubs.ClubUserPresenceRecord.cpp |   6 +-
 ...t.Xbox.Services.Clubs.ClubsOwnedResult.cpp |   4 +-
 ....Xbox.Services.Clubs.ClubsSearchResult.cpp |   4 +-
 ...osoft.Xbox.Services.Clubs.ClubsService.cpp |  20 +--
 ...extualSearch.ContextualSearchBroadcast.cpp |  12 +-
 ...lSearch.ContextualSearchConfiguredStat.cpp |  20 +--
 ...textualSearch.ContextualSearchGameClip.cpp |  20 +--
 ...ualSearch.ContextualSearchGameClipStat.cpp |  10 +-
 ...arch.ContextualSearchGameClipThumbnail.cpp |   6 +-
 ...Search.ContextualSearchGameClipUriInfo.cpp |   8 +-
 ...Search.ContextualSearchGameClipsResult.cpp |   4 +-
 ...ntextualSearch.ContextualSearchService.cpp |  12 +-
 ...rtainmentProfileListContainsItemResult.cpp |   6 +-
 ...rofile.EntertainmentProfileListService.cpp |   2 +-
 ...le.EntertainmentProfileListXboxOnePins.cpp |   6 +-
 ...es.GameServerPlatform.AllocationResult.cpp |  12 +-
 ...vices.GameServerPlatform.ClusterResult.cpp |  12 +-
 ....GameServerPlatform.GameServerImageSet.cpp |  18 +--
 ...erverPlatform.GameServerMetadataResult.cpp |   4 +-
 ...rverPlatform.GameServerPlatformService.cpp |  16 +-
 ...meServerPlatform.GameServerPortMapping.cpp |   6 +-
 ...eServerPlatform.GameServerTicketStatus.cpp |  20 +--
 ...ervices.GameServerPlatform.GameVariant.cpp |  14 +-
 ...eServerPlatform.QualityOfServiceServer.cpp |   6 +-
 ...t.Xbox.Services.HttpCallRequestMessage.cpp |  12 +-
 ...Services.Leaderboard.LeaderboardColumn.cpp |   6 +-
 ....Services.Leaderboard.LeaderboardQuery.cpp |  26 +--
 ...Services.Leaderboard.LeaderboardResult.cpp |  14 +-
 ...ox.Services.Leaderboard.LeaderboardRow.cpp |  10 +-
 ...ervices.Leaderboard.LeaderboardService.cpp |  32 ++--
 ...rvices.Marketplace.BrowseCatalogResult.cpp |   8 +-
 ....Xbox.Services.Marketplace.CatalogItem.cpp |  24 +--
 ...es.Marketplace.CatalogItemAvailability.cpp |  32 ++--
 ...ervices.Marketplace.CatalogItemDetails.cpp |  26 +--
 ....Services.Marketplace.CatalogItemImage.cpp |  12 +-
 ...ox.Services.Marketplace.CatalogService.cpp |   6 +-
 ...Marketplace.ConsumeInventoryItemResult.cpp |   6 +-
 ...box.Services.Marketplace.InventoryItem.cpp |  26 +--
 ...vices.Marketplace.InventoryItemsResult.cpp |   8 +-
 ....Services.Marketplace.InventoryService.cpp |  24 +--
 ....Matchmaking.CreateMatchTicketResponse.cpp |   4 +-
 ...s.Matchmaking.HopperStatisticsResponse.cpp |   6 +-
 ...Matchmaking.MatchTicketDetailsResponse.cpp |  12 +-
 ...ervices.Matchmaking.MatchmakingService.cpp |   8 +-
 ...er.Manager.FindMatchCompletedEventArgs.cpp |   4 +-
 ...ltiplayer.Manager.HostChangedEventArgs.cpp |   2 +-
 ...er.Manager.JoinLobbyCompletedEventArgs.cpp |   2 +-
 ...tiplayer.Manager.MemberJoinedEventArgs.cpp |   2 +-
 ...ultiplayer.Manager.MemberLeftEventArgs.cpp |   2 +-
 ...Manager.MemberPropertyChangedEventArgs.cpp |   4 +-
 ...s.Multiplayer.Manager.MultiplayerEvent.cpp |  12 +-
 ...iplayer.Manager.MultiplayerGameSession.cpp |  24 +--
 ...player.Manager.MultiplayerLobbySession.cpp |  38 ++---
 ...Multiplayer.Manager.MultiplayerManager.cpp |  46 +++---
 ....Multiplayer.Manager.MultiplayerMember.cpp |  24 +--
 ...anager.PerformQosMeasurementsEventArgs.cpp |   2 +-
 ...anager.SessionPropertyChangedEventArgs.cpp |   2 +-
 ...er.TournamentGameSessionReadyEventArgs.cpp |   2 +-
 ...amentRegistrationStateChangedEventArgs.cpp |   4 +-
 ...Multiplayer.Manager.UserAddedEventArgs.cpp |   2 +-
 ...ltiplayer.Manager.UserRemovedEventArgs.cpp |   2 +-
 ...Multiplayer.MultiplayerActivityDetails.cpp |  20 +--
 ...tiplayer.MultiplayerGetSessionsRequest.cpp |  42 ++---
 ...layer.MultiplayerManagedInitialization.cpp |  12 +-
 ...player.MultiplayerMemberInitialization.cpp |  12 +-
 ...ayer.MultiplayerPeerToHostRequirements.cpp |   8 +-
 ...ayer.MultiplayerPeerToPeerRequirements.cpp |   4 +-
 ...ultiplayerQualityOfServiceMeasurements.cpp |  12 +-
 ...er.MultiplayerQuerySearchHandleRequest.cpp |  22 +--
 ...rvices.Multiplayer.MultiplayerRoleInfo.cpp |  12 +-
 ...rvices.Multiplayer.MultiplayerRoleType.cpp |   8 +-
 ...iplayer.MultiplayerSearchHandleDetails.cpp |  28 ++--
 ...iplayer.MultiplayerSearchHandleRequest.cpp |  16 +-
 ...ervices.Multiplayer.MultiplayerService.cpp |  52 +++---
 ...ervices.Multiplayer.MultiplayerSession.cpp | 150 +++++++++---------
 ...er.MultiplayerSessionArbitrationServer.cpp |  10 +-
 ...iplayer.MultiplayerSessionCapabilities.cpp |  44 ++---
 ...ayer.MultiplayerSessionChangeEventArgs.cpp |   6 +-
 ...ultiplayer.MultiplayerSessionConstants.cpp |  62 ++++----
 ...er.MultiplayerSessionMatchmakingServer.cpp |   8 +-
 ...s.Multiplayer.MultiplayerSessionMember.cpp |  58 +++----
 ...ltiplayer.MultiplayerSessionProperties.cpp |  34 ++--
 ...ultiplayer.MultiplayerSessionReference.cpp |  12 +-
 ...ultiplayer.MultiplayerSessionRoleTypes.cpp |   2 +-
 ...s.Multiplayer.MultiplayerSessionStates.cpp |  18 +--
 ...er.MultiplayerSessionTournamentsServer.cpp |  18 +--
 ...ervices.Multiplayer.WriteSessionResult.cpp |   6 +-
 ...Presence.DevicePresenceChangeEventArgs.cpp |   6 +-
 ...sence.DevicePresenceChangeSubscription.cpp |   8 +-
 ...vices.Presence.PresenceBroadcastRecord.cpp |  10 +-
 ...ft.Xbox.Services.Presence.PresenceData.cpp |   8 +-
 ...Services.Presence.PresenceDeviceRecord.cpp |   4 +-
 ....Services.Presence.PresenceMediaRecord.cpp |   6 +-
 ....Xbox.Services.Presence.PresenceRecord.cpp |   8 +-
 ...Xbox.Services.Presence.PresenceService.cpp |  28 ++--
 ....Services.Presence.PresenceTitleRecord.cpp |  14 +-
 ....Presence.TitlePresenceChangeEventArgs.cpp |   6 +-
 ...esence.TitlePresenceChangeSubscription.cpp |  10 +-
 ...Privacy.MultiplePermissionsCheckResult.cpp |   4 +-
 ...Services.Privacy.PermissionCheckResult.cpp |   6 +-
 ....Services.Privacy.PermissionDenyReason.cpp |   4 +-
 ...Services.Privacy.PermissionIdConstants.cpp |  28 ++--
 ...t.Xbox.Services.Privacy.PrivacyService.cpp |   8 +-
 ...alTimeActivity.RealTimeActivityService.cpp |  14 +-
 ...TimeActivitySubscriptionErrorEventArgs.cpp |  10 +-
 ...Xbox.Services.ServiceCallLoggingConfig.cpp |  16 +-
 ...Services.Social.Manager.PreferredColor.cpp |   6 +-
 ...ox.Services.Social.Manager.SocialEvent.cpp |  12 +-
 ....Services.Social.Manager.SocialManager.cpp |  20 +--
 ...al.Manager.SocialManagerPresenceRecord.cpp |   6 +-
 ...nager.SocialManagerPresenceTitleRecord.cpp |  10 +-
 ...Manager.SocialUserGroupLoadedEventArgs.cpp |   2 +-
 ...x.Services.Social.Manager.TitleHistory.cpp |   4 +-
 ...Services.Social.Manager.XboxSocialUser.cpp |  26 +--
 ...ces.Social.Manager.XboxSocialUserGroup.cpp |  14 +-
 ...ft.Xbox.Services.Social.ProfileService.cpp |   6 +-
 ...Services.Social.ReputationFeedbackItem.cpp |  12 +-
 ...Xbox.Services.Social.ReputationService.cpp |   4 +-
 ...x.Services.Social.SocialGroupConstants.cpp |   4 +-
 ...cial.SocialRelationshipChangeEventArgs.cpp |   6 +-
 ...l.SocialRelationshipChangeSubscription.cpp |   8 +-
 ...oft.Xbox.Services.Social.SocialService.cpp |  14 +-
 ...Services.Social.XboxSocialRelationship.cpp |   8 +-
 ...es.Social.XboxSocialRelationshipResult.cpp |   8 +-
 ...t.Xbox.Services.Social.XboxUserProfile.cpp |  14 +-
 ...ics.Manager.LeaderboardResultEventArgs.cpp |   2 +-
 ...ices.Statistics.Manager.StatisticEvent.cpp |  10 +-
 ...es.Statistics.Manager.StatisticManager.cpp |  28 ++--
 ...ices.Statistics.Manager.StatisticValue.cpp |  10 +-
 ...oft.Xbox.Services.System.StringService.cpp |   4 +-
 ...box.Services.System.VerifyStringResult.cpp |   4 +-
 ...rvices.System.XboxLiveServicesSettings.cpp |  14 +-
 ....TitleStorage.TitleStorageBlobMetadata.cpp |  32 ++--
 ...Storage.TitleStorageBlobMetadataResult.cpp |   6 +-
 ...es.TitleStorage.TitleStorageBlobResult.cpp |   4 +-
 ...ervices.TitleStorage.TitleStorageQuota.cpp |  14 +-
 ...vices.TitleStorage.TitleStorageService.cpp |  16 +-
 ...vices.Tournaments.CurrentMatchMetadata.cpp |   4 +-
 ...box.Services.Tournaments.MatchMetadata.cpp |   8 +-
 ...ices.Tournaments.PreviousMatchMetadata.cpp |   6 +-
 ...rvices.Tournaments.TeamChangeEventArgs.cpp |   6 +-
 ...ces.Tournaments.TeamChangeSubscription.cpp |   8 +-
 ...oft.Xbox.Services.Tournaments.TeamInfo.cpp |  22 +--
 ....Xbox.Services.Tournaments.TeamRequest.cpp |  14 +-
 ...Services.Tournaments.TeamRequestResult.cpp |   6 +-
 ....Xbox.Services.Tournaments.TeamSummary.cpp |   6 +-
 ...t.Xbox.Services.Tournaments.Tournament.cpp |  52 +++---
 ....Tournaments.TournamentChangeEventArgs.cpp |   4 +-
 ...urnaments.TournamentChangeSubscription.cpp |   6 +-
 ...rvices.Tournaments.TournamentReference.cpp |   8 +-
 ...Services.Tournaments.TournamentRequest.cpp |  22 +--
 ...es.Tournaments.TournamentRequestResult.cpp |   6 +-
 ...Services.Tournaments.TournamentService.cpp |  16 +-
 ...vices.Tournaments.TournamentTeamResult.cpp |   8 +-
 ...ces.UserStatistics.RequestedStatistics.cpp |   6 +-
 ...atistics.ServiceConfigurationStatistic.cpp |   4 +-
 ...Xbox.Services.UserStatistics.Statistic.cpp |   6 +-
 ...serStatistics.StatisticChangeEventArgs.cpp |   6 +-
 ...Statistics.StatisticChangeSubscription.cpp |  12 +-
 ...es.UserStatistics.UserStatisticsResult.cpp |   4 +-
 ...s.UserStatistics.UserStatisticsService.cpp |  14 +-
 ...Xbox.Services.XboxLiveAppConfiguration.cpp |  10 +-
 ...icrosoft.Xbox.Services.XboxLiveContext.cpp |  36 ++---
 ....Xbox.Services.XboxLiveContextSettings.cpp |  40 ++---
 ...crosoft.Xbox.Services.XboxLiveHttpCall.cpp |  30 ++--
 ...Xbox.Services.XboxLiveHttpCallResponse.cpp |  22 +--
 ...Xbox.Services.XboxLiveLogCallEventArgs.cpp |   6 +-
 ...oft.Xbox.Services.XboxLiveWnsEventArgs.cpp |   4 +-
 ...ervices.XboxServiceCallRoutedEventArgs.cpp |  32 ++--
 .../Windows.Kinect.AudioBeam.cpp              |  16 +-
 .../Windows.Kinect.AudioBeamFrame.cpp         |  12 +-
 ...Windows.Kinect.AudioBeamFrameReference.cpp |   4 +-
 .../Windows.Kinect.AudioBeamSubFrame.cpp      |  22 +--
 .../Windows.Kinect.AudioBodyCorrelation.cpp   |   2 +-
 ...dows.Kinect.AudioFrameArrivedEventArgs.cpp |   2 +-
 .../Windows.Kinect.AudioFrameReader.cpp       |  14 +-
 .../Windows.Kinect.AudioSource.cpp            |  18 +--
 .../Implementation/Windows.Kinect.Body.cpp    |  34 ++--
 .../Windows.Kinect.BodyFrame.cpp              |  12 +-
 ...ndows.Kinect.BodyFrameArrivedEventArgs.cpp |   2 +-
 .../Windows.Kinect.BodyFrameReader.cpp        |  14 +-
 .../Windows.Kinect.BodyFrameReference.cpp     |   4 +-
 .../Windows.Kinect.BodyFrameSource.cpp        |  16 +-
 .../Windows.Kinect.BodyIndexFrame.cpp         |  14 +-
 ....Kinect.BodyIndexFrameArrivedEventArgs.cpp |   2 +-
 .../Windows.Kinect.BodyIndexFrameReader.cpp   |  14 +-
 ...Windows.Kinect.BodyIndexFrameReference.cpp |   4 +-
 .../Windows.Kinect.BodyIndexFrameSource.cpp   |  12 +-
 .../Windows.Kinect.ColorFrame.cpp             |  22 +--
 ...dows.Kinect.ColorFrameArrivedEventArgs.cpp |   2 +-
 .../Windows.Kinect.ColorFrameReader.cpp       |  14 +-
 .../Windows.Kinect.ColorFrameReference.cpp    |   4 +-
 .../Windows.Kinect.ColorFrameSource.cpp       |  14 +-
 .../Windows.Kinect.CoordinateMapper.cpp       |  26 +--
 .../Windows.Kinect.DepthFrame.cpp             |  18 +--
 ...dows.Kinect.DepthFrameArrivedEventArgs.cpp |   2 +-
 .../Windows.Kinect.DepthFrameReader.cpp       |  14 +-
 .../Windows.Kinect.DepthFrameReference.cpp    |   4 +-
 .../Windows.Kinect.DepthFrameSource.cpp       |  16 +-
 .../Windows.Kinect.FrameCapturedEventArgs.cpp |   6 +-
 .../Windows.Kinect.FrameDescription.cpp       |  14 +-
 .../Windows.Kinect.InfraredFrame.cpp          |  14 +-
 ...s.Kinect.InfraredFrameArrivedEventArgs.cpp |   2 +-
 .../Windows.Kinect.InfraredFrameReader.cpp    |  14 +-
 .../Windows.Kinect.InfraredFrameReference.cpp |   4 +-
 .../Windows.Kinect.InfraredFrameSource.cpp    |  12 +-
 ...indows.Kinect.IsPausedChangedEventArgs.cpp |   2 +-
 .../Windows.Kinect.KinectSensor.cpp           |  24 +--
 .../Windows.Kinect.MultiSourceFrame.cpp       |  12 +-
 ...inect.MultiSourceFrameArrivedEventArgs.cpp |   2 +-
 .../Windows.Kinect.MultiSourceFrameReader.cpp |  16 +-
 ...ndows.Kinect.MultiSourceFrameReference.cpp |   2 +-
 ...indows.Kinect.PropertyChangedEventArgs.cpp |   2 +-
 ...ievements.AchievementUnlockedEventArgs.cpp |  14 +-
 ...ationModel.Core.CoreApplicationContext.cpp |   8 +-
 ...pplicationModel.Core.UserContextLookup.cpp |   6 +-
 ...pplicationModel.State.Internal.AppInfo.cpp |   4 +-
 ...icationModel.State.Internal.AumidQuery.cpp |   2 +-
 ...el.State.Internal.ContentCompatibility.cpp |  18 +--
 ...del.State.Internal.ContentEnhancements.cpp |  26 +--
 ...el.State.Internal.PackageFullNameQuery.cpp |   8 +-
 ...cationModel.State.Internal.PackageInfo.cpp |  28 ++--
 ...Model.State.Internal.PackageInfoEvents.cpp |  10 +-
 ...tionModel.State.Internal.ProtocolQuery.cpp |   2 +-
 ...x.ApplicationModel.Store.Configuration.cpp |   2 +-
 ...ws.Xbox.ApplicationModel.Store.Product.cpp |  18 +--
 ...nModel.Store.ProductPurchasedEventArgs.cpp |   2 +-
 .../Windows.Xbox.Chat.ChatChannel.cpp         |   2 +-
 .../Windows.Xbox.Chat.ChatDecoder.cpp         |   6 +-
 .../Windows.Xbox.Chat.ChatEncoder.cpp         |   8 +-
 .../Windows.Xbox.Chat.ChatMuteList.cpp        |   4 +-
 .../Windows.Xbox.Chat.ChatParticipant.cpp     |  14 +-
 .../Windows.Xbox.Chat.ChatSession.cpp         |  26 +--
 .../Windows.Xbox.Chat.ChatUserCorrelation.cpp |   2 +-
 .../Windows.Xbox.Chat.Format.cpp              |  18 +--
 ...box.Chat.UserMuteStateChangedEventArgs.cpp |   6 +-
 .../Windows.Xbox.Input.BodyController.cpp     |  38 ++---
 .../Windows.Xbox.Input.BodyHandPair.cpp       |   4 +-
 ...indows.Xbox.Input.BrokeredInteractions.cpp |  24 +--
 .../Windows.Xbox.Input.Controller.cpp         |  18 +--
 ...dows.Xbox.Input.ControllerInputManager.cpp |   2 +-
 .../Windows.Xbox.Input.Gamepad.cpp            |  18 +--
 .../Windows.Xbox.Input.InputManager.cpp       |  48 +++---
 ...indows.Xbox.Input.InputManagerInternal.cpp |  10 +-
 ...indows.Xbox.Input.NavigationController.cpp |  24 +--
 .../Windows.Xbox.Input.NavigationReading.cpp  |  28 ++--
 ...ement.Deployment.ContentInstallManager.cpp |  98 ++++++------
 ...ent.Deployment.ContentInstallationInfo.cpp |  16 +-
 ....Management.Deployment.ContentLocation.cpp |  20 +--
 ....Management.Deployment.ContentMetadata.cpp |  44 ++---
 ...ent.Deployment.ContentMetadataPackager.cpp |   2 +-
 ...ment.DownloadableContentPackageManager.cpp |   4 +-
 ...ment.Deployment.PackageTransferManager.cpp |  24 +--
 ...ment.Deployment.PackageTransferWatcher.cpp |  22 +--
 ...ement.Deployment.StreamingInstallQueue.cpp |  12 +-
 ...ndows.Xbox.Media.GameTransportControls.cpp |   4 +-
 ...ox.Media.SmoothStreamingSessionManager.cpp |   4 +-
 ...box.Media.SystemMediaTransportControls.cpp |  74 ++++-----
 .../Windows.Xbox.Multiplayer.GamePlayer.cpp   |   6 +-
 ...Xbox.Multiplayer.GamePlayerDeviceGroup.cpp |   2 +-
 ...ultiplayer.GamePlayersChangedEventArgs.cpp |   6 +-
 ....Multiplayer.GameSessionReadyEventArgs.cpp |   2 +-
 ...ultiplayer.MatchStatusChangedEventArgs.cpp |   4 +-
 ...ultiplayer.MultiplayerSessionReference.cpp |   8 +-
 .../Windows.Xbox.Multiplayer.Party.cpp        |  73 +++++----
 .../Windows.Xbox.Multiplayer.PartyChat.cpp    |  20 +--
 ...ndows.Xbox.Multiplayer.PartyChatMember.cpp |   4 +-
 ...Windows.Xbox.Multiplayer.PartyChatView.cpp |   2 +-
 .../Windows.Xbox.Multiplayer.PartyConfig.cpp  |   8 +-
 .../Windows.Xbox.Multiplayer.PartyMember.cpp  |   6 +-
 ...box.Multiplayer.PartyMemberDeviceGroup.cpp |   2 +-
 ...ultiplayer.PartyRosterChangedEventArgs.cpp |  10 +-
 ...Multiplayer.PartyStateChangedEventArgs.cpp |   2 +-
 .../Windows.Xbox.Multiplayer.PartyView.cpp    |  14 +-
 ....Xbox.Multiplayer.UserPartyAssociation.cpp |   4 +-
 .../Windows.Xbox.Networking.Development.cpp   |   6 +-
 .../Windows.Xbox.Networking.ErrorMessages.cpp |   2 +-
 ...tworking.MeasureQualityOfServiceResult.cpp |   8 +-
 ...ndows.Xbox.Networking.QualityOfService.cpp |   8 +-
 ...Networking.QualityOfServiceMeasurement.cpp |   8 +-
 ...ws.Xbox.Networking.SecureDeviceAddress.cpp |  28 ++--
 ...box.Networking.SecureDeviceAssociation.cpp |  28 ++--
 ...cureDeviceAssociationIncomingEventArgs.cpp |   2 +-
 ...DeviceAssociationStateChangedEventArgs.cpp |   4 +-
 ...orking.SecureDeviceAssociationTemplate.cpp |  30 ++--
 ...tworking.SecureDeviceSocketDescription.cpp |  10 +-
 ...x.SmartGlass.SmartGlassAuxiliaryStream.cpp |  20 +--
 ...ndows.Xbox.SmartGlass.SmartGlassDevice.cpp |  30 ++--
 ....SmartGlass.SmartGlassDeviceCollection.cpp |  10 +-
 ...box.SmartGlass.SmartGlassDeviceWatcher.cpp |   8 +-
 ...box.SmartGlass.SmartGlassDirectSurface.cpp |  14 +-
 ....Xbox.SmartGlass.SmartGlassHtmlSurface.cpp |  12 +-
 ...ass.SmartGlassMessageReceivedEventArgs.cpp |   2 +-
 ...dows.Xbox.SmartGlass.SmartGlassSensors.cpp |  10 +-
 ....SmartGlass.SmartGlassTextEntrySurface.cpp |  44 ++---
 ...inuousSpeechRecognitionResultEventArgs.cpp |   2 +-
 ...inuousSpeechRecognitionStatusEventArgs.cpp |   4 +-
 ...Recognition.InstalledSpeechRecognizers.cpp |   4 +-
 ...ition.InstalledSpeechRecognizersInProc.cpp |   4 +-
 ...on.SpeechAudioProblemOccurredEventArgs.cpp |   2 +-
 ...ox.Speech.Recognition.SpeechChoiceRule.cpp |   8 +-
 ...x.Speech.Recognition.SpeechGarbageItem.cpp |  10 +-
 ....Xbox.Speech.Recognition.SpeechGrammar.cpp |  12 +-
 ...peech.Recognition.SpeechGrammarBuilder.cpp |  20 +--
 ...ecognition.SpeechGrammarBuilderRuleSet.cpp |  24 +--
 ...ox.Speech.Recognition.SpeechGrammarSet.cpp |  22 +--
 ...box.Speech.Recognition.SpeechGraphRule.cpp |  12 +-
 ...ox.Speech.Recognition.SpeechGraphState.cpp |   4 +-
 ...nition.SpeechHypothesisResultEventArgs.cpp |   2 +-
 ...Xbox.Speech.Recognition.SpeechNullItem.cpp |   8 +-
 ...ox.Speech.Recognition.SpeechPhraseItem.cpp |  32 ++--
 ....Recognition.SpeechPronunciationDetail.cpp |   6 +-
 ...ch.Recognition.SpeechRecognitionResult.cpp |  12 +-
 ...SpeechRecognitionResultBodyCorrelation.cpp |   2 +-
 ...ognition.SpeechRecognitionResultDetail.cpp |  14 +-
 ...cognition.SpeechRecognitionResultToken.cpp |   6 +-
 ...tion.SpeechRecognitionSemanticProperty.cpp |  10 +-
 ...ox.Speech.Recognition.SpeechRecognizer.cpp |  56 +++----
 ...h.Recognition.SpeechRecognizerAnalyzer.cpp |   6 +-
 ...nizerAudioCaptureStateChangedEventArgs.cpp |   2 +-
 ...cognition.SpeechRecognizerAudioContext.cpp |   2 +-
 ...ecognition.SpeechRecognizerInformation.cpp |   8 +-
 ...cognition.SpeechRecognizerInputSetting.cpp |  10 +-
 ...SpeechRecognizerPhraseStartedEventArgs.cpp |   2 +-
 ...h.Recognition.SpeechRecognizerSettings.cpp |  14 +-
 ...on.SpeechRecognizerSoundEndedEventArgs.cpp |   2 +-
 ....SpeechRecognizerSoundStartedEventArgs.cpp |   2 +-
 ...ch.Recognition.SpeechRuleReferenceItem.cpp |  16 +-
 ....Speech.Recognition.SpeechSequenceRule.cpp |   8 +-
 ...Xbox.Storage.ConnectedStorageContainer.cpp |   8 +-
 ...ows.Xbox.Storage.ConnectedStorageSpace.cpp |   8 +-
 ....Xbox.Storage.ContainerInfoQueryResult.cpp |   8 +-
 .../Windows.Xbox.System.Console.cpp           |   8 +-
 .../Windows.Xbox.System.Console2.cpp          |   2 +-
 .../Windows.Xbox.System.Launcher.cpp          |   2 +-
 .../Windows.Xbox.System.User.cpp              |  42 ++---
 .../Windows.Xbox.System.UserDisplayInfo.cpp   |  15 +-
 .../Windows.Xbox.UI.Accessibility.cpp         |   4 +-
 .../Windows.Xbox.UI.AddRemoveFriendResult.cpp |   2 +-
 .../Windows.Xbox.UI.KeyboardOptions.cpp       |  28 ++--
 .../Windows.Xbox.UI.SystemUI.cpp              |  46 +++---
 ...indows.Xbox.UI.WebAuthenticationResult.cpp |   6 +-
 dlls/winrt_x/Logger.cpp                       |  98 +++++++-----
 dlls/winrt_x/Logger.h                         |  32 ++--
 377 files changed, 2644 insertions(+), 2606 deletions(-)

diff --git a/dlls/common/DebugLogger.h b/dlls/common/DebugLogger.h
index d1c07bc..13eeeb6 100644
--- a/dlls/common/DebugLogger.h
+++ b/dlls/common/DebugLogger.h
@@ -5,7 +5,7 @@
 #include <cstring>
 
 // Function to extract the last folder name (project/module name)
-inline const char* ExtractProjectName(const char* filePath) {
+inline const char* RetrieveProjectName(const char* filePath) {
     const char* lastSlash = strrchr(filePath, '/');  // UNIX-like path
     if (!lastSlash) lastSlash = strrchr(filePath, '\\');  // Windows path
 
@@ -45,7 +45,7 @@ inline const char* ExtractProjectName(const char* filePath) {
 #endif
 
 // Function to extract only the function name from the full signature
-inline const char* ExtractFunctionName(const char* fullSignature) {
+inline const char* RetrieveFunctionName(const char* fullSignature) {
     const char* paren = strchr(fullSignature, '('); // Find first '('
     if (paren) {
         static char functionName[ 256 ]; // Buffer to store function name
@@ -64,10 +64,10 @@ inline const char* ExtractFunctionName(const char* fullSignature) {
 }
 
 // Debug Print Macro (Basic)
-#define DEBUG_LOG() printf("Line: %d --> %s --> %s \r\n", __LINE__,ExtractProjectName(__FILE__) ,ExtractFunctionName(FUNCTION_NAME) )
+#define DEBUG_LOG() printf("Line: %d --> %s --> %s \r\n", __LINE__, RetrieveProjectName(__FILE__) ,RetrieveFunctionName(FUNCTION_NAME) )
 
 // Debug Print Macro (Custom Message)
-#define DEBUGLOG(fmt, ...) printf("Line: %d --> %s --> %s " fmt "\r\n", __LINE__ , ExtractProjectName(__FILE__), __FUNCTION__ , ##__VA_ARGS__)
+#define DEBUGLOG(fmt, ...) printf("Line: %d --> %s --> %s " fmt "\r\n", __LINE__ , RetrieveProjectName(__FILE__), __FUNCTION__ , ##__VA_ARGS__)
 
 #else
 #define DEBUG_LOG() // No-op in release mode
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.AccessibilitySettingsChangedEventArgs.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.AccessibilitySettingsChangedEventArgs.cpp
index 7c6c911..0ab67ec 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.AccessibilitySettingsChangedEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.AccessibilitySettingsChangedEventArgs.cpp
@@ -6,6 +6,6 @@ namespace winrt::Microsoft::Xbox::GameChat::implementation
 {
     winrt::Microsoft::Xbox::GameChat::ChatUser AccessibilitySettingsChangedEventArgs::ChatUser()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.ChannelUpdatedEventArgs.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.ChannelUpdatedEventArgs.cpp
index d054118..4aa6f3f 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.ChannelUpdatedEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.ChannelUpdatedEventArgs.cpp
@@ -7,12 +7,12 @@ namespace winrt::Microsoft::Xbox::GameChat::implementation
 {
     winrt::Microsoft::Xbox::GameChat::ChatUser ChannelUpdatedEventArgs::ChatUser()
     {
-        Logger::NotImplemented();
+        LOG_NOTIMPLEMENTED();
         throw hresult_not_implemented();
     }
     uint8_t ChannelUpdatedEventArgs::Channel()
     {
-        Logger::NotImplemented();
+        LOG_NOTIMPLEMENTED();
         throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.ChatManager.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.ChatManager.cpp
index 43e25bf..a68b557 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.ChatManager.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.ChatManager.cpp
@@ -6,15 +6,15 @@ namespace winrt::Microsoft::Xbox::GameChat::implementation
 {
     ChatManager::ChatManager(winrt::Microsoft::Xbox::GameChat::ChatSessionPeriod const& chatSessionPeriod)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     ChatManager::ChatManager(winrt::Microsoft::Xbox::GameChat::ChatSessionPeriod const& chatSessionPeriod, bool titleEnforcedPrivilegeAndPrivacy)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     ChatManager::ChatManager(winrt::Microsoft::Xbox::GameChat::ChatSessionPeriod const& chatSessionPeriod, winrt::Microsoft::Xbox::GameChat::PrivilegeAndPrivacyEnforcementMode const& privilegeAndPrivacyEnforcementMode, winrt::Microsoft::Xbox::GameChat::TextConversionMode const& textConversionMode)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::GameChat::ChatManagerSettings ChatManager::ChatSettings()
     {
@@ -22,91 +22,91 @@ namespace winrt::Microsoft::Xbox::GameChat::implementation
     }
     winrt::event_token ChatManager::OnDebugMessage(winrt::Windows::Foundation::EventHandler<winrt::Microsoft::Xbox::GameChat::DebugMessageEventArgs> const& __param0)
     {
-        Logger::NotImplemented(); return {};
+        LOG_NOTIMPLEMENTED(); return {};
     }
     void ChatManager::OnDebugMessage(winrt::event_token const& __param0) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token ChatManager::OnOutgoingChatPacketReady(winrt::Windows::Foundation::EventHandler<winrt::Microsoft::Xbox::GameChat::ChatPacketEventArgs> const& __param0)
     {
-        Logger::NotImplemented(); return {};
+        LOG_NOTIMPLEMENTED(); return {};
     }
     void ChatManager::OnOutgoingChatPacketReady(winrt::event_token const& __param0) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token ChatManager::OnCompareUniqueConsoleIdentifiers(winrt::Microsoft::Xbox::GameChat::CompareUniqueConsoleIdentifiersHandler const& __param0)
     {
-        Logger::NotImplemented(); return {};
+        LOG_NOTIMPLEMENTED(); return {};
     }
     void ChatManager::OnCompareUniqueConsoleIdentifiers(winrt::event_token const& __param0) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token ChatManager::OnUserAddedToChannel(winrt::Windows::Foundation::EventHandler<winrt::Microsoft::Xbox::GameChat::ChannelUpdatedEventArgs> const& __param0)
     {
-        Logger::NotImplemented(); return {};
+        LOG_NOTIMPLEMENTED(); return {};
     }
     void ChatManager::OnUserAddedToChannel(winrt::event_token const& __param0) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token ChatManager::OnUserRemovedFromChannel(winrt::Windows::Foundation::EventHandler<winrt::Microsoft::Xbox::GameChat::ChannelUpdatedEventArgs> const& __param0)
     {
-        Logger::NotImplemented(); return {};
+        LOG_NOTIMPLEMENTED(); return {};
     }
     void ChatManager::OnUserRemovedFromChannel(winrt::event_token const& __param0) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token ChatManager::OnPreEncodeAudioBuffer(winrt::Microsoft::Xbox::GameChat::ProcessAudioBufferHandler const& __param0)
     {
-        Logger::NotImplemented(); return {};
+        LOG_NOTIMPLEMENTED(); return {};
     }
     void ChatManager::OnPreEncodeAudioBuffer(winrt::event_token const& __param0) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token ChatManager::OnPostDecodeAudioBuffer(winrt::Microsoft::Xbox::GameChat::ProcessAudioBufferHandler const& __param0)
     {
-        Logger::NotImplemented(); return {};
+        LOG_NOTIMPLEMENTED(); return {};
     }
     void ChatManager::OnPostDecodeAudioBuffer(winrt::event_token const& __param0) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token ChatManager::OnTextMessageReceived(winrt::Windows::Foundation::EventHandler<winrt::Microsoft::Xbox::GameChat::TextMessageReceivedEventArgs> const& __param0)
     {
-        Logger::NotImplemented(); return {};
+        LOG_NOTIMPLEMENTED(); return {};
     }
     void ChatManager::OnTextMessageReceived(winrt::event_token const& __param0) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token ChatManager::OnAccessibilitySettingsChanged(winrt::Windows::Foundation::EventHandler<winrt::Microsoft::Xbox::GameChat::AccessibilitySettingsChangedEventArgs> const& __param0)
     {
-        Logger::NotImplemented(); return {};
+        LOG_NOTIMPLEMENTED(); return {};
     }
     void ChatManager::OnAccessibilitySettingsChanged(winrt::event_token const& __param0) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::GameChat::ChatMessageType ChatManager::ProcessIncomingChatMessage(winrt::Windows::Storage::Streams::IBuffer const& chatPacket, winrt::Windows::Foundation::IInspectable const& uniqueRemoteConsoleIdentifier)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ChatManager::HandleNewRemoteConsole(winrt::Windows::Foundation::IInspectable const& uniqueRemoteConsoleIdentifier)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction ChatManager::AddLocalUserToChatChannelAsync(uint8_t channelIndex, winrt::Windows::Xbox::System::IUser user)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction ChatManager::AddLocalUsersToChatChannelAsync(uint8_t channelIndex, winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::System::User> users)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction ChatManager::RemoveLocalUserFromChatChannelAsync(uint8_t channelIndex, winrt::Windows::Xbox::System::IUser user)
     {
@@ -114,7 +114,7 @@ namespace winrt::Microsoft::Xbox::GameChat::implementation
     }
     winrt::Windows::Foundation::IAsyncAction ChatManager::RemoveRemoteConsoleAsync(winrt::Windows::Foundation::IInspectable uniqueRemoteConsoleIdentifier)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::GameChat::ChatUser> ChatManager::GetChatUsers()
     {
@@ -122,30 +122,30 @@ namespace winrt::Microsoft::Xbox::GameChat::implementation
     }
     void ChatManager::MuteUserFromAllChannels(winrt::Microsoft::Xbox::GameChat::ChatUser const& user)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ChatManager::UnmuteUserFromAllChannels(winrt::Microsoft::Xbox::GameChat::ChatUser const& user)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ChatManager::MuteAllUsersFromAllChannels()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ChatManager::UnmuteAllUsersFromAllChannels()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction ChatManager::MuteUserIfReputationIsBadAsync(winrt::Microsoft::Xbox::GameChat::ChatUser user)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool ChatManager::HasMicFocus()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::GameChat::ChatPerformanceCounters ChatManager::ChatPerformanceCounters()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.ChatManagerSettings.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.ChatManagerSettings.cpp
index 311d34e..1a6b03c 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.ChatManagerSettings.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.ChatManagerSettings.cpp
@@ -6,67 +6,67 @@ namespace winrt::Microsoft::Xbox::GameChat::implementation
 {
     uint32_t ChatManagerSettings::AudioThreadPeriodInMilliseconds()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ChatManagerSettings::AudioThreadPeriodInMilliseconds(uint32_t value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t ChatManagerSettings::AudioThreadAffinityMask()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ChatManagerSettings::AudioThreadAffinityMask(uint32_t value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     int32_t ChatManagerSettings::AudioThreadPriority()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ChatManagerSettings::AudioThreadPriority(int32_t value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Chat::EncodingQuality ChatManagerSettings::AudioEncodingQuality()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ChatManagerSettings::AudioEncodingQuality(winrt::Windows::Xbox::Chat::EncodingQuality const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t ChatManagerSettings::JitterBufferMaxPackets()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ChatManagerSettings::JitterBufferMaxPackets(uint32_t value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t ChatManagerSettings::JitterBufferLowestNeededPacketCount()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ChatManagerSettings::JitterBufferLowestNeededPacketCount(uint32_t value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t ChatManagerSettings::JitterBufferPacketsBeforeRelaxingNeeded()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ChatManagerSettings::JitterBufferPacketsBeforeRelaxingNeeded(uint32_t value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool ChatManagerSettings::PerformanceCountersEnabled()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ChatManagerSettings::PerformanceCountersEnabled(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     bool m_CombineCaptureBuffersIntoSinglePacket;
@@ -112,34 +112,34 @@ namespace winrt::Microsoft::Xbox::GameChat::implementation
 
     winrt::Microsoft::Xbox::GameChat::GameChatDiagnosticsTraceLevel ChatManagerSettings::DiagnosticsTraceLevel()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ChatManagerSettings::DiagnosticsTraceLevel(winrt::Microsoft::Xbox::GameChat::GameChatDiagnosticsTraceLevel const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool ChatManagerSettings::AutoMuteBadReputationUsers()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ChatManagerSettings::AutoMuteBadReputationUsers(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t ChatManagerSettings::SessionStateUpdateRequestCoalesceDuration()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ChatManagerSettings::SessionStateUpdateRequestCoalesceDuration(uint32_t value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t ChatManagerSettings::MuteUserIfReputationIsBadCoalesceDuration()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ChatManagerSettings::MuteUserIfReputationIsBadCoalesceDuration(uint32_t value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.ChatPacketEventArgs.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.ChatPacketEventArgs.cpp
index d62bc29..5cb68ad 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.ChatPacketEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.ChatPacketEventArgs.cpp
@@ -6,30 +6,30 @@ namespace winrt::Microsoft::Xbox::GameChat::implementation
 {
     winrt::Windows::Storage::Streams::IBuffer ChatPacketEventArgs::PacketBuffer()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool ChatPacketEventArgs::SendReliable()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool ChatPacketEventArgs::SendInOrder()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool ChatPacketEventArgs::SendPacketToAllConnectedConsoles()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IInspectable ChatPacketEventArgs::UniqueTargetConsoleIdentifier()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::GameChat::ChatMessageType ChatPacketEventArgs::ChatMessageType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::GameChat::ChatUser ChatPacketEventArgs::ChatUser()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.ChatPerformanceCounters.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.ChatPerformanceCounters.cpp
index 887c93b..cb57a78 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.ChatPerformanceCounters.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.ChatPerformanceCounters.cpp
@@ -6,34 +6,34 @@ namespace winrt::Microsoft::Xbox::GameChat::implementation
 {
     winrt::Microsoft::Xbox::GameChat::ChatPerformanceTime ChatPerformanceCounters::CaptureExecutionTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::GameChat::ChatPerformanceTime ChatPerformanceCounters::SendExecutionTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::GameChat::ChatPerformanceTime ChatPerformanceCounters::RenderExecutionTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::GameChat::ChatPerformanceTime ChatPerformanceCounters::AudioThreadExecutionTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::GameChat::ChatPerformanceTime ChatPerformanceCounters::AudioThreadPeriodTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::GameChat::ChatPerformanceTime ChatPerformanceCounters::IncomingPacketTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     double ChatPerformanceCounters::IncomingPacketBandwidthBitsPerSecond()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     double ChatPerformanceCounters::OutgoingPacketBandwidthBitsPerSecond()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.ChatPerformanceTime.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.ChatPerformanceTime.cpp
index 3ecf8c4..18da32b 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.ChatPerformanceTime.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.ChatPerformanceTime.cpp
@@ -6,14 +6,14 @@ namespace winrt::Microsoft::Xbox::GameChat::implementation
 {
     double ChatPerformanceTime::MinTimeInMilliseconds()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     double ChatPerformanceTime::MaxTimeInMilliseconds()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     double ChatPerformanceTime::AverageTimeInMilliseconds()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.ChatUser.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.ChatUser.cpp
index 7b13b97..5f7e483 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.ChatUser.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.ChatUser.cpp
@@ -6,82 +6,82 @@ namespace winrt::Microsoft::Xbox::GameChat::implementation
 {
     hstring ChatUser::XboxUserId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IInspectable ChatUser::UniqueConsoleIdentifier()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::GameChat::ChatUserTalkingMode ChatUser::TalkingMode()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t ChatUser::NumberOfPendingAudioPacketsToPlay()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t ChatUser::DynamicNeededPacketCount()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Chat::ChatRestriction ChatUser::RestrictionMode()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::System::IUser ChatUser::User()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool ChatUser::IsLocal()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool ChatUser::IsLocalUserMuted()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool ChatUser::IsMuted()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<uint8_t> ChatUser::GetAllChannels()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ChatUser::GenerateTextMessage(hstring const& message, bool allowTextToSpeechConversion)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Chat::ChatParticipantTypes ChatUser::ParticipantType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ChatUser::ParticipantType(winrt::Windows::Xbox::Chat::ChatParticipantTypes const& val)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     float ChatUser::Volume()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ChatUser::Volume(float val)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     float ChatUser::LocalRenderTargetVolume()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ChatUser::LocalRenderTargetVolume(float val)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool ChatUser::HasRequestedTranscription()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool ChatUser::HasRequestedSynthesizedAudio()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.DebugMessageEventArgs.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.DebugMessageEventArgs.cpp
index 299a97e..75593c3 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.DebugMessageEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.DebugMessageEventArgs.cpp
@@ -6,10 +6,10 @@ namespace winrt::Microsoft::Xbox::GameChat::implementation
 {
     hstring DebugMessageEventArgs::Message()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     int32_t DebugMessageEventArgs::ErrorCode()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.TextMessageReceivedEventArgs.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.TextMessageReceivedEventArgs.cpp
index f96bbb7..839fdfa 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.TextMessageReceivedEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.GameChat.TextMessageReceivedEventArgs.cpp
@@ -6,14 +6,14 @@ namespace winrt::Microsoft::Xbox::GameChat::implementation
 {
     hstring TextMessageReceivedEventArgs::Message()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::GameChat::ChatTextMessageType TextMessageReceivedEventArgs::ChatTextMessageType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::GameChat::ChatUser TextMessageReceivedEventArgs::ChatUser()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Achievements.Achievement.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Achievements.Achievement.cpp
index 32d7fca..9a17e4d 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Achievements.Achievement.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Achievements.Achievement.cpp
@@ -7,80 +7,80 @@ namespace winrt::Microsoft::Xbox::Services::Achievements::implementation
     hstring Achievement::Id()
     {
 
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring Achievement::ServiceConfigurationId()
     {
 
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring Achievement::Name()
     {
 
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Achievements::AchievementTitleAssociation> Achievement::TitleAssociations()
     {
-		Logger::NotImplemented(); throw hresult_not_implemented();
+		LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Achievements::AchievementProgressState Achievement::ProgressState()
     {
-		Logger::NotImplemented(); throw hresult_not_implemented();
+		LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Achievements::AchievementProgression Achievement::Progression()
     {
-		Logger::NotImplemented(); throw hresult_not_implemented();
+		LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Achievements::AchievementMediaAsset> Achievement::MediaAssets()
     {
-		Logger::NotImplemented(); throw hresult_not_implemented();
+		LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<hstring> Achievement::PlatformsAvailableOn()
     {
-		Logger::NotImplemented(); throw hresult_not_implemented();
+		LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool Achievement::IsSecret()
     {
-		Logger::NotImplemented(); throw hresult_not_implemented();
+		LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring Achievement::UnlockedDescription()
     {
-		Logger::NotImplemented(); throw hresult_not_implemented();
+		LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring Achievement::LockedDescription()
     {
-		Logger::NotImplemented(); throw hresult_not_implemented();
+		LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring Achievement::ProductId()
     {
-		Logger::NotImplemented(); throw hresult_not_implemented();
+		LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Achievements::AchievementType Achievement::AchievementType()
     {
-		Logger::NotImplemented(); throw hresult_not_implemented();
+		LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Achievements::AchievementParticipationType Achievement::ParticipationType()
     {
-		Logger::NotImplemented(); throw hresult_not_implemented();
+		LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Achievements::AchievementTimeWindow Achievement::Available()
     {
-		Logger::NotImplemented(); throw hresult_not_implemented();
+		LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Achievements::AchievementReward> Achievement::Rewards()
     {
-		Logger::NotImplemented(); throw hresult_not_implemented();
+		LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan Achievement::EstimatedUnlockTime()
     {
-		Logger::NotImplemented(); throw hresult_not_implemented();
+		LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring Achievement::DeepLink()
     {
-		Logger::NotImplemented(); throw hresult_not_implemented();
+		LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool Achievement::IsRevoked()
     {
-		Logger::NotImplemented(); throw hresult_not_implemented();
+		LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Achievements.AchievementMediaAsset.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Achievements.AchievementMediaAsset.cpp
index 6e78862..2fccb66 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Achievements.AchievementMediaAsset.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Achievements.AchievementMediaAsset.cpp
@@ -7,14 +7,14 @@ namespace winrt::Microsoft::Xbox::Services::Achievements::implementation
 {
     hstring AchievementMediaAsset::Name()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Achievements::AchievementMediaAssetType AchievementMediaAsset::MediaAssetType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring AchievementMediaAsset::Url()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Achievements.AchievementProgression.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Achievements.AchievementProgression.cpp
index 3cb2ee7..2436170 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Achievements.AchievementProgression.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Achievements.AchievementProgression.cpp
@@ -7,10 +7,10 @@ namespace winrt::Microsoft::Xbox::Services::Achievements::implementation
 {
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Achievements::AchievementRequirement> AchievementProgression::Requirements()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime AchievementProgression::TimeUnlocked()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Achievements.AchievementRequirement.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Achievements.AchievementRequirement.cpp
index 5cc7b7c..8e188ea 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Achievements.AchievementRequirement.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Achievements.AchievementRequirement.cpp
@@ -7,14 +7,14 @@ namespace winrt::Microsoft::Xbox::Services::Achievements::implementation
 {
     hstring AchievementRequirement::Id()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring AchievementRequirement::CurrentProgressValue()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring AchievementRequirement::TargetProgressValue()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Achievements.AchievementReward.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Achievements.AchievementReward.cpp
index f3574ea..b2f57c4 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Achievements.AchievementReward.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Achievements.AchievementReward.cpp
@@ -7,26 +7,26 @@ namespace winrt::Microsoft::Xbox::Services::Achievements::implementation
 {
     hstring AchievementReward::Name()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring AchievementReward::Description()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring AchievementReward::Data()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Achievements::AchievementRewardType AchievementReward::RewardType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::PropertyType AchievementReward::ValuePropertyType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Achievements::AchievementMediaAsset AchievementReward::MediaAsset()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Achievements.AchievementService.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Achievements.AchievementService.cpp
index 6072143..09de5e0 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Achievements.AchievementService.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Achievements.AchievementService.cpp
@@ -7,26 +7,26 @@ namespace winrt::Microsoft::Xbox::Services::Achievements::implementation
 {
     winrt::Windows::Foundation::IAsyncAction AchievementService::UpdateAchievementAsync(hstring xboxUserId, hstring achievementId, uint32_t percentComplete)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction AchievementService::UpdateAchievementAsync(hstring xboxUserId, uint32_t titleId, hstring serviceConfigurationId, hstring achievementId, uint32_t percentComplete)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<int32_t> AchievementService::TryUpdateAchievementAsync(hstring xboxUserId, hstring achievementId, uint32_t percentComplete)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<int32_t> AchievementService::TryUpdateAchievementAsync(hstring xboxUserId, uint32_t titleId, hstring serviceConfigurationId, hstring achievementId, uint32_t percentComplete)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Achievements::AchievementsResult> AchievementService::GetAchievementsForTitleIdAsync(hstring xboxUserId, uint32_t titleId, winrt::Microsoft::Xbox::Services::Achievements::AchievementType type, bool unlockedOnly, winrt::Microsoft::Xbox::Services::Achievements::AchievementOrderBy orderBy, uint32_t skipItems, uint32_t maxItems)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Achievements::Achievement> AchievementService::GetAchievementAsync(hstring xboxUserId, hstring serviceConfigurationId, hstring achievementId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Achievements.AchievementTimeWindow.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Achievements.AchievementTimeWindow.cpp
index 2ecd855..360bb9f 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Achievements.AchievementTimeWindow.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Achievements.AchievementTimeWindow.cpp
@@ -7,10 +7,10 @@ namespace winrt::Microsoft::Xbox::Services::Achievements::implementation
 {
     winrt::Windows::Foundation::DateTime AchievementTimeWindow::StartDate()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime AchievementTimeWindow::EndDate()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Achievements.AchievementTitleAssociation.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Achievements.AchievementTitleAssociation.cpp
index a12e678..ef44e40 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Achievements.AchievementTitleAssociation.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Achievements.AchievementTitleAssociation.cpp
@@ -7,10 +7,10 @@ namespace winrt::Microsoft::Xbox::Services::Achievements::implementation
 {
     hstring AchievementTitleAssociation::Name()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t AchievementTitleAssociation::TitleId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Achievements.AchievementsResult.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Achievements.AchievementsResult.cpp
index 390e4f2..c1486cb 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Achievements.AchievementsResult.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Achievements.AchievementsResult.cpp
@@ -7,14 +7,14 @@ namespace winrt::Microsoft::Xbox::Services::Achievements::implementation
 {
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Achievements::Achievement> AchievementsResult::Items()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Achievements::AchievementsResult> AchievementsResult::GetNextAsync(uint32_t maxItems)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool AchievementsResult::HasNext()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.Club.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.Club.cpp
index 6c323fa..ddd29f3 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.Club.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.Club.cpp
@@ -7,170 +7,170 @@ namespace winrt::Microsoft::Xbox::Services::Clubs::implementation
 {
     hstring Club::Id()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Clubs::ClubType Club::Type()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime Club::Created()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring Club::Owner()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring Club::TitleFamilyId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring Club::TitleFamilyName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring Club::ShortName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Clubs::ClubProfile Club::Profile()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring Club::GlyphImageUrl()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring Club::BannerImageUrl()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool Club::IsClubSuspended()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime Club::SuspendedUntil()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring Club::FounderXuid()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t Club::FollowersCount()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t Club::PresenceCount()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t Club::PresenceTodayCount()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t Club::MembersCount()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t Club::ModeratorsCount()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t Club::RecommendedCount()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t Club::RequestedToJoinCount()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t Club::ReportCount()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t Club::ReporteItemsCount()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Clubs::ClubActionSettings Club::ActionSettings()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Clubs::ClubRole> Club::ViewerRoles()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Clubs::ClubRoster> Club::GetRosterAsync()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Clubs::ClubUserPresenceRecord>> Club::GetClubUserPresenceRecordsAsync()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction Club::RenameClubAsync(hstring newName)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Clubs::ClubRole>> Club::GetRolesAsync(hstring xuid)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Clubs::ClubRoleRecord>> Club::GetRoleRecordsAsync()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Clubs::ClubRoleRecord>> Club::GetRoleRecordsAsync(hstring xuid)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Clubs::ClubPresenceCounts> Club::GetPresenceCountsAsync()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction Club::SetPresenceWithinClubAsync(winrt::Microsoft::Xbox::Services::Clubs::ClubUserPresence presence)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Clubs::ClubRole>> Club::AddUserToClubAsync()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Clubs::ClubRole>> Club::AddUserToClubAsync(hstring xuid)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Clubs::ClubRole>> Club::RemoveUserFromClubAsync()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Clubs::ClubRole>> Club::RemoveUserFromClubAsync(hstring xuid)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Clubs::ClubRole>> Club::FollowClubAsync()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Clubs::ClubRole>> Club::UnfollowClubAsync()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Clubs::ClubRole>> Club::BanUserFromClubAsync(hstring xuid)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Clubs::ClubRole>> Club::UnbanUserFromClubAsync(hstring xuid)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Clubs::ClubRole>> Club::AddClubModeratorAsync(hstring xuid)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Clubs::ClubRole>> Club::RemoveClubModeratorAsync(hstring xuid)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubActionSetting.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubActionSetting.cpp
index d2d8d1b..aa78ab1 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubActionSetting.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubActionSetting.cpp
@@ -7,18 +7,18 @@ namespace winrt::Microsoft::Xbox::Services::Clubs::implementation
 {
     winrt::Microsoft::Xbox::Services::Clubs::ClubRole ClubActionSetting::RequiredRole()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Clubs::ClubRole> ClubActionSetting::AllowedValues()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool ClubActionSetting::CanViewerChangeSetting()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool ClubActionSetting::CanViewerAct()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubActionSettings.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubActionSettings.cpp
index 91aef6a..59295d9 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubActionSettings.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubActionSettings.cpp
@@ -7,58 +7,58 @@ namespace winrt::Microsoft::Xbox::Services::Clubs::implementation
 {
     winrt::Microsoft::Xbox::Services::Clubs::ClubActionSetting ClubActionSettings::PostToFeed()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Clubs::ClubActionSetting ClubActionSettings::ViewFeed()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Clubs::ClubActionSetting ClubActionSettings::WriteInChat()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Clubs::ClubActionSetting ClubActionSettings::ViewChat()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Clubs::ClubActionSetting ClubActionSettings::SetChatTopic()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Clubs::ClubActionSetting ClubActionSettings::JoinLookingForGame()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Clubs::ClubActionSetting ClubActionSettings::CreateLookingForGame()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Clubs::ClubActionSetting ClubActionSettings::ViewLookingForGame()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Clubs::ClubActionSetting ClubActionSettings::InviteOrAcceptJoinRequests()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Clubs::ClubActionSetting ClubActionSettings::KickOrBan()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Clubs::ClubActionSetting ClubActionSettings::ViewRoster()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Clubs::ClubActionSetting ClubActionSettings::UpdateProfile()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Clubs::ClubActionSetting ClubActionSettings::DeleteProfile()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Clubs::ClubActionSetting ClubActionSettings::ViewProfile()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubBooleanSetting.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubBooleanSetting.cpp
index bf00ba1..532a0fa 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubBooleanSetting.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubBooleanSetting.cpp
@@ -7,10 +7,10 @@ namespace winrt::Microsoft::Xbox::Services::Clubs::implementation
 {
     bool ClubBooleanSetting::Value()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool ClubBooleanSetting::CanViewerChangeSetting()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubPresenceCounts.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubPresenceCounts.cpp
index 0d20746..977e4c1 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubPresenceCounts.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubPresenceCounts.cpp
@@ -7,18 +7,18 @@ namespace winrt::Microsoft::Xbox::Services::Clubs::implementation
 {
     uint32_t ClubPresenceCounts::TotalCount()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t ClubPresenceCounts::HereNow()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t ClubPresenceCounts::HereToday()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t ClubPresenceCounts::InGameNow()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubProfile.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubProfile.cpp
index 0d2eb4c..bcb44fe 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubProfile.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubProfile.cpp
@@ -7,70 +7,70 @@ namespace winrt::Microsoft::Xbox::Services::Clubs::implementation
 {
     winrt::Microsoft::Xbox::Services::Clubs::ClubStringSetting ClubProfile::Name()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Clubs::ClubStringSetting ClubProfile::Description()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Clubs::ClubBooleanSetting ClubProfile::MatureContentEnabled()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Clubs::ClubBooleanSetting ClubProfile::WatchClubTitlesOnly()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Clubs::ClubBooleanSetting ClubProfile::IsSearchable()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Clubs::ClubBooleanSetting ClubProfile::IsRecommendable()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Clubs::ClubBooleanSetting ClubProfile::RequestToJoinEnabled()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Clubs::ClubBooleanSetting ClubProfile::LeaveEnabled()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Clubs::ClubBooleanSetting ClubProfile::TransferOwnershipEnabled()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Clubs::ClubStringSetting ClubProfile::DisplayImageUrl()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Clubs::ClubStringSetting ClubProfile::BackgroundImageUrl()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Clubs::ClubStringMultiSetting ClubProfile::Tags()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Clubs::ClubStringSetting ClubProfile::PreferredLocale()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Clubs::ClubStringMultiSetting ClubProfile::AssociatedTitles()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Clubs::ClubStringSetting ClubProfile::PrimaryColor()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Clubs::ClubStringSetting ClubProfile::SecondayColor()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Clubs::ClubStringSetting ClubProfile::TertiaryColor()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubRecommendation.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubRecommendation.cpp
index d45ea02..8e4c044 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubRecommendation.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubRecommendation.cpp
@@ -7,10 +7,10 @@ namespace winrt::Microsoft::Xbox::Services::Clubs::implementation
 {
     winrt::Microsoft::Xbox::Services::Clubs::Club ClubRecommendation::RecommendedClub()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<hstring> ClubRecommendation::Reasons()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubRoleRecord.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubRoleRecord.cpp
index 64e3e2d..4906a25 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubRoleRecord.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubRoleRecord.cpp
@@ -7,18 +7,18 @@ namespace winrt::Microsoft::Xbox::Services::Clubs::implementation
 {
     hstring ClubRoleRecord::Xuid()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Clubs::ClubRole ClubRoleRecord::Role()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring ClubRoleRecord::ActorXuid()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime ClubRoleRecord::CreatedDate()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubRoster.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubRoster.cpp
index e8e50c2..ebaa9c4 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubRoster.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubRoster.cpp
@@ -7,18 +7,18 @@ namespace winrt::Microsoft::Xbox::Services::Clubs::implementation
 {
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Clubs::ClubRoleRecord> ClubRoster::Moderators()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Clubs::ClubRoleRecord> ClubRoster::RequestedToJoin()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Clubs::ClubRoleRecord> ClubRoster::Recommended()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Clubs::ClubRoleRecord> ClubRoster::Banned()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubSearchAutoComplete.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubSearchAutoComplete.cpp
index 16bcf96..668447b 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubSearchAutoComplete.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubSearchAutoComplete.cpp
@@ -7,34 +7,34 @@ namespace winrt::Microsoft::Xbox::Services::Clubs::implementation
 {
     hstring ClubSearchAutoComplete::Id()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring ClubSearchAutoComplete::Name()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring ClubSearchAutoComplete::Description()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring ClubSearchAutoComplete::DisplayImageUrl()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     double ClubSearchAutoComplete::Score()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring ClubSearchAutoComplete::SuggestedQueryText()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<hstring> ClubSearchAutoComplete::Tags()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<hstring> ClubSearchAutoComplete::AssociatedTitles()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubSearchFacetResult.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubSearchFacetResult.cpp
index e55c8ef..3cd13e2 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubSearchFacetResult.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubSearchFacetResult.cpp
@@ -7,10 +7,10 @@ namespace winrt::Microsoft::Xbox::Services::Clubs::implementation
 {
     hstring ClubSearchFacetResult::Value()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t ClubSearchFacetResult::Count()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubStringMultiSetting.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubStringMultiSetting.cpp
index cfa653a..f3993f9 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubStringMultiSetting.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubStringMultiSetting.cpp
@@ -7,14 +7,14 @@ namespace winrt::Microsoft::Xbox::Services::Clubs::implementation
 {
     winrt::Windows::Foundation::Collections::IVectorView<hstring> ClubStringMultiSetting::Values()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<hstring> ClubStringMultiSetting::AllowedValues()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool ClubStringMultiSetting::CanViewerChangeSetting()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubStringSetting.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubStringSetting.cpp
index 4c539cd..c356e62 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubStringSetting.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubStringSetting.cpp
@@ -7,14 +7,14 @@ namespace winrt::Microsoft::Xbox::Services::Clubs::implementation
 {
     hstring ClubStringSetting::Value()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<hstring> ClubStringSetting::AllowedValues()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool ClubStringSetting::CanViewerChangeSetting()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubUserPresenceRecord.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubUserPresenceRecord.cpp
index 53f58c9..d69825b 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubUserPresenceRecord.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubUserPresenceRecord.cpp
@@ -7,14 +7,14 @@ namespace winrt::Microsoft::Xbox::Services::Clubs::implementation
 {
     hstring ClubUserPresenceRecord::Xuid()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime ClubUserPresenceRecord::LastSeen()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Clubs::ClubUserPresence ClubUserPresenceRecord::LastSeenState()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubsOwnedResult.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubsOwnedResult.cpp
index 78acac9..caac480 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubsOwnedResult.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubsOwnedResult.cpp
@@ -7,10 +7,10 @@ namespace winrt::Microsoft::Xbox::Services::Clubs::implementation
 {
     winrt::Windows::Foundation::Collections::IVectorView<hstring> ClubsOwnedResult::ClubIds()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t ClubsOwnedResult::RemainingClubs()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubsSearchResult.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubsSearchResult.cpp
index 051e702..eb1fece 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubsSearchResult.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubsSearchResult.cpp
@@ -7,10 +7,10 @@ namespace winrt::Microsoft::Xbox::Services::Clubs::implementation
 {
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Clubs::Club> ClubsSearchResult::Clubs()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IMapView<hstring, winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Clubs::ClubSearchFacetResult>> ClubsSearchResult::SearchFacetResults()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubsService.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubsService.cpp
index adf31eb..1295737 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubsService.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Clubs.ClubsService.cpp
@@ -7,42 +7,42 @@ namespace winrt::Microsoft::Xbox::Services::Clubs::implementation
 {
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Clubs::Club> ClubsService::GetClubAsync(hstring clubId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Clubs::Club>> ClubsService::GetClubsAsync(winrt::Windows::Foundation::Collections::IVectorView<hstring> clubIds)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Clubs::ClubsOwnedResult> ClubsService::GetClubsOwnedAsync()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Clubs::Club> ClubsService::CreateClubAsync(hstring name, winrt::Microsoft::Xbox::Services::Clubs::ClubType type, hstring titleFamilyId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction ClubsService::DeleteClubAsync(hstring clubId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Clubs::Club>> ClubsService::GetClubAssociationsAsync()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Clubs::Club>> ClubsService::GetClubAssociationsAsync(hstring xuid)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Clubs::ClubRecommendation>> ClubsService::GetClubRecommendationsAsync()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Clubs::ClubsSearchResult> ClubsService::SearchClubsAsync(hstring queryString, winrt::Windows::Foundation::Collections::IVectorView<hstring> titleIds, winrt::Windows::Foundation::Collections::IVectorView<hstring> tags)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Clubs::ClubSearchAutoComplete>> ClubsService::SuggestClubsAsync(hstring queryString, winrt::Windows::Foundation::Collections::IVectorView<hstring> titleIds, winrt::Windows::Foundation::Collections::IVectorView<hstring> tags)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.ContextualSearch.ContextualSearchBroadcast.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.ContextualSearch.ContextualSearchBroadcast.cpp
index df47702..78b9fbd 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.ContextualSearch.ContextualSearchBroadcast.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.ContextualSearch.ContextualSearchBroadcast.cpp
@@ -7,26 +7,26 @@ namespace winrt::Microsoft::Xbox::Services::ContextualSearch::implementation
 {
     hstring ContextualSearchBroadcast::XboxUserId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring ContextualSearchBroadcast::Provider()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring ContextualSearchBroadcast::BroadcasterIdFromProvider()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint64_t ContextualSearchBroadcast::Viewers()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime ContextualSearchBroadcast::StartedDate()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IMapView<hstring, hstring> ContextualSearchBroadcast::CurrentStats()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.ContextualSearch.ContextualSearchConfiguredStat.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.ContextualSearch.ContextualSearchConfiguredStat.cpp
index a15cc34..0435586 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.ContextualSearch.ContextualSearchConfiguredStat.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.ContextualSearch.ContextualSearchConfiguredStat.cpp
@@ -7,42 +7,42 @@ namespace winrt::Microsoft::Xbox::Services::ContextualSearch::implementation
 {
     hstring ContextualSearchConfiguredStat::Name()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring ContextualSearchConfiguredStat::DataType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::ContextualSearch::ContextualSearchStatVisibility ContextualSearchConfiguredStat::Visibility()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring ContextualSearchConfiguredStat::DisplayName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool ContextualSearchConfiguredStat::CanBeFiltered()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool ContextualSearchConfiguredStat::CanBeSorted()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::ContextualSearch::ContextualSearchStatVisibility ContextualSearchConfiguredStat::DisplayType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IMapView<hstring, hstring> ContextualSearchConfiguredStat::ValueToDisplayName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint64_t ContextualSearchConfiguredStat::RangeMin()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint64_t ContextualSearchConfiguredStat::RangeMax()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.ContextualSearch.ContextualSearchGameClip.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.ContextualSearch.ContextualSearchGameClip.cpp
index 6aa4985..59aa55a 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.ContextualSearch.ContextualSearchGameClip.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.ContextualSearch.ContextualSearchGameClip.cpp
@@ -7,42 +7,42 @@ namespace winrt::Microsoft::Xbox::Services::ContextualSearch::implementation
 {
     hstring ContextualSearchGameClip::ClipName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint64_t ContextualSearchGameClip::DurationInSeconds()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring ContextualSearchGameClip::GameClipId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring ContextualSearchGameClip::GameClipLocale()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::ContextualSearch::ContextualSearchGameClipUriInfo> ContextualSearchGameClip::GameClipUris()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::ContextualSearch::ContextualSearchGameClipThumbnail> ContextualSearchGameClip::Thumbnails()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::ContextualSearch::ContextualSearchGameClipType ContextualSearchGameClip::GameClipType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint64_t ContextualSearchGameClip::Views()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring ContextualSearchGameClip::XboxUserId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::ContextualSearch::ContextualSearchGameClipStat> ContextualSearchGameClip::Stats()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.ContextualSearch.ContextualSearchGameClipStat.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.ContextualSearch.ContextualSearchGameClipStat.cpp
index 381f68f..fb3df32 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.ContextualSearch.ContextualSearchGameClipStat.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.ContextualSearch.ContextualSearchGameClipStat.cpp
@@ -7,22 +7,22 @@ namespace winrt::Microsoft::Xbox::Services::ContextualSearch::implementation
 {
     hstring ContextualSearchGameClipStat::Name()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring ContextualSearchGameClipStat::Value()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring ContextualSearchGameClipStat::MinValue()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring ContextualSearchGameClipStat::MaxValue()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring ContextualSearchGameClipStat::DeltaValue()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.ContextualSearch.ContextualSearchGameClipThumbnail.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.ContextualSearch.ContextualSearchGameClipThumbnail.cpp
index b8e0353..3bea9ec 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.ContextualSearch.ContextualSearchGameClipThumbnail.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.ContextualSearch.ContextualSearchGameClipThumbnail.cpp
@@ -7,14 +7,14 @@ namespace winrt::Microsoft::Xbox::Services::ContextualSearch::implementation
 {
     winrt::Windows::Foundation::Uri ContextualSearchGameClipThumbnail::Url()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint64_t ContextualSearchGameClipThumbnail::FileSize()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::ContextualSearch::ContextualSearchGameClipThumbnailType ContextualSearchGameClipThumbnail::ThumbnailType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.ContextualSearch.ContextualSearchGameClipUriInfo.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.ContextualSearch.ContextualSearchGameClipUriInfo.cpp
index 5d9f537..2ca9b7d 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.ContextualSearch.ContextualSearchGameClipUriInfo.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.ContextualSearch.ContextualSearchGameClipUriInfo.cpp
@@ -6,18 +6,18 @@ namespace winrt::Microsoft::Xbox::Services::ContextualSearch::implementation
 {
     winrt::Windows::Foundation::Uri ContextualSearchGameClipUriInfo::Url()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint64_t ContextualSearchGameClipUriInfo::FileSize()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::ContextualSearch::ContextualSearchGameClipUriType ContextualSearchGameClipUriInfo::UriType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime ContextualSearchGameClipUriInfo::Expiration()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.ContextualSearch.ContextualSearchGameClipsResult.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.ContextualSearch.ContextualSearchGameClipsResult.cpp
index 1e74fc5..991aa7e 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.ContextualSearch.ContextualSearchGameClipsResult.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.ContextualSearch.ContextualSearchGameClipsResult.cpp
@@ -6,10 +6,10 @@ namespace winrt::Microsoft::Xbox::Services::ContextualSearch::implementation
 {
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::ContextualSearch::ContextualSearchGameClipsResult> ContextualSearchGameClipsResult::GetNextAsync(uint32_t maxItems)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::ContextualSearch::ContextualSearchGameClip> ContextualSearchGameClipsResult::Items()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.ContextualSearch.ContextualSearchService.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.ContextualSearch.ContextualSearchService.cpp
index 2804875..18f036e 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.ContextualSearch.ContextualSearchService.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.ContextualSearch.ContextualSearchService.cpp
@@ -6,26 +6,26 @@ namespace winrt::Microsoft::Xbox::Services::ContextualSearch::implementation
 {
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::ContextualSearch::ContextualSearchConfiguredStat>> ContextualSearchService::GetConfigurationAsync(uint32_t titleId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::ContextualSearch::ContextualSearchBroadcast>> ContextualSearchService::GetBroadcastsAsync(uint32_t titleId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::ContextualSearch::ContextualSearchBroadcast>> ContextualSearchService::GetBroadcastsAsync(uint32_t titleId, uint32_t skipItems, uint32_t maxItems, hstring orderByStatName, bool orderAscending, hstring searchQuery)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::ContextualSearch::ContextualSearchBroadcast>> ContextualSearchService::GetBroadcastsAsync(uint32_t titleId, uint32_t skipItems, uint32_t maxItems, hstring orderByStatName, bool orderAscending, hstring filterStatName, winrt::Microsoft::Xbox::Services::ContextualSearch::ContextualSearchFilterOperator filterOperator, hstring filterStatValue)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::ContextualSearch::ContextualSearchGameClipsResult> ContextualSearchService::GetGameClipsAsync(uint32_t titleId, uint32_t skipItems, uint32_t maxItems, hstring orderByStatName, bool orderAscending, hstring filterStatName, winrt::Microsoft::Xbox::Services::ContextualSearch::ContextualSearchFilterOperator filterOperator, hstring filterStatValue)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::ContextualSearch::ContextualSearchGameClipsResult> ContextualSearchService::GetGameClipsAsync(uint32_t titleId, uint32_t skipItems, uint32_t maxItems, hstring orderByStatName, bool orderAscending, hstring searchQuery)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.EntertainmentProfile.EntertainmentProfileListContainsItemResult.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.EntertainmentProfile.EntertainmentProfileListContainsItemResult.cpp
index a206068..d7db672 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.EntertainmentProfile.EntertainmentProfileListContainsItemResult.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.EntertainmentProfile.EntertainmentProfileListContainsItemResult.cpp
@@ -6,14 +6,14 @@ namespace winrt::Microsoft::Xbox::Services::EntertainmentProfile::implementation
 {
     bool EntertainmentProfileListContainsItemResult::IsContained()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring EntertainmentProfileListContainsItemResult::ProviderId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring EntertainmentProfileListContainsItemResult::Provider()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.EntertainmentProfile.EntertainmentProfileListService.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.EntertainmentProfile.EntertainmentProfileListService.cpp
index 11884ec..a712bf1 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.EntertainmentProfile.EntertainmentProfileListService.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.EntertainmentProfile.EntertainmentProfileListService.cpp
@@ -7,6 +7,6 @@ namespace winrt::Microsoft::Xbox::Services::EntertainmentProfile::implementation
 {
     winrt::Microsoft::Xbox::Services::EntertainmentProfile::EntertainmentProfileListXboxOnePins EntertainmentProfileListService::XboxOnePins()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.EntertainmentProfile.EntertainmentProfileListXboxOnePins.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.EntertainmentProfile.EntertainmentProfileListXboxOnePins.cpp
index d6e8dae..b482ebf 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.EntertainmentProfile.EntertainmentProfileListXboxOnePins.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.EntertainmentProfile.EntertainmentProfileListXboxOnePins.cpp
@@ -7,14 +7,14 @@ namespace winrt::Microsoft::Xbox::Services::EntertainmentProfile::implementation
 {
     winrt::Windows::Foundation::IAsyncAction EntertainmentProfileListXboxOnePins::AddItemAsync(winrt::Microsoft::Xbox::Services::Marketplace::MediaItemType itemType, hstring providerId, hstring provider, winrt::Windows::Foundation::Uri imageUrl, winrt::Windows::Foundation::Uri providerLogoImageUrl, hstring title, hstring subTitle, hstring locale)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction EntertainmentProfileListXboxOnePins::RemoveItemAsync(hstring providerId, hstring provider)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::EntertainmentProfile::EntertainmentProfileListContainsItemResult> EntertainmentProfileListXboxOnePins::ContainsItemAsync(hstring providerId, hstring provider)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.GameServerPlatform.AllocationResult.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.GameServerPlatform.AllocationResult.cpp
index f4c524f..b42d1b3 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.GameServerPlatform.AllocationResult.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.GameServerPlatform.AllocationResult.cpp
@@ -7,26 +7,26 @@ namespace winrt::Microsoft::Xbox::Services::GameServerPlatform::implementation
 {
     winrt::Microsoft::Xbox::Services::GameServerPlatform::GameServerFulfillmentState AllocationResult::FulfillmentState()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring AllocationResult::HostName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring AllocationResult::SessionHostId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring AllocationResult::Region()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::GameServerPlatform::GameServerPortMapping> AllocationResult::PortMappings()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring AllocationResult::SecureDeviceAddress()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.GameServerPlatform.ClusterResult.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.GameServerPlatform.ClusterResult.cpp
index 388c7c9..1ec5795 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.GameServerPlatform.ClusterResult.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.GameServerPlatform.ClusterResult.cpp
@@ -7,26 +7,26 @@ namespace winrt::Microsoft::Xbox::Services::GameServerPlatform::implementation
 {
     winrt::Windows::Foundation::TimeSpan ClusterResult::PollInterval()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::GameServerPlatform::GameServerFulfillmentState ClusterResult::FulfillmentState()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring ClusterResult::HostName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring ClusterResult::Region()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::GameServerPlatform::GameServerPortMapping> ClusterResult::PortMappings()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring ClusterResult::SecureDeviceAddress()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.GameServerPlatform.GameServerImageSet.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.GameServerPlatform.GameServerImageSet.cpp
index 53726cb..73354bf 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.GameServerPlatform.GameServerImageSet.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.GameServerPlatform.GameServerImageSet.cpp
@@ -7,38 +7,38 @@ namespace winrt::Microsoft::Xbox::Services::GameServerPlatform::implementation
 {
     uint64_t GameServerImageSet::MinPlayers()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint64_t GameServerImageSet::MaxPlayers()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring GameServerImageSet::Id()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring GameServerImageSet::Name()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint64_t GameServerImageSet::SelectionOrder()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring GameServerImageSet::SchemaContent()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring GameServerImageSet::SchemaName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring GameServerImageSet::SchemaId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IMapView<hstring, hstring> GameServerImageSet::Tags()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.GameServerPlatform.GameServerMetadataResult.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.GameServerPlatform.GameServerMetadataResult.cpp
index f6bc7d8..a03ba8f 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.GameServerPlatform.GameServerMetadataResult.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.GameServerPlatform.GameServerMetadataResult.cpp
@@ -7,10 +7,10 @@ namespace winrt::Microsoft::Xbox::Services::GameServerPlatform::implementation
 {
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::GameServerPlatform::GameVariant> GameServerMetadataResult::GameVariants()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::GameServerPlatform::GameServerImageSet> GameServerMetadataResult::GameServerImageSets()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.GameServerPlatform.GameServerPlatformService.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.GameServerPlatform.GameServerPlatformService.cpp
index 8d11c52..5f71a62 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.GameServerPlatform.GameServerPlatformService.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.GameServerPlatform.GameServerPlatformService.cpp
@@ -7,34 +7,34 @@ namespace winrt::Microsoft::Xbox::Services::GameServerPlatform::implementation
 {
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::GameServerPlatform::ClusterResult> GameServerPlatformService::AllocateClusterAsync(uint32_t gameServerTitleId, hstring serviceConfigurationId, hstring sessionTemplateName, hstring sessionName, bool abortIfQueued)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::GameServerPlatform::ClusterResult> GameServerPlatformService::AllocateClusterInlineAsync(uint32_t gameServerTitleId, hstring serviceConfigurationId, hstring sandboxId, hstring ticketId, hstring gsiSetId, hstring gameVariantId, uint64_t maxAllowedPlayers, hstring location, bool abortIfQueued)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::GameServerPlatform::GameServerTicketStatus> GameServerPlatformService::GetTicketStatusAsync(uint32_t gameServerTitleId, hstring ticketId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::GameServerPlatform::GameServerMetadataResult> GameServerPlatformService::GetGameServerMetadataAsync(uint32_t titleId, uint32_t maxAllowedPlayers, bool publisherOnly, uint32_t maxVariants, hstring locale)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::GameServerPlatform::GameServerMetadataResult> GameServerPlatformService::GetGameServerMetadataAsync(uint32_t titleId, uint32_t maxAllowedPlayers, bool publisherOnly, uint32_t maxVariants, hstring locale, winrt::Windows::Foundation::Collections::IMapView<hstring, hstring> filterTags)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::GameServerPlatform::QualityOfServiceServer>> GameServerPlatformService::GetQualityOfServiceServersAsync()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::GameServerPlatform::AllocationResult> GameServerPlatformService::AllocateSessionHost(uint32_t gameServerTitleId, winrt::Windows::Foundation::Collections::IVectorView<hstring> locations, hstring sessionId, hstring cloudGameId, hstring gameModeId, hstring sessionCookie)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::GameServerPlatform::AllocationResult> GameServerPlatformService::GetSessionHostAllocationStatus(uint32_t gameServerTitleId, hstring sessionId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.GameServerPlatform.GameServerPortMapping.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.GameServerPlatform.GameServerPortMapping.cpp
index 1747031..345ff43 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.GameServerPlatform.GameServerPortMapping.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.GameServerPlatform.GameServerPortMapping.cpp
@@ -7,14 +7,14 @@ namespace winrt::Microsoft::Xbox::Services::GameServerPlatform::implementation
 {
     hstring GameServerPortMapping::PortName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t GameServerPortMapping::InternalPortNumber()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t GameServerPortMapping::ExternalPortNumber()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.GameServerPlatform.GameServerTicketStatus.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.GameServerPlatform.GameServerTicketStatus.cpp
index a029077..2e02926 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.GameServerPlatform.GameServerTicketStatus.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.GameServerPlatform.GameServerTicketStatus.cpp
@@ -7,42 +7,42 @@ namespace winrt::Microsoft::Xbox::Services::GameServerPlatform::implementation
 {
     hstring GameServerTicketStatus::TicketId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring GameServerTicketStatus::ClusterId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t GameServerTicketStatus::TitleId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring GameServerTicketStatus::HostName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::GameServerPlatform::GameServerHostStatus GameServerTicketStatus::Status()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring GameServerTicketStatus::Description()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring GameServerTicketStatus::SecureContext()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::GameServerPlatform::GameServerPortMapping> GameServerTicketStatus::PortMappings()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring GameServerTicketStatus::GameHostId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring GameServerTicketStatus::Region()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.GameServerPlatform.GameVariant.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.GameServerPlatform.GameVariant.cpp
index 8971471..b364acb 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.GameServerPlatform.GameVariant.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.GameServerPlatform.GameVariant.cpp
@@ -7,30 +7,30 @@ namespace winrt::Microsoft::Xbox::Services::GameServerPlatform::implementation
 {
     hstring GameVariant::Id()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring GameVariant::Name()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool GameVariant::IsPublisher()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint64_t GameVariant::Rank()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring GameVariant::SchemaContent()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring GameVariant::SchemaName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring GameVariant::SchemaId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.GameServerPlatform.QualityOfServiceServer.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.GameServerPlatform.QualityOfServiceServer.cpp
index d21981f..8496e9a 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.GameServerPlatform.QualityOfServiceServer.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.GameServerPlatform.QualityOfServiceServer.cpp
@@ -7,14 +7,14 @@ namespace winrt::Microsoft::Xbox::Services::GameServerPlatform::implementation
 {
     hstring QualityOfServiceServer::ServerFullQualifiedDomainName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring QualityOfServiceServer::SecureDeviceAddressBase64()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring QualityOfServiceServer::TargetLocation()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.HttpCallRequestMessage.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.HttpCallRequestMessage.cpp
index 900224a..0149c70 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.HttpCallRequestMessage.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.HttpCallRequestMessage.cpp
@@ -6,17 +6,17 @@ namespace winrt::Microsoft::Xbox::Services::implementation
 {
     hstring HttpCallRequestMessage::RequestMessageString()
     {
-        Logger::NotImplemented();
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     com_array<uint8_t> HttpCallRequestMessage::RequestMessageVector()
     {
-        Logger::NotImplemented();
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::HttpRequestMessageType HttpCallRequestMessage::GetHttpRequestMessageType()
     {
-        Logger::NotImplemented();
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Leaderboard.LeaderboardColumn.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Leaderboard.LeaderboardColumn.cpp
index f2f7a04..cc7217f 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Leaderboard.LeaderboardColumn.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Leaderboard.LeaderboardColumn.cpp
@@ -7,14 +7,14 @@ namespace winrt::Microsoft::Xbox::Services::Leaderboard::implementation
 {
     hstring LeaderboardColumn::DisplayName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring LeaderboardColumn::StatisticName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::PropertyType LeaderboardColumn::StatisticType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Leaderboard.LeaderboardQuery.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Leaderboard.LeaderboardQuery.cpp
index cddd13f..4b807cd 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Leaderboard.LeaderboardQuery.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Leaderboard.LeaderboardQuery.cpp
@@ -7,54 +7,54 @@ namespace winrt::Microsoft::Xbox::Services::Leaderboard::implementation
 {
     bool LeaderboardQuery::SkipResultToMe()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void LeaderboardQuery::SkipResultToMe(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t LeaderboardQuery::SkipResultToRank()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void LeaderboardQuery::SkipResultToRank(uint32_t value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t LeaderboardQuery::MaxItems()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void LeaderboardQuery::MaxItems(uint32_t value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Leaderboard::SortOrder LeaderboardQuery::Order()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void LeaderboardQuery::Order(winrt::Microsoft::Xbox::Services::Leaderboard::SortOrder const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint64_t LeaderboardQuery::CallbackId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void LeaderboardQuery::CallbackId(uint64_t value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring LeaderboardQuery::StatName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring LeaderboardQuery::SocialGroup()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool LeaderboardQuery::HasNext()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Leaderboard.LeaderboardResult.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Leaderboard.LeaderboardResult.cpp
index 790a691..eb9a24a 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Leaderboard.LeaderboardResult.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Leaderboard.LeaderboardResult.cpp
@@ -7,30 +7,30 @@ namespace winrt::Microsoft::Xbox::Services::Leaderboard::implementation
 {
     hstring LeaderboardResult::DisplayName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t LeaderboardResult::TotalRowCount()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Leaderboard::LeaderboardColumn> LeaderboardResult::Columns()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Leaderboard::LeaderboardRow> LeaderboardResult::Rows()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool LeaderboardResult::HasNext()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Leaderboard::LeaderboardResult> LeaderboardResult::GetNextAsync(uint32_t maxItems)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Leaderboard::LeaderboardQuery LeaderboardResult::GetNextQuery()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Leaderboard.LeaderboardRow.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Leaderboard.LeaderboardRow.cpp
index 533bfd3..1b2c66f 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Leaderboard.LeaderboardRow.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Leaderboard.LeaderboardRow.cpp
@@ -7,22 +7,22 @@ namespace winrt::Microsoft::Xbox::Services::Leaderboard::implementation
 {
     hstring LeaderboardRow::Gamertag()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring LeaderboardRow::XboxUserId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     double LeaderboardRow::Percentile()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t LeaderboardRow::Rank()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<hstring> LeaderboardRow::Values()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Leaderboard.LeaderboardService.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Leaderboard.LeaderboardService.cpp
index fd3b67d..d7b528f 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Leaderboard.LeaderboardService.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Leaderboard.LeaderboardService.cpp
@@ -7,66 +7,66 @@ namespace winrt::Microsoft::Xbox::Services::Leaderboard::implementation
 {
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Leaderboard::LeaderboardResult> LeaderboardService::GetLeaderboardAsync(hstring serviceConfigurationId, hstring leaderboardName)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Leaderboard::LeaderboardResult> LeaderboardService::GetLeaderboardAsync(hstring serviceConfigurationId, hstring leaderboardName, uint32_t skipToRank, uint32_t maxItems)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Leaderboard::LeaderboardResult> LeaderboardService::GetLeaderboardAsync(hstring serviceConfigurationId, hstring leaderboardName, hstring xuid, hstring socialGroup, uint32_t maxItems)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Leaderboard::LeaderboardResult> LeaderboardService::GetLeaderboardAsync(hstring serviceConfigurationId, hstring leaderboardName, hstring xuid, hstring socialGroup, uint32_t skipToRank, uint32_t maxItems)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Leaderboard::LeaderboardResult> LeaderboardService::GetLeaderboardWithAdditionalColumnsAsync(hstring serviceConfigurationId, hstring leaderboardName, winrt::Windows::Foundation::Collections::IVectorView<hstring> additionalColumns)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Leaderboard::LeaderboardResult> LeaderboardService::GetLeaderboardWithAdditionalColumnsAsync(hstring serviceConfigurationId, hstring leaderboardName, hstring xuid, hstring socialGroup, winrt::Windows::Foundation::Collections::IVectorView<hstring> additionalColumns, uint32_t maxItems)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Leaderboard::LeaderboardResult> LeaderboardService::GetLeaderboardWithAdditionalColumnsAsync(hstring serviceConfigurationId, hstring leaderboardName, uint32_t skipToRank, winrt::Windows::Foundation::Collections::IVectorView<hstring> additionalColumns, uint32_t maxItems)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Leaderboard::LeaderboardResult> LeaderboardService::GetLeaderboardWithAdditionalColumnsAsync(hstring serviceConfigurationId, hstring leaderboardName, hstring xuid, hstring socialGroup, uint32_t skipToRank, winrt::Windows::Foundation::Collections::IVectorView<hstring> additionalColumns, uint32_t maxItems)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Leaderboard::LeaderboardResult> LeaderboardService::GetLeaderboardWithSkipToUserAsync(hstring serviceConfigurationId, hstring leaderboardName, hstring skipToXboxUserId, uint32_t maxItems)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Leaderboard::LeaderboardResult> LeaderboardService::GetLeaderboardWithSkipToUserAsync(hstring serviceConfigurationId, hstring leaderboardName, hstring xuid, hstring socialGroup, hstring skipToXboxUserId, uint32_t maxItems)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Leaderboard::LeaderboardResult> LeaderboardService::GetLeaderboardWithSkipToUserWithAdditionalColumnsAsync(hstring serviceConfigurationId, hstring leaderboardName, hstring skipToXboxUserId, winrt::Windows::Foundation::Collections::IVectorView<hstring> additionalColumns, uint32_t maxItems)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Leaderboard::LeaderboardResult> LeaderboardService::GetLeaderboardWithSkipToUserWithAdditionalColumnsAsync(hstring serviceConfigurationId, hstring leaderboardName, hstring xuid, hstring socialGroup, hstring skipToXboxUserId, winrt::Windows::Foundation::Collections::IVectorView<hstring> additionalColumns, uint32_t maxItems)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Leaderboard::LeaderboardResult> LeaderboardService::GetLeaderboardForSocialGroupAsync(hstring xboxUserId, hstring serviceConfigurationId, hstring statisticName, hstring socialGroup, uint32_t maxItems)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Leaderboard::LeaderboardResult> LeaderboardService::GetLeaderboardForSocialGroupAsync(hstring xboxUserId, hstring serviceConfigurationId, hstring statisticName, hstring socialGroup, hstring sortOrder, uint32_t maxItems)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Leaderboard::LeaderboardResult> LeaderboardService::GetLeaderboardForSocialGroupWithSkipToRankAsync(hstring xboxUserId, hstring serviceConfigurationId, hstring statisticName, hstring socialGroup, uint32_t skipToRank, hstring sortOrder, uint32_t maxItems)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Leaderboard::LeaderboardResult> LeaderboardService::GetLeaderboardForSocialGroupWithSkipToUserAsync(hstring xboxUserId, hstring serviceConfigurationId, hstring statisticName, hstring socialGroup, hstring skipToXboxUserId, hstring sortOrder, uint32_t maxItems)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.BrowseCatalogResult.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.BrowseCatalogResult.cpp
index ea86b6a..aa3af0f 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.BrowseCatalogResult.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.BrowseCatalogResult.cpp
@@ -7,18 +7,18 @@ namespace winrt::Microsoft::Xbox::Services::Marketplace::implementation
 {
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Marketplace::CatalogItem> BrowseCatalogResult::Items()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t BrowseCatalogResult::TotalCount()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Marketplace::BrowseCatalogResult> BrowseCatalogResult::GetNextAsync(uint32_t maxItems)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool BrowseCatalogResult::HasNext()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.CatalogItem.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.CatalogItem.cpp
index 0753af8..6cdb8ea 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.CatalogItem.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.CatalogItem.cpp
@@ -7,50 +7,50 @@ namespace winrt::Microsoft::Xbox::Services::Marketplace::implementation
 {
     winrt::Microsoft::Xbox::Services::Marketplace::MediaItemType CatalogItem::MediaItemType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring CatalogItem::Id()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring CatalogItem::Name()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring CatalogItem::ReducedName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t CatalogItem::TitleId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime CatalogItem::ReleaseDate()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring CatalogItem::ProductId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring CatalogItem::SandboxId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool CatalogItem::IsBundle()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool CatalogItem::IsPartOfAnyBundle()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Marketplace::CatalogItemImage> CatalogItem::Images()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<hstring> CatalogItem::AvailabilityContentIds()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.CatalogItemAvailability.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.CatalogItemAvailability.cpp
index ffda7a2..b94aa9a 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.CatalogItemAvailability.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.CatalogItemAvailability.cpp
@@ -7,66 +7,66 @@ namespace winrt::Microsoft::Xbox::Services::Marketplace::implementation
 {
     hstring CatalogItemAvailability::ContentId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<hstring> CatalogItemAvailability::AcceptablePaymentInstrumentTypes()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring CatalogItemAvailability::AvailabilityTitle()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring CatalogItemAvailability::AvailabilityDescription()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring CatalogItemAvailability::CurrencyCode()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring CatalogItemAvailability::DisplayPrice()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring CatalogItemAvailability::DisplayListPrice()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring CatalogItemAvailability::DistributionType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool CatalogItemAvailability::IsPurchasable()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     double CatalogItemAvailability::ListPrice()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     double CatalogItemAvailability::Price()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t CatalogItemAvailability::ConsumableQuantity()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring CatalogItemAvailability::PromotionalText()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring CatalogItemAvailability::SignedOffer()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring CatalogItemAvailability::OfferId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring CatalogItemAvailability::OfferDisplayDataJson()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.CatalogItemDetails.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.CatalogItemDetails.cpp
index 1bb4150..337771f 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.CatalogItemDetails.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.CatalogItemDetails.cpp
@@ -7,54 +7,54 @@ namespace winrt::Microsoft::Xbox::Services::Marketplace::implementation
 {
     winrt::Microsoft::Xbox::Services::Marketplace::MediaItemType CatalogItemDetails::MediaItemType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring CatalogItemDetails::Id()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring CatalogItemDetails::Name()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring CatalogItemDetails::ReducedName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring CatalogItemDetails::Description()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t CatalogItemDetails::TitleId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime CatalogItemDetails::ReleaseDate()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring CatalogItemDetails::ProductId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring CatalogItemDetails::SandboxId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool CatalogItemDetails::IsBundle()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool CatalogItemDetails::IsPartOfAnyBundle()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Marketplace::CatalogItemImage> CatalogItemDetails::Images()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Marketplace::CatalogItemAvailability> CatalogItemDetails::Availabilities()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.CatalogItemImage.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.CatalogItemImage.cpp
index 3382039..b2360b5 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.CatalogItemImage.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.CatalogItemImage.cpp
@@ -7,26 +7,26 @@ namespace winrt::Microsoft::Xbox::Services::Marketplace::implementation
 {
     hstring CatalogItemImage::Id()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Uri CatalogItemImage::ResizeUrl()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<hstring> CatalogItemImage::Purposes()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring CatalogItemImage::Purpose()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t CatalogItemImage::Height()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t CatalogItemImage::Width()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.CatalogService.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.CatalogService.cpp
index d05c740..e718c60 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.CatalogService.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.CatalogService.cpp
@@ -7,14 +7,14 @@ namespace winrt::Microsoft::Xbox::Services::Marketplace::implementation
 {
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Marketplace::BrowseCatalogResult> CatalogService::BrowseCatalogAsync(hstring parentId, winrt::Microsoft::Xbox::Services::Marketplace::MediaItemType parentMediaType, winrt::Microsoft::Xbox::Services::Marketplace::MediaItemType childMediaType, winrt::Microsoft::Xbox::Services::Marketplace::CatalogSortOrder orderBy, uint32_t skipItems, uint32_t maxItems)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Marketplace::BrowseCatalogResult> CatalogService::BrowseCatalogBundlesAsync(hstring parentId, winrt::Microsoft::Xbox::Services::Marketplace::MediaItemType parentMediaType, hstring productId, winrt::Microsoft::Xbox::Services::Marketplace::BundleRelationshipType relationship, uint32_t skipItems, uint32_t maxItems)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Marketplace::CatalogItemDetails>> CatalogService::GetCatalogItemDetailsAsync(winrt::Windows::Foundation::Collections::IVectorView<hstring> productIds)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.ConsumeInventoryItemResult.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.ConsumeInventoryItemResult.cpp
index 0d72b49..8f93af0 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.ConsumeInventoryItemResult.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.ConsumeInventoryItemResult.cpp
@@ -7,14 +7,14 @@ namespace winrt::Microsoft::Xbox::Services::Marketplace::implementation
 {
     winrt::Windows::Foundation::Uri ConsumeInventoryItemResult::ConsumableUrl()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t ConsumeInventoryItemResult::ConsumableBalance()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring ConsumeInventoryItemResult::TransactionId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.InventoryItem.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.InventoryItem.cpp
index ba79ea6..1f52c63 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.InventoryItem.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.InventoryItem.cpp
@@ -7,54 +7,54 @@ namespace winrt::Microsoft::Xbox::Services::Marketplace::implementation
 {
     winrt::Windows::Foundation::Uri InventoryItem::Url()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Marketplace::InventoryItemState InventoryItem::InventoryItemState()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Marketplace::MediaItemType InventoryItem::MediaItemType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring InventoryItem::ProductId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t InventoryItem::TitleId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<hstring> InventoryItem::ContainerIds()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime InventoryItem::RightsObtainedDate()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime InventoryItem::StartDate()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime InventoryItem::EndDate()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Uri InventoryItem::ConsumableUrl()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t InventoryItem::ConsumableBalance()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool InventoryItem::IsTrialEntitlement()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan InventoryItem::TrialTimeRemaining()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.InventoryItemsResult.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.InventoryItemsResult.cpp
index 74ab116..563d508 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.InventoryItemsResult.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.InventoryItemsResult.cpp
@@ -7,18 +7,18 @@ namespace winrt::Microsoft::Xbox::Services::Marketplace::implementation
 {
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Marketplace::InventoryItem> InventoryItemsResult::Items()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t InventoryItemsResult::TotalItems()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Marketplace::InventoryItemsResult> InventoryItemsResult::GetNextAsync(uint32_t maxItems)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool InventoryItemsResult::HasNext()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.InventoryService.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.InventoryService.cpp
index d05eb52..b8eedc6 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.InventoryService.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Marketplace.InventoryService.cpp
@@ -7,50 +7,50 @@ namespace winrt::Microsoft::Xbox::Services::Marketplace::implementation
 {
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Marketplace::InventoryItemsResult> InventoryService::GetInventoryItemsAsync(winrt::Microsoft::Xbox::Services::Marketplace::MediaItemType mediaItemType)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Marketplace::InventoryItemsResult> InventoryService::GetInventoryItemsAsync(winrt::Windows::Foundation::Collections::IVectorView<hstring> productIds, bool expandSatisfyingEntitlements)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Marketplace::InventoryItemsResult> InventoryService::GetInventoryItemsAsync(winrt::Microsoft::Xbox::Services::Marketplace::MediaItemType mediaItemType, bool expandSatisfyingEntitlements, bool includeAllItemStatesAndAvailabilities)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Marketplace::InventoryItemsResult> InventoryService::GetInventoryItemsAsync(winrt::Microsoft::Xbox::Services::Marketplace::MediaItemType mediaItemType, winrt::Microsoft::Xbox::Services::Marketplace::InventoryItemState inventoryItemState, winrt::Microsoft::Xbox::Services::Marketplace::InventoryItemAvailability inventoryItemAvailability, hstring inventoryItemContainerId, uint32_t maxItems)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Marketplace::InventoryItemsResult> InventoryService::GetInventoryItemsAsync(winrt::Microsoft::Xbox::Services::Marketplace::MediaItemType mediaItemType, winrt::Microsoft::Xbox::Services::Marketplace::InventoryItemState inventoryItemState, winrt::Microsoft::Xbox::Services::Marketplace::InventoryItemAvailability inventoryItemAvailability, hstring inventoryItemContainerId, uint32_t maxItems, bool expandSatisfyingEntitlements)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Marketplace::InventoryItemsResult> InventoryService::GetInventoryItemsForAllUsersAsync(winrt::Microsoft::Xbox::Services::Marketplace::MediaItemType mediaItemType)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Marketplace::InventoryItemsResult> InventoryService::GetInventoryItemsForAllUsersAsync(winrt::Microsoft::Xbox::Services::Marketplace::MediaItemType mediaItemType, bool expandSatisfyingEntitlements, bool includeAllItemStatesAndAvailabilities)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Marketplace::InventoryItemsResult> InventoryService::GetInventoryItemsForAllUsersAsync(winrt::Microsoft::Xbox::Services::Marketplace::MediaItemType mediaItemType, winrt::Microsoft::Xbox::Services::Marketplace::InventoryItemState inventoryItemState, winrt::Microsoft::Xbox::Services::Marketplace::InventoryItemAvailability inventoryItemAvailability, hstring inventoryItemContainerId, uint32_t maxItems)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Marketplace::InventoryItemsResult> InventoryService::GetInventoryItemsForAllUsersAsync(winrt::Microsoft::Xbox::Services::Marketplace::MediaItemType mediaItemType, winrt::Microsoft::Xbox::Services::Marketplace::InventoryItemState inventoryItemState, winrt::Microsoft::Xbox::Services::Marketplace::InventoryItemAvailability inventoryItemAvailability, hstring inventoryItemContainerId, uint32_t maxItems, bool expandSatisfyingEntitlements)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Marketplace::InventoryItemsResult> InventoryService::GetInventoryItemsForAllUsersAsync(winrt::Windows::Foundation::Collections::IVectorView<hstring> productIds, bool expandSatisfyingEntitlements)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Marketplace::InventoryItem> InventoryService::GetInventoryItemAsync(winrt::Microsoft::Xbox::Services::Marketplace::InventoryItem inventoryItem)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Marketplace::ConsumeInventoryItemResult> InventoryService::ConsumeInventoryItemAsync(winrt::Microsoft::Xbox::Services::Marketplace::InventoryItem inventoryItem, uint32_t quantityToConsume, hstring transactionId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Matchmaking.CreateMatchTicketResponse.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Matchmaking.CreateMatchTicketResponse.cpp
index 156e621..1fca988 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Matchmaking.CreateMatchTicketResponse.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Matchmaking.CreateMatchTicketResponse.cpp
@@ -7,10 +7,10 @@ namespace winrt::Microsoft::Xbox::Services::Matchmaking::implementation
 {
     hstring CreateMatchTicketResponse::MatchTicketId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan CreateMatchTicketResponse::EstimatedWaitTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Matchmaking.HopperStatisticsResponse.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Matchmaking.HopperStatisticsResponse.cpp
index ac803fa..3f53b98 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Matchmaking.HopperStatisticsResponse.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Matchmaking.HopperStatisticsResponse.cpp
@@ -7,14 +7,14 @@ namespace winrt::Microsoft::Xbox::Services::Matchmaking::implementation
 {
     hstring HopperStatisticsResponse::HopperName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan HopperStatisticsResponse::EstimatedWaitTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t HopperStatisticsResponse::PlayersWaitingToMatch()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Matchmaking.MatchTicketDetailsResponse.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Matchmaking.MatchTicketDetailsResponse.cpp
index f1c9c8a..6d146f1 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Matchmaking.MatchTicketDetailsResponse.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Matchmaking.MatchTicketDetailsResponse.cpp
@@ -7,26 +7,26 @@ namespace winrt::Microsoft::Xbox::Services::Matchmaking::implementation
 {
     winrt::Microsoft::Xbox::Services::Matchmaking::TicketStatus MatchTicketDetailsResponse::MatchStatus()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan MatchTicketDetailsResponse::EstimatedWaitTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Matchmaking::PreserveSessionMode MatchTicketDetailsResponse::PreserveSession()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionReference MatchTicketDetailsResponse::TicketSession()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionReference MatchTicketDetailsResponse::TargetSession()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MatchTicketDetailsResponse::TicketAttributes()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Matchmaking.MatchmakingService.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Matchmaking.MatchmakingService.cpp
index bb50c4d..375bf08 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Matchmaking.MatchmakingService.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Matchmaking.MatchmakingService.cpp
@@ -7,18 +7,18 @@ namespace winrt::Microsoft::Xbox::Services::Matchmaking::implementation
 {
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Matchmaking::CreateMatchTicketResponse> MatchmakingService::CreateMatchTicketAsync(winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionReference ticketSessionReference, hstring matchmakingServiceConfigurationId, hstring hopperName, winrt::Windows::Foundation::TimeSpan ticketTimeout, winrt::Microsoft::Xbox::Services::Matchmaking::PreserveSessionMode preserveSession, hstring ticketAttributesJson)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction MatchmakingService::DeleteMatchTicketAsync(hstring serviceConfigurationId, hstring hopperName, hstring ticketId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Matchmaking::MatchTicketDetailsResponse> MatchmakingService::GetMatchTicketDetailsAsync(hstring serviceConfigurationId, hstring hopperName, hstring ticketId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Matchmaking::HopperStatisticsResponse> MatchmakingService::GetHopperStatisticsAsync(hstring serviceConfigurationId, hstring hopperName)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.FindMatchCompletedEventArgs.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.FindMatchCompletedEventArgs.cpp
index 985512f..196fd20 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.FindMatchCompletedEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.FindMatchCompletedEventArgs.cpp
@@ -7,10 +7,10 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::Manager::implementation
 {
     winrt::Microsoft::Xbox::Services::Multiplayer::Manager::MatchStatus FindMatchCompletedEventArgs::MatchStatus()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerMeasurementFailure FindMatchCompletedEventArgs::InitializationFailureCause()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.HostChangedEventArgs.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.HostChangedEventArgs.cpp
index 5aa16ee..a616bd3 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.HostChangedEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.HostChangedEventArgs.cpp
@@ -7,6 +7,6 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::Manager::implementation
 {
     winrt::Microsoft::Xbox::Services::Multiplayer::Manager::MultiplayerMember HostChangedEventArgs::HostMember()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.JoinLobbyCompletedEventArgs.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.JoinLobbyCompletedEventArgs.cpp
index 177bfc5..9a760e7 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.JoinLobbyCompletedEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.JoinLobbyCompletedEventArgs.cpp
@@ -7,6 +7,6 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::Manager::implementation
 {
     hstring JoinLobbyCompletedEventArgs::InvitedXboxUserId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.MemberJoinedEventArgs.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.MemberJoinedEventArgs.cpp
index 92cf0a4..e9cb024 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.MemberJoinedEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.MemberJoinedEventArgs.cpp
@@ -7,6 +7,6 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::Manager::implementation
 {
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Multiplayer::Manager::MultiplayerMember> MemberJoinedEventArgs::Members()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.MemberLeftEventArgs.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.MemberLeftEventArgs.cpp
index 857674e..8f3d071 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.MemberLeftEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.MemberLeftEventArgs.cpp
@@ -7,6 +7,6 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::Manager::implementation
 {
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Multiplayer::Manager::MultiplayerMember> MemberLeftEventArgs::Members()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.MemberPropertyChangedEventArgs.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.MemberPropertyChangedEventArgs.cpp
index d2fd739..cd3d081 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.MemberPropertyChangedEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.MemberPropertyChangedEventArgs.cpp
@@ -7,10 +7,10 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::Manager::implementation
 {
     winrt::Microsoft::Xbox::Services::Multiplayer::Manager::MultiplayerMember MemberPropertyChangedEventArgs::Member()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MemberPropertyChangedEventArgs::Properties()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.MultiplayerEvent.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.MultiplayerEvent.cpp
index 794c432..a62211f 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.MultiplayerEvent.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.MultiplayerEvent.cpp
@@ -7,26 +7,26 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::Manager::implementation
 {
     int32_t MultiplayerEvent::ErrorCode()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerEvent::ErrorMessage()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IInspectable MultiplayerEvent::Context()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::Manager::MultiplayerEventType MultiplayerEvent::EventType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::Manager::MultiplayerEventArgs MultiplayerEvent::EventArgs()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::Manager::MultiplayerSessionType MultiplayerEvent::SessionType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.MultiplayerGameSession.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.MultiplayerGameSession.cpp
index 98a3023..798cabf 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.MultiplayerGameSession.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.MultiplayerGameSession.cpp
@@ -7,50 +7,50 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::Manager::implementation
 {
     hstring MultiplayerGameSession::CorrelationId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionReference MultiplayerGameSession::SessionReference()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Multiplayer::Manager::MultiplayerMember> MultiplayerGameSession::Members()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::Manager::MultiplayerMember MultiplayerGameSession::Host()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerGameSession::Properties()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionConstants MultiplayerGameSession::SessionConstants()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IMapView<hstring, winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionReference> MultiplayerGameSession::TournamentTeams()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IMapView<hstring, winrt::Microsoft::Xbox::Services::Tournaments::TournamentTeamResult> MultiplayerGameSession::TournamentTeamResults()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerGameSession::IsHost(hstring const& xboxUserId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerGameSession::SetProperties(hstring const& name, hstring const& valueJson, winrt::Windows::Foundation::IInspectable const& context)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerGameSession::SetSynchronizedProperties(hstring const& name, hstring const& valueJson, winrt::Windows::Foundation::IInspectable const& context)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerGameSession::SetSynchronizedHost(winrt::Microsoft::Xbox::Services::Multiplayer::Manager::MultiplayerMember const& gameHost, winrt::Windows::Foundation::IInspectable const& context)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.MultiplayerLobbySession.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.MultiplayerLobbySession.cpp
index fe22b42..8253e93 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.MultiplayerLobbySession.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.MultiplayerLobbySession.cpp
@@ -7,78 +7,78 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::Manager::implementation
 {
     hstring MultiplayerLobbySession::CorrelationId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionReference MultiplayerLobbySession::SessionReference()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Multiplayer::Manager::MultiplayerMember> MultiplayerLobbySession::LocalMembers()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Multiplayer::Manager::MultiplayerMember> MultiplayerLobbySession::Members()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::Manager::MultiplayerMember MultiplayerLobbySession::Host()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerLobbySession::Properties()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionConstants MultiplayerLobbySession::SessionConstants()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Tournaments::TournamentTeamResult MultiplayerLobbySession::LastTournamentTeamResult()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerLobbySession::AddLocalUser(winrt::Windows::Xbox::System::User const& user)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerLobbySession::RemoveLocalUser(winrt::Windows::Xbox::System::User const& user)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerLobbySession::SetLocalMemberProperties(winrt::Windows::Xbox::System::User const& user, hstring const& name, hstring const& valueJson, winrt::Windows::Foundation::IInspectable const& context)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerLobbySession::DeleteLocalMemberProperties(winrt::Windows::Xbox::System::User const& user, hstring const& name, winrt::Windows::Foundation::IInspectable const& context)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerLobbySession::SetLocalMemberConnectionAddress(winrt::Windows::Xbox::System::User const& user, hstring const& connectionAddress, winrt::Windows::Foundation::IInspectable const& context)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerLobbySession::IsHost(hstring const& xboxUserId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerLobbySession::SetProperties(hstring const& name, hstring const& valueJson, winrt::Windows::Foundation::IInspectable const& context)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerLobbySession::SetSynchronizedProperties(hstring const& name, hstring const& valueJson, winrt::Windows::Foundation::IInspectable const& context)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerLobbySession::SetSynchronizedHost(winrt::Microsoft::Xbox::Services::Multiplayer::Manager::MultiplayerMember const& gameHost, winrt::Windows::Foundation::IInspectable const& context)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerLobbySession::InviteFriends(winrt::Windows::Xbox::System::User const& user, hstring const& contextStringId, hstring const& customActivationContext)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerLobbySession::InviteUsers(winrt::Windows::Xbox::System::User const& user, winrt::Windows::Foundation::Collections::IVectorView<hstring> const& xboxUserIds, hstring const& contextStringId, hstring const& customActivationContext)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.MultiplayerManager.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.MultiplayerManager.cpp
index 2b51d66..71d41e0 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.MultiplayerManager.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.MultiplayerManager.cpp
@@ -7,94 +7,94 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::Manager::implementation
 {
     winrt::Microsoft::Xbox::Services::Multiplayer::Manager::MultiplayerManager MultiplayerManager::SingletonInstance()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerManager::Initialize(hstring const& lobbySessionTemplateName)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerManager::FindMatch(hstring const& hopperName, hstring const& attributes, winrt::Windows::Foundation::TimeSpan const& timeout)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerManager::CancelMatch()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerManager::JoinLobby(hstring const& handleId, winrt::Windows::Xbox::System::User const& user)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerManager::JoinLobby(hstring const& handleId, winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::System::User> const& users)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerManager::JoinLobby(winrt::Windows::ApplicationModel::Activation::IProtocolActivatedEventArgs const& eventArgs, winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::System::User> const& users)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerManager::JoinLobby(winrt::Windows::ApplicationModel::Activation::IProtocolActivatedEventArgs const& eventArgs, winrt::Windows::Xbox::System::User const& user)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerManager::InvitePartyToGame()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerManager::JoinGameFromLobby(hstring const& sessionTemplateName)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerManager::JoinGame(hstring const& sessionName, hstring const& sessionTemplateName)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerManager::JoinGame(hstring const& sessionName, hstring const& sessionTemplateName, winrt::Windows::Foundation::Collections::IVectorView<hstring> const& xboxUserIds)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerManager::LeaveGame()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Multiplayer::Manager::MultiplayerEvent> MultiplayerManager::DoWork()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::Manager::MatchStatus MultiplayerManager::MatchStatus()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan MultiplayerManager::EstimatedMatchWaitTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::Manager::MultiplayerLobbySession MultiplayerManager::LobbySession()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::Manager::MultiplayerGameSession MultiplayerManager::GameSession()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::Manager::Joinability MultiplayerManager::Joinability()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerManager::SetJoinInProgress(winrt::Microsoft::Xbox::Services::Multiplayer::Manager::Joinability const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerManager::AutoFillMembersDuringMatchmaking()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerManager::AutoFillMembersDuringMatchmaking(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerManager::SetQualityOfServiceMeasurements(winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerQualityOfServiceMeasurements> const& measurements)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.MultiplayerMember.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.MultiplayerMember.cpp
index 9b31667..8159ca3 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.MultiplayerMember.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.MultiplayerMember.cpp
@@ -7,50 +7,50 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::Manager::implementation
 {
     uint32_t MultiplayerMember::MemberId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerMember::TeamId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerMember::XboxUserId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerMember::DebugGamertag()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerMember::IsLocal()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerMember::IsInLobby()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerMember::IsInGame()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionMemberStatus MultiplayerMember::Status()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerMember::ConnectionAddress()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerMember::Properties()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerMember::IsMemberOnSameDevice(winrt::Microsoft::Xbox::Services::Multiplayer::Manager::MultiplayerMember const& member)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerMember::_DeviceToken()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.PerformQosMeasurementsEventArgs.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.PerformQosMeasurementsEventArgs.cpp
index 2f1a80e..a37d849 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.PerformQosMeasurementsEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.PerformQosMeasurementsEventArgs.cpp
@@ -7,6 +7,6 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::Manager::implementation
 {
     winrt::Windows::Foundation::Collections::IMapView<hstring, hstring> PerformQosMeasurementsEventArgs::AddressToDeviceTokens()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.SessionPropertyChangedEventArgs.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.SessionPropertyChangedEventArgs.cpp
index bd65eb6..59266dc 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.SessionPropertyChangedEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.SessionPropertyChangedEventArgs.cpp
@@ -7,6 +7,6 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::Manager::implementation
 {
     hstring SessionPropertyChangedEventArgs::Properties()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.TournamentGameSessionReadyEventArgs.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.TournamentGameSessionReadyEventArgs.cpp
index b760b69..9f5381f 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.TournamentGameSessionReadyEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.TournamentGameSessionReadyEventArgs.cpp
@@ -7,6 +7,6 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::Manager::implementation
 {
     winrt::Windows::Foundation::DateTime TournamentGameSessionReadyEventArgs::StartTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.TournamentRegistrationStateChangedEventArgs.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.TournamentRegistrationStateChangedEventArgs.cpp
index d6fd6a6..f1127bf 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.TournamentRegistrationStateChangedEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.TournamentRegistrationStateChangedEventArgs.cpp
@@ -7,10 +7,10 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::Manager::implementation
 {
     winrt::Microsoft::Xbox::Services::Tournaments::TournamentRegistrationState TournamentRegistrationStateChangedEventArgs::RegistrationState()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Tournaments::TournamentRegistrationReason TournamentRegistrationStateChangedEventArgs::RegistrationReason()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.UserAddedEventArgs.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.UserAddedEventArgs.cpp
index 1ad4a74..c7287ca 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.UserAddedEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.UserAddedEventArgs.cpp
@@ -7,6 +7,6 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::Manager::implementation
 {
     hstring UserAddedEventArgs::XboxUserId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.UserRemovedEventArgs.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.UserRemovedEventArgs.cpp
index 96ab0c2..92f742c 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.UserRemovedEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.Manager.UserRemovedEventArgs.cpp
@@ -7,6 +7,6 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::Manager::implementation
 {
     hstring UserRemovedEventArgs::XboxUserId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerActivityDetails.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerActivityDetails.cpp
index e3e719f..34efd1b 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerActivityDetails.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerActivityDetails.cpp
@@ -7,42 +7,42 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::implementation
 {
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionReference MultiplayerActivityDetails::SessionReference()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerActivityDetails::HandleId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t MultiplayerActivityDetails::TitleId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionVisibility MultiplayerActivityDetails::Visibility()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionRestriction MultiplayerActivityDetails::JoinRestriction()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerActivityDetails::Closed()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerActivityDetails::OwnerXboxUserId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t MultiplayerActivityDetails::MaxMembersCount()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t MultiplayerActivityDetails::MembersCount()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerActivityDetails::CustomSessionPropertiesJson()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerGetSessionsRequest.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerGetSessionsRequest.cpp
index 54dcf70..d1a6946 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerGetSessionsRequest.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerGetSessionsRequest.cpp
@@ -7,86 +7,86 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::implementation
 {
     MultiplayerGetSessionsRequest::MultiplayerGetSessionsRequest(hstring const& serviceConfigurationId, uint32_t maxItems)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerGetSessionsRequest::ServiceConfigurationId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t MultiplayerGetSessionsRequest::MaxItems()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerGetSessionsRequest::IncludePrivateSessions()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerGetSessionsRequest::IncludePrivateSessions(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerGetSessionsRequest::IncludeReservations()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerGetSessionsRequest::IncludeReservations(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerGetSessionsRequest::IncludeInactiveSessions()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerGetSessionsRequest::IncludeInactiveSessions(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerGetSessionsRequest::XboxUserIdFilter()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerGetSessionsRequest::XboxUserIdFilter(hstring const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<hstring> MultiplayerGetSessionsRequest::XboxUserIdsFilter()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerGetSessionsRequest::XboxUserIdsFilter(winrt::Windows::Foundation::Collections::IVectorView<hstring> const& xboxUserIds)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerGetSessionsRequest::KeywordFilter()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerGetSessionsRequest::KeywordFilter(hstring const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerGetSessionsRequest::SessionTemplateNameFilter()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerGetSessionsRequest::SessionTemplateNameFilter(hstring const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionVisibility MultiplayerGetSessionsRequest::VisibilityFilter()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerGetSessionsRequest::VisibilityFilter(winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionVisibility const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t MultiplayerGetSessionsRequest::ContractVersionFilter()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerGetSessionsRequest::ContractVersionFilter(uint32_t value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerManagedInitialization.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerManagedInitialization.cpp
index ee1cfd5..df163d1 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerManagedInitialization.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerManagedInitialization.cpp
@@ -7,26 +7,26 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::implementation
 {
     bool MultiplayerManagedInitialization::ManagedInitializationSet()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan MultiplayerManagedInitialization::JoinTimeout()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan MultiplayerManagedInitialization::MeasurementTimeout()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan MultiplayerManagedInitialization::EvaluationTimeout()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerManagedInitialization::AutoEvaluate()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t MultiplayerManagedInitialization::MembersNeededToStart()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerMemberInitialization.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerMemberInitialization.cpp
index a2db75c..1ce629e 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerMemberInitialization.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerMemberInitialization.cpp
@@ -7,26 +7,26 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::implementation
 {
     bool MultiplayerMemberInitialization::MemberInitializationSet()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan MultiplayerMemberInitialization::JoinTimeout()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan MultiplayerMemberInitialization::MeasurementTimeout()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan MultiplayerMemberInitialization::EvaluationTimeout()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerMemberInitialization::ExternalEvaluation()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t MultiplayerMemberInitialization::MembersNeededToStart()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerPeerToHostRequirements.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerPeerToHostRequirements.cpp
index 8d33f4b..dd8527b 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerPeerToHostRequirements.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerPeerToHostRequirements.cpp
@@ -7,18 +7,18 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::implementation
 {
     winrt::Windows::Foundation::TimeSpan MultiplayerPeerToHostRequirements::LatencyMaximum()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint64_t MultiplayerPeerToHostRequirements::BandwidthDownMinimumInKilobitsPerSecond()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint64_t MultiplayerPeerToHostRequirements::BandwidthUpMinimumInKilobitsPerSecond()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayMetrics MultiplayerPeerToHostRequirements::HostSelectionMetric()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerPeerToPeerRequirements.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerPeerToPeerRequirements.cpp
index 6d2495f..3910972 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerPeerToPeerRequirements.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerPeerToPeerRequirements.cpp
@@ -7,10 +7,10 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::implementation
 {
     winrt::Windows::Foundation::TimeSpan MultiplayerPeerToPeerRequirements::LatencyMaximum()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint64_t MultiplayerPeerToPeerRequirements::BandwidthMinimumInKilobitsPerSecond()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerQualityOfServiceMeasurements.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerQualityOfServiceMeasurements.cpp
index a7eb1ff..552f0de 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerQualityOfServiceMeasurements.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerQualityOfServiceMeasurements.cpp
@@ -7,26 +7,26 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::implementation
 {
     MultiplayerQualityOfServiceMeasurements::MultiplayerQualityOfServiceMeasurements(hstring const& memberDeviceToken, winrt::Windows::Foundation::TimeSpan const& latency, uint64_t bandwidthDownInKilobitsPerSecond, uint64_t bandwidthUpInKilobitsPerSecond, hstring const& customJson)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerQualityOfServiceMeasurements::MemberDeviceToken()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan MultiplayerQualityOfServiceMeasurements::Latency()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint64_t MultiplayerQualityOfServiceMeasurements::BandwidthDownInKilobitsPerSecond()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint64_t MultiplayerQualityOfServiceMeasurements::BandwidthUpInKilobitsPerSecond()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerQualityOfServiceMeasurements::CustomJson()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerQuerySearchHandleRequest.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerQuerySearchHandleRequest.cpp
index 2a1b788..720207b 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerQuerySearchHandleRequest.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerQuerySearchHandleRequest.cpp
@@ -7,46 +7,46 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::implementation
 {
     MultiplayerQuerySearchHandleRequest::MultiplayerQuerySearchHandleRequest(hstring const& serviceConfigurationId, hstring const& sessionTemplateName)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerQuerySearchHandleRequest::ServiceConfigurationId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerQuerySearchHandleRequest::SessionTemplateName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerQuerySearchHandleRequest::OrderBy()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerQuerySearchHandleRequest::OrderBy(hstring const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerQuerySearchHandleRequest::OrderAscending()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerQuerySearchHandleRequest::OrderAscending(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerQuerySearchHandleRequest::SearchFilter()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerQuerySearchHandleRequest::SearchFilter(hstring const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerQuerySearchHandleRequest::SocialGroup()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerQuerySearchHandleRequest::SocialGroup(hstring const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerRoleInfo.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerRoleInfo.cpp
index 0b93e1d..fca3165 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerRoleInfo.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerRoleInfo.cpp
@@ -7,26 +7,26 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::implementation
 {
     winrt::Windows::Foundation::Collections::IVectorView<hstring> MultiplayerRoleInfo::MemberXboxUserIds()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t MultiplayerRoleInfo::MembersCount()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t MultiplayerRoleInfo::TargetCount()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerRoleInfo::TargetCount(uint32_t value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t MultiplayerRoleInfo::MaxMembersCount()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerRoleInfo::MaxMembersCount(uint32_t value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerRoleType.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerRoleType.cpp
index ab00763..0e70bdc 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerRoleType.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerRoleType.cpp
@@ -7,18 +7,18 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::implementation
 {
     bool MultiplayerRoleType::OwnerManaged()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Multiplayer::MutableRoleSetting> MultiplayerRoleType::MutableRoleSettings()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IMapView<hstring, winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerRoleInfo> MultiplayerRoleType::Roles()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerRoleType::Roles(winrt::Windows::Foundation::Collections::IMapView<hstring, winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerRoleInfo> const& roles)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSearchHandleDetails.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSearchHandleDetails.cpp
index 4e5d6d1..bb910fd 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSearchHandleDetails.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSearchHandleDetails.cpp
@@ -7,58 +7,58 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::implementation
 {
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionReference MultiplayerSearchHandleDetails::SessionReference()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerSearchHandleDetails::HandleId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<hstring> MultiplayerSearchHandleDetails::SessionOwnerXboxUserIds()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<hstring> MultiplayerSearchHandleDetails::Tags()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IMapView<hstring, double> MultiplayerSearchHandleDetails::NumbersMetadata()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IMapView<hstring, hstring> MultiplayerSearchHandleDetails::StringsMetadata()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IMapView<hstring, winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerRoleType> MultiplayerSearchHandleDetails::RoleTypes()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionVisibility MultiplayerSearchHandleDetails::Visibility()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionRestriction MultiplayerSearchHandleDetails::JoinRestriction()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerSearchHandleDetails::Closed()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t MultiplayerSearchHandleDetails::MaxMembersCount()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t MultiplayerSearchHandleDetails::MembersCount()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime MultiplayerSearchHandleDetails::HandleCreationTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerSearchHandleDetails::CustomSessionPropertiesJson()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSearchHandleRequest.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSearchHandleRequest.cpp
index 92159b5..2760420 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSearchHandleRequest.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSearchHandleRequest.cpp
@@ -7,34 +7,34 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::implementation
 {
     MultiplayerSearchHandleRequest::MultiplayerSearchHandleRequest(winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionReference const& sessionReference)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionReference MultiplayerSearchHandleRequest::SessionReference()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<hstring> MultiplayerSearchHandleRequest::Tags()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSearchHandleRequest::Tags(winrt::Windows::Foundation::Collections::IVectorView<hstring> const& tags)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IMapView<hstring, double> MultiplayerSearchHandleRequest::NumbersMetadata()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSearchHandleRequest::NumbersMetadata(winrt::Windows::Foundation::Collections::IMapView<hstring, double> const& metadata)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IMapView<hstring, hstring> MultiplayerSearchHandleRequest::StringsMetadata()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSearchHandleRequest::StringsMetadata(winrt::Windows::Foundation::Collections::IMapView<hstring, hstring> const& metadata)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerService.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerService.cpp
index ec6bc8a..1e71076 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerService.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerService.cpp
@@ -7,47 +7,47 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::implementation
 {
     winrt::event_token MultiplayerService::MultiplayerSessionChanged(winrt::Windows::Foundation::EventHandler<winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionChangeEventArgs> const& __param0)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerService::MultiplayerSessionChanged(winrt::event_token const& __param0) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token MultiplayerService::MultiplayerSubscriptionLost(winrt::Windows::Foundation::EventHandler<winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSubscriptionLostEventArgs> const& __param0)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerService::MultiplayerSubscriptionLost(winrt::event_token const& __param0) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSession> MultiplayerService::WriteSessionAsync(winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSession multiplayerSession, winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionWriteMode multiplayerSessionWriteMode)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Multiplayer::WriteSessionResult> MultiplayerService::TryWriteSessionAsync(winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSession multiplayerSession, winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionWriteMode multiplayerSessionWriteMode)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSession> MultiplayerService::WriteSessionByHandleAsync(winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSession multiplayerSession, winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionWriteMode multiplayerSessionWriteMode, hstring handleId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Multiplayer::WriteSessionResult> MultiplayerService::TryWriteSessionByHandleAsync(winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSession multiplayerSession, winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionWriteMode multiplayerSessionWriteMode, hstring handleId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSession> MultiplayerService::GetCurrentSessionAsync(winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionReference sessionReference)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSession> MultiplayerService::GetCurrentSessionByHandleAsync(hstring handleId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionStates>> MultiplayerService::GetSessionsAsync(winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerGetSessionsRequest getSessionsRequest)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionStates>> MultiplayerService::GetSessionsAsync(hstring serviceConfigurationId, hstring sessionTemplateNameFilter, hstring xboxUserIdFilter, hstring keywordFilter, winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionVisibility visibilityFilter, uint32_t contractVersionFilter, bool includePrivateSessions, bool includeReservations, bool includeInactiveSessions, uint32_t maxItems)
     {
@@ -55,62 +55,62 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::implementation
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionStates>> MultiplayerService::GetSessionsForUsersFilterAsync(hstring serviceConfigurationId, hstring sessionTemplateNameFilter, winrt::Windows::Foundation::Collections::IVectorView<hstring> xboxUserIdsFilter, hstring keywordFilter, winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionVisibility visibilityFilter, uint32_t contractVersionFilter, bool includePrivateSessions, bool includeReservations, bool includeInactiveSessions, uint32_t maxItems)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction MultiplayerService::SetActivityAsync(winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionReference sessionReference)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<hstring> MultiplayerService::SetTransferHandleAsync(winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionReference targetSessionReference, winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionReference originSessionReference)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction MultiplayerService::SetSearchHandleAsync(winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSearchHandleRequest searchHandleRequest)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction MultiplayerService::ClearActivityAsync(hstring serviceConfigurationId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction MultiplayerService::ClearSearchHandleAsync(hstring handleId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<hstring>> MultiplayerService::SendInvitesAsync(winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionReference sessionReference, winrt::Windows::Foundation::Collections::IVectorView<hstring> xboxUserIds, uint32_t titleId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<hstring>> MultiplayerService::SendInvitesAsync(winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionReference sessionReference, winrt::Windows::Foundation::Collections::IVectorView<hstring> xboxUserIds, uint32_t titleId, hstring contextStringId, hstring activationContext)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerActivityDetails>> MultiplayerService::GetActivitiesForSocialGroupAsync(hstring serviceConfigurationId, hstring socialGroupOwnerXboxUserId, hstring socialGroup)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerActivityDetails>> MultiplayerService::GetActivitiesForUsersAsync(hstring serviceConfigurationId, winrt::Windows::Foundation::Collections::IVectorView<hstring> xboxUserIds)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSearchHandleDetails>> MultiplayerService::GetSearchHandlesAsync(hstring serviceConfigurationId, hstring sessionTemplateName, hstring orderBy, bool orderAscending, hstring searchFilter)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSearchHandleDetails>> MultiplayerService::GetSearchHandlesAsync(winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerQuerySearchHandleRequest searchHandleRequest)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerService::EnableMultiplayerSubscriptions()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerService::DisableMultiplayerSubscriptions()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerService::MultiplayerSubscriptionsEnabled()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSession.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSession.cpp
index 9e584be..358ad27 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSession.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSession.cpp
@@ -7,302 +7,302 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::implementation
 {
     MultiplayerSession::MultiplayerSession(winrt::Microsoft::Xbox::Services::XboxLiveContext const& xboxLiveContext)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     MultiplayerSession::MultiplayerSession(winrt::Microsoft::Xbox::Services::XboxLiveContext const& xboxLiveContext, winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionReference const& multiplayerSessionReference, uint32_t maxMembersInSession, bool reserved, winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionVisibility const& multiplayerSessionVisibility, winrt::Windows::Foundation::Collections::IVectorView<hstring> const& initiatorXboxUserIds, hstring const& sessionCustomConstantsJson)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     MultiplayerSession::MultiplayerSession(winrt::Microsoft::Xbox::Services::XboxLiveContext const& xboxLiveContext, winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionReference const& multiplayerSessionReference, uint32_t maxMembersInSession, winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionVisibility const& multiplayerSessionVisibility, winrt::Windows::Foundation::Collections::IVectorView<hstring> const& initiatorXboxUserIds, hstring const& sessionCustomConstantsJson)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     MultiplayerSession::MultiplayerSession(winrt::Microsoft::Xbox::Services::XboxLiveContext const& xboxLiveContext, winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionReference const& multiplayerSessionReference)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionChangeTypes MultiplayerSession::CompareMultiplayerSessions(winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSession const& currentSession, winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSession const& oldSession)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::WriteSessionStatus MultiplayerSession::ConvertHttpStatusToWriteSessionStatus(int32_t httpStatusCode)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerSession::MultiplayerCorrelationId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerSession::SearchHandleId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Tournaments::TournamentArbitrationStatus MultiplayerSession::ArbitrationStatus()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime MultiplayerSession::StartTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime MultiplayerSession::DateOfNextTimer()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime MultiplayerSession::DateOfSession()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerInitializationStage MultiplayerSession::InitializationStage()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime MultiplayerSession::InitializingStageStartTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t MultiplayerSession::InitializingEpisode()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::WriteSessionStatus MultiplayerSession::WriteStatus()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<hstring> MultiplayerSession::HostCandidates()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionReference MultiplayerSession::SessionReference()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionConstants MultiplayerSession::SessionConstants()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionProperties MultiplayerSession::SessionProperties()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionRoleTypes MultiplayerSession::SessionRoleTypes()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionMember> MultiplayerSession::Members()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionMatchmakingServer MultiplayerSession::MatchmakingServer()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionTournamentsServer MultiplayerSession::TournamentsServer()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionArbitrationServer MultiplayerSession::ArbitrationServer()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t MultiplayerSession::MembersAccepted()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerSession::ServersJson()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::ServersJson(hstring const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerSession::ETag()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionChangeTypes MultiplayerSession::SubscribedChangeTypes()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionMember MultiplayerSession::CurrentUser()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerSession::Branch()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint64_t MultiplayerSession::ChangeNumber()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::AddMemberReservation(hstring const& xboxUserId, hstring const& memberCustomConstantsJson)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::AddMemberReservation(hstring const& xboxUserId, hstring const& memberCustomConstantsJson, bool initializeRequested)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionMember MultiplayerSession::Join()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionMember MultiplayerSession::Join(hstring const& memberCustomConstantsJson)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionMember MultiplayerSession::Join(hstring const& memberCustomConstantsJson, bool initializeRequested)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionMember MultiplayerSession::Join(hstring const& memberCustomConstantsJson, bool initializeRequested, bool joinWithActiveStatus)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::SetVisibility(winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionVisibility const& visibility)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::SetMaxMembersInSession(uint32_t maxMembersInSession)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::SetMutableRoleSettings(winrt::Windows::Foundation::Collections::IMapView<hstring, winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerRoleType> const& roleTypes)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::SetTimeouts(winrt::Windows::Foundation::TimeSpan const& memberReservedTimeout, winrt::Windows::Foundation::TimeSpan const& memberInactiveTimeout, winrt::Windows::Foundation::TimeSpan const& memberReadyTimeout, winrt::Windows::Foundation::TimeSpan const& sessionEmptyTimeout)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::SetArbitrationTimeouts(winrt::Windows::Foundation::TimeSpan const& arbitrationTimeout, winrt::Windows::Foundation::TimeSpan const& forfeitTimeout)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::SetQualityOfServiceConnectivityMetrics(bool enableLatencyMetric, bool enableBandwidthDownMetric, bool enableBandwidthUpMetric, bool enableCustomMetric)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::SetManagedInitialization(winrt::Windows::Foundation::TimeSpan const& joinTimeout, winrt::Windows::Foundation::TimeSpan const& measurementTimeout, winrt::Windows::Foundation::TimeSpan const& evaluationTimeout, bool autoEvalute, uint32_t membersNeededToStart)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::SetMemberInitialization(winrt::Windows::Foundation::TimeSpan const& joinTimeout, winrt::Windows::Foundation::TimeSpan const& measurementTimeout, winrt::Windows::Foundation::TimeSpan const& evaluationTimeout, bool autoEvalute, uint32_t membersNeededToStart)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::SetPeerToPeerRequirements(winrt::Windows::Foundation::TimeSpan const& latencyMaximum, uint32_t bandwidthMinimumInKilobitsPerSecond)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::SetPeerToHostRequirements(winrt::Windows::Foundation::TimeSpan const& latencyMaximum, uint32_t bandwidthDownMinimumInKilobitsPerSecond, uint32_t bandwidthUpMinimumInKilobitsPerSecond, winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayMetrics const& hostSelectionMetric)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::SetMeasurementServerAddresses(winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::GameServerPlatform::QualityOfServiceServer> const& measurementServerAddresses)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::SetCloudComputePackageJson(hstring const& sessionCloudComputePackageConstantsJson)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::SetSessionCapabilities(winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionCapabilities const& capabilities)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::SetInitializationStatus(bool initializationSucceeded)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::SetHostDeviceToken(hstring const& hostDeviceToken)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::SetMatchmakingServerConnectionPath(hstring const& serverConnectionPath)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::SetClosed(bool closed)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::SetLocked(bool locked)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::SetAllocateCloudCompute(bool allocateCloudCompute)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::SetMatchmakingResubmit(bool matchResubmit)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::SetServerConnectionStringCandidates(winrt::Windows::Foundation::Collections::IVectorView<hstring> const& serverConnectionStringCandidates)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::SetSessionChangeSubscription(winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionChangeTypes const& changeTypes)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::Leave()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::SetCurrentUserStatus(winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionMemberStatus const& status)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::SetCurrentUserSecureDeviceAddressBase64(hstring const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::SetCurrentUserRoleInfo(winrt::Windows::Foundation::Collections::IMapView<hstring, hstring> const& roles)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::SetCurrentUserMembersInGroup(winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionMember> const& membersInGroup)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::SetCurrentUserQualityOfServiceMeasurements(winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerQualityOfServiceMeasurements> const& measurements)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::SetCurrentUserQualityOfServiceServerMeasurementsJson(hstring const& valueJson)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::SetCurrentUserArbitrationResults(winrt::Windows::Foundation::Collections::IMapView<hstring, winrt::Microsoft::Xbox::Services::Tournaments::TournamentTeamResult> const& results)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::SetCurrentUserMemberCustomPropertyJson(hstring const& name, hstring const& valueJson)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::DeleteCurrentUserMemberCustomPropertyJson(hstring const& name)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::SetMatchmakingTargetSessionConstantsJson(hstring const& matchmakingTargetSessionConstants)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::SetSessionCustomPropertyJson(hstring const& name, hstring const& valueJson)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::DeleteSessionCustomPropertyJson(hstring const& name)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSession::_Init(winrt::Microsoft::Xbox::Services::XboxLiveContext const& xboxLiveContext, winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionReference const& multiplayerSessionReference, uint32_t maxMembersInSession, winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionVisibility const& multiplayerSessionVisibility, winrt::Windows::Foundation::Collections::IVectorView<hstring> const& initiatorXboxUserIds, hstring const& sessionCustomConstantsJson)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionArbitrationServer.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionArbitrationServer.cpp
index f049ef5..62af5f0 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionArbitrationServer.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionArbitrationServer.cpp
@@ -7,22 +7,22 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::implementation
 {
     winrt::Windows::Foundation::DateTime MultiplayerSessionArbitrationServer::ArbitrationStartTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Tournaments::TournamentArbitrationState MultiplayerSessionArbitrationServer::ResultState()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Tournaments::TournamentGameResultSource MultiplayerSessionArbitrationServer::ResultSource()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t MultiplayerSessionArbitrationServer::ResultConfidenceLevel()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IMapView<hstring, winrt::Microsoft::Xbox::Services::Tournaments::TournamentTeamResult> MultiplayerSessionArbitrationServer::Results()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionCapabilities.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionCapabilities.cpp
index d88cc6b..659980f 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionCapabilities.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionCapabilities.cpp
@@ -7,90 +7,90 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::implementation
 {
     bool MultiplayerSessionCapabilities::Connectivity()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSessionCapabilities::Connectivity(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerSessionCapabilities::SuppressPresenceActivityCheck()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSessionCapabilities::SuppressPresenceActivityCheck(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerSessionCapabilities::Gameplay()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSessionCapabilities::Gameplay(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerSessionCapabilities::Large()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSessionCapabilities::Large(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerSessionCapabilities::ConnectionRequiredForActiveMembers()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSessionCapabilities::ConnectionRequiredForActiveMembers(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerSessionCapabilities::UserAuthorizationStyle()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSessionCapabilities::UserAuthorizationStyle(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerSessionCapabilities::Crossplay()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSessionCapabilities::Crossplay(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerSessionCapabilities::Team()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSessionCapabilities::Team(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerSessionCapabilities::Arbitration()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSessionCapabilities::Arbitration(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerSessionCapabilities::Searchable()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSessionCapabilities::Searchable(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerSessionCapabilities::HasOwners()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSessionCapabilities::HasOwners(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionChangeEventArgs.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionChangeEventArgs.cpp
index 76bec36..5eef25d 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionChangeEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionChangeEventArgs.cpp
@@ -7,14 +7,14 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::implementation
 {
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionReference MultiplayerSessionChangeEventArgs::SessionReference()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerSessionChangeEventArgs::Branch()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint64_t MultiplayerSessionChangeEventArgs::ChangeNumber()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionConstants.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionConstants.cpp
index 0919c14..3c41f69 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionConstants.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionConstants.cpp
@@ -7,126 +7,126 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::implementation
 {
     uint32_t MultiplayerSessionConstants::MaxMembersInSession()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSessionConstants::MaxMembersInSession(uint32_t value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionVisibility MultiplayerSessionConstants::MultiplayerSessionVisibility()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSessionConstants::MultiplayerSessionVisibility(winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionVisibility const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<hstring> MultiplayerSessionConstants::InitiatorXboxUserIds()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerSessionConstants::CustomConstantsJson()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan MultiplayerSessionConstants::MemberReservationTimeout()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan MultiplayerSessionConstants::MemberInactiveTimeout()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan MultiplayerSessionConstants::MemberReadyTimeout()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan MultiplayerSessionConstants::SessionEmptyTimeout()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan MultiplayerSessionConstants::ArbitrationTimeout()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan MultiplayerSessionConstants::ForfeitTimeout()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerSessionConstants::CapabilitiesConnectivity()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerSessionConstants::CapabilitiesSuppressPresenceActivityCheck()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerSessionConstants::CapabilitiesGameplay()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerSessionConstants::CapabilitiesLarge()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerSessionConstants::CapabilitiesConnectionRequiredForActiveMember()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerSessionConstants::CapabilitiesCrossplay()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerSessionConstants::CapabilitiesUserAuthorizationStyle()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerSessionConstants::CapabilitiesTeam()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerSessionConstants::CapabilitiesSearchable()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerSessionConstants::CapabilitiesArbitration()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerSessionConstants::EnableMetricsLatency()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerSessionConstants::EnableMetricsBandwidthDown()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerSessionConstants::EnableMetricsBandwidthUp()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerSessionConstants::EnableMetricsCustom()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerManagedInitialization MultiplayerSessionConstants::ManagedInitialization()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerMemberInitialization MultiplayerSessionConstants::MemberInitialization()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerPeerToPeerRequirements MultiplayerSessionConstants::PeerToPeerRequirements()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerPeerToHostRequirements MultiplayerSessionConstants::PeerToHostRequirements()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerSessionConstants::MeasurementServerAddressesJson()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionMatchmakingServer.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionMatchmakingServer.cpp
index 59bc6d5..a4e1d3d 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionMatchmakingServer.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionMatchmakingServer.cpp
@@ -7,18 +7,18 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::implementation
 {
     winrt::Microsoft::Xbox::Services::Multiplayer::MatchmakingStatus MultiplayerSessionMatchmakingServer::Status()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerSessionMatchmakingServer::StatusDetails()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan MultiplayerSessionMatchmakingServer::TypicalWait()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionReference MultiplayerSessionMatchmakingServer::TargetSessionRef()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionMember.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionMember.cpp
index 64f9f60..04640c8 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionMember.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionMember.cpp
@@ -7,118 +7,118 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::implementation
 {
     uint32_t MultiplayerSessionMember::MemberId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerSessionMember::TeamId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerSessionMember::XboxUserId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerSessionMember::MemberCustomConstantsJson()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerSessionMember::SecureDeviceAddressBase64()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IMapView<hstring, hstring> MultiplayerSessionMember::Roles()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerSessionMember::MemberCustomPropertiesJson()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerSessionMember::Gamertag()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionMemberStatus MultiplayerSessionMember::Status()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerSessionMember::IsTurnAvailable()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerSessionMember::IsCurrentUser()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerSessionMember::InitializeRequested()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerSessionMember::MatchmakingResultServerMeasurementsJson()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerSessionMember::MemberServerMeasurementsJson()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVector<winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionMember> MultiplayerSessionMember::MembersInGroup()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVector<winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerQualityOfServiceMeasurements> MultiplayerSessionMember::MemberMeasurements()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerSessionMember::DeviceToken()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::NetworkAddressTranslationSetting MultiplayerSessionMember::Nat()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t MultiplayerSessionMember::ActiveTitleId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t MultiplayerSessionMember::InitializationEpisode()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime MultiplayerSessionMember::JoinTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerMeasurementFailure MultiplayerSessionMember::InitializationFailureCause()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionReference MultiplayerSessionMember::TournamentTeamSessionRef()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVector<hstring> MultiplayerSessionMember::Groups()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSessionMember::Groups(winrt::Windows::Foundation::Collections::IVector<hstring> const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVector<hstring> MultiplayerSessionMember::Encounters()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSessionMember::Encounters(winrt::Windows::Foundation::Collections::IVector<hstring> const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IMap<hstring, winrt::Microsoft::Xbox::Services::Tournaments::TournamentTeamResult> MultiplayerSessionMember::Results()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Tournaments::TournamentArbitrationStatus MultiplayerSessionMember::ArbitrationStatus()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionProperties.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionProperties.cpp
index 9b9ba1a..e3a5409 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionProperties.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionProperties.cpp
@@ -7,70 +7,70 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::implementation
 {
     winrt::Windows::Foundation::Collections::IVectorView<hstring> MultiplayerSessionProperties::Keywords()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSessionProperties::Keywords(winrt::Windows::Foundation::Collections::IVectorView<hstring> const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionRestriction MultiplayerSessionProperties::JoinRestriction()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSessionProperties::JoinRestriction(winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionRestriction const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionRestriction MultiplayerSessionProperties::ReadRestriction()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSessionProperties::ReadRestriction(winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionRestriction const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionMember> MultiplayerSessionProperties::TurnCollection()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiplayerSessionProperties::TurnCollection(winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionMember> const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerSessionProperties::MatchmakingTargetSessionConstantsJson()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerSessionProperties::SessionCustomPropertiesJson()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerSessionProperties::MatchmakingServerConnectionString()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<hstring> MultiplayerSessionProperties::ServerConnectionStringCandidates()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<uint32_t> MultiplayerSessionProperties::SessionOwnerIndices()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerSessionProperties::HostDeviceToken()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerSessionProperties::Closed()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerSessionProperties::Locked()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerSessionProperties::AllocateCloudCompute()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionReference.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionReference.cpp
index a53d31e..af52fde 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionReference.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionReference.cpp
@@ -7,26 +7,26 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::implementation
 {
     MultiplayerSessionReference::MultiplayerSessionReference(hstring const& serviceConfigurationId, hstring const& sessionTemplateName, hstring const& sessionName)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionReference MultiplayerSessionReference::ParseFromUriPath(hstring const& uriPath)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerSessionReference::ServiceConfigurationId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerSessionReference::SessionTemplateName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerSessionReference::SessionName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerSessionReference::ToUriPath()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionRoleTypes.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionRoleTypes.cpp
index 0b97d97..0801be3 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionRoleTypes.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionRoleTypes.cpp
@@ -7,6 +7,6 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::implementation
 {
     winrt::Windows::Foundation::Collections::IMapView<hstring, winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerRoleType> MultiplayerSessionRoleTypes::RoleTypes()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionStates.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionStates.cpp
index c3b8617..699e619 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionStates.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionStates.cpp
@@ -7,38 +7,38 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::implementation
 {
     winrt::Windows::Foundation::DateTime MultiplayerSessionStates::StartTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionReference MultiplayerSessionStates::SessionReference()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionStatus MultiplayerSessionStates::Status()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionVisibility MultiplayerSessionStates::Visibility()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiplayerSessionStates::IsMyTurn()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerSessionStates::XboxUserId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t MultiplayerSessionStates::AcceptedMemberCount()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionRestriction MultiplayerSessionStates::JoinRestriction()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<hstring> MultiplayerSessionStates::Keywords()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionTournamentsServer.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionTournamentsServer.cpp
index 5708b2d..8e2ab41 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionTournamentsServer.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionTournamentsServer.cpp
@@ -7,38 +7,38 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::implementation
 {
     winrt::Microsoft::Xbox::Services::Tournaments::TournamentReference MultiplayerSessionTournamentsServer::TournamentReference()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IMapView<hstring, winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionReference> MultiplayerSessionTournamentsServer::Teams()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Tournaments::TournamentRegistrationState MultiplayerSessionTournamentsServer::RegistrationState()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Tournaments::TournamentRegistrationReason MultiplayerSessionTournamentsServer::RegistrationReason()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime MultiplayerSessionTournamentsServer::NextGameStartTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionReference MultiplayerSessionTournamentsServer::NextGameSessionRef()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime MultiplayerSessionTournamentsServer::LastGameEndTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Tournaments::TournamentTeamResult MultiplayerSessionTournamentsServer::LastTeamResult()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Tournaments::TournamentGameResultSource MultiplayerSessionTournamentsServer::LastGameResultSource()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.WriteSessionResult.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.WriteSessionResult.cpp
index 49fdbfa..ee25b5d 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.WriteSessionResult.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Multiplayer.WriteSessionResult.cpp
@@ -7,14 +7,14 @@ namespace winrt::Microsoft::Xbox::Services::Multiplayer::implementation
 {
     bool WriteSessionResult::Succeeded()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSession WriteSessionResult::Session()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::WriteSessionStatus WriteSessionResult::Status()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.DevicePresenceChangeEventArgs.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.DevicePresenceChangeEventArgs.cpp
index e161a95..d55cfaf 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.DevicePresenceChangeEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.DevicePresenceChangeEventArgs.cpp
@@ -7,14 +7,14 @@ namespace winrt::Microsoft::Xbox::Services::Presence::implementation
 {
     hstring DevicePresenceChangeEventArgs::XboxUserId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Presence::PresenceDeviceType DevicePresenceChangeEventArgs::DeviceType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool DevicePresenceChangeEventArgs::IsUserLoggedOnDevice()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.DevicePresenceChangeSubscription.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.DevicePresenceChangeSubscription.cpp
index 3298739..2f9b9ae 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.DevicePresenceChangeSubscription.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.DevicePresenceChangeSubscription.cpp
@@ -7,18 +7,18 @@ namespace winrt::Microsoft::Xbox::Services::Presence::implementation
 {
     winrt::Microsoft::Xbox::Services::RealTimeActivity::RealTimeActivitySubscriptionState DevicePresenceChangeSubscription::State()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring DevicePresenceChangeSubscription::ResourceUri()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t DevicePresenceChangeSubscription::SubscriptionId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring DevicePresenceChangeSubscription::XboxUserId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.PresenceBroadcastRecord.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.PresenceBroadcastRecord.cpp
index 6ede238..1808112 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.PresenceBroadcastRecord.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.PresenceBroadcastRecord.cpp
@@ -7,22 +7,22 @@ namespace winrt::Microsoft::Xbox::Services::Presence::implementation
 {
     hstring PresenceBroadcastRecord::BroadcastId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring PresenceBroadcastRecord::Session()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring PresenceBroadcastRecord::Provider()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t PresenceBroadcastRecord::ViewerCount()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime PresenceBroadcastRecord::StartTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.PresenceData.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.PresenceData.cpp
index 621cde9..f529c69 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.PresenceData.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.PresenceData.cpp
@@ -11,18 +11,18 @@ namespace winrt::Microsoft::Xbox::Services::Presence::implementation
     }
     PresenceData::PresenceData(hstring const& serviceConfigurationId, hstring const& presenceId, winrt::Windows::Foundation::Collections::IVectorView<hstring> const& presenceTokenIds)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring PresenceData::ServiceConfigurationId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring PresenceData::PresenceId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<hstring> PresenceData::PresenceTokenIds()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.PresenceDeviceRecord.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.PresenceDeviceRecord.cpp
index df1882e..8c17875 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.PresenceDeviceRecord.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.PresenceDeviceRecord.cpp
@@ -7,10 +7,10 @@ namespace winrt::Microsoft::Xbox::Services::Presence::implementation
 {
     winrt::Microsoft::Xbox::Services::Presence::PresenceDeviceType PresenceDeviceRecord::DeviceType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Presence::PresenceTitleRecord> PresenceDeviceRecord::PresenceTitleRecords()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.PresenceMediaRecord.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.PresenceMediaRecord.cpp
index 47c2acc..8c08d9d 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.PresenceMediaRecord.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.PresenceMediaRecord.cpp
@@ -7,14 +7,14 @@ namespace winrt::Microsoft::Xbox::Services::Presence::implementation
 {
     hstring PresenceMediaRecord::MediaId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Presence::PresenceMediaIdType PresenceMediaRecord::MediaIdType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring PresenceMediaRecord::Name()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.PresenceRecord.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.PresenceRecord.cpp
index 6e7d19c..cebe6fc 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.PresenceRecord.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.PresenceRecord.cpp
@@ -7,18 +7,18 @@ namespace winrt::Microsoft::Xbox::Services::Presence::implementation
 {
     hstring PresenceRecord::XboxUserId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Presence::UserPresenceState PresenceRecord::UserState()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Presence::PresenceDeviceRecord> PresenceRecord::PresenceDeviceRecords()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool PresenceRecord::IsUserPlayingTitle(uint32_t titleId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.PresenceService.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.PresenceService.cpp
index a41c9c9..8e66c19 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.PresenceService.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.PresenceService.cpp
@@ -7,23 +7,23 @@ namespace winrt::Microsoft::Xbox::Services::Presence::implementation
 {
     winrt::event_token PresenceService::DevicePresenceChanged(winrt::Windows::Foundation::EventHandler<winrt::Microsoft::Xbox::Services::Presence::DevicePresenceChangeEventArgs> const& __param0)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void PresenceService::DevicePresenceChanged(winrt::event_token const& __param0) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token PresenceService::TitlePresenceChanged(winrt::Windows::Foundation::EventHandler<winrt::Microsoft::Xbox::Services::Presence::TitlePresenceChangeEventArgs> const& __param0)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void PresenceService::TitlePresenceChanged(winrt::event_token const& __param0) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction PresenceService::SetPresenceAsync(bool isUserActiveInTitle)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction PresenceService::SetPresenceAsync(bool isUserActiveInTitle, winrt::Microsoft::Xbox::Services::Presence::PresenceData presenceData)
     {
@@ -32,38 +32,38 @@ namespace winrt::Microsoft::Xbox::Services::Presence::implementation
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Presence::PresenceRecord> PresenceService::GetPresenceAsync(hstring xboxUserId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Presence::PresenceRecord>> PresenceService::GetPresenceForMultipleUsersAsync(winrt::Windows::Foundation::Collections::IVectorView<hstring> xboxUserIds)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Presence::PresenceRecord>> PresenceService::GetPresenceForMultipleUsersAsync(winrt::Windows::Foundation::Collections::IVectorView<hstring> xboxUserIds, winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Presence::PresenceDeviceType> deviceTypes, winrt::Windows::Foundation::Collections::IVectorView<uint32_t> titleIds, winrt::Microsoft::Xbox::Services::Presence::PresenceDetailLevel detailLevel, bool onlineOnly, bool broadcastingOnly)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Presence::PresenceRecord>> PresenceService::GetPresenceForSocialGroupAsync(hstring socialGroup)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Presence::PresenceRecord>> PresenceService::GetPresenceForSocialGroupAsync(hstring socialGroup, hstring socialGroupOwnerXboxuserId, winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Presence::PresenceDeviceType> deviceTypes, winrt::Windows::Foundation::Collections::IVectorView<uint32_t> titleIds, winrt::Microsoft::Xbox::Services::Presence::PresenceDetailLevel detailLevel, bool onlineOnly, bool broadcastingOnly)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Presence::DevicePresenceChangeSubscription PresenceService::SubscribeToDevicePresenceChange(hstring const& xboxUserId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void PresenceService::UnsubscribeFromDevicePresenceChange(winrt::Microsoft::Xbox::Services::Presence::DevicePresenceChangeSubscription const& subscription)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Presence::TitlePresenceChangeSubscription PresenceService::SubscribeToTitlePresenceChange(hstring const& xboxUserId, uint32_t titleId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void PresenceService::UnsubscribeFromTitlePresenceChange(winrt::Microsoft::Xbox::Services::Presence::TitlePresenceChangeSubscription const& subscription)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.PresenceTitleRecord.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.PresenceTitleRecord.cpp
index f63fe90..5c038c9 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.PresenceTitleRecord.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.PresenceTitleRecord.cpp
@@ -7,30 +7,30 @@ namespace winrt::Microsoft::Xbox::Services::Presence::implementation
 {
     uint32_t PresenceTitleRecord::TitleId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring PresenceTitleRecord::TitleName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime PresenceTitleRecord::LastModifiedDate()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool PresenceTitleRecord::IsTitleActive()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring PresenceTitleRecord::Presence()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Presence::PresenceTitleViewState PresenceTitleRecord::TitleViewState()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Presence::PresenceBroadcastRecord PresenceTitleRecord::BroadcastRecord()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.TitlePresenceChangeEventArgs.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.TitlePresenceChangeEventArgs.cpp
index ad48de3..d53c121 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.TitlePresenceChangeEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.TitlePresenceChangeEventArgs.cpp
@@ -7,14 +7,14 @@ namespace winrt::Microsoft::Xbox::Services::Presence::implementation
 {
     hstring TitlePresenceChangeEventArgs::XboxUserId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t TitlePresenceChangeEventArgs::TitleId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Presence::TitlePresenceState TitlePresenceChangeEventArgs::TitleState()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.TitlePresenceChangeSubscription.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.TitlePresenceChangeSubscription.cpp
index 355a90e..6a88903 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.TitlePresenceChangeSubscription.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Presence.TitlePresenceChangeSubscription.cpp
@@ -7,22 +7,22 @@ namespace winrt::Microsoft::Xbox::Services::Presence::implementation
 {
     winrt::Microsoft::Xbox::Services::RealTimeActivity::RealTimeActivitySubscriptionState TitlePresenceChangeSubscription::State()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring TitlePresenceChangeSubscription::ResourceUri()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t TitlePresenceChangeSubscription::SubscriptionId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring TitlePresenceChangeSubscription::XboxUserId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t TitlePresenceChangeSubscription::TitleId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Privacy.MultiplePermissionsCheckResult.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Privacy.MultiplePermissionsCheckResult.cpp
index df363bf..9abfd49 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Privacy.MultiplePermissionsCheckResult.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Privacy.MultiplePermissionsCheckResult.cpp
@@ -7,10 +7,10 @@ namespace winrt::Microsoft::Xbox::Services::Privacy::implementation
 {
     hstring MultiplePermissionsCheckResult::XboxUserId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Privacy::PermissionCheckResult> MultiplePermissionsCheckResult::Items()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Privacy.PermissionCheckResult.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Privacy.PermissionCheckResult.cpp
index 4f31285..58e0896 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Privacy.PermissionCheckResult.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Privacy.PermissionCheckResult.cpp
@@ -7,14 +7,14 @@ namespace winrt::Microsoft::Xbox::Services::Privacy::implementation
 {
     bool PermissionCheckResult::IsAllowed()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring PermissionCheckResult::PermissionRequested()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Privacy::PermissionDenyReason> PermissionCheckResult::DenyReasons()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Privacy.PermissionDenyReason.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Privacy.PermissionDenyReason.cpp
index 6362063..593c4e9 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Privacy.PermissionDenyReason.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Privacy.PermissionDenyReason.cpp
@@ -7,10 +7,10 @@ namespace winrt::Microsoft::Xbox::Services::Privacy::implementation
 {
     hstring PermissionDenyReason::Reason()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring PermissionDenyReason::RestrictedSetting()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Privacy.PermissionIdConstants.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Privacy.PermissionIdConstants.cpp
index 2b72d6b..a5fde63 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Privacy.PermissionIdConstants.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Privacy.PermissionIdConstants.cpp
@@ -7,58 +7,58 @@ namespace winrt::Microsoft::Xbox::Services::Privacy::implementation
 {
     hstring PermissionIdConstants::CommunicateUsingText()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring PermissionIdConstants::CommunicateUsingVideo()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring PermissionIdConstants::CommunicateUsingVoice()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring PermissionIdConstants::ViewTargetProfile()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring PermissionIdConstants::ViewTargetGameHistory()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring PermissionIdConstants::ViewTargetVideoHistory()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring PermissionIdConstants::ViewTargetMusicHistory()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring PermissionIdConstants::ViewTargetExerciseInfo()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring PermissionIdConstants::ViewTargetPresence()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring PermissionIdConstants::ViewTargetVideoStatus()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring PermissionIdConstants::ViewTargetMusicStatus()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring PermissionIdConstants::PlayMultiplayer()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring PermissionIdConstants::BroadcastWithTwitch()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring PermissionIdConstants::ViewTargetUserCreatedContent()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Privacy.PrivacyService.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Privacy.PrivacyService.cpp
index 3630dfb..786c0db 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Privacy.PrivacyService.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Privacy.PrivacyService.cpp
@@ -7,18 +7,18 @@ namespace winrt::Microsoft::Xbox::Services::Privacy::implementation
 {
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<hstring>> PrivacyService::GetAvoidListAsync()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Privacy::PermissionCheckResult> PrivacyService::CheckPermissionWithTargetUserAsync(hstring permissionId, hstring targetXboxUserId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Privacy::MultiplePermissionsCheckResult>> PrivacyService::CheckMultiplePermissionsWithMultipleTargetUsersAsync(winrt::Windows::Foundation::Collections::IVectorView<hstring> permissionIds, winrt::Windows::Foundation::Collections::IVectorView<hstring> targetXboxUserIds)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<hstring>> PrivacyService::GetMuteListAsync()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.RealTimeActivity.RealTimeActivityService.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.RealTimeActivity.RealTimeActivityService.cpp
index c6de607..b882164 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.RealTimeActivity.RealTimeActivityService.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.RealTimeActivity.RealTimeActivityService.cpp
@@ -7,7 +7,7 @@ namespace winrt::Microsoft::Xbox::Services::RealTimeActivity::implementation
 {
     void RealTimeActivityService::Activate()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void RealTimeActivityService::Deactivate()
     {
@@ -15,26 +15,26 @@ namespace winrt::Microsoft::Xbox::Services::RealTimeActivity::implementation
     }
     winrt::event_token RealTimeActivityService::RealTimeActivityConnectionStateChange(winrt::Windows::Foundation::EventHandler<winrt::Microsoft::Xbox::Services::RealTimeActivity::RealTimeActivityConnectionState> const& __param0)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void RealTimeActivityService::RealTimeActivityConnectionStateChange(winrt::event_token const& __param0) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token RealTimeActivityService::RealTimeActivitySubscriptionError(winrt::Windows::Foundation::EventHandler<winrt::Microsoft::Xbox::Services::RealTimeActivity::RealTimeActivitySubscriptionErrorEventArgs> const& __param0)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void RealTimeActivityService::RealTimeActivitySubscriptionError(winrt::event_token const& __param0) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token RealTimeActivityService::RealTimeActivityResync(winrt::Windows::Foundation::EventHandler<winrt::Microsoft::Xbox::Services::RealTimeActivity::RealTimeActivityResyncEventArgs> const& __param0)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void RealTimeActivityService::RealTimeActivityResync(winrt::event_token const& __param0) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.RealTimeActivity.RealTimeActivitySubscriptionErrorEventArgs.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.RealTimeActivity.RealTimeActivitySubscriptionErrorEventArgs.cpp
index 9065509..0c5a311 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.RealTimeActivity.RealTimeActivitySubscriptionErrorEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.RealTimeActivity.RealTimeActivitySubscriptionErrorEventArgs.cpp
@@ -7,22 +7,22 @@ namespace winrt::Microsoft::Xbox::Services::RealTimeActivity::implementation
 {
     winrt::Microsoft::Xbox::Services::RealTimeActivity::RealTimeActivitySubscriptionState RealTimeActivitySubscriptionErrorEventArgs::State()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t RealTimeActivitySubscriptionErrorEventArgs::SubscriptionId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring RealTimeActivitySubscriptionErrorEventArgs::ResourceUri()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::RealTimeActivity::RealTimeActivitySubscriptionError RealTimeActivitySubscriptionErrorEventArgs::SubscriptionError()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring RealTimeActivitySubscriptionErrorEventArgs::ErrorMessage()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.ServiceCallLoggingConfig.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.ServiceCallLoggingConfig.cpp
index cd8c1f0..b7a558a 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.ServiceCallLoggingConfig.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.ServiceCallLoggingConfig.cpp
@@ -6,22 +6,22 @@ namespace winrt::Microsoft::Xbox::Services::implementation
 {
     winrt::Microsoft::Xbox::Services::ServiceCallLoggingConfig ServiceCallLoggingConfig::SingletonInstance()
     {
-        Logger::NotImplemented();
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ServiceCallLoggingConfig::Enable()
     {
-        Logger::NotImplemented();
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ServiceCallLoggingConfig::Disable()
     {
-        Logger::NotImplemented();
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ServiceCallLoggingConfig::RegisterForProtocolActivation()
     {
-        Logger::NotImplemented();
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.Manager.PreferredColor.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.Manager.PreferredColor.cpp
index f8d6548..c8a5965 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.Manager.PreferredColor.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.Manager.PreferredColor.cpp
@@ -7,14 +7,14 @@ namespace winrt::Microsoft::Xbox::Services::Social::Manager::implementation
 {
     hstring PreferredColor::PrimaryColor()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring PreferredColor::SecondaryColor()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring PreferredColor::TertiaryColor()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.Manager.SocialEvent.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.Manager.SocialEvent.cpp
index bedc791..c16133e 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.Manager.SocialEvent.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.Manager.SocialEvent.cpp
@@ -7,26 +7,26 @@ namespace winrt::Microsoft::Xbox::Services::Social::Manager::implementation
 {
     winrt::Windows::Xbox::System::User SocialEvent::User()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Social::Manager::SocialEventType SocialEvent::EventType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<hstring> SocialEvent::UsersAffected()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     int32_t SocialEvent::ErrorCode()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring SocialEvent::ErrorMessage()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Social::Manager::SocialEventArgs SocialEvent::EventArgs()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.Manager.SocialManager.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.Manager.SocialManager.cpp
index 8544c9c..2e34891 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.Manager.SocialManager.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.Manager.SocialManager.cpp
@@ -7,42 +7,42 @@ namespace winrt::Microsoft::Xbox::Services::Social::Manager::implementation
 {
     winrt::Microsoft::Xbox::Services::Social::Manager::SocialManager SocialManager::SingletonInstance()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SocialManager::AddLocalUser(winrt::Windows::Xbox::System::User const& user, winrt::Microsoft::Xbox::Services::Social::Manager::SocialManagerExtraDetailLevel const& extraDetailLevel)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SocialManager::RemoveLocalUser(winrt::Windows::Xbox::System::User const& user)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Social::Manager::SocialEvent> SocialManager::DoWork()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Social::Manager::XboxSocialUserGroup SocialManager::CreateSocialUserGroupFromFilters(winrt::Windows::Xbox::System::User const& user, winrt::Microsoft::Xbox::Services::Social::Manager::PresenceFilter const& presenceFilter, winrt::Microsoft::Xbox::Services::Social::Manager::RelationshipFilter const& relationshipFilter)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Social::Manager::XboxSocialUserGroup SocialManager::CreateSocialUserGroupFromList(winrt::Windows::Xbox::System::User const& user, winrt::Windows::Foundation::Collections::IVectorView<hstring> const& xboxUserIdList)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SocialManager::DestroySocialUserGroup(winrt::Microsoft::Xbox::Services::Social::Manager::XboxSocialUserGroup const& xboxSocialUserGroup)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::System::User> SocialManager::LocalUsers()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SocialManager::UpdateSocialUserGroup(winrt::Microsoft::Xbox::Services::Social::Manager::XboxSocialUserGroup const& socialGroup, winrt::Windows::Foundation::Collections::IVectorView<hstring> const& users)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SocialManager::SetRichPresencePollingState(winrt::Windows::Xbox::System::User const& user, bool shouldEnablePolling)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.Manager.SocialManagerPresenceRecord.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.Manager.SocialManagerPresenceRecord.cpp
index 53b79c9..44527fe 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.Manager.SocialManagerPresenceRecord.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.Manager.SocialManagerPresenceRecord.cpp
@@ -7,14 +7,14 @@ namespace winrt::Microsoft::Xbox::Services::Social::Manager::implementation
 {
     winrt::Microsoft::Xbox::Services::Presence::UserPresenceState SocialManagerPresenceRecord::UserState()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Social::Manager::SocialManagerPresenceTitleRecord> SocialManagerPresenceRecord::PresenceTitleRecords()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool SocialManagerPresenceRecord::IsUserPlayingTitle(uint32_t titleId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.Manager.SocialManagerPresenceTitleRecord.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.Manager.SocialManagerPresenceTitleRecord.cpp
index 954a0e7..7d84f21 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.Manager.SocialManagerPresenceTitleRecord.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.Manager.SocialManagerPresenceTitleRecord.cpp
@@ -7,22 +7,22 @@ namespace winrt::Microsoft::Xbox::Services::Social::Manager::implementation
 {
     bool SocialManagerPresenceTitleRecord::IsTitleActive()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t SocialManagerPresenceTitleRecord::TitleId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring SocialManagerPresenceTitleRecord::PresenceText()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool SocialManagerPresenceTitleRecord::IsBroadcasting()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Presence::PresenceDeviceType SocialManagerPresenceTitleRecord::DeviceType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.Manager.SocialUserGroupLoadedEventArgs.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.Manager.SocialUserGroupLoadedEventArgs.cpp
index 8318215..b9b08fd 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.Manager.SocialUserGroupLoadedEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.Manager.SocialUserGroupLoadedEventArgs.cpp
@@ -7,6 +7,6 @@ namespace winrt::Microsoft::Xbox::Services::Social::Manager::implementation
 {
     winrt::Microsoft::Xbox::Services::Social::Manager::XboxSocialUserGroup SocialUserGroupLoadedEventArgs::SocialUserGroup()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.Manager.TitleHistory.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.Manager.TitleHistory.cpp
index 65fecfa..3c8ac3b 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.Manager.TitleHistory.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.Manager.TitleHistory.cpp
@@ -7,10 +7,10 @@ namespace winrt::Microsoft::Xbox::Services::Social::Manager::implementation
 {
     bool TitleHistory::HasUserPlayed()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime TitleHistory::LastTimeUserPlayed()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.Manager.XboxSocialUser.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.Manager.XboxSocialUser.cpp
index 126a446..bfa4e55 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.Manager.XboxSocialUser.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.Manager.XboxSocialUser.cpp
@@ -7,54 +7,54 @@ namespace winrt::Microsoft::Xbox::Services::Social::Manager::implementation
 {
     hstring XboxSocialUser::XboxUserId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool XboxSocialUser::IsFavorite()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool XboxSocialUser::IsFollowingUser()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool XboxSocialUser::IsFollowedByCaller()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring XboxSocialUser::DisplayName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring XboxSocialUser::RealName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring XboxSocialUser::DisplayPicUrlRaw()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool XboxSocialUser::UseAvatar()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring XboxSocialUser::Gamertag()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring XboxSocialUser::Gamerscore()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Social::Manager::SocialManagerPresenceRecord XboxSocialUser::PresenceRecord()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Social::Manager::TitleHistory XboxSocialUser::TitleHistory()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Social::Manager::PreferredColor XboxSocialUser::PreferredColor()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.Manager.XboxSocialUserGroup.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.Manager.XboxSocialUserGroup.cpp
index c3f0645..2598ba4 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.Manager.XboxSocialUserGroup.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.Manager.XboxSocialUserGroup.cpp
@@ -7,30 +7,30 @@ namespace winrt::Microsoft::Xbox::Services::Social::Manager::implementation
 {
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Social::Manager::XboxSocialUser> XboxSocialUserGroup::Users()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Social::Manager::SocialUserGroupType XboxSocialUserGroup::SocialUserGroupType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<hstring> XboxSocialUserGroup::UsersTrackedBySocialUserGroup()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::System::User XboxSocialUserGroup::LocalUser()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Social::Manager::PresenceFilter XboxSocialUserGroup::PresenceFilterOfGroup()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Social::Manager::RelationshipFilter XboxSocialUserGroup::RelationshipFilterOfGroup()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Social::Manager::XboxSocialUser> XboxSocialUserGroup::GetUsersFromXboxUserIds(winrt::Windows::Foundation::Collections::IVectorView<hstring> const& xboxUserIds)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.ProfileService.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.ProfileService.cpp
index db227ba..b6f3280 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.ProfileService.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.ProfileService.cpp
@@ -7,14 +7,14 @@ namespace winrt::Microsoft::Xbox::Services::Social::implementation
 {
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Social::XboxUserProfile> ProfileService::GetUserProfileAsync(hstring xboxUserId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Social::XboxUserProfile>> ProfileService::GetUserProfilesAsync(winrt::Windows::Foundation::Collections::IVectorView<hstring> xboxUserIds)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Social::XboxUserProfile>> ProfileService::GetUserProfilesForSocialGroupAsync(hstring socialGroup)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.ReputationFeedbackItem.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.ReputationFeedbackItem.cpp
index dd9b87b..c715a60 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.ReputationFeedbackItem.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.ReputationFeedbackItem.cpp
@@ -7,26 +7,26 @@ namespace winrt::Microsoft::Xbox::Services::Social::implementation
 {
     ReputationFeedbackItem::ReputationFeedbackItem(hstring const& xboxUserId, winrt::Microsoft::Xbox::Services::Social::ReputationFeedbackType const& reputationFeedbackType, winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionReference const& sessionReference, hstring const& reasonMessage, hstring const& evidenceResourceId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring ReputationFeedbackItem::XboxUserId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Social::ReputationFeedbackType ReputationFeedbackItem::FeedbackType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionReference ReputationFeedbackItem::SessionReference()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring ReputationFeedbackItem::ReasonMessage()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring ReputationFeedbackItem::EvidenceResourceId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.ReputationService.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.ReputationService.cpp
index b206245..24e072a 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.ReputationService.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.ReputationService.cpp
@@ -7,10 +7,10 @@ namespace winrt::Microsoft::Xbox::Services::Social::implementation
 {
     winrt::Windows::Foundation::IAsyncAction ReputationService::SubmitReputationFeedbackAsync(hstring xboxUserId, winrt::Microsoft::Xbox::Services::Social::ReputationFeedbackType reputationFeedbackType, hstring sessionName, hstring reasonMessage, hstring evidenceResourceId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction ReputationService::SubmitBatchReputationFeedbackAsync(winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Social::ReputationFeedbackItem> feedbackItems)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.SocialGroupConstants.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.SocialGroupConstants.cpp
index 9ada74b..f3e2847 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.SocialGroupConstants.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.SocialGroupConstants.cpp
@@ -7,10 +7,10 @@ namespace winrt::Microsoft::Xbox::Services::Social::implementation
 {
     hstring SocialGroupConstants::Favorite()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring SocialGroupConstants::People()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.SocialRelationshipChangeEventArgs.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.SocialRelationshipChangeEventArgs.cpp
index 7e0e36a..7275572 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.SocialRelationshipChangeEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.SocialRelationshipChangeEventArgs.cpp
@@ -7,14 +7,14 @@ namespace winrt::Microsoft::Xbox::Services::Social::implementation
 {
     hstring SocialRelationshipChangeEventArgs::CallerXboxUserId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Social::SocialNotificationType SocialRelationshipChangeEventArgs::SocialNotification()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<hstring> SocialRelationshipChangeEventArgs::XboxUserIds()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.SocialRelationshipChangeSubscription.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.SocialRelationshipChangeSubscription.cpp
index 0cb5ddc..86f9954 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.SocialRelationshipChangeSubscription.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.SocialRelationshipChangeSubscription.cpp
@@ -7,18 +7,18 @@ namespace winrt::Microsoft::Xbox::Services::Social::implementation
 {
     winrt::Microsoft::Xbox::Services::RealTimeActivity::RealTimeActivitySubscriptionState SocialRelationshipChangeSubscription::State()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring SocialRelationshipChangeSubscription::ResourceUri()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t SocialRelationshipChangeSubscription::SubscriptionId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring SocialRelationshipChangeSubscription::XboxUserId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.SocialService.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.SocialService.cpp
index 970f5b4..9a307d9 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.SocialService.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.SocialService.cpp
@@ -7,23 +7,23 @@ namespace winrt::Microsoft::Xbox::Services::Social::implementation
 {
     winrt::event_token SocialService::SocialRelationshipChanged(winrt::Windows::Foundation::EventHandler<winrt::Microsoft::Xbox::Services::Social::SocialRelationshipChangeEventArgs> const& __param0)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SocialService::SocialRelationshipChanged(winrt::event_token const& __param0) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Social::XboxSocialRelationshipResult> SocialService::GetSocialRelationshipsAsync()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Social::XboxSocialRelationshipResult> SocialService::GetSocialRelationshipsAsync(winrt::Microsoft::Xbox::Services::Social::SocialRelationship socialRelationshipFilter)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Social::XboxSocialRelationshipResult> SocialService::GetSocialRelationshipsAsync(hstring xboxUserId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Social::XboxSocialRelationshipResult> SocialService::GetSocialRelationshipsAsync(winrt::Microsoft::Xbox::Services::Social::SocialRelationship socialRelationshipFilter, uint32_t startIndex, uint32_t maxItems)
     {
@@ -31,10 +31,10 @@ namespace winrt::Microsoft::Xbox::Services::Social::implementation
     }
     winrt::Microsoft::Xbox::Services::Social::SocialRelationshipChangeSubscription SocialService::SubscribeToSocialRelationshipChange(hstring const& xboxUserId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SocialService::UnsubscribeFromSocialRelationshipChange(winrt::Microsoft::Xbox::Services::Social::SocialRelationshipChangeSubscription const& subscription)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.XboxSocialRelationship.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.XboxSocialRelationship.cpp
index e6b1027..d8bc69e 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.XboxSocialRelationship.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.XboxSocialRelationship.cpp
@@ -7,18 +7,18 @@ namespace winrt::Microsoft::Xbox::Services::Social::implementation
 {
     hstring XboxSocialRelationship::XboxUserId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool XboxSocialRelationship::IsFavorite()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool XboxSocialRelationship::IsFollowingCaller()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<hstring> XboxSocialRelationship::SocialNetworks()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.XboxSocialRelationshipResult.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.XboxSocialRelationshipResult.cpp
index 18d7801..e802e3e 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.XboxSocialRelationshipResult.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.XboxSocialRelationshipResult.cpp
@@ -7,18 +7,18 @@ namespace winrt::Microsoft::Xbox::Services::Social::implementation
 {
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Social::XboxSocialRelationship> XboxSocialRelationshipResult::Items()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t XboxSocialRelationshipResult::TotalCount()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool XboxSocialRelationshipResult::HasNext()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Social::XboxSocialRelationshipResult> XboxSocialRelationshipResult::GetNextAsync(uint32_t maxItems)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.XboxUserProfile.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.XboxUserProfile.cpp
index 46758ed..d00859f 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.XboxUserProfile.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Social.XboxUserProfile.cpp
@@ -7,30 +7,30 @@ namespace winrt::Microsoft::Xbox::Services::Social::implementation
 {
     hstring XboxUserProfile::ApplicationDisplayName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Uri XboxUserProfile::ApplicationDisplayPictureResizeUri()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring XboxUserProfile::GameDisplayName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Uri XboxUserProfile::GameDisplayPictureResizeUri()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring XboxUserProfile::Gamerscore()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring XboxUserProfile::Gamertag()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring XboxUserProfile::XboxUserId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Statistics.Manager.LeaderboardResultEventArgs.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Statistics.Manager.LeaderboardResultEventArgs.cpp
index 8cdc487..d4a483b 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Statistics.Manager.LeaderboardResultEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Statistics.Manager.LeaderboardResultEventArgs.cpp
@@ -7,6 +7,6 @@ namespace winrt::Microsoft::Xbox::Services::Statistics::Manager::implementation
 {
     winrt::Microsoft::Xbox::Services::Leaderboard::LeaderboardResult LeaderboardResultEventArgs::Result()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Statistics.Manager.StatisticEvent.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Statistics.Manager.StatisticEvent.cpp
index 57526bd..7d4cead 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Statistics.Manager.StatisticEvent.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Statistics.Manager.StatisticEvent.cpp
@@ -7,22 +7,22 @@ namespace winrt::Microsoft::Xbox::Services::Statistics::Manager::implementation
 {
     winrt::Windows::Xbox::System::User StatisticEvent::User()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Statistics::Manager::StatisticEventType StatisticEvent::EventType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     int32_t StatisticEvent::ErrorCode()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring StatisticEvent::ErrorMessage()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Statistics::Manager::StatisticEventArgs StatisticEvent::EventArgs()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Statistics.Manager.StatisticManager.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Statistics.Manager.StatisticManager.cpp
index 030248a..a8232c3 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Statistics.Manager.StatisticManager.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Statistics.Manager.StatisticManager.cpp
@@ -7,58 +7,58 @@ namespace winrt::Microsoft::Xbox::Services::Statistics::Manager::implementation
 {
     winrt::Microsoft::Xbox::Services::Statistics::Manager::StatisticManager StatisticManager::SingletonInstance()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void StatisticManager::AddLocalUser(winrt::Windows::Xbox::System::User const& user)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void StatisticManager::RemoveLocalUser(winrt::Windows::Xbox::System::User const& user)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void StatisticManager::RequestFlushToService(winrt::Windows::Xbox::System::User const& user)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void StatisticManager::RequestFlushToService(winrt::Windows::Xbox::System::User const& user, bool isHighPriority)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Statistics::Manager::StatisticEvent> StatisticManager::DoWork()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void StatisticManager::SetStatisticNumberData(winrt::Windows::Xbox::System::User const& user, hstring const& name, double value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void StatisticManager::SetStatisticIntegerData(winrt::Windows::Xbox::System::User const& user, hstring const& name, int64_t value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void StatisticManager::SetStatisticStringData(winrt::Windows::Xbox::System::User const& user, hstring const& name, hstring const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<hstring> StatisticManager::GetStatisticNames(winrt::Windows::Xbox::System::User const& user)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Statistics::Manager::StatisticValue StatisticManager::GetStatistic(winrt::Windows::Xbox::System::User const& user, hstring const& name)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void StatisticManager::DeleteStatistic(winrt::Windows::Xbox::System::User const& user, hstring const& name)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void StatisticManager::GetLeaderboard(winrt::Windows::Xbox::System::User const& user, hstring const& statName, winrt::Microsoft::Xbox::Services::Leaderboard::LeaderboardQuery const& query)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void StatisticManager::GetSocialLeaderboard(winrt::Windows::Xbox::System::User const& user, hstring const& statName, hstring const& socialGroup, winrt::Microsoft::Xbox::Services::Leaderboard::LeaderboardQuery const& query)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Statistics.Manager.StatisticValue.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Statistics.Manager.StatisticValue.cpp
index bde4b16..5f8b70f 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Statistics.Manager.StatisticValue.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Statistics.Manager.StatisticValue.cpp
@@ -7,22 +7,22 @@ namespace winrt::Microsoft::Xbox::Services::Statistics::Manager::implementation
 {
     hstring StatisticValue::Name()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     double StatisticValue::AsNumber()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     int64_t StatisticValue::AsInteger()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring StatisticValue::AsString()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Statistics::Manager::StatisticDataType StatisticValue::DataType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.System.StringService.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.System.StringService.cpp
index fe80b09..5f29f48 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.System.StringService.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.System.StringService.cpp
@@ -7,10 +7,10 @@ namespace winrt::Microsoft::Xbox::Services::System::implementation
 {
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::System::VerifyStringResult> StringService::VerifyStringAsync(hstring stringToVerify)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::System::VerifyStringResult>> StringService::VerifyStringsAsync(winrt::Windows::Foundation::Collections::IVectorView<hstring> stringsToVerify)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.System.VerifyStringResult.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.System.VerifyStringResult.cpp
index 54fd23d..94bb1d2 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.System.VerifyStringResult.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.System.VerifyStringResult.cpp
@@ -7,10 +7,10 @@ namespace winrt::Microsoft::Xbox::Services::System::implementation
 {
     winrt::Microsoft::Xbox::Services::System::VerifyStringResultCode VerifyStringResult::ResultCode()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring VerifyStringResult::FirstOffendingSubstring()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.System.XboxLiveServicesSettings.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.System.XboxLiveServicesSettings.cpp
index b2c45aa..ebd854e 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.System.XboxLiveServicesSettings.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.System.XboxLiveServicesSettings.cpp
@@ -7,30 +7,30 @@ namespace winrt::Microsoft::Xbox::Services::System::implementation
 {
     winrt::Microsoft::Xbox::Services::System::XboxLiveServicesSettings XboxLiveServicesSettings::SingletonInstance()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token XboxLiveServicesSettings::LogCallRouted(winrt::Windows::Foundation::EventHandler<winrt::Microsoft::Xbox::Services::XboxLiveLogCallEventArgs> const& __param0)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void XboxLiveServicesSettings::LogCallRouted(winrt::event_token const& __param0) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::XboxServicesDiagnosticsTraceLevel XboxLiveServicesSettings::DiagnosticsTraceLevel()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void XboxLiveServicesSettings::DiagnosticsTraceLevel(winrt::Microsoft::Xbox::Services::XboxServicesDiagnosticsTraceLevel const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token XboxLiveServicesSettings::WnsEventRecevied(winrt::Windows::Foundation::EventHandler<winrt::Microsoft::Xbox::Services::XboxLiveWnsEventArgs> const& __param0)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void XboxLiveServicesSettings::WnsEventRecevied(winrt::event_token const& __param0) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.TitleStorage.TitleStorageBlobMetadata.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.TitleStorage.TitleStorageBlobMetadata.cpp
index 49b4bc6..f18b727 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.TitleStorage.TitleStorageBlobMetadata.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.TitleStorage.TitleStorageBlobMetadata.cpp
@@ -7,66 +7,66 @@ namespace winrt::Microsoft::Xbox::Services::TitleStorage::implementation
 {
     TitleStorageBlobMetadata::TitleStorageBlobMetadata(hstring const& serviceConfigurationId, winrt::Microsoft::Xbox::Services::TitleStorage::TitleStorageType const& storageType, hstring const& blobPath, winrt::Microsoft::Xbox::Services::TitleStorage::TitleStorageBlobType const& blobType, hstring const& xboxUserId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     TitleStorageBlobMetadata::TitleStorageBlobMetadata(hstring const& serviceConfigurationId, winrt::Microsoft::Xbox::Services::TitleStorage::TitleStorageType const& storageType, hstring const& blobPath, winrt::Microsoft::Xbox::Services::TitleStorage::TitleStorageBlobType const& blobType, hstring const& xboxUserId, hstring const& displayName, hstring const& eTag)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     TitleStorageBlobMetadata::TitleStorageBlobMetadata(hstring const& serviceConfigurationId, winrt::Microsoft::Xbox::Services::TitleStorage::TitleStorageType const& storageType, hstring const& blobPath, winrt::Microsoft::Xbox::Services::TitleStorage::TitleStorageBlobType const& blobType, hstring const& xboxUserId, hstring const& displayName, hstring const& eTag, winrt::Windows::Foundation::DateTime const& clientTimestamp)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::TitleStorage::TitleStorageBlobMetadata TitleStorageBlobMetadata::CreateTitleStorageBlobMetadataForSessionStorage(hstring const& serviceConfigurationId, hstring const& blobPath, winrt::Microsoft::Xbox::Services::TitleStorage::TitleStorageBlobType const& blobType, hstring const& multiplayerSessionTemplateName, hstring const& multiplayerSessionName, hstring const& displayName, hstring const& eTag)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring TitleStorageBlobMetadata::BlobPath()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::TitleStorage::TitleStorageBlobType TitleStorageBlobMetadata::BlobType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::TitleStorage::TitleStorageType TitleStorageBlobMetadata::StorageType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring TitleStorageBlobMetadata::DisplayName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring TitleStorageBlobMetadata::ETag()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime TitleStorageBlobMetadata::ClientTimestamp()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void TitleStorageBlobMetadata::set(winrt::Windows::Foundation::DateTime const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint64_t TitleStorageBlobMetadata::Length()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring TitleStorageBlobMetadata::ServiceConfigurationId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring TitleStorageBlobMetadata::XboxUserId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring TitleStorageBlobMetadata::MultiplayerSessionTemplateName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring TitleStorageBlobMetadata::MultiplayerSessionName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.TitleStorage.TitleStorageBlobMetadataResult.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.TitleStorage.TitleStorageBlobMetadataResult.cpp
index 8f29104..6ef5d27 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.TitleStorage.TitleStorageBlobMetadataResult.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.TitleStorage.TitleStorageBlobMetadataResult.cpp
@@ -7,14 +7,14 @@ namespace winrt::Microsoft::Xbox::Services::TitleStorage::implementation
 {
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::TitleStorage::TitleStorageBlobMetadata> TitleStorageBlobMetadataResult::Items()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::TitleStorage::TitleStorageBlobMetadataResult> TitleStorageBlobMetadataResult::GetNextAsync(uint32_t maxItems)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool TitleStorageBlobMetadataResult::HasNext()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.TitleStorage.TitleStorageBlobResult.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.TitleStorage.TitleStorageBlobResult.cpp
index 57af05e..4647255 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.TitleStorage.TitleStorageBlobResult.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.TitleStorage.TitleStorageBlobResult.cpp
@@ -7,10 +7,10 @@ namespace winrt::Microsoft::Xbox::Services::TitleStorage::implementation
 {
     winrt::Windows::Storage::Streams::IBuffer TitleStorageBlobResult::BlobBuffer()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::TitleStorage::TitleStorageBlobMetadata TitleStorageBlobResult::BlobMetadata()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.TitleStorage.TitleStorageQuota.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.TitleStorage.TitleStorageQuota.cpp
index 922c1f3..386cffd 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.TitleStorage.TitleStorageQuota.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.TitleStorage.TitleStorageQuota.cpp
@@ -7,30 +7,30 @@ namespace winrt::Microsoft::Xbox::Services::TitleStorage::implementation
 {
     hstring TitleStorageQuota::ServiceConfigurationId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::TitleStorage::TitleStorageType TitleStorageQuota::StorageType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring TitleStorageQuota::XboxUserId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring TitleStorageQuota::MultiplayerSessionTemplateName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring TitleStorageQuota::MultiplayerSessionName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint64_t TitleStorageQuota::UsedBytes()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint64_t TitleStorageQuota::QuotaBytes()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.TitleStorage.TitleStorageService.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.TitleStorage.TitleStorageService.cpp
index e0792d1..d6cbf44 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.TitleStorage.TitleStorageService.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.TitleStorage.TitleStorageService.cpp
@@ -7,34 +7,34 @@ namespace winrt::Microsoft::Xbox::Services::TitleStorage::implementation
 {
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::TitleStorage::TitleStorageQuota> TitleStorageService::GetQuotaAsync(hstring serviceConfigurationId, winrt::Microsoft::Xbox::Services::TitleStorage::TitleStorageType storageType)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::TitleStorage::TitleStorageQuota> TitleStorageService::GetQuotaForSessionStorageAsync(hstring serviceConfigurationId, hstring multiplayerSessionTemplateName, hstring multiplayerSessionName)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::TitleStorage::TitleStorageBlobMetadataResult> TitleStorageService::GetBlobMetadataAsync(hstring serviceConfigurationId, winrt::Microsoft::Xbox::Services::TitleStorage::TitleStorageType storageType, hstring blobPath, hstring xboxUserId, uint32_t skipItems, uint32_t maxItems)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::TitleStorage::TitleStorageBlobMetadataResult> TitleStorageService::GetBlobMetadataForSessionStorageAsync(hstring serviceConfigurationId, hstring blobPath, hstring multiplayerSessionTemplateName, hstring multiplayerSessionName, uint32_t skipItems, uint32_t maxItems)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction TitleStorageService::DeleteBlobAsync(winrt::Microsoft::Xbox::Services::TitleStorage::TitleStorageBlobMetadata blobMetadata, bool deleteOnlyIfETagMatches)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::TitleStorage::TitleStorageBlobResult> TitleStorageService::DownloadBlobAsync(winrt::Microsoft::Xbox::Services::TitleStorage::TitleStorageBlobMetadata blobMetadata, winrt::Windows::Storage::Streams::IBuffer blobBuffer, winrt::Microsoft::Xbox::Services::TitleStorage::TitleStorageETagMatchCondition etagMatchCondition, hstring selectQuery)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::TitleStorage::TitleStorageBlobResult> TitleStorageService::DownloadBlobAsync(winrt::Microsoft::Xbox::Services::TitleStorage::TitleStorageBlobMetadata blobMetadata, winrt::Windows::Storage::Streams::IBuffer blobBuffer, winrt::Microsoft::Xbox::Services::TitleStorage::TitleStorageETagMatchCondition etagMatchCondition, hstring selectQuery, uint32_t preferredDownloadBlockSize)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::TitleStorage::TitleStorageBlobMetadata> TitleStorageService::UploadBlobAsync(winrt::Microsoft::Xbox::Services::TitleStorage::TitleStorageBlobMetadata blobMetadata, winrt::Windows::Storage::Streams::IBuffer blobBuffer, winrt::Microsoft::Xbox::Services::TitleStorage::TitleStorageETagMatchCondition etagMatchCondition, uint32_t preferredUploadBlockSize)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.CurrentMatchMetadata.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.CurrentMatchMetadata.cpp
index 7fdeabd..5af5ad0 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.CurrentMatchMetadata.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.CurrentMatchMetadata.cpp
@@ -7,10 +7,10 @@ namespace winrt::Microsoft::Xbox::Services::Tournaments::implementation
 {
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerSessionReference CurrentMatchMetadata::GameSessionReference()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Tournaments::MatchMetadata CurrentMatchMetadata::MatchDetails()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.MatchMetadata.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.MatchMetadata.cpp
index d68abb0..0f9285f 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.MatchMetadata.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.MatchMetadata.cpp
@@ -7,18 +7,18 @@ namespace winrt::Microsoft::Xbox::Services::Tournaments::implementation
 {
     hstring MatchMetadata::Description()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime MatchMetadata::StartTIme()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MatchMetadata::IsBye()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<hstring> MatchMetadata::OpposingTeamIds()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.PreviousMatchMetadata.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.PreviousMatchMetadata.cpp
index 9f1d4f1..ef7bc42 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.PreviousMatchMetadata.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.PreviousMatchMetadata.cpp
@@ -7,14 +7,14 @@ namespace winrt::Microsoft::Xbox::Services::Tournaments::implementation
 {
     winrt::Microsoft::Xbox::Services::Tournaments::TournamentTeamResult PreviousMatchMetadata::Result()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime PreviousMatchMetadata::EndTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Tournaments::MatchMetadata PreviousMatchMetadata::MatchDetails()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TeamChangeEventArgs.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TeamChangeEventArgs.cpp
index 8045f46..81b4730 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TeamChangeEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TeamChangeEventArgs.cpp
@@ -7,14 +7,14 @@ namespace winrt::Microsoft::Xbox::Services::Tournaments::implementation
 {
     hstring TeamChangeEventArgs::OrganizerId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring TeamChangeEventArgs::TournamentId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring TeamChangeEventArgs::TeamId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TeamChangeSubscription.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TeamChangeSubscription.cpp
index e2004ca..a6ca53d 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TeamChangeSubscription.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TeamChangeSubscription.cpp
@@ -7,18 +7,18 @@ namespace winrt::Microsoft::Xbox::Services::Tournaments::implementation
 {
     winrt::Microsoft::Xbox::Services::RealTimeActivity::RealTimeActivitySubscriptionState TeamChangeSubscription::State()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring TeamChangeSubscription::OrganizerId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring TeamChangeSubscription::TournamentId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring TeamChangeSubscription::TeamId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TeamInfo.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TeamInfo.cpp
index 2ec5c51..eee13c8 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TeamInfo.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TeamInfo.cpp
@@ -7,46 +7,46 @@ namespace winrt::Microsoft::Xbox::Services::Tournaments::implementation
 {
     hstring TeamInfo::Id()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring TeamInfo::Name()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<hstring> TeamInfo::MemberXboxUserIds()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime TeamInfo::RegistrationDate()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring TeamInfo::Standing()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Tournaments::TeamState TeamInfo::TeamState()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Tournaments::TeamCompletedReason TeamInfo::CompletedReason()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint64_t TeamInfo::Ranking()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring TeamInfo::ContinuationUri()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Tournaments::CurrentMatchMetadata TeamInfo::CurrentMatchMetadata()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Tournaments::PreviousMatchMetadata TeamInfo::PreviousMatchMetadata()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TeamRequest.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TeamRequest.cpp
index 5e751df..fecc49d 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TeamRequest.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TeamRequest.cpp
@@ -7,30 +7,30 @@ namespace winrt::Microsoft::Xbox::Services::Tournaments::implementation
 {
     TeamRequest::TeamRequest(hstring const& organizerId, hstring const& tournamentId, bool filterResultsForUser)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t TeamRequest::MaxItems()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void TeamRequest::MaxItems(uint32_t value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Tournaments::TeamState> TeamRequest::StateFilter()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void TeamRequest::StateFilter(winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Tournaments::TeamState> const& states)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Tournaments::TeamOrderBy TeamRequest::OrderBy()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void TeamRequest::OrderBy(winrt::Microsoft::Xbox::Services::Tournaments::TeamOrderBy const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TeamRequestResult.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TeamRequestResult.cpp
index dff8176..5e8803e 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TeamRequestResult.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TeamRequestResult.cpp
@@ -7,14 +7,14 @@ namespace winrt::Microsoft::Xbox::Services::Tournaments::implementation
 {
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Tournaments::TeamInfo> TeamRequestResult::Teams()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool TeamRequestResult::HasNext()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Tournaments::TeamRequestResult> TeamRequestResult::GetNextAsync()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TeamSummary.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TeamSummary.cpp
index 8caeda7..ef0a66f 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TeamSummary.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TeamSummary.cpp
@@ -7,14 +7,14 @@ namespace winrt::Microsoft::Xbox::Services::Tournaments::implementation
 {
     hstring TeamSummary::Id()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Tournaments::TeamState TeamSummary::TeamState()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint64_t TeamSummary::Ranking()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.Tournament.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.Tournament.cpp
index b9e50bd..6025526 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.Tournament.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.Tournament.cpp
@@ -7,106 +7,106 @@ namespace winrt::Microsoft::Xbox::Services::Tournaments::implementation
 {
     hstring Tournament::Id()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring Tournament::OrganizerId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring Tournament::OrganizerName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring Tournament::Name()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring Tournament::Description()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring Tournament::GameMode()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring Tournament::TournamentStyle()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool Tournament::IsRegistrationOpen()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool Tournament::IsCheckinOpen()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool Tournament::IsPlayingOpen()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool Tournament::HasPrize()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool Tournament::IsPaused()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t Tournament::MinTeamSize()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t Tournament::MaxTeamSize()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t Tournament::TeamsRegisteredCount()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t Tournament::MinTeamsRegistered()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t Tournament::MaxTeamsRegistered()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Tournaments::TournamentState Tournament::TournamentState()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime Tournament::RegistrationStartTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime Tournament::RegistrationEndTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime Tournament::CheckinStartTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime Tournament::CheckinEndTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime Tournament::PlayingStartTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime Tournament::PlayingEndTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime Tournament::EndTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Tournaments::TeamSummary Tournament::TeamSummary()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TournamentChangeEventArgs.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TournamentChangeEventArgs.cpp
index facaa84..abc295a 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TournamentChangeEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TournamentChangeEventArgs.cpp
@@ -7,10 +7,10 @@ namespace winrt::Microsoft::Xbox::Services::Tournaments::implementation
 {
     hstring TournamentChangeEventArgs::OrganizerId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring TournamentChangeEventArgs::TournamentId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TournamentChangeSubscription.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TournamentChangeSubscription.cpp
index 502803f..fc733c7 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TournamentChangeSubscription.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TournamentChangeSubscription.cpp
@@ -7,14 +7,14 @@ namespace winrt::Microsoft::Xbox::Services::Tournaments::implementation
 {
     winrt::Microsoft::Xbox::Services::RealTimeActivity::RealTimeActivitySubscriptionState TournamentChangeSubscription::State()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring TournamentChangeSubscription::OrganizerId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring TournamentChangeSubscription::TournamentId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TournamentReference.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TournamentReference.cpp
index 258335c..324343c 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TournamentReference.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TournamentReference.cpp
@@ -7,18 +7,18 @@ namespace winrt::Microsoft::Xbox::Services::Tournaments::implementation
 {
     hstring TournamentReference::DefinitionName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring TournamentReference::TournamentId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring TournamentReference::Organizer()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring TournamentReference::ServiceConfigurationId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TournamentRequest.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TournamentRequest.cpp
index 4e1a268..83ce3cf 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TournamentRequest.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TournamentRequest.cpp
@@ -7,46 +7,46 @@ namespace winrt::Microsoft::Xbox::Services::Tournaments::implementation
 {
     TournamentRequest::TournamentRequest(bool filterResultsForUser)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t TournamentRequest::MaxItems()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void TournamentRequest::MaxItems(uint32_t value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Tournaments::TournamentState> TournamentRequest::StateFilter()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void TournamentRequest::StateFilter(winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Tournaments::TournamentState> const& states)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Tournaments::TournamentOrderBy TournamentRequest::OrderBy()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void TournamentRequest::OrderBy(winrt::Microsoft::Xbox::Services::Tournaments::TournamentOrderBy const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Tournaments::TournamentSortOrder TournamentRequest::SortOrder()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void TournamentRequest::SortOrder(winrt::Microsoft::Xbox::Services::Tournaments::TournamentSortOrder const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring TournamentRequest::OrganizerId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void TournamentRequest::OrganizerId(hstring const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TournamentRequestResult.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TournamentRequestResult.cpp
index 5173137..4fd52bc 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TournamentRequestResult.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TournamentRequestResult.cpp
@@ -7,14 +7,14 @@ namespace winrt::Microsoft::Xbox::Services::Tournaments::implementation
 {
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::Tournaments::Tournament> TournamentRequestResult::Tournaments()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool TournamentRequestResult::HasNext()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Tournaments::TournamentRequestResult> TournamentRequestResult::GetNextAsync()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TournamentService.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TournamentService.cpp
index de73503..9009a1d 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TournamentService.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TournamentService.cpp
@@ -7,34 +7,34 @@ namespace winrt::Microsoft::Xbox::Services::Tournaments::implementation
 {
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Tournaments::TournamentRequestResult> TournamentService::GetTournamentsAsync(winrt::Microsoft::Xbox::Services::Tournaments::TournamentRequest request)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Tournaments::Tournament> TournamentService::GetTournamentDetailsAsync(hstring organizerId, hstring tournamentId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Tournaments::TeamRequestResult> TournamentService::GetTeamsAsync(winrt::Microsoft::Xbox::Services::Tournaments::TeamRequest request)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::Tournaments::TeamInfo> TournamentService::GetTeamDetailsAsync(hstring organizerId, hstring tournamentId, hstring teamId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token TournamentService::TeamChanged(winrt::Windows::Foundation::EventHandler<winrt::Microsoft::Xbox::Services::Tournaments::TeamChangeEventArgs> const& __param0)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void TournamentService::TeamChanged(winrt::event_token const& __param0) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Tournaments::TeamChangeSubscription TournamentService::SubscribeToTeamChange(hstring const& organizerId, hstring const& tournamentId, hstring const& teamId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void TournamentService::UnsubscribeFromTeamChange(winrt::Microsoft::Xbox::Services::Tournaments::TeamChangeSubscription const& subscription)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TournamentTeamResult.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TournamentTeamResult.cpp
index 486e0f8..b5dc1b7 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TournamentTeamResult.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.Tournaments.TournamentTeamResult.cpp
@@ -7,18 +7,18 @@ namespace winrt::Microsoft::Xbox::Services::Tournaments::implementation
 {
     winrt::Microsoft::Xbox::Services::Tournaments::TournamentGameResultState TournamentTeamResult::State()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void TournamentTeamResult::State(winrt::Microsoft::Xbox::Services::Tournaments::TournamentGameResultState const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint64_t TournamentTeamResult::Ranking()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void TournamentTeamResult::Ranking(uint64_t value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.UserStatistics.RequestedStatistics.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.UserStatistics.RequestedStatistics.cpp
index 66f9a7e..595ac6e 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.UserStatistics.RequestedStatistics.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.UserStatistics.RequestedStatistics.cpp
@@ -7,14 +7,14 @@ namespace winrt::Microsoft::Xbox::Services::UserStatistics::implementation
 {
     RequestedStatistics::RequestedStatistics(hstring const& serviceConfigurationId, winrt::Windows::Foundation::Collections::IVectorView<hstring> const& statistics)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring RequestedStatistics::ServiceConfigurationId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<hstring> RequestedStatistics::Statistics()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.UserStatistics.ServiceConfigurationStatistic.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.UserStatistics.ServiceConfigurationStatistic.cpp
index 05cba0d..94adedc 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.UserStatistics.ServiceConfigurationStatistic.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.UserStatistics.ServiceConfigurationStatistic.cpp
@@ -7,10 +7,10 @@ namespace winrt::Microsoft::Xbox::Services::UserStatistics::implementation
 {
     hstring ServiceConfigurationStatistic::ServiceConfigurationId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::UserStatistics::Statistic> ServiceConfigurationStatistic::Statistics()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.UserStatistics.Statistic.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.UserStatistics.Statistic.cpp
index 314787a..3422162 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.UserStatistics.Statistic.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.UserStatistics.Statistic.cpp
@@ -7,14 +7,14 @@ namespace winrt::Microsoft::Xbox::Services::UserStatistics::implementation
 {
     hstring Statistic::StatisticName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::PropertyType Statistic::StatisticType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring Statistic::Value()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.UserStatistics.StatisticChangeEventArgs.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.UserStatistics.StatisticChangeEventArgs.cpp
index 1306ec9..f9c6742 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.UserStatistics.StatisticChangeEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.UserStatistics.StatisticChangeEventArgs.cpp
@@ -7,14 +7,14 @@ namespace winrt::Microsoft::Xbox::Services::UserStatistics::implementation
 {
     hstring StatisticChangeEventArgs::XboxUserId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring StatisticChangeEventArgs::ServiceConfigurationId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::UserStatistics::Statistic StatisticChangeEventArgs::LatestStatistic()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.UserStatistics.StatisticChangeSubscription.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.UserStatistics.StatisticChangeSubscription.cpp
index db4d9a1..51da731 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.UserStatistics.StatisticChangeSubscription.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.UserStatistics.StatisticChangeSubscription.cpp
@@ -7,26 +7,26 @@ namespace winrt::Microsoft::Xbox::Services::UserStatistics::implementation
 {
     winrt::Microsoft::Xbox::Services::RealTimeActivity::RealTimeActivitySubscriptionState StatisticChangeSubscription::State()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring StatisticChangeSubscription::ResourceUri()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t StatisticChangeSubscription::SubscriptionId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring StatisticChangeSubscription::XboxUserId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring StatisticChangeSubscription::ServiceConfigurationId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring StatisticChangeSubscription::StatisticName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.UserStatistics.UserStatisticsResult.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.UserStatistics.UserStatisticsResult.cpp
index ddcfdb6..f4d56f6 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.UserStatistics.UserStatisticsResult.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.UserStatistics.UserStatisticsResult.cpp
@@ -7,10 +7,10 @@ namespace winrt::Microsoft::Xbox::Services::UserStatistics::implementation
 {
     hstring UserStatisticsResult::XboxUserId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::UserStatistics::ServiceConfigurationStatistic> UserStatisticsResult::ServiceConfigurationStatistics()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.UserStatistics.UserStatisticsService.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.UserStatistics.UserStatisticsService.cpp
index ddd8c1c..7d869b3 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.UserStatistics.UserStatisticsService.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.UserStatistics.UserStatisticsService.cpp
@@ -7,19 +7,19 @@ namespace winrt::Microsoft::Xbox::Services::UserStatistics::implementation
 {
     winrt::event_token UserStatisticsService::StatisticChanged(winrt::Windows::Foundation::EventHandler<winrt::Microsoft::Xbox::Services::UserStatistics::StatisticChangeEventArgs> const& __param0)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void UserStatisticsService::StatisticChanged(winrt::event_token const& __param0) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::UserStatistics::UserStatisticsResult> UserStatisticsService::GetSingleUserStatisticsAsync(hstring xboxUserId, hstring serviceConfigurationId, hstring statisticName)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::UserStatistics::UserStatisticsResult> UserStatisticsService::GetSingleUserStatisticsAsync(hstring xboxUserId, hstring serviceConfigurationId, winrt::Windows::Foundation::Collections::IVectorView<hstring> statisticNames)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::UserStatistics::UserStatisticsResult>> UserStatisticsService::GetMultipleUserStatisticsAsync(winrt::Windows::Foundation::Collections::IVectorView<hstring> xboxUserIds, hstring serviceConfigurationId, winrt::Windows::Foundation::Collections::IVectorView<hstring> statisticNames)
     {
@@ -31,14 +31,14 @@ namespace winrt::Microsoft::Xbox::Services::UserStatistics::implementation
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::UserStatistics::UserStatisticsResult>> UserStatisticsService::GetMultipleUserStatisticsForMultipleServiceConfigurationsAsync(winrt::Windows::Foundation::Collections::IVectorView<hstring> xboxUserIds, winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Xbox::Services::UserStatistics::RequestedStatistics> requestedServiceConfigurationStatisticsCollection)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::UserStatistics::StatisticChangeSubscription UserStatisticsService::SubscribeToStatisticChange(hstring const& xboxUserId, hstring const& serviceConfigurationId, hstring const& statisticName)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void UserStatisticsService::UnsubscribeFromStatisticChange(winrt::Microsoft::Xbox::Services::UserStatistics::StatisticChangeSubscription const& subscription)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.XboxLiveAppConfiguration.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.XboxLiveAppConfiguration.cpp
index 05c1158..71dee10 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.XboxLiveAppConfiguration.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.XboxLiveAppConfiguration.cpp
@@ -7,22 +7,22 @@ namespace winrt::Microsoft::Xbox::Services::implementation
 {
     winrt::Microsoft::Xbox::Services::XboxLiveAppConfiguration XboxLiveAppConfiguration::SingletonInstance()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t XboxLiveAppConfiguration::TitleId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring XboxLiveAppConfiguration::ServiceConfigurationId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring XboxLiveAppConfiguration::Environment()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring XboxLiveAppConfiguration::Sandbox()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.XboxLiveContext.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.XboxLiveContext.cpp
index 26fe4bc..fe5aa47 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.XboxLiveContext.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.XboxLiveContext.cpp
@@ -18,12 +18,12 @@ namespace winrt::Microsoft::Xbox::Services::implementation
     }
     winrt::Windows::Xbox::System::User XboxLiveContext::User()
     {
-        Logger::NotImplemented();
+        LOG_NOTIMPLEMENTED();
         throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Social::ProfileService XboxLiveContext::ProfileService()
     {
-        Logger::NotImplemented(); 
+        LOG_NOTIMPLEMENTED(); 
         throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Social::SocialService XboxLiveContext::SocialService()
@@ -32,15 +32,15 @@ namespace winrt::Microsoft::Xbox::Services::implementation
     }
     winrt::Microsoft::Xbox::Services::Social::ReputationService XboxLiveContext::ReputationService()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Achievements::AchievementService XboxLiveContext::AchievementService()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Leaderboard::LeaderboardService XboxLiveContext::LeaderboardService()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::UserStatistics::UserStatisticsService XboxLiveContext::UserStatisticsService()
     {
@@ -48,7 +48,7 @@ namespace winrt::Microsoft::Xbox::Services::implementation
     }
     winrt::Microsoft::Xbox::Services::Matchmaking::MatchmakingService XboxLiveContext::MatchmakingService()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Multiplayer::MultiplayerService XboxLiveContext::MultiplayerService()
     {
@@ -56,7 +56,7 @@ namespace winrt::Microsoft::Xbox::Services::implementation
     }
     winrt::Microsoft::Xbox::Services::Tournaments::TournamentService XboxLiveContext::TournamentService()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::RealTimeActivity::RealTimeActivityService XboxLiveContext::RealTimeActivityService()
     {
@@ -68,46 +68,46 @@ namespace winrt::Microsoft::Xbox::Services::implementation
     }
     winrt::Microsoft::Xbox::Services::GameServerPlatform::GameServerPlatformService XboxLiveContext::GameServerPlatformService()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::TitleStorage::TitleStorageService XboxLiveContext::TitleStorageService()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Privacy::PrivacyService XboxLiveContext::PrivacyService()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::System::StringService XboxLiveContext::StringService()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::ContextualSearch::ContextualSearchService XboxLiveContext::ContextualSearchService()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Clubs::ClubsService XboxLiveContext::ClubsService()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Marketplace::CatalogService XboxLiveContext::CatalogService()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::Marketplace::InventoryService XboxLiveContext::InventoryService()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::EntertainmentProfile::EntertainmentProfileListService XboxLiveContext::EntertainmentProfileListService()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::XboxLiveContextSettings XboxLiveContext::Settings()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::XboxLiveAppConfiguration XboxLiveContext::AppConfig()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.XboxLiveContextSettings.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.XboxLiveContextSettings.cpp
index 39a463c..6c9291e 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.XboxLiveContextSettings.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.XboxLiveContextSettings.cpp
@@ -7,82 +7,82 @@ namespace winrt::Microsoft::Xbox::Services::implementation
 {
     winrt::event_token XboxLiveContextSettings::ServiceCallRouted(winrt::Windows::Foundation::EventHandler<winrt::Microsoft::Xbox::Services::XboxServiceCallRoutedEventArgs> const& __param0)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void XboxLiveContextSettings::ServiceCallRouted(winrt::event_token const& __param0) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool XboxLiveContextSettings::EnableServiceCallRoutedEvents()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void XboxLiveContextSettings::EnableServiceCallRoutedEvents(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::XboxServicesDiagnosticsTraceLevel XboxLiveContextSettings::DiagnosticsTraceLevel()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void XboxLiveContextSettings::DiagnosticsTraceLevel(winrt::Microsoft::Xbox::Services::XboxServicesDiagnosticsTraceLevel const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan XboxLiveContextSettings::HttpTimeout()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void XboxLiveContextSettings::HttpTimeout(winrt::Windows::Foundation::TimeSpan const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan XboxLiveContextSettings::LongHttpTimeout()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void XboxLiveContextSettings::LongHttpTimeout(winrt::Windows::Foundation::TimeSpan const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan XboxLiveContextSettings::HttpRetryDelay()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void XboxLiveContextSettings::HttpRetryDelay(winrt::Windows::Foundation::TimeSpan const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan XboxLiveContextSettings::HttpTimeoutWindow()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void XboxLiveContextSettings::HttpTimeoutWindow(winrt::Windows::Foundation::TimeSpan const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan XboxLiveContextSettings::WebsocketTimeoutWindow()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void XboxLiveContextSettings::WebsocketTimeoutWindow(winrt::Windows::Foundation::TimeSpan const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool XboxLiveContextSettings::UseCoreDispatcherForEventRouting()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void XboxLiveContextSettings::UseCoreDispatcherForEventRouting(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void XboxLiveContextSettings::DisableAssertsForXboxLiveThrottlingInDevSandboxes(winrt::Microsoft::Xbox::Services::XboxLiveContextThrottleSetting const& setting)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void XboxLiveContextSettings::DisableAssertsForMaximumNumberOfWebsocketsActivated(winrt::Microsoft::Xbox::Services::XboxLiveContextRecommendedSetting const& setting)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.XboxLiveHttpCall.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.XboxLiveHttpCall.cpp
index 961d534..08c0080 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.XboxLiveHttpCall.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.XboxLiveHttpCall.cpp
@@ -7,62 +7,62 @@ namespace winrt::Microsoft::Xbox::Services::implementation
 {
     winrt::Microsoft::Xbox::Services::XboxLiveHttpCall XboxLiveHttpCall::CreateXboxLiveHttpCall(winrt::Microsoft::Xbox::Services::XboxLiveContextSettings const& settings, hstring const& httpMethod, hstring const& serverName, hstring const& pathQueryFragment)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::XboxLiveHttpCallResponse> XboxLiveHttpCall::GetResponseWithAuth(winrt::Windows::Xbox::System::User user, winrt::Microsoft::Xbox::Services::HttpCallResponseBodyType httpCallResponseBodyType)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Xbox::Services::XboxLiveHttpCallResponse> XboxLiveHttpCall::GetResponseWithoutAuth(winrt::Microsoft::Xbox::Services::HttpCallResponseBodyType httpCallResponseBodyType)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void XboxLiveHttpCall::SetRequestBody(hstring const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void XboxLiveHttpCall::SetRequestBodyArray(array_view<uint8_t const> requestBodyArray)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void XboxLiveHttpCall::SetCustomHeader(hstring const& headerName, hstring const& headerValue)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool XboxLiveHttpCall::RetryAllowed()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void XboxLiveHttpCall::RetryAllowed(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring XboxLiveHttpCall::ContentTypeHeaderValue()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void XboxLiveHttpCall::ContentTypeHeaderValue(hstring const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring XboxLiveHttpCall::ContractVersionHeaderValue()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void XboxLiveHttpCall::ContractVersionHeaderValue(hstring const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring XboxLiveHttpCall::ServerName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring XboxLiveHttpCall::PathQueryFragment()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring XboxLiveHttpCall::HttpMethod()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.XboxLiveHttpCallResponse.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.XboxLiveHttpCallResponse.cpp
index 167f5d7..a4227ab 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.XboxLiveHttpCallResponse.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.XboxLiveHttpCallResponse.cpp
@@ -7,46 +7,46 @@ namespace winrt::Microsoft::Xbox::Services::implementation
 {
     winrt::Microsoft::Xbox::Services::HttpCallResponseBodyType XboxLiveHttpCallResponse::BodyType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring XboxLiveHttpCallResponse::ResponseBodyString()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring XboxLiveHttpCallResponse::ResponseBodyJson()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     com_array<uint8_t> XboxLiveHttpCallResponse::ResponseBodyVector()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IMapView<hstring, hstring> XboxLiveHttpCallResponse::Headers()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     int32_t XboxLiveHttpCallResponse::HttpStatus()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     int32_t XboxLiveHttpCallResponse::ErrorCode()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring XboxLiveHttpCallResponse::ErrorMessage()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring XboxLiveHttpCallResponse::ETag()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring XboxLiveHttpCallResponse::ResponseDate()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     int64_t XboxLiveHttpCallResponse::RetryAfterInSeconds()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.XboxLiveLogCallEventArgs.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.XboxLiveLogCallEventArgs.cpp
index 0966431..3d52dfe 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.XboxLiveLogCallEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.XboxLiveLogCallEventArgs.cpp
@@ -7,14 +7,14 @@ namespace winrt::Microsoft::Xbox::Services::implementation
 {
     winrt::Microsoft::Xbox::Services::XboxServicesDiagnosticsTraceLevel XboxLiveLogCallEventArgs::Level()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring XboxLiveLogCallEventArgs::Category()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring XboxLiveLogCallEventArgs::Message()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.XboxLiveWnsEventArgs.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.XboxLiveWnsEventArgs.cpp
index 418ac20..8dfb824 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.XboxLiveWnsEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.XboxLiveWnsEventArgs.cpp
@@ -7,10 +7,10 @@ namespace winrt::Microsoft::Xbox::Services::implementation
 {
     hstring XboxLiveWnsEventArgs::XboxUserId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring XboxLiveWnsEventArgs::NotificationType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.XboxServiceCallRoutedEventArgs.cpp b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.XboxServiceCallRoutedEventArgs.cpp
index 9e5d5f9..6e786b7 100644
--- a/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.XboxServiceCallRoutedEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Microsoft.Xbox.Services.XboxServiceCallRoutedEventArgs.cpp
@@ -7,66 +7,66 @@ namespace winrt::Microsoft::Xbox::Services::implementation
 {
     hstring XboxServiceCallRoutedEventArgs::HttpMethod()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Uri XboxServiceCallRoutedEventArgs::Url()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring XboxServiceCallRoutedEventArgs::RequestHeaders()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Microsoft::Xbox::Services::HttpCallRequestMessage XboxServiceCallRoutedEventArgs::RequestBody()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t XboxServiceCallRoutedEventArgs::ResponseCount()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring XboxServiceCallRoutedEventArgs::ResponseHeaders()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring XboxServiceCallRoutedEventArgs::ResponseBody()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring XboxServiceCallRoutedEventArgs::ETag()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring XboxServiceCallRoutedEventArgs::Token()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring XboxServiceCallRoutedEventArgs::Signature()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t XboxServiceCallRoutedEventArgs::HttpStatus()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring XboxServiceCallRoutedEventArgs::FullResponseToString()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime XboxServiceCallRoutedEventArgs::RequestTimeUTC()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime XboxServiceCallRoutedEventArgs::ResponseTimeUTC()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan XboxServiceCallRoutedEventArgs::ElapsedCallTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring XboxServiceCallRoutedEventArgs::XboxUserId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.AudioBeam.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.AudioBeam.cpp
index 8694671..55cc097 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.AudioBeam.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.AudioBeam.cpp
@@ -7,34 +7,34 @@ namespace winrt::Windows::Kinect::implementation
 {
     winrt::Windows::Kinect::AudioSource AudioBeam::AudioSource()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::AudioBeamMode AudioBeam::AudioBeamMode()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void AudioBeam::AudioBeamMode(winrt::Windows::Kinect::AudioBeamMode const& audioBeamMode)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     float AudioBeam::BeamAngle()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void AudioBeam::BeamAngle(float beamAngle)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     float AudioBeam::BeamAngleConfidence()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan AudioBeam::RelativeTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Storage::Streams::IInputStream AudioBeam::OpenInputStream()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.AudioBeamFrame.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.AudioBeamFrame.cpp
index 925b5b1..494f8c2 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.AudioBeamFrame.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.AudioBeamFrame.cpp
@@ -7,26 +7,26 @@ namespace winrt::Windows::Kinect::implementation
 {
     void AudioBeamFrame::Close()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::AudioSource AudioBeamFrame::AudioSource()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan AudioBeamFrame::Duration()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan AudioBeamFrame::RelativeTimeStart()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::AudioBeam AudioBeamFrame::AudioBeam()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Kinect::AudioBeamSubFrame> AudioBeamFrame::SubFrames()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.AudioBeamFrameReference.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.AudioBeamFrameReference.cpp
index f09ecc5..bee00d5 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.AudioBeamFrameReference.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.AudioBeamFrameReference.cpp
@@ -7,10 +7,10 @@ namespace winrt::Windows::Kinect::implementation
 {
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Kinect::AudioBeamFrame> AudioBeamFrameReference::AcquireBeamFrames()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan AudioBeamFrameReference::RelativeTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.AudioBeamSubFrame.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.AudioBeamSubFrame.cpp
index d820a73..e7dba69 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.AudioBeamSubFrame.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.AudioBeamSubFrame.cpp
@@ -7,46 +7,46 @@ namespace winrt::Windows::Kinect::implementation
 {
     void AudioBeamSubFrame::Close()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t AudioBeamSubFrame::FrameLengthInBytes()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan AudioBeamSubFrame::Duration()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     float AudioBeamSubFrame::BeamAngle()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     float AudioBeamSubFrame::BeamAngleConfidence()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::AudioBeamMode AudioBeamSubFrame::AudioBeamMode()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan AudioBeamSubFrame::RelativeTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Kinect::AudioBodyCorrelation> AudioBeamSubFrame::AudioBodyCorrelations()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void AudioBeamSubFrame::CopyFrameDataToArray(array_view<uint8_t> frameData)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void AudioBeamSubFrame::CopyFrameDataToBuffer(winrt::Windows::Storage::Streams::IBuffer const& buffer)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Storage::Streams::IBuffer AudioBeamSubFrame::LockAudioBuffer()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.AudioBodyCorrelation.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.AudioBodyCorrelation.cpp
index 2d611b3..905a838 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.AudioBodyCorrelation.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.AudioBodyCorrelation.cpp
@@ -7,6 +7,6 @@ namespace winrt::Windows::Kinect::implementation
 {
     uint64_t AudioBodyCorrelation::BodyTrackingId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.AudioFrameArrivedEventArgs.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.AudioFrameArrivedEventArgs.cpp
index d4981cb..d94f47c 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.AudioFrameArrivedEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.AudioFrameArrivedEventArgs.cpp
@@ -7,6 +7,6 @@ namespace winrt::Windows::Kinect::implementation
 {
     winrt::Windows::Kinect::AudioBeamFrameReference AudioFrameArrivedEventArgs::FrameReference()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.AudioFrameReader.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.AudioFrameReader.cpp
index 9b65b33..245c676 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.AudioFrameReader.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.AudioFrameReader.cpp
@@ -7,30 +7,30 @@ namespace winrt::Windows::Kinect::implementation
 {
     void AudioFrameReader::Close()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token AudioFrameReader::FrameArrived(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Kinect::AudioFrameReader, winrt::Windows::Kinect::AudioFrameArrivedEventArgs> const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void AudioFrameReader::FrameArrived(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Kinect::AudioBeamFrame> AudioFrameReader::AcquireLatestBeamFrames()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool AudioFrameReader::IsPaused()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void AudioFrameReader::IsPaused(bool isPaused)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::AudioSource AudioFrameReader::AudioSource()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.AudioSource.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.AudioSource.cpp
index 97e56a4..c9e721c 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.AudioSource.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.AudioSource.cpp
@@ -7,38 +7,38 @@ namespace winrt::Windows::Kinect::implementation
 {
     winrt::event_token AudioSource::FrameCaptured(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Kinect::AudioSource, winrt::Windows::Kinect::FrameCapturedEventArgs> const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void AudioSource::FrameCaptured(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::KinectSensor AudioSource::KinectSensor()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool AudioSource::IsActive()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t AudioSource::SubFrameLengthInBytes()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan AudioSource::SubFrameDuration()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t AudioSource::MaxSubFrameCount()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::AudioFrameReader AudioSource::OpenReader()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Kinect::AudioBeam> AudioSource::AudioBeams()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.Body.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.Body.cpp
index 195db3d..61be823 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.Body.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.Body.cpp
@@ -7,70 +7,70 @@ namespace winrt::Windows::Kinect::implementation
 {
     int32_t Body::JointCount()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void Body::Close()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IMapView<winrt::Windows::Kinect::JointType, winrt::Windows::Kinect::Joint> Body::Joints()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IMapView<winrt::Windows::Kinect::JointType, winrt::Windows::Kinect::JointOrientation> Body::JointOrientations()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::DetectionResult Body::Engaged()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IMapView<winrt::Windows::Kinect::Expression, winrt::Windows::Kinect::DetectionResult> Body::Expressions()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IMapView<winrt::Windows::Kinect::Activity, winrt::Windows::Kinect::DetectionResult> Body::Activities()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IMapView<winrt::Windows::Kinect::Appearance, winrt::Windows::Kinect::DetectionResult> Body::Appearance()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::HandState Body::HandLeftState()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::TrackingConfidence Body::HandLeftConfidence()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::HandState Body::HandRightState()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::TrackingConfidence Body::HandRightConfidence()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::FrameEdges Body::ClippedEdges()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint64_t Body::TrackingId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool Body::IsTracked()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Point Body::Lean()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::TrackingState Body::LeanTrackingState()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.BodyFrame.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.BodyFrame.cpp
index 6944d9e..b17bcb5 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.BodyFrame.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.BodyFrame.cpp
@@ -7,26 +7,26 @@ namespace winrt::Windows::Kinect::implementation
 {
     void BodyFrame::Close()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void BodyFrame::GetAndRefreshBodyData(winrt::Windows::Foundation::Collections::IVector<winrt::Windows::Kinect::Body> const& bodies)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     int32_t BodyFrame::BodyCount()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::Vector4 BodyFrame::FloorClipPlane()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan BodyFrame::RelativeTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::BodyFrameSource BodyFrame::BodyFrameSource()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.BodyFrameArrivedEventArgs.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.BodyFrameArrivedEventArgs.cpp
index 5864fe0..2d14fb1 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.BodyFrameArrivedEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.BodyFrameArrivedEventArgs.cpp
@@ -7,6 +7,6 @@ namespace winrt::Windows::Kinect::implementation
 {
     winrt::Windows::Kinect::BodyFrameReference BodyFrameArrivedEventArgs::FrameReference()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.BodyFrameReader.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.BodyFrameReader.cpp
index bc83609..41b5c78 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.BodyFrameReader.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.BodyFrameReader.cpp
@@ -7,30 +7,30 @@ namespace winrt::Windows::Kinect::implementation
 {
     void BodyFrameReader::Close()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token BodyFrameReader::FrameArrived(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Kinect::BodyFrameReader, winrt::Windows::Kinect::BodyFrameArrivedEventArgs> const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void BodyFrameReader::FrameArrived(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::BodyFrame BodyFrameReader::AcquireLatestFrame()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool BodyFrameReader::IsPaused()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void BodyFrameReader::IsPaused(bool isPaused)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::BodyFrameSource BodyFrameReader::BodyFrameSource()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.BodyFrameReference.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.BodyFrameReference.cpp
index de52017..3f79b0b 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.BodyFrameReference.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.BodyFrameReference.cpp
@@ -7,10 +7,10 @@ namespace winrt::Windows::Kinect::implementation
 {
     winrt::Windows::Kinect::BodyFrame BodyFrameReference::AcquireFrame()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan BodyFrameReference::RelativeTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.BodyFrameSource.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.BodyFrameSource.cpp
index cf2adf9..99665f3 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.BodyFrameSource.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.BodyFrameSource.cpp
@@ -7,34 +7,34 @@ namespace winrt::Windows::Kinect::implementation
 {
     winrt::event_token BodyFrameSource::FrameCaptured(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Kinect::BodyFrameSource, winrt::Windows::Kinect::FrameCapturedEventArgs> const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void BodyFrameSource::FrameCaptured(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool BodyFrameSource::IsActive()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     int32_t BodyFrameSource::BodyCount()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::BodyFrameReader BodyFrameSource::OpenReader()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::KinectSensor BodyFrameSource::KinectSensor()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void BodyFrameSource::OverrideHandTracking(uint64_t trackingId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void BodyFrameSource::OverrideHandTracking(uint64_t oldTrackingId, uint64_t newTrackingId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.BodyIndexFrame.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.BodyIndexFrame.cpp
index 4a3c8fb..fac9d55 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.BodyIndexFrame.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.BodyIndexFrame.cpp
@@ -7,30 +7,30 @@ namespace winrt::Windows::Kinect::implementation
 {
     void BodyIndexFrame::Close()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void BodyIndexFrame::CopyFrameDataToArray(array_view<uint8_t> frameData)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void BodyIndexFrame::CopyFrameDataToBuffer(winrt::Windows::Storage::Streams::IBuffer const& buffer)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Storage::Streams::IBuffer BodyIndexFrame::LockImageBuffer()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::FrameDescription BodyIndexFrame::FrameDescription()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan BodyIndexFrame::RelativeTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::BodyIndexFrameSource BodyIndexFrame::BodyIndexFrameSource()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.BodyIndexFrameArrivedEventArgs.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.BodyIndexFrameArrivedEventArgs.cpp
index c05b241..e8857cd 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.BodyIndexFrameArrivedEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.BodyIndexFrameArrivedEventArgs.cpp
@@ -7,6 +7,6 @@ namespace winrt::Windows::Kinect::implementation
 {
     winrt::Windows::Kinect::BodyIndexFrameReference BodyIndexFrameArrivedEventArgs::FrameReference()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.BodyIndexFrameReader.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.BodyIndexFrameReader.cpp
index 649757f..9989316 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.BodyIndexFrameReader.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.BodyIndexFrameReader.cpp
@@ -7,30 +7,30 @@ namespace winrt::Windows::Kinect::implementation
 {
     void BodyIndexFrameReader::Close()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token BodyIndexFrameReader::FrameArrived(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Kinect::BodyIndexFrameReader, winrt::Windows::Kinect::BodyIndexFrameArrivedEventArgs> const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void BodyIndexFrameReader::FrameArrived(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::BodyIndexFrame BodyIndexFrameReader::AcquireLatestFrame()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool BodyIndexFrameReader::IsPaused()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void BodyIndexFrameReader::IsPaused(bool isPaused)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::BodyIndexFrameSource BodyIndexFrameReader::BodyIndexFrameSource()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.BodyIndexFrameReference.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.BodyIndexFrameReference.cpp
index 10ee1fa..3f41b16 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.BodyIndexFrameReference.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.BodyIndexFrameReference.cpp
@@ -7,10 +7,10 @@ namespace winrt::Windows::Kinect::implementation
 {
     winrt::Windows::Kinect::BodyIndexFrame BodyIndexFrameReference::AcquireFrame()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan BodyIndexFrameReference::RelativeTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.BodyIndexFrameSource.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.BodyIndexFrameSource.cpp
index 56c08e7..162ff49 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.BodyIndexFrameSource.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.BodyIndexFrameSource.cpp
@@ -7,26 +7,26 @@ namespace winrt::Windows::Kinect::implementation
 {
     winrt::event_token BodyIndexFrameSource::FrameCaptured(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Kinect::BodyIndexFrameSource, winrt::Windows::Kinect::FrameCapturedEventArgs> const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void BodyIndexFrameSource::FrameCaptured(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool BodyIndexFrameSource::IsActive()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::BodyIndexFrameReader BodyIndexFrameSource::OpenReader()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::FrameDescription BodyIndexFrameSource::FrameDescription()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::KinectSensor BodyIndexFrameSource::KinectSensor()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.ColorFrame.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.ColorFrame.cpp
index ab9e913..eccfb11 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.ColorFrame.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.ColorFrame.cpp
@@ -7,46 +7,46 @@ namespace winrt::Windows::Kinect::implementation
 {
     void ColorFrame::Close()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::ColorImageFormat ColorFrame::RawColorImageFormat()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::FrameDescription ColorFrame::FrameDescription()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ColorFrame::CopyRawFrameDataToArray(array_view<uint8_t> frameData)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ColorFrame::CopyRawFrameDataToBuffer(winrt::Windows::Storage::Streams::IBuffer const& buffer)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Storage::Streams::IBuffer ColorFrame::LockRawImageBuffer()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ColorFrame::CopyConvertedFrameDataToArray(array_view<uint8_t> frameData, winrt::Windows::Kinect::ColorImageFormat const& colorFormat)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ColorFrame::CopyConvertedFrameDataToBuffer(winrt::Windows::Storage::Streams::IBuffer const& buffer, winrt::Windows::Kinect::ColorImageFormat const& colorFormat)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::FrameDescription ColorFrame::CreateFrameDescription(winrt::Windows::Kinect::ColorImageFormat const& format)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan ColorFrame::RelativeTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::ColorFrameSource ColorFrame::ColorFrameSource()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.ColorFrameArrivedEventArgs.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.ColorFrameArrivedEventArgs.cpp
index 717976d..7cff74c 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.ColorFrameArrivedEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.ColorFrameArrivedEventArgs.cpp
@@ -7,6 +7,6 @@ namespace winrt::Windows::Kinect::implementation
 {
     winrt::Windows::Kinect::ColorFrameReference ColorFrameArrivedEventArgs::FrameReference()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.ColorFrameReader.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.ColorFrameReader.cpp
index c60f9bb..8fd648c 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.ColorFrameReader.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.ColorFrameReader.cpp
@@ -7,30 +7,30 @@ namespace winrt::Windows::Kinect::implementation
 {
     void ColorFrameReader::Close()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token ColorFrameReader::FrameArrived(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Kinect::ColorFrameReader, winrt::Windows::Kinect::ColorFrameArrivedEventArgs> const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ColorFrameReader::FrameArrived(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::ColorFrame ColorFrameReader::AcquireLatestFrame()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool ColorFrameReader::IsPaused()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ColorFrameReader::IsPaused(bool isPaused)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::ColorFrameSource ColorFrameReader::ColorFrameSource()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.ColorFrameReference.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.ColorFrameReference.cpp
index 38c482d..dfa6874 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.ColorFrameReference.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.ColorFrameReference.cpp
@@ -7,10 +7,10 @@ namespace winrt::Windows::Kinect::implementation
 {
     winrt::Windows::Kinect::ColorFrame ColorFrameReference::AcquireFrame()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan ColorFrameReference::RelativeTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.ColorFrameSource.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.ColorFrameSource.cpp
index e064de3..6ac257e 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.ColorFrameSource.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.ColorFrameSource.cpp
@@ -7,30 +7,30 @@ namespace winrt::Windows::Kinect::implementation
 {
     winrt::event_token ColorFrameSource::FrameCaptured(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Kinect::ColorFrameSource, winrt::Windows::Kinect::FrameCapturedEventArgs> const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ColorFrameSource::FrameCaptured(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool ColorFrameSource::IsActive()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::ColorFrameReader ColorFrameSource::OpenReader()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::FrameDescription ColorFrameSource::CreateFrameDescription(winrt::Windows::Kinect::ColorImageFormat const& format)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::FrameDescription ColorFrameSource::FrameDescription()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::KinectSensor ColorFrameSource::KinectSensor()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.CoordinateMapper.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.CoordinateMapper.cpp
index b12c230..f57c2a6 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.CoordinateMapper.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.CoordinateMapper.cpp
@@ -7,54 +7,54 @@ namespace winrt::Windows::Kinect::implementation
 {
     winrt::Windows::Kinect::DepthSpacePoint CoordinateMapper::MapCameraPointToDepthSpace(winrt::Windows::Kinect::CameraSpacePoint const& cameraPoint)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::ColorSpacePoint CoordinateMapper::MapCameraPointToColorSpace(winrt::Windows::Kinect::CameraSpacePoint const& cameraPoint)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::CameraSpacePoint CoordinateMapper::MapDepthPointToCameraSpace(winrt::Windows::Kinect::DepthSpacePoint const& depthPoint, uint16_t depth)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::ColorSpacePoint CoordinateMapper::MapDepthPointToColorSpace(winrt::Windows::Kinect::DepthSpacePoint const& depthPoint, uint16_t depth)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void CoordinateMapper::MapDepthFrameToCameraSpace(array_view<uint16_t const> depthFrameData, array_view<winrt::Windows::Kinect::CameraSpacePoint> cameraSpacePoints)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void CoordinateMapper::MapDepthFrameToColorSpace(array_view<uint16_t const> depthFrameData, array_view<winrt::Windows::Kinect::ColorSpacePoint> colorSpacePoints)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void CoordinateMapper::MapDepthFrameToCameraSpaceUsingIBuffer(winrt::Windows::Storage::Streams::IBuffer const& depthFrameData, array_view<winrt::Windows::Kinect::CameraSpacePoint> cameraSpacePoints)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void CoordinateMapper::MapDepthFrameToColorSpaceUsingIBuffer(winrt::Windows::Storage::Streams::IBuffer const& depthFrameData, array_view<winrt::Windows::Kinect::ColorSpacePoint> colorSpacePoints)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void CoordinateMapper::MapColorFrameToDepthSpace(array_view<uint16_t const> depthFrameData, array_view<winrt::Windows::Kinect::DepthSpacePoint> depthSpacePoints)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void CoordinateMapper::MapColorFrameToCameraSpace(array_view<uint16_t const> depthFrameData, array_view<winrt::Windows::Kinect::CameraSpacePoint> cameraSpacePoints)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void CoordinateMapper::MapColorFrameToDepthSpaceUsingIBuffer(winrt::Windows::Storage::Streams::IBuffer const& depthFrameData, array_view<winrt::Windows::Kinect::DepthSpacePoint> depthSpacePoints)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void CoordinateMapper::MapColorFrameToCameraSpaceUsingIBuffer(winrt::Windows::Storage::Streams::IBuffer const& depthFrameData, array_view<winrt::Windows::Kinect::CameraSpacePoint> cameraSpacePoints)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     com_array<winrt::Windows::Foundation::Point> CoordinateMapper::GetDepthFrameToCameraSpaceTable()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.DepthFrame.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.DepthFrame.cpp
index 15f0d80..1ecd8a2 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.DepthFrame.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.DepthFrame.cpp
@@ -7,38 +7,38 @@ namespace winrt::Windows::Kinect::implementation
 {
     void DepthFrame::Close()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void DepthFrame::CopyFrameDataToArray(array_view<uint16_t> frameData)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void DepthFrame::CopyFrameDataToBuffer(winrt::Windows::Storage::Streams::IBuffer const& buffer)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Storage::Streams::IBuffer DepthFrame::LockImageBuffer()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::FrameDescription DepthFrame::FrameDescription()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan DepthFrame::RelativeTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::DepthFrameSource DepthFrame::DepthFrameSource()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint16_t DepthFrame::DepthMinReliableDistance()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint16_t DepthFrame::DepthMaxReliableDistance()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.DepthFrameArrivedEventArgs.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.DepthFrameArrivedEventArgs.cpp
index c466a18..7671559 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.DepthFrameArrivedEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.DepthFrameArrivedEventArgs.cpp
@@ -7,6 +7,6 @@ namespace winrt::Windows::Kinect::implementation
 {
     winrt::Windows::Kinect::DepthFrameReference DepthFrameArrivedEventArgs::FrameReference()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.DepthFrameReader.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.DepthFrameReader.cpp
index be4147f..eb1c71d 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.DepthFrameReader.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.DepthFrameReader.cpp
@@ -7,30 +7,30 @@ namespace winrt::Windows::Kinect::implementation
 {
     void DepthFrameReader::Close()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token DepthFrameReader::FrameArrived(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Kinect::DepthFrameReader, winrt::Windows::Kinect::DepthFrameArrivedEventArgs> const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void DepthFrameReader::FrameArrived(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::DepthFrame DepthFrameReader::AcquireLatestFrame()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool DepthFrameReader::IsPaused()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void DepthFrameReader::IsPaused(bool isPaused)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::DepthFrameSource DepthFrameReader::DepthFrameSource()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.DepthFrameReference.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.DepthFrameReference.cpp
index 3818462..c5b0ae9 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.DepthFrameReference.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.DepthFrameReference.cpp
@@ -7,10 +7,10 @@ namespace winrt::Windows::Kinect::implementation
 {
     winrt::Windows::Kinect::DepthFrame DepthFrameReference::AcquireFrame()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan DepthFrameReference::RelativeTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.DepthFrameSource.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.DepthFrameSource.cpp
index f4c5161..bea3ced 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.DepthFrameSource.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.DepthFrameSource.cpp
@@ -7,34 +7,34 @@ namespace winrt::Windows::Kinect::implementation
 {
     winrt::event_token DepthFrameSource::FrameCaptured(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Kinect::DepthFrameSource, winrt::Windows::Kinect::FrameCapturedEventArgs> const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void DepthFrameSource::FrameCaptured(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool DepthFrameSource::IsActive()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::DepthFrameReader DepthFrameSource::OpenReader()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint16_t DepthFrameSource::DepthMinReliableDistance()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint16_t DepthFrameSource::DepthMaxReliableDistance()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::FrameDescription DepthFrameSource::FrameDescription()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::KinectSensor DepthFrameSource::KinectSensor()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.FrameCapturedEventArgs.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.FrameCapturedEventArgs.cpp
index a0dd10a..d7e8ba4 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.FrameCapturedEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.FrameCapturedEventArgs.cpp
@@ -7,14 +7,14 @@ namespace winrt::Windows::Kinect::implementation
 {
     winrt::Windows::Kinect::FrameSourceTypes FrameCapturedEventArgs::FrameType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::FrameCapturedStatus FrameCapturedEventArgs::FrameStatus()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan FrameCapturedEventArgs::RelativeTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.FrameDescription.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.FrameDescription.cpp
index 53ae851..7289df5 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.FrameDescription.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.FrameDescription.cpp
@@ -7,30 +7,30 @@ namespace winrt::Windows::Kinect::implementation
 {
     int32_t FrameDescription::Width()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     int32_t FrameDescription::Height()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     float FrameDescription::HorizontalFieldOfView()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     float FrameDescription::VerticalFieldOfView()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     float FrameDescription::DiagonalFieldOfView()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t FrameDescription::LengthInPixels()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t FrameDescription::BytesPerPixel()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.InfraredFrame.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.InfraredFrame.cpp
index 032664f..08935b9 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.InfraredFrame.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.InfraredFrame.cpp
@@ -7,30 +7,30 @@ namespace winrt::Windows::Kinect::implementation
 {
     void InfraredFrame::Close()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void InfraredFrame::CopyFrameDataToArray(array_view<uint16_t> frameData)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void InfraredFrame::CopyFrameDataToBuffer(winrt::Windows::Storage::Streams::IBuffer const& buffer)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Storage::Streams::IBuffer InfraredFrame::LockImageBuffer()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::FrameDescription InfraredFrame::FrameDescription()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan InfraredFrame::RelativeTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::InfraredFrameSource InfraredFrame::InfraredFrameSource()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.InfraredFrameArrivedEventArgs.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.InfraredFrameArrivedEventArgs.cpp
index 33d3a45..03d81cd 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.InfraredFrameArrivedEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.InfraredFrameArrivedEventArgs.cpp
@@ -7,6 +7,6 @@ namespace winrt::Windows::Kinect::implementation
 {
     winrt::Windows::Kinect::InfraredFrameReference InfraredFrameArrivedEventArgs::FrameReference()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.InfraredFrameReader.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.InfraredFrameReader.cpp
index af05325..022b86e 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.InfraredFrameReader.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.InfraredFrameReader.cpp
@@ -7,30 +7,30 @@ namespace winrt::Windows::Kinect::implementation
 {
     void InfraredFrameReader::Close()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token InfraredFrameReader::FrameArrived(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Kinect::InfraredFrameReader, winrt::Windows::Kinect::InfraredFrameArrivedEventArgs> const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void InfraredFrameReader::FrameArrived(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::InfraredFrame InfraredFrameReader::AcquireLatestFrame()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool InfraredFrameReader::IsPaused()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void InfraredFrameReader::IsPaused(bool isPaused)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::InfraredFrameSource InfraredFrameReader::InfraredFrameSource()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.InfraredFrameReference.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.InfraredFrameReference.cpp
index adad5a5..a157c92 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.InfraredFrameReference.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.InfraredFrameReference.cpp
@@ -7,10 +7,10 @@ namespace winrt::Windows::Kinect::implementation
 {
     winrt::Windows::Kinect::InfraredFrame InfraredFrameReference::AcquireFrame()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan InfraredFrameReference::RelativeTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.InfraredFrameSource.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.InfraredFrameSource.cpp
index b6e7754..c05ab1a 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.InfraredFrameSource.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.InfraredFrameSource.cpp
@@ -7,26 +7,26 @@ namespace winrt::Windows::Kinect::implementation
 {
     winrt::event_token InfraredFrameSource::FrameCaptured(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Kinect::InfraredFrameSource, winrt::Windows::Kinect::FrameCapturedEventArgs> const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void InfraredFrameSource::FrameCaptured(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool InfraredFrameSource::IsActive()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::InfraredFrameReader InfraredFrameSource::OpenReader()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::FrameDescription InfraredFrameSource::FrameDescription()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::KinectSensor InfraredFrameSource::KinectSensor()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.IsPausedChangedEventArgs.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.IsPausedChangedEventArgs.cpp
index 46c8351..87cfcd0 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.IsPausedChangedEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.IsPausedChangedEventArgs.cpp
@@ -7,6 +7,6 @@ namespace winrt::Windows::Kinect::implementation
 {
     bool IsPausedChangedEventArgs::IsPaused()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.KinectSensor.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.KinectSensor.cpp
index fa23f65..aa79ddf 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.KinectSensor.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.KinectSensor.cpp
@@ -11,15 +11,15 @@ namespace winrt::Windows::Kinect::implementation
     }
     winrt::Windows::Foundation::Collections::IObservableMap<hstring, winrt::Windows::Kinect::KinectSensor> KinectSensor::Sensors()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token KinectSensor::IsPausedChanged(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Kinect::KinectSensor, winrt::Windows::Kinect::IsPausedChangedEventArgs> const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void KinectSensor::IsPausedChanged(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void KinectSensor::Open()
     {
@@ -41,38 +41,38 @@ namespace winrt::Windows::Kinect::implementation
     }
     winrt::Windows::Kinect::ColorFrameSource KinectSensor::ColorFrameSource()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::DepthFrameSource KinectSensor::DepthFrameSource()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::BodyFrameSource KinectSensor::BodyFrameSource()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::BodyIndexFrameSource KinectSensor::BodyIndexFrameSource()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::InfraredFrameSource KinectSensor::InfraredFrameSource()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::AudioSource KinectSensor::AudioSource()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::MultiSourceFrameReader KinectSensor::OpenMultiSourceFrameReader(winrt::Windows::Kinect::FrameSourceTypes const& enabledFrameSourceTypes)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::CoordinateMapper KinectSensor::CoordinateMapper()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring KinectSensor::UniqueKinectId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.MultiSourceFrame.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.MultiSourceFrame.cpp
index 03f2a4e..9628616 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.MultiSourceFrame.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.MultiSourceFrame.cpp
@@ -7,26 +7,26 @@ namespace winrt::Windows::Kinect::implementation
 {
     void MultiSourceFrame::Close()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::ColorFrameReference MultiSourceFrame::ColorFrameReference()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::DepthFrameReference MultiSourceFrame::DepthFrameReference()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::BodyFrameReference MultiSourceFrame::BodyFrameReference()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::BodyIndexFrameReference MultiSourceFrame::BodyIndexFrameReference()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::InfraredFrameReference MultiSourceFrame::InfraredFrameReference()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.MultiSourceFrameArrivedEventArgs.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.MultiSourceFrameArrivedEventArgs.cpp
index d8944bb..52607c5 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.MultiSourceFrameArrivedEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.MultiSourceFrameArrivedEventArgs.cpp
@@ -7,6 +7,6 @@ namespace winrt::Windows::Kinect::implementation
 {
     winrt::Windows::Kinect::MultiSourceFrameReference MultiSourceFrameArrivedEventArgs::FrameReference()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.MultiSourceFrameReader.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.MultiSourceFrameReader.cpp
index f6aca51..70fe5d1 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.MultiSourceFrameReader.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.MultiSourceFrameReader.cpp
@@ -7,34 +7,34 @@ namespace winrt::Windows::Kinect::implementation
 {
     void MultiSourceFrameReader::Close()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token MultiSourceFrameReader::MultiSourceFrameArrived(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Kinect::MultiSourceFrameReader, winrt::Windows::Kinect::MultiSourceFrameArrivedEventArgs> const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiSourceFrameReader::MultiSourceFrameArrived(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::MultiSourceFrame MultiSourceFrameReader::AcquireLatestFrame()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::FrameSourceTypes MultiSourceFrameReader::FrameSourceTypes()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool MultiSourceFrameReader::IsPaused()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void MultiSourceFrameReader::IsPaused(bool isPaused)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Kinect::KinectSensor MultiSourceFrameReader::KinectSensor()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.MultiSourceFrameReference.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.MultiSourceFrameReference.cpp
index 317eb42..2b68643 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.MultiSourceFrameReference.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.MultiSourceFrameReference.cpp
@@ -7,6 +7,6 @@ namespace winrt::Windows::Kinect::implementation
 {
     winrt::Windows::Kinect::MultiSourceFrame MultiSourceFrameReference::AcquireFrame()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Kinect.PropertyChangedEventArgs.cpp b/dlls/winrt_x/Implementation/Windows.Kinect.PropertyChangedEventArgs.cpp
index 0289451..085c613 100644
--- a/dlls/winrt_x/Implementation/Windows.Kinect.PropertyChangedEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Kinect.PropertyChangedEventArgs.cpp
@@ -7,6 +7,6 @@ namespace winrt::Windows::Kinect::implementation
 {
     hstring PropertyChangedEventArgs::PropertyName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Achievements.AchievementUnlockedEventArgs.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Achievements.AchievementUnlockedEventArgs.cpp
index 1d0301e..b186602 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Achievements.AchievementUnlockedEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Achievements.AchievementUnlockedEventArgs.cpp
@@ -6,30 +6,30 @@ namespace winrt::Windows::Xbox::Achievements::implementation
 {
     winrt::Windows::Xbox::System::User AchievementUnlockedEventArgs::User()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring AchievementUnlockedEventArgs::TitleId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring AchievementUnlockedEventArgs::ServiceConfigurationId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring AchievementUnlockedEventArgs::AchievementId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime AchievementUnlockedEventArgs::UnlockTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Uri AchievementUnlockedEventArgs::ExtendedInfoUrl()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<hstring> AchievementUnlockedEventArgs::InAppRewardValue()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.Core.CoreApplicationContext.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.Core.CoreApplicationContext.cpp
index 1dac82a..1087868 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.Core.CoreApplicationContext.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.Core.CoreApplicationContext.cpp
@@ -16,11 +16,11 @@ namespace winrt::Windows::Xbox::ApplicationModel::Core::implementation
     }
     winrt::event_token CoreApplicationContext::CurrentUserChanged(winrt::Windows::Foundation::EventHandler<winrt::Windows::Foundation::IInspectable> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void CoreApplicationContext::CurrentUserChanged(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void CoreApplicationContext::SetCurrentUser(winrt::Windows::Xbox::System::User const& value)
     {
@@ -35,10 +35,10 @@ namespace winrt::Windows::Xbox::ApplicationModel::Core::implementation
     }
     winrt::event_token CoreApplicationContext::CurrentSystemUserChanged(winrt::Windows::Foundation::EventHandler<winrt::Windows::Foundation::IInspectable> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void CoreApplicationContext::CurrentSystemUserChanged(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.Core.UserContextLookup.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.Core.UserContextLookup.cpp
index e9c2600..d04b9ac 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.Core.UserContextLookup.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.Core.UserContextLookup.cpp
@@ -6,14 +6,14 @@ namespace winrt::Windows::Xbox::ApplicationModel::Core::implementation
 {
     void UserContextLookup::RefreshUserContext(hstring const& aumid)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void UserContextLookup::GetCurrentUserContext(hstring const& aumid, winrt::Windows::Xbox::System::User& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void UserContextLookup::NotifyUserContextChanged(uint32_t userId, uint32_t userSequenceId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.State.Internal.AppInfo.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.State.Internal.AppInfo.cpp
index feb47bd..bd68599 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.State.Internal.AppInfo.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.State.Internal.AppInfo.cpp
@@ -6,10 +6,10 @@ namespace winrt::Windows::Xbox::ApplicationModel::State::Internal::implementatio
 {
     winrt::Windows::Xbox::ApplicationModel::State::Internal::IAppInfo AppInfo::FindByAumid(hstring const& aumid)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::ApplicationModel::State::Internal::IAppInfo> AppInfo::FindByTitleId(uint32_t titleId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.State.Internal.AumidQuery.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.State.Internal.AumidQuery.cpp
index 98bce05..fdecfc8 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.State.Internal.AumidQuery.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.State.Internal.AumidQuery.cpp
@@ -6,6 +6,6 @@ namespace winrt::Windows::Xbox::ApplicationModel::State::Internal::implementatio
 {
     void AumidQuery::GetXboxLiveInfo(hstring const& aumid, uint32_t& titleId, winrt::guid& primaryScid, bool& requireXboxLive)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.State.Internal.ContentCompatibility.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.State.Internal.ContentCompatibility.cpp
index 6180738..4274f65 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.State.Internal.ContentCompatibility.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.State.Internal.ContentCompatibility.cpp
@@ -6,38 +6,38 @@ namespace winrt::Windows::Xbox::ApplicationModel::State::Internal::implementatio
 {
     winrt::hresult ContentCompatibility::IsContentCompatible(winrt::guid const& contentId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::hresult ContentCompatibility::IsContentCompatible(hstring const& productId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint64_t ContentCompatibility::GetQuickResumeFlags(uint32_t titleId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool ContentCompatibility::IsQuickResumeAllowedForEra(uint32_t titleId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool ContentCompatibility::IsQuickResumeBlockedForGameCore(uint32_t titleId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::hresult ContentCompatibility::IsXbox360ContentCompatible(winrt::guid const& legacyProductId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring ContentCompatibility::GetXbox360StoreIdFromContentId(winrt::guid const& contentId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool ContentCompatibility::IsQuickResumeBlockedForServer(uint32_t titleId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t ContentCompatibility::GetMacIdBehaviorForTitleOnServer(uint32_t titleId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.State.Internal.ContentEnhancements.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.State.Internal.ContentEnhancements.cpp
index de511cb..672d1fb 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.State.Internal.ContentEnhancements.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.State.Internal.ContentEnhancements.cpp
@@ -6,54 +6,54 @@ namespace winrt::Windows::Xbox::ApplicationModel::State::Internal::implementatio
 {
     uint64_t ContentEnhancements::GetEnhancementSettings(uint32_t titleId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::ApplicationModel::State::Internal::EnhancementFeatureState ContentEnhancements::GetAutoHDREnabledGlobally()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool ContentEnhancements::GetAutoHDRAllowedForGame(uint32_t titleId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool ContentEnhancements::GetAutoHDREnabledForGame(uint32_t titleId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ContentEnhancements::SetAutoHDREnabledForGame(uint32_t titleId, bool isFeatureEnabled)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool ContentEnhancements::GetPerformanceModeAllowedForGame(uint32_t titleId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool ContentEnhancements::GetPerformanceModeEnabledForGame(uint32_t titleId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ContentEnhancements::SetPerformanceModeEnabledForGame(uint32_t titleId, bool isFeatureEnabled)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool ContentEnhancements::GetPerformanceModeForGameRequires120Hz(uint32_t titleId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::ApplicationModel::State::Internal::PerformanceModeDetails ContentEnhancements::GetPerformanceModeDetailsForGame(uint32_t titleId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool ContentEnhancements::GetAutoHDRAllowedForGameFromManifest(hstring const& aumid)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool ContentEnhancements::GetAutoHDREnabledForGameFromManifest(uint32_t titleId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool ContentEnhancements::IsGen9AwareGame(winrt::guid const& legacyProductId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.State.Internal.PackageFullNameQuery.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.State.Internal.PackageFullNameQuery.cpp
index 2491491..4611b89 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.State.Internal.PackageFullNameQuery.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.State.Internal.PackageFullNameQuery.cpp
@@ -6,18 +6,18 @@ namespace winrt::Windows::Xbox::ApplicationModel::State::Internal::implementatio
 {
     bool PackageFullNameQuery::IsInbox(hstring const& packageFullName)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool PackageFullNameQuery::IsEra(hstring const& packageFullName)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::ApplicationModel::State::Internal::PackageContentType PackageFullNameQuery::GetContentType(hstring const& packageFullName)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool PackageFullNameQuery::IsGameCore(hstring const& packageFullName)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.State.Internal.PackageInfo.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.State.Internal.PackageInfo.cpp
index 3c25d19..dad6ae6 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.State.Internal.PackageInfo.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.State.Internal.PackageInfo.cpp
@@ -6,58 +6,58 @@ namespace winrt::Windows::Xbox::ApplicationModel::State::Internal::implementatio
 {
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::ApplicationModel::State::Internal::IPackageInfo> PackageInfo::Find(winrt::Windows::Xbox::ApplicationModel::State::Internal::FindPackageInfoFilter const& filter)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::ApplicationModel::State::Internal::IPackageInfo> PackageInfo::FindByDeviceId(winrt::guid const& deviceId, winrt::Windows::Xbox::ApplicationModel::State::Internal::FindPackageInfoFilter const& filter)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::ApplicationModel::State::Internal::IPackageInfo> PackageInfo::FindByContentId(winrt::guid const& contentId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::ApplicationModel::State::Internal::IPackageInfo> PackageInfo::FindByProductId(winrt::guid const& productId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::ApplicationModel::State::Internal::IPackageInfo> PackageInfo::FindByTitleId(uint32_t titleId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::ApplicationModel::State::Internal::IPackageInfo> PackageInfo::FindByAllowedProductId(winrt::guid const& allowedProductId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::ApplicationModel::State::Internal::IPackageInfo PackageInfo::FindByPackageInstanceId(hstring const& packageInstanceId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::ApplicationModel::State::Internal::IPackageInfo> PackageInfo::FindUniversalPackagesByFamilyName(hstring const& packageFamilyName)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::ApplicationModel::State::Internal::IPackageInfo> PackageInfo::FindByAllowedPackageFamilyName(hstring const& allowedPackageFamilyName)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::ApplicationModel::State::Internal::IPackageInfo> PackageInfo::FindUnparented()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::ApplicationModel::State::Internal::IPackageInfo PackageInfo::FindByFullName(hstring const& fullName)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::ApplicationModel::State::Internal::IPackageInfo> PackageInfo::FindByTitleSearchString(hstring const& searchString, uint32_t maxResults)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::ApplicationModel::State::Internal::IPackageInfo PackageInfo::FindGameHub(winrt::guid const& gameHubId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::ApplicationModel::State::Internal::IPackageInfo> PackageInfo::FindPackagesForGameHub(winrt::guid const& gameHubId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.State.Internal.PackageInfoEvents.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.State.Internal.PackageInfoEvents.cpp
index f9ece40..431196d 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.State.Internal.PackageInfoEvents.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.State.Internal.PackageInfoEvents.cpp
@@ -6,22 +6,22 @@ namespace winrt::Windows::Xbox::ApplicationModel::State::Internal::implementatio
 {
     winrt::event_token PackageInfoEvents::PackageChanged(winrt::Windows::Foundation::EventHandler<winrt::Windows::Xbox::ApplicationModel::State::Internal::IPackageChangedEventArgs> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void PackageInfoEvents::PackageChanged(winrt::event_token const& cookie) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token PackageInfoEvents::PackageReset(winrt::Windows::Foundation::EventHandler<winrt::Windows::Foundation::IInspectable> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void PackageInfoEvents::PackageReset(winrt::event_token const& cookie) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void PackageInfoEvents::LogStats()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.State.Internal.ProtocolQuery.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.State.Internal.ProtocolQuery.cpp
index 9aa1790..1cbb162 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.State.Internal.ProtocolQuery.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.State.Internal.ProtocolQuery.cpp
@@ -6,6 +6,6 @@ namespace winrt::Windows::Xbox::ApplicationModel::State::Internal::implementatio
 {
     winrt::Windows::Foundation::Collections::IVectorView<hstring> ProtocolQuery::FindAumidsForScheme(hstring const& scheme)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.Store.Configuration.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.Store.Configuration.cpp
index 23cc14d..7e1691b 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.Store.Configuration.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.Store.Configuration.cpp
@@ -6,6 +6,6 @@ namespace winrt::Windows::Xbox::ApplicationModel::Store::implementation
 {
     hstring Configuration::MarketplaceId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.Store.Product.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.Store.Product.cpp
index 1327073..ce06297 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.Store.Product.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.Store.Product.cpp
@@ -7,23 +7,23 @@ namespace winrt::Windows::Xbox::ApplicationModel::Store::implementation
 {
     winrt::Windows::Foundation::IAsyncAction Product::ShowPurchaseAsync(winrt::Windows::Xbox::System::IUser requestingUser, hstring offer)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction Product::ShowDetailsAsync(winrt::Windows::Xbox::System::IUser requestingUser, hstring productId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction Product::ShowMarketplaceAsync(winrt::Windows::Xbox::System::IUser requestingUser, winrt::Windows::Xbox::ApplicationModel::Store::ProductItemTypes inputProductItemType, hstring inputProductId, winrt::Windows::Xbox::ApplicationModel::Store::ProductItemTypes resultProductItemTypes)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction Product::ShowRedeemCodeAsync(winrt::Windows::Xbox::System::IUser user, hstring offer)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction Product::ShowSubscriptionAsync(winrt::Windows::Xbox::System::IUser user, hstring productId, uint32_t privilegeId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Xbox::ApplicationModel::Store::PrivilegeCheckResult> Product::CheckPrivilegeAsync(winrt::Windows::Xbox::System::IUser user, uint32_t privilegeId, bool attemptResolution, hstring friendlyDisplay)
     {
@@ -45,18 +45,18 @@ namespace winrt::Windows::Xbox::ApplicationModel::Store::implementation
     }
     winrt::Windows::Foundation::IAsyncAction Product::ShowPurchaseForStoreIdAsync(winrt::Windows::Xbox::System::IUser requestingUser, hstring storeId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction Product::ShowDetailsForStoreIdAsync(winrt::Windows::Xbox::System::IUser requestingUser, hstring storeId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction Product::ShowUpsellAsync(winrt::Windows::Xbox::System::IUser requestingUser, uint32_t privilegeId, hstring prioritizedSku, uint32_t upsellEntryPoint, hstring referProductId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction Product::ShowUpsellThirdPartyNoticeAsync(winrt::Windows::Xbox::System::IUser requestingUser)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.Store.ProductPurchasedEventArgs.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.Store.ProductPurchasedEventArgs.cpp
index c5a6180..ad5a04b 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.Store.ProductPurchasedEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.ApplicationModel.Store.ProductPurchasedEventArgs.cpp
@@ -7,6 +7,6 @@ namespace winrt::Windows::Xbox::ApplicationModel::Store::implementation
 {
     hstring ProductPurchasedEventArgs::Receipt()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Chat.ChatChannel.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Chat.ChatChannel.cpp
index cba387d..78df7f4 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Chat.ChatChannel.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Chat.ChatChannel.cpp
@@ -6,6 +6,6 @@ namespace winrt::Windows::Xbox::Chat::implementation
 {
     winrt::Windows::Foundation::Collections::IVector<winrt::Windows::Xbox::Chat::IChatParticipant> ChatChannel::Participants()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Chat.ChatDecoder.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Chat.ChatDecoder.cpp
index e751c7d..d302b99 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Chat.ChatDecoder.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Chat.ChatDecoder.cpp
@@ -6,14 +6,14 @@ namespace winrt::Windows::Xbox::Chat::implementation
 {
     winrt::Windows::Xbox::Chat::IFormat ChatDecoder::Format()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ChatDecoder::Decode(winrt::Windows::Storage::Streams::IBuffer const& buffer, winrt::Windows::Storage::Streams::IBuffer& decodedBuffer)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     int32_t ChatDecoder::IsDataInFlight()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Chat.ChatEncoder.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Chat.ChatEncoder.cpp
index 9e61940..339eab5 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Chat.ChatEncoder.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Chat.ChatEncoder.cpp
@@ -6,18 +6,18 @@ namespace winrt::Windows::Xbox::Chat::implementation
 {
     ChatEncoder::ChatEncoder(winrt::Windows::Xbox::Chat::IFormat const& sourceFormat, winrt::Windows::Xbox::Chat::EncodingQuality const& quality)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ChatEncoder::Encode(winrt::Windows::Storage::Streams::IBuffer const& buffer, winrt::Windows::Storage::Streams::IBuffer& encodedBuffer)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     int32_t ChatEncoder::IsDataInFlight()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ChatEncoder::Encode(winrt::Windows::Storage::Streams::IBuffer const& buffer, winrt::Windows::Xbox::Chat::ChatBufferSource const& bufferSource, winrt::Windows::Storage::Streams::IBuffer& encodedBuffer, winrt::Windows::Xbox::Chat::ChatBufferSource& pEncodedBufferSource)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Chat.ChatMuteList.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Chat.ChatMuteList.cpp
index 7dca3c6..a775e62 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Chat.ChatMuteList.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Chat.ChatMuteList.cpp
@@ -6,10 +6,10 @@ namespace winrt::Windows::Xbox::Chat::implementation
 {
     winrt::event_token ChatMuteList::UserMuteStateChanged(winrt::Windows::Foundation::EventHandler<winrt::Windows::Xbox::Chat::UserMuteStateChangedEventArgs> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ChatMuteList::UserMuteStateChanged(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Chat.ChatParticipant.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Chat.ChatParticipant.cpp
index 91ea00e..2754ad3 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Chat.ChatParticipant.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Chat.ChatParticipant.cpp
@@ -6,30 +6,30 @@ namespace winrt::Windows::Xbox::Chat::implementation
 {
     ChatParticipant::ChatParticipant(winrt::Windows::Xbox::System::IUser const& user)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::System::IUser ChatParticipant::User()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Chat::ChatParticipantTypes ChatParticipant::ParticipantType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ChatParticipant::ParticipantType(winrt::Windows::Xbox::Chat::ChatParticipantTypes const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     float ChatParticipant::Volume()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ChatParticipant::Volume(float value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ChatParticipant::SynthesizeTextMessageAsAudioBuffers(hstring const& message, winrt::Windows::Media::SpeechSynthesis::VoiceInformation const& preferredVoice)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Chat.ChatSession.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Chat.ChatSession.cpp
index 091363c..c5d3a9c 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Chat.ChatSession.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Chat.ChatSession.cpp
@@ -6,54 +6,54 @@ namespace winrt::Windows::Xbox::Chat::implementation
 {
     ChatSession::ChatSession(winrt::Windows::Foundation::TimeSpan const& period, winrt::Windows::Xbox::Chat::ChatFeatures const& enabledFeatures)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     ChatSession::ChatSession(winrt::Windows::Foundation::TimeSpan const& period, uint32_t processorAffinity, winrt::Windows::Xbox::Chat::ChatFeatures const& enabledFeatures)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVector<winrt::Windows::Xbox::Chat::IChatChannel> ChatSession::Channels()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token ChatSession::StateChangedEvent(winrt::Windows::Xbox::Chat::ChatSessionStateChangedHandler const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ChatSession::StateChangedEvent(winrt::event_token const& cookie) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Xbox::Chat::IChatSessionState> ChatSession::GetStateAsync()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ChatSession::TranscriptionEnabled(int32_t value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     int32_t ChatSession::TranscriptionEnabled()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Chat::ChatEncoder ChatSession::CreateTranscribingEncoder(winrt::Windows::Xbox::Chat::IChatParticipant const& participant, winrt::Windows::Xbox::Chat::IFormat const& sourceFormat, winrt::Windows::Xbox::Chat::EncodingQuality const& quality)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token ChatSession::TranscribedTextReadyEvent(winrt::Windows::Xbox::Chat::ChatParticipantTranscribedTextReadyHandler const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ChatSession::TranscribedTextReadyEvent(winrt::event_token const& cookie) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Chat::ChatRestriction ChatSession::GetParticipantRelationship(winrt::Windows::Xbox::Chat::IChatParticipant const& sourceParticipant, winrt::Windows::Xbox::Chat::IChatParticipant const& targetParticipant)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::System::IAudioDeviceInfo ChatSession::GetDedicatedSynthesisDevice(winrt::Windows::Xbox::Chat::IChatParticipant const& participant)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Chat.ChatUserCorrelation.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Chat.ChatUserCorrelation.cpp
index 812d8f6..17d506f 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Chat.ChatUserCorrelation.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Chat.ChatUserCorrelation.cpp
@@ -6,6 +6,6 @@ namespace winrt::Windows::Xbox::Chat::implementation
 {
     winrt::Windows::Xbox::System::IUser ChatUserCorrelation::User()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Chat.Format.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Chat.Format.cpp
index 5fa64d2..8b77525 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Chat.Format.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Chat.Format.cpp
@@ -6,38 +6,38 @@ namespace winrt::Windows::Xbox::Chat::implementation
 {
     void Format::BitsPerSample(uint32_t value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t Format::BitsPerSample()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t Format::Bitrate()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void Format::ChannelCount(uint32_t value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t Format::ChannelCount()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void Format::SampleRate(uint32_t value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t Format::SampleRate()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void Format::Subtype(winrt::guid const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::guid Format::Subtype()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Chat.UserMuteStateChangedEventArgs.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Chat.UserMuteStateChangedEventArgs.cpp
index 321ad32..8a15dc1 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Chat.UserMuteStateChangedEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Chat.UserMuteStateChangedEventArgs.cpp
@@ -6,14 +6,14 @@ namespace winrt::Windows::Xbox::Chat::implementation
 {
     winrt::Windows::Xbox::System::IUser UserMuteStateChangedEventArgs::Owner()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring UserMuteStateChangedEventArgs::RecipientXboxUserId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool UserMuteStateChangedEventArgs::Muted()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Input.BodyController.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Input.BodyController.cpp
index 51966ad..b1ee1d1 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Input.BodyController.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Input.BodyController.cpp
@@ -6,78 +6,78 @@ namespace winrt::Windows::Xbox::Input::implementation
 {
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Input::IBodyController> BodyController::BodyControllers()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token BodyController::BodyControllerAdded(winrt::Windows::Foundation::EventHandler<winrt::Windows::Xbox::Input::BodyControllerAddedEventArgs> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void BodyController::BodyControllerAdded(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token BodyController::BodyControllerRemoved(winrt::Windows::Foundation::EventHandler<winrt::Windows::Xbox::Input::BodyControllerRemovedEventArgs> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void BodyController::BodyControllerRemoved(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint64_t BodyController::Id()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring BodyController::Type()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::System::User BodyController::User()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t BodyController::BiometricUserId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token BodyController::BiometricUserChanged(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Input::BodyController, winrt::Windows::Xbox::Input::IBiometricUserChangedEventArgs> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void BodyController::BiometricUserChanged(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Input::IBodyControllerReading BodyController::GetCurrentReading()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token BodyController::ReadingChanged(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Input::BodyController, winrt::Windows::Xbox::Input::IBodyControllerReadingChangedEventArgs> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void BodyController::ReadingChanged(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<uint64_t> BodyController::AssociatedControllerIds()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token BodyController::AssociatedControllerAdded(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Input::BodyController, winrt::Windows::Xbox::Input::IAssociatedControllerAddedEventArgs> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void BodyController::AssociatedControllerAdded(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token BodyController::AssociatedControllerRemoved(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Input::BodyController, winrt::Windows::Xbox::Input::IAssociatedControllerRemovedEventArgs> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void BodyController::AssociatedControllerRemoved(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Input.BodyHandPair.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Input.BodyHandPair.cpp
index fd742ad..074fe91 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Input.BodyHandPair.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Input.BodyHandPair.cpp
@@ -6,10 +6,10 @@ namespace winrt::Windows::Xbox::Input::implementation
 {
     uint64_t BodyHandPair::BodyTrackingId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void BodyHandPair::BodyTrackingId(uint64_t trackingId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Input.BrokeredInteractions.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Input.BrokeredInteractions.cpp
index a37e144..a7b7632 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Input.BrokeredInteractions.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Input.BrokeredInteractions.cpp
@@ -6,50 +6,50 @@ namespace winrt::Windows::Xbox::Input::implementation
 {
     winrt::Windows::Xbox::Input::InputMode BrokeredInteractions::SmartglassInputMode()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void BrokeredInteractions::SmartglassInputMode(winrt::Windows::Xbox::Input::InputMode const& mode)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Input::ManipulationMode BrokeredInteractions::SmartglassManipulationModes()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void BrokeredInteractions::SmartglassManipulationModes(winrt::Windows::Xbox::Input::ManipulationMode const& mode)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Input::InputMode BrokeredInteractions::GamepadInputMode()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void BrokeredInteractions::GamepadInputMode(winrt::Windows::Xbox::Input::InputMode const& mode)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Input::ManipulationMode BrokeredInteractions::GamepadManipulationModes()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void BrokeredInteractions::GamepadManipulationModes(winrt::Windows::Xbox::Input::ManipulationMode const& mode)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void BrokeredInteractions::SetManipulationRect(int32_t left, int32_t top, int32_t right, int32_t bottom)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void BrokeredInteractions::SetSystemCursorAttractionRect(int32_t left, int32_t top, int32_t right, int32_t bottom)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void BrokeredInteractions::ForceGamepadCursorActivation(int32_t x, int32_t y)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void BrokeredInteractions::SetCursorPos(int32_t x, int32_t y)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Input.Controller.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Input.Controller.cpp
index 0dd19ce..1037616 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Input.Controller.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Input.Controller.cpp
@@ -22,7 +22,7 @@ namespace winrt::Windows::Xbox::Input::implementation
     winrt::event_token Controller::ControllerAdded(winrt::Windows::Foundation::EventHandler<winrt::Windows::Xbox::Input::ControllerAddedEventArgs> const& handler)
     {
         wprintf(L"Controller || Controller Added!\n");
-        Logger::NotImplemented(); return {};
+        LOG_NOTIMPLEMENTED(); return {};
     }
     void Controller::ControllerAdded(winrt::event_token const& token) noexcept
     {
@@ -32,7 +32,7 @@ namespace winrt::Windows::Xbox::Input::implementation
     winrt::event_token Controller::ControllerRemoved(winrt::Windows::Foundation::EventHandler<winrt::Windows::Xbox::Input::ControllerRemovedEventArgs> const& handler)
     {
         wprintf(L"Controller || Controller Removed!\n");
-        Logger::NotImplemented(); return {};
+        LOG_NOTIMPLEMENTED(); return {};
     }
     void Controller::ControllerRemoved(winrt::event_token const& token) noexcept
     {
@@ -42,7 +42,7 @@ namespace winrt::Windows::Xbox::Input::implementation
     winrt::event_token Controller::ControllerPairingChanged(winrt::Windows::Foundation::EventHandler<winrt::Windows::Xbox::Input::ControllerPairingChangedEventArgs> const& handler)
     {
         wprintf(L"Controller || ControllerPairingChanged!\n");
-        Logger::NotImplemented(); return {};
+        LOG_NOTIMPLEMENTED(); return {};
     }
     void Controller::ControllerPairingChanged(winrt::event_token const& token) noexcept
     {
@@ -52,7 +52,7 @@ namespace winrt::Windows::Xbox::Input::implementation
     winrt::event_token Controller::ControllerOrderChanged(winrt::Windows::Foundation::EventHandler<winrt::Windows::Xbox::Input::ControllerOrderChangedEventArgs> const& handler)
     {
         wprintf(L"Controller || ControllerOrderChanged!\n");
-        Logger::NotImplemented(); return {};
+        LOG_NOTIMPLEMENTED(); return {};
     }
     void Controller::ControllerOrderChanged(winrt::event_token const& token) noexcept
     {
@@ -72,12 +72,12 @@ namespace winrt::Windows::Xbox::Input::implementation
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Input::IController> Controller::GetControllersOrderedLeftToRight(winrt::Windows::Xbox::Input::ControllerOrderFilter const& orderFilter)
     {
         wprintf(L"Controller || GetControllersOrderedLeftToRight!\n");
-        Logger::NotImplemented(); return {};
+        LOG_NOTIMPLEMENTED(); return {};
         
     }
     uint64_t Controller::Id( )
     {
-        Logger::NotImplemented(); return 0;
+        LOG_NOTIMPLEMENTED(); return 0;
     }
     hstring Controller::Type( )
     {
@@ -91,7 +91,7 @@ namespace winrt::Windows::Xbox::Input::implementation
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::System::IAudioDeviceInfo> Controller::AudioDevices( )
     {
         Logger::Warning("[AudioDevices] STUBBED\n");
-        Logger::NotImplemented(); return {};
+        LOG_NOTIMPLEMENTED(); return {};
     }
     winrt::Windows::Xbox::Input::GameControllerVersionInfo Controller::FirmwareVersionInfo( )
     {
@@ -113,10 +113,10 @@ namespace winrt::Windows::Xbox::Input::implementation
     }
     uint16_t Controller::HardwareProductId( )
     {
-        Logger::NotImplemented(); return 0;
+        LOG_NOTIMPLEMENTED(); return 0;
     }
     uint16_t Controller::HardwareVendorId( )
     {
-        Logger::NotImplemented(); return 0;
+        LOG_NOTIMPLEMENTED(); return 0;
     }
 }
\ No newline at end of file
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Input.ControllerInputManager.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Input.ControllerInputManager.cpp
index 41ff03f..c797cae 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Input.ControllerInputManager.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Input.ControllerInputManager.cpp
@@ -6,6 +6,6 @@ namespace winrt::Windows::Xbox::Input::implementation
 {
     winrt::Windows::Xbox::Input::IController ControllerInputManager::GetControllerFromIndex(uint32_t index)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Input.Gamepad.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Input.Gamepad.cpp
index 275e723..5fc6ca5 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Input.Gamepad.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Input.Gamepad.cpp
@@ -40,22 +40,22 @@ namespace winrt::Windows::Xbox::Input::implementation
     winrt::event_token Gamepad::GamepadAdded(winrt::Windows::Foundation::EventHandler<winrt::Windows::Xbox::Input::GamepadAddedEventArgs> const& handler)
     {
 		wprintf(L"Gamepad || Gamepad Added!\n");
-        Logger::NotImplemented(); return {};
+        LOG_NOTIMPLEMENTED(); return {};
     }
     void Gamepad::GamepadAdded(winrt::event_token const& token) noexcept
     {
         wprintf(L"Gamepad || Gamepad Added!\n");
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token Gamepad::GamepadRemoved(winrt::Windows::Foundation::EventHandler<winrt::Windows::Xbox::Input::GamepadRemovedEventArgs> const& handler)
     {
 		wprintf(L"Gamepad || Gamepad Removed!\n");
-        Logger::NotImplemented(); return {};
+        LOG_NOTIMPLEMENTED(); return {};
     }
     void Gamepad::GamepadRemoved(winrt::event_token const& token) noexcept
     {
         wprintf(L"Gamepad || Gamepad Removed!\n");
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint64_t Gamepad::Id()
     {
@@ -73,7 +73,7 @@ namespace winrt::Windows::Xbox::Input::implementation
     }
     winrt::Windows::Xbox::Input::INavigationReading Gamepad::GetNavigationReading()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Input::RawNavigationReading Gamepad::GetRawNavigationReading()
     {
@@ -84,11 +84,11 @@ namespace winrt::Windows::Xbox::Input::implementation
     }
     winrt::event_token Gamepad::NavigationReadingChanged(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Input::NavigationController, winrt::Windows::Xbox::Input::INavigationReadingChangedEventArgs> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void Gamepad::NavigationReadingChanged(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void Gamepad::SetVibration(winrt::Windows::Xbox::Input::GamepadVibration const& value)
     {
@@ -138,11 +138,11 @@ namespace winrt::Windows::Xbox::Input::implementation
     }
     winrt::event_token Gamepad::ReadingChanged(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Input::Gamepad, winrt::Windows::Xbox::Input::IGamepadReadingChangedEventArgs> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void Gamepad::ReadingChanged(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool Gamepad::IsTrusted()
     {
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Input.InputManager.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Input.InputManager.cpp
index a93824c..6c531e1 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Input.InputManager.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Input.InputManager.cpp
@@ -6,98 +6,98 @@ namespace winrt::Windows::Xbox::Input::implementation
 {
     void InputManager::SetKinectOnePersonSystemEngagement()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void InputManager::SetKinectTwoPersonSystemEngagement()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void InputManager::SetKinectOnePersonManualEngagement(winrt::Windows::Xbox::Input::BodyHandPair const& bodyHandPair)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void InputManager::SetKinectTwoPersonManualEngagement(winrt::Windows::Xbox::Input::BodyHandPair const& bodyHandPair1, winrt::Windows::Xbox::Input::BodyHandPair const& bodyHandPair2)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Input::BodyHandPair> InputManager::KinectManualEngagedHands()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Input::KinectEngagementMode InputManager::KinectEngagementMode()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t InputManager::MaximumKinectEngagedPersonCount()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Input::SystemCursorVisibility InputManager::SystemCursorVisibility()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void InputManager::SystemCursorVisibility(winrt::Windows::Xbox::Input::SystemCursorVisibility const& visibility)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void InputManager::DeferSystemGestures()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void InputManager::OverrideKinectInteractionMode(winrt::Windows::Xbox::Input::KinectInteractionMode const& mode)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool InputManager::DoesGamepadDeferKinectInteractions()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void InputManager::DoesGamepadDeferKinectInteractions(bool doesGamepadDeferKinectInteractions)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool InputManager::IsKinectPersonEngaged()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token InputManager::IsKinectPersonEngagedChanged(winrt::Windows::Foundation::EventHandler<winrt::Windows::Xbox::Input::IsKinectPersonEngagedChangedEventArgs> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void InputManager::IsKinectPersonEngagedChanged(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Input::InputMode InputManager::SmartglassInputMode()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void InputManager::SmartglassInputMode(winrt::Windows::Xbox::Input::InputMode const& mode)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Input::ManipulationMode InputManager::SmartglassManipulationModes()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void InputManager::SmartglassManipulationModes(winrt::Windows::Xbox::Input::ManipulationMode const& mode)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Input::InputMode InputManager::GamepadInputMode()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void InputManager::GamepadInputMode(winrt::Windows::Xbox::Input::InputMode const& mode)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Input::ManipulationMode InputManager::GamepadManipulationModes()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void InputManager::GamepadManipulationModes(winrt::Windows::Xbox::Input::ManipulationMode const& mode)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Input.InputManagerInternal.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Input.InputManagerInternal.cpp
index bb70409..cdf342d 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Input.InputManagerInternal.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Input.InputManagerInternal.cpp
@@ -6,22 +6,22 @@ namespace winrt::Windows::Xbox::Input::implementation
 {
     void InputManagerInternal::OverrideKinectInteractionMode(winrt::Windows::Xbox::Input::KinectInteractionMode const& mode, uint32_t durationMilliseconds)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void InputManagerInternal::SetManipulationRect(int32_t left, int32_t top, int32_t right, int32_t bottom)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void InputManagerInternal::SetSystemCursorAttractionRect(int32_t left, int32_t top, int32_t right, int32_t bottom)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void InputManagerInternal::ForceGamepadCursorActivation(int32_t x, int32_t y)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void InputManagerInternal::SetCursorPos(int32_t x, int32_t y)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Input.NavigationController.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Input.NavigationController.cpp
index 35ee6ce..046552c 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Input.NavigationController.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Input.NavigationController.cpp
@@ -6,50 +6,50 @@ namespace winrt::Windows::Xbox::Input::implementation
 {
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Input::INavigationController> NavigationController::NavigationControllers()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token NavigationController::NavigationControllerAdded(winrt::Windows::Foundation::EventHandler<winrt::Windows::Xbox::Input::NavigationControllerAddedEventArgs> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void NavigationController::NavigationControllerAdded(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token NavigationController::NavigationControllerRemoved(winrt::Windows::Foundation::EventHandler<winrt::Windows::Xbox::Input::NavigationControllerRemovedEventArgs> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void NavigationController::NavigationControllerRemoved(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint64_t NavigationController::Id()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring NavigationController::Type()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::System::User NavigationController::User()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Input::INavigationReading NavigationController::GetNavigationReading()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Input::RawNavigationReading NavigationController::GetRawNavigationReading()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token NavigationController::NavigationReadingChanged(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Input::NavigationController, winrt::Windows::Xbox::Input::INavigationReadingChangedEventArgs> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void NavigationController::NavigationReadingChanged(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Input.NavigationReading.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Input.NavigationReading.cpp
index 6b88205..c84bc9f 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Input.NavigationReading.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Input.NavigationReading.cpp
@@ -6,58 +6,58 @@ namespace winrt::Windows::Xbox::Input::implementation
 {
     winrt::Windows::Foundation::DateTime NavigationReading::Timestamp()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Input::NavigationButtons NavigationReading::Buttons()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool NavigationReading::IsUpPressed()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool NavigationReading::IsDownPressed()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool NavigationReading::IsLeftPressed()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool NavigationReading::IsRightPressed()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool NavigationReading::IsMenuPressed()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool NavigationReading::IsViewPressed()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool NavigationReading::IsPreviousPagePressed()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool NavigationReading::IsNextPagePressed()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool NavigationReading::IsAcceptPressed()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool NavigationReading::IsCancelPressed()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool NavigationReading::IsXPressed()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool NavigationReading::IsYPressed()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Management.Deployment.ContentInstallManager.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Management.Deployment.ContentInstallManager.cpp
index 96906f4..212aa5f 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Management.Deployment.ContentInstallManager.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Management.Deployment.ContentInstallManager.cpp
@@ -6,198 +6,198 @@ namespace winrt::Windows::Xbox::Management::Deployment::implementation
 {
     void ContentInstallManager::StartInstall(hstring const& source, winrt::guid const& contentId, winrt::Windows::Xbox::Management::Deployment::IContentMetadata const& metadata, winrt::Windows::Xbox::Management::Deployment::InstallUpdateBehavior const& update)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ContentInstallManager::QueueInstall(hstring const& source, winrt::guid const& contentId, winrt::Windows::Xbox::Management::Deployment::IContentMetadata const& metadata, winrt::Windows::Xbox::Management::Deployment::InstallUpdateBehavior const& update)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ContentInstallManager::Uninstall(hstring const& packageInstanceId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ContentInstallManager::CancelInstall(hstring const& packageInstanceId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ContentInstallManager::PauseInstall(hstring const& packageInstanceId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ContentInstallManager::ResumeInstall(hstring const& packageInstanceId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction ContentInstallManager::RegistrationAsync(hstring packageInstanceId, uint32_t timeout)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool ContentInstallManager::IsInstalled(winrt::guid const& contentId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Management::Deployment::InstallQueueItemState ContentInstallManager::GetQueuedItemState(hstring const& packageInstanceId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::hresult ContentInstallManager::GetQueuedItemError(hstring const& packageInstanceId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     float ContentInstallManager::GetQueuedItemInstallationProgress(hstring const& packageInstanceId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Management::Deployment::InstallQueueItemInstallationType ContentInstallManager::GetQueuedItemInstallationType(hstring const& packageInstanceId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint64_t ContentInstallManager::GetQueuedItemPackageSize(hstring const& packageInstanceId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint64_t ContentInstallManager::GetQueuedUpdateDiskSpaceRequired(hstring const& packageInstanceId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ContentInstallManager::GetPackagePersistentLocalStorageInfoById(hstring const& packageInstanceId, uint64_t& persistentLocalStorageSize, bool& allocated)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ContentInstallManager::DeletePackagePersistentLocalStorageById(winrt::guid const& contentId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ContentInstallManager::GetPackageSharedStorageInfoById(winrt::guid const& contentId, uint64_t& sharedStorageSize, bool& allocated)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ContentInstallManager::GetPackageAppSpecificStorageById(hstring const& packageInstanceId, uint64_t& appSpecificSize)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Management::Deployment::RegistrationState ContentInstallManager::GetPackageRegistrationState(hstring const& packageInstanceId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring ContentInstallManager::GetPackageRegionSpecifier(hstring const& packageInstanceId, winrt::Windows::Xbox::Management::Deployment::RegionSpecifierKey const& key, winrt::Windows::Xbox::Management::Deployment::RegionSpecifierType const& type)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ContentInstallManager::StartPackageCopyFromStorage(winrt::Windows::Foundation::Collections::IVectorView<hstring> const& packageInstanceIds, winrt::guid const& destDeviceId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ContentInstallManager::StartPackageMoveFromStorage(winrt::Windows::Foundation::Collections::IVectorView<hstring> const& packageInstanceIds, winrt::guid const& destDeviceId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::guid ContentInstallManager::FindDeviceWithAvailableSpaceForQueuedPackage(hstring const& packageInstanceId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ContentInstallManager::ReQueuePackageInstallToDevice(hstring const& packageInstanceId, winrt::guid const& deviceId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ContentInstallManager::StartGroupInstall(winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Management::Deployment::IContentInstallationInfo> const& value, winrt::Windows::Xbox::Management::Deployment::InstallUpdateBehavior const& update)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ContentInstallManager::QueueGroupInstall(winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Management::Deployment::IContentInstallationInfo> const& value, winrt::Windows::Xbox::Management::Deployment::InstallUpdateBehavior const& update)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ContentInstallManager::QueueGroupLanInstall(winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Management::Deployment::IContentInstallationInfo> const& value, winrt::Windows::Xbox::Management::Deployment::InstallUpdateBehavior const& update, winrt::guid const& destDeviceId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ContentInstallManager::QueueGroupInstallByOneStoreProductId(winrt::Windows::Foundation::Collections::IVectorView<hstring> const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ContentInstallManager::QueryPackageUpgrade(winrt::guid const& productId, bool& isUpgraded, hstring& upgradedPackageFamilyName)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t ContentInstallManager::GetInstallingItemCountForDisc(hstring const& discSetId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<hstring> ContentInstallManager::GetShrinkablePackages()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ContentInstallManager::GetTrimmedPackageSize(hstring const& packageInstanceId, uint64_t& currentPackageSize, uint64_t& trimmedPackageSize)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ContentInstallManager::TrimPackage(hstring const& packageInstanceId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ContentInstallManager::PauseAllInstalls()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ContentInstallManager::ResumeAllInstalls()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ContentInstallManager::CancelAllInstalls()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ContentInstallManager::StartPackageCopyFromStorage(winrt::Windows::Foundation::Collections::IVectorView<hstring> const& packageInstanceIds, winrt::guid const& destDeviceId, hstring const& applicationId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ContentInstallManager::StartPackageMoveFromStorage(winrt::Windows::Foundation::Collections::IVectorView<hstring> const& packageInstanceIds, winrt::guid const& destDeviceId, hstring const& applicationId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ContentInstallManager::StartInstall(hstring const& source, winrt::guid const& contentId, winrt::Windows::Xbox::Management::Deployment::IContentMetadata const& metadata, winrt::Windows::Xbox::Management::Deployment::InstallUpdateBehavior const& update, winrt::guid const& destDeviceId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ContentInstallManager::QueueInstall(hstring const& source, winrt::guid const& contentId, winrt::Windows::Xbox::Management::Deployment::IContentMetadata const& metadata, winrt::Windows::Xbox::Management::Deployment::InstallUpdateBehavior const& update, winrt::guid const& destDeviceId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ContentInstallManager::StartGroupInstall(winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Management::Deployment::IContentInstallationInfo> const& value, winrt::Windows::Xbox::Management::Deployment::InstallUpdateBehavior const& update, winrt::guid const& destDeviceId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ContentInstallManager::QueueGroupInstall(winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Management::Deployment::IContentInstallationInfo> const& value, winrt::Windows::Xbox::Management::Deployment::InstallUpdateBehavior const& update, winrt::guid const& destDeviceId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ContentInstallManager::QueueGroupInstallByOneStoreProductId(winrt::Windows::Foundation::Collections::IVectorView<hstring> const& value, winrt::guid const& destDeviceId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ContentInstallManager::GetPersistentLocalStorageInfoById(hstring const& packageInstanceId, uint64_t& persistentLocalStorageSize, bool& allocated, uint32_t& xcrdId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ContentInstallManager::DeletePersistentLocalStorageById(hstring const& packageInstanceId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ContentInstallManager::GetPersistentLocalStorageDeviceInfoById(hstring const& packageInstanceId, uint64_t& size, bool& allocated, winrt::guid& deviceId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ContentInstallManager::QueueGroupInstallByOneStoreProductId(winrt::Windows::Foundation::Collections::IVectorView<hstring> const& value, winrt::guid const& destDeviceId, hstring const& applicationId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void ContentInstallManager::PreIndexCloudPackage(winrt::guid const& contentId, hstring const& oneStoreProductId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction ContentInstallManager::InstallWithAppInfoAsync(winrt::Windows::Xbox::ApplicationModel::State::Internal::IAppInfo appInfo, bool installDlc)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Management.Deployment.ContentInstallationInfo.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Management.Deployment.ContentInstallationInfo.cpp
index 4cbfcd4..50a05d0 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Management.Deployment.ContentInstallationInfo.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Management.Deployment.ContentInstallationInfo.cpp
@@ -6,34 +6,34 @@ namespace winrt::Windows::Xbox::Management::Deployment::implementation
 {
     ContentInstallationInfo::ContentInstallationInfo(hstring const& path, hstring const& oneStoreProductId, winrt::guid const& contentId, hstring const& packageFamilyName, winrt::guid const& siblingId, winrt::guid const& variantId, winrt::Windows::Xbox::Management::Deployment::ConsoleGeneration const& generation, winrt::Windows::Xbox::Management::Deployment::IContentMetadata const& metadata)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     ContentInstallationInfo::ContentInstallationInfo(hstring const& path, hstring const& oneStoreProductId, winrt::guid const& contentId, hstring const& packageFamilyName, winrt::Windows::Xbox::Management::Deployment::IContentMetadata const& metadata)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring ContentInstallationInfo::Path()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::guid ContentInstallationInfo::ContentId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Management::Deployment::IContentMetadata ContentInstallationInfo::Metadata()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring ContentInstallationInfo::OneStoreProductId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring ContentInstallationInfo::PackageFamilyName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool ContentInstallationInfo::InstallByDefault()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Management.Deployment.ContentLocation.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Management.Deployment.ContentLocation.cpp
index 94d79d3..3c4a913 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Management.Deployment.ContentLocation.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Management.Deployment.ContentLocation.cpp
@@ -6,42 +6,42 @@ namespace winrt::Windows::Xbox::Management::Deployment::implementation
 {
     ContentLocation::ContentLocation(hstring const& path)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Management::Deployment::IContentInstallationInfo> ContentLocation::InstallationInfos()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Management::Deployment::IContentMetadata ContentLocation::BundleMetadata()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Management::Deployment::IContentInstallationInfo ContentLocation::DefaultInstallationInfo()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Management::Deployment::ContentLocationContentType ContentLocation::ContentType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t ContentLocation::DiscNumber()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t ContentLocation::DiscCount()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring ContentLocation::DiscSetId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<hstring> ContentLocation::PackageTitles()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Management::Deployment::IContentInstallationInfo> ContentLocation::HiddenInstallationInfos()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Management.Deployment.ContentMetadata.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Management.Deployment.ContentMetadata.cpp
index 0c3fe6c..6ee2e59 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Management.Deployment.ContentMetadata.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Management.Deployment.ContentMetadata.cpp
@@ -6,90 +6,90 @@ namespace winrt::Windows::Xbox::Management::Deployment::implementation
 {
     ContentMetadata::ContentMetadata(winrt::Windows::Xbox::Management::Deployment::ContentMetadataInitData const& initData)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     ContentMetadata::ContentMetadata(winrt::Windows::Xbox::Management::Deployment::ContentMetadataInitData const& initData, winrt::Windows::Foundation::Collections::IVectorView<winrt::guid> const& relatedMedia, winrt::Windows::Foundation::Collections::IVectorView<hstring> const& relatedMediaFamilyNames)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     ContentMetadata::ContentMetadata(winrt::Windows::Xbox::Management::Deployment::ContentMetadataInitData const& initData, winrt::guid const& siblingId, winrt::guid const& variantId, winrt::Windows::Foundation::Collections::IVectorView<winrt::guid> const& relatedMedia, winrt::Windows::Foundation::Collections::IVectorView<hstring> const& relatedMediaFamilyNames)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     ContentMetadata::ContentMetadata(winrt::Windows::Xbox::Management::Deployment::ContentMetadataInitData const& initData, winrt::guid const& siblingId, winrt::guid const& variantId, winrt::Windows::Foundation::Collections::IVectorView<winrt::guid> const& relatedMedia, winrt::Windows::Foundation::Collections::IVectorView<hstring> const& relatedMediaFamilyNames, winrt::guid const& gameHubId, bool isGameHub)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring ContentMetadata::Name()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::guid ContentMetadata::ProductId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Uri ContentMetadata::LogoUri()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Uri ContentMetadata::SmallLogoUri()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Uri ContentMetadata::WideLogoUri()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring ContentMetadata::DownloadUri()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Management::Deployment::CatalogType ContentMetadata::CatalogType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint64_t ContentMetadata::Size()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Management::Deployment::MetadataSource ContentMetadata::MetadataSource()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t ContentMetadata::TitleId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::guid> ContentMetadata::RelatedMedia()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::ApplicationModel::State::Internal::GameAttributes ContentMetadata::Attributes()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<hstring> ContentMetadata::RelatedMediaFamilyNames()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring ContentMetadata::Ratings()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::guid ContentMetadata::SiblingId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::guid ContentMetadata::VariantId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::guid ContentMetadata::GameHubId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool ContentMetadata::IsGameHub()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Management.Deployment.ContentMetadataPackager.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Management.Deployment.ContentMetadataPackager.cpp
index cfa26ee..f4041a6 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Management.Deployment.ContentMetadataPackager.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Management.Deployment.ContentMetadataPackager.cpp
@@ -6,6 +6,6 @@ namespace winrt::Windows::Xbox::Management::Deployment::implementation
 {
     winrt::Windows::Foundation::Collections::PropertySet ContentMetadataPackager::PackageContentMetadata(winrt::guid const& deviceId, winrt::guid const& contentId, hstring const& oneStoreProductId, winrt::Windows::Xbox::Management::Deployment::ContentMetadata const& metadata)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Management.Deployment.DownloadableContentPackageManager.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Management.Deployment.DownloadableContentPackageManager.cpp
index ba577d7..5a94739 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Management.Deployment.DownloadableContentPackageManager.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Management.Deployment.DownloadableContentPackageManager.cpp
@@ -18,10 +18,10 @@ namespace winrt::Windows::Xbox::Management::Deployment::implementation
     }
     winrt::event_token DownloadableContentPackageManager::DownloadableContentPackageInstallCompletedWithDetails(winrt::Windows::Foundation::EventHandler<winrt::Windows::Xbox::Management::Deployment::IDownloadableContentPackageInstallCompletedEventArgs> const& eventHandler)
     {
-        Logger::NotImplemented(); return {};
+        LOG_NOTIMPLEMENTED(); return {};
     }
     void DownloadableContentPackageManager::DownloadableContentPackageInstallCompletedWithDetails(winrt::event_token const& eventCookie) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Management.Deployment.PackageTransferManager.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Management.Deployment.PackageTransferManager.cpp
index 4661da5..82b684e 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Management.Deployment.PackageTransferManager.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Management.Deployment.PackageTransferManager.cpp
@@ -7,15 +7,15 @@ namespace winrt::Windows::Xbox::Management::Deployment::implementation
 
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Xbox::Management::Deployment::CheckForUpdateResult> PackageTransferManager::CheckForUpdateAsync(winrt::Windows::Xbox::Management::Deployment::IDownloadableContentPackage package)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Xbox::Management::Deployment::RequestUpdatePackageResult> PackageTransferManager::RequestUpdatePackageAsync(winrt::Windows::Xbox::Management::Deployment::IDownloadableContentPackage package)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Xbox::Management::Deployment::RequestUpdatePackageResult> PackageTransferManager::RequestUpdateCurrentPackageAsync()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Management::Deployment::PackageTransferManager PackageTransferManager::Current( )
     {
@@ -32,11 +32,11 @@ namespace winrt::Windows::Xbox::Management::Deployment::implementation
 
     winrt::Windows::Xbox::Management::Deployment::PackageTransferManager PackageTransferManager::Create(winrt::Windows::ApplicationModel::Package const& package)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void PackageTransferManager::UpdateInstallOrder(winrt::Windows::Foundation::Collections::IIterable<uint32_t> const& chunkIds, winrt::Windows::Xbox::Management::Deployment::UpdateInstallOrderBehavior const& updateBehavior)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool PackageTransferManager::IsChunkInstalled(uint32_t chunkId)
     {
@@ -49,7 +49,7 @@ namespace winrt::Windows::Xbox::Management::Deployment::implementation
     }
     uint32_t PackageTransferManager::FindChunkFromFile(hstring const& path)
     {
-        Logger::NotImplemented(); return 0;
+        LOG_NOTIMPLEMENTED(); return 0;
     }
     winrt::Windows::Xbox::Management::Deployment::PackageTransferStatus PackageTransferManager::TransferStatus( )
     {
@@ -58,26 +58,26 @@ namespace winrt::Windows::Xbox::Management::Deployment::implementation
     }
     winrt::Windows::Xbox::Management::Deployment::PackageTransferType PackageTransferManager::TransferType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Management::Deployment::ChunkSpecifiers PackageTransferManager::AvailableChunkSpecifiers()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Management::Deployment::InstallationState PackageTransferManager::GetInstallationState(winrt::Windows::Foundation::Collections::IIterable<uint32_t> const& chunkIds)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Management::Deployment::InstallationState PackageTransferManager::GetInstallationState(winrt::Windows::Xbox::Management::Deployment::ChunkSpecifiers const& specifiers)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Xbox::Management::Deployment::PackageTransferWatcher> PackageTransferManager::AddChunkSpecifiersAsync(winrt::Windows::Xbox::Management::Deployment::ChunkSpecifiers additionalSpecifiers)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction PackageTransferManager::RemoveChunkSpecifiersAsync(winrt::Windows::Xbox::Management::Deployment::ChunkSpecifiers removeSpecifiers)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Management.Deployment.PackageTransferWatcher.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Management.Deployment.PackageTransferWatcher.cpp
index 7450427..26b60f1 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Management.Deployment.PackageTransferWatcher.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Management.Deployment.PackageTransferWatcher.cpp
@@ -16,31 +16,31 @@ namespace winrt::Windows::Xbox::Management::Deployment::implementation
     }
     winrt::Windows::Xbox::Management::Deployment::PackageTransferWatcher PackageTransferWatcher::CreateForChunkSpecifiers(winrt::Windows::ApplicationModel::Package const& package, winrt::Windows::Xbox::Management::Deployment::ChunkSpecifiers const& specifiers)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Management::Deployment::PackageTransferWatcher PackageTransferWatcher::CreateForContentPackage(winrt::Windows::Xbox::Management::Deployment::IContentPackage const& package)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Management::Deployment::PackageTransferWatcher PackageTransferWatcher::CreateForDownloadableContentPackage(winrt::Windows::Xbox::Management::Deployment::IDownloadableContentPackage const& package)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<uint32_t> PackageTransferWatcher::ChunkIds()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token PackageTransferWatcher::ChunkCompleted(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Management::Deployment::PackageTransferWatcher, winrt::Windows::Xbox::Management::Deployment::ChunkCompletedEventArgs> const& handler)
     {
-        Logger::NotImplemented(); return {};
+        LOG_NOTIMPLEMENTED(); return {};
     }
     void PackageTransferWatcher::ChunkCompleted(winrt::event_token const& cookie) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token PackageTransferWatcher::ProgressChanged(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Management::Deployment::PackageTransferWatcher, winrt::Windows::Xbox::Management::Deployment::ProgressChangedEventArgs> const& handler)
     {
-        Logger::NotImplemented(); return {};
+        LOG_NOTIMPLEMENTED(); return {};
     }
     void PackageTransferWatcher::ProgressChanged(winrt::event_token const& cookie) noexcept
     {
@@ -49,7 +49,7 @@ namespace winrt::Windows::Xbox::Management::Deployment::implementation
     winrt::event_token PackageTransferWatcher::TransferCompleted(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Management::Deployment::PackageTransferWatcher, winrt::Windows::Xbox::Management::Deployment::TransferCompletedEventArgs> const& handler)
     {
 		Logger::Warning("PackageTransferWatcher::TransferCompleted\n");
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void PackageTransferWatcher::TransferCompleted(winrt::event_token const& cookie) noexcept
     {
@@ -58,17 +58,17 @@ namespace winrt::Windows::Xbox::Management::Deployment::implementation
     winrt::Windows::Xbox::Management::Deployment::PackageTransferStatus PackageTransferWatcher::TransferStatus()
     {
 		Logger::Warning("PackageTransferWatcher::TransferStatus\n");
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Management::Deployment::PackageTransferType PackageTransferWatcher::TransferType()
     {
 		Logger::Warning("PackageTransferWatcher::TransferType\n");
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token PackageTransferWatcher::TransferStatusChanged(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Management::Deployment::PackageTransferWatcher, winrt::Windows::Xbox::Management::Deployment::TransferStatusChangedEventArgs> const& handler)
     {
 		Logger::Warning("PackageTransferWatcher::TransferStatusChanged\n");
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void PackageTransferWatcher::TransferStatusChanged(winrt::event_token const& cookie) noexcept
     {
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Management.Deployment.StreamingInstallQueue.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Management.Deployment.StreamingInstallQueue.cpp
index c6e021f..b550e04 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Management.Deployment.StreamingInstallQueue.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Management.Deployment.StreamingInstallQueue.cpp
@@ -6,26 +6,26 @@ namespace winrt::Windows::Xbox::Management::Deployment::implementation
 {
     winrt::Windows::Foundation::Collections::IVectorView<hstring> StreamingInstallQueue::GetOrderedPackageInstanceIds()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Management::Deployment::IStreamingPackage StreamingInstallQueue::GetStreamingPackage(hstring const& packageInstanceId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token StreamingInstallQueue::QueueChanged(winrt::Windows::Foundation::EventHandler<winrt::Windows::Xbox::Management::Deployment::IStreamingQueueChangedEventArgs> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void StreamingInstallQueue::QueueChanged(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token StreamingInstallQueue::StreamingPackageStateChanged(winrt::Windows::Foundation::EventHandler<winrt::Windows::Xbox::Management::Deployment::IStreamingPackageStateChangedEventArgs> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void StreamingInstallQueue::StreamingPackageStateChanged(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Media.GameTransportControls.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Media.GameTransportControls.cpp
index 86f7f3e..2b81f8a 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Media.GameTransportControls.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Media.GameTransportControls.cpp
@@ -6,11 +6,11 @@ namespace winrt::Windows::Xbox::Media::implementation
 {
     hstring GameTransportControls::Title()
     {
-        Logger::NotImplemented( ); return L"null";
+        LOG_NOTIMPLEMENTED(); return L"null";
     }
     hstring GameTransportControls::Subtitle()
     {
-        Logger::NotImplemented( ); return L"null";
+        LOG_NOTIMPLEMENTED(); return L"null";
     }
     winrt::Windows::Xbox::Media::GamePlaybackStatus GameTransportControls::PlaybackStatus()
     {
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Media.SmoothStreamingSessionManager.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Media.SmoothStreamingSessionManager.cpp
index bcb155f..decca42 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Media.SmoothStreamingSessionManager.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Media.SmoothStreamingSessionManager.cpp
@@ -6,10 +6,10 @@ namespace winrt::Windows::Xbox::Media::implementation
 {
     winrt::event_token SmoothStreamingSessionManager::SessionCreated(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Media::ISmoothStreamingSessionManager, winrt::Windows::Xbox::Media::ISmoothStreamingSession> const& session)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SmoothStreamingSessionManager::SessionCreated(winrt::event_token const& cookie) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Media.SystemMediaTransportControls.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Media.SystemMediaTransportControls.cpp
index cd37e5d..7eaf95d 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Media.SystemMediaTransportControls.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Media.SystemMediaTransportControls.cpp
@@ -6,150 +6,150 @@ namespace winrt::Windows::Xbox::Media::implementation
 {
     winrt::Windows::Xbox::Media::SystemMediaTransportControls SystemMediaTransportControls::GetForCurrentView()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Media::MediaPlaybackStatus SystemMediaTransportControls::PlaybackStatus()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SystemMediaTransportControls::PlaybackStatus(winrt::Windows::Xbox::Media::MediaPlaybackStatus const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Media::SystemMediaTransportControlsDisplayUpdater SystemMediaTransportControls::DisplayUpdater()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Media::SoundLevel SystemMediaTransportControls::SoundLevel()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool SystemMediaTransportControls::IsEnabled()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SystemMediaTransportControls::IsEnabled(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool SystemMediaTransportControls::IsPlayEnabled()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SystemMediaTransportControls::IsPlayEnabled(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool SystemMediaTransportControls::IsStopEnabled()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SystemMediaTransportControls::IsStopEnabled(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool SystemMediaTransportControls::IsPauseEnabled()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SystemMediaTransportControls::IsPauseEnabled(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool SystemMediaTransportControls::IsRecordEnabled()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SystemMediaTransportControls::IsRecordEnabled(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool SystemMediaTransportControls::IsFastForwardEnabled()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SystemMediaTransportControls::IsFastForwardEnabled(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool SystemMediaTransportControls::IsRewindEnabled()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SystemMediaTransportControls::IsRewindEnabled(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool SystemMediaTransportControls::IsPreviousEnabled()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SystemMediaTransportControls::IsPreviousEnabled(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool SystemMediaTransportControls::IsNextEnabled()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SystemMediaTransportControls::IsNextEnabled(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool SystemMediaTransportControls::IsChannelUpEnabled()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SystemMediaTransportControls::IsChannelUpEnabled(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool SystemMediaTransportControls::IsChannelDownEnabled()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SystemMediaTransportControls::IsChannelDownEnabled(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool SystemMediaTransportControls::IsBackEnabled()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SystemMediaTransportControls::IsBackEnabled(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool SystemMediaTransportControls::IsViewEnabled()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SystemMediaTransportControls::IsViewEnabled(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool SystemMediaTransportControls::IsMenuEnabled()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SystemMediaTransportControls::IsMenuEnabled(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token SystemMediaTransportControls::ButtonPressed(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Media::SystemMediaTransportControls, winrt::Windows::Xbox::Media::SystemMediaTransportControlsButtonPressedEventArgs> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SystemMediaTransportControls::ButtonPressed(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token SystemMediaTransportControls::PropertyChanged(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Media::SystemMediaTransportControls, winrt::Windows::Xbox::Media::SystemMediaTransportControlsPropertyChangedEventArgs> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SystemMediaTransportControls::PropertyChanged(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.GamePlayer.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.GamePlayer.cpp
index 116983e..6e230d9 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.GamePlayer.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.GamePlayer.cpp
@@ -6,14 +6,14 @@ namespace winrt::Windows::Xbox::Multiplayer::implementation
 {
     hstring GamePlayer::XboxUserId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime GamePlayer::LastInvitedTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime GamePlayer::PartyJoinTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.GamePlayerDeviceGroup.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.GamePlayerDeviceGroup.cpp
index 2493cf4..91e21a0 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.GamePlayerDeviceGroup.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.GamePlayerDeviceGroup.cpp
@@ -6,6 +6,6 @@ namespace winrt::Windows::Xbox::Multiplayer::implementation
 {
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Multiplayer::GamePlayer> GamePlayerDeviceGroup::Players()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.GamePlayersChangedEventArgs.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.GamePlayersChangedEventArgs.cpp
index a43944d..5af29fd 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.GamePlayersChangedEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.GamePlayersChangedEventArgs.cpp
@@ -6,14 +6,14 @@ namespace winrt::Windows::Xbox::Multiplayer::implementation
 {
     winrt::Windows::Xbox::Multiplayer::MultiplayerSessionReference GamePlayersChangedEventArgs::GameSession()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Multiplayer::GamePlayer> GamePlayersChangedEventArgs::AvailablePlayers()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Multiplayer::GamePlayerDeviceGroup> GamePlayersChangedEventArgs::AvailablePlayersGroupedByDevice()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.GameSessionReadyEventArgs.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.GameSessionReadyEventArgs.cpp
index 76dd919..746f654 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.GameSessionReadyEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.GameSessionReadyEventArgs.cpp
@@ -6,6 +6,6 @@ namespace winrt::Windows::Xbox::Multiplayer::implementation
 {
     winrt::Windows::Xbox::Multiplayer::MultiplayerSessionReference GameSessionReadyEventArgs::GameSession()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.MatchStatusChangedEventArgs.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.MatchStatusChangedEventArgs.cpp
index 79ec799..f61ebff 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.MatchStatusChangedEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.MatchStatusChangedEventArgs.cpp
@@ -6,10 +6,10 @@ namespace winrt::Windows::Xbox::Multiplayer::implementation
 {
     winrt::Windows::Xbox::Multiplayer::MultiplayerSessionReference MatchStatusChangedEventArgs::MatchSession()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Multiplayer::MatchStatus MatchStatusChangedEventArgs::MatchStatus()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.MultiplayerSessionReference.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.MultiplayerSessionReference.cpp
index 5c080c5..d836d63 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.MultiplayerSessionReference.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.MultiplayerSessionReference.cpp
@@ -6,18 +6,18 @@ namespace winrt::Windows::Xbox::Multiplayer::implementation
 {
     MultiplayerSessionReference::MultiplayerSessionReference(hstring const& sessionName, hstring const& serviceConfigurationId, hstring const& sessionTemplateName)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerSessionReference::SessionName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerSessionReference::ServiceConfigurationId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring MultiplayerSessionReference::SessionTemplateName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.Party.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.Party.cpp
index d4119a8..e12f8d0 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.Party.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.Party.cpp
@@ -13,14 +13,14 @@ namespace winrt::Windows::Xbox::Multiplayer::implementation
 
     winrt::Windows::Foundation::IAsyncAction Party::RegisterGameSessionAsync(winrt::Windows::Xbox::System::User actingUser, winrt::Windows::Xbox::Multiplayer::MultiplayerSessionReference sessionReference)
     {
-        
+        Logger::Info("Registering game session for user\n");
         co_await winrt::resume_background( );
         Logger::Info("Game session registered successfully.\n");
         co_return;
     }
     winrt::Windows::Foundation::IAsyncAction Party::RegisterMatchSessionAsync(winrt::Windows::Xbox::System::User actingUser, winrt::Windows::Xbox::Multiplayer::MultiplayerSessionReference sessionReference)
     {
-        
+		Logger::Info("Registering match session for user\n");
         co_await winrt::resume_background();
         Logger::Info("Match session registered successfully.\n");
         co_return;
@@ -28,7 +28,7 @@ namespace winrt::Windows::Xbox::Multiplayer::implementation
 
     winrt::Windows::Foundation::IAsyncAction Party::InviteToPartyAsync(winrt::Windows::Xbox::System::User actingUser, winrt::Windows::Foundation::Collections::IVectorView<hstring> usersToInvite)
     {
-        
+		Logger::Info("Inviting users to party\n");
         co_await winrt::resume_background();
         for (auto const& userId : usersToInvite)
         {
@@ -39,120 +39,123 @@ namespace winrt::Windows::Xbox::Multiplayer::implementation
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Xbox::Multiplayer::PartyView> Party::GetPartyViewAsync()
     {
-        
-        Logger::NotImplemented(); throw hresult_not_implemented();
+		Logger::Info("Retrieving party view\n");
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction Party::AddLocalUsersAsync(winrt::Windows::Xbox::System::User actingUser, winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::System::User> localUsersToAdd)
     {
-        
-        Logger::NotImplemented(); throw hresult_not_implemented();
+		Logger::Info("Adding local users to party\n");
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction Party::PullInactivePlayersAsync(winrt::Windows::Xbox::System::User actingUser, winrt::Windows::Xbox::Multiplayer::MultiplayerSessionReference sessionReference)
     {
-        
-        Logger::NotImplemented(); throw hresult_not_implemented();
+		Logger::Info("Pulling inactive players from session\n");
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction Party::PullReservedPlayersAsync(winrt::Windows::Xbox::System::User actingUser, winrt::Windows::Xbox::Multiplayer::MultiplayerSessionReference sessionReference)
     {
-        
-        Logger::NotImplemented(); throw hresult_not_implemented();
+		Logger::Info("Pulling reserved players from session\n");
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Multiplayer::GamePlayer>> Party::GetAvailableGamePlayersAsync(winrt::Windows::Xbox::System::User actingUser)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+		Logger::Info("Retrieving available game players for user\n");
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Multiplayer::GamePlayerDeviceGroup>> Party::GetAvailableGamePlayersGroupedByDeviceAsync(winrt::Windows::Xbox::System::User actingUser)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+		Logger::Info("Retrieving available game players grouped by device for user\n");
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction Party::SwitchPartyTitleAsync(winrt::Windows::Xbox::System::User actingUser)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+		Logger::Info("Switching party title for user\n");
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token Party::GameSessionReady(winrt::Windows::Foundation::EventHandler<winrt::Windows::Xbox::Multiplayer::GameSessionReadyEventArgs> const& handler)
     {
-        
+		Logger::Info("Subscribing to GameSessionReady event\n");
         return m_gameSessionReadyEvent.add(handler);
     }
     void Party::GameSessionReady(winrt::event_token const& token) noexcept
     {
-        
+		Logger::Info("Unsubscribing from GameSessionReady event\n");
         m_gameSessionReadyEvent.remove(token);
     }
     winrt::event_token Party::PartyStateChanged(winrt::Windows::Foundation::EventHandler<winrt::Windows::Xbox::Multiplayer::PartyStateChangedEventArgs> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void Party::PartyStateChanged(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token Party::PartyRosterChanged(winrt::Windows::Foundation::EventHandler<winrt::Windows::Xbox::Multiplayer::PartyRosterChangedEventArgs> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void Party::PartyRosterChanged(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token Party::MatchStatusChanged(winrt::Windows::Foundation::EventHandler<winrt::Windows::Xbox::Multiplayer::MatchStatusChangedEventArgs> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void Party::MatchStatusChanged(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token Party::GamePlayersChanged(winrt::Windows::Foundation::EventHandler<winrt::Windows::Xbox::Multiplayer::GamePlayersChangedEventArgs> const& handler)
     {
-		Logger::NotImplemented(); throw hresult_not_implemented();
+		LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void Party::GamePlayersChanged(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Xbox::Multiplayer::PartyView> Party::GetPartyViewAsyncEx(winrt::Windows::Xbox::Multiplayer::PartyFlags flags)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction Party::RemoveLocalUsersAsync(winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::System::User> localUsersToRemove)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring Party::PartyId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction Party::DisassociateGameSessionAsync(winrt::Windows::Xbox::System::User actingUser, winrt::Windows::Xbox::Multiplayer::MultiplayerSessionReference sessionReferenceToDisassociate)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction Party::RegisterGameSessionCompareAsync(winrt::Windows::Xbox::System::User actingUser, winrt::Windows::Xbox::Multiplayer::MultiplayerSessionReference sessionReference, winrt::Windows::Xbox::Multiplayer::MultiplayerSessionReference sessionReferenceComparand)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction Party::RegisterMatchSessionCompareAsync(winrt::Windows::Xbox::System::User actingUser, winrt::Windows::Xbox::Multiplayer::MultiplayerSessionReference sessionReference, winrt::Windows::Xbox::Multiplayer::MultiplayerSessionReference sessionReferenceComparand)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Multiplayer::UserPartyAssociation>> Party::GetUserPartyAssociationsAsync(winrt::Windows::Xbox::System::User actingUser, winrt::Windows::Foundation::Collections::IVectorView<hstring> targetXboxUserIds)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Xbox::Multiplayer::PartyView> Party::GetPartyViewByPartyIdAsync(winrt::Windows::Xbox::System::User actingUser, hstring partyId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction Party::JoinPartyByIdAsync(winrt::Windows::Xbox::System::User actingUser, hstring partyId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Multiplayer::SessionJoinability Party::Joinability()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void Party::Joinability(winrt::Windows::Xbox::Multiplayer::SessionJoinability const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.PartyChat.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.PartyChat.cpp
index 7179536..17563f5 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.PartyChat.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.PartyChat.cpp
@@ -6,42 +6,42 @@ namespace winrt::Windows::Xbox::Multiplayer::implementation
 {
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Xbox::Multiplayer::PartyChatView> PartyChat::GetPartyChatViewAsync()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token PartyChat::PartyChatViewChanged(winrt::Windows::Foundation::EventHandler<winrt::Windows::Foundation::IInspectable> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void PartyChat::PartyChatViewChanged(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool PartyChat::IsPartyChatActive()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool PartyChat::IsPartyChatSuppressed()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void PartyChat::IsPartyChatSuppressed(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token PartyChat::IsPartyChatActiveChanged(winrt::Windows::Foundation::EventHandler<bool> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void PartyChat::IsPartyChatActiveChanged(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token PartyChat::IsPartyChatSuppressedChanged(winrt::Windows::Foundation::EventHandler<bool> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void PartyChat::IsPartyChatSuppressedChanged(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.PartyChatMember.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.PartyChatMember.cpp
index 9f81d65..b6a0e17 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.PartyChatMember.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.PartyChatMember.cpp
@@ -6,10 +6,10 @@ namespace winrt::Windows::Xbox::Multiplayer::implementation
 {
     hstring PartyChatMember::XboxUserId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool PartyChatMember::IsLocal()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.PartyChatView.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.PartyChatView.cpp
index 7163999..c49e0c6 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.PartyChatView.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.PartyChatView.cpp
@@ -6,6 +6,6 @@ namespace winrt::Windows::Xbox::Multiplayer::implementation
 {
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Multiplayer::PartyChatMember> PartyChatView::Members()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.PartyConfig.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.PartyConfig.cpp
index f944346..f56037c 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.PartyConfig.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.PartyConfig.cpp
@@ -6,18 +6,18 @@ namespace winrt::Windows::Xbox::Multiplayer::implementation
 {
     bool PartyConfig::SuppressGameSessionReadyToast()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void PartyConfig::SuppressGameSessionReadyToast(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Multiplayer::SuppressGameSessionReadyToastMode PartyConfig::SuppressGameSessionReadyToastMode()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void PartyConfig::SuppressGameSessionReadyToastMode(winrt::Windows::Xbox::Multiplayer::SuppressGameSessionReadyToastMode const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.PartyMember.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.PartyMember.cpp
index b4dc3df..9cceca3 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.PartyMember.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.PartyMember.cpp
@@ -6,14 +6,14 @@ namespace winrt::Windows::Xbox::Multiplayer::implementation
 {
     hstring PartyMember::XboxUserId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool PartyMember::IsLocal()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::DateTime PartyMember::JoinTime()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.PartyMemberDeviceGroup.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.PartyMemberDeviceGroup.cpp
index 054acbf..48fffe6 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.PartyMemberDeviceGroup.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.PartyMemberDeviceGroup.cpp
@@ -6,6 +6,6 @@ namespace winrt::Windows::Xbox::Multiplayer::implementation
 {
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Multiplayer::PartyMember> PartyMemberDeviceGroup::Members()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.PartyRosterChangedEventArgs.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.PartyRosterChangedEventArgs.cpp
index 11a82ac..1cd0aab 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.PartyRosterChangedEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.PartyRosterChangedEventArgs.cpp
@@ -6,22 +6,22 @@ namespace winrt::Windows::Xbox::Multiplayer::implementation
 {
     winrt::Windows::Foundation::Collections::IVectorView<hstring> PartyRosterChangedEventArgs::AddedMembers()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<hstring> PartyRosterChangedEventArgs::AddedReservedMembers()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<hstring> PartyRosterChangedEventArgs::RemovedMembers()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<hstring> PartyRosterChangedEventArgs::RemovedReservedMembers()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Multiplayer::PartyView PartyRosterChangedEventArgs::PartyView()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.PartyStateChangedEventArgs.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.PartyStateChangedEventArgs.cpp
index 801e418..bffddd5 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.PartyStateChangedEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.PartyStateChangedEventArgs.cpp
@@ -6,6 +6,6 @@ namespace winrt::Windows::Xbox::Multiplayer::implementation
 {
     winrt::Windows::Xbox::Multiplayer::PartyView PartyStateChangedEventArgs::PartyView()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.PartyView.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.PartyView.cpp
index 5efca6b..1845471 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.PartyView.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.PartyView.cpp
@@ -6,30 +6,30 @@ namespace winrt::Windows::Xbox::Multiplayer::implementation
 {
     winrt::Windows::Foundation::Collections::IVectorView<hstring> PartyView::ReservedMembers()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Multiplayer::PartyMember> PartyView::Members()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Multiplayer::PartyMemberDeviceGroup> PartyView::MembersGroupedByDevice()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Multiplayer::MultiplayerSessionReference PartyView::MatchSession()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Multiplayer::MultiplayerSessionReference PartyView::GameSession()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool PartyView::IsPartyInAnotherTitle()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Multiplayer::SessionJoinability PartyView::Joinability()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.UserPartyAssociation.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.UserPartyAssociation.cpp
index b0f4be2..f32c5a3 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.UserPartyAssociation.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Multiplayer.UserPartyAssociation.cpp
@@ -6,10 +6,10 @@ namespace winrt::Windows::Xbox::Multiplayer::implementation
 {
     winrt::Windows::Foundation::Collections::IVectorView<hstring> UserPartyAssociation::QueriedXboxUserIds()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring UserPartyAssociation::PartyId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Networking.Development.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Networking.Development.cpp
index e2405c4..9d5db28 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Networking.Development.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Networking.Development.cpp
@@ -6,14 +6,14 @@ namespace winrt::Windows::Xbox::Networking::implementation
 {
     winrt::Windows::Xbox::Networking::SecureDeviceAddress Development::CreateSecureDeviceAddressFromHostNames(winrt::Windows::Xbox::Networking::SecureDeviceId const& secureDeviceId, winrt::Windows::Foundation::Collections::IIterable<winrt::Windows::Networking::HostName> const& hostNames)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Networking::SecureDeviceSocketDescription Development::CreateSecureDeviceSocketDescription(hstring const& name, winrt::Windows::Xbox::Networking::SecureIpProtocol const& secureIpProtocol, uint16_t boundPortRangeLower, uint16_t boundPortRangeUpper, winrt::Windows::Xbox::Networking::SecureDeviceSocketUsage const& allowedUsages)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Networking::SecureDeviceAssociationTemplate Development::CreateSecureDeviceAssociationTemplate(hstring const& name, winrt::Windows::Xbox::Networking::SecureDeviceSocketDescription const& initiatorSecureDeviceSocketDescription, winrt::Windows::Xbox::Networking::SecureDeviceSocketDescription const& acceptorSecureDeviceSocketDescription, winrt::Windows::Xbox::Networking::SecureDeviceAssociationUsage const& allowedUsages, hstring const& relyingParty, winrt::Windows::Foundation::Collections::IIterable<winrt::Windows::Xbox::Networking::ProtocolParserDescription> const& protocolParserDescriptions, winrt::Windows::Foundation::Collections::IIterable<winrt::Windows::Xbox::Networking::QualityOfServiceMetric> const& qualityOfServiceMetricPathPriorities, winrt::Windows::Xbox::Networking::MultiplayerSessionRequirement const& multiplayerSessionRequirement)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Networking.ErrorMessages.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Networking.ErrorMessages.cpp
index dd32e98..c34281c 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Networking.ErrorMessages.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Networking.ErrorMessages.cpp
@@ -6,6 +6,6 @@ namespace winrt::Windows::Xbox::Networking::implementation
 {
     hstring ErrorMessages::GetMessageForError(uint32_t errorCode)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Networking.MeasureQualityOfServiceResult.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Networking.MeasureQualityOfServiceResult.cpp
index 9ebda7a..d467d58 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Networking.MeasureQualityOfServiceResult.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Networking.MeasureQualityOfServiceResult.cpp
@@ -6,18 +6,18 @@ namespace winrt::Windows::Xbox::Networking::implementation
 {
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Networking::QualityOfServiceMeasurement> MeasureQualityOfServiceResult::Measurements()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Networking::QualityOfServiceMeasurement> MeasureQualityOfServiceResult::GetMeasurementsForDevice(winrt::Windows::Xbox::Networking::SecureDeviceAddress const& address)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Networking::QualityOfServiceMeasurement> MeasureQualityOfServiceResult::GetMeasurementsForMetric(winrt::Windows::Xbox::Networking::QualityOfServiceMetric const& metric)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Networking::QualityOfServiceMeasurement MeasureQualityOfServiceResult::GetMeasurement(winrt::Windows::Xbox::Networking::SecureDeviceAddress const& address, winrt::Windows::Xbox::Networking::QualityOfServiceMetric const& metric)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Networking.QualityOfService.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Networking.QualityOfService.cpp
index c16955a..87f90ef 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Networking.QualityOfService.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Networking.QualityOfService.cpp
@@ -6,18 +6,18 @@ namespace winrt::Windows::Xbox::Networking::implementation
 {
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Xbox::Networking::MeasureQualityOfServiceResult> QualityOfService::MeasureQualityOfServiceAsync(winrt::Windows::Foundation::Collections::IIterable<winrt::Windows::Xbox::Networking::SecureDeviceAddress> addresses, winrt::Windows::Foundation::Collections::IIterable<winrt::Windows::Xbox::Networking::QualityOfServiceMetric> metrics, uint32_t timeoutInMilliseconds, uint32_t numberOfProbes)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void QualityOfService::PublishPrivatePayload(array_view<uint8_t const> payload)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void QualityOfService::ClearPrivatePayload()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void QualityOfService::ConfigureQualityOfService(uint32_t maxSimultaneousProbeConnections, bool constrainSystemBandwidthUp, bool constrainSystemBandwidthDown)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Networking.QualityOfServiceMeasurement.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Networking.QualityOfServiceMeasurement.cpp
index 170aa20..1b0146f 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Networking.QualityOfServiceMeasurement.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Networking.QualityOfServiceMeasurement.cpp
@@ -6,18 +6,18 @@ namespace winrt::Windows::Xbox::Networking::implementation
 {
     winrt::Windows::Xbox::Networking::QualityOfServiceMeasurementStatus QualityOfServiceMeasurement::Status()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Networking::QualityOfServiceMetric QualityOfServiceMeasurement::Metric()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IPropertyValue QualityOfServiceMeasurement::MetricValue()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Networking::SecureDeviceAddress QualityOfServiceMeasurement::SecureDeviceAddress()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Networking.SecureDeviceAddress.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Networking.SecureDeviceAddress.cpp
index 681b1b9..86fd670 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Networking.SecureDeviceAddress.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Networking.SecureDeviceAddress.cpp
@@ -6,58 +6,58 @@ namespace winrt::Windows::Xbox::Networking::implementation
 {
     SecureDeviceAddress::SecureDeviceAddress(winrt::Windows::Storage::Streams::IBuffer const& buffer)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     int32_t SecureDeviceAddress::CompareBuffers(winrt::Windows::Storage::Streams::IBuffer const& buffer1, winrt::Windows::Storage::Streams::IBuffer const& buffer2)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     int32_t SecureDeviceAddress::CompareBytes(array_view<uint8_t const> bytes1, array_view<uint8_t const> bytes2)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Networking::SecureDeviceAddress SecureDeviceAddress::FromBytes(array_view<uint8_t const> bytes)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Networking::SecureDeviceAddress SecureDeviceAddress::GetLocal()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Networking::SecureDeviceAddress SecureDeviceAddress::CreateDedicatedServerAddress(hstring const& hostnameOrAddress)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Networking::SecureDeviceAddress SecureDeviceAddress::FromBase64String(hstring const& base64String)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token SecureDeviceAddress::BufferChanged(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Networking::SecureDeviceAddress, winrt::Windows::Foundation::IInspectable> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SecureDeviceAddress::BufferChanged(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Storage::Streams::IBuffer SecureDeviceAddress::GetBuffer()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     int32_t SecureDeviceAddress::Compare(winrt::Windows::Xbox::Networking::SecureDeviceAddress const& secureDeviceAddress)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring SecureDeviceAddress::GetBase64String()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool SecureDeviceAddress::IsLocal()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Networking::NetworkAccessType SecureDeviceAddress::NetworkAccessType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Networking.SecureDeviceAssociation.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Networking.SecureDeviceAssociation.cpp
index 4e3e860..c2faa48 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Networking.SecureDeviceAssociation.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Networking.SecureDeviceAssociation.cpp
@@ -6,58 +6,58 @@ namespace winrt::Windows::Xbox::Networking::implementation
 {
     winrt::Windows::Xbox::Networking::SecureDeviceAssociation SecureDeviceAssociation::GetAssociationBySocketAddressBytes(array_view<uint8_t const> remoteSocketAddressBytes, array_view<uint8_t const> localSocketAddressBytes)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Networking::SecureDeviceAssociation SecureDeviceAssociation::GetAssociationByHostNamesAndPorts(winrt::Windows::Networking::HostName const& remoteHostName, hstring const& remotePort, winrt::Windows::Networking::HostName const& localHostName, hstring const& localPort)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token SecureDeviceAssociation::StateChanged(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Networking::SecureDeviceAssociation, winrt::Windows::Xbox::Networking::SecureDeviceAssociationStateChangedEventArgs> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SecureDeviceAssociation::StateChanged(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction SecureDeviceAssociation::DestroyAsync()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SecureDeviceAssociation::GetRemoteSocketAddressBytes(array_view<uint8_t> socketAddressBytes)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SecureDeviceAssociation::GetLocalSocketAddressBytes(array_view<uint8_t> socketAddressBytes)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Networking::SecureDeviceAssociationState SecureDeviceAssociation::State()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Networking::SecureDeviceAssociationTemplate SecureDeviceAssociation::Template()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Networking::SecureDeviceAddress SecureDeviceAssociation::RemoteSecureDeviceAddress()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Networking::HostName SecureDeviceAssociation::RemoteHostName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring SecureDeviceAssociation::RemotePort()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Networking::HostName SecureDeviceAssociation::LocalHostName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring SecureDeviceAssociation::LocalPort()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Networking.SecureDeviceAssociationIncomingEventArgs.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Networking.SecureDeviceAssociationIncomingEventArgs.cpp
index 8b2ba94..4702d59 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Networking.SecureDeviceAssociationIncomingEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Networking.SecureDeviceAssociationIncomingEventArgs.cpp
@@ -6,6 +6,6 @@ namespace winrt::Windows::Xbox::Networking::implementation
 {
     winrt::Windows::Xbox::Networking::SecureDeviceAssociation SecureDeviceAssociationIncomingEventArgs::Association()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Networking.SecureDeviceAssociationStateChangedEventArgs.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Networking.SecureDeviceAssociationStateChangedEventArgs.cpp
index 9769299..26c0002 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Networking.SecureDeviceAssociationStateChangedEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Networking.SecureDeviceAssociationStateChangedEventArgs.cpp
@@ -6,10 +6,10 @@ namespace winrt::Windows::Xbox::Networking::implementation
 {
     winrt::Windows::Xbox::Networking::SecureDeviceAssociationState SecureDeviceAssociationStateChangedEventArgs::OldState()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Networking::SecureDeviceAssociationState SecureDeviceAssociationStateChangedEventArgs::NewState()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Networking.SecureDeviceAssociationTemplate.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Networking.SecureDeviceAssociationTemplate.cpp
index dc7f9c4..ae2c3e3 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Networking.SecureDeviceAssociationTemplate.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Networking.SecureDeviceAssociationTemplate.cpp
@@ -12,35 +12,35 @@ namespace winrt::Windows::Xbox::Networking::implementation
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Networking::SecureDeviceAssociationTemplate> SecureDeviceAssociationTemplate::Templates()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token SecureDeviceAssociationTemplate::AssociationIncoming(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Networking::SecureDeviceAssociationTemplate, winrt::Windows::Xbox::Networking::SecureDeviceAssociationIncomingEventArgs> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SecureDeviceAssociationTemplate::AssociationIncoming(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Xbox::Networking::SecureDeviceAssociation> SecureDeviceAssociationTemplate::CreateAssociationAsync(winrt::Windows::Xbox::Networking::SecureDeviceAddress secureDeviceAddress, winrt::Windows::Xbox::Networking::CreateSecureDeviceAssociationBehavior behavior)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Xbox::Networking::SecureDeviceAssociation> SecureDeviceAssociationTemplate::CreateAssociationForPortsAsync(winrt::Windows::Xbox::Networking::SecureDeviceAddress secureDeviceAddress, winrt::Windows::Xbox::Networking::CreateSecureDeviceAssociationBehavior behavior, hstring initiatorPort, hstring acceptorPort)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Storage::Streams::IBuffer> SecureDeviceAssociationTemplate::CreateCertificateRequestAsync(hstring subjectName)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction SecureDeviceAssociationTemplate::InstallCertificateAsync(winrt::Windows::Storage::Streams::IBuffer certificateBuffer)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring SecureDeviceAssociationTemplate::Name()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Networking::SecureDeviceSocketDescription SecureDeviceAssociationTemplate::InitiatorSocketDescription()
     {
@@ -49,30 +49,30 @@ namespace winrt::Windows::Xbox::Networking::implementation
     }
     winrt::Windows::Xbox::Networking::SecureDeviceSocketDescription SecureDeviceAssociationTemplate::AcceptorSocketDescription()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Networking::SecureDeviceAssociationUsage SecureDeviceAssociationTemplate::AllowedUsages()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring SecureDeviceAssociationTemplate::RelyingParty()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Networking::ProtocolParserDescription> SecureDeviceAssociationTemplate::ProtocolParserDescriptions()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Networking::QualityOfServiceMetric> SecureDeviceAssociationTemplate::QualityOfServiceMetricPathPriorities()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Networking::MultiplayerSessionRequirement SecureDeviceAssociationTemplate::MultiplayerSessionRequirement()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Networking::SecureDeviceAssociation> SecureDeviceAssociationTemplate::Associations()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Networking.SecureDeviceSocketDescription.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Networking.SecureDeviceSocketDescription.cpp
index 6719290..26204d9 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Networking.SecureDeviceSocketDescription.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Networking.SecureDeviceSocketDescription.cpp
@@ -6,22 +6,22 @@ namespace winrt::Windows::Xbox::Networking::implementation
 {
     hstring SecureDeviceSocketDescription::Name()
     {
-        Logger::NotImplemented(); return L"";
+        LOG_NOTIMPLEMENTED(); return L"";
     }
     winrt::Windows::Xbox::Networking::SecureIpProtocol SecureDeviceSocketDescription::IpProtocol()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint16_t SecureDeviceSocketDescription::BoundPortRangeLower()
     {
-        Logger::NotImplemented(); return 0;
+        LOG_NOTIMPLEMENTED(); return 0;
     }
     uint16_t SecureDeviceSocketDescription::BoundPortRangeUpper()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Networking::SecureDeviceSocketUsage SecureDeviceSocketDescription::AllowedUsages()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.SmartGlass.SmartGlassAuxiliaryStream.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.SmartGlass.SmartGlassAuxiliaryStream.cpp
index ade2409..02cf880 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.SmartGlass.SmartGlassAuxiliaryStream.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.SmartGlass.SmartGlassAuxiliaryStream.cpp
@@ -6,51 +6,51 @@ namespace winrt::Windows::Xbox::SmartGlass::implementation
 {
     void SmartGlassAuxiliaryStream::Open()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     void SmartGlassAuxiliaryStream::Close()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     winrt::event_token SmartGlassAuxiliaryStream::OnConnect(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::SmartGlass::SmartGlassAuxiliaryStream, winrt::Windows::Foundation::IInspectable> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     void SmartGlassAuxiliaryStream::OnConnect(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     winrt::event_token SmartGlassAuxiliaryStream::OnReceive(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::SmartGlass::SmartGlassAuxiliaryStream, winrt::Windows::Xbox::SmartGlass::SmartGlassAuxiliaryStreamReadStats> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     void SmartGlassAuxiliaryStream::OnReceive(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     winrt::event_token SmartGlassAuxiliaryStream::OnSend(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::SmartGlass::SmartGlassAuxiliaryStream, winrt::Windows::Xbox::SmartGlass::SmartGlassAuxiliaryStreamWriteStats> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     void SmartGlassAuxiliaryStream::OnSend(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     winrt::event_token SmartGlassAuxiliaryStream::OnError(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::SmartGlass::SmartGlassAuxiliaryStream, int32_t> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     void SmartGlassAuxiliaryStream::OnError(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
\ No newline at end of file
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.SmartGlass.SmartGlassDevice.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.SmartGlass.SmartGlassDevice.cpp
index 013079d..b3ce0d3 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.SmartGlass.SmartGlassDevice.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.SmartGlass.SmartGlassDevice.cpp
@@ -6,76 +6,76 @@ namespace winrt::Windows::Xbox::SmartGlass::implementation
 {
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Xbox::SmartGlass::SmartGlassDevice> SmartGlassDevice::CreateFromIdAsync(hstring id)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Xbox::SmartGlass::SmartGlassDeviceCollection> SmartGlassDevice::FindAllAsync()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     hstring SmartGlassDevice::Id()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     hstring SmartGlassDevice::DisplayName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     winrt::Windows::Xbox::SmartGlass::SmartGlassDirectSurface SmartGlassDevice::DirectSurface()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     winrt::Windows::Xbox::SmartGlass::SmartGlassHtmlSurface SmartGlassDevice::HtmlSurface()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     winrt::Windows::Xbox::SmartGlass::SmartGlassTextEntrySurface SmartGlassDevice::TextEntrySurface()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     winrt::Windows::Xbox::System::User SmartGlassDevice::User()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     winrt::Windows::Foundation::IAsyncAction SmartGlassDevice::SetActiveSurfaceAsync(winrt::Windows::Xbox::SmartGlass::ISmartGlassSurface surface)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     winrt::Windows::Xbox::SmartGlass::QosMetrics SmartGlassDevice::QosMetrics()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     winrt::event_token SmartGlassDevice::QosMetricsChanged(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::SmartGlass::SmartGlassDevice, winrt::Windows::Xbox::SmartGlass::QosMetricsChangedEventArgs> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     void SmartGlassDevice::QosMetricsChanged(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     uint32_t SmartGlassDevice::get_DpiX()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     uint32_t SmartGlassDevice::get_DpiY()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     winrt::Windows::Xbox::SmartGlass::SmartGlassAuxiliaryStream SmartGlassDevice::AuxiliaryStream()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
\ No newline at end of file
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.SmartGlass.SmartGlassDeviceCollection.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.SmartGlass.SmartGlassDeviceCollection.cpp
index 4654315..02412de 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.SmartGlass.SmartGlassDeviceCollection.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.SmartGlass.SmartGlassDeviceCollection.cpp
@@ -6,26 +6,26 @@ namespace winrt::Windows::Xbox::SmartGlass::implementation
 {
     winrt::Windows::Foundation::Collections::IIterator<winrt::Windows::Xbox::SmartGlass::SmartGlassDevice> SmartGlassDeviceCollection::First()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     winrt::Windows::Xbox::SmartGlass::SmartGlassDevice SmartGlassDeviceCollection::GetAt(uint32_t index)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     uint32_t SmartGlassDeviceCollection::Size()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     bool SmartGlassDeviceCollection::IndexOf(winrt::Windows::Xbox::SmartGlass::SmartGlassDevice const& value, uint32_t& index)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     uint32_t SmartGlassDeviceCollection::GetMany(uint32_t startIndex, array_view<winrt::Windows::Xbox::SmartGlass::SmartGlassDevice> items)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
\ No newline at end of file
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.SmartGlass.SmartGlassDeviceWatcher.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.SmartGlass.SmartGlassDeviceWatcher.cpp
index e4e64dd..6793e0d 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.SmartGlass.SmartGlassDeviceWatcher.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.SmartGlass.SmartGlassDeviceWatcher.cpp
@@ -6,21 +6,21 @@ namespace winrt::Windows::Xbox::SmartGlass::implementation
 {
     winrt::event_token SmartGlassDeviceWatcher::DeviceAdded(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::SmartGlass::SmartGlassDeviceWatcher, winrt::Windows::Xbox::SmartGlass::SmartGlassDevice> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     void SmartGlassDeviceWatcher::DeviceAdded(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     winrt::event_token SmartGlassDeviceWatcher::DeviceRemoved(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::SmartGlass::SmartGlassDeviceWatcher, winrt::Windows::Xbox::SmartGlass::SmartGlassDevice> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     void SmartGlassDeviceWatcher::DeviceRemoved(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
\ No newline at end of file
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.SmartGlass.SmartGlassDirectSurface.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.SmartGlass.SmartGlassDirectSurface.cpp
index 516daa5..d5dc230 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.SmartGlass.SmartGlassDirectSurface.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.SmartGlass.SmartGlassDirectSurface.cpp
@@ -6,36 +6,36 @@ namespace winrt::Windows::Xbox::SmartGlass::implementation
 {
     hstring SmartGlassDirectSurface::Id()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     
     bool SmartGlassDirectSurface::Visible()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     
     hstring SmartGlassDirectSurface::AudioDeviceId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     
     winrt::Windows::Foundation::Rect SmartGlassDirectSurface::Bounds()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     
     winrt::Windows::Foundation::Rect SmartGlassDirectSurface::NativeBounds()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     
     winrt::Windows::Xbox::SmartGlass::QosSettings SmartGlassDirectSurface::QosSettings()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
  
     winrt::Windows::Xbox::SmartGlass::SmartGlassSensors SmartGlassDirectSurface::Sensors()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
\ No newline at end of file
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.SmartGlass.SmartGlassHtmlSurface.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.SmartGlass.SmartGlassHtmlSurface.cpp
index 380cccf..cbf18e3 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.SmartGlass.SmartGlassHtmlSurface.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.SmartGlass.SmartGlassHtmlSurface.cpp
@@ -6,31 +6,31 @@ namespace winrt::Windows::Xbox::SmartGlass::implementation
 {
     hstring SmartGlassHtmlSurface::Id()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     bool SmartGlassHtmlSurface::Visible()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     winrt::Windows::Xbox::SmartGlass::SmartGlassSensors SmartGlassHtmlSurface::Sensors()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     winrt::Windows::Foundation::IAsyncAction SmartGlassHtmlSurface::SubmitMessageAsync(hstring message)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     winrt::event_token SmartGlassHtmlSurface::MessageReceived(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::SmartGlass::SmartGlassHtmlSurface, winrt::Windows::Xbox::SmartGlass::SmartGlassMessageReceivedEventArgs> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     void SmartGlassHtmlSurface::MessageReceived(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
\ No newline at end of file
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.SmartGlass.SmartGlassMessageReceivedEventArgs.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.SmartGlass.SmartGlassMessageReceivedEventArgs.cpp
index a87d30d..29e8f74 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.SmartGlass.SmartGlassMessageReceivedEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.SmartGlass.SmartGlassMessageReceivedEventArgs.cpp
@@ -6,6 +6,6 @@ namespace winrt::Windows::Xbox::SmartGlass::implementation
 {
     hstring SmartGlassMessageReceivedEventArgs::Message()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
\ No newline at end of file
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.SmartGlass.SmartGlassSensors.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.SmartGlass.SmartGlassSensors.cpp
index 54d4866..750ae84 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.SmartGlass.SmartGlassSensors.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.SmartGlass.SmartGlassSensors.cpp
@@ -6,26 +6,26 @@ namespace winrt::Windows::Xbox::SmartGlass::implementation
 {
     winrt::Windows::Devices::Sensors::Accelerometer SmartGlassSensors::Accelerometer()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     winrt::Windows::Devices::Sensors::Compass SmartGlassSensors::Compass()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     winrt::Windows::Devices::Sensors::Gyrometer SmartGlassSensors::Gyrometer()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     winrt::Windows::Devices::Sensors::Inclinometer SmartGlassSensors::Inclinometer()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     winrt::Windows::Devices::Sensors::OrientationSensor SmartGlassSensors::OrientationSensor()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
\ No newline at end of file
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.SmartGlass.SmartGlassTextEntrySurface.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.SmartGlass.SmartGlassTextEntrySurface.cpp
index 213086f..b4ab128 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.SmartGlass.SmartGlassTextEntrySurface.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.SmartGlass.SmartGlassTextEntrySurface.cpp
@@ -6,111 +6,111 @@ namespace winrt::Windows::Xbox::SmartGlass::implementation
 {
     hstring SmartGlassTextEntrySurface::Id()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     bool SmartGlassTextEntrySurface::Visible()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     hstring SmartGlassTextEntrySurface::Text()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     void SmartGlassTextEntrySurface::Text(hstring const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     hstring SmartGlassTextEntrySurface::Prompt()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     void SmartGlassTextEntrySurface::Prompt(hstring const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     hstring SmartGlassTextEntrySurface::InputScope()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     void SmartGlassTextEntrySurface::InputScope(hstring const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     winrt::Windows::Xbox::SmartGlass::TextEntryOptions SmartGlassTextEntrySurface::Options()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     void SmartGlassTextEntrySurface::Options(winrt::Windows::Xbox::SmartGlass::TextEntryOptions const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     hstring SmartGlassTextEntrySurface::FlowDirection()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     void SmartGlassTextEntrySurface::FlowDirection(hstring const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     hstring SmartGlassTextEntrySurface::Language()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     void SmartGlassTextEntrySurface::Language(hstring const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     uint32_t SmartGlassTextEntrySurface::MaxLength()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     void SmartGlassTextEntrySurface::MaxLength(uint32_t value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     winrt::Windows::Xbox::SmartGlass::TextEntryResult SmartGlassTextEntrySurface::Result()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     winrt::event_token SmartGlassTextEntrySurface::TextChanged(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::SmartGlass::SmartGlassTextEntrySurface, winrt::Windows::Xbox::SmartGlass::SmartGlassTextEntryEventArgs> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     void SmartGlassTextEntrySurface::TextChanged(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     winrt::event_token SmartGlassTextEntrySurface::TextEntryFinished(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::SmartGlass::SmartGlassTextEntrySurface, winrt::Windows::Xbox::SmartGlass::SmartGlassTextEntryEventArgs> const& handler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     void SmartGlassTextEntrySurface::TextEntryFinished(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 
     void SmartGlassTextEntrySurface::SetSelection(uint32_t start, uint32_t length)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
\ No newline at end of file
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.ContinuousSpeechRecognitionResultEventArgs.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.ContinuousSpeechRecognitionResultEventArgs.cpp
index 183374b..5f059ad 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.ContinuousSpeechRecognitionResultEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.ContinuousSpeechRecognitionResultEventArgs.cpp
@@ -8,6 +8,6 @@ namespace winrt::Windows::Xbox::Speech::Recognition::implementation
 {
     winrt::Windows::Xbox::Speech::Recognition::SpeechRecognitionResult ContinuousSpeechRecognitionResultEventArgs::Result()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.ContinuousSpeechRecognitionStatusEventArgs.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.ContinuousSpeechRecognitionStatusEventArgs.cpp
index fc0c159..5f743a5 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.ContinuousSpeechRecognitionStatusEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.ContinuousSpeechRecognitionStatusEventArgs.cpp
@@ -8,10 +8,10 @@ namespace winrt::Windows::Xbox::Speech::Recognition::implementation
 {
     winrt::Windows::Xbox::Speech::Recognition::ContinuousSpeechRecognitionStatus ContinuousSpeechRecognitionStatusEventArgs::Status()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::hresult ContinuousSpeechRecognitionStatusEventArgs::ErrorCode()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.InstalledSpeechRecognizers.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.InstalledSpeechRecognizers.cpp
index 3a9074b..0198471 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.InstalledSpeechRecognizers.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.InstalledSpeechRecognizers.cpp
@@ -8,10 +8,10 @@ namespace winrt::Windows::Xbox::Speech::Recognition::implementation
 {
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Speech::Recognition::SpeechRecognizerInformation> InstalledSpeechRecognizers::All()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Speech::Recognition::SpeechRecognizerInformation InstalledSpeechRecognizers::Default()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.InstalledSpeechRecognizersInProc.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.InstalledSpeechRecognizersInProc.cpp
index 16c173f..1610fa1 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.InstalledSpeechRecognizersInProc.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.InstalledSpeechRecognizersInProc.cpp
@@ -8,10 +8,10 @@ namespace winrt::Windows::Xbox::Speech::Recognition::implementation
 {
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Speech::Recognition::SpeechRecognizerInformation> InstalledSpeechRecognizersInProc::All()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Speech::Recognition::SpeechRecognizerInformation InstalledSpeechRecognizersInProc::Default()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechAudioProblemOccurredEventArgs.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechAudioProblemOccurredEventArgs.cpp
index 4c26337..c0aea83 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechAudioProblemOccurredEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechAudioProblemOccurredEventArgs.cpp
@@ -8,6 +8,6 @@ namespace winrt::Windows::Xbox::Speech::Recognition::implementation
 {
     winrt::Windows::Xbox::Speech::Recognition::SpeechRecognitionAudioProblem SpeechAudioProblemOccurredEventArgs::Problem()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechChoiceRule.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechChoiceRule.cpp
index 9b7e86f..3ff6906 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechChoiceRule.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechChoiceRule.cpp
@@ -8,18 +8,18 @@ namespace winrt::Windows::Xbox::Speech::Recognition::implementation
 {
     bool SpeechChoiceRule::EnabledOnLoad()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechChoiceRule::EnabledOnLoad(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechChoiceRule::Clear()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechChoiceRule::AddItem(winrt::Windows::Xbox::Speech::Recognition::ISpeechRuleItem const& item)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechGarbageItem.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechGarbageItem.cpp
index 0c25e9a..dbaf09f 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechGarbageItem.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechGarbageItem.cpp
@@ -8,22 +8,22 @@ namespace winrt::Windows::Xbox::Speech::Recognition::implementation
 {
     SpeechGarbageItem::SpeechGarbageItem(winrt::Windows::Xbox::Speech::Recognition::SpeechRuleItemMatchType const& matchType)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Speech::Recognition::SpeechRuleItemMatchType SpeechGarbageItem::MatchType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechGarbageItem::MatchType(winrt::Windows::Xbox::Speech::Recognition::SpeechRuleItemMatchType const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring SpeechGarbageItem::Semantics()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechGarbageItem::Semantics(hstring const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechGrammar.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechGrammar.cpp
index 7bb2c44..8aaffb1 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechGrammar.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechGrammar.cpp
@@ -8,26 +8,26 @@ namespace winrt::Windows::Xbox::Speech::Recognition::implementation
 {
     bool SpeechGrammar::Enabled()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechGrammar::Enabled(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Speech::Recognition::SpeechGrammarProbability SpeechGrammar::Probability()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechGrammar::Probability(winrt::Windows::Xbox::Speech::Recognition::SpeechGrammarProbability const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechGrammar::EnableRule(hstring const& ruleName)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechGrammar::DisableRule(hstring const& ruleName)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechGrammarBuilder.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechGrammarBuilder.cpp
index b2bb923..e5d98d7 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechGrammarBuilder.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechGrammarBuilder.cpp
@@ -8,42 +8,42 @@ namespace winrt::Windows::Xbox::Speech::Recognition::implementation
 {
     SpeechGrammarBuilder::SpeechGrammarBuilder(hstring const& language)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Xbox::Speech::Recognition::SpeechGrammarBuilder> SpeechGrammarBuilder::CreateFromSpeechGrammarAsync(winrt::Windows::Xbox::Speech::Recognition::SpeechGrammar speechGrammar)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Xbox::Speech::Recognition::SpeechGrammarBuilder> SpeechGrammarBuilder::CreateFromStreamAsync(winrt::Windows::Storage::Streams::IRandomAccessStream stream)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Speech::Recognition::SpeechGrammarBuilderRuleSet SpeechGrammarBuilder::Rules()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Speech::Recognition::SpeechGrammarBuilderSemanticsFormat SpeechGrammarBuilder::SemanticsFormat()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechGrammarBuilder::SemanticsFormat(winrt::Windows::Xbox::Speech::Recognition::SpeechGrammarBuilderSemanticsFormat const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Speech::Recognition::ISpeechRule SpeechGrammarBuilder::RootRule()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechGrammarBuilder::SetRootRule(hstring const& ruleKey)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechGrammarBuilder::PronunciationFormat(winrt::Windows::Xbox::Speech::Recognition::SpeechPronunciationFormat const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Speech::Recognition::SpeechPronunciationFormat SpeechGrammarBuilder::PronunciationFormat()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechGrammarBuilderRuleSet.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechGrammarBuilderRuleSet.cpp
index 0a0c0dd..76fe716 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechGrammarBuilderRuleSet.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechGrammarBuilderRuleSet.cpp
@@ -8,50 +8,50 @@ namespace winrt::Windows::Xbox::Speech::Recognition::implementation
 {
     winrt::Windows::Foundation::Collections::IIterator<winrt::Windows::Foundation::Collections::IKeyValuePair<hstring, winrt::Windows::Xbox::Speech::Recognition::ISpeechRule>> SpeechGrammarBuilderRuleSet::First()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Speech::Recognition::ISpeechRule SpeechGrammarBuilderRuleSet::Lookup(hstring const& key)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t SpeechGrammarBuilderRuleSet::Size()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool SpeechGrammarBuilderRuleSet::HasKey(hstring const& key)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechGrammarBuilderRuleSet::Split(winrt::Windows::Foundation::Collections::IMapView<hstring, winrt::Windows::Xbox::Speech::Recognition::ISpeechRule>& first, winrt::Windows::Foundation::Collections::IMapView<hstring, winrt::Windows::Xbox::Speech::Recognition::ISpeechRule>& second)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Speech::Recognition::SpeechChoiceRule SpeechGrammarBuilderRuleSet::AddChoiceRule(hstring const& key, winrt::Windows::Foundation::Collections::IIterable<hstring> const& phrases)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Speech::Recognition::SpeechChoiceRule SpeechGrammarBuilderRuleSet::AddChoiceRule(hstring const& key)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Speech::Recognition::SpeechSequenceRule SpeechGrammarBuilderRuleSet::AddSequenceRule(hstring const& key, winrt::Windows::Foundation::Collections::IIterable<winrt::Windows::Xbox::Speech::Recognition::ISpeechRuleItem> const& items)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Speech::Recognition::SpeechSequenceRule SpeechGrammarBuilderRuleSet::AddSequenceRule(hstring const& key)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Speech::Recognition::SpeechGraphRule SpeechGrammarBuilderRuleSet::AddGraphRule(hstring const& key)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechGrammarBuilderRuleSet::Clear()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Speech::Recognition::ISpeechRule SpeechGrammarBuilderRuleSet::Remove(hstring const& key)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechGrammarSet.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechGrammarSet.cpp
index 9551542..c339f38 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechGrammarSet.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechGrammarSet.cpp
@@ -8,46 +8,46 @@ namespace winrt::Windows::Xbox::Speech::Recognition::implementation
 {
     winrt::Windows::Foundation::Collections::IIterator<winrt::Windows::Foundation::Collections::IKeyValuePair<hstring, winrt::Windows::Xbox::Speech::Recognition::SpeechGrammar>> SpeechGrammarSet::First()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Speech::Recognition::SpeechGrammar SpeechGrammarSet::Lookup(hstring const& key)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t SpeechGrammarSet::Size()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool SpeechGrammarSet::HasKey(hstring const& key)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechGrammarSet::Split(winrt::Windows::Foundation::Collections::IMapView<hstring, winrt::Windows::Xbox::Speech::Recognition::SpeechGrammar>& first, winrt::Windows::Foundation::Collections::IMapView<hstring, winrt::Windows::Xbox::Speech::Recognition::SpeechGrammar>& second)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Speech::Recognition::SpeechGrammar SpeechGrammarSet::AddGrammarFromList(hstring const& key, winrt::Windows::Foundation::Collections::IIterable<hstring> const& phrases)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Speech::Recognition::SpeechGrammar SpeechGrammarSet::AddGrammarFromUri(hstring const& key, winrt::Windows::Foundation::Uri const& grammarUri)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Speech::Recognition::SpeechGrammar SpeechGrammarSet::AddGrammarFromStream(hstring const& key, winrt::Windows::Storage::Streams::IRandomAccessStream const& stream)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechGrammarSet::Clear()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Speech::Recognition::SpeechGrammar SpeechGrammarSet::Remove(hstring const& key)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Speech::Recognition::SpeechGrammar SpeechGrammarSet::AddGrammarFromBuilder(hstring const& key, winrt::Windows::Xbox::Speech::Recognition::SpeechGrammarBuilder const& grammar)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechGraphRule.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechGraphRule.cpp
index e98f1f8..230e116 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechGraphRule.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechGraphRule.cpp
@@ -8,26 +8,26 @@ namespace winrt::Windows::Xbox::Speech::Recognition::implementation
 {
     bool SpeechGraphRule::EnabledOnLoad()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechGraphRule::EnabledOnLoad(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechGraphRule::Clear()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Speech::Recognition::SpeechGraphState SpeechGraphRule::CreateGraphState(winrt::Windows::Xbox::Speech::Recognition::SpeechGraphStateType const& stateType)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechGraphRule::StartState(winrt::Windows::Xbox::Speech::Recognition::SpeechGraphState const& ruleState)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Speech::Recognition::SpeechGraphState SpeechGraphRule::StartState()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechGraphState.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechGraphState.cpp
index 1fb0be6..074f640 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechGraphState.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechGraphState.cpp
@@ -8,10 +8,10 @@ namespace winrt::Windows::Xbox::Speech::Recognition::implementation
 {
     void SpeechGraphState::AddTransition(winrt::Windows::Xbox::Speech::Recognition::ISpeechRuleItem const& item, float weight, winrt::Windows::Xbox::Speech::Recognition::SpeechGraphState const& targetState)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Speech::Recognition::SpeechGraphStateType SpeechGraphState::StateType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechHypothesisResultEventArgs.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechHypothesisResultEventArgs.cpp
index 3a7a9e1..eabc68f 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechHypothesisResultEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechHypothesisResultEventArgs.cpp
@@ -8,6 +8,6 @@ namespace winrt::Windows::Xbox::Speech::Recognition::implementation
 {
     winrt::Windows::Xbox::Speech::Recognition::SpeechRecognitionResult SpeechHypothesisResultEventArgs::Hypothesis()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechNullItem.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechNullItem.cpp
index e27fe73..e8dbec8 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechNullItem.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechNullItem.cpp
@@ -8,18 +8,18 @@ namespace winrt::Windows::Xbox::Speech::Recognition::implementation
 {
     winrt::Windows::Xbox::Speech::Recognition::SpeechRuleItemMatchType SpeechNullItem::MatchType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechNullItem::MatchType(winrt::Windows::Xbox::Speech::Recognition::SpeechRuleItemMatchType const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring SpeechNullItem::Semantics()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechNullItem::Semantics(hstring const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechPhraseItem.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechPhraseItem.cpp
index de462d1..c71aae0 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechPhraseItem.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechPhraseItem.cpp
@@ -8,66 +8,66 @@ namespace winrt::Windows::Xbox::Speech::Recognition::implementation
 {
     SpeechPhraseItem::SpeechPhraseItem(hstring const& text)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     SpeechPhraseItem::SpeechPhraseItem(hstring const& text, hstring const& semantics)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     SpeechPhraseItem::SpeechPhraseItem(hstring const& text, hstring const& semantics, winrt::Windows::Xbox::Speech::Recognition::SpeechRuleItemMatchType const& matchType)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     SpeechPhraseItem::SpeechPhraseItem(hstring const& text, hstring const& semantics, winrt::Windows::Xbox::Speech::Recognition::SpeechRuleItemMatchType const& itemMatchType, winrt::Windows::Xbox::Speech::Recognition::SpeechPhraseSubsetMatchMode const& phraseSubsetMatchMode)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Speech::Recognition::SpeechRuleItemMatchType SpeechPhraseItem::MatchType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechPhraseItem::MatchType(winrt::Windows::Xbox::Speech::Recognition::SpeechRuleItemMatchType const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring SpeechPhraseItem::Semantics()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechPhraseItem::Semantics(hstring const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring SpeechPhraseItem::Text()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechPhraseItem::Text(hstring const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring SpeechPhraseItem::Pronunciation()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechPhraseItem::Pronunciation(hstring const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring SpeechPhraseItem::DisplayForm()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechPhraseItem::DisplayForm(hstring const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Speech::Recognition::SpeechPhraseSubsetMatchMode SpeechPhraseItem::SubsetMatchMode()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechPhraseItem::SubsetMatchMode(winrt::Windows::Xbox::Speech::Recognition::SpeechPhraseSubsetMatchMode const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechPronunciationDetail.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechPronunciationDetail.cpp
index b8a5861..edcc7a4 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechPronunciationDetail.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechPronunciationDetail.cpp
@@ -8,14 +8,14 @@ namespace winrt::Windows::Xbox::Speech::Recognition::implementation
 {
     hstring SpeechPronunciationDetail::Pronunciation()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Speech::Recognition::SpeechPronunciationSource SpeechPronunciationDetail::Source()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Speech::Recognition::SpeechPronunciationFormat SpeechPronunciationDetail::Format()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognitionResult.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognitionResult.cpp
index 7e73eb9..624a70b 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognitionResult.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognitionResult.cpp
@@ -8,26 +8,26 @@ namespace winrt::Windows::Xbox::Speech::Recognition::implementation
 {
     hstring SpeechRecognitionResult::Text()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Speech::Recognition::SpeechRecognitionConfidence SpeechRecognitionResult::TextConfidence()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IMapView<hstring, winrt::Windows::Xbox::Speech::Recognition::SpeechRecognitionSemanticProperty> SpeechRecognitionResult::Semantics()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring SpeechRecognitionResult::RuleName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Speech::Recognition::SpeechRecognitionResult> SpeechRecognitionResult::GetAlternates(uint32_t maxAlternates)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Speech::Recognition::SpeechRecognitionResultDetail SpeechRecognitionResult::Details()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognitionResultBodyCorrelation.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognitionResultBodyCorrelation.cpp
index c1cdc07..e7a7c13 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognitionResultBodyCorrelation.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognitionResultBodyCorrelation.cpp
@@ -8,6 +8,6 @@ namespace winrt::Windows::Xbox::Speech::Recognition::implementation
 {
     uint64_t SpeechRecognitionResultBodyCorrelation::BodyTrackingId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognitionResultDetail.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognitionResultDetail.cpp
index c63c79f..fa9a78c 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognitionResultDetail.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognitionResultDetail.cpp
@@ -8,30 +8,30 @@ namespace winrt::Windows::Xbox::Speech::Recognition::implementation
 {
     winrt::Windows::Foundation::Collections::IVectorView<hstring> SpeechRecognitionResultDetail::RuleStack()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     float SpeechRecognitionResultDetail::ConfidenceScore()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring SpeechRecognitionResultDetail::Pronunciation()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Speech::Recognition::SpeechRecognitionResultToken> SpeechRecognitionResultDetail::Tokens()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint64_t SpeechRecognitionResultDetail::AudioPosition()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t SpeechRecognitionResultDetail::AudioSize()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Speech::Recognition::SpeechRecognitionResultBodyCorrelation> SpeechRecognitionResultDetail::BodyCorrelation()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognitionResultToken.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognitionResultToken.cpp
index 5c1f05c..a05e05e 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognitionResultToken.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognitionResultToken.cpp
@@ -8,14 +8,14 @@ namespace winrt::Windows::Xbox::Speech::Recognition::implementation
 {
     hstring SpeechRecognitionResultToken::DisplayForm()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring SpeechRecognitionResultToken::LexicalForm()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring SpeechRecognitionResultToken::PronunciationForm()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognitionSemanticProperty.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognitionSemanticProperty.cpp
index 17637f8..eae9dac 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognitionSemanticProperty.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognitionSemanticProperty.cpp
@@ -8,22 +8,22 @@ namespace winrt::Windows::Xbox::Speech::Recognition::implementation
 {
     hstring SpeechRecognitionSemanticProperty::Name()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring SpeechRecognitionSemanticProperty::ValueAsString()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Speech::Recognition::SpeechRecognitionConfidence SpeechRecognitionSemanticProperty::ConfidenceLevel()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     float SpeechRecognitionSemanticProperty::ConfidenceScore()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Speech::Recognition::SpeechRecognitionSemanticProperty> SpeechRecognitionSemanticProperty::Duplicates()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizer.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizer.cpp
index 51c910c..6ffba86 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizer.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizer.cpp
@@ -8,114 +8,114 @@ namespace winrt::Windows::Xbox::Speech::Recognition::implementation
 {
     void SpeechRecognizer::Close()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Xbox::Speech::Recognition::SpeechRecognitionResult> SpeechRecognizer::RecognizeAsync()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction SpeechRecognizer::PreloadGrammarsAsync()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Speech::Recognition::SpeechRecognizerSettings SpeechRecognizer::Settings()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Speech::Recognition::SpeechGrammarSet SpeechRecognizer::Grammars()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechRecognizer::StartContinuousRecognition()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechRecognizer::StopContinuousRecognition()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechRecognizer::ResumeContinuousRecognition()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool SpeechRecognizer::PauseOnContinuousRecognitionResultAvailable()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechRecognizer::PauseOnContinuousRecognitionResultAvailable(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Speech::Recognition::SpeechRecognizerInformation SpeechRecognizer::GetRecognizer()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechRecognizer::SetRecognizer(winrt::Windows::Xbox::Speech::Recognition::SpeechRecognizerInformation const& recognizerInformation)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token SpeechRecognizer::AudioProblemOccurred(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Speech::Recognition::SpeechRecognizer, winrt::Windows::Xbox::Speech::Recognition::SpeechAudioProblemOccurredEventArgs> const& audioProblemOccuredHandler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechRecognizer::AudioProblemOccurred(winrt::event_token const& cookie) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token SpeechRecognizer::AudioCaptureStateChanged(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Speech::Recognition::SpeechRecognizer, winrt::Windows::Xbox::Speech::Recognition::SpeechRecognizerAudioCaptureStateChangedEventArgs> const& audioCaptureStateChangedHandler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechRecognizer::AudioCaptureStateChanged(winrt::event_token const& cookie) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token SpeechRecognizer::ContinuousRecognitionResultAvailable(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Speech::Recognition::SpeechRecognizer, winrt::Windows::Xbox::Speech::Recognition::ContinuousSpeechRecognitionResultEventArgs> const& continuousRecognitionResultAvailableHandler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechRecognizer::ContinuousRecognitionResultAvailable(winrt::event_token const& cookie) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token SpeechRecognizer::ContinuousRecognitionStatusChanged(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Speech::Recognition::SpeechRecognizer, winrt::Windows::Xbox::Speech::Recognition::ContinuousSpeechRecognitionStatusEventArgs> const& continuousRecognitionStatusChangedHandler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechRecognizer::ContinuousRecognitionStatusChanged(winrt::event_token const& cookie) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token SpeechRecognizer::HypothesisAvailable(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Speech::Recognition::SpeechRecognizer, winrt::Windows::Xbox::Speech::Recognition::SpeechHypothesisResultEventArgs> const& hypothesisAvailableHandler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechRecognizer::HypothesisAvailable(winrt::event_token const& cookie) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token SpeechRecognizer::SoundStarted(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Speech::Recognition::SpeechRecognizer, winrt::Windows::Xbox::Speech::Recognition::SpeechRecognizerSoundStartedEventArgs> const& soundStartedHandler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechRecognizer::SoundStarted(winrt::event_token const& cookie) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token SpeechRecognizer::SoundEnded(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Speech::Recognition::SpeechRecognizer, winrt::Windows::Xbox::Speech::Recognition::SpeechRecognizerSoundEndedEventArgs> const& soundEndedHandler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechRecognizer::SoundEnded(winrt::event_token const& cookie) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token SpeechRecognizer::PhraseStarted(winrt::Windows::Foundation::TypedEventHandler<winrt::Windows::Xbox::Speech::Recognition::SpeechRecognizer, winrt::Windows::Xbox::Speech::Recognition::SpeechRecognizerPhraseStartedEventArgs> const& phraseStartedHandler)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechRecognizer::PhraseStarted(winrt::event_token const& cookie) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizerAnalyzer.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizerAnalyzer.cpp
index 985d2b4..be0b027 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizerAnalyzer.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizerAnalyzer.cpp
@@ -8,14 +8,14 @@ namespace winrt::Windows::Xbox::Speech::Recognition::implementation
 {
     winrt::Windows::Foundation::IAsyncAction SpeechRecognizerAnalyzer::SerializeGrammarsToFolderAsync(winrt::Windows::Xbox::Speech::Recognition::SpeechRecognizer speechRecognizer, winrt::Windows::Foundation::Uri destinationFolder, winrt::Windows::Xbox::Speech::Recognition::SpeechGrammarRuleInclusionMode inclusionMode)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Xbox::Speech::Recognition::SpeechRecognitionResult> SpeechRecognizerAnalyzer::CheckResultFromPhraseAsync(winrt::Windows::Xbox::Speech::Recognition::SpeechRecognizer speechRecognizer, hstring phrase)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Speech::Recognition::SpeechPronunciationDetail> SpeechRecognizerAnalyzer::GetPronunciationFromPhrase(winrt::Windows::Xbox::Speech::Recognition::SpeechRecognizer const& speechRecognizer, hstring const& phrase)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizerAudioCaptureStateChangedEventArgs.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizerAudioCaptureStateChangedEventArgs.cpp
index 0d3307e..dfbb298 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizerAudioCaptureStateChangedEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizerAudioCaptureStateChangedEventArgs.cpp
@@ -8,6 +8,6 @@ namespace winrt::Windows::Xbox::Speech::Recognition::implementation
 {
     winrt::Windows::Xbox::Speech::Recognition::SpeechRecognizerAudioCaptureState SpeechRecognizerAudioCaptureStateChangedEventArgs::State()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizerAudioContext.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizerAudioContext.cpp
index a8a2ba8..3d323ae 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizerAudioContext.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizerAudioContext.cpp
@@ -8,6 +8,6 @@ namespace winrt::Windows::Xbox::Speech::Recognition::implementation
 {
     uint64_t SpeechRecognizerAudioContext::AudioPosition()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizerInformation.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizerInformation.cpp
index 3e1dcf8..2c31125 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizerInformation.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizerInformation.cpp
@@ -8,18 +8,18 @@ namespace winrt::Windows::Xbox::Speech::Recognition::implementation
 {
     hstring SpeechRecognizerInformation::DisplayName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring SpeechRecognizerInformation::Id()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring SpeechRecognizerInformation::Language()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring SpeechRecognizerInformation::Description()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizerInputSetting.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizerInputSetting.cpp
index c9c61d7..6ae73ed 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizerInputSetting.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizerInputSetting.cpp
@@ -8,22 +8,22 @@ namespace winrt::Windows::Xbox::Speech::Recognition::implementation
 {
     void SpeechRecognizerInputSetting::SetInputToAudioStream(winrt::Windows::Storage::Streams::IRandomAccessStream const& inputStream)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechRecognizerInputSetting::SetInputToText(hstring const& text)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechRecognizerInputSetting::SetInputToPronunciation(hstring const& pronunciation)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechRecognizerInputSetting::SetInputToMicrophone()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechRecognizerInputSetting::SetInputToMicrophoneFeatureVector()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizerPhraseStartedEventArgs.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizerPhraseStartedEventArgs.cpp
index 075695b..8ff83dd 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizerPhraseStartedEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizerPhraseStartedEventArgs.cpp
@@ -8,6 +8,6 @@ namespace winrt::Windows::Xbox::Speech::Recognition::implementation
 {
     winrt::Windows::Xbox::Speech::Recognition::SpeechRecognizerAudioContext SpeechRecognizerPhraseStartedEventArgs::AudioContext()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizerSettings.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizerSettings.cpp
index 6343e6c..e6f14de 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizerSettings.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizerSettings.cpp
@@ -8,30 +8,30 @@ namespace winrt::Windows::Xbox::Speech::Recognition::implementation
 {
     winrt::Windows::Foundation::TimeSpan SpeechRecognizerSettings::InitialSilenceTimeout()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechRecognizerSettings::InitialSilenceTimeout(winrt::Windows::Foundation::TimeSpan const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan SpeechRecognizerSettings::EndSilenceTimeout()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechRecognizerSettings::EndSilenceTimeout(winrt::Windows::Foundation::TimeSpan const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::TimeSpan SpeechRecognizerSettings::BabbleTimeout()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechRecognizerSettings::BabbleTimeout(winrt::Windows::Foundation::TimeSpan const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Speech::Recognition::SpeechRecognizerInputSetting SpeechRecognizerSettings::SpeechRecognizerInputSetting()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizerSoundEndedEventArgs.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizerSoundEndedEventArgs.cpp
index ecd097d..68e0519 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizerSoundEndedEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizerSoundEndedEventArgs.cpp
@@ -8,6 +8,6 @@ namespace winrt::Windows::Xbox::Speech::Recognition::implementation
 {
     winrt::Windows::Xbox::Speech::Recognition::SpeechRecognizerAudioContext SpeechRecognizerSoundEndedEventArgs::AudioContext()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizerSoundStartedEventArgs.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizerSoundStartedEventArgs.cpp
index 5bb19fc..9e558cc 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizerSoundStartedEventArgs.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRecognizerSoundStartedEventArgs.cpp
@@ -8,6 +8,6 @@ namespace winrt::Windows::Xbox::Speech::Recognition::implementation
 {
     winrt::Windows::Xbox::Speech::Recognition::SpeechRecognizerAudioContext SpeechRecognizerSoundStartedEventArgs::AudioContext()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRuleReferenceItem.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRuleReferenceItem.cpp
index 177c3bf..b44a1b1 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRuleReferenceItem.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechRuleReferenceItem.cpp
@@ -8,34 +8,34 @@ namespace winrt::Windows::Xbox::Speech::Recognition::implementation
 {
     SpeechRuleReferenceItem::SpeechRuleReferenceItem(hstring const& ruleName)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     SpeechRuleReferenceItem::SpeechRuleReferenceItem(hstring const& ruleName, winrt::Windows::Xbox::Speech::Recognition::SpeechRuleItemMatchType const& matchType)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Speech::Recognition::SpeechRuleItemMatchType SpeechRuleReferenceItem::MatchType()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechRuleReferenceItem::MatchType(winrt::Windows::Xbox::Speech::Recognition::SpeechRuleItemMatchType const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring SpeechRuleReferenceItem::Semantics()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechRuleReferenceItem::Semantics(hstring const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring SpeechRuleReferenceItem::RuleName()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechRuleReferenceItem::RuleName(hstring const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechSequenceRule.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechSequenceRule.cpp
index 156cdf7..ddee842 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechSequenceRule.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Speech.Recognition.SpeechSequenceRule.cpp
@@ -8,18 +8,18 @@ namespace winrt::Windows::Xbox::Speech::Recognition::implementation
 {
     bool SpeechSequenceRule::EnabledOnLoad()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechSequenceRule::EnabledOnLoad(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechSequenceRule::Clear()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SpeechSequenceRule::AppendItem(winrt::Windows::Xbox::Speech::Recognition::ISpeechRuleItem const& item)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Storage.ConnectedStorageContainer.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Storage.ConnectedStorageContainer.cpp
index 98eb674..c4bfe83 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Storage.ConnectedStorageContainer.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Storage.ConnectedStorageContainer.cpp
@@ -13,7 +13,7 @@ namespace winrt::Windows::Xbox::Storage::implementation
     }
     winrt::Windows::Xbox::Storage::ConnectedStorageSpace ConnectedStorageContainer::OwningSpace()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction ConnectedStorageContainer::SubmitUpdatesAsync(winrt::Windows::Foundation::Collections::IMapView<hstring, winrt::Windows::Storage::Streams::IBuffer> blobsToWrite, winrt::Windows::Foundation::Collections::IIterable<hstring> blobsToDelete)
     {
@@ -25,11 +25,11 @@ namespace winrt::Windows::Xbox::Storage::implementation
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IMapView<hstring, winrt::Windows::Storage::Streams::IBuffer>> ConnectedStorageContainer::GetAsync(winrt::Windows::Foundation::Collections::IIterable<hstring> blobsToRead)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction ConnectedStorageContainer::SubmitPropertySetUpdatesAsync(winrt::Windows::Foundation::Collections::IPropertySet blobsToWrite, winrt::Windows::Foundation::Collections::IIterable<hstring> blobsToDelete)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction ConnectedStorageContainer::SubmitUpdatesAsync(winrt::Windows::Foundation::Collections::IMapView<hstring, winrt::Windows::Storage::Streams::IBuffer> blobsToWrite, winrt::Windows::Foundation::Collections::IIterable<hstring> blobsToDelete, hstring displayName)
     {
@@ -37,7 +37,7 @@ namespace winrt::Windows::Xbox::Storage::implementation
     }
     winrt::Windows::Foundation::IAsyncAction ConnectedStorageContainer::SubmitPropertySetUpdatesAsync(winrt::Windows::Foundation::Collections::IPropertySet blobsToWrite, winrt::Windows::Foundation::Collections::IIterable<hstring> blobsToDelete, hstring displayName)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Storage::BlobInfoQueryResult ConnectedStorageContainer::CreateBlobInfoQuery(hstring const& blobNamePrefix)
     {
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Storage.ConnectedStorageSpace.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Storage.ConnectedStorageSpace.cpp
index 205de06..09b09c0 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Storage.ConnectedStorageSpace.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Storage.ConnectedStorageSpace.cpp
@@ -63,11 +63,11 @@ namespace winrt::Windows::Xbox::Storage::implementation
     }
     hstring ConnectedStorageSpace::ServiceConfigurationId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool ConnectedStorageSpace::IsReadOnly()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::Storage::ConnectedStorageContainer ConnectedStorageSpace::CreateContainer(hstring const& containerName)
     {
@@ -99,10 +99,10 @@ namespace winrt::Windows::Xbox::Storage::implementation
     }
     winrt::Windows::Foundation::IAsyncOperation<int32_t> ConnectedStorageSpace::GetRemainingBytesInQuotaAsync()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<int64_t> ConnectedStorageSpace::GetRemainingBytesInQuota64Async()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.Storage.ContainerInfoQueryResult.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.Storage.ContainerInfoQueryResult.cpp
index d98576f..a618cf4 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.Storage.ContainerInfoQueryResult.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.Storage.ContainerInfoQueryResult.cpp
@@ -12,19 +12,19 @@ namespace winrt::Windows::Xbox::Storage::implementation
 {
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Storage::ContainerInfo>> ContainerInfoQueryResult::GetContainerInfoAsync(uint32_t startIndex, uint32_t maxNumberOfItems)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Storage::ContainerInfo>> ContainerInfoQueryResult::GetContainerInfoAsync()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<uint32_t> ContainerInfoQueryResult::GetItemCountAsync()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Storage::ContainerInfo2>> ContainerInfoQueryResult::GetContainerInfo2Async(uint32_t startIndex, uint32_t maxNumberOfItems)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Windows::Xbox::Storage::ContainerInfo2>> ContainerInfoQueryResult::GetContainerInfo2Async()
     {
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.System.Console.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.System.Console.cpp
index 46a5ae0..095344d 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.System.Console.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.System.Console.cpp
@@ -6,18 +6,18 @@ namespace winrt::Windows::Xbox::System::implementation
 {
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Xbox::System::GetTokenAndSignatureResult> Console::GetTokenAndSignatureAsync(hstring httpMethod, hstring url, hstring headers)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Xbox::System::GetTokenAndSignatureResult> Console::GetTokenAndSignatureAsync(hstring httpMethod, hstring url, hstring headers, array_view<uint8_t const> body)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Xbox::System::GetTokenAndSignatureResult> Console::GetTokenAndSignatureAsync(hstring httpMethod, hstring url, hstring headers, hstring body)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring Console::ApplicationSpecificDeviceId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.System.Console2.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.System.Console2.cpp
index 97e3781..7b77873 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.System.Console2.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.System.Console2.cpp
@@ -6,6 +6,6 @@ namespace winrt::Windows::Xbox::System::implementation
 {
     hstring Console2::ApplicationSpecificDeviceId()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.System.Launcher.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.System.Launcher.cpp
index 4a87913..4dda4db 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.System.Launcher.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.System.Launcher.cpp
@@ -6,6 +6,6 @@ namespace winrt::Windows::Xbox::System::implementation
 {
     winrt::Windows::Foundation::IAsyncOperation<bool> Launcher::NavigateBackAsync()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.System.User.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.System.User.cpp
index a3eb16d..e8de507 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.System.User.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.System.User.cpp
@@ -53,51 +53,51 @@ namespace winrt::Windows::Xbox::System::implementation
     }
     winrt::Windows::Xbox::System::User User::GetUserById(uint32_t id)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Xbox::System::GetTokenAndSignatureResult> User::GetTokenAndSignatureForAllUsersAsync(hstring httpMethod, hstring url, hstring headers)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Xbox::System::GetTokenAndSignatureResult> User::GetTokenAndSignatureForAllUsersAsync(hstring httpMethod, hstring url, hstring headers, array_view<uint8_t const> body)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Xbox::System::GetTokenAndSignatureResult> User::GetTokenAndSignatureForAllUsersAsync(hstring httpMethod, hstring url, hstring headers, hstring body)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token User::AudioDeviceAdded(winrt::Windows::Foundation::EventHandler<winrt::Windows::Xbox::System::AudioDeviceAddedEventArgs> const& handler)
     {
-        Logger::NotImplemented(); return {};
+        LOG_NOTIMPLEMENTED(); return {};
     }
     void User::AudioDeviceAdded(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented( ); return;
+        LOG_NOTIMPLEMENTED(); return;
     }
     winrt::event_token User::AudioDeviceRemoved(winrt::Windows::Foundation::EventHandler<winrt::Windows::Xbox::System::AudioDeviceRemovedEventArgs> const& handler)
     {
-        Logger::NotImplemented(); return {};
+        LOG_NOTIMPLEMENTED(); return {};
     }
     void User::AudioDeviceRemoved(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token User::AudioDeviceChanged(winrt::Windows::Foundation::EventHandler<winrt::Windows::Xbox::System::AudioDeviceChangedEventArgs> const& handler)
     {
-        Logger::NotImplemented(); return {};
+        LOG_NOTIMPLEMENTED(); return {};
     }
     void User::AudioDeviceChanged(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token User::SignInCompleted(winrt::Windows::Foundation::EventHandler<winrt::Windows::Xbox::System::SignInCompletedEventArgs> const& handler)
     {
-        Logger::NotImplemented(); return {};
+        LOG_NOTIMPLEMENTED(); return {};
     }
     void User::SignInCompleted(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::event_token User::SignOutStarted(winrt::Windows::Foundation::EventHandler<winrt::Windows::Xbox::System::SignOutStartedEventArgs> const& handler)
     {
@@ -109,23 +109,23 @@ namespace winrt::Windows::Xbox::System::implementation
     }
     winrt::event_token User::SignOutCompleted(winrt::Windows::Foundation::EventHandler<winrt::Windows::Xbox::System::SignOutCompletedEventArgs> const& handler)
     {
-        Logger::NotImplemented(); return {};
+        LOG_NOTIMPLEMENTED(); return {};
     }
     void User::SignOutCompleted(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented( ); return;
+        LOG_NOTIMPLEMENTED(); return;
     }
     winrt::event_token User::UserDisplayInfoChanged(winrt::Windows::Foundation::EventHandler<winrt::Windows::Xbox::System::UserDisplayInfoChangedEventArgs> const& handler)
     {
-        Logger::NotImplemented(); return {};
+        LOG_NOTIMPLEMENTED(); return {};
     }
     void User::UserDisplayInfoChanged(winrt::event_token const& token) noexcept
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::guid User::GetNetworkCacheIdForUsers(winrt::Windows::Foundation::Collections::IVectorView<uint32_t> const& users)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t User::Id()
     {
@@ -154,7 +154,7 @@ namespace winrt::Windows::Xbox::System::implementation
     }
     winrt::Windows::Xbox::System::UserLocation User::Location()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::System::User User::Sponsor()
     {
@@ -170,14 +170,14 @@ namespace winrt::Windows::Xbox::System::implementation
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Xbox::System::GetTokenAndSignatureResult> User::GetTokenAndSignatureAsync(hstring httpMethod, hstring url, hstring headers)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Xbox::System::GetTokenAndSignatureResult> User::GetTokenAndSignatureAsync(hstring httpMethod, hstring url, hstring headers, array_view<uint8_t const> body)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Xbox::System::GetTokenAndSignatureResult> User::GetTokenAndSignatureAsync(hstring httpMethod, hstring url, hstring headers, hstring body)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.System.UserDisplayInfo.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.System.UserDisplayInfo.cpp
index 551f1c3..fb30c49 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.System.UserDisplayInfo.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.System.UserDisplayInfo.cpp
@@ -6,40 +6,39 @@ namespace winrt::Windows::Xbox::System::implementation
 {
     hstring UserDisplayInfo::Gamertag()
     {
-        Logger::NotImplemented( );
+        LOG_NOTIMPLEMENTED();
         hstring gamertag = L"durangler" + m_gamertag;
         return gamertag;
     }
     uint32_t UserDisplayInfo::GamerScore()
     {
-        Logger::NotImplemented( );
-        Logger::NotImplemented(); return 0;
+        LOG_NOTIMPLEMENTED(); return 0;
     }
     hstring UserDisplayInfo::ApplicationDisplayName()
     {
-        Logger::NotImplemented( );
+        LOG_NOTIMPLEMENTED();
         return winrt::to_hstring("WinDurango");
     }
     hstring UserDisplayInfo::GameDisplayName()
     {
 
-        Logger::NotImplemented( );
+        LOG_NOTIMPLEMENTED();
         hstring gamertag = L"durangler" + m_gamertag;
         return gamertag;
     }
     int32_t UserDisplayInfo::Reputation()
     {
-        Logger::NotImplemented( );
+        LOG_NOTIMPLEMENTED();
         return 1;
     }
     winrt::Windows::Xbox::System::UserAgeGroup UserDisplayInfo::AgeGroup()
     {
-        Logger::NotImplemented( );
+		Logger::Info("UserDisplayInfo::AgeGroup() called");
         return UserAgeGroup::Unknown;
     }
     winrt::Windows::Foundation::Collections::IVectorView<uint32_t> UserDisplayInfo::Privileges()
     {   
-        Logger::NotImplemented( );
+        LOG_NOTIMPLEMENTED();
         auto vector = winrt::single_threaded_vector<uint32_t>();
         vector.Append(1);
         return vector.GetView();
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.UI.Accessibility.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.UI.Accessibility.cpp
index c15bac5..00f9857 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.UI.Accessibility.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.UI.Accessibility.cpp
@@ -7,10 +7,10 @@ namespace winrt::Windows::Xbox::UI::implementation
 {
     void Accessibility::SetSpeechToTextPositionHint(winrt::Windows::Xbox::UI::SpeechToTextPositionHint const& position)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void Accessibility::SendSpeechToTextString(hstring const& speakerName, hstring const& content, winrt::Windows::Xbox::UI::SpeechToTextType const& type)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.UI.AddRemoveFriendResult.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.UI.AddRemoveFriendResult.cpp
index 6bca68b..54b00bb 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.UI.AddRemoveFriendResult.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.UI.AddRemoveFriendResult.cpp
@@ -7,6 +7,6 @@ namespace winrt::Windows::Xbox::UI::implementation
 {
     winrt::Windows::Xbox::UI::AddRemoveFriendResultStatus AddRemoveFriendResult::Status()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.UI.KeyboardOptions.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.UI.KeyboardOptions.cpp
index 9ccde9b..f21b1dc 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.UI.KeyboardOptions.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.UI.KeyboardOptions.cpp
@@ -7,58 +7,58 @@ namespace winrt::Windows::Xbox::UI::implementation
 {
     hstring KeyboardOptions::DefaultText()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void KeyboardOptions::DefaultText(hstring const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring KeyboardOptions::TitleText()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void KeyboardOptions::TitleText(hstring const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     hstring KeyboardOptions::DescriptionText()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void KeyboardOptions::DescriptionText(hstring const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t KeyboardOptions::MaxLength()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void KeyboardOptions::MaxLength(uint32_t value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     bool KeyboardOptions::LengthIndicatorVisibility()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void KeyboardOptions::LengthIndicatorVisibility(bool value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t KeyboardOptions::LengthIndicatorThreshold()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void KeyboardOptions::LengthIndicatorThreshold(uint32_t value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::UI::VirtualKeyboardInputScope KeyboardOptions::InputScope()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void KeyboardOptions::InputScope(winrt::Windows::Xbox::UI::VirtualKeyboardInputScope const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.UI.SystemUI.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.UI.SystemUI.cpp
index 0b10412..118c018 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.UI.SystemUI.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.UI.SystemUI.cpp
@@ -12,11 +12,11 @@ namespace winrt::Windows::Xbox::UI::implementation
 {
     winrt::Windows::Foundation::IAsyncAction SystemUI::ShowEpgAsync(winrt::Windows::Xbox::System::IUser requestingUser, winrt::Windows::Foundation::Collections::IIterable<winrt::Windows::Foundation::Collections::IKeyValuePair<hstring, winrt::Windows::Foundation::IInspectable>> propertySet)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction SystemUI::ShowMiniguideAsync(winrt::Windows::Xbox::System::IUser requestingUser)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction SystemUI::ShowProfileCardAsync(winrt::Windows::Xbox::System::IUser requestingUser, hstring targetXuid)
     {
@@ -24,7 +24,7 @@ namespace winrt::Windows::Xbox::UI::implementation
     }
     winrt::Windows::Foundation::IAsyncAction SystemUI::ShowSendInvitesAsync(winrt::Windows::Xbox::System::IUser requestingUser)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Xbox::UI::AccountPickerResult> SystemUI::ShowAccountPickerAsync(winrt::Windows::Xbox::Input::IController controller, winrt::Windows::Xbox::UI::AccountPickerOptions options)
     {
@@ -50,82 +50,82 @@ namespace winrt::Windows::Xbox::UI::implementation
     }
     winrt::Windows::Foundation::IAsyncAction SystemUI::LaunchPartyAsync(winrt::Windows::Xbox::System::IUser requestingUser)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction SystemUI::LaunchAchievementsAsync(winrt::Windows::Xbox::System::IUser requestingUser, uint32_t titleId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction SystemUI::ShowPartyAndSendPartyInvitesAsync(winrt::Windows::Xbox::System::IUser requestingUser, winrt::Windows::Foundation::Collections::IVectorView<hstring> recipientUserIdList)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction SystemUI::ShowCreateLookingForGroupAsync(winrt::Windows::Xbox::System::IUser requestingUser, winrt::Windows::Foundation::Collections::IVectorView<hstring> preselectedTags, hstring preselectedDescription, uint32_t defaultNeedCount)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction SystemUI::ShowUserLookingForGroupsAsync(winrt::Windows::Xbox::System::IUser requestingUser)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction SystemUI::ShowLookingForGroupResultsAsync(winrt::Windows::Xbox::System::IUser requestingUser, winrt::Windows::Foundation::Collections::IVectorView<hstring> tags)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction SystemUI::LaunchKinectSetupAsync(winrt::Windows::Xbox::System::IUser requestingUser)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction SystemUI::LaunchRecentPlayersAsync(winrt::Windows::Xbox::System::IUser requestingUser)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction SystemUI::SnapDefaultBroadcastApp(winrt::Windows::Xbox::System::IUser requestingUser)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction SystemUI::ShowComposeMessageAsync(winrt::Windows::Xbox::System::IUser requestingUser, hstring defaultMessageText, winrt::Windows::Foundation::Collections::IVector<hstring> recipientUserIdList)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Xbox::UI::AddRemoveFriendResult> SystemUI::ShowAddRemoveFriendAsync(winrt::Windows::Xbox::System::IUser requestingUser, hstring targetUserId)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<hstring>> SystemUI::ShowPeoplePickerAsync(winrt::Windows::Xbox::System::IUser requestingUser, hstring promptText, winrt::Windows::Foundation::Collections::IVectorView<hstring> selectFromUserIdList, winrt::Windows::Foundation::Collections::IVectorView<hstring> preselectedUserIdList, uint32_t minimumSelectionCount, uint32_t maximumSelectionCount)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<bool> SystemUI::TrySnapSelf()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<bool> SystemUI::TrySnapOther(winrt::Windows::Foundation::Uri snapTargetUri, winrt::Windows::Xbox::System::IUser user)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncAction SystemUI::ShowMiniguideWithCommandAsync(winrt::Windows::Xbox::System::IUser requestingUser, winrt::Windows::Xbox::UI::MiniguideCommand initialCommand)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<hstring> SystemUI::ShowVirtualKeyboardWithOptionsAsync(winrt::Windows::Xbox::UI::KeyboardOptions options)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     void SystemUI::SetNotificationPositionHint(winrt::Windows::Xbox::UI::NotificationPositionHint const& value)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Xbox::UI::WebAuthenticationResult> SystemUI::AuthenticateAsync(winrt::Windows::Xbox::System::IUser requestingUser, winrt::Windows::Xbox::UI::WebAuthenticationOptions options, winrt::Windows::Foundation::Uri requestUri, winrt::Windows::Foundation::Uri callbackUri)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Xbox::UI::WebAuthenticationResult> SystemUI::AuthenticateAsync(winrt::Windows::Xbox::System::IUser requestingUser, winrt::Windows::Xbox::UI::WebAuthenticationOptions options, winrt::Windows::Foundation::Uri requestUri)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Foundation::Uri SystemUI::GetCurrentApplicationCallbackUri(winrt::Windows::Xbox::System::IUser const& requestingUser)
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Implementation/Windows.Xbox.UI.WebAuthenticationResult.cpp b/dlls/winrt_x/Implementation/Windows.Xbox.UI.WebAuthenticationResult.cpp
index 3b54036..d6e4cf5 100644
--- a/dlls/winrt_x/Implementation/Windows.Xbox.UI.WebAuthenticationResult.cpp
+++ b/dlls/winrt_x/Implementation/Windows.Xbox.UI.WebAuthenticationResult.cpp
@@ -7,14 +7,14 @@ namespace winrt::Windows::Xbox::UI::implementation
 {
     hstring WebAuthenticationResult::ResponseData()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     winrt::Windows::Xbox::UI::WebAuthenticationStatus WebAuthenticationResult::ResponseStatus()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
     uint32_t WebAuthenticationResult::ResponseErrorDetail()
     {
-        Logger::NotImplemented(); throw hresult_not_implemented();
+        LOG_NOTIMPLEMENTED(); throw hresult_not_implemented();
     }
 }
diff --git a/dlls/winrt_x/Logger.cpp b/dlls/winrt_x/Logger.cpp
index 6a2e705..e43c4d1 100644
--- a/dlls/winrt_x/Logger.cpp
+++ b/dlls/winrt_x/Logger.cpp
@@ -1,34 +1,35 @@
-
 #include "Logger.h"
 #include <ctime>
 #include <fstream>
 #include <iostream>
 #include <mutex>
+#include <windows.h>
+#include "../common/DebugLogger.h"
 
 static std::mutex logMutex;
 static std::ofstream logFile("debug.log", std::ios::app);
 
 static const char* ToString(LogLevel level) {
     switch (level) {
-    case LogLevel::Debug: return "DEBUG";
-    case LogLevel::Info: return "INFO";
-    case LogLevel::Warning: return "WARNING";
-    case LogLevel::Error: return "ERROR";
-    case LogLevel::Fatal: return "FATAL";
+    case LogLevel::Debug:          return "DEBUG";
+    case LogLevel::Info:           return "INFO";
+    case LogLevel::Warning:        return "WARNING";
+    case LogLevel::Error:          return "ERROR";
+    case LogLevel::Fatal:          return "FATAL";
     case LogLevel::NotImplemented: return "NOT_IMPLEMENTED";
-    default: return "UNKNOWN";
+    default:                       return "UNKNOWN";
     }
 }
 
-static const char* LevelColor(LogLevel level) {
+WORD GetConsoleColor(LogLevel level) {
     switch (level) {
-    case LogLevel::Debug: return "\x1B[36m"; // Cyan
-    case LogLevel::Info: return "\x1B[32m";  // Green
-    case LogLevel::Warning: return "\x1B[33m"; // Yellow
-    case LogLevel::Error: return "\x1B[31m"; // Red
-    case LogLevel::Fatal: return "\x1B[41m"; // Red Background
-    case LogLevel::NotImplemented: return "\x1B[35m"; // Magenta
-    default: return "\x1B[0m";
+    case LogLevel::Debug:          return FOREGROUND_BLUE | FOREGROUND_GREEN;
+    case LogLevel::Info:           return FOREGROUND_GREEN;
+    case LogLevel::Warning:        return FOREGROUND_RED | FOREGROUND_GREEN;
+    case LogLevel::Error:          return FOREGROUND_RED;
+    case LogLevel::Fatal:          return BACKGROUND_RED | FOREGROUND_RED | FOREGROUND_INTENSITY;
+    case LogLevel::NotImplemented: return FOREGROUND_RED | FOREGROUND_BLUE;
+    default:                       return FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE;
     }
 }
 
@@ -43,44 +44,69 @@ void Logger::Log(LogLevel level, const std::string& message, const char* file, i
     std::lock_guard<std::mutex> lock(logMutex);
 
     const char* levelStr = ToString(level);
-    const char* color = LevelColor(level);
-    const char* reset = "\x1B[0m";
-
-    std::string func = ExtractFunctionName(function);
+    std::string func = Logger::ExtractFunctionName(function);
     std::string timeStr = CurrentTime( );
+    const char* project = Logger::ExtractProjectName(file);
 
-    // Console
-    std::cout << color << timeStr << " - " << func << " - " << levelStr << " - Line " << line;
+    // Console coloring
+    HANDLE hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
+    CONSOLE_SCREEN_BUFFER_INFO csbi;
+    WORD originalAttributes = 0;
+    if (GetConsoleScreenBufferInfo(hConsole, &csbi)) {
+        originalAttributes = csbi.wAttributes;
+        SetConsoleTextAttribute(hConsole, GetConsoleColor(level));
+    }
+
+    std::cout << timeStr << " - " << project << "::" << func << " - " << levelStr << " - Line " << line;
     if (!message.empty( )) std::cout << " - " << message;
-    std::cout << reset << std::endl;
+    std::cout << std::endl;
 
-    // File
+    if (hConsole) SetConsoleTextAttribute(hConsole, originalAttributes);
+
+    // File logging
     if (logFile.is_open( )) {
-        logFile << timeStr << " - " << func << " - " << levelStr << " - Line " << line;
+        logFile << timeStr << " - " << project << "::" << func << " - " << levelStr << " - Line " << line;
         if (!message.empty( )) logFile << " - " << message;
         logFile << std::endl;
     }
 }
 
-// Shortcuts
-void Logger::Debug(const char* message) { Log(LogLevel::Debug, message, __FILE__, __LINE__, FUNCTION_NAME); }
-void Logger::Info(const char* message) { Log(LogLevel::Info, message, __FILE__, __LINE__, FUNCTION_NAME); }
-void Logger::Warning(const char* message) { Log(LogLevel::Warning, message, __FILE__, __LINE__, FUNCTION_NAME); }
-void Logger::Error(const char* message) { Log(LogLevel::Error, message, __FILE__, __LINE__, FUNCTION_NAME); }
-void Logger::Fatal(const char* message) { Log(LogLevel::Fatal, message, __FILE__, __LINE__, FUNCTION_NAME); }
-void Logger::NotImplemented(const char* message) { Log(LogLevel::NotImplemented, message, __FILE__, __LINE__, FUNCTION_NAME); }
+void Logger::LogNotImplemented(LogLevel level, int line, const char* file, const char* function) {
+    Logger::Log(level, "Feature not implemented", file, line, function);
+}
 
-// Utility
-const char* ExtractProjectName(const char* filePath) {
+void Logger::Debug(const char* message) { Logger::Log(LogLevel::Debug, message, __FILE__, __LINE__, FUNCTION_NAME); }
+void Logger::Info(const char* message) { Logger::Log(LogLevel::Info, message, __FILE__, __LINE__, FUNCTION_NAME); }
+void Logger::Warning(const char* message) { Logger::Log(LogLevel::Warning, message, __FILE__, __LINE__, FUNCTION_NAME); }
+void Logger::Error(const char* message) { Logger::Log(LogLevel::Error, message, __FILE__, __LINE__, FUNCTION_NAME); }
+void Logger::Fatal(const char* message) { Logger::Log(LogLevel::Fatal, message, __FILE__, __LINE__, FUNCTION_NAME); }
+
+void Logger::PrintWithContext(int line, const char* file, const char* function, const char* fmt, va_list args) {
+    char formatted[ 1024 ];
+    vsnprintf(formatted, sizeof(formatted), fmt, args);
+    Logger::Log(LogLevel::NotImplemented, formatted, file, line, function);
+}
+
+void Logger::NotImplemented(const char* fmt, ...) {
+    va_list args;
+    va_start(args, fmt);
+    Logger::PrintWithContext(__LINE__, __FILE__, FUNCTION_NAME, fmt, args);
+    va_end(args);
+}
+
+const char* Logger::ExtractProjectName(const char* filePath) {
     const char* lastSlash = strrchr(filePath, '/');
     if (!lastSlash) lastSlash = strrchr(filePath, '\\');
     if (lastSlash) {
         const char* secondLastSlash = filePath;
         while (secondLastSlash < lastSlash) {
             const char* temp = strpbrk(secondLastSlash + 1, "/\\");
-            if (temp && temp < lastSlash) secondLastSlash = temp;
-            else break;
+            if (temp && temp < lastSlash)
+                secondLastSlash = temp;
+            else
+                break;
         }
+
         if (secondLastSlash != filePath) {
             static char projectName[ 256 ];
             size_t length = lastSlash - secondLastSlash - 1;
@@ -97,7 +123,7 @@ const char* ExtractProjectName(const char* filePath) {
     return "UnknownProject";
 }
 
-const char* ExtractFunctionName(const char* fullSignature) {
+const char* Logger::ExtractFunctionName(const char* fullSignature) {
     const char* paren = strchr(fullSignature, '(');
     if (paren) {
         static char functionName[ 256 ];
diff --git a/dlls/winrt_x/Logger.h b/dlls/winrt_x/Logger.h
index 7bfe0fd..bd137a4 100644
--- a/dlls/winrt_x/Logger.h
+++ b/dlls/winrt_x/Logger.h
@@ -1,10 +1,11 @@
-#include "pch.h"
+#pragma once
+
 #include <string>
+#include <cstdarg>
+
 #ifndef DEBUG_LOGGER_H
 #define DEBUG_LOGGER_H
 
-
-
 enum class LogLevel {
     Debug,
     Info,
@@ -17,6 +18,7 @@ enum class LogLevel {
 class Logger {
 public:
     static void Log(LogLevel level, const std::string& message, const char* file, int line, const char* function);
+    static void LogNotImplemented(LogLevel level, int line, const char* file, const char* function);
 
     // Logging APIs
     static void Debug(const char* message = "");
@@ -24,9 +26,17 @@ public:
     static void Warning(const char* message = "");
     static void Error(const char* message = "");
     static void Fatal(const char* message = "");
-    static void NotImplemented(const char* message = "");
+
+    // Updated NotImplemented with caller context
+    static void NotImplemented(const char* fmt, ...);
+
+    static void PrintWithContext(int line, const char* file, const char* function, const char* fmt, va_list args);
+
+    static const char* ExtractFunctionName(const char* fullSignature);
+    static const char* ExtractProjectName(const char* filePath);
 };
 
+// Function name macro (compiler-specific)
 #if defined(__GNUC__) || defined(__clang__)
 #define FUNCTION_NAME __PRETTY_FUNCTION__
 #elif defined(_MSC_VER)
@@ -35,16 +45,16 @@ public:
 #define FUNCTION_NAME __FUNCTION__
 #endif
 
+// NotImplemented macro for correct callsite info
+#define LOG_NOTIMPLEMENTED(...) Logger::NotImplemented(__FILE__, __LINE__, FUNCTION_NAME, ##__VA_ARGS__)
+
 // Debug macros
 #ifdef _DEBUG
-#define DEBUG_LOG() Logger::Debug()
-#define DEBUGLOG(fmt, ...) Logger::Debug(fmt, ##__VA_ARGS__)
+#define DEBUG_PRINT() Logger::Debug()
+#define DEBUGPRINT(fmt, ...) Logger::Debug(fmt, ##__VA_ARGS__)
 #else
-#define DEBUG_LOG()
-#define DEBUGLOG(fmt, ...)
+#define DEBUG_PRINT()
+#define DEBUGPRINT(fmt, ...)
 #endif
 
-const char* ExtractProjectName(const char* filePath);
-const char* ExtractFunctionName(const char* fullSignature);
-
 #endif // DEBUG_LOGGER_H