Skip to content
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

Added Support for UWP #85

Closed
wants to merge 11 commits into from
Closed

Added Support for UWP #85

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bd5d81f
UWP Changes
TheElixZammuto Sep 16, 2023
0994be3
Merge pull request #5 from moonlight-stream/master
TheElixZammuto Oct 8, 2023
fef238a
Version Bump
TheElixZammuto Oct 9, 2023
9c7aee5
Merge pull request #6 from moonlight-stream/master
TheElixZammuto Nov 12, 2023
ed90623
Improve code for upstreaming
TheElixZammuto Dec 17, 2023
85e844e
Cleanup
TheElixZammuto Dec 17, 2023
86cebc3
Update to upstream enet
TheElixZammuto Dec 17, 2023
20060da
other cleanup
TheElixZammuto Dec 17, 2023
68ae61b
Remove UWP Specific tweaks to cmakefile
TheElixZammuto Jan 15, 2024
3ab3618
Moved UWP definitions in the Header
TheElixZammuto Jan 15, 2024
a1fb059
Removed duplicated newlines
TheElixZammuto Jan 15, 2024
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
5 changes: 4 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@ endif()
target_link_libraries(moonlight-common-c PRIVATE enet)

if(MSVC)
target_compile_options(moonlight-common-c PRIVATE /W3 /wd4100 /wd4232 /wd5105 /WX)
target_compile_options(moonlight-common-c PRIVATE /W3 /wd4100 /wd4232 /wd5105)
if(NOT TARGET_UWP)
target_compile_options(moonlight-common-c PRIVATE /WX)
TheElixZammuto marked this conversation as resolved.
Show resolved Hide resolved
endif()
target_link_libraries(moonlight-common-c PRIVATE ws2_32.lib winmm.lib)
elseif(MINGW)
target_link_libraries(moonlight-common-c PRIVATE -lws2_32 -lwinmm)
Expand Down
12 changes: 10 additions & 2 deletions src/PlatformSockets.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,26 @@

#if defined(LC_WINDOWS)

# if defined(WINAPI_FAMILY) && WINAPI_FAMILY==WINAPI_FAMILY_APP
# define LC_UWP
# else
# define LC_WINDOWS_DESKTOP
#endif
TheElixZammuto marked this conversation as resolved.
Show resolved Hide resolved

#ifndef SIO_UDP_CONNRESET
#define SIO_UDP_CONNRESET _WSAIOW(IOC_VENDOR, 12)
#endif

static HMODULE WlanApiLibraryHandle;
static HANDLE WlanHandle;

#if defined(LC_WINDOWS_DESKTOP)
DWORD (WINAPI *pfnWlanOpenHandle)(DWORD dwClientVersion, PVOID pReserved, PDWORD pdwNegotiatedVersion, PHANDLE phClientHandle);
DWORD (WINAPI *pfnWlanCloseHandle)(HANDLE hClientHandle, PVOID pReserved);
DWORD (WINAPI *pfnWlanEnumInterfaces)(HANDLE hClientHandle, PVOID pReserved, PWLAN_INTERFACE_INFO_LIST *ppInterfaceList);
VOID (WINAPI *pfnWlanFreeMemory)(PVOID pMemory);
DWORD (WINAPI *pfnWlanSetInterface)(HANDLE hClientHandle, CONST GUID *pInterfaceGuid, WLAN_INTF_OPCODE OpCode, DWORD dwDataSize, CONST PVOID pData, PVOID pReserved);
#endif

#ifndef WLAN_API_MAKE_VERSION
#define WLAN_API_MAKE_VERSION(_major, _minor) (((DWORD)(_minor)) << 16 | (_major))
Expand Down Expand Up @@ -618,7 +626,7 @@ bool isPrivateNetworkAddress(struct sockaddr_storage* address) {

// Enable platform-specific low latency options (best-effort)
void enterLowLatencyMode(void) {
#if defined(LC_WINDOWS)
#if defined(LC_WINDOWS_DESKTOP)
DWORD negotiatedVersion;
PWLAN_INTERFACE_INFO_LIST wlanInterfaceList;
DWORD i;
Expand Down Expand Up @@ -692,7 +700,7 @@ void enterLowLatencyMode(void) {
}

void exitLowLatencyMode(void) {
#if defined(LC_WINDOWS)
#if defined(LC_WINDOWS_DESKTOP)
// Closing our WLAN client handle will undo our optimizations
if (WlanHandle != NULL) {
pfnWlanCloseHandle(WlanHandle, NULL);
Expand Down