Skip to content

Fix URFW auto-init reference to EnsureIsLoaded() #2501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DrusTheAxe merged 1 commit into from
May 12, 2022
Merged

Fix URFW auto-init reference to EnsureIsLoaded() #2501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dev/UndockedRegFreeWinRT/UndockedRegFreeWinRT-AutoInitializer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// the WindowsAppSDK runtime DLL and thus gets loaded when
// the including PE file gets loaded.

STDAPI UndockedRegFreeWinRT_EnsureIsLoaded();
STDAPI WindowsAppRuntime_EnsureIsLoaded();

namespace Microsoft::Windows::Foundation::UndockedRegFreeWinRT
{
Expand All @@ -34,7 +34,7 @@ namespace Microsoft::Windows::Foundation::UndockedRegFreeWinRT
exit(HRESULT_FROM_WIN32(lastError));
}
#else
(void) UndockedRegFreeWinRT_EnsureIsLoaded();
(void) WindowsAppRuntime_EnsureIsLoaded();
#endif
}
};
Expand Down
4 changes: 2 additions & 2 deletions dev/UndockedRegFreeWinRT/UndockedRegFreeWinRT-AutoInitializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace Microsoft.Windows.Foundation.UndockedRegFreeWinRTCS
internal static class NativeMethods
{
[DllImport("Microsoft.WindowsAppRuntime.dll", CharSet = CharSet.Unicode, ExactSpelling = true)]
internal static extern int UndockedRegFreeWinRT_EnsureIsLoaded();
internal static extern int WindowsAppRuntime_EnsureIsLoaded();
}

class AutoInitialize
Expand All @@ -21,7 +21,7 @@ internal static void AccessWindowsAppSDK()
// It's the act of calling the function causing the DllImport to load the DLL that
// matters. This provides the moral equivalent of a native DLL's Import Address
// Table (IAT) have an entry that's resolved when this module is loaded.
NativeMethods.UndockedRegFreeWinRT_EnsureIsLoaded();
NativeMethods.WindowsAppRuntime_EnsureIsLoaded();
}
}
}