Vantha/0ad
1
1
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

fix LONG_PTR VC6 error reported by stuart

Browse Source 
This was SVN commit r499.
This commit is contained in:
janwas 2004-06-13 19:23:37 +00:00
parent 3c7826ca27
commit 0fb2ec31fc
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/lib/sysdep/win/wdll.cpp
View File

@ -259,13 +259,15 @@ FLoadedAtPreferredAddress(PIMAGE_NT_HEADERS pinh, HMODULE hmod) {
#undef InterlockedExchangePointer
#define InterlockedExchangePointer(Target, Value) \
(PVOID)(LONG_PTR)InterlockedExchange((PLONG)(Target), (LONG)(LONG_PTR)(Value))
(PVOID)(uintptr_t)InterlockedExchange((PLONG)(Target), (LONG)(uintptr_t)(Value))
/*
#if (_MSC_VER >= 1300)
typedef __w64 unsigned long *PULONG_PTR;
#else
typedef unsigned long *PULONG_PTR;
#endif
*/
#endif
@ -293,11 +295,11 @@ extern "C" FARPROC WINAPI __delayLoadHelper2(PCImgDelayDescr pidd, FARPROC* ppfn
if (!(idd.grAttrs & dlattrRva))
{
PDelayLoadInfo rgpdli[1] = { &dli };
/*
RaiseException(
VcppException(ERROR_SEVERITY_ERROR, ERROR_INVALID_PARAMETER),
0, 1, PULONG_PTR(rgpdli)
);
);*/
return 0;
}
@ -352,14 +354,14 @@ extern "C" FARPROC WINAPI __delayLoadHelper2(PCImgDelayDescr pidd, FARPROC* ppfn
if (hmod == 0) {
PDelayLoadInfo rgpdli[1] = { &dli };
/*
RaiseException(
VcppException(ERROR_SEVERITY_ERROR, ERROR_MOD_NOT_FOUND),
0,
1,
PULONG_PTR(rgpdli)
);
*/
// If we get to here, we blindly assume that the handler of the exception
// has magically fixed everything up and left the function pointer in
// dli.pfnCur.
@ -424,14 +426,14 @@ extern "C" FARPROC WINAPI __delayLoadHelper2(PCImgDelayDescr pidd, FARPROC* ppfn
}
if (pfnRet == 0) {
PDelayLoadInfo rgpdli[1] = { &dli };
/*
RaiseException(
VcppException(ERROR_SEVERITY_ERROR, ERROR_PROC_NOT_FOUND),
0,
1,
PULONG_PTR(rgpdli)
);
*/
// If we get to here, we blindly assume that the handler of the exception
// has magically fixed everything up and left the function pointer in
// dli.pfnCur.