Declare debug channels in all dlls that need them; added imports of ntdll where necessary.
diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index 3cd3c19..7dab0b6 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in
@@ -44,6 +44,11 @@ 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
diff --git a/dlls/Makefile.in b/dlls/Makefile.in index f1b7c8e..28d7b1c 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in
@@ -378,66 +378,66 @@ # 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
diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 713435a..25fdf1e 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec
@@ -4,6 +4,8 @@ import kernel32.dll import ntdll.dll +debug_channels (advapi) + @ stub AbortSystemShutdownA @ stub AbortSystemShutdownW @ stdcall AccessCheck(ptr long long ptr ptr ptr ptr ptr) AccessCheck
diff --git a/dlls/avifil32/Makefile.in b/dlls/avifil32/Makefile.in index 70c7fd7..4a14a7f 100644 --- a/dlls/avifil32/Makefile.in +++ b/dlls/avifil32/Makefile.in
@@ -5,7 +5,7 @@ MODULE = avifil32 SOVERSION = 1.0 ALTNAMES = avifile -IMPORTS = msvfw32 kernel32 +IMPORTS = msvfw32 kernel32 ntdll C_SRCS = \ avifile.c
diff --git a/dlls/avifil32/avifil32.spec b/dlls/avifil32/avifil32.spec index 0c03f52..d19a396 100644 --- a/dlls/avifil32/avifil32.spec +++ b/dlls/avifil32/avifil32.spec
@@ -3,6 +3,9 @@ import msvfw32.dll import kernel32.dll +import ntdll.dll + +debug_channels (avifile) @ stub AVIBuildFilter @ stub AVIBuildFilterA
diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in index 19490e1..d0a6f60 100644 --- a/dlls/comctl32/Makefile.in +++ b/dlls/comctl32/Makefile.in
@@ -4,7 +4,7 @@ VPATH = @srcdir@ MODULE = comctl32 SOVERSION = 1.0 -IMPORTS = user32 gdi32 advapi32 kernel32 +IMPORTS = user32 gdi32 advapi32 kernel32 ntdll C_SRCS = \ animate.c \
diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec index 2cd1bbe..6b3e16b 100644 --- a/dlls/comctl32/comctl32.spec +++ b/dlls/comctl32/comctl32.spec
@@ -7,6 +7,11 @@ 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
diff --git a/dlls/commdlg/comdlg32.spec b/dlls/commdlg/comdlg32.spec index e63af38..066c9ae 100644 --- a/dlls/commdlg/comdlg32.spec +++ b/dlls/commdlg/comdlg32.spec
@@ -12,6 +12,8 @@ import kernel32.dll import ntdll.dll +debug_channels (commdlg) + 0 stub ArrowBtnWndProc 1 stdcall ChooseColorA(ptr) ChooseColorA 2 stdcall ChooseColorW(ptr) ChooseColorW
diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec index 12b0c5d..c29c186 100644 --- a/dlls/crtdll/crtdll.spec +++ b/dlls/crtdll/crtdll.spec
@@ -6,6 +6,8 @@ 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
diff --git a/dlls/ddraw/ddraw.spec b/dlls/ddraw/ddraw.spec index 871a771..098822d 100644 --- a/dlls/ddraw/ddraw.spec +++ b/dlls/ddraw/ddraw.spec
@@ -7,6 +7,8 @@ import gdi32.dll import kernel32.dll +debug_channels (ddraw) + @ stub DDHAL32_VidMemAlloc @ stub DDHAL32_VidMemFree @ stub DDInternalLock
diff --git a/dlls/dinput/Makefile.in b/dlls/dinput/Makefile.in index f5bdf81..7a69fa4 100644 --- a/dlls/dinput/Makefile.in +++ b/dlls/dinput/Makefile.in
@@ -4,7 +4,7 @@ VPATH = @srcdir@ MODULE = dinput SOVERSION = 1.0 -IMPORTS = user32 kernel32 +IMPORTS = user32 kernel32 ntdll C_SRCS = \ dinput_main.c
diff --git a/dlls/dinput/dinput.spec b/dlls/dinput/dinput.spec index 47c8c06..628bfae 100644 --- a/dlls/dinput/dinput.spec +++ b/dlls/dinput/dinput.spec
@@ -3,6 +3,9 @@ import user32.dll import kernel32.dll +import ntdll.dll + +debug_channels (dinput) @ stdcall DirectInputCreateA(long long ptr ptr) DirectInputCreateA @ stub DirectInputCreateW
diff --git a/dlls/dplayx/Makefile.in b/dlls/dplayx/Makefile.in index 84e7b7a..d9f7f0d 100644 --- a/dlls/dplayx/Makefile.in +++ b/dlls/dplayx/Makefile.in
@@ -4,7 +4,7 @@ VPATH = @srcdir@ MODULE = dplayx SOVERSION = 1.0 -IMPORTS = winmm ole32 user32 advapi32 kernel32 +IMPORTS = winmm ole32 user32 advapi32 kernel32 ntdll C_SRCS = \ dpclassfactory.c \
diff --git a/dlls/dplayx/dplayx.spec b/dlls/dplayx/dplayx.spec index fd16565..eba9d9c 100644 --- a/dlls/dplayx/dplayx.spec +++ b/dlls/dplayx/dplayx.spec
@@ -7,6 +7,9 @@ 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
diff --git a/dlls/dsound/Makefile.in b/dlls/dsound/Makefile.in index efb8b1f..c9fa8be 100644 --- a/dlls/dsound/Makefile.in +++ b/dlls/dsound/Makefile.in
@@ -4,7 +4,7 @@ VPATH = @srcdir@ MODULE = dsound SOVERSION = 1.0 -IMPORTS = winmm kernel32 +IMPORTS = winmm kernel32 ntdll C_SRCS = \ dsound_main.c
diff --git a/dlls/dsound/dsound.spec b/dlls/dsound/dsound.spec index 5fadf30..4594181 100644 --- a/dlls/dsound/dsound.spec +++ b/dlls/dsound/dsound.spec
@@ -1,7 +1,11 @@ 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
diff --git a/dlls/gdi/Makefile.in b/dlls/gdi/Makefile.in index b5584cb..55c95d2 100644 --- a/dlls/gdi/Makefile.in +++ b/dlls/gdi/Makefile.in
@@ -5,7 +5,7 @@ MODULE = gdi32 SOVERSION = 1.0 ALTNAMES = gdi dispdib wing -IMPORTS = advapi32 kernel32 +IMPORTS = advapi32 kernel32 ntdll C_SRCS = \ bidi16.c \
diff --git a/dlls/gdi/gdi32.spec b/dlls/gdi/gdi32.spec index be9d5e2..38a2125 100644 --- a/dlls/gdi/gdi32.spec +++ b/dlls/gdi/gdi32.spec
@@ -4,6 +4,10 @@ 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
diff --git a/dlls/icmp/Makefile.in b/dlls/icmp/Makefile.in index f77e49c..df1688b 100644 --- a/dlls/icmp/Makefile.in +++ b/dlls/icmp/Makefile.in
@@ -4,7 +4,7 @@ VPATH = @srcdir@ MODULE = icmp SOVERSION = 1.0 -IMPORTS = kernel32 +IMPORTS = kernel32 ntdll C_SRCS = icmp_main.c
diff --git a/dlls/icmp/icmp.spec b/dlls/icmp/icmp.spec index 0e30d90..2ecf218 100644 --- a/dlls/icmp/icmp.spec +++ b/dlls/icmp/icmp.spec
@@ -2,6 +2,9 @@ type win32 import kernel32.dll +import ntdll.dll + +debug_channels (icmp) @ stdcall IcmpCloseHandle(ptr) IcmpCloseHandle @ stdcall IcmpCreateFile() IcmpCreateFile
diff --git a/dlls/imagehlp/Makefile.in b/dlls/imagehlp/Makefile.in index b0c2bef..66a8340 100644 --- a/dlls/imagehlp/Makefile.in +++ b/dlls/imagehlp/Makefile.in
@@ -4,7 +4,7 @@ VPATH = @srcdir@ MODULE = imagehlp SOVERSION = 1.0 -IMPORTS = kernel32 +IMPORTS = kernel32 ntdll C_SRCS = \ access.c \
diff --git a/dlls/imagehlp/imagehlp.spec b/dlls/imagehlp/imagehlp.spec index d403ff6..ee9d35a 100644 --- a/dlls/imagehlp/imagehlp.spec +++ b/dlls/imagehlp/imagehlp.spec
@@ -3,6 +3,9 @@ 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
diff --git a/dlls/imm32/Makefile.in b/dlls/imm32/Makefile.in index 65028e6..215f0fb 100644 --- a/dlls/imm32/Makefile.in +++ b/dlls/imm32/Makefile.in
@@ -4,7 +4,7 @@ VPATH = @srcdir@ MODULE = imm32 SOVERSION = 1.0 -IMPORTS = kernel32 +IMPORTS = kernel32 ntdll C_SRCS = \ imm.c
diff --git a/dlls/imm32/imm32.spec b/dlls/imm32/imm32.spec index f008bfe..a87e526 100644 --- a/dlls/imm32/imm32.spec +++ b/dlls/imm32/imm32.spec
@@ -2,6 +2,9 @@ type win32 import kernel32.dll +import ntdll.dll + +debug_channels (imm) @ stdcall ImmAssociateContext(long long) ImmAssociateContext @ stdcall ImmConfigureIMEA(long long long ptr) ImmConfigureIMEA
diff --git a/dlls/kernel/kernel32.spec b/dlls/kernel/kernel32.spec index 9d1df99..0ea5407 100644 --- a/dlls/kernel/kernel32.spec +++ b/dlls/kernel/kernel32.spec
@@ -5,6 +5,8 @@ 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)
diff --git a/dlls/lzexpand/Makefile.in b/dlls/lzexpand/Makefile.in index d5ef1ca..ac80c86 100644 --- a/dlls/lzexpand/Makefile.in +++ b/dlls/lzexpand/Makefile.in
@@ -5,7 +5,7 @@ MODULE = lz32 SOVERSION = 1.0 ALTNAMES = lzexpand -IMPORTS = kernel32 +IMPORTS = kernel32 ntdll C_SRCS = \ lzexpand_main.c
diff --git a/dlls/lzexpand/lz32.spec b/dlls/lzexpand/lz32.spec index 828d18f..172079d 100644 --- a/dlls/lzexpand/lz32.spec +++ b/dlls/lzexpand/lz32.spec
@@ -2,6 +2,9 @@ type win32 import kernel32.dll +import ntdll.dll + +debug_channels (file) @ stdcall CopyLZFile(long long) CopyLZFile @ stdcall GetExpandedNameA(str ptr) GetExpandedNameA
diff --git a/dlls/mpr/Makefile.in b/dlls/mpr/Makefile.in index b6e312e..88e8f2c 100644 --- a/dlls/mpr/Makefile.in +++ b/dlls/mpr/Makefile.in
@@ -4,7 +4,7 @@ VPATH = @srcdir@ MODULE = mpr SOVERSION = 1.0 -IMPORTS = kernel32 +IMPORTS = kernel32 ntdll C_SRCS = \ auth.c \
diff --git a/dlls/mpr/mpr.spec b/dlls/mpr/mpr.spec index efe28d0..e2ea0ce 100644 --- a/dlls/mpr/mpr.spec +++ b/dlls/mpr/mpr.spec
@@ -2,6 +2,9 @@ type win32 import kernel32.dll +import ntdll.dll + +debug_channels (mpr) # ordinal exports 1 stub @
diff --git a/dlls/msacm/Makefile.in b/dlls/msacm/Makefile.in index 06eca80..f73bc2b 100644 --- a/dlls/msacm/Makefile.in +++ b/dlls/msacm/Makefile.in
@@ -5,7 +5,7 @@ MODULE = msacm32 SOVERSION = 1.0 ALTNAMES = msacm -IMPORTS = winmm user32 kernel32 +IMPORTS = winmm user32 kernel32 ntdll C_SRCS = \ driver.c \
diff --git a/dlls/msacm/msacm32.spec b/dlls/msacm/msacm32.spec index 6c2b782..51184d504 100644 --- a/dlls/msacm/msacm32.spec +++ b/dlls/msacm/msacm32.spec
@@ -6,6 +6,9 @@ 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
diff --git a/dlls/msvideo/Makefile.in b/dlls/msvideo/Makefile.in index 3e03b06..67b7a4e 100644 --- a/dlls/msvideo/Makefile.in +++ b/dlls/msvideo/Makefile.in
@@ -5,7 +5,7 @@ MODULE = msvfw32 SOVERSION = 1.0 ALTNAMES = msvideo -IMPORTS = winmm user32 gdi32 kernel32 +IMPORTS = winmm user32 gdi32 kernel32 ntdll C_SRCS = \ msvideo_main.c \
diff --git a/dlls/msvideo/msvfw32.spec b/dlls/msvideo/msvfw32.spec index d8351f1..321d9db 100644 --- a/dlls/msvideo/msvfw32.spec +++ b/dlls/msvideo/msvfw32.spec
@@ -5,6 +5,9 @@ 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
diff --git a/dlls/odbc32/odbc32.spec b/dlls/odbc32/odbc32.spec index 07a293f..0250334 100644 --- a/dlls/odbc32/odbc32.spec +++ b/dlls/odbc32/odbc32.spec
@@ -4,6 +4,8 @@ import ntdll.dll +debug_channels (odbc) + 001 stdcall SQLAllocConnect(long ptr) SQLAllocConnect 002 stdcall SQLAllocEnv(ptr) SQLAllocEnv 003 stdcall SQLAllocStmt(long ptr) SQLAllocStmt
diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index b4a9bb9..8dfd17b 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec
@@ -8,6 +8,8 @@ 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
diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in index fd47214..4128994 100644 --- a/dlls/oleaut32/Makefile.in +++ b/dlls/oleaut32/Makefile.in
@@ -5,7 +5,7 @@ MODULE = oleaut32 SOVERSION = 1.0 ALTNAMES = ole2disp typelib -IMPORTS = ole32 user32 gdi32 kernel32 +IMPORTS = ole32 user32 gdi32 kernel32 ntdll C_SRCS = \ connpt.c \
diff --git a/dlls/oleaut32/oleaut32.spec b/dlls/oleaut32/oleaut32.spec index e07df28..a99c932 100644 --- a/dlls/oleaut32/oleaut32.spec +++ b/dlls/oleaut32/oleaut32.spec
@@ -5,6 +5,9 @@ import user32.dll import gdi32.dll import kernel32.dll +import ntdll.dll + +debug_channels (ole typelib) 1 stub DllGetClassObject 2 stdcall SysAllocString(wstr) SysAllocString
diff --git a/dlls/olecli/Makefile.in b/dlls/olecli/Makefile.in index a8ddcd7..bbbadac34 100644 --- a/dlls/olecli/Makefile.in +++ b/dlls/olecli/Makefile.in
@@ -5,7 +5,7 @@ MODULE = olecli32 SOVERSION = 1.0 ALTNAMES = olecli -IMPORTS = ole32 olesvr32 gdi32 +IMPORTS = ole32 olesvr32 gdi32 ntdll C_SRCS = \ olecli_main.c
diff --git a/dlls/olecli/olecli32.spec b/dlls/olecli/olecli32.spec index 4c1d16b..40985a8 100644 --- a/dlls/olecli/olecli32.spec +++ b/dlls/olecli/olecli32.spec
@@ -4,6 +4,9 @@ import ole32.dll import olesvr32.dll import gdi32.dll +import ntdll.dll + +debug_channels (ole) 1 stub WEP 2 stub OleDelete
diff --git a/dlls/oledlg/oledlg.spec b/dlls/oledlg/oledlg.spec index 594a10f..2195dfa 100644 --- a/dlls/oledlg/oledlg.spec +++ b/dlls/oledlg/oledlg.spec
@@ -3,6 +3,8 @@ 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
diff --git a/dlls/olepro32/Makefile.in b/dlls/olepro32/Makefile.in index 534a94b..d8f5f0d 100644 --- a/dlls/olepro32/Makefile.in +++ b/dlls/olepro32/Makefile.in
@@ -4,7 +4,7 @@ VPATH = @srcdir@ MODULE = olepro32 SOVERSION = 1.0 -IMPORTS = oleaut32 +IMPORTS = oleaut32 ntdll C_SRCS = olepro32stubs.c
diff --git a/dlls/olepro32/olepro32.spec b/dlls/olepro32/olepro32.spec index be39dec..52f6e80 100644 --- a/dlls/olepro32/olepro32.spec +++ b/dlls/olepro32/olepro32.spec
@@ -2,6 +2,9 @@ type win32 import oleaut32.dll +import ntdll.dll + +debug_channels (ole) 248 forward OleIconToCursor OLEAUT32.OleIconToCursor 249 forward OleCreatePropertyFrameIndirect OLEAUT32.OleCreatePropertyFrameIndirect
diff --git a/dlls/olesvr/olesvr32.spec b/dlls/olesvr/olesvr32.spec index 41892c3..aca7656 100644 --- a/dlls/olesvr/olesvr32.spec +++ b/dlls/olesvr/olesvr32.spec
@@ -3,6 +3,8 @@ import ntdll.dll +debug_channels (ole) + 1 stub WEP 2 stdcall OleRegisterServer(str ptr ptr long long) OleRegisterServer 3 stub OleRevokeServer
diff --git a/dlls/opengl32/opengl32.spec b/dlls/opengl32/opengl32.spec index 3ec44fe3..ac7588f 100644 --- a/dlls/opengl32/opengl32.spec +++ b/dlls/opengl32/opengl32.spec
@@ -5,6 +5,8 @@ import x11drv import kernel32 +debug_channels (opengl) + @ stdcall wglCreateContext(long) wglCreateContext @ stdcall wglCreateLayerContext(long long) wglCreateLayerContext @ stdcall wglCopyContext(long long long) wglCopyContext
diff --git a/dlls/psapi/Makefile.in b/dlls/psapi/Makefile.in index 35b8544..834a4f2 100644 --- a/dlls/psapi/Makefile.in +++ b/dlls/psapi/Makefile.in
@@ -4,7 +4,7 @@ VPATH = @srcdir@ MODULE = psapi SOVERSION = 1.0 -IMPORTS = kernel32 +IMPORTS = kernel32 ntdll C_SRCS = \ psapi_main.c
diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec index 6bfd9f7..7d01cba 100644 --- a/dlls/psapi/psapi.spec +++ b/dlls/psapi/psapi.spec
@@ -2,6 +2,9 @@ type win32 import kernel32.dll +import ntdll.dll + +debug_channels (psapi) @ stdcall EmptyWorkingSet(long) EmptyWorkingSet @ stdcall EnumDeviceDrivers(ptr long ptr) EnumDeviceDrivers
diff --git a/dlls/rasapi32/rasapi32.spec b/dlls/rasapi32/rasapi32.spec index 920903d..eb402d7 100644 --- a/dlls/rasapi32/rasapi32.spec +++ b/dlls/rasapi32/rasapi32.spec
@@ -3,6 +3,8 @@ import ntdll.dll +debug_channels (ras) + 500 stub RnaEngineRequest 501 stub DialEngineRequest 502 stub SuprvRequest
diff --git a/dlls/richedit/Makefile.in b/dlls/richedit/Makefile.in index d4a8c6e..93e6a09 100644 --- a/dlls/richedit/Makefile.in +++ b/dlls/richedit/Makefile.in
@@ -4,7 +4,7 @@ VPATH = @srcdir@ MODULE = riched32 SOVERSION = 1.0 -IMPORTS = user32 kernel32 +IMPORTS = user32 kernel32 ntdll C_SRCS = \ charlist.c \
diff --git a/dlls/richedit/riched32.spec b/dlls/richedit/riched32.spec index b0c06fb..9853260 100644 --- a/dlls/richedit/riched32.spec +++ b/dlls/richedit/riched32.spec
@@ -4,5 +4,8 @@ import user32.dll import kernel32.dll +import ntdll.dll + +debug_channels (richedit) 2 stdcall DllGetVersion (ptr) RICHED32_DllGetVersion
diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 8d9b149..0c33ce9 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec
@@ -4,6 +4,8 @@ import ntdll.dll +debug_channels (ole) + @ stdcall UuidCreate(ptr) UuidCreate @ stdcall RpcStringFreeA(ptr) RpcStringFreeA @ stdcall UuidToStringA(ptr ptr) UuidToStringA
diff --git a/dlls/serialui/Makefile.in b/dlls/serialui/Makefile.in index 5ae497d..8565bdf 100644 --- a/dlls/serialui/Makefile.in +++ b/dlls/serialui/Makefile.in
@@ -4,7 +4,7 @@ VPATH = @srcdir@ MODULE = serialui SOVERSION = 1.0 -IMPORTS = user32 advapi32 kernel32 +IMPORTS = user32 advapi32 kernel32 ntdll C_SRCS = \ confdlg.c
diff --git a/dlls/serialui/serialui.spec b/dlls/serialui/serialui.spec index 65014da..60d20a8 100644 --- a/dlls/serialui/serialui.spec +++ b/dlls/serialui/serialui.spec
@@ -6,6 +6,9 @@ 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
diff --git a/dlls/setupapi/Makefile.in b/dlls/setupapi/Makefile.in index 6b4ee79..c7dda9d 100644 --- a/dlls/setupapi/Makefile.in +++ b/dlls/setupapi/Makefile.in
@@ -5,7 +5,7 @@ MODULE = setupapi SOVERSION = 1.0 ALTNAMES = setupx -IMPORTS = advapi32 kernel32 +IMPORTS = advapi32 kernel32 ntdll C_SRCS = \ infparse.c \
diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index c38a835..a43a4f6 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec
@@ -3,6 +3,9 @@ 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
diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index abe9128..90c0d3c 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in
@@ -5,7 +5,7 @@ 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 \
diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 7859acf..7fbc847 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c
@@ -36,8 +36,8 @@ /* 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 @@ 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 @@ 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 @@ pidltemp = ILGetNext(pidltemp); } while (pidltemp->mkid.cb); } - __SET_DEBUGGING(__DBCL_TRACE, dbch_pidl, bIsPidlDebug); + __SET_DEBUGGING(__DBCL_TRACE, __wine_dbch_pidl, bIsPidlDebug); return ret; }
diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 490a5c5..4d3a864 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec
@@ -12,6 +12,9 @@ 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
diff --git a/dlls/shlwapi/Makefile.in b/dlls/shlwapi/Makefile.in index 8978b8f..30d9327 100644 --- a/dlls/shlwapi/Makefile.in +++ b/dlls/shlwapi/Makefile.in
@@ -4,7 +4,7 @@ VPATH = @srcdir@ MODULE = shlwapi SOVERSION = 1.0 -IMPORTS = advapi32 user32 gdi32 kernel32 +IMPORTS = advapi32 user32 gdi32 kernel32 ntdll C_SRCS = \ ordinal.c \
diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index d4d31b6..19f3787 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec
@@ -2,10 +2,13 @@ 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 @
diff --git a/dlls/tapi32/tapi32.spec b/dlls/tapi32/tapi32.spec index 44a16cb..c4b1cd8 100644 --- a/dlls/tapi32/tapi32.spec +++ b/dlls/tapi32/tapi32.spec
@@ -3,6 +3,8 @@ import kernel32.dll +debug_channels (tapi) + @ stdcall lineAccept(long str long) lineAccept @ stdcall lineAddProvider(str long ptr) lineAddProvider @ stdcall lineAddToConference(long long) lineAddToConference
diff --git a/dlls/ttydrv/Makefile.in b/dlls/ttydrv/Makefile.in index c2a88df..1c5548b 100644 --- a/dlls/ttydrv/Makefile.in +++ b/dlls/ttydrv/Makefile.in
@@ -5,7 +5,7 @@ MODULE = ttydrv SOVERSION = 1.0 EXTRALIBS = $(LIBS) -IMPORTS = user32 gdi32 kernel32 +IMPORTS = user32 gdi32 kernel32 ntdll C_SRCS = \ bitmap.c \
diff --git a/dlls/ttydrv/ttydrv.spec b/dlls/ttydrv/ttydrv.spec index bb423dc..aef0ce9 100644 --- a/dlls/ttydrv/ttydrv.spec +++ b/dlls/ttydrv/ttydrv.spec
@@ -5,6 +5,9 @@ import user32.dll import gdi32.dll import kernel32.dll +import ntdll.dll + +debug_channels (ttydrv) # USER driver
diff --git a/dlls/urlmon/Makefile.in b/dlls/urlmon/Makefile.in index 7547fcd..b449722 100644 --- a/dlls/urlmon/Makefile.in +++ b/dlls/urlmon/Makefile.in
@@ -4,7 +4,7 @@ VPATH = @srcdir@ MODULE = urlmon SOVERSION = 1.0 -IMPORTS = ole32 +IMPORTS = ole32 ntdll C_SRCS = \ umon.c \
diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 0a86c52..967246e 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec
@@ -2,6 +2,9 @@ type win32 import ole32.dll +import ntdll.dll + +debug_channels (win32) 1 stub CDLGetLongPathNameA 2 stub CDLGetLongPathNameW
diff --git a/dlls/user/user32.spec b/dlls/user/user32.spec index cc5a252..e1b441c 100644 --- a/dlls/user/user32.spec +++ b/dlls/user/user32.spec
@@ -8,6 +8,11 @@ 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
diff --git a/dlls/version/Makefile.in b/dlls/version/Makefile.in index 3447096..5bd76a9 100644 --- a/dlls/version/Makefile.in +++ b/dlls/version/Makefile.in
@@ -5,7 +5,7 @@ MODULE = version SOVERSION = 1.0 ALTNAMES = ver -IMPORTS = lz32 kernel32 +IMPORTS = lz32 kernel32 ntdll C_SRCS = \ info.c \
diff --git a/dlls/version/version.spec b/dlls/version/version.spec index cf06fad..7c4ab79 100644 --- a/dlls/version/version.spec +++ b/dlls/version/version.spec
@@ -3,6 +3,9 @@ import lz32.dll import kernel32.dll +import ntdll.dll + +debug_channels (ver) @ stdcall GetFileVersionInfoA(str long long ptr) GetFileVersionInfoA @ stdcall GetFileVersionInfoSizeA(str ptr) GetFileVersionInfoSizeA
diff --git a/dlls/win32s/Makefile.in b/dlls/win32s/Makefile.in index 7539534..f64f781 100644 --- a/dlls/win32s/Makefile.in +++ b/dlls/win32s/Makefile.in
@@ -5,7 +5,7 @@ MODULE = w32skrnl SOVERSION = 1.0 ALTNAMES = w32sys win32s16 -IMPORTS = kernel32 +IMPORTS = kernel32 ntdll C_SRCS = \ w32skernel.c \
diff --git a/dlls/win32s/w32skrnl.spec b/dlls/win32s/w32skrnl.spec index 1109d7e..be8e6c0 100644 --- a/dlls/win32s/w32skrnl.spec +++ b/dlls/win32s/w32skrnl.spec
@@ -2,6 +2,9 @@ type win32 import kernel32.dll +import ntdll.dll + +debug_channels (dll) 1 stub _kSetEnvironmentVariable@8 2 stub _SzFromImte@4
diff --git a/dlls/winaspi/Makefile.in b/dlls/winaspi/Makefile.in index 2538efe..ea756b8 100644 --- a/dlls/winaspi/Makefile.in +++ b/dlls/winaspi/Makefile.in
@@ -5,7 +5,7 @@ MODULE = wnaspi32 SOVERSION = 1.0 ALTNAMES = winaspi -IMPORTS = advapi32 kernel32 +IMPORTS = advapi32 kernel32 ntdll C_SRCS = \ aspi.c \
diff --git a/dlls/winaspi/wnaspi32.spec b/dlls/winaspi/wnaspi32.spec index 1ed92f0..289e155 100644 --- a/dlls/winaspi/wnaspi32.spec +++ b/dlls/winaspi/wnaspi32.spec
@@ -4,6 +4,9 @@ import advapi32.dll import kernel32.dll +import ntdll.dll + +debug_channels (aspi) # we have several ordinal clashes here, it seems...
diff --git a/dlls/wineps/Makefile.in b/dlls/wineps/Makefile.in index 3437aeb..e876430 100644 --- a/dlls/wineps/Makefile.in +++ b/dlls/wineps/Makefile.in
@@ -5,7 +5,7 @@ MODULE = wineps SOVERSION = 1.0 ALTNAMES = wineps16 -IMPORTS = user32 gdi32 kernel32 +IMPORTS = user32 gdi32 kernel32 ntdll C_SRCS = \ afm.c \
diff --git a/dlls/wineps/wineps.spec b/dlls/wineps/wineps.spec index 17053e3..d96efc5 100644 --- a/dlls/wineps/wineps.spec +++ b/dlls/wineps/wineps.spec
@@ -6,3 +6,6 @@ import user32.dll import gdi32.dll import kernel32.dll +import ntdll.dll + +debug_channels (psdrv)
diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in index 8832c27..8c7532f 100644 --- a/dlls/wininet/Makefile.in +++ b/dlls/wininet/Makefile.in
@@ -4,7 +4,7 @@ VPATH = @srcdir@ MODULE = wininet SOVERSION = 1.0 -IMPORTS = user32 kernel32 +IMPORTS = user32 kernel32 ntdll C_SRCS = \ ftp.c \
diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec index 064620b..0525db1 100644 --- a/dlls/wininet/wininet.spec +++ b/dlls/wininet/wininet.spec
@@ -4,6 +4,9 @@ import user32.dll import kernel32.dll +import ntdll.dll + +debug_channels (wininet) @ stub InternetInitializeAutoProxyDll @ stub ShowCertificate
diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in index 5448f63..96ca8fd 100644 --- a/dlls/winmm/Makefile.in +++ b/dlls/winmm/Makefile.in
@@ -5,7 +5,7 @@ MODULE = winmm SOVERSION = 1.0 ALTNAMES = mmsystem sound -IMPORTS = user32 kernel32 +IMPORTS = user32 kernel32 ntdll C_SRCS = \ joystick.c \
diff --git a/dlls/winmm/joystick/Makefile.in b/dlls/winmm/joystick/Makefile.in index 7de7caf..dd48054 100644 --- a/dlls/winmm/joystick/Makefile.in +++ b/dlls/winmm/joystick/Makefile.in
@@ -4,7 +4,7 @@ VPATH = @srcdir@ MODULE = joystick.drv SOVERSION = 1.0 -IMPORTS = winmm user32 +IMPORTS = winmm user32 kernel32 ntdll C_SRCS = \ joystick.c
diff --git a/dlls/winmm/joystick/joystick.drv.spec b/dlls/winmm/joystick/joystick.drv.spec index 9b0cd2b..9a7417c 100644 --- a/dlls/winmm/joystick/joystick.drv.spec +++ b/dlls/winmm/joystick/joystick.drv.spec
@@ -4,5 +4,9 @@ import winmm.dll import user32.dll +import kernel32.dll +import ntdll.dll + +debug_channels (joystick) @ stdcall DriverProc(long long long long long) JSTCK_DriverProc
diff --git a/dlls/winmm/mcianim/Makefile.in b/dlls/winmm/mcianim/Makefile.in index 3bc74c9..e124a8c 100644 --- a/dlls/winmm/mcianim/Makefile.in +++ b/dlls/winmm/mcianim/Makefile.in
@@ -4,7 +4,7 @@ VPATH = @srcdir@ MODULE = mcianim.drv SOVERSION = 1.0 -IMPORTS = winmm user32 kernel32 +IMPORTS = winmm user32 kernel32 ntdll C_SRCS = \ mcianim.c
diff --git a/dlls/winmm/mcianim/mcianim.drv.spec b/dlls/winmm/mcianim/mcianim.drv.spec index b9522c0..902d935 100644 --- a/dlls/winmm/mcianim/mcianim.drv.spec +++ b/dlls/winmm/mcianim/mcianim.drv.spec
@@ -5,5 +5,8 @@ import winmm.dll import user32.dll import kernel32.dll +import ntdll.dll + +debug_channels (mcianim) @ stdcall DriverProc(long long long long long) MCIANIM_DriverProc
diff --git a/dlls/winmm/mciavi/Makefile.in b/dlls/winmm/mciavi/Makefile.in index 6f52614..4baf901 100644 --- a/dlls/winmm/mciavi/Makefile.in +++ b/dlls/winmm/mciavi/Makefile.in
@@ -4,7 +4,7 @@ VPATH = @srcdir@ MODULE = mciavi.drv SOVERSION = 1.0 -IMPORTS = winmm user32 kernel32 +IMPORTS = winmm user32 kernel32 ntdll C_SRCS = \ mciavi.c
diff --git a/dlls/winmm/mciavi/mciavi.drv.spec b/dlls/winmm/mciavi/mciavi.drv.spec index 09547c7..623f9f9 100644 --- a/dlls/winmm/mciavi/mciavi.drv.spec +++ b/dlls/winmm/mciavi/mciavi.drv.spec
@@ -5,5 +5,8 @@ import winmm.dll import user32.dll import kernel32.dll +import ntdll.dll + +debug_channels (mciavi) @ stdcall DriverProc(long long long long long) MCIAVI_DriverProc
diff --git a/dlls/winmm/mcicda/Makefile.in b/dlls/winmm/mcicda/Makefile.in index a204a4d..83256f5 100644 --- a/dlls/winmm/mcicda/Makefile.in +++ b/dlls/winmm/mcicda/Makefile.in
@@ -4,7 +4,7 @@ VPATH = @srcdir@ MODULE = mcicda.drv SOVERSION = 1.0 -IMPORTS = winmm user32 kernel32 +IMPORTS = winmm user32 kernel32 ntdll C_SRCS = \ mcicda.c
diff --git a/dlls/winmm/mcicda/mcicda.drv.spec b/dlls/winmm/mcicda/mcicda.drv.spec index f82ae87..45d5e35 100644 --- a/dlls/winmm/mcicda/mcicda.drv.spec +++ b/dlls/winmm/mcicda/mcicda.drv.spec
@@ -5,5 +5,8 @@ import winmm.dll import user32.dll import kernel32.dll +import ntdll.dll + +debug_channels (mcicda) @ stdcall DriverProc(long long long long long) MCICDA_DriverProc
diff --git a/dlls/winmm/mciseq/Makefile.in b/dlls/winmm/mciseq/Makefile.in index 1bad2cd..732bac8 100644 --- a/dlls/winmm/mciseq/Makefile.in +++ b/dlls/winmm/mciseq/Makefile.in
@@ -4,7 +4,7 @@ VPATH = @srcdir@ MODULE = mciseq.drv SOVERSION = 1.0 -IMPORTS = winmm user32 kernel32 +IMPORTS = winmm user32 kernel32 ntdll C_SRCS = \ mcimidi.c
diff --git a/dlls/winmm/mciseq/mciseq.drv.spec b/dlls/winmm/mciseq/mciseq.drv.spec index 2ac882d..8c23180 100644 --- a/dlls/winmm/mciseq/mciseq.drv.spec +++ b/dlls/winmm/mciseq/mciseq.drv.spec
@@ -5,5 +5,8 @@ import winmm.dll import user32.dll import kernel32.dll +import ntdll.dll + +debug_channels (mcimidi) @ stdcall DriverProc(long long long long long) MCIMIDI_DriverProc
diff --git a/dlls/winmm/mciwave/Makefile.in b/dlls/winmm/mciwave/Makefile.in index 79343ea..9b4f433 100644 --- a/dlls/winmm/mciwave/Makefile.in +++ b/dlls/winmm/mciwave/Makefile.in
@@ -4,7 +4,7 @@ VPATH = @srcdir@ MODULE = mciwave.drv SOVERSION = 1.0 -IMPORTS = winmm user32 kernel32 +IMPORTS = winmm user32 kernel32 ntdll C_SRCS = \ mciwave.c
diff --git a/dlls/winmm/mciwave/mciwave.drv.spec b/dlls/winmm/mciwave/mciwave.drv.spec index 860b9c4..a2d2214 100644 --- a/dlls/winmm/mciwave/mciwave.drv.spec +++ b/dlls/winmm/mciwave/mciwave.drv.spec
@@ -5,5 +5,8 @@ import winmm.dll import user32.dll import kernel32.dll +import ntdll.dll + +debug_channels (mciwave) @ stdcall DriverProc(long long long long long) MCIWAVE_DriverProc
diff --git a/dlls/winmm/midimap/Makefile.in b/dlls/winmm/midimap/Makefile.in index 136efe2..e28d024 100644 --- a/dlls/winmm/midimap/Makefile.in +++ b/dlls/winmm/midimap/Makefile.in
@@ -4,7 +4,7 @@ VPATH = @srcdir@ MODULE = midimap.drv SOVERSION = 1.0 -IMPORTS = winmm user32 kernel32 +IMPORTS = winmm user32 kernel32 ntdll C_SRCS = \ midimap.c
diff --git a/dlls/winmm/midimap/midimap.drv.spec b/dlls/winmm/midimap/midimap.drv.spec index a899bcc..bbc87d6 100644 --- a/dlls/winmm/midimap/midimap.drv.spec +++ b/dlls/winmm/midimap/midimap.drv.spec
@@ -5,6 +5,9 @@ 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
diff --git a/dlls/winmm/wavemap/Makefile.in b/dlls/winmm/wavemap/Makefile.in index d7d69e7..77736d6 100644 --- a/dlls/winmm/wavemap/Makefile.in +++ b/dlls/winmm/wavemap/Makefile.in
@@ -4,7 +4,7 @@ VPATH = @srcdir@ MODULE = msacm.drv SOVERSION = 1.0 -IMPORTS = winmm user32 kernel32 +IMPORTS = winmm user32 kernel32 ntdll C_SRCS = \ wavemap.c
diff --git a/dlls/winmm/wavemap/msacm.drv.spec b/dlls/winmm/wavemap/msacm.drv.spec index e235d06..6b37d52 100644 --- a/dlls/winmm/wavemap/msacm.drv.spec +++ b/dlls/winmm/wavemap/msacm.drv.spec
@@ -5,6 +5,9 @@ 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
diff --git a/dlls/winmm/wineoss/Makefile.in b/dlls/winmm/wineoss/Makefile.in index 41d68ff..a8123c4 100644 --- a/dlls/winmm/wineoss/Makefile.in +++ b/dlls/winmm/wineoss/Makefile.in
@@ -4,7 +4,7 @@ VPATH = @srcdir@ MODULE = wineoss.drv SOVERSION = 1.0 -IMPORTS = winmm user32 kernel32 +IMPORTS = winmm user32 kernel32 ntdll C_SRCS = \ audio.c \
diff --git a/dlls/winmm/wineoss/wineoss.drv.spec b/dlls/winmm/wineoss/wineoss.drv.spec index fd8b9e3..935f552 100644 --- a/dlls/winmm/wineoss/wineoss.drv.spec +++ b/dlls/winmm/wineoss/wineoss.drv.spec
@@ -5,6 +5,9 @@ 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
diff --git a/dlls/winmm/winmm.spec b/dlls/winmm/winmm.spec index 08bf866..d5bf906 100644 --- a/dlls/winmm/winmm.spec +++ b/dlls/winmm/winmm.spec
@@ -5,6 +5,10 @@ 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
diff --git a/dlls/winsock/ws2_32.spec b/dlls/winsock/ws2_32.spec index be3c685..7c7ee6a 100644 --- a/dlls/winsock/ws2_32.spec +++ b/dlls/winsock/ws2_32.spec
@@ -10,6 +10,8 @@ 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
diff --git a/dlls/winspool/Makefile.in b/dlls/winspool/Makefile.in index 2525288..b12f653 100644 --- a/dlls/winspool/Makefile.in +++ b/dlls/winspool/Makefile.in
@@ -4,7 +4,7 @@ VPATH = @srcdir@ MODULE = winspool.drv SOVERSION = 1.0 -IMPORTS = gdi32 advapi32 kernel32 +IMPORTS = gdi32 advapi32 kernel32 ntdll C_SRCS = \ info.c \
diff --git a/dlls/winspool/winspool.drv.spec b/dlls/winspool/winspool.drv.spec index 10f8f74..d4fd544 100644 --- a/dlls/winspool/winspool.drv.spec +++ b/dlls/winspool/winspool.drv.spec
@@ -6,6 +6,9 @@ import gdi32.dll import advapi32.dll import kernel32.dll +import ntdll.dll + +debug_channels (winspool) 101 stub ADVANCEDSETUPDIALOG 102 stub AbortPrinter
diff --git a/dlls/wsock32/Makefile.in b/dlls/wsock32/Makefile.in index e2e9d12..84c4a0b 100644 --- a/dlls/wsock32/Makefile.in +++ b/dlls/wsock32/Makefile.in
@@ -4,7 +4,7 @@ VPATH = @srcdir@ MODULE = wsock32 SOVERSION = 1.0 -IMPORTS = ws2_32 +IMPORTS = ws2_32 kernel32 ntdll C_SRCS = socket.c
diff --git a/dlls/wsock32/wsock32.spec b/dlls/wsock32/wsock32.spec index f579d9c..154c780 100644 --- a/dlls/wsock32/wsock32.spec +++ b/dlls/wsock32/wsock32.spec
@@ -2,6 +2,10 @@ 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
diff --git a/dlls/x11drv/x11drv.spec b/dlls/x11drv/x11drv.spec index 4d63588..e8f1f6c 100644 --- a/dlls/x11drv/x11drv.spec +++ b/dlls/x11drv/x11drv.spec
@@ -6,6 +6,9 @@ import gdi32.dll import kernel32.dll +debug_channels (bitblt bitmap clipboard cursor dinput event font gdi graphics + key keyboard opengl palette text win x11 x11drv) + # USER driver @ cdecl Synchronize() X11DRV_Synchronize