From 264200c7265bdd76385879cb1e53d5d61e801724 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Thu, 10 Mar 2016 18:31:52 +0000 Subject: [PATCH] [DELAYIMP]: Whitespace fixes only (tabs -> spaces). svn path=/trunk/; revision=70992 --- reactos/include/psdk/delayimp.h | 62 +++++++------- reactos/lib/sdk/delayimp/delayimp.c | 124 ++++++++++++++-------------- 2 files changed, 93 insertions(+), 93 deletions(-) diff --git a/reactos/include/psdk/delayimp.h b/reactos/include/psdk/delayimp.h index dbb7ba9d3f4..b0ccdb47c29 100644 --- a/reactos/include/psdk/delayimp.h +++ b/reactos/include/psdk/delayimp.h @@ -14,53 +14,53 @@ typedef const IMAGE_THUNK_DATA *PCImgThunkData; enum DLAttr { - dlattrRva = 0x1, + dlattrRva = 0x1, }; /* Notification codes */ enum { - dliStartProcessing, - dliNotePreLoadLibrary, - dliNotePreGetProcAddress, - dliFailLoadLib, - dliFailGetProc, - dliNoteEndProcessing, + dliStartProcessing, + dliNotePreLoadLibrary, + dliNotePreGetProcAddress, + dliFailLoadLib, + dliFailGetProc, + dliNoteEndProcessing, }; typedef struct ImgDelayDescr { - DWORD grAttrs; - RVA rvaDLLName; - RVA rvaHmod; - RVA rvaIAT; - RVA rvaINT; - RVA rvaBoundIAT; - RVA rvaUnloadIAT; - DWORD dwTimeStamp; + DWORD grAttrs; + RVA rvaDLLName; + RVA rvaHmod; + RVA rvaIAT; + RVA rvaINT; + RVA rvaBoundIAT; + RVA rvaUnloadIAT; + DWORD dwTimeStamp; } ImgDelayDescr, *PImgDelayDescr; typedef const ImgDelayDescr *PCImgDelayDescr; typedef struct DelayLoadProc { - BOOL fImportByName; - union - { - LPCSTR szProcName; - DWORD dwOrdinal; - }; + BOOL fImportByName; + union + { + LPCSTR szProcName; + DWORD dwOrdinal; + }; } DelayLoadProc; typedef struct DelayLoadInfo { - DWORD cb; - PCImgDelayDescr pidd; - FARPROC *ppfn; - LPCSTR szDll; - DelayLoadProc dlp; - HMODULE hmodCur; - FARPROC pfnCur; - DWORD dwLastError; + DWORD cb; + PCImgDelayDescr pidd; + FARPROC *ppfn; + LPCSTR szDll; + DelayLoadProc dlp; + HMODULE hmodCur; + FARPROC pfnCur; + DWORD dwLastError; } DelayLoadInfo, *PDelayLoadInfo; typedef FARPROC (WINAPI *PfnDliHook)(unsigned, PDelayLoadInfo); @@ -69,7 +69,7 @@ FORCEINLINE unsigned IndexFromPImgThunkData(PCImgThunkData pData, PCImgThunkData pBase) { - return pData - pBase; + return pData - pBase; } extern const IMAGE_DOS_HEADER __ImageBase; @@ -78,7 +78,7 @@ FORCEINLINE PVOID PFromRva(RVA rva) { - return (PVOID)(((ULONG_PTR)(rva)) + ((ULONG_PTR)&__ImageBase)); + return (PVOID)(((ULONG_PTR)(rva)) + ((ULONG_PTR)&__ImageBase)); } diff --git a/reactos/lib/sdk/delayimp/delayimp.c b/reactos/lib/sdk/delayimp/delayimp.c index b8b8665e32a..f53353a944d 100644 --- a/reactos/lib/sdk/delayimp/delayimp.c +++ b/reactos/lib/sdk/delayimp/delayimp.c @@ -17,71 +17,71 @@ FARPROC WINAPI __delayLoadHelper2(PCImgDelayDescr pidd, PImgThunkData pIATEntry) { - DelayLoadInfo dli; - int index; - PImgThunkData pIAT; - PImgThunkData pINT; - HMODULE *phMod; - FARPROC pProc; + DelayLoadInfo dli; + int index; + PImgThunkData pIAT; + PImgThunkData pINT; + HMODULE *phMod; + FARPROC pProc; - pIAT = PFromRva(pidd->rvaIAT); - pINT = PFromRva(pidd->rvaINT); - phMod = PFromRva(pidd->rvaHmod); - index = IndexFromPImgThunkData(pIATEntry, pIAT); + pIAT = PFromRva(pidd->rvaIAT); + pINT = PFromRva(pidd->rvaINT); + phMod = PFromRva(pidd->rvaHmod); + index = IndexFromPImgThunkData(pIATEntry, pIAT); - dli.cb = sizeof(dli); - dli.pidd = pidd; - dli.ppfn = (FARPROC*)pIATEntry->u1.Function; - dli.szDll = PFromRva(pidd->rvaDLLName); - dli.dlp.fImportByName = !(pINT[index].u1.Ordinal & IMAGE_ORDINAL_FLAG); - if (dli.dlp.fImportByName) - { - /* u1.AdressOfData points to a IMAGE_IMPORT_BY_NAME struct */ - PIMAGE_IMPORT_BY_NAME piibn = PFromRva((RVA)pINT[index].u1.AddressOfData); - dli.dlp.szProcName = (LPCSTR)&piibn->Name; - } - else - { - dli.dlp.dwOrdinal = pINT[index].u1.Ordinal & ~IMAGE_ORDINAL_FLAG; - } - dli.hmodCur = *phMod; - dli.pfnCur = (FARPROC)pIAT[index].u1.Function; - dli.dwLastError = GetLastError(); - pProc = __pfnDliNotifyHook2(dliStartProcessing, &dli); - if (pProc) - { - pIAT[index].u1.Function = (DWORD_PTR)pProc; - return pProc; - } + dli.cb = sizeof(dli); + dli.pidd = pidd; + dli.ppfn = (FARPROC*)pIATEntry->u1.Function; + dli.szDll = PFromRva(pidd->rvaDLLName); + dli.dlp.fImportByName = !(pINT[index].u1.Ordinal & IMAGE_ORDINAL_FLAG); + if (dli.dlp.fImportByName) + { + /* u1.AdressOfData points to a IMAGE_IMPORT_BY_NAME struct */ + PIMAGE_IMPORT_BY_NAME piibn = PFromRva((RVA)pINT[index].u1.AddressOfData); + dli.dlp.szProcName = (LPCSTR)&piibn->Name; + } + else + { + dli.dlp.dwOrdinal = pINT[index].u1.Ordinal & ~IMAGE_ORDINAL_FLAG; + } + dli.hmodCur = *phMod; + dli.pfnCur = (FARPROC)pIAT[index].u1.Function; + dli.dwLastError = GetLastError(); + pProc = __pfnDliNotifyHook2(dliStartProcessing, &dli); + if (pProc) + { + pIAT[index].u1.Function = (DWORD_PTR)pProc; + return pProc; + } - if (dli.hmodCur == NULL) - { - dli.hmodCur = LoadLibraryA(dli.szDll); - if (!dli.hmodCur) - { - dli.dwLastError = GetLastError(); - __pfnDliFailureHook2(dliFailLoadLib, &dli); -// if (ret) -// { -// } - // FIXME: raise exception; - return NULL; - } - *phMod = dli.hmodCur; - } + if (dli.hmodCur == NULL) + { + dli.hmodCur = LoadLibraryA(dli.szDll); + if (!dli.hmodCur) + { + dli.dwLastError = GetLastError(); + __pfnDliFailureHook2(dliFailLoadLib, &dli); +// if (ret) +// { +// } + // FIXME: raise exception; + return NULL; + } + *phMod = dli.hmodCur; + } - /* dli.dlp.szProcName might also contain the ordinal */ - pProc = GetProcAddress(dli.hmodCur, dli.dlp.szProcName); - if (!pProc) - { - dli.dwLastError = GetLastError(); - __pfnDliFailureHook2(dliFailGetProc, &dli); - // FIXME: handle return value & raise exception - return NULL; - } - pIAT[index].u1.Function = (DWORD_PTR)pProc; + /* dli.dlp.szProcName might also contain the ordinal */ + pProc = GetProcAddress(dli.hmodCur, dli.dlp.szProcName); + if (!pProc) + { + dli.dwLastError = GetLastError(); + __pfnDliFailureHook2(dliFailGetProc, &dli); + // FIXME: handle return value & raise exception + return NULL; + } + pIAT[index].u1.Function = (DWORD_PTR)pProc; - return pProc; + return pProc; } /*** The default hooks ***/ @@ -89,13 +89,13 @@ __delayLoadHelper2(PCImgDelayDescr pidd, PImgThunkData pIATEntry) FARPROC WINAPI DefaultDliNotifyHook2(unsigned dliNotify, PDelayLoadInfo pdli) { - return NULL; + return NULL; } FARPROC WINAPI DefaultDliFailureHook2(unsigned dliNotify, PDelayLoadInfo pdli) { - return NULL; + return NULL; } PfnDliHook __pfnDliNotifyHook2 = DefaultDliNotifyHook2;