diff --git a/WinDurango.sln b/WinDurango.sln
index 18e4e04..36ecdb3 100644
--- a/WinDurango.sln
+++ b/WinDurango.sln
@@ -21,9 +21,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kernelx", "dlls\kernelx\ker
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mfplat", "dlls\mfplat\mfplat.vcxproj", "{A67D1CEC-9F56-4D53-97C2-88BADEDDB22D}"
EndProject
+<<<<<<< Updated upstream
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winrt_x", "dlls\winrt_x\winrt_x.vcxproj", "{23FA421F-DC63-40BB-8188-2F4B26D7023B}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xg_x", "dlls\xg_x\xg_x.vcxproj", "{61147792-3E17-4013-B289-8F7D99BA510F}"
+=======
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XboxIntegratedMultiplayer", "dlls\XboxIntegratedMultiplayer\XboxIntegratedMultiplayer.vcxproj", "{4EFBB336-7E24-4AA2-B02F-6C014F5BB7E7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AcpHal", "dlls\AcpHal\AcpHal.vcxproj", "{A89A1631-2013-4642-B8A1-7AFE05D5A46B}"
+>>>>>>> Stashed changes
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -89,6 +95,7 @@ Global
{A67D1CEC-9F56-4D53-97C2-88BADEDDB22D}.Release|x64.Build.0 = Release|x64
{A67D1CEC-9F56-4D53-97C2-88BADEDDB22D}.ReleaseMD|x64.ActiveCfg = Release|x64
{A67D1CEC-9F56-4D53-97C2-88BADEDDB22D}.ReleaseMD|x64.Build.0 = Release|x64
+<<<<<<< Updated upstream
{23FA421F-DC63-40BB-8188-2F4B26D7023B}.Debug|x64.ActiveCfg = Debug|x64
{23FA421F-DC63-40BB-8188-2F4B26D7023B}.Debug|x64.Build.0 = Debug|x64
{23FA421F-DC63-40BB-8188-2F4B26D7023B}.DebugMDd|x64.ActiveCfg = Debug|x64
@@ -105,11 +112,80 @@ Global
{61147792-3E17-4013-B289-8F7D99BA510F}.Release|x64.Build.0 = Release|x64
{61147792-3E17-4013-B289-8F7D99BA510F}.ReleaseMD|x64.ActiveCfg = Release|x64
{61147792-3E17-4013-B289-8F7D99BA510F}.ReleaseMD|x64.Build.0 = Release|x64
+=======
+ {A67D1CEC-9F56-4D53-97C2-88BADEDDB22D}.ReleaseMD|x86.ActiveCfg = Release|Win32
+ {A67D1CEC-9F56-4D53-97C2-88BADEDDB22D}.ReleaseMD|x86.Build.0 = Release|Win32
+ {4EFBB336-7E24-4AA2-B02F-6C014F5BB7E7}.Debug|ARM.ActiveCfg = Debug|x64
+ {4EFBB336-7E24-4AA2-B02F-6C014F5BB7E7}.Debug|ARM.Build.0 = Debug|x64
+ {4EFBB336-7E24-4AA2-B02F-6C014F5BB7E7}.Debug|ARM64.ActiveCfg = Debug|x64
+ {4EFBB336-7E24-4AA2-B02F-6C014F5BB7E7}.Debug|ARM64.Build.0 = Debug|x64
+ {4EFBB336-7E24-4AA2-B02F-6C014F5BB7E7}.Debug|x64.ActiveCfg = Debug|x64
+ {4EFBB336-7E24-4AA2-B02F-6C014F5BB7E7}.Debug|x64.Build.0 = Debug|x64
+ {4EFBB336-7E24-4AA2-B02F-6C014F5BB7E7}.Debug|x86.ActiveCfg = Debug|Win32
+ {4EFBB336-7E24-4AA2-B02F-6C014F5BB7E7}.Debug|x86.Build.0 = Debug|Win32
+ {4EFBB336-7E24-4AA2-B02F-6C014F5BB7E7}.DebugMDd|ARM.ActiveCfg = Debug|x64
+ {4EFBB336-7E24-4AA2-B02F-6C014F5BB7E7}.DebugMDd|ARM.Build.0 = Debug|x64
+ {4EFBB336-7E24-4AA2-B02F-6C014F5BB7E7}.DebugMDd|ARM64.ActiveCfg = Debug|x64
+ {4EFBB336-7E24-4AA2-B02F-6C014F5BB7E7}.DebugMDd|ARM64.Build.0 = Debug|x64
+ {4EFBB336-7E24-4AA2-B02F-6C014F5BB7E7}.DebugMDd|x64.ActiveCfg = Debug|x64
+ {4EFBB336-7E24-4AA2-B02F-6C014F5BB7E7}.DebugMDd|x64.Build.0 = Debug|x64
+ {4EFBB336-7E24-4AA2-B02F-6C014F5BB7E7}.DebugMDd|x86.ActiveCfg = Debug|Win32
+ {4EFBB336-7E24-4AA2-B02F-6C014F5BB7E7}.DebugMDd|x86.Build.0 = Debug|Win32
+ {4EFBB336-7E24-4AA2-B02F-6C014F5BB7E7}.Release|ARM.ActiveCfg = Release|x64
+ {4EFBB336-7E24-4AA2-B02F-6C014F5BB7E7}.Release|ARM.Build.0 = Release|x64
+ {4EFBB336-7E24-4AA2-B02F-6C014F5BB7E7}.Release|ARM64.ActiveCfg = Release|x64
+ {4EFBB336-7E24-4AA2-B02F-6C014F5BB7E7}.Release|ARM64.Build.0 = Release|x64
+ {4EFBB336-7E24-4AA2-B02F-6C014F5BB7E7}.Release|x64.ActiveCfg = Release|x64
+ {4EFBB336-7E24-4AA2-B02F-6C014F5BB7E7}.Release|x64.Build.0 = Release|x64
+ {4EFBB336-7E24-4AA2-B02F-6C014F5BB7E7}.Release|x86.ActiveCfg = Release|Win32
+ {4EFBB336-7E24-4AA2-B02F-6C014F5BB7E7}.Release|x86.Build.0 = Release|Win32
+ {4EFBB336-7E24-4AA2-B02F-6C014F5BB7E7}.ReleaseMD|ARM.ActiveCfg = Release|x64
+ {4EFBB336-7E24-4AA2-B02F-6C014F5BB7E7}.ReleaseMD|ARM.Build.0 = Release|x64
+ {4EFBB336-7E24-4AA2-B02F-6C014F5BB7E7}.ReleaseMD|ARM64.ActiveCfg = Release|x64
+ {4EFBB336-7E24-4AA2-B02F-6C014F5BB7E7}.ReleaseMD|ARM64.Build.0 = Release|x64
+ {4EFBB336-7E24-4AA2-B02F-6C014F5BB7E7}.ReleaseMD|x64.ActiveCfg = Release|x64
+ {4EFBB336-7E24-4AA2-B02F-6C014F5BB7E7}.ReleaseMD|x64.Build.0 = Release|x64
+ {4EFBB336-7E24-4AA2-B02F-6C014F5BB7E7}.ReleaseMD|x86.ActiveCfg = Release|Win32
+ {4EFBB336-7E24-4AA2-B02F-6C014F5BB7E7}.ReleaseMD|x86.Build.0 = Release|Win32
+ {A89A1631-2013-4642-B8A1-7AFE05D5A46B}.Debug|ARM.ActiveCfg = Debug|x64
+ {A89A1631-2013-4642-B8A1-7AFE05D5A46B}.Debug|ARM.Build.0 = Debug|x64
+ {A89A1631-2013-4642-B8A1-7AFE05D5A46B}.Debug|ARM64.ActiveCfg = Debug|x64
+ {A89A1631-2013-4642-B8A1-7AFE05D5A46B}.Debug|ARM64.Build.0 = Debug|x64
+ {A89A1631-2013-4642-B8A1-7AFE05D5A46B}.Debug|x64.ActiveCfg = Debug|x64
+ {A89A1631-2013-4642-B8A1-7AFE05D5A46B}.Debug|x64.Build.0 = Debug|x64
+ {A89A1631-2013-4642-B8A1-7AFE05D5A46B}.Debug|x86.ActiveCfg = Debug|Win32
+ {A89A1631-2013-4642-B8A1-7AFE05D5A46B}.Debug|x86.Build.0 = Debug|Win32
+ {A89A1631-2013-4642-B8A1-7AFE05D5A46B}.DebugMDd|ARM.ActiveCfg = Debug|x64
+ {A89A1631-2013-4642-B8A1-7AFE05D5A46B}.DebugMDd|ARM.Build.0 = Debug|x64
+ {A89A1631-2013-4642-B8A1-7AFE05D5A46B}.DebugMDd|ARM64.ActiveCfg = Debug|x64
+ {A89A1631-2013-4642-B8A1-7AFE05D5A46B}.DebugMDd|ARM64.Build.0 = Debug|x64
+ {A89A1631-2013-4642-B8A1-7AFE05D5A46B}.DebugMDd|x64.ActiveCfg = Debug|x64
+ {A89A1631-2013-4642-B8A1-7AFE05D5A46B}.DebugMDd|x64.Build.0 = Debug|x64
+ {A89A1631-2013-4642-B8A1-7AFE05D5A46B}.DebugMDd|x86.ActiveCfg = Debug|Win32
+ {A89A1631-2013-4642-B8A1-7AFE05D5A46B}.DebugMDd|x86.Build.0 = Debug|Win32
+ {A89A1631-2013-4642-B8A1-7AFE05D5A46B}.Release|ARM.ActiveCfg = Release|x64
+ {A89A1631-2013-4642-B8A1-7AFE05D5A46B}.Release|ARM.Build.0 = Release|x64
+ {A89A1631-2013-4642-B8A1-7AFE05D5A46B}.Release|ARM64.ActiveCfg = Release|x64
+ {A89A1631-2013-4642-B8A1-7AFE05D5A46B}.Release|ARM64.Build.0 = Release|x64
+ {A89A1631-2013-4642-B8A1-7AFE05D5A46B}.Release|x64.ActiveCfg = Release|x64
+ {A89A1631-2013-4642-B8A1-7AFE05D5A46B}.Release|x64.Build.0 = Release|x64
+ {A89A1631-2013-4642-B8A1-7AFE05D5A46B}.Release|x86.ActiveCfg = Release|Win32
+ {A89A1631-2013-4642-B8A1-7AFE05D5A46B}.Release|x86.Build.0 = Release|Win32
+ {A89A1631-2013-4642-B8A1-7AFE05D5A46B}.ReleaseMD|ARM.ActiveCfg = Release|x64
+ {A89A1631-2013-4642-B8A1-7AFE05D5A46B}.ReleaseMD|ARM.Build.0 = Release|x64
+ {A89A1631-2013-4642-B8A1-7AFE05D5A46B}.ReleaseMD|ARM64.ActiveCfg = Release|x64
+ {A89A1631-2013-4642-B8A1-7AFE05D5A46B}.ReleaseMD|ARM64.Build.0 = Release|x64
+ {A89A1631-2013-4642-B8A1-7AFE05D5A46B}.ReleaseMD|x64.ActiveCfg = Release|x64
+ {A89A1631-2013-4642-B8A1-7AFE05D5A46B}.ReleaseMD|x64.Build.0 = Release|x64
+ {A89A1631-2013-4642-B8A1-7AFE05D5A46B}.ReleaseMD|x86.ActiveCfg = Release|Win32
+ {A89A1631-2013-4642-B8A1-7AFE05D5A46B}.ReleaseMD|x86.Build.0 = Release|Win32
+>>>>>>> Stashed changes
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
+<<<<<<< Updated upstream
{37489709-8054-4903-9C49-A79846049FC9} = {243DBE8A-7A46-42B5-9FEC-A8E7CB67CE81}
{C4B41A92-2F30-4E8D-8F44-1A82F5C6A7F9} = {BF759166-26A8-4B46-8423-8091158F2EA5}
{DD076E76-174E-414F-A47F-01CC84E3FC80} = {BF759166-26A8-4B46-8423-8091158F2EA5}
@@ -119,6 +195,21 @@ Global
{A67D1CEC-9F56-4D53-97C2-88BADEDDB22D} = {BF759166-26A8-4B46-8423-8091158F2EA5}
{23FA421F-DC63-40BB-8188-2F4B26D7023B} = {BF759166-26A8-4B46-8423-8091158F2EA5}
{61147792-3E17-4013-B289-8F7D99BA510F} = {BF759166-26A8-4B46-8423-8091158F2EA5}
+=======
+ {94127830-3A6C-4861-BBD2-20C0D289802D} = {A46DB9F5-4A23-41CA-98CA-A5DE9DDF012A}
+ {B7848E35-3881-44CC-89B9-C14D32B2BC42} = {A46DB9F5-4A23-41CA-98CA-A5DE9DDF012A}
+ {7639E4A9-40B7-4709-864A-72A1879AADED} = {A46DB9F5-4A23-41CA-98CA-A5DE9DDF012A}
+ {F9420BF5-A0E3-41C4-8EB0-DB81A54CF6D8} = {A46DB9F5-4A23-41CA-98CA-A5DE9DDF012A}
+ {F58FABA6-C92B-4D45-8F05-51A3430D2625} = {A46DB9F5-4A23-41CA-98CA-A5DE9DDF012A}
+ {C0273DA4-2B16-4A10-B229-6113D4408741} = {240ACC56-C364-4337-B2C1-D607979FBEA3}
+ {41492CBB-4C65-4E00-AC8B-69E89EFC8AC4} = {240ACC56-C364-4337-B2C1-D607979FBEA3}
+ {C4B41A92-2F30-4E8D-8F44-1A82F5C6A7F9} = {A46DB9F5-4A23-41CA-98CA-A5DE9DDF012A}
+ {DD076E76-174E-414F-A47F-01CC84E3FC80} = {A46DB9F5-4A23-41CA-98CA-A5DE9DDF012A}
+ {37489709-8054-4903-9C49-A79846049FC9} = {097A8A65-AD91-432A-9AF2-58F588E51597}
+ {A67D1CEC-9F56-4D53-97C2-88BADEDDB22D} = {A46DB9F5-4A23-41CA-98CA-A5DE9DDF012A}
+ {4EFBB336-7E24-4AA2-B02F-6C014F5BB7E7} = {A46DB9F5-4A23-41CA-98CA-A5DE9DDF012A}
+ {A89A1631-2013-4642-B8A1-7AFE05D5A46B} = {A46DB9F5-4A23-41CA-98CA-A5DE9DDF012A}
+>>>>>>> Stashed changes
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {30EA489C-CFA4-4816-BE12-8BCE129039C5}
diff --git a/dlls/AcpHal/AcpHal.cpp b/dlls/AcpHal/AcpHal.cpp
new file mode 100644
index 0000000..c04f229
--- /dev/null
+++ b/dlls/AcpHal/AcpHal.cpp
@@ -0,0 +1,41 @@
+#include "pch.h"
+
+__int64 AcpHalAllocateShapeContexts_X(__int64 a1) {
+ return 0;
+}
+
+__int64 AcpHalCreate_X(unsigned __int64* a1) {
+ return 0;
+}
+
+__int64 AcpHalReleaseShapeContexts_X() {
+ return 0;
+}
+
+__int64 ApuAlloc_X(int a1, int a2, int a3, int a4, int a5) {
+ return 0;
+}
+
+__int64 ApuCreateHeap_X(int a1, int a2) {
+ return 0;
+}
+
+__int64 ApuFree_X(__int64 a1) {
+ return 0;
+}
+
+__int64 ApuHeapGetState_X(__int64 a1, int a2) {
+ return 0;
+}
+
+__int64 ApuIsVirtualAddressValid_X(unsigned __int64 a1, unsigned int a2) {
+ return 0;
+}
+
+__int64 ApuMapApuAddress_X(unsigned int a1) {
+ return 0;
+}
+
+__int64 ApuMapVirtualAddress_X(unsigned __int64 a1) {
+ return 0;
+}
diff --git a/dlls/AcpHal/AcpHal.vcxproj b/dlls/AcpHal/AcpHal.vcxproj
new file mode 100644
index 0000000..2e9b884
--- /dev/null
+++ b/dlls/AcpHal/AcpHal.vcxproj
@@ -0,0 +1,165 @@
+
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ x64
+
+
+
+ 17.0
+ Win32Proj
+ {a89a1631-2013-4642-b8a1-7afe05d5a46b}
+ AcpHal
+ 10.0
+
+
+
+ DynamicLibrary
+ true
+ v143
+ Unicode
+
+
+ DynamicLibrary
+ false
+ v143
+ true
+ Unicode
+
+
+ DynamicLibrary
+ true
+ v143
+ Unicode
+
+
+ DynamicLibrary
+ false
+ v143
+ true
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Level3
+ true
+ WIN32;_DEBUG;ACPHAL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
+ true
+ Use
+ pch.h
+
+
+ Windows
+ true
+ false
+ Exports.def
+
+
+
+
+ Level3
+ true
+ true
+ true
+ WIN32;NDEBUG;ACPHAL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
+ true
+ Use
+ pch.h
+
+
+ Windows
+ true
+ true
+ true
+ false
+ Exports.def
+
+
+
+
+ Level3
+ true
+ _DEBUG;ACPHAL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
+ true
+ Use
+ pch.h
+
+
+ Windows
+ true
+ false
+ Exports.def
+
+
+
+
+ Level3
+ true
+ true
+ true
+ NDEBUG;ACPHAL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
+ true
+ Use
+ pch.h
+
+
+ Windows
+ true
+ true
+ true
+ false
+ Exports.def
+
+
+
+
+
+
+
+
+
+
+ Create
+ Create
+ Create
+ Create
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dlls/AcpHal/AcpHal.vcxproj.filters b/dlls/AcpHal/AcpHal.vcxproj.filters
new file mode 100644
index 0000000..41a9785
--- /dev/null
+++ b/dlls/AcpHal/AcpHal.vcxproj.filters
@@ -0,0 +1,42 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {93995380-89BD-4b04-88EB-625FBE52EBFB}
+ h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd
+
+
+ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
+ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms
+
+
+
+
+ Header Files
+
+
+ Header Files
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+
+
+
+ Source Files
+
+
+
\ No newline at end of file
diff --git a/dlls/AcpHal/Exports.def b/dlls/AcpHal/Exports.def
new file mode 100644
index 0000000..3f40f0f
--- /dev/null
+++ b/dlls/AcpHal/Exports.def
@@ -0,0 +1,12 @@
+LIBRARY AcpHal
+EXPORTS
+ AcpHalAllocateShapeContexts = AcpHalAllocateShapeContexts_X @1
+ AcpHalCreate = AcpHalCreate_X @2
+ AcpHalReleaseShapeContexts = AcpHalReleaseShapeContexts_X @3
+ ApuAlloc = ApuAlloc_X @4
+ ApuCreateHeap = ApuCreateHeap_X @5
+ ApuFree = ApuFree_X @6
+ ApuHeapGetState = ApuHeapGetState_X @7
+ ApuIsVirtualAddressValid = ApuIsVirtualAddressValid_X @8
+ ApuMapApuAddress = ApuMapApuAddress_X @9
+ ApuMapVirtualAddress = ApuMapVirtualAddress_X @10
diff --git a/dlls/AcpHal/dllmain.cpp b/dlls/AcpHal/dllmain.cpp
new file mode 100644
index 0000000..f266597
--- /dev/null
+++ b/dlls/AcpHal/dllmain.cpp
@@ -0,0 +1,19 @@
+// dllmain.cpp : Defines the entry point for the DLL application.
+#include "pch.h"
+
+BOOL APIENTRY DllMain( HMODULE hModule,
+ DWORD ul_reason_for_call,
+ LPVOID lpReserved
+ )
+{
+ switch (ul_reason_for_call)
+ {
+ case DLL_PROCESS_ATTACH:
+ case DLL_THREAD_ATTACH:
+ case DLL_THREAD_DETACH:
+ case DLL_PROCESS_DETACH:
+ break;
+ }
+ return TRUE;
+}
+
diff --git a/dlls/AcpHal/framework.h b/dlls/AcpHal/framework.h
new file mode 100644
index 0000000..54b83e9
--- /dev/null
+++ b/dlls/AcpHal/framework.h
@@ -0,0 +1,5 @@
+#pragma once
+
+#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
+// Windows Header Files
+#include
diff --git a/dlls/AcpHal/packages.config b/dlls/AcpHal/packages.config
new file mode 100644
index 0000000..cbf6205
--- /dev/null
+++ b/dlls/AcpHal/packages.config
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/dlls/AcpHal/pch.cpp b/dlls/AcpHal/pch.cpp
new file mode 100644
index 0000000..64b7eef
--- /dev/null
+++ b/dlls/AcpHal/pch.cpp
@@ -0,0 +1,5 @@
+// pch.cpp: source file corresponding to the pre-compiled header
+
+#include "pch.h"
+
+// When you are using pre-compiled headers, this source file is necessary for compilation to succeed.
diff --git a/dlls/AcpHal/pch.h b/dlls/AcpHal/pch.h
new file mode 100644
index 0000000..885d5d6
--- /dev/null
+++ b/dlls/AcpHal/pch.h
@@ -0,0 +1,13 @@
+// pch.h: This is a precompiled header file.
+// Files listed below are compiled only once, improving build performance for future builds.
+// This also affects IntelliSense performance, including code completion and many code browsing features.
+// However, files listed here are ALL re-compiled if any one of them is updated between builds.
+// Do not add files here that you will be updating frequently as this negates the performance advantage.
+
+#ifndef PCH_H
+#define PCH_H
+
+// add headers that you want to pre-compile here
+#include "framework.h"
+
+#endif //PCH_H
diff --git a/dlls/XboxIntegratedMultiplayer/Exports.def b/dlls/XboxIntegratedMultiplayer/Exports.def
new file mode 100644
index 0000000..9fdc3bd
--- /dev/null
+++ b/dlls/XboxIntegratedMultiplayer/Exports.def
@@ -0,0 +1,63 @@
+LIBRARY XboxIntegratedMultiplayer
+EXPORTS
+ XimAuthorityGetIsLocal = XimAuthorityGetIsLocal_X @2
+ XimAuthorityGetNetworkPathInformation = XimAuthorityGetNetworkPathInformation_X @3
+ XimAuthoritySendDataToPlayers = XimAuthoritySendDataToPlayers_X @4
+ XimAuthoritySetAuthorityReconciledData = XimAuthoritySetAuthorityReconciledData_X @5
+ XimCleanup = XimCleanup_X @6
+ XimCreateOutOfBandReservation = XimCreateOutOfBandReservation_X @7
+ XimExtractProtocolActivationInformation = XimExtractProtocolActivationInformation_X @8
+ XimFailFastWithInform = XimFailFastWithInform_X @9
+ XimFinishProcessingStateChanges = XimFinishProcessingStateChanges_X @10
+ XimGetAllowedPlayerJoins = XimGetAllowedPlayerJoins_X @11
+ XimGetBackfillMatchmakingConfiguration = XimGetBackfillMatchmakingConfiguration_X @12
+ XimGetChatTargets = XimGetChatTargets_X @13
+ XimGetDebugMemoryMode = XimGetDebugMemoryMode_X @14
+ XimGetMemFunctions = XimGetMemFunctions_X @15
+ XimGetNetworkCustomProperty = XimGetNetworkCustomProperty_X @16
+ XimGetPlayers = XimGetPlayers_X @17
+ XimGetThreadProcessor = XimGetThreadProcessor_X @18
+ XimInitialize = XimInitialize_X @19
+ XimKickPlayer = XimKickPlayer_X @20
+ XimLeaveNetwork = XimLeaveNetwork_X @21
+ XimMoveToNetworkUsingJoinableXboxUserId = XimMoveToNetworkUsingJoinableXboxUserId_X @22
+ XimMoveToNetworkUsingMatchmaking = XimMoveToNetworkUsingMatchmaking_X @23
+ XimMoveToNetworkUsingOutOfBandReservation = XimMoveToNetworkUsingOutOfBandReservation_X @24
+ XimMoveToNetworkUsingProtocolActivatedEventArgs = XimMoveToNetworkUsingProtocolActivatedEventArgs_X @25
+ XimMoveToNewNetwork = XimMoveToNewNetwork_X @26
+ XimPlayerGetChatAudioRenderVolume = XimPlayerGetChatAudioRenderVolume_X @27
+ XimPlayerGetChatIndicator = XimPlayerGetChatIndicator_X @28
+ XimPlayerGetChatMuted = XimPlayerGetChatMuted_X @29
+ XimPlayerGetChatSpeechToTextConversionPreferenceEnabled= XimPlayerGetChatSpeechToTextConversionPreferenceEnabled_X @30
+ XimPlayerGetChatTextToSpeechConversionPreferenceEnabled= XimPlayerGetChatTextToSpeechConversionPreferenceEnabled_X @31
+ XimPlayerGetCustomPlayerContext = XimPlayerGetCustomPlayerContext_X @32
+ XimPlayerGetCustomProperty = XimPlayerGetCustomProperty_X @33
+ XimPlayerGetGamertag = XimPlayerGetGamertag_X @34
+ XimPlayerGetIsLocal = XimPlayerGetIsLocal_X @35
+ XimPlayerGetIsOnSameDeviceAsOtherPlayer = XimPlayerGetIsOnSameDeviceAsOtherPlayer_X @36
+ XimPlayerGetMatchmakingConfiguration = XimPlayerGetMatchmakingConfiguration_X @37
+ XimPlayerGetNetworkPathInformation = XimPlayerGetNetworkPathInformation_X @38
+ XimPlayerGetTeamIndex = XimPlayerGetTeamIndex_X @39
+ XimPlayerGetWasMatchmade = XimPlayerGetWasMatchmade_X @40
+ XimPlayerGetXboxUserId = XimPlayerGetXboxUserId_X @41
+ XimPlayerInviteUsers = XimPlayerInviteUsers_X @42
+ XimPlayerSendChatText = XimPlayerSendChatText_X @43
+ XimPlayerSendDataToAuthority = XimPlayerSendDataToAuthority_X @44
+ XimPlayerSendDataToOtherPlayers = XimPlayerSendDataToOtherPlayers_X @45
+ XimPlayerSetChatAudioRenderVolume = XimPlayerSetChatAudioRenderVolume_X @46
+ XimPlayerSetChatMuted = XimPlayerSetChatMuted_X @47
+ XimPlayerSetCustomPlayerContext = XimPlayerSetCustomPlayerContext_X @48
+ XimPlayerSetCustomProperty = XimPlayerSetCustomProperty_X @49
+ XimPlayerSetMatchmakingConfiguration = XimPlayerSetMatchmakingConfiguration_X @50
+ XimPlayerSetTeamIndex = XimPlayerSetTeamIndex_X @51
+ XimPlayerShowInviteUI = XimPlayerShowInviteUI_X @52
+ XimRequestJoinableXboxUserIds = XimRequestJoinableXboxUserIds_X @53
+ XimSetAllowedPlayerJoins = XimSetAllowedPlayerJoins_X @54
+ XimSetBackfillMatchmakingConfiguration = XimSetBackfillMatchmakingConfiguration_X @55
+ XimSetChatTargets = XimSetChatTargets_X @56
+ XimSetDebugMemoryMode = XimSetDebugMemoryMode_X @57
+ XimSetIntendedLocalXboxUserIds = XimSetIntendedLocalXboxUserIds_X @58
+ XimSetMemFunctions = XimSetMemFunctions_X @59
+ XimSetNetworkCustomProperty = XimSetNetworkCustomProperty_X @60
+ XimSetThreadProcessor = XimSetThreadProcessor_X @61
+ XimStartProcessingStateChanges = XimStartProcessingStateChanges_X @62
\ No newline at end of file
diff --git a/dlls/XboxIntegratedMultiplayer/XboxIntegratedMultiplayer.cpp b/dlls/XboxIntegratedMultiplayer/XboxIntegratedMultiplayer.cpp
new file mode 100644
index 0000000..f96ce31
--- /dev/null
+++ b/dlls/XboxIntegratedMultiplayer/XboxIntegratedMultiplayer.cpp
@@ -0,0 +1,63 @@
+#include "pch.h"
+
+__int64 XimAuthorityGetIsLocal_X() { return 0; }
+__int64 XimAuthorityGetNetworkPathInformation_X() { return 0; }
+__int64 XimAuthoritySendDataToPlayers_X() { return 0; }
+__int64 XimAuthoritySetAuthorityReconciledData_X() { return 0; }
+__int64 XimCleanup_X() { return 0; }
+__int64 XimCreateOutOfBandReservation_X() { return 0; }
+__int64 XimExtractProtocolActivationInformation_X() { return 0; }
+__int64 XimFailFastWithInform_X() { return 0; }
+__int64 XimFinishProcessingStateChanges_X() { return 0; }
+__int64 XimGetAllowedPlayerJoins_X() { return 0; }
+__int64 XimGetBackfillMatchmakingConfiguration_X() { return 0; }
+__int64 XimGetChatTargets_X() { return 0; }
+__int64 XimGetDebugMemoryMode_X() { return 0; }
+__int64 XimGetMemFunctions_X() { return 0; }
+__int64 XimGetNetworkCustomProperty_X() { return 0; }
+__int64 XimGetPlayers_X() { return 0; }
+__int64 XimGetThreadProcessor_X() { return 0; }
+__int64 XimInitialize_X() { return 0; }
+__int64 XimKickPlayer_X() { return 0; }
+__int64 XimLeaveNetwork_X() { return 0; }
+__int64 XimMoveToNetworkUsingJoinableXboxUserId_X() { return 0; }
+__int64 XimMoveToNetworkUsingMatchmaking_X() { return 0; }
+__int64 XimMoveToNetworkUsingOutOfBandReservation_X() { return 0; }
+__int64 XimMoveToNetworkUsingProtocolActivatedEventArgs_X() { return 0; }
+__int64 XimMoveToNewNetwork_X() { return 0; }
+__int64 XimPlayerGetChatAudioRenderVolume_X() { return 0; }
+__int64 XimPlayerGetChatIndicator_X() { return 0; }
+__int64 XimPlayerGetChatMuted_X() { return 0; }
+__int64 XimPlayerGetChatSpeechToTextConversionPreferenceEnabled_X() { return 0; }
+__int64 XimPlayerGetChatTextToSpeechConversionPreferenceEnabled_X() { return 0; }
+__int64 XimPlayerGetCustomPlayerContext_X() { return 0; }
+__int64 XimPlayerGetCustomProperty_X() { return 0; }
+__int64 XimPlayerGetGamertag_X() { return 0; }
+__int64 XimPlayerGetIsLocal_X() { return 0; }
+__int64 XimPlayerGetIsOnSameDeviceAsOtherPlayer_X() { return 0; }
+__int64 XimPlayerGetMatchmakingConfiguration_X() { return 0; }
+__int64 XimPlayerGetNetworkPathInformation_X() { return 0; }
+__int64 XimPlayerGetTeamIndex_X() { return 0; }
+__int64 XimPlayerGetWasMatchmade_X() { return 0; }
+__int64 XimPlayerGetXboxUserId_X() { return 0; }
+__int64 XimPlayerInviteUsers_X() { return 0; }
+__int64 XimPlayerSendChatText_X() { return 0; }
+__int64 XimPlayerSendDataToAuthority_X() { return 0; }
+__int64 XimPlayerSendDataToOtherPlayers_X() { return 0; }
+__int64 XimPlayerSetChatAudioRenderVolume_X() { return 0; }
+__int64 XimPlayerSetChatMuted_X() { return 0; }
+__int64 XimPlayerSetCustomPlayerContext_X() { return 0; }
+__int64 XimPlayerSetCustomProperty_X() { return 0; }
+__int64 XimPlayerSetMatchmakingConfiguration_X() { return 0; }
+__int64 XimPlayerSetTeamIndex_X() { return 0; }
+__int64 XimPlayerShowInviteUI_X() { return 0; }
+__int64 XimRequestJoinableXboxUserIds_X() { return 0; }
+__int64 XimSetAllowedPlayerJoins_X() { return 0; }
+__int64 XimSetBackfillMatchmakingConfiguration_X() { return 0; }
+__int64 XimSetChatTargets_X() { return 0; }
+__int64 XimSetDebugMemoryMode_X() { return 0; }
+__int64 XimSetIntendedLocalXboxUserIds_X() { return 0; }
+__int64 XimSetMemFunctions_X() { return 0; }
+__int64 XimSetNetworkCustomProperty_X() { return 0; }
+__int64 XimSetThreadProcessor_X() { return 0; }
+__int64 XimStartProcessingStateChanges_X() { return 0; }
diff --git a/dlls/XboxIntegratedMultiplayer/XboxIntegratedMultiplayer.vcxproj b/dlls/XboxIntegratedMultiplayer/XboxIntegratedMultiplayer.vcxproj
new file mode 100644
index 0000000..e725e54
--- /dev/null
+++ b/dlls/XboxIntegratedMultiplayer/XboxIntegratedMultiplayer.vcxproj
@@ -0,0 +1,165 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ x64
+
+
+
+ 17.0
+ Win32Proj
+ {4efbb336-7e24-4aa2-b02f-6c014f5bb7e7}
+ XboxIntegratedMultiplayer
+ 10.0
+
+
+
+ DynamicLibrary
+ true
+ v143
+ Unicode
+
+
+ DynamicLibrary
+ false
+ v143
+ true
+ Unicode
+
+
+ DynamicLibrary
+ true
+ v143
+ Unicode
+
+
+ DynamicLibrary
+ false
+ v143
+ true
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Level3
+ true
+ WIN32;_DEBUG;XBOXINTEGRATEDMULTIPLAYER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
+ true
+ Use
+ pch.h
+
+
+ Windows
+ true
+ false
+ Exports.def
+
+
+
+
+ Level3
+ true
+ true
+ true
+ WIN32;NDEBUG;XBOXINTEGRATEDMULTIPLAYER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
+ true
+ Use
+ pch.h
+
+
+ Windows
+ true
+ true
+ true
+ false
+ Exports.def
+
+
+
+
+ Level3
+ true
+ _DEBUG;XBOXINTEGRATEDMULTIPLAYER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
+ true
+ Use
+ pch.h
+
+
+ Windows
+ true
+ false
+ Exports.def
+
+
+
+
+ Level3
+ true
+ true
+ true
+ NDEBUG;XBOXINTEGRATEDMULTIPLAYER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
+ true
+ Use
+ pch.h
+
+
+ Windows
+ true
+ true
+ true
+ false
+ Exports.def
+
+
+
+
+
+
+
+
+
+ Create
+ Create
+ Create
+ Create
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dlls/XboxIntegratedMultiplayer/XboxIntegratedMultiplayer.vcxproj.filters b/dlls/XboxIntegratedMultiplayer/XboxIntegratedMultiplayer.vcxproj.filters
new file mode 100644
index 0000000..f911b3e
--- /dev/null
+++ b/dlls/XboxIntegratedMultiplayer/XboxIntegratedMultiplayer.vcxproj.filters
@@ -0,0 +1,41 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {93995380-89BD-4b04-88EB-625FBE52EBFB}
+ h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd
+
+
+ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
+ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms
+
+
+
+
+ Header Files
+
+
+ Header Files
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+
+
+ Source Files
+
+
+
\ No newline at end of file
diff --git a/dlls/XboxIntegratedMultiplayer/dllmain.cpp b/dlls/XboxIntegratedMultiplayer/dllmain.cpp
new file mode 100644
index 0000000..f266597
--- /dev/null
+++ b/dlls/XboxIntegratedMultiplayer/dllmain.cpp
@@ -0,0 +1,19 @@
+// dllmain.cpp : Defines the entry point for the DLL application.
+#include "pch.h"
+
+BOOL APIENTRY DllMain( HMODULE hModule,
+ DWORD ul_reason_for_call,
+ LPVOID lpReserved
+ )
+{
+ switch (ul_reason_for_call)
+ {
+ case DLL_PROCESS_ATTACH:
+ case DLL_THREAD_ATTACH:
+ case DLL_THREAD_DETACH:
+ case DLL_PROCESS_DETACH:
+ break;
+ }
+ return TRUE;
+}
+
diff --git a/dlls/XboxIntegratedMultiplayer/framework.h b/dlls/XboxIntegratedMultiplayer/framework.h
new file mode 100644
index 0000000..54b83e9
--- /dev/null
+++ b/dlls/XboxIntegratedMultiplayer/framework.h
@@ -0,0 +1,5 @@
+#pragma once
+
+#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
+// Windows Header Files
+#include
diff --git a/dlls/XboxIntegratedMultiplayer/pch.cpp b/dlls/XboxIntegratedMultiplayer/pch.cpp
new file mode 100644
index 0000000..64b7eef
--- /dev/null
+++ b/dlls/XboxIntegratedMultiplayer/pch.cpp
@@ -0,0 +1,5 @@
+// pch.cpp: source file corresponding to the pre-compiled header
+
+#include "pch.h"
+
+// When you are using pre-compiled headers, this source file is necessary for compilation to succeed.
diff --git a/dlls/XboxIntegratedMultiplayer/pch.h b/dlls/XboxIntegratedMultiplayer/pch.h
new file mode 100644
index 0000000..885d5d6
--- /dev/null
+++ b/dlls/XboxIntegratedMultiplayer/pch.h
@@ -0,0 +1,13 @@
+// pch.h: This is a precompiled header file.
+// Files listed below are compiled only once, improving build performance for future builds.
+// This also affects IntelliSense performance, including code completion and many code browsing features.
+// However, files listed here are ALL re-compiled if any one of them is updated between builds.
+// Do not add files here that you will be updating frequently as this negates the performance advantage.
+
+#ifndef PCH_H
+#define PCH_H
+
+// add headers that you want to pre-compile here
+#include "framework.h"
+
+#endif //PCH_H
diff --git a/dlls/kernelx/dllmain.cpp b/dlls/kernelx/dllmain.cpp
index 77c8b5e..73efa4a 100644
--- a/dlls/kernelx/dllmain.cpp
+++ b/dlls/kernelx/dllmain.cpp
@@ -26,6 +26,59 @@ HRESULT WINAPI RoGetActivationFactory_Hook(HSTRING classId, REFIID iid, void** f
const std::wstring message = std::wstring(L"classId: ") +
WindowsGetStringRawBuffer(classId, nullptr);
+=======
+ const wchar_t* classIdStr = WindowsGetStringRawBuffer(classId, nullptr);
+ int result = pRoGetActivationFactory(classId, iid, factory);
+
+ // Failed, redirect to our winrt component
+ if (result < 0) {
+ debug_printf("[DEBUG] Forwarding activationFactory of %ls to our dll!", classIdStr);
+
+ /*// That means we redirect this to already existing dll which has been implemented by Microsoft
+ if (wcscmp(classIdStr, L"Windows.Xbox.Media.GameTransportControls") == 0) {
+ HMODULE gtcLib = LoadLibraryEx(L"gametransportcontrols.dll", NULL, 0);
+ debug_printf("[DEBUG] gtcLib: %i\n", gtcLib);
+ if (!gtcLib)
+ return result;
+
+ FuncDllGetActivationFactory gtcLibActivationFactory = (FuncDllGetActivationFactory)GetProcAddress(gtcLib, "DllGetActivationFactory");
+ debug_printf("[DEBUG] gtcLibActivationFactory: %i\n", gtcLibActivationFactory);
+
+ if (!gtcLibActivationFactory)
+ return result;
+
+ Microsoft::WRL::ComPtr _factory;
+ result = gtcLibActivationFactory(classId, (void**)_factory.GetAddressOf());
+
+ HRESULT returnvalue = _factory.CopyTo(iid, factory);
+
+ if (returnvalue < 0)
+ return result;
+
+ return returnvalue;
+ }*/
+ // Checks if we initalized pointer to our DllGetActivationFactory
+ if (!pDllGetActivationFactory) {
+ HMODULE winrtLib = LoadLibraryA("Windows_Xbox_Achievement.dll");
+ debug_printf("[DEBUG] winrtLib: %i\n", winrtLib);
+ if (!winrtLib)
+ return result;
+
+ pDllGetActivationFactory = (FuncDllGetActivationFactory)GetProcAddress(winrtLib, "DllGetActivationFactory");
+ debug_printf("[DEBUG] pDllGetActivationFactory: %i\n", pDllGetActivationFactory);
+
+ if (!pDllGetActivationFactory)
+ return result;
+ }
+
+ result = pDllGetActivationFactory(classId, factory);
+
+ if (result < 0)
+ return result;
+
+ return result;
+ }
+>>>>>>> Stashed changes
if (FAILED(hr))
{
diff --git a/dlls/kernelx/kernelx.vcxproj b/dlls/kernelx/kernelx.vcxproj
index becb5be..c2dfd9a 100644
--- a/dlls/kernelx/kernelx.vcxproj
+++ b/dlls/kernelx/kernelx.vcxproj
@@ -69,6 +69,9 @@
Exports.def
ntdll.lib;detours.lib;runtimeobject.lib;kernel32.lib;Synchronization.lib;%(AdditionalDependencies)
+
+ copy /Y "$(TargetDir)$(TargetName).dll" "C:\Users\krzyc\Documents\JakisSyfZebyNieBrudzicPuplitu\XboxOneMinecraftLCE\Mount\kernelx.dll"
+
diff --git a/dlls/kernelx/pch.h b/dlls/kernelx/pch.h
index 0d94107..796dd13 100644
--- a/dlls/kernelx/pch.h
+++ b/dlls/kernelx/pch.h
@@ -5,6 +5,9 @@
#include "kernelx.h"
#include "../src/detours.h"
+=======
+#include "../../thirdparty/Detours/src/detours.h"
+>>>>>>> Stashed changes
#include
#include