Added winebuild support for generating a .dbg.c file containing the

debug channels definitions. Made win32 the default type for spec files. Ignore C compiler in winebuild so we can simply pass it $(DEFS). Removed type win32 and debug_channels from spec files. Fixed winebuild to always generate correct C identifiers (reported by Vincent Béron).
2002-05-14 20:54:58 +00:00 · 2002-05-14 20:54:58 +00:00 · ad53383f9b
parent ec329ab3b4
commit ad53383f9b
211 changed files with 410 additions and 409 deletions
--- a/Make.rules.in
+++ b/Make.rules.in
@ -107,7 +107,7 @@ dlldir          = @libdir@/wine
 prog_manext     = 1
 conf_manext     = 5
 CLEAN_FILES     = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \
-                  *.flc *.spec.c *.spec.def *.glue.c y.tab.c y.tab.h @LEX_OUTPUT_ROOT@.c core
+                  *.flc *.spec.c *.spec.def *.glue.c *.dbg.c y.tab.c y.tab.h @LEX_OUTPUT_ROOT@.c core

 OBJS = $(C_SRCS:.c=.o) $(GEN_C_SRCS:.c=.o) $(GEN_ASM_SRCS:.s=.o) \
       $(ASM_SRCS:.S=.o) $(GLUE:.c=.glue.o) $(EXTRA_OBJS)
@ -137,13 +137,13 @@ LINTS = $(C_SRCS:.c=.ln)
 	$(WINDRES) -i $< -o $@

 .spec.spec.c:
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -o $@ -spec $<
+	$(LDPATH) $(WINEBUILD) $(DEFS) -o $@ -spec $<

 .spec.spec.def:
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -o $@ -def $<
+	$(LDPATH) $(WINEBUILD) $(DEFS) -o $@ -def $<

 .c.glue.c:
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -o $@ -glue $<
+	$(LDPATH) $(WINEBUILD) $(DEFS) -o $@ -glue $<

 .c.ln:
 	$(LINT) -c $(ALLLINTFLAGS) $< || ( $(RM) $@ && exit 1 )
@ -169,6 +169,11 @@ $(MODULE).tmp.o: $(SPEC_SRCS:.spec=.spec.o) $(OBJS) Makefile.in
 	$(LDCOMBINE) $(SPEC_SRCS:.spec=.spec.o) $(OBJS) -o $@
 	-$(STRIP) --strip-unneeded $@

+# Rule for main module debug channels
+
+$(MODULE).dbg.c: $(C_SRCS) $(WINEBUILD)
+	$(LDPATH) $(WINEBUILD) $(DEFS) -o $@ -debug -C$(SRCDIR) $(C_SRCS)
+
 # Rule to rebuild the resource compiler

 $(WRC):
@ -232,8 +237,8 @@ winapi_check::
 $(SUBDIRS:%=%/__depend__): $(MAKEDEP) dummy
 	cd `dirname $@` && $(MAKE) depend

-depend: $(MAKEDEP) $(GEN_C_SRCS) $(SUBDIRS:%=%/__depend__)
-	$(MAKEDEP) $(DIVINCL) -C$(SRCDIR) $(C_SRCS) $(RC_SRCS) $(RC_SRCS16) $(MC_SRCS) $(EXTRA_SRCS) $(CTESTS) -C. $(GEN_C_SRCS)
+depend: $(MAKEDEP) $(SUBDIRS:%=%/__depend__)
+	$(MAKEDEP) $(DIVINCL) -C$(SRCDIR) $(C_SRCS) $(RC_SRCS) $(RC_SRCS16) $(MC_SRCS) $(EXTRA_SRCS) $(CTESTS)

 # Rules for cleaning

@ -290,7 +295,7 @@ $(TESTPROGRAM).tmp.o: $(TESTOBJS)
 	-$(STRIP) --strip-unneeded $@

 $(TESTPROGRAM).spec.c: $(TESTPROGRAM).tmp.o $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -sym $(TESTPROGRAM).tmp.o -o $@ -exe $(TESTPROGRAM) -mcui -L$(DLLDIR) $(TESTIMPORTS:%=-l%)
+	$(LDPATH) $(WINEBUILD) $(DEFS) -sym $(TESTPROGRAM).tmp.o -o $@ -exe $(TESTPROGRAM) -mcui -L$(DLLDIR) $(TESTIMPORTS:%=-l%)

 $(TESTPROGRAM).exe: $(TESTOBJS)
 	$(CC) $(TESTOBJS) -o $@ $(TESTIMPORTS:%=-l%) $(LIBWINE) $(LIBS)
--- a/debugger/.cvsignore
+++ b/debugger/.cvsignore
@ -1,6 +1,7 @@
 Makefile
 lex.yy.c
 winedbg
+winedbg.dbg.c
 winedbg.spec.c
 y.tab.c
 y.tab.h
--- a/dlls/Makedll.rules.in
+++ b/dlls/Makedll.rules.in
@ -14,7 +14,7 @@ ALTSPECS    = $(ALTNAMES:%.dll=%)
 SPEC_SRCS   = $(ALTSPECS:%=%.spec)
 MAINSPEC    = $(MODULE:%.dll=%).spec
 SPEC_DEF    = $(MAINSPEC).def
-ALL_OBJS    = $(MAINSPEC).o $(SPEC_SRCS:.spec=.spec.o) $(OBJS)
+ALL_OBJS    = $(MAINSPEC).o $(SPEC_SRCS:.spec=.spec.o) $(OBJS) $(MODULE).dbg.o
 ALL_LIBS    = $(LIBWINE) $(EXTRALIBS) $(LIBS)
 TESTIMPORTS = $(MODULE) $(DELAYIMPORTS) $(IMPORTS)

@ -25,7 +25,7 @@ all: $(MODULE)$(DLLEXT)
 # Rule for main module spec file

 $(MAINSPEC).c: $(MAINSPEC) $(RC_SRCS:.rc=.res) $(SYMBOLFILE) $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ $(SYMBOLFILE:%=-sym %) -o $@ -spec $(SRCDIR)/$(MAINSPEC) $(RC_SRCS:%.rc=-res %.res) -L$(DLLDIR) $(DELAYIMPORTS:%=-dl%) $(IMPORTS:%=-l%)
+	$(LDPATH) $(WINEBUILD) $(DEFS) $(SYMBOLFILE:%=-sym %) -o $@ -spec $(SRCDIR)/$(MAINSPEC) $(RC_SRCS:%.rc=-res %.res) -L$(DLLDIR) $(DELAYIMPORTS:%=-dl%) $(IMPORTS:%=-l%)

 # Rules for .so files

@ -34,8 +34,8 @@ $(MODULE).so: $(ALL_OBJS) Makefile.in

 # Rules for .dll files

-$(MODULE): $(OBJS) $(SPEC_DEF) Makefile.in
-	$(DLLWRAP) $(DLLWRAPFLAGS) --def $(SPEC_DEF) --implib $(MODULE:.dll=.a) -o $(MODULE) $(OBJS) -L$(DLLDIR) $(IMPORTS:%=-l%) $(ALL_LIBS)
+$(MODULE): $(OBJS) $(MODULE).dbg.o $(SPEC_DEF) Makefile.in
+	$(DLLWRAP) $(DLLWRAPFLAGS) --def $(SPEC_DEF) --implib $(MODULE:.dll=.a) -o $(MODULE) $(OBJS) $(MODULE).dbg.o -L$(DLLDIR) $(IMPORTS:%=-l%) $(ALL_LIBS)

 $(SPEC_DEF): $(WINEBUILD)

@ -48,11 +48,6 @@ checklink:: $(MODULE)$(DLLEXT)

 $(TESTRESULTS): $(MODULE)$(DLLEXT)

-# Rules for debug channels
-
-debug_channels: dummy
-	$(TOPSRCDIR)/tools/make_debug $(MAINSPEC) $(C_SRCS) $(SUBDIRS:%=%/*.c)
-
 # Sanity check

 Makedll.rules: $(TOPSRCDIR)/Makedll.rules.in $(TOPSRCDIR)/configure
--- a/dlls/advapi32/.cvsignore
+++ b/dlls/advapi32/.cvsignore
@ -1,2 +1,3 @@
 Makefile
+advapi32.dll.dbg.c
 advapi32.spec.c
--- a/dlls/advapi32/advapi32.spec
+++ b/dlls/advapi32/advapi32.spec
@ -1,7 +1,4 @@
 name	advapi32
-type	win32
-
-debug_channels (advapi crypt reg)

@ stdcall AbortSystemShutdownA(ptr) AbortSystemShutdownA
@ stdcall AbortSystemShutdownW(ptr) AbortSystemShutdownW
--- a/dlls/avicap32/.cvsignore
+++ b/dlls/avicap32/.cvsignore
@ -1,2 +1,3 @@
 Makefile
+avicap32.dll.dbg.c
 avicap32.spec.c
--- a/dlls/avicap32/avicap32.spec
+++ b/dlls/avicap32/avicap32.spec
@ -1,4 +1,2 @@
 name avicap32
-type win32

-debug_channels ()
--- a/dlls/avifil32/.cvsignore
+++ b/dlls/avifil32/.cvsignore
@ -1,3 +1,4 @@
 Makefile
+avifil32.dll.dbg.c
 avifil32.spec.c
 avifile.spec.c
--- a/dlls/avifil32/avifil32.spec
+++ b/dlls/avifil32/avifil32.spec
@ -1,7 +1,4 @@
 name	avifil32
-type	win32
-
-debug_channels (avifile)

@ stub    AVIBuildFilter
@ stub    AVIBuildFilterA
--- a/dlls/comctl32/.cvsignore
+++ b/dlls/comctl32/.cvsignore
@ -1,3 +1,4 @@
 Makefile
+comctl32.dll.dbg.c
 comctl32.spec.c
 rsrc.res
--- a/dlls/comctl32/comctl32.spec
+++ b/dlls/comctl32/comctl32.spec
@ -1,11 +1,6 @@
 name	comctl32
-type	win32
 init	COMCTL32_LibMain

-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 
 #  import comctl32.dll by ordinal)
--- a/dlls/commdlg/.cvsignore
+++ b/dlls/commdlg/.cvsignore
@ -1,4 +1,5 @@
 Makefile
+comdlg32.dll.dbg.c
 comdlg32.spec.c
 commdlg.spec.c
 rsrc.res
--- a/dlls/commdlg/comdlg32.spec
+++ b/dlls/commdlg/comdlg32.spec
@ -1,9 +1,6 @@
 name	comdlg32
-type	win32
 init	COMDLG32_DllEntryPoint

-debug_channels (commdlg)
-
@ stdcall ChooseColorA(ptr) ChooseColorA
@ stdcall ChooseColorW(ptr) ChooseColorW
@ stdcall ChooseFontA(ptr) ChooseFontA
--- a/dlls/crtdll/.cvsignore
+++ b/dlls/crtdll/.cvsignore
@ -1,2 +1,3 @@
 Makefile
+crtdll.dll.dbg.c
 crtdll.spec.c
--- a/dlls/crtdll/crtdll.spec
+++ b/dlls/crtdll/crtdll.spec
@ -1,10 +1,7 @@
 # Old C runtime library. All functions provided by msvcrt
 name    crtdll
-type    win32
 init    CRTDLL_Init

-debug_channels (crtdll)
-
@ forward ??2@YAPAXI@Z msvcrt.??2@YAPAXI@Z
@ forward ??3@YAXPAX@Z msvcrt.??3@YAXPAX@Z
@ forward ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z msvcrt.?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z
--- a/dlls/crypt32/.cvsignore
+++ b/dlls/crypt32/.cvsignore
@ -1,2 +1,3 @@
 Makefile
+crypt32.dll.dbg.c
 crypt32.spec.c
--- a/dlls/crypt32/crypt32.spec
+++ b/dlls/crypt32/crypt32.spec
@ -1,7 +1,4 @@
 name crypt32
-type win32
-
-debug_channels ()

@ stub CertAddCRLContextToStore
@ stub CertAddCTLContextToStore
--- a/dlls/dciman32/.cvsignore
+++ b/dlls/dciman32/.cvsignore
@ -1,2 +1,3 @@
 Makefile
+dciman32.dll.dbg.c
 dciman32.spec.c
--- a/dlls/dciman32/dciman32.spec
+++ b/dlls/dciman32/dciman32.spec
@ -1,5 +1,4 @@
 name	dciman32
-type	win32

@ stub    DCIBeginAccess
@ stdcall DCICloseProvider(long) DCICloseProvider
--- a/dlls/ddraw/.cvsignore
+++ b/dlls/ddraw/.cvsignore
@ -1,3 +1,4 @@
 Makefile
+ddraw.dll.dbg.c
 ddraw.spec.c
 version.res
--- a/dlls/ddraw/ddraw.spec
+++ b/dlls/ddraw/ddraw.spec
@ -1,9 +1,6 @@
 name ddraw
-type win32
 init DDRAW_DllMain

-debug_channels (ddraw)
-
@ stub DDHAL32_VidMemAlloc
@ stub DDHAL32_VidMemFree
@ stub DDInternalLock
--- a/dlls/devenum/.cvsignore
+++ b/dlls/devenum/.cvsignore
@ -1,2 +1,3 @@
 Makefile
+devenum.dll.dbg.c
 devenum.spec.c
--- a/dlls/devenum/devenum.spec
+++ b/dlls/devenum/devenum.spec
@ -1,7 +1,4 @@
 name devenum
-type win32
-
-debug_channels()

@ stub DllCanUnloadNow
@ stub DllGetClassObject
--- a/dlls/dinput/.cvsignore
+++ b/dlls/dinput/.cvsignore
@ -1,2 +1,3 @@
 Makefile
+dinput.dll.dbg.c
 dinput.spec.c
--- a/dlls/dinput/dinput.spec
+++ b/dlls/dinput/dinput.spec
@ -1,7 +1,4 @@
 name dinput
-type win32
-
-debug_channels (dinput)

@ stdcall DirectInputCreateA(long long ptr ptr) DirectInputCreateA
@ stub DirectInputCreateW
--- a/dlls/dplay/.cvsignore
+++ b/dlls/dplay/.cvsignore
@ -1,2 +1,3 @@
 Makefile
+dplay.dll.dbg.c
 dplay.spec.c
--- a/dlls/dplay/dplay.spec
+++ b/dlls/dplay/dplay.spec
@ -1,6 +1,5 @@
 # First DirectPlay dll. Replaced by dplayx.dll.
 name dplay
-type win32

@ forward DirectPlayCreate dplayx.DirectPlayCreate
@ forward DirectPlayEnumerate dplayx.DirectPlayEnumerate
--- a/dlls/dplayx/.cvsignore
+++ b/dlls/dplayx/.cvsignore
@ -1,3 +1,4 @@
 Makefile
+dplayx.dll.dbg.c
 dplayx.spec.c
 version.res
--- a/dlls/dplayx/dplayx.spec
+++ b/dlls/dplayx/dplayx.spec
@ -1,9 +1,6 @@
 name dplayx
-type win32
 init DPLAYX_LibMain

-debug_channels (dplay)
-
  1 stdcall DirectPlayCreate(ptr ptr ptr) DirectPlayCreate
  2 stdcall DirectPlayEnumerateA(ptr ptr) DirectPlayEnumerateA
  3 stdcall DirectPlayEnumerateW(ptr ptr) DirectPlayEnumerateW
--- a/dlls/dsound/.cvsignore
+++ b/dlls/dsound/.cvsignore
@ -1,2 +1,3 @@
 Makefile
+dsound.dll.dbg.c
 dsound.spec.c
--- a/dlls/dsound/dsound.spec
+++ b/dlls/dsound/dsound.spec
@ -1,7 +1,4 @@
 name dsound
-type win32
-
-debug_channels (dsound)

 0 stub DirectSoundUnknown
 1 stdcall DirectSoundCreate(ptr ptr ptr) DirectSoundCreate
--- a/dlls/gdi/.cvsignore
+++ b/dlls/gdi/.cvsignore
@ -1,6 +1,7 @@
 Makefile
 dispdib.spec.c
 gdi.exe.spec.c
+gdi32.dll.dbg.c
 gdi32.spec.c
 printdrv.glue.c
 version.res
--- a/dlls/gdi/gdi32.spec
+++ b/dlls/gdi/gdi32.spec
@ -1,10 +1,6 @@
 name    gdi32
-type    win32
 init    MAIN_GdiInit

-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
 101 stdcall @(long str str ptr) GDI_CallExtDeviceModePropSheet16
--- a/dlls/glu32/.cvsignore
+++ b/dlls/glu32/.cvsignore
@ -1,2 +1,3 @@
 Makefile
+glu32.dll.dbg.c
 glu32.spec.c
--- a/dlls/glu32/glu32.spec
+++ b/dlls/glu32/glu32.spec
@ -1,5 +1,4 @@
 name glu32
-type win32

@ stdcall gluLookAt(double double double double double double double double double) wine_gluLookAt
@ stdcall gluOrtho2D(double double double double) wine_gluOrtho2D
--- a/dlls/icmp/.cvsignore
+++ b/dlls/icmp/.cvsignore
@ -1,2 +1,3 @@
 Makefile
+icmp.dll.dbg.c
 icmp.spec.c
--- a/dlls/icmp/icmp.spec
+++ b/dlls/icmp/icmp.spec
@ -1,7 +1,4 @@
 name icmp
-type win32
-
-debug_channels (icmp)

@ stdcall IcmpCloseHandle(ptr) IcmpCloseHandle
@ stdcall IcmpCreateFile() IcmpCreateFile
--- a/dlls/imagehlp/.cvsignore
+++ b/dlls/imagehlp/.cvsignore
@ -1,2 +1,3 @@
 Makefile
+imagehlp.dll.dbg.c
 imagehlp.spec.c
--- a/dlls/imagehlp/imagehlp.spec
+++ b/dlls/imagehlp/imagehlp.spec
@ -1,9 +1,6 @@
 name	imagehlp
-type	win32
 init	IMAGEHLP_LibMain

-debug_channels (imagehlp)
-
@ stdcall BindImage(str str str) BindImage
@ stdcall BindImageEx(long str str str ptr) BindImageEx
@ stdcall CheckSumMappedFile(ptr long ptr ptr) CheckSumMappedFile
--- a/dlls/imm32/.cvsignore
+++ b/dlls/imm32/.cvsignore
@ -1,3 +1,4 @@
 Makefile
 imm.spec.c
+imm32.dll.dbg.c
 imm32.spec.c
--- a/dlls/imm32/imm32.spec
+++ b/dlls/imm32/imm32.spec
@ -1,7 +1,4 @@
 name	imm32
-type	win32
-
-debug_channels (imm)

@ stdcall ImmAssociateContext(long long) ImmAssociateContext
@ stdcall ImmConfigureIMEA(long long long ptr) ImmConfigureIMEA
--- a/dlls/kernel/.cvsignore
+++ b/dlls/kernel/.cvsignore
@ -1,6 +1,7 @@
 Makefile
 comm.spec.c
 kernel.res
+kernel32.dll.dbg.c
 kernel32.spec.c
 krnl386.exe.spec.c
 stress.spec.c
--- a/dlls/kernel/kernel32.spec
+++ b/dlls/kernel/kernel32.spec
@ -1,10 +1,6 @@
 name	kernel32
-type	win32
 init	MAIN_KernelInit

-debug_channels (comm console 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)
--- a/dlls/lzexpand/.cvsignore
+++ b/dlls/lzexpand/.cvsignore
@ -1,3 +1,4 @@
 Makefile
+lz32.dll.dbg.c
 lz32.spec.c
 lzexpand.spec.c
--- a/dlls/lzexpand/lz32.spec
+++ b/dlls/lzexpand/lz32.spec
@ -1,7 +1,4 @@
 name	lz32
-type	win32
-
-debug_channels (file)

@ stdcall CopyLZFile(long long) CopyLZFile
@ stdcall GetExpandedNameA(str ptr) GetExpandedNameA
--- a/dlls/mapi32/.cvsignore
+++ b/dlls/mapi32/.cvsignore
@ -1,2 +1,3 @@
 Makefile
+mapi32.dll.dbg.c
 mapi32.spec.c
--- a/dlls/mapi32/mapi32.spec
+++ b/dlls/mapi32/mapi32.spec
@ -1,7 +1,4 @@
 name mapi32
-type win32
-
-debug_channels (mapi)

@ stub BMAPIAddress
@ stub BMAPIDetails
--- a/dlls/mpr/.cvsignore
+++ b/dlls/mpr/.cvsignore
@ -1,2 +1,3 @@
 Makefile
+mpr.dll.dbg.c
 mpr.spec.c
--- a/dlls/mpr/mpr.spec
+++ b/dlls/mpr/mpr.spec
@ -1,7 +1,4 @@
 name mpr
-type win32
-
-debug_channels (mpr)

 # ordinal exports
 1 stub @
--- a/dlls/msacm/.cvsignore
+++ b/dlls/msacm/.cvsignore
@ -1,4 +1,5 @@
 Makefile
 msacm.res
 msacm.spec.c
+msacm32.dll.dbg.c
 msacm32.spec.c
--- a/dlls/msacm/imaadp32/.cvsignore
+++ b/dlls/msacm/imaadp32/.cvsignore
@ -1,2 +1,3 @@
 Makefile
+imaadp32.acm.dbg.c
 imaadp32.acm.spec.c
--- a/dlls/msacm/imaadp32/imaadp32.acm.spec
+++ b/dlls/msacm/imaadp32/imaadp32.acm.spec
@ -1,7 +1,4 @@
 name imaadp32
 file imaadp32.acm
-type win32
-
-debug_channels (adpcm)

@ stdcall DriverProc (long long long long long) ADPCM_DriverProc
--- a/dlls/msacm/msacm32.spec
+++ b/dlls/msacm/msacm32.spec
@ -1,9 +1,6 @@
 name msacm32
-type win32
 init MSACM32_LibMain

-debug_channels (msacm)
-
@ stdcall acmDriverAddA(ptr long long long long) acmDriverAddA
@ stdcall acmDriverAddW(ptr long long long long) acmDriverAddW
@ stdcall acmDriverClose(long long) acmDriverClose
--- a/dlls/msacm/msg711/.cvsignore
+++ b/dlls/msacm/msg711/.cvsignore
@ -1,2 +1,3 @@
 Makefile
+msg711.drv.dbg.c
 msg711.drv.spec.c
--- a/dlls/msacm/msg711/msg711.drv.spec
+++ b/dlls/msacm/msg711/msg711.drv.spec
@ -1,7 +1,4 @@
 name msg711
 file msg711.drv
-type win32
-
-debug_channels ()

@ stub DriverProc #(long long long long long)
--- a/dlls/msdmo/.cvsignore
+++ b/dlls/msdmo/.cvsignore
@ -1,2 +1,3 @@
 Makefile
+msdmo.dll.dbg.c
 msdmo.spec.c
--- a/dlls/msdmo/msdmo.spec
+++ b/dlls/msdmo/msdmo.spec
@ -1,7 +1,4 @@
 name msdmo
-type win32
-
-debug_channels ()

@ stub DMOEnum
@ stub DMOGetName
--- a/dlls/msimg32/.cvsignore
+++ b/dlls/msimg32/.cvsignore
@ -1,2 +1,3 @@
 Makefile
+msimg32.dll.dbg.c
 msimg32.spec.c
--- a/dlls/msimg32/msimg32.spec
+++ b/dlls/msimg32/msimg32.spec
@ -1,7 +1,4 @@
 name msimg32
-type win32
-
-debug_channels (msimg32)

@ stdcall AlphaBlend(long long long long long long long long long long long) AlphaBlend
@ stub DllInitialize
--- a/dlls/msisys/.cvsignore
+++ b/dlls/msisys/.cvsignore
@ -1,2 +1,3 @@
 Makefile
+msisys.ocx.dbg.c
 msisys.ocx.spec.c
--- a/dlls/msisys/msisys.ocx.spec
+++ b/dlls/msisys/msisys.ocx.spec
@ -1,10 +1,7 @@
 name	msisys
 file	msisys.ocx
-type	win32
 init	MSISYS_DllMain

-debug_channels (msisys)
-
@ stdcall DllCanUnloadNow() MSISYS_DllCanUnloadNow
@ stdcall DllGetClassObject(ptr ptr ptr) MSISYS_DllGetClassObject
@ stdcall DllRegisterServer() MSISYS_DllRegisterServer
--- a/dlls/msnet32/.cvsignore
+++ b/dlls/msnet32/.cvsignore
@ -1,2 +1,3 @@
 Makefile
+msnet32.dll.dbg.c
 msnet32.spec.c
--- a/dlls/msnet32/msnet32.spec
+++ b/dlls/msnet32/msnet32.spec
@ -1,5 +1,4 @@
 name msnet32
-type win32

  1 stub @
  2 stub @
--- a/dlls/msrle32/.cvsignore
+++ b/dlls/msrle32/.cvsignore
@ -1,2 +1,3 @@
 Makefile
+msrle32.dll.dbg.c
 msrle32.spec.c
--- a/dlls/msrle32/msrle32.spec
+++ b/dlls/msrle32/msrle32.spec
@ -1,7 +1,4 @@
 name msrle32
-type win32
-
-debug_channels()

@ stub DriverProc #(long long long long long)

--- a/dlls/msvcrt/.cvsignore
+++ b/dlls/msvcrt/.cvsignore
@ -1,2 +1,3 @@
 Makefile
+msvcrt.dll.dbg.c
 msvcrt.spec.c
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@ -1,10 +1,7 @@
 # msvcrt.dll - MS VC++ Run Time Library
 name    msvcrt
-type    win32
 init    MSVCRT_Init

-debug_channels (msvcrt)
-
@ cdecl $I10_OUTPUT() MSVCRT_I10_OUTPUT
@ cdecl ??0__non_rtti_object@@QAE@ABV0@@Z(ptr ptr) MSVCRT___non_rtti_object_copy_ctor
@ cdecl ??0__non_rtti_object@@QAE@PBD@Z(ptr ptr) MSVCRT___non_rtti_object_ctor
--- a/dlls/msvcrt20/.cvsignore
+++ b/dlls/msvcrt20/.cvsignore
@ -1,2 +1,3 @@
 Makefile
+msvcrt20.dll.dbg.c
 msvcrt20.spec.c
--- a/dlls/msvcrt20/msvcrt20.spec
+++ b/dlls/msvcrt20/msvcrt20.spec
@ -1,8 +1,5 @@
 # msvcrt20.dll - MS VC++ Run Time Library
 name    msvcrt20
-type    win32
-
-debug_channels (msvcrt) 

@ stub ??0Iostream_init@@QAE@AAVios@@H@Z  #
@ stub ??0Iostream_init@@QAE@XZ #
--- a/dlls/msvideo/.cvsignore
+++ b/dlls/msvideo/.cvsignore
@ -1,4 +1,5 @@
 Makefile
+msvfw32.dll.dbg.c
 msvfw32.spec.c
 msvideo.spec.c
 msvideo_main.glue.c
--- a/dlls/msvideo/msvfw32.spec
+++ b/dlls/msvideo/msvfw32.spec
@ -1,7 +1,4 @@
 name	msvfw32
-type	win32
-
-debug_channels (mci msvideo)

 # Yes, ICCompress,ICDecompress,MCIWnd* and ICDraw* are cdecl (VFWAPIV).
 # The rest is stdcall (VFWAPI) however. -Marcus Meissner, 990124
--- a/dlls/netapi32/.cvsignore
+++ b/dlls/netapi32/.cvsignore
@ -1,2 +1,3 @@
 Makefile
+netapi32.dll.dbg.c
 netapi32.spec.c
--- a/dlls/netapi32/netapi32.spec
+++ b/dlls/netapi32/netapi32.spec
@ -1,8 +1,5 @@
 name	netapi32
-type    win32
 init	NETAPI32_LibMain

-debug_channels (netbios)
-
 1 stdcall Netbios(ptr) Netbios

--- a/dlls/ntdll/.cvsignore
+++ b/dlls/ntdll/.cvsignore
@ -1,4 +1,5 @@
 Makefile
+ntdll.dll.dbg.c
 ntdll.spec.c
 relay16.s
 relay32.s
--- a/dlls/ntdll/Makefile.in
+++ b/dlls/ntdll/Makefile.in
@ -142,10 +142,10 @@ EXTRASUBDIRS = \
@MAKE_DLL_RULES@

 relay16.s: $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -o $@ -relay16
+	$(LDPATH) $(WINEBUILD) $(DEFS) -o $@ -relay16

 relay32.s: $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -o $@ -relay32
+	$(LDPATH) $(WINEBUILD) $(DEFS) -o $@ -relay32

 install:: install_libdir
 uninstall:: uninstall_libdir
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@ -1,11 +1,4 @@
 name	ntdll
-type	win32
-
-debug_channels (atom cdrom console debug delayhlp dll dosfs dosmem file fixup
-                global heap int int21 int31 io loaddll local module ntdll process
-                profile reg relay resource segment seh selector server snoop
-                string system tape task thread tid timer toolhelp ver virtual
-                vxd win32)

 #note that the Zw... functions are alternate names for the 
 #Nt... functions.  (see www.sysinternals.com for details)
--- a/dlls/odbc32/.cvsignore
+++ b/dlls/odbc32/.cvsignore
@ -1,2 +1,3 @@
 Makefile
+odbc32.dll.dbg.c
 odbc32.spec.c
--- a/dlls/odbc32/odbc32.spec
+++ b/dlls/odbc32/odbc32.spec
@ -1,9 +1,6 @@
 name	odbc32
-type	win32
 init    MAIN_OdbcInit

-debug_channels (odbc)
-
 001 stdcall SQLAllocConnect(long ptr) SQLAllocConnect
 002 stdcall SQLAllocEnv(ptr)  SQLAllocEnv
 003 stdcall SQLAllocStmt(long ptr) SQLAllocStmt
--- a/dlls/ole32/.cvsignore
+++ b/dlls/ole32/.cvsignore
@ -5,6 +5,7 @@ ole2conv.spec.c
 ole2nls.spec.c
 ole2prox.spec.c
 ole2thk.spec.c
+ole32.dll.dbg.c
 ole32.spec.c
 ole32res.res
 storage.spec.c
--- a/dlls/ole32/ole32.spec
+++ b/dlls/ole32/ole32.spec
@ -1,9 +1,6 @@
 name	ole32
-type	win32
 init	OLE32_DllEntryPoint

-debug_channels (accel 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
--- a/dlls/oleaut32/.cvsignore
+++ b/dlls/oleaut32/.cvsignore
@ -1,5 +1,6 @@
 Makefile
 ole2disp.spec.c
+oleaut32.dll.dbg.c
 oleaut32.spec.c
 typelib.spec.c
 version.res
--- a/dlls/oleaut32/oleaut32.spec
+++ b/dlls/oleaut32/oleaut32.spec
@ -1,7 +1,4 @@
 name oleaut32
-type win32
-
-debug_channels (ole olerelay typelib)

 1 stdcall DllGetClassObject(ptr ptr ptr) OLEAUT32_DllGetClassObject
 2 stdcall SysAllocString(wstr) SysAllocString
--- a/dlls/olecli/.cvsignore
+++ b/dlls/olecli/.cvsignore
@ -1,3 +1,4 @@
 Makefile
 olecli.spec.c
+olecli32.dll.dbg.c
 olecli32.spec.c
--- a/dlls/olecli/olecli32.spec
+++ b/dlls/olecli/olecli32.spec
@ -1,7 +1,4 @@
 name olecli32
-type win32
-
-debug_channels (ole)

   1 stub WEP
   2 stub OleDelete
--- a/dlls/oledlg/.cvsignore
+++ b/dlls/oledlg/.cvsignore
@ -1,2 +1,3 @@
 Makefile
+oledlg.dll.dbg.c
 oledlg.spec.c
--- a/dlls/oledlg/oledlg.spec
+++ b/dlls/oledlg/oledlg.spec
@ -1,7 +1,4 @@
 name	oledlg
-type	win32
-
-debug_channels (ole)

  1 stdcall OleUIAddVerbMenuA(ptr str long long long long long long ptr) OleUIAddVerbMenuA
  2 stdcall OleUICanConvertOrActivateAs(ptr long long) OleUICanConvertOrActivateAs
--- a/dlls/olepro32/.cvsignore
+++ b/dlls/olepro32/.cvsignore
@ -1,2 +1,3 @@
 Makefile
+olepro32.dll.dbg.c
 olepro32.spec.c
--- a/dlls/olepro32/olepro32.spec
+++ b/dlls/olepro32/olepro32.spec
@ -1,7 +1,4 @@
 name olepro32
-type win32
-
-debug_channels (ole)

 248 forward OleIconToCursor OLEAUT32.OleIconToCursor
 249 forward OleCreatePropertyFrameIndirect OLEAUT32.OleCreatePropertyFrameIndirect
--- a/dlls/olesvr/.cvsignore
+++ b/dlls/olesvr/.cvsignore
@ -1,3 +1,4 @@
 Makefile
 olesvr.spec.c
+olesvr32.dll.dbg.c
 olesvr32.spec.c
--- a/dlls/olesvr/olesvr32.spec
+++ b/dlls/olesvr/olesvr32.spec
@ -1,7 +1,4 @@
 name	olesvr32
-type	win32
-
-debug_channels (ole)

 1 stub WEP
 2 stdcall OleRegisterServer(str ptr ptr long long) OleRegisterServer
--- a/dlls/opengl32/.cvsignore
+++ b/dlls/opengl32/.cvsignore
@ -1,2 +1,3 @@
 Makefile
+opengl32.dll.dbg.c
 opengl32.spec.c
--- a/dlls/opengl32/opengl32.spec
+++ b/dlls/opengl32/opengl32.spec
@ -1,9 +1,6 @@
 name opengl32
-type win32
 init OpenGL32_Init

-debug_channels (opengl)
-
@  stdcall wglCreateContext(long) wglCreateContext
@  stdcall wglCreateLayerContext(long long) wglCreateLayerContext
@  stdcall wglCopyContext(long long long) wglCopyContext
--- a/dlls/psapi/.cvsignore
+++ b/dlls/psapi/.cvsignore
@ -1,2 +1,3 @@
 Makefile
+psapi.dll.dbg.c
 psapi.spec.c
--- a/dlls/psapi/psapi.spec
+++ b/dlls/psapi/psapi.spec
@ -1,7 +1,4 @@
 name    psapi
-type    win32
-
-debug_channels (psapi)

@ stdcall EmptyWorkingSet(long) EmptyWorkingSet
@ stdcall EnumDeviceDrivers(ptr long ptr) EnumDeviceDrivers
--- a/dlls/qcap/.cvsignore
+++ b/dlls/qcap/.cvsignore
@ -1,2 +1,3 @@
 Makefile
+qcap.dll.dbg.c
 qcap.spec.c
--- a/dlls/qcap/qcap.spec
+++ b/dlls/qcap/qcap.spec
@ -1,7 +1,4 @@
 name qcap
-type win32
-
-debug_channels()

@ stub DllCanUnloadNow
@ stub DllGetClassObject
--- a/dlls/quartz/.cvsignore
+++ b/dlls/quartz/.cvsignore
@ -1,2 +1,3 @@
 Makefile
+quartz.dll.dbg.c
 quartz.spec.c
--- a/dlls/quartz/quartz.spec
+++ b/dlls/quartz/quartz.spec
@ -1,7 +1,4 @@
 name	quartz
-type	win32
-
-debug_channels (quartz)

@ stub AMGetErrorTextA
@ stub AMGetErrorTextW
--- a/dlls/rasapi32/.cvsignore
+++ b/dlls/rasapi32/.cvsignore
@ -1,3 +1,4 @@
 Makefile
 rasapi16.spec.c
+rasapi32.dll.dbg.c
 rasapi32.spec.c
--- a/dlls/rasapi32/rasapi32.spec
+++ b/dlls/rasapi32/rasapi32.spec
@ -1,7 +1,4 @@
 name	rasapi32
-type	win32
-
-debug_channels (ras)

 1  stub RasAutodialAddressToNetwork
 2  stub RasAutodialEntryToNetwork
--- a/Show More
+++ b/Show More