Skip to content
Snippets Groups Projects
Commit eb58e1d5 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files

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

ntdll where necessary.
parent 94613ab0
No related branches found
No related tags found
No related merge requests found
Showing
with 90 additions and 52 deletions
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -5,7 +5,7 @@ VPATH = @srcdir@
MODULE = avifil32
SOVERSION = 1.0
ALTNAMES = avifile
IMPORTS = msvfw32 kernel32
IMPORTS = msvfw32 kernel32 ntdll
C_SRCS = \
avifile.c
......
......@@ -3,6 +3,9 @@ type win32
import msvfw32.dll
import kernel32.dll
import ntdll.dll
debug_channels (avifile)
@ stub AVIBuildFilter
@ stub AVIBuildFilterA
......
......@@ -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 \
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -7,6 +7,8 @@ import x11drv.dll
import gdi32.dll
import kernel32.dll
debug_channels (ddraw)
@ stub DDHAL32_VidMemAlloc
@ stub DDHAL32_VidMemFree
@ stub DDInternalLock
......
......@@ -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
......
......@@ -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
......
......@@ -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 \
......
......@@ -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
......
......@@ -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
......
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
......
......@@ -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 \
......
......@@ -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
......
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = icmp
SOVERSION = 1.0
IMPORTS = kernel32
IMPORTS = kernel32 ntdll
C_SRCS = icmp_main.c
......
......@@ -2,6 +2,9 @@ name icmp
type win32
import kernel32.dll
import ntdll.dll
debug_channels (icmp)
@ stdcall IcmpCloseHandle(ptr) IcmpCloseHandle
@ stdcall IcmpCreateFile() IcmpCreateFile
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment