From 69f279cc64bf2fd67955ddd816f278fb87dfa27e Mon Sep 17 00:00:00 2001 From: elasota Date: Fri, 11 Sep 2020 23:53:51 -0400 Subject: [PATCH] EOL fixes --- Aerofoil/GpFiberStarter_Win32.cpp | 104 +++++++++++++++--------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/Aerofoil/GpFiberStarter_Win32.cpp b/Aerofoil/GpFiberStarter_Win32.cpp index 2eed500..ef67969 100644 --- a/Aerofoil/GpFiberStarter_Win32.cpp +++ b/Aerofoil/GpFiberStarter_Win32.cpp @@ -1,56 +1,56 @@ -#include "GpFiberStarter.h" -#include "GpFiber_Win32.h" -#include "GpWindows.h" - -#include - -namespace GpFiberStarter_Win32 -{ - struct FiberStartState - { - GpFiberStarter::ThreadFunc_t m_threadFunc; - IGpFiber *m_creatingFiber; - void *m_context; - }; - - static VOID WINAPI FiberStartRoutine(LPVOID lpThreadParameter) - { - const FiberStartState *tss = static_cast(lpThreadParameter); - - GpFiberStarter::ThreadFunc_t threadFunc = tss->m_threadFunc; - IGpFiber *creatingFiber = tss->m_creatingFiber; - void *context = tss->m_context; - creatingFiber->YieldTo(); - - threadFunc(context); - - assert(!"Fiber function exited"); - } -} - -IGpFiber *GpFiberStarter::StartFiber(ThreadFunc_t threadFunc, void *context, IGpFiber *creatingFiber) -{ - ULONG_PTR lowLimit; - ULONG_PTR highLimit; +#include "GpFiberStarter.h" +#include "GpFiber_Win32.h" +#include "GpWindows.h" + +#include + +namespace GpFiberStarter_Win32 +{ + struct FiberStartState + { + GpFiberStarter::ThreadFunc_t m_threadFunc; + IGpFiber *m_creatingFiber; + void *m_context; + }; + + static VOID WINAPI FiberStartRoutine(LPVOID lpThreadParameter) + { + const FiberStartState *tss = static_cast(lpThreadParameter); + + GpFiberStarter::ThreadFunc_t threadFunc = tss->m_threadFunc; + IGpFiber *creatingFiber = tss->m_creatingFiber; + void *context = tss->m_context; + creatingFiber->YieldTo(); + + threadFunc(context); + + assert(!"Fiber function exited"); + } +} + +IGpFiber *GpFiberStarter::StartFiber(ThreadFunc_t threadFunc, void *context, IGpFiber *creatingFiber) +{ + ULONG_PTR lowLimit; + ULONG_PTR highLimit; + +#if 0 + GetCurrentThreadStackLimits(&lowLimit, &highLimit); -#if 0 - GetCurrentThreadStackLimits(&lowLimit, &highLimit); - ULONG_PTR stackSize = highLimit - lowLimit; #else ULONG_PTR stackSize = 1024 * 1024; -#endif - - GpFiberStarter_Win32::FiberStartState startState; - startState.m_context = context; - startState.m_creatingFiber = creatingFiber; - startState.m_threadFunc = threadFunc; - - void *fiber = CreateFiber(static_cast(stackSize), GpFiberStarter_Win32::FiberStartRoutine, &startState); - if (!fiber) - return nullptr; - - SwitchToFiber(fiber); - - return GpFiber_Win32::Create(fiber); -} +#endif + + GpFiberStarter_Win32::FiberStartState startState; + startState.m_context = context; + startState.m_creatingFiber = creatingFiber; + startState.m_threadFunc = threadFunc; + + void *fiber = CreateFiber(static_cast(stackSize), GpFiberStarter_Win32::FiberStartRoutine, &startState); + if (!fiber) + return nullptr; + + SwitchToFiber(fiber); + + return GpFiber_Win32::Create(fiber); +}