[ros-diffs] [tkreuzer] 42174: - move delayimp.h to psdk

tkreuzer at svn.reactos.org tkreuzer at svn.reactos.org
Fri Jul 24 13:29:55 CEST 2009


Author: tkreuzer
Date: Fri Jul 24 13:29:54 2009
New Revision: 42174

URL: http://svn.reactos.org/svn/reactos?rev=42174&view=rev
Log:
- move delayimp.h to psdk

Added:
    trunk/reactos/include/psdk/delayimp.h
      - copied unchanged from r42172, trunk/reactos/lib/sdk/delayimp/delayimp.h
Removed:
    trunk/reactos/lib/sdk/delayimp/delayimp.h
Modified:
    trunk/reactos/lib/sdk/delayimp/delayimp.c

Modified: trunk/reactos/lib/sdk/delayimp/delayimp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/delayimp/delayimp.c?rev=42174&r1=42173&r2=42174&view=diff
==============================================================================
--- trunk/reactos/lib/sdk/delayimp/delayimp.c [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/delayimp/delayimp.c [iso-8859-1] Fri Jul 24 13:29:54 2009
@@ -8,7 +8,7 @@
  */
 
 #include <windows.h>
-#include "delayimp.h"
+#include <delayimp.h>
 
 /**** load helper ****/
 

Removed: trunk/reactos/lib/sdk/delayimp/delayimp.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/delayimp/delayimp.h?rev=42173&view=auto
==============================================================================
--- trunk/reactos/lib/sdk/delayimp/delayimp.h [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/delayimp/delayimp.h (removed)
@@ -1,83 +1,0 @@
-#ifndef _delayimp_h
-#define _delayimp_h
-
-#define DELAYLOAD_VERSION 0x200
-
-typedef DWORD RVA;
-typedef IMAGE_THUNK_DATA *PImgThunkData;
-typedef const IMAGE_THUNK_DATA *PCImgThunkData;
-
-enum DLAttr
-{
-	dlattrRva = 0x1,
-};
-
-/* Notification codes */
-enum
-{
-	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; 
-} ImgDelayDescr, *PImgDelayDescr;
-typedef const ImgDelayDescr *PCImgDelayDescr;
-
-typedef struct DelayLoadProc
-{
-	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;
-} DelayLoadInfo, *PDelayLoadInfo;
-
-typedef FARPROC (WINAPI *PfnDliHook)(unsigned, PDelayLoadInfo);
-
-static __inline__
-unsigned
-IndexFromPImgThunkData(PCImgThunkData pData, PCImgThunkData pBase)
-{
-	return pData - pBase;
-}
-
-extern const IMAGE_DOS_HEADER __ImageBase;
-
-static __inline__
-PVOID
-PFromRva(RVA rva)
-{
-	return (PVOID)(((ULONG_PTR)(rva)) + ((ULONG_PTR)&__ImageBase));
-}
-
-
-extern PfnDliHook __pfnDliNotifyHook2;
-extern PfnDliHook __pfnDliFailureHook2;
-
-#endif /* not _delayimp_h */




More information about the Ros-diffs mailing list