Moved 32-bit relay and snoop support to dlls/ntdll.

dlls/kernel/ne_module.c

@@ -44,7 +44,6 @@
 #include "global.h"
 #include "file.h"
 #include "task.h"
-#include "snoop.h"
 #include "builtin16.h"
 #include "stackframe.h"
 #include "excpt.h"
@@ -93,6 +92,8 @@ typedef struct
 
 static const BUILTIN16_DESCRIPTOR *builtin_dlls[MAX_DLLS];
 
+extern void SNOOP16_RegisterDLL(NE_MODULE*,LPCSTR);
+extern FARPROC16 SNOOP16_GetProcAddress16(HMODULE16,DWORD,FARPROC16);
 
 static HINSTANCE16 NE_LoadModule( LPCSTR name, BOOL lib_only );
 static BOOL16 NE_FreeModule( HMODULE16 hModule, BOOL call_wep );

dlls/kernel/snoop16.c

@@ -31,10 +31,10 @@
 #include "wine/winbase16.h"
 #include "wine/library.h"
 #include "global.h"
+#include "module.h"
 #include "stackframe.h"
 #include "builtin16.h"
 #include "toolhelp.h"
-#include "snoop.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(snoop);
@@ -43,6 +43,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(snoop);
 
 #include "pshpack1.h"
 
+extern int SNOOP_ShowDebugmsgSnoop(const char *dll,int ord,const char *fname);  /* FIXME */
+
 void WINAPI SNOOP16_Entry(FARPROC proc, LPBYTE args, CONTEXT86 *context);
 void WINAPI SNOOP16_Return(FARPROC proc, LPBYTE args, CONTEXT86 *context);
 

dlls/ntdll/Makefile.in

@@ -27,8 +27,6 @@ C_SRCS = \
 	$(TOPOBJDIR)/misc/registry.c \
 	$(TOPOBJDIR)/misc/version.c \
 	$(TOPOBJDIR)/msdos/dpmi.c \
-	$(TOPOBJDIR)/relay32/relay386.c \
-	$(TOPOBJDIR)/relay32/snoop.c \
 	$(TOPOBJDIR)/scheduler/handle.c \
 	$(TOPOBJDIR)/scheduler/process.c \
 	$(TOPOBJDIR)/scheduler/pthread.c \
@@ -51,6 +49,7 @@ C_SRCS = \
 	path.c \
 	process.c \
 	reg.c \
+	relay.c \
 	resource.c \
 	rtl.c \
 	rtlbitmap.c \
@@ -81,7 +80,6 @@ EXTRASUBDIRS = \
 	$(TOPOBJDIR)/memory \
 	$(TOPOBJDIR)/misc \
 	$(TOPOBJDIR)/msdos \
-	$(TOPOBJDIR)/relay32 \
 	$(TOPOBJDIR)/scheduler \
 	$(TOPOBJDIR)/win32
 

dlls/ntdll/ntdll_misc.h

@@ -44,7 +44,7 @@ extern FARPROC RELAY_GetProcAddress( HMODULE module, IMAGE_EXPORT_DIRECTORY *exp
                                      DWORD exp_size, FARPROC proc, const char *user );
 extern FARPROC SNOOP_GetProcAddress( HMODULE hmod, IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size,
                                      FARPROC origfun, DWORD ordinal );
-extern void RELAY_SetupDLL( const char *module );
+extern void RELAY_SetupDLL( HMODULE hmod );
 extern void SNOOP_SetupDLL( HMODULE hmod );
 
 static inline HANDLE ntdll_get_process_heap(void)

include/snoop.h

-/*
- * Definitions for inter-dll snooping
- *
- * Copyright 1998 Marcus Meissner
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef __WINE_SNOOP_H
-#define __WINE_SNOOP_H
-
-#include <module.h>
-
-extern void SNOOP16_RegisterDLL(NE_MODULE*,LPCSTR);
-extern FARPROC16 SNOOP16_GetProcAddress16(HMODULE16,DWORD,FARPROC16);
-extern int SNOOP_ShowDebugmsgSnoop(const char *dll,int ord,const char *fname);
-#endif

loader/ne/module.c

@@ -41,7 +41,6 @@
 #include "toolhelp.h"
 #include "file.h"
 #include "task.h"
-#include "snoop.h"
 #include "builtin16.h"
 #include "stackframe.h"
 #include "excpt.h"