Declare debug channels in all dlls that need them; added imports of

dlls/Makedll.rules.in

@@ -44,6 +44,11 @@ $(ALTNAMES:%=lib%.a): lib$(MODULE).a
 checklink:: lib$(MODULE).$(LIBEXT)
 	$(CC) -o checklink $(TOPSRCDIR)/library/checklink.c -L. -l$(MODULE) -L$(TOPOBJDIR) -lwine -lwine_unicode $(EXTRALIBS) $(LIBS) && $(RM) checklink
 
+# Rules for debug channels
+
+debug_channels: dummy
+	$(TOPSRCDIR)/tools/make_debug $(MODULE).spec $(C_SRCS) $(SUBDIRS:%=%/*.c)
+
 # Rules for installation
 
 .PHONY: install_so install_a

dlls/Makefile.in

@@ -378,66 +378,66 @@ libx11drv.@LIBEXT@: x11drv/libx11drv.@LIBEXT@
 # Inter-dll dependencies (only necessary for .so)
 
 advapi32/libadvapi32.so: libkernel32.so libntdll.so
-avifil32/libavifil32.so: libmsvfw32.so libkernel32.so
-comctl32/libcomctl32.so: libuser32.so libgdi32.so libadvapi32.so libkernel32.so
+avifil32/libavifil32.so: libmsvfw32.so libkernel32.so libntdll.so
+comctl32/libcomctl32.so: libuser32.so libgdi32.so libadvapi32.so libkernel32.so libntdll.so
 commdlg/libcomdlg32.so: libshell32.so libshlwapi.so libcomctl32.so libuser32.so libwinspool.drv.so libgdi32.so libkernel32.so libntdll.so
 crtdll/libcrtdll.so: libkernel32.so libntdll.so
 dciman32/libdciman32.so: libntdll.so
 ddraw/libddraw.so: libole32.so libuser32.so libx11drv.so libgdi32.so libkernel32.so
-dinput/libdinput.so: libuser32.so libkernel32.so
+dinput/libdinput.so: libuser32.so libkernel32.so libntdll.so
 dplay/libdplay.so: libdplayx.so
-dplayx/libdplayx.so: libwinmm.so libole32.so libuser32.so libadvapi32.so libkernel32.so
-dsound/libdsound.so: libwinmm.so libkernel32.so
-gdi/libgdi32.so: libadvapi32.so libkernel32.so
-icmp/libicmp.so: libkernel32.so
-imagehlp/libimagehlp.so: libkernel32.so
-imm32/libimm32.so: libkernel32.so
+dplayx/libdplayx.so: libwinmm.so libole32.so libuser32.so libadvapi32.so libkernel32.so libntdll.so
+dsound/libdsound.so: libwinmm.so libkernel32.so libntdll.so
+gdi/libgdi32.so: libadvapi32.so libkernel32.so libntdll.so
+icmp/libicmp.so: libkernel32.so libntdll.so
+imagehlp/libimagehlp.so: libkernel32.so libntdll.so
+imm32/libimm32.so: libkernel32.so libntdll.so
 kernel/libkernel32.so: libntdll.so
-lzexpand/liblz32.so: libkernel32.so
-mpr/libmpr.so: libkernel32.so
-msacm/libmsacm32.so: libwinmm.so libuser32.so libkernel32.so
+lzexpand/liblz32.so: libkernel32.so libntdll.so
+mpr/libmpr.so: libkernel32.so libntdll.so
+msacm/libmsacm32.so: libwinmm.so libuser32.so libkernel32.so libntdll.so
 msnet32/libmsnet32.so: libntdll.so
-msvideo/libmsvfw32.so: libwinmm.so libuser32.so libgdi32.so libkernel32.so
+msvideo/libmsvfw32.so: libwinmm.so libuser32.so libgdi32.so libkernel32.so libntdll.so
 odbc32/libodbc32.so: libntdll.so
 ole32/libole32.so: libadvapi32.so libuser32.so libgdi32.so librpcrt4.so libkernel32.so libntdll.so
-oleaut32/liboleaut32.so: libole32.so libuser32.so libgdi32.so libkernel32.so
-olecli/libolecli32.so: libole32.so libolesvr32.so libgdi32.so
+oleaut32/liboleaut32.so: libole32.so libuser32.so libgdi32.so libkernel32.so libntdll.so
+olecli/libolecli32.so: libole32.so libolesvr32.so libgdi32.so libntdll.so
 oledlg/liboledlg.so: libntdll.so
-olepro32/libolepro32.so: liboleaut32.so
+olepro32/libolepro32.so: liboleaut32.so libntdll.so
 olesvr/libolesvr32.so: libntdll.so
 opengl32/libopengl32.so: libx11drv.so libkernel32.so
-psapi/libpsapi.so: libkernel32.so
+psapi/libpsapi.so: libkernel32.so libntdll.so
 rasapi32/librasapi32.so: libntdll.so
-richedit/libriched32.so: libuser32.so libkernel32.so
+richedit/libriched32.so: libuser32.so libkernel32.so libntdll.so
 rpcrt4/librpcrt4.so: libntdll.so
-serialui/libserialui.so: libuser32.so libadvapi32.so libkernel32.so
-setupapi/libsetupapi.so: libadvapi32.so libkernel32.so
-shell32/libshell32.so: libole32.so libshlwapi.so libcomctl32.so libadvapi32.so libuser32.so libgdi32.so libkernel32.so
-shfolder/libshfolder.so: libshell32.so
-shlwapi/libshlwapi.so: libadvapi32.so libuser32.so libgdi32.so libkernel32.so
+serialui/libserialui.so: libuser32.so libadvapi32.so libkernel32.so libntdll.so
+setupapi/libsetupapi.so: libadvapi32.so libkernel32.so libntdll.so
+shell32/libshell32.so: libole32.so libshlwapi.so libcomctl32.so libadvapi32.so libuser32.so libgdi32.so libkernel32.so libntdll.so
+shfolder/libshfolder.so: libshell32.so libntdll.so
+shlwapi/libshlwapi.so: libadvapi32.so libuser32.so libgdi32.so libkernel32.so libntdll.so
 tapi32/libtapi32.so: libkernel32.so
-ttydrv/libttydrv.so: libuser32.so libgdi32.so libkernel32.so
-urlmon/liburlmon.so: libole32.so
+ttydrv/libttydrv.so: libuser32.so libgdi32.so libkernel32.so libntdll.so
+urlmon/liburlmon.so: libole32.so libntdll.so
 user/libuser32.so: libgdi32.so libadvapi32.so libkernel32.so libntdll.so
-version/libversion.so: liblz32.so libkernel32.so
-win32s/libw32skrnl.so: libkernel32.so
-winaspi/libwnaspi32.so: libadvapi32.so libkernel32.so
-wineps/libwineps.so: libuser32.so libgdi32.so libkernel32.so
-wininet/libwininet.so: libuser32.so libkernel32.so
-winmm/joystick/libjoystick.drv.so: libwinmm.so libuser32.so
-winmm/libwinmm.so: libuser32.so libkernel32.so
-winmm/mcianim/libmcianim.drv.so: libwinmm.so libuser32.so libkernel32.so
-winmm/mciavi/libmciavi.drv.so: libwinmm.so libuser32.so libkernel32.so
-winmm/mcicda/libmcicda.drv.so: libwinmm.so libuser32.so libkernel32.so
-winmm/mciseq/libmciseq.drv.so: libwinmm.so libuser32.so libkernel32.so
-winmm/mciwave/libmciwave.drv.so: libwinmm.so libuser32.so libkernel32.so
-winmm/midimap/libmidimap.drv.so: libwinmm.so libuser32.so libkernel32.so
-winmm/wavemap/libmsacm.drv.so: libwinmm.so libuser32.so libkernel32.so
-winmm/wineoss/libwineoss.drv.so: libwinmm.so libuser32.so libkernel32.so
+version/libversion.so: liblz32.so libkernel32.so libntdll.so
+win32s/libw32skrnl.so: libkernel32.so libntdll.so
+winaspi/libwnaspi32.so: libadvapi32.so libkernel32.so libntdll.so
+wineps/libwineps.so: libuser32.so libgdi32.so libkernel32.so libntdll.so
+wininet/libwininet.so: libuser32.so libkernel32.so libntdll.so
+winmm/joystick/libjoystick.drv.so: libwinmm.so libuser32.so libkernel32.so libntdll.so
+winmm/libwinmm.so: libuser32.so libkernel32.so libntdll.so
+winmm/mcianim/libmcianim.drv.so: libwinmm.so libuser32.so libkernel32.so libntdll.so
+winmm/mciavi/libmciavi.drv.so: libwinmm.so libuser32.so libkernel32.so libntdll.so
+winmm/mcicda/libmcicda.drv.so: libwinmm.so libuser32.so libkernel32.so libntdll.so
+winmm/mciseq/libmciseq.drv.so: libwinmm.so libuser32.so libkernel32.so libntdll.so
+winmm/mciwave/libmciwave.drv.so: libwinmm.so libuser32.so libkernel32.so libntdll.so
+winmm/midimap/libmidimap.drv.so: libwinmm.so libuser32.so libkernel32.so libntdll.so
+winmm/wavemap/libmsacm.drv.so: libwinmm.so libuser32.so libkernel32.so libntdll.so
+winmm/wineoss/libwineoss.drv.so: libwinmm.so libuser32.so libkernel32.so libntdll.so
 winsock/libws2_32.so: libuser32.so libkernel32.so libntdll.so
-winspool/libwinspool.drv.so: libgdi32.so libadvapi32.so libkernel32.so
-wow32/libwow32.so: libkernel32.so
-wsock32/libwsock32.so: libws2_32.so
+winspool/libwinspool.drv.so: libgdi32.so libadvapi32.so libkernel32.so libntdll.so
+wow32/libwow32.so: libkernel32.so libntdll.so
+wsock32/libwsock32.so: libws2_32.so libkernel32.so libntdll.so
 x11drv/libx11drv.so: libuser32.so libgdi32.so libkernel32.so
 
 $(DLLFILES): dummy

dlls/advapi32/advapi32.spec

@@ -4,6 +4,8 @@ type	win32
 import	kernel32.dll
 import	ntdll.dll
 
+debug_channels (advapi)
+
 @ stub AbortSystemShutdownA
 @ stub AbortSystemShutdownW
 @ stdcall AccessCheck(ptr long long ptr ptr ptr ptr ptr) AccessCheck

dlls/avifil32/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = avifil32
 SOVERSION = 1.0
 ALTNAMES  = avifile
-IMPORTS   = msvfw32 kernel32
+IMPORTS   = msvfw32 kernel32 ntdll
 
 C_SRCS = \
 	avifile.c

dlls/avifil32/avifil32.spec

@@ -3,6 +3,9 @@ type	win32
 
 import msvfw32.dll
 import kernel32.dll
+import ntdll.dll
+
+debug_channels (avifile)
 
 @ stub    AVIBuildFilter
 @ stub    AVIBuildFilterA

dlls/comctl32/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = comctl32
 SOVERSION = 1.0
-IMPORTS   = user32 gdi32 advapi32 kernel32
+IMPORTS   = user32 gdi32 advapi32 kernel32 ntdll
 
 C_SRCS = \
 	animate.c \

dlls/comctl32/comctl32.spec

@@ -7,6 +7,11 @@ import	user32.dll
 import	gdi32.dll
 import	advapi32.dll
 import	kernel32.dll
+import	ntdll.dll
+
+debug_channels (animate comboex commctrl datetime header hotkey imagelist ipaddress
+                listview message monthcal nativefont pager progress propsheet
+                rebar statusbar tab toolbar tooltips trackbar treeview updown)
 
 # Functions exported by the Win95 comctl32.dll 
 # (these need to have these exact ordinals, because some win95 dlls 

dlls/commdlg/comdlg32.spec

@@ -12,6 +12,8 @@ import gdi32.dll
 import kernel32.dll
 import ntdll.dll
 
+debug_channels (commdlg)
+
  0 stub ArrowBtnWndProc
  1 stdcall ChooseColorA(ptr) ChooseColorA
  2 stdcall ChooseColorW(ptr) ChooseColorW

dlls/crtdll/crtdll.spec

@@ -6,6 +6,8 @@ init    CRTDLL_Init
 import kernel32.dll
 import ntdll.dll
 
+debug_channels (crtdll)
+
 @ cdecl ??2@YAPAXI@Z(long) CRTDLL_new
 @ cdecl ??3@YAXPAX@Z(long) CRTDLL_delete
 @ cdecl ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) CRTDLL_set_new_handler

dlls/ddraw/ddraw.spec

@@ -7,6 +7,8 @@ import x11drv.dll
 import gdi32.dll
 import kernel32.dll
 
+debug_channels (ddraw)
+
 @ stub DDHAL32_VidMemAlloc
 @ stub DDHAL32_VidMemFree
 @ stub DDInternalLock

dlls/dinput/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dinput
 SOVERSION = 1.0
-IMPORTS   = user32 kernel32
+IMPORTS   = user32 kernel32 ntdll
 
 C_SRCS = \
 	dinput_main.c

dlls/dinput/dinput.spec

@@ -3,6 +3,9 @@ type win32
 
 import user32.dll
 import kernel32.dll
+import ntdll.dll
+
+debug_channels (dinput)
 
 @ stdcall DirectInputCreateA(long long ptr ptr) DirectInputCreateA
 @ stub DirectInputCreateW

dlls/dplayx/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dplayx
 SOVERSION = 1.0
-IMPORTS   = winmm ole32 user32 advapi32 kernel32
+IMPORTS   = winmm ole32 user32 advapi32 kernel32 ntdll
 
 C_SRCS = \
 	dpclassfactory.c \

dlls/dplayx/dplayx.spec

@@ -7,6 +7,9 @@ import ole32.dll
 import user32.dll
 import advapi32.dll
 import kernel32.dll
+import ntdll.dll
+
+debug_channels (dplay)
 
   1 stdcall DirectPlayCreate(ptr ptr ptr) DirectPlayCreate
   2 stdcall DirectPlayEnumerateA(ptr ptr) DirectPlayEnumerateA

dlls/dsound/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dsound
 SOVERSION = 1.0
-IMPORTS   = winmm kernel32
+IMPORTS   = winmm kernel32 ntdll
 
 C_SRCS = \
 	dsound_main.c

dlls/dsound/dsound.spec

 name dsound
 type win32
-import winmm
-import kernel32
+
+import winmm.dll
+import kernel32.dll
+import ntdll.dll
+
+debug_channels (dsound)
 
 0 stub DirectSoundUnknown
 1 stdcall DirectSoundCreate(ptr ptr ptr) DirectSoundCreate

dlls/gdi/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = gdi32
 SOVERSION = 1.0
 ALTNAMES  = gdi dispdib wing
-IMPORTS   = advapi32 kernel32
+IMPORTS   = advapi32 kernel32 ntdll
 
 C_SRCS = \
 	bidi16.c \

dlls/gdi/gdi32.spec

@@ -4,6 +4,10 @@ init    MAIN_GdiInit
 
 import	advapi32.dll
 import	kernel32.dll
+import	ntdll.dll
+
+debug_channels (bitblt bitmap clipping dc ddraw driver enhmetafile font gdi
+                metafile palette print region text win16drv wing)
 
 # ordinal exports
 100 stdcall @(long long str str str) GDI_CallDevInstall16

dlls/icmp/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = icmp
 SOVERSION = 1.0
-IMPORTS   = kernel32
+IMPORTS   = kernel32 ntdll
 
 C_SRCS = icmp_main.c 
 

dlls/icmp/icmp.spec

@@ -2,6 +2,9 @@ name icmp
 type win32
 
 import kernel32.dll
+import ntdll.dll
+
+debug_channels (icmp)
 
 @ stdcall IcmpCloseHandle(ptr) IcmpCloseHandle
 @ stdcall IcmpCreateFile() IcmpCreateFile

dlls/imagehlp/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = imagehlp
 SOVERSION = 1.0
-IMPORTS   = kernel32
+IMPORTS   = kernel32 ntdll
 
 C_SRCS = \
 	access.c \

dlls/imagehlp/imagehlp.spec

@@ -3,6 +3,9 @@ type	win32
 init	IMAGEHLP_LibMain
 
 import	kernel32.dll
+import	ntdll.dll
+
+debug_channels (imagehlp)
 
 @ stdcall BindImage(str str str) BindImage
 @ stdcall BindImageEx(long str str str ptr) BindImageEx

dlls/imm32/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = imm32
 SOVERSION = 1.0
-IMPORTS   = kernel32
+IMPORTS   = kernel32 ntdll
 
 C_SRCS = \
 	imm.c

dlls/imm32/imm32.spec

@@ -2,6 +2,9 @@ name	imm32
 type	win32
 
 import	kernel32.dll
+import	ntdll.dll
+
+debug_channels (imm)
 
 @ stdcall ImmAssociateContext(long long) ImmAssociateContext
 @ stdcall ImmConfigureIMEA(long long long ptr) ImmConfigureIMEA

dlls/kernel/kernel32.spec

@@ -5,6 +5,8 @@ rsrc	kernel.res
 
 import  ntdll.dll
 
+debug_channels (comm debugstr dll int resource stress thunk toolhelp win32)
+
 # Functions exported by the Win95 kernel32.dll 
 # (these need to have these exact ordinals, for some win95 dlls 
 #  import kernel32.dll by ordinal)

dlls/lzexpand/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = lz32
 SOVERSION = 1.0
 ALTNAMES  = lzexpand
-IMPORTS   = kernel32
+IMPORTS   = kernel32 ntdll
 
 C_SRCS = \
 	lzexpand_main.c

dlls/lzexpand/lz32.spec

@@ -2,6 +2,9 @@ name	lz32
 type	win32
 
 import	kernel32.dll
+import	ntdll.dll
+
+debug_channels (file)
 
 @ stdcall CopyLZFile(long long) CopyLZFile
 @ stdcall GetExpandedNameA(str ptr) GetExpandedNameA

dlls/mpr/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mpr
 SOVERSION = 1.0
-IMPORTS   = kernel32
+IMPORTS   = kernel32 ntdll
 
 C_SRCS = \
 	auth.c \

dlls/mpr/mpr.spec

@@ -2,6 +2,9 @@ name mpr
 type win32
 
 import kernel32.dll
+import ntdll.dll
+
+debug_channels (mpr)
 
 # ordinal exports
  1 stub @

dlls/msacm/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = msacm32
 SOVERSION = 1.0
 ALTNAMES  = msacm
-IMPORTS   = winmm user32 kernel32
+IMPORTS   = winmm user32 kernel32 ntdll
 
 C_SRCS = \
 	driver.c \

dlls/msacm/msacm32.spec

@@ -6,6 +6,9 @@ rsrc msacm.res
 import winmm.dll
 import user32.dll
 import kernel32.dll
+import ntdll.dll
+
+debug_channels (msacm)
 
  1 stub XRegThunkEntry
  2 stdcall acmDriverAddA(ptr long long long long) acmDriverAddA

dlls/msvideo/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = msvfw32
 SOVERSION = 1.0
 ALTNAMES  = msvideo
-IMPORTS   = winmm user32 gdi32 kernel32
+IMPORTS   = winmm user32 gdi32 kernel32 ntdll
 
 C_SRCS = \
 	msvideo_main.c \

dlls/msvideo/msvfw32.spec

@@ -5,6 +5,9 @@ import winmm.dll
 import user32.dll
 import gdi32.dll
 import kernel32.dll
+import ntdll.dll
+
+debug_channels (msvideo)
 
 # Yes, ICCompress,ICDecompress,MCIWnd* and ICDraw* are cdecl (VFWAPIV).
 # The rest is stdcall (VFWAPI) however. -Marcus Meissner, 990124

dlls/odbc32/odbc32.spec

@@ -4,6 +4,8 @@ init    MAIN_OdbcInit
 
 import	ntdll.dll
 
+debug_channels (odbc)
+
 001 stdcall SQLAllocConnect(long ptr) SQLAllocConnect
 002 stdcall SQLAllocEnv(ptr)  SQLAllocEnv
 003 stdcall SQLAllocStmt(long ptr) SQLAllocStmt

dlls/ole32/ole32.spec

@@ -8,6 +8,8 @@ import rpcrt4.dll
 import kernel32.dll
 import ntdll.dll
 
+debug_channels (ole relay storage)
+
   1 stub BindMoniker                # stdcall (ptr long ptr ptr) return 0,ERR_NOTIMPLEMENTED
   2 stdcall CLSIDFromProgID(wstr ptr) CLSIDFromProgID
   3 stdcall CLSIDFromString(wstr ptr) CLSIDFromString

dlls/oleaut32/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = oleaut32
 SOVERSION = 1.0
 ALTNAMES  = ole2disp typelib
-IMPORTS   = ole32 user32 gdi32 kernel32
+IMPORTS   = ole32 user32 gdi32 kernel32 ntdll
 
 C_SRCS = \
 	connpt.c \

dlls/oleaut32/oleaut32.spec

@@ -5,6 +5,9 @@ import ole32.dll
 import user32.dll
 import gdi32.dll
 import kernel32.dll
+import ntdll.dll
+
+debug_channels (ole typelib)
 
 1 stub DllGetClassObject
 2 stdcall SysAllocString(wstr) SysAllocString

dlls/olecli/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = olecli32
 SOVERSION = 1.0
 ALTNAMES  = olecli
-IMPORTS   = ole32 olesvr32 gdi32
+IMPORTS   = ole32 olesvr32 gdi32 ntdll
 
 C_SRCS = \
 	olecli_main.c

dlls/olecli/olecli32.spec

@@ -4,6 +4,9 @@ type win32
 import ole32.dll
 import olesvr32.dll
 import gdi32.dll
+import ntdll.dll
+
+debug_channels (ole)
 
    1 stub WEP
    2 stub OleDelete

dlls/oledlg/oledlg.spec

@@ -3,6 +3,8 @@ type	win32
 
 import	ntdll.dll
 
+debug_channels (ole)
+
   1 stdcall OleUIAddVerbMenuA(ptr str long long long long long long ptr) OleUIAddVerbMenuA
   2 stdcall OleUICanConvertOrActivateAs(ptr long long) OleUICanConvertOrActivateAs
   3 stdcall OleUIInsertObjectA(ptr) OleUIInsertObjectA

dlls/olepro32/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = olepro32
 SOVERSION = 1.0
-IMPORTS   = oleaut32
+IMPORTS   = oleaut32 ntdll
 
 C_SRCS = olepro32stubs.c
 

dlls/olepro32/olepro32.spec

@@ -2,6 +2,9 @@ name olepro32
 type win32
 
 import oleaut32.dll
+import ntdll.dll
+
+debug_channels (ole)
 
 248 forward OleIconToCursor OLEAUT32.OleIconToCursor
 249 forward OleCreatePropertyFrameIndirect OLEAUT32.OleCreatePropertyFrameIndirect

dlls/olesvr/olesvr32.spec

@@ -3,6 +3,8 @@ type	win32
 
 import	ntdll.dll
 
+debug_channels (ole)
+
  1 stub WEP
  2 stdcall OleRegisterServer(str ptr ptr long long) OleRegisterServer
  3 stub OleRevokeServer

dlls/opengl32/opengl32.spec

@@ -5,6 +5,8 @@ init OpenGL32_Init
 import x11drv
 import kernel32
 
+debug_channels (opengl)
+
 @  stdcall wglCreateContext(long) wglCreateContext
 @  stdcall wglCreateLayerContext(long long) wglCreateLayerContext
 @  stdcall wglCopyContext(long long long) wglCopyContext

dlls/psapi/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = psapi
 SOVERSION = 1.0
-IMPORTS   = kernel32
+IMPORTS   = kernel32 ntdll
 
 C_SRCS = \
 	psapi_main.c

dlls/psapi/psapi.spec

@@ -2,6 +2,9 @@ name    psapi
 type    win32
 
 import	kernel32.dll
+import	ntdll.dll
+
+debug_channels (psapi)
 
 @ stdcall EmptyWorkingSet(long) EmptyWorkingSet
 @ stdcall EnumDeviceDrivers(ptr long ptr) EnumDeviceDrivers

dlls/rasapi32/rasapi32.spec

@@ -3,6 +3,8 @@ type	win32
 
 import	ntdll.dll
 
+debug_channels (ras)
+
 500 stub	RnaEngineRequest
 501 stub	DialEngineRequest
 502 stub	SuprvRequest

dlls/richedit/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = riched32
 SOVERSION = 1.0
-IMPORTS   = user32 kernel32
+IMPORTS   = user32 kernel32 ntdll
 
 C_SRCS = \
 	charlist.c \

dlls/richedit/riched32.spec

@@ -4,5 +4,8 @@ init	RICHED32_LibMain
 
 import	user32.dll
 import	kernel32.dll
+import	ntdll.dll
+
+debug_channels (richedit)
 
 2 stdcall DllGetVersion (ptr) RICHED32_DllGetVersion

dlls/rpcrt4/rpcrt4.spec

@@ -4,6 +4,8 @@ init	RPCRT4_LibMain
 
 import	ntdll.dll
 
+debug_channels (ole)
+
 @ stdcall UuidCreate(ptr) UuidCreate
 @ stdcall RpcStringFreeA(ptr) RpcStringFreeA
 @ stdcall UuidToStringA(ptr ptr) UuidToStringA

dlls/serialui/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = serialui
 SOVERSION = 1.0
-IMPORTS   = user32 advapi32 kernel32
+IMPORTS   = user32 advapi32 kernel32 ntdll
 
 C_SRCS = \
 	confdlg.c

dlls/serialui/serialui.spec

@@ -6,6 +6,9 @@ rsrc	serialui_rc.res
 import	user32.dll
 import	advapi32.dll
 import	kernel32.dll
+import	ntdll.dll
+
+debug_channels (comm)
 
 2 stdcall EnumPropPages(ptr ptr ptr) SERIALUI_EnumPropPages
 3 stdcall drvCommConfigDialog(ptr long ptr) SERIALUI_CommConfigDialog

dlls/setupapi/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = setupapi
 SOVERSION = 1.0
 ALTNAMES  = setupx
-IMPORTS   = advapi32 kernel32
+IMPORTS   = advapi32 kernel32 ntdll
 
 C_SRCS = \
 	infparse.c \

dlls/setupapi/setupapi.spec

@@ -3,6 +3,9 @@ type win32
 
 import advapi32.dll
 import kernel32.dll
+import ntdll.dll
+
+debug_channels (setupapi setupx)
 
 # almost all functions are commented out for now. Ordinals are from setupapi.dll 4.0
 

dlls/shell32/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = shell32
 SOVERSION = 1.0
 ALTNAMES  = shell
-IMPORTS   = ole32 shlwapi comctl32 advapi32 user32 gdi32 kernel32
+IMPORTS   = ole32 shlwapi comctl32 advapi32 user32 gdi32 kernel32 ntdll
 
 C_SRCS = \
 	brsfolder.c \

dlls/shell32/pidl.c

@@ -36,8 +36,8 @@ void pdump (LPCITEMIDLIST pidl)
 
 	/* silence the sub-functions */
 	bIsShellDebug = TRACE_ON(shell);
-	__SET_DEBUGGING(__DBCL_TRACE, dbch_shell, FALSE);
-	__SET_DEBUGGING(__DBCL_TRACE, dbch_pidl, FALSE);
+	__SET_DEBUGGING(__DBCL_TRACE, __wine_dbch_shell, FALSE);
+	__SET_DEBUGGING(__DBCL_TRACE, __wine_dbch_pidl, FALSE);
 
 	if (! pidltemp)
 	{
@@ -77,8 +77,8 @@ void pdump (LPCITEMIDLIST pidl)
 	  pcheck(pidl);
 	}
 
-	__SET_DEBUGGING(__DBCL_TRACE, dbch_shell, bIsShellDebug);
-	__SET_DEBUGGING(__DBCL_TRACE, dbch_pidl, TRUE);
+	__SET_DEBUGGING(__DBCL_TRACE, __wine_dbch_shell, bIsShellDebug);
+	__SET_DEBUGGING(__DBCL_TRACE, __wine_dbch_pidl, TRUE);
 
 }
 #define BYTES_PRINTED 32
@@ -89,7 +89,7 @@ BOOL pcheck (LPCITEMIDLIST pidl)
         LPITEMIDLIST pidltemp = pidl;
 
 	bIsPidlDebug = TRACE_ON(shell);
-	__SET_DEBUGGING(__DBCL_TRACE, dbch_pidl, FALSE);
+	__SET_DEBUGGING(__DBCL_TRACE, __wine_dbch_pidl, FALSE);
 
         if (pidltemp && pidltemp->mkid.cb)
         { do
@@ -135,7 +135,7 @@ BOOL pcheck (LPCITEMIDLIST pidl)
 	    pidltemp = ILGetNext(pidltemp);
 	  } while (pidltemp->mkid.cb);
 	}
-	__SET_DEBUGGING(__DBCL_TRACE, dbch_pidl, bIsPidlDebug);
+	__SET_DEBUGGING(__DBCL_TRACE, __wine_dbch_pidl, bIsPidlDebug);
 	return ret;
 }
 

dlls/shell32/shell32.spec

@@ -12,6 +12,9 @@ import advapi32.dll
 import user32.dll
 import gdi32.dll
 import kernel32.dll
+import ntdll.dll
+
+debug_channels (exec pidl shell)
 
 # Functions exported by the Win95 shell32.dll 
 # (these need to have these exact ordinals, for some 

dlls/shlwapi/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = shlwapi
 SOVERSION = 1.0
-IMPORTS   = advapi32 user32 gdi32 kernel32
+IMPORTS   = advapi32 user32 gdi32 kernel32 ntdll
 
 C_SRCS = \
 	ordinal.c \

dlls/shlwapi/shlwapi.spec

@@ -2,10 +2,13 @@ name shlwapi
 type win32
 init SHLWAPI_LibMain
 
-import advapi32
-import user32
-import gdi32
-import kernel32
+import advapi32.dll
+import user32.dll
+import gdi32.dll
+import kernel32.dll
+import ntdll.dll
+
+debug_channels (shell)
 
 1   stdcall @(ptr ptr) SHLWAPI_1
 2   stub @

dlls/tapi32/tapi32.spec

@@ -3,6 +3,8 @@ type	win32
 
 import	kernel32.dll
 
+debug_channels (tapi)
+
 @ stdcall lineAccept(long str long) lineAccept
 @ stdcall lineAddProvider(str long ptr) lineAddProvider
 @ stdcall lineAddToConference(long long) lineAddToConference

dlls/ttydrv/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = ttydrv
 SOVERSION = 1.0
 EXTRALIBS = $(LIBS)
-IMPORTS   = user32 gdi32 kernel32
+IMPORTS   = user32 gdi32 kernel32 ntdll
 
 C_SRCS = \
 	bitmap.c \

dlls/ttydrv/ttydrv.spec

@@ -5,6 +5,9 @@ init	TTYDRV_Init
 import	user32.dll
 import	gdi32.dll
 import	kernel32.dll
+import	ntdll.dll
+
+debug_channels (ttydrv)
 
 # USER driver
 

dlls/urlmon/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = urlmon
 SOVERSION = 1.0
-IMPORTS   = ole32
+IMPORTS   = ole32 ntdll
 
 C_SRCS = \
 	umon.c \

dlls/urlmon/urlmon.spec

@@ -2,6 +2,9 @@ name    urlmon
 type    win32
 
 import	ole32.dll
+import	ntdll.dll
+
+debug_channels (win32)
 
 1 stub CDLGetLongPathNameA
 2 stub CDLGetLongPathNameW

dlls/user/user32.spec

@@ -8,6 +8,11 @@ import	advapi32.dll
 import	kernel32.dll
 import	ntdll.dll
 
+debug_channels (accel caret class clipboard combo cursor dc ddeml dialog driver
+                edit event graphics hook icon key keyboard listbox local mdi
+                menu message msg nonclient prop relay resource scroll sendmsg
+                shell static syscolor system text timer win win32 wnet)
+
 @ stdcall ActivateKeyboardLayout(long long) ActivateKeyboardLayout
 @ stdcall AdjustWindowRect(ptr long long) AdjustWindowRect
 @ stdcall AdjustWindowRectEx(ptr long long long) AdjustWindowRectEx

dlls/version/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = version
 SOVERSION = 1.0
 ALTNAMES  = ver
-IMPORTS   = lz32 kernel32
+IMPORTS   = lz32 kernel32 ntdll
 
 C_SRCS = \
 	info.c \

dlls/version/version.spec

@@ -3,6 +3,9 @@ type win32
 
 import lz32.dll
 import kernel32.dll
+import ntdll.dll
+
+debug_channels (ver)
 
 @ stdcall GetFileVersionInfoA(str long long ptr) GetFileVersionInfoA
 @ stdcall GetFileVersionInfoSizeA(str ptr) GetFileVersionInfoSizeA

dlls/win32s/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = w32skrnl
 SOVERSION = 1.0
 ALTNAMES  = w32sys win32s16
-IMPORTS   = kernel32
+IMPORTS   = kernel32 ntdll
 
 C_SRCS = \
 	w32skernel.c \

dlls/win32s/w32skrnl.spec

@@ -2,6 +2,9 @@ name	w32skrnl
 type	win32
 
 import	kernel32.dll
+import	ntdll.dll
+
+debug_channels (dll)
 
 1 stub _kSetEnvironmentVariable@8
 2 stub _SzFromImte@4

dlls/winaspi/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = wnaspi32
 SOVERSION = 1.0
 ALTNAMES  = winaspi
-IMPORTS   = advapi32 kernel32
+IMPORTS   = advapi32 kernel32 ntdll
 
 C_SRCS = \
 	aspi.c \

dlls/winaspi/wnaspi32.spec

@@ -4,6 +4,9 @@ init	WNASPI32_LibMain
 
 import	advapi32.dll
 import	kernel32.dll
+import	ntdll.dll
+
+debug_channels (aspi)
 
 # we have several ordinal clashes here, it seems...
 

dlls/wineps/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = wineps
 SOVERSION = 1.0
 ALTNAMES  = wineps16
-IMPORTS   = user32 gdi32 kernel32
+IMPORTS   = user32 gdi32 kernel32 ntdll
 
 C_SRCS = \
 	afm.c \

dlls/wineps/wineps.spec

@@ -6,3 +6,6 @@ rsrc	rsrc.res
 import	user32.dll
 import	gdi32.dll
 import	kernel32.dll
+import	ntdll.dll
+
+debug_channels (psdrv)

dlls/wininet/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wininet
 SOVERSION = 1.0
-IMPORTS   = user32 kernel32
+IMPORTS   = user32 kernel32 ntdll
 
 C_SRCS = \
 	ftp.c \

dlls/wininet/wininet.spec

@@ -4,6 +4,9 @@ init    WININET_LibMain
 
 import	user32.dll
 import	kernel32.dll
+import	ntdll.dll
+
+debug_channels (wininet)
 
 @ stub InternetInitializeAutoProxyDll
 @ stub ShowCertificate

dlls/winmm/Makefile.in

@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = winmm
 SOVERSION = 1.0
 ALTNAMES  = mmsystem sound
-IMPORTS   = user32 kernel32
+IMPORTS   = user32 kernel32 ntdll
 
 C_SRCS = \
 	joystick.c \

dlls/winmm/joystick/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = joystick.drv
 SOVERSION = 1.0
-IMPORTS   = winmm user32
+IMPORTS   = winmm user32 kernel32 ntdll
 
 C_SRCS = \
 	joystick.c

dlls/winmm/joystick/joystick.drv.spec

@@ -4,5 +4,9 @@ type win32
 
 import winmm.dll
 import user32.dll
+import kernel32.dll
+import ntdll.dll
+
+debug_channels (joystick)
 
 @ stdcall DriverProc(long long long long long) JSTCK_DriverProc

dlls/winmm/mcianim/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mcianim.drv
 SOVERSION = 1.0
-IMPORTS   = winmm user32 kernel32
+IMPORTS   = winmm user32 kernel32 ntdll
 
 C_SRCS = \
 	mcianim.c

dlls/winmm/mcianim/mcianim.drv.spec

@@ -5,5 +5,8 @@ type win32
 import winmm.dll
 import user32.dll
 import kernel32.dll
+import	ntdll.dll
+
+debug_channels (mcianim)
 
 @ stdcall DriverProc(long long long long long) MCIANIM_DriverProc

dlls/winmm/mciavi/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mciavi.drv
 SOVERSION = 1.0
-IMPORTS   = winmm user32 kernel32
+IMPORTS   = winmm user32 kernel32 ntdll
 
 C_SRCS = \
 	mciavi.c

dlls/winmm/mciavi/mciavi.drv.spec

@@ -5,5 +5,8 @@ type win32
 import winmm.dll
 import user32.dll
 import kernel32.dll
+import	ntdll.dll
+
+debug_channels (mciavi)
 
 @ stdcall DriverProc(long long long long long) MCIAVI_DriverProc

dlls/winmm/mcicda/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mcicda.drv
 SOVERSION = 1.0
-IMPORTS   = winmm user32 kernel32
+IMPORTS   = winmm user32 kernel32 ntdll
 
 C_SRCS = \
 	mcicda.c

dlls/winmm/mcicda/mcicda.drv.spec

@@ -5,5 +5,8 @@ type win32
 import winmm.dll
 import user32.dll
 import kernel32.dll
+import	ntdll.dll
+
+debug_channels (mcicda)
 
 @ stdcall DriverProc(long long long long long) MCICDA_DriverProc

dlls/winmm/mciseq/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mciseq.drv
 SOVERSION = 1.0
-IMPORTS   = winmm user32 kernel32
+IMPORTS   = winmm user32 kernel32 ntdll
 
 C_SRCS = \
 	mcimidi.c

dlls/winmm/mciseq/mciseq.drv.spec

@@ -5,5 +5,8 @@ type win32
 import winmm.dll
 import user32.dll
 import kernel32.dll
+import	ntdll.dll
+
+debug_channels (mcimidi)
 
 @ stdcall DriverProc(long long long long long) MCIMIDI_DriverProc

dlls/winmm/mciwave/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mciwave.drv
 SOVERSION = 1.0
-IMPORTS   = winmm user32 kernel32
+IMPORTS   = winmm user32 kernel32 ntdll
 
 C_SRCS = \
 	mciwave.c

dlls/winmm/mciwave/mciwave.drv.spec

@@ -5,5 +5,8 @@ type win32
 import winmm.dll
 import user32.dll
 import kernel32.dll
+import	ntdll.dll
+
+debug_channels (mciwave)
 
 @ stdcall DriverProc(long long long long long) MCIWAVE_DriverProc

dlls/winmm/midimap/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = midimap.drv
 SOVERSION = 1.0
-IMPORTS   = winmm user32 kernel32
+IMPORTS   = winmm user32 kernel32 ntdll
 
 C_SRCS = \
 	midimap.c

dlls/winmm/midimap/midimap.drv.spec

@@ -5,6 +5,9 @@ type win32
 import winmm.dll
 import user32.dll
 import kernel32.dll
+import	ntdll.dll
+
+debug_channels (msacm)
 
 @ stdcall DriverProc(long long long long long) MIDIMAP_DriverProc
 @ stdcall midMessage(long long long long long) MIDIMAP_midMessage

dlls/winmm/wavemap/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msacm.drv
 SOVERSION = 1.0
-IMPORTS   = winmm user32 kernel32
+IMPORTS   = winmm user32 kernel32 ntdll
 
 C_SRCS = \
 	wavemap.c

dlls/winmm/wavemap/msacm.drv.spec

@@ -5,6 +5,9 @@ type win32
 import winmm.dll
 import user32.dll
 import kernel32.dll
+import	ntdll.dll
+
+debug_channels (msacm)
 
 @ stdcall DriverProc(long long long long long) WAVEMAP_DriverProc
 @ stdcall widMessage(long long long long long) WAVEMAP_widMessage

dlls/winmm/wineoss/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wineoss.drv
 SOVERSION = 1.0
-IMPORTS   = winmm user32 kernel32
+IMPORTS   = winmm user32 kernel32 ntdll
 
 C_SRCS = \
 	audio.c \

dlls/winmm/wineoss/wineoss.drv.spec

@@ -5,6 +5,9 @@ type win32
 import winmm.dll
 import user32.dll
 import kernel32.dll
+import	ntdll.dll
+
+debug_channels (midi mmaux wave)
 
   1 stdcall DriverProc(long long long long long) OSS_DriverProc
   2 stdcall auxMessage(long long long long long) OSS_auxMessage

dlls/winmm/winmm.spec

@@ -5,6 +5,10 @@ rsrc winmm_res.res
 
 import user32.dll
 import kernel32.dll
+import	ntdll.dll
+
+debug_channels (joystick mci mcianim mciavi mcicda mcimidi mciwave midi mmaux
+                mmio mmsys mmtime msacm sound wave)
 
 # ordinal exports
 1 stdcall @(ptr long long) PlaySoundA

dlls/winsock/ws2_32.spec

@@ -10,6 +10,8 @@ import user32.dll
 import kernel32.dll
 import ntdll.dll
 
+debug_channels (winsock)
+
 #  EXPORTS ***********
 1   stdcall  accept(long ptr ptr) WSOCK32_accept
 2   stdcall  bind(long ptr long) WSOCK32_bind

dlls/winspool/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winspool.drv
 SOVERSION = 1.0
-IMPORTS   = gdi32 advapi32 kernel32
+IMPORTS   = gdi32 advapi32 kernel32 ntdll
 
 C_SRCS = \
 	info.c \

dlls/winspool/winspool.drv.spec

@@ -6,6 +6,9 @@ init	WINSPOOL_EntryPoint
 import	gdi32.dll
 import	advapi32.dll
 import	kernel32.dll
+import	ntdll.dll
+
+debug_channels (winspool)
 
 101 stub ADVANCEDSETUPDIALOG
 102 stub AbortPrinter

dlls/wsock32/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wsock32
 SOVERSION = 1.0
-IMPORTS   = ws2_32
+IMPORTS   = ws2_32 kernel32 ntdll
 
 C_SRCS = socket.c
 

dlls/wsock32/wsock32.spec

@@ -2,6 +2,10 @@ name	wsock32
 type	win32
 
 import	ws2_32.dll
+import	kernel32.dll
+import	ntdll.dll
+
+debug_channels (winsock)
 
   1 forward accept ws2_32.accept
   2 forward bind ws2_32.bind