Made some more spec file entries optional or unnecessary.

Fixed a few DLLName/DLLFileName mismatches.

Made some more spec file entries optional or unnecessary.
77afd6c4 · Alexandre Julliard · cf5188b6 · 77afd6c4 · 77afd6c4 · 77afd6c4
Commit 77afd6c4 authored Jun 21, 2002 by Alexandre Julliard
146 changed files
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -141,7 +141,7 @@ LINTS = $(C_SRCS:.c=.ln)
 	$(WINDRES) -i $< -o $@
 .spec.spec.c:
-	$(LDPATH) $(WINEBUILD) $(DEFS) -o $@ -spec $<
+	$(LDPATH) $(WINEBUILD) $(DEFS) -o $@ -M $(MODULE) -spec $<
 .spec.spec.def:
 	$(LDPATH) $(WINEBUILD) $(DEFS) -o $@ -def $<

--- a/dlls/advapi32/advapi32.spec
+++ b/dlls/advapi32/advapi32.spec
-name	advapi32
 @ stdcall AbortSystemShutdownA(ptr) AbortSystemShutdownA
 @ stdcall AbortSystemShutdownW(ptr) AbortSystemShutdownW
 @ stdcall AccessCheck(ptr long long ptr ptr ptr ptr ptr) AccessCheck

--- a/dlls/avicap32/avicap32.spec
+++ b/dlls/avicap32/avicap32.spec
-name avicap32
 @ stub capCreateCaptureWindowA
 @ stub capCreateCaptureWindowW
 @ stdcall capGetDriverDescriptionA(long ptr long ptr long) capGetDriverDescriptionA

--- a/dlls/avifil32/avifil32.spec
+++ b/dlls/avifil32/avifil32.spec
-name	avifil32
 @ stub    AVIBuildFilter
 @ stub    AVIBuildFilterA
 @ stub    AVIBuildFilterW

--- a/dlls/avifil32/avifile.spec
+++ b/dlls/avifil32/avifile.spec
-name	avifile
-type	win16
-owner	avifil32
 # I'm just using "long" instead of "ptr" for the interface pointers,
 # because they are 32-bit pointers, not converted to 16-bit format,
 # but the app doesn't really need to know, it should never need to

--- a/dlls/comcat/comcat.spec
+++ b/dlls/comcat/comcat.spec
-name comcat
 init COMCAT_DllEntryPoint
 @ stdcall DllCanUnloadNow() COMCAT_DllCanUnloadNow

--- a/dlls/comctl32/comctl32.spec
+++ b/dlls/comctl32/comctl32.spec
-name	comctl32
 init	COMCTL32_LibMain
 # Functions exported by the Win95 comctl32.dll

--- a/dlls/commdlg/comdlg32.spec
+++ b/dlls/commdlg/comdlg32.spec
-name	comdlg32
 init	COMDLG32_DllEntryPoint
 @ stdcall ChooseColorA(ptr) ChooseColorA

--- a/dlls/commdlg/commdlg.spec
+++ b/dlls/commdlg/commdlg.spec
-name	commdlg
-type	win16
-owner	comdlg32
 1   pascal16 GetOpenFileName(segptr) GetOpenFileName16
 2   pascal16 GetSaveFileName(segptr) GetSaveFileName16
 5   pascal16 ChooseColor(ptr) ChooseColor16

--- a/dlls/crtdll/crtdll.spec
+++ b/dlls/crtdll/crtdll.spec
 # Old C runtime library. All functions provided by msvcrt
-name    crtdll
 init    CRTDLL_Init
 @ forward ??2@YAPAXI@Z msvcrt.??2@YAPAXI@Z
@@ -527,4 +526,3 @@ init    CRTDLL_Init
 @ forward wscanf msvcrt.wscanf
 @ forward _itow msvcrt._itow
 @ forward _ltow msvcrt._ltow
--- a/dlls/crypt32/crypt32.spec
+++ b/dlls/crypt32/crypt32.spec
-name crypt32
 @ stub CertAddCRLContextToStore
 @ stub CertAddCTLContextToStore
 @ stub CertAddCertificateContextToStore

--- a/dlls/dciman32/dciman32.spec
+++ b/dlls/dciman32/dciman32.spec
-name	dciman32
 @ stub    DCIBeginAccess
 @ stdcall DCICloseProvider(long) DCICloseProvider
 @ stub    DCICreateOffscreen

--- a/dlls/ddraw/ddraw.spec
+++ b/dlls/ddraw/ddraw.spec
-name ddraw
 init DDRAW_DllMain
 @ stub DDHAL32_VidMemAlloc

--- a/dlls/devenum/devenum.spec
+++ b/dlls/devenum/devenum.spec
-name devenum
 @ stub DllCanUnloadNow
 @ stub DllGetClassObject
 @ stub DllRegisterServer

--- a/dlls/dinput/dinput.spec
+++ b/dlls/dinput/dinput.spec
-name dinput
 init Init
 @ stdcall DirectInputCreateA(long long ptr ptr) DirectInputCreateA

--- a/dlls/dinput8/dinput8.spec
+++ b/dlls/dinput8/dinput8.spec
-name dinput8
 @ stdcall DirectInput8Create(long long ptr ptr ptr) DirectInput8Create
 @ stdcall DllCanUnloadNow() DINPUT8_DllCanUnloadNow
 @ stdcall DllGetClassObject(ptr ptr ptr) DINPUT8_DllGetClassObject

--- a/dlls/dplay/dplay.spec
+++ b/dlls/dplay/dplay.spec
 # First DirectPlay dll. Replaced by dplayx.dll.
-name dplay
 @ forward DirectPlayCreate dplayx.DirectPlayCreate
 @ forward DirectPlayEnumerate dplayx.DirectPlayEnumerate
--- a/dlls/dplayx/dplayx.spec
+++ b/dlls/dplayx/dplayx.spec
-name dplayx
 init DPLAYX_LibMain
  1 stdcall DirectPlayCreate(ptr ptr ptr) DirectPlayCreate

--- a/dlls/dsound/dsound.spec
+++ b/dlls/dsound/dsound.spec
-name dsound
 0 stub DirectSoundUnknown
 1 stdcall DirectSoundCreate(ptr ptr ptr) DirectSoundCreate8
 2 stdcall DirectSoundEnumerateA(ptr ptr) DirectSoundEnumerateA

--- a/dlls/gdi/dispdib.spec
+++ b/dlls/gdi/dispdib.spec
-name	dispdib
-type	win16
-owner	gdi32
 1 pascal16 DisplayDib(ptr ptr word) DisplayDib
--- a/dlls/gdi/gdi.exe.spec
+++ b/dlls/gdi/gdi.exe.spec
-name	gdi
+heap	65520
-type	win16
-heap	65488  # 65536 - 16 (instance data) - 32 (stock objects)
-file	gdi.exe
-owner	gdi32
 rsrc	version16.res
 1   pascal   SetBkColor(word long) SetBkColor16

--- a/dlls/gdi/gdi32.spec
+++ b/dlls/gdi/gdi32.spec
-name    gdi32
 init    MAIN_GdiInit
 # ordinal exports

--- a/dlls/gdi/wing.spec
+++ b/dlls/gdi/wing.spec
-name    wing
-type    win16
-owner	gdi32
 1001 pascal16 WinGCreateDC() WinGCreateDC16
 1002 pascal16 WinGRecommendDIBFormat(ptr) WinGRecommendDIBFormat16
 1003 pascal16 WinGCreateBitmap(word ptr ptr) WinGCreateBitmap16

--- a/dlls/glu32/glu32.spec
+++ b/dlls/glu32/glu32.spec
-name glu32
 @ stdcall gluLookAt(double double double double double double double double double) wine_gluLookAt
 @ stdcall gluOrtho2D(double double double double) wine_gluOrtho2D
 @ stdcall gluPerspective(double double double double) wine_gluPerspective

--- a/dlls/icmp/icmp.spec
+++ b/dlls/icmp/icmp.spec
-name icmp
 @ stdcall IcmpCloseHandle(ptr) IcmpCloseHandle
 @ stdcall IcmpCreateFile() IcmpCreateFile
 @ stub  IcmpParseReplies
@@ -8,5 +6,3 @@ name icmp
 @ stub  do_echo_rep
 @ stub  do_echo_req
 @ stub  register_icmp
--- a/dlls/imagehlp/imagehlp.spec
+++ b/dlls/imagehlp/imagehlp.spec
-name	imagehlp
 init	IMAGEHLP_LibMain
 @ stdcall BindImage(str str str) BindImage

--- a/dlls/imm32/imm.spec
+++ b/dlls/imm32/imm.spec
-name	imm
-type	win16
-owner	imm32
 4   stub IMMGETDEFAULTIMEWND
 7   stub IMMGETDESCRIPTIONA
 8   stub IMMGETIMEFILENAMEA

--- a/dlls/imm32/imm32.spec
+++ b/dlls/imm32/imm32.spec
-name	imm32
 @ stdcall ImmAssociateContext(long long) ImmAssociateContext
 @ stdcall ImmConfigureIMEA(long long long ptr) ImmConfigureIMEA
 @ stdcall ImmConfigureIMEW(long long long ptr) ImmConfigureIMEW

--- a/dlls/kernel/comm.spec
+++ b/dlls/kernel/comm.spec
-name	comm
-type	win16
-owner	kernel32
  1 stub INICOM
  2 stub SETCOM
  3 stub SETQUE
@@ -21,4 +17,3 @@ owner	kernel32
 19 stub COMMWRITESTRING
 20 stub READCOMMSTRING
 100 stub ENABLENOTIFICATION
--- a/dlls/kernel/kernel32.spec
+++ b/dlls/kernel/kernel32.spec
-name	kernel32
 init	MAIN_KernelInit
 # Functions exported by the Win95 kernel32.dll

--- a/dlls/kernel/krnl386.exe.spec
+++ b/dlls/kernel/krnl386.exe.spec
 name	kernel
-type	win16
-file	krnl386.exe
-owner	kernel32
 rsrc	version16.res
 # 1-207 are the basic functions, those are (with minor variations)

--- a/dlls/kernel/stress.spec
+++ b/dlls/kernel/stress.spec
 # summary: resource modification dll
 #
-name	stress
-type	win16
-owner	kernel32
 2   pascal AllocMem(long) AllocMem
 3   pascal FreeAllMem() FreeAllMem
 6   pascal AllocFileHandles(word) AllocFileHandles

--- a/dlls/kernel/system.spec
+++ b/dlls/kernel/system.spec
-name	system
-type	win16
-owner	kernel32
 1 pascal   InquireSystem(word word) InquireSystem16
 2 pascal16 CreateSystemTimer(word segptr) WIN16_CreateSystemTimer
 3 pascal16 KillSystemTimer(word) SYSTEM_KillSystemTimer

--- a/dlls/kernel/toolhelp.spec
+++ b/dlls/kernel/toolhelp.spec
-name	toolhelp
-type	win16
-owner	kernel32
 50 pascal16 GlobalHandleToSel(word) GlobalHandleToSel16
 51 pascal16 GlobalFirst(ptr word) GlobalFirst16
 52 pascal16 GlobalNext(ptr word) GlobalNext16

--- a/dlls/kernel/win87em.spec
+++ b/dlls/kernel/win87em.spec
-name	win87em
-type	win16
-owner	kernel32
 1 pascal -register _fpMath() WIN87_fpmath
 3 pascal16 __WinEm87Info(ptr word) WIN87_WinEm87Info
 4 pascal16 __WinEm87Restore(ptr word) WIN87_WinEm87Restore

--- a/dlls/kernel/windebug.spec
+++ b/dlls/kernel/windebug.spec
-name	windebug
-type	win16
-owner	kernel32
  1 stub     WINDEBUG
  2 stub     WEP
  3 pascal -register WinNotify() WinNotify16
--- a/dlls/kernel/wprocs.spec
+++ b/dlls/kernel/wprocs.spec
-name	wprocs
-type	win16
-owner	kernel32
 # Interrupt vectors 0-255 are ordinals 100-355
 # The '-interrupt' keyword takes care of the flags pushed on the stack by the interrupt
 117 pascal -interrupt INT_Int11Handler() INT_Int11Handler

--- a/dlls/lzexpand/lz32.spec
+++ b/dlls/lzexpand/lz32.spec
-name	lz32
 @ stdcall CopyLZFile(long long) CopyLZFile
 @ stdcall GetExpandedNameA(str ptr) GetExpandedNameA
 @ stdcall GetExpandedNameW(wstr ptr) GetExpandedNameW

--- a/dlls/lzexpand/lzexpand.spec
+++ b/dlls/lzexpand/lzexpand.spec
-name	lzexpand
-type	win16
-owner	lz32
 1  pascal   LZCopy(word word) LZCopy16
 2  pascal16 LZOpenFile(str ptr word) LZOpenFile16
 3  pascal16 LZInit(word) LZInit16

--- a/dlls/mapi32/mapi32.spec
+++ b/dlls/mapi32/mapi32.spec
-name mapi32
 @ stub BMAPIAddress
 @ stub BMAPIDetails
 @ stub BMAPIFindNext

--- a/dlls/mpr/mpr.spec
+++ b/dlls/mpr/mpr.spec
-name mpr
 # ordinal exports
 1 stub @
 2 stub @

--- a/dlls/msacm/imaadp32/imaadp32.acm.spec
+++ b/dlls/msacm/imaadp32/imaadp32.acm.spec
-name imaadp32
-file imaadp32.acm
 @ stdcall DriverProc (long long long long long) ADPCM_DriverProc
--- a/dlls/msacm/msacm.spec
+++ b/dlls/msacm/msacm.spec
-name	msacm
-type	win16
-owner	msacm32
  1 stub     WEP
  2 stub     DRIVERPROC
  3 stub     ___EXPORTEDSTUB

--- a/dlls/msacm/msacm32.spec
+++ b/dlls/msacm/msacm32.spec
-name msacm32
 init MSACM32_LibMain
 @ stdcall acmDriverAddA(ptr long long long long) acmDriverAddA

--- a/dlls/msacm/msadp32/msadp32.acm.spec
+++ b/dlls/msacm/msadp32/msadp32.acm.spec
-name msadp32
-file msadp32.acm
 @ stdcall DriverProc (long long long long long) ADPCM_DriverProc
--- a/dlls/msacm/msg711/msg711.acm.spec
+++ b/dlls/msacm/msg711/msg711.acm.spec
-name msg711
-file msg711.acm
 @ stdcall DriverProc(long long long long long) G711_DriverProc
--- a/dlls/msacm/winemp3/winemp3.acm.spec
+++ b/dlls/msacm/winemp3/winemp3.acm.spec
-name winemp3
-file winemp3.acm
 @ stdcall DriverProc(long long long long long) MPEG3_DriverProc
--- a/dlls/msdmo/msdmo.spec
+++ b/dlls/msdmo/msdmo.spec
-name msdmo
 @ stub DMOEnum
 @ stub DMOGetName
 @ stub DMOGetTypes
@@ -15,4 +13,3 @@ name msdmo
 @ stub MoDuplicateMediaType
 @ stub MoFreeMediaType
 @ stub MoInitMediaType
--- a/dlls/msimg32/msimg32.spec
+++ b/dlls/msimg32/msimg32.spec
-name msimg32
 @ stdcall AlphaBlend(long long long long long long long long long long long) AlphaBlend
 @ stub DllInitialize
 @ stdcall GradientFill(long ptr long ptr long long) GradientFill

--- a/dlls/msisys/msisys.ocx.spec
+++ b/dlls/msisys/msisys.ocx.spec
-name	msisys
-file	msisys.ocx
 init	MSISYS_DllMain
 @ stdcall DllCanUnloadNow() MSISYS_DllCanUnloadNow

--- a/dlls/msnet32/msnet32.spec
+++ b/dlls/msnet32/msnet32.spec
-name msnet32
  1 stub @
  2 stub @
  3 stub @
@@ -96,4 +94,3 @@ name msnet32
 94 stub @
 95 stub @
 96 stub @
--- a/dlls/msrle32/msrle32.spec
+++ b/dlls/msrle32/msrle32.spec
-name msrle32
 @ stub DriverProc #(long long long long long)
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
 # msvcrt.dll - MS VC++ Run Time Library
-name    msvcrt
 init    MSVCRT_Init
 @ cdecl $I10_OUTPUT() MSVCRT_I10_OUTPUT

--- a/dlls/msvcrt20/msvcrt20.spec
+++ b/dlls/msvcrt20/msvcrt20.spec
 # msvcrt20.dll - MS VC++ Run Time Library
-name    msvcrt20
 @ stub ??0Iostream_init@@QAE@AAVios@@H@Z  #
 @ stub ??0Iostream_init@@QAE@XZ #
 @ stub ??0filebuf@@QAE@ABV0@@Z #

--- a/dlls/msvideo/msvfw32.spec
+++ b/dlls/msvideo/msvfw32.spec
-name	msvfw32
 # Yes, ICCompress,ICDecompress,MCIWnd* and ICDraw* are cdecl (VFWAPIV).
 # The rest is stdcall (VFWAPI) however. -Marcus Meissner, 990124

--- a/dlls/msvideo/msvideo.spec
+++ b/dlls/msvideo/msvideo.spec
-name msvideo
-type win16
-owner msvfw32
 2 pascal VideoForWindowsVersion() VideoForWindowsVersion
 20 stub VIDEOGETNUMDEVS
 21 stub VIDEOGETERRORTEXT

--- a/dlls/netapi32/netapi32.spec
+++ b/dlls/netapi32/netapi32.spec
-name	netapi32
 init	NETAPI32_LibMain
 1 stdcall Netbios(ptr) Netbios
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
-name	ntdll
 #note that the Zw... functions are alternate names for the
 #Nt... functions.  (see www.sysinternals.com for details)
 #if you change a Nt.. function DON'T FORGET to change the

--- a/dlls/odbc32/odbc32.spec
+++ b/dlls/odbc32/odbc32.spec
--- a/dlls/ole32/compobj.spec
+++ b/dlls/ole32/compobj.spec
-name	compobj
-type	win16
-owner	ole32
 1 pascal CoBuildVersion() CoBuildVersion
 2 pascal CoInitialize(long) CoInitialize16
 3 pascal CoUninitialize() CoUninitialize16

--- a/dlls/ole32/ole2.spec
+++ b/dlls/ole32/ole2.spec
-name	ole2
-type	win16
-owner	ole32
 1 pascal OleBuildVersion() OleBuildVersion
 2 pascal OleInitialize(ptr) OleInitialize
 3 pascal OleUninitialize() OleUninitialize

--- a/dlls/ole32/ole2conv.spec
+++ b/dlls/ole32/ole2conv.spec
-name	ole2conv
-type	win16
-owner	ole32
 1 stub GETFILTERINFO
 2 stub IMPORTGR
 3 stub GETFILTERPREF

--- a/dlls/ole32/ole2nls.spec
+++ b/dlls/ole32/ole2nls.spec
-name	ole2nls
-type	win16
-owner	ole32
 1 pascal GetUserDefaultLCID() GetUserDefaultLCID16
 2 pascal GetSystemDefaultLCID() GetSystemDefaultLCID16
 3 pascal16 GetUserDefaultLangID() GetUserDefaultLangID16

--- a/dlls/ole32/ole2prox.spec
+++ b/dlls/ole32/ole2prox.spec
-name	ole2prox
-type	win16
-owner	ole32
 1 stub DLLGETCLASSOBJECT
 #2 WEP
 #3 ___EXPORTEDSTUB
--- a/dlls/ole32/ole2thk.spec
+++ b/dlls/ole32/ole2thk.spec
-name	ole2thk
-type	win16
-owner	ole32
 1 stub WEP
 2 stub ROT16_ISRUNNING16
 3 stub ISWIN32SHANDLE

--- a/dlls/ole32/ole32.spec
+++ b/dlls/ole32/ole32.spec
-name	ole32
 init	OLE32_DllEntryPoint
  1 stub BindMoniker                # stdcall (ptr long ptr ptr) return 0,ERR_NOTIMPLEMENTED

--- a/dlls/ole32/storage.spec
+++ b/dlls/ole32/storage.spec
 # Compound Storage DLL.
 # (FIXME: some methods are commented out. Commenting them in _WILL_
 #  result in dataloss. Do it at your own risk.)
-name	storage
-type	win16
-owner	ole32
 1 pascal StgCreateDocFileA(str long long ptr) StgCreateDocFile16
 2 stub StgCreateDocFileOnILockBytes

--- a/dlls/oleaut32/ole2disp.spec
+++ b/dlls/oleaut32/ole2disp.spec
-name	ole2disp
-type	win16
-owner	oleaut32
 1 stub DLLGETCLASSOBJECT
 2 pascal SysAllocString(str)		SysAllocString16
 3 pascal SysReallocString(ptr str)	SysReAllocString16

--- a/dlls/oleaut32/oleaut32.spec
+++ b/dlls/oleaut32/oleaut32.spec
-name oleaut32
 1 stdcall DllGetClassObject(ptr ptr ptr) OLEAUT32_DllGetClassObject
 2 stdcall SysAllocString(wstr) SysAllocString
 3 stdcall SysReAllocString(ptr wstr) SysReAllocString

--- a/dlls/oleaut32/typelib.spec
+++ b/dlls/oleaut32/typelib.spec
-name typelib
-type win16
-owner oleaut32
 2  stub CREATETYPELIB
 3  pascal LoadTypeLib(ptr ptr) LoadTypeLib16
 4  stub LHASHVALOFNAMESYS

--- a/dlls/olecli/olecli.spec
+++ b/dlls/olecli/olecli.spec
-name	olecli
-type	win16
-owner	olecli32
 #1 WEP
 2 stub OLEDELETE
 3 stub OLESAVETOSTREAM

--- a/dlls/olecli/olecli32.spec
+++ b/dlls/olecli/olecli32.spec
-name olecli32
   1 stub WEP
   2 stub OleDelete
   3 forward OleSaveToStream ole32.OleSaveToStream

--- a/dlls/oledlg/oledlg.spec
+++ b/dlls/oledlg/oledlg.spec
-name	oledlg
  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

--- a/dlls/olepro32/olepro32.spec
+++ b/dlls/olepro32/olepro32.spec
-name olepro32
 248 forward OleIconToCursor OLEAUT32.OleIconToCursor
 249 forward OleCreatePropertyFrameIndirect OLEAUT32.OleCreatePropertyFrameIndirect
 250 forward OleCreatePropertyFrame OLEAUT32.OleCreatePropertyFrame

--- a/dlls/olesvr/olesvr.spec
+++ b/dlls/olesvr/olesvr.spec
-name	olesvr
-type	win16
-owner	olesvr32
 #1 WEP
 2  pascal OleRegisterServer(str ptr ptr word word) OleRegisterServer16
 3  pascal OleRevokeServer(long) OleRevokeServer16

--- a/dlls/olesvr/olesvr32.spec
+++ b/dlls/olesvr/olesvr32.spec
-name	olesvr32
 1 stub WEP
 2 stdcall OleRegisterServer(str ptr ptr long long) OleRegisterServer
 3 stub OleRevokeServer

--- a/dlls/opengl32/opengl32.spec
+++ b/dlls/opengl32/opengl32.spec
-name opengl32
 init OpenGL32_Init
 @  stdcall wglCreateContext(long) wglCreateContext

--- a/dlls/psapi/psapi.spec
+++ b/dlls/psapi/psapi.spec
-name    psapi
 @ stdcall EmptyWorkingSet(long) EmptyWorkingSet
 @ stdcall EnumDeviceDrivers(ptr long ptr) EnumDeviceDrivers
 @ stdcall EnumProcessModules(long ptr long ptr) EnumProcessModules

--- a/dlls/qcap/qcap.spec
+++ b/dlls/qcap/qcap.spec
-name qcap
 @ stub DllCanUnloadNow
 @ stub DllGetClassObject
 @ stub DllRegisterServer
 @ stub DllUnregisterServer
--- a/dlls/quartz/quartz.spec
+++ b/dlls/quartz/quartz.spec
-name	quartz
 @ stub AMGetErrorTextA
 @ stub AMGetErrorTextW
 @ stub AmpFactorToDB
@@ -8,4 +6,3 @@ name	quartz
 @ stub DllGetClassObject
 @ stub DllRegisterServer
 @ stub DllUnregisterServer
--- a/dlls/rasapi32/rasapi16.spec
+++ b/dlls/rasapi32/rasapi16.spec
-name    rasapi16
-type    win16
-owner	rasapi32
 #1 stub	WEP
 #2 stub	DLLENTRYPOINT
 3 stub	RNA1632_THUNKDATA16

--- a/dlls/rasapi32/rasapi32.spec
+++ b/dlls/rasapi32/rasapi32.spec
-name	rasapi32
 1  stub RasAutodialAddressToNetwork
 2  stub RasAutodialEntryToNetwork
 3  stub RasConnectionNotificationA

--- a/dlls/richedit/riched32.spec
+++ b/dlls/richedit/riched32.spec
-name	riched32
 init	RICHED32_LibMain
 2 stdcall DllGetVersion (ptr) RICHED32_DllGetVersion
--- a/dlls/rpcrt4/rpcrt4.spec
+++ b/dlls/rpcrt4/rpcrt4.spec
-name	rpcrt4
 init	RPCRT4_LibMain
 @ stub DceErrorInqTextA

--- a/dlls/serialui/serialui.spec
+++ b/dlls/serialui/serialui.spec
-name	serialui
 init	SERIALUI_LibMain
 2 stdcall EnumPropPages(ptr ptr ptr) SERIALUI_EnumPropPages

--- a/dlls/setupapi/setupapi.spec
+++ b/dlls/setupapi/setupapi.spec
-name setupapi
 @ stub AddMiniIconToList
 @ stub AddTagToGroupOrderListEntry
 @ stub AppendStringToMultiSz

--- a/dlls/setupapi/setupx.spec
+++ b/dlls/setupapi/setupx.spec
-name    setupx
-type    win16
-owner	setupapi
 1    stub     WEP
 2    pascal16 IpOpen(str ptr) IpOpen16
 3    stub     IpOpenAppend #(str word)

--- a/dlls/shdocvw/shdocvw.spec
+++ b/dlls/shdocvw/shdocvw.spec
-name	shdocvw
 # ordinal exports
 101 stub @
 102 stub @

--- a/dlls/shell32/shell.spec
+++ b/dlls/shell32/shell.spec
-name	shell
-type	win16
-owner	shell32
 rsrc	version16.res
  1 pascal   RegOpenKey(long str ptr) RegOpenKey16

--- a/dlls/shell32/shell32.spec
+++ b/dlls/shell32/shell32.spec
-name	shell32
 init	Shell32LibMain
 # Functions exported by the Win95 shell32.dll

--- a/dlls/shfolder/shfolder.spec
+++ b/dlls/shfolder/shfolder.spec
-name shfolder
 @ forward SHGetFolderPathA shell32.SHGetFolderPathA
 @ forward SHGetFolderPathW shell32.SHGetFolderPathW
--- a/dlls/shlwapi/shlwapi.spec
+++ b/dlls/shlwapi/shlwapi.spec
-name shlwapi
 init SHLWAPI_LibMain
 1   stdcall @(str ptr) SHLWAPI_1

--- a/dlls/snmpapi/snmpapi.spec
+++ b/dlls/snmpapi/snmpapi.spec
-name    snmpapi
 init    SNMPAPI_DllMain
 @ stub SnmpSvcAddrIsIpx

--- a/dlls/sti/sti.spec
+++ b/dlls/sti/sti.spec
-name sti
 @ stub DllCanUnloadNow
 @ stub DllGetClassObject
 @ stub DllRegisterServer

--- a/dlls/tapi32/tapi32.spec
+++ b/dlls/tapi32/tapi32.spec
-name	tapi32
 @ stdcall lineAccept(long str long) lineAccept
 @ stdcall lineAddProvider(str long ptr) lineAddProvider
 @ stdcall lineAddToConference(long long) lineAddToConference

--- a/dlls/ttydrv/ttydrv.spec
+++ b/dlls/ttydrv/ttydrv.spec
-name	ttydrv
 init	TTYDRV_Init
 # GDI driver

--- a/dlls/twain/twain_32.spec
+++ b/dlls/twain/twain_32.spec
-name	twain_32
 init	TWAIN_LibMain
 @ stdcall DSM_Entry(ptr ptr long long long ptr) DSM_Entry
--- a/dlls/url/url.spec
+++ b/dlls/url/url.spec
-name url
 @ stub AddMIMEFileTypesPS
 @ stub AutodialHookCallback
 @ stub DllCanUnloadNow

--- a/dlls/urlmon/urlmon.spec
+++ b/dlls/urlmon/urlmon.spec
-name    urlmon
 1 stub CDLGetLongPathNameA
 2 stub CDLGetLongPathNameW
 @ stub AsyncGetClassBits
@@ -76,4 +74,3 @@ name    urlmon
 @ stdcall UrlMkSetSessionOption(long ptr long long) UrlMkSetSessionOption
 @ stub WriteHitLogging
 @ stub ZonesReInit
--- a/dlls/user/ddeml.spec
+++ b/dlls/user/ddeml.spec
-name	ddeml
-type	win16
-owner	user32
 2 pascal16 DdeInitialize(ptr segptr long long) DdeInitialize16
 3 pascal16 DdeUninitialize(long) DdeUninitialize16
 4 pascal DdeConnectList(long word word word ptr) DdeConnectList16

--- a/dlls/user/display.spec
+++ b/dlls/user/display.spec
--- a/dlls/user/keyboard.spec
+++ b/dlls/user/keyboard.spec
--- a/dlls/user/mouse.spec
+++ b/dlls/user/mouse.spec
--- a/dlls/user/user.exe.spec
+++ b/dlls/user/user.exe.spec
--- a/dlls/user/user32.spec
+++ b/dlls/user/user32.spec
--- a/dlls/version/ver.spec
+++ b/dlls/version/ver.spec
--- a/dlls/version/version.spec
+++ b/dlls/version/version.spec
--- a/dlls/win32s/w32skrnl.spec
+++ b/dlls/win32s/w32skrnl.spec
--- a/dlls/win32s/w32sys.spec
+++ b/dlls/win32s/w32sys.spec
--- a/dlls/win32s/win32s16.spec
+++ b/dlls/win32s/win32s16.spec
--- a/dlls/winaspi/winaspi.spec
+++ b/dlls/winaspi/winaspi.spec
--- a/dlls/winaspi/wnaspi32.spec
+++ b/dlls/winaspi/wnaspi32.spec
--- a/dlls/winedos/winedos.spec
+++ b/dlls/winedos/winedos.spec
--- a/dlls/wineps/wineps.spec
+++ b/dlls/wineps/wineps.spec
--- a/dlls/wineps/wineps16.spec
+++ b/dlls/wineps/wineps16.spec
--- a/dlls/wininet/wininet.spec
+++ b/dlls/wininet/wininet.spec
--- a/dlls/winmm/joystick/joystick.drv.spec
+++ b/dlls/winmm/joystick/joystick.drv.spec
--- a/dlls/winmm/mcianim/mcianim.drv.spec
+++ b/dlls/winmm/mcianim/mcianim.drv.spec
--- a/dlls/winmm/mciavi/mciavi.drv.spec
+++ b/dlls/winmm/mciavi/mciavi.drv.spec
--- a/dlls/winmm/mcicda/mcicda.drv.spec
+++ b/dlls/winmm/mcicda/mcicda.drv.spec
--- a/dlls/winmm/mciseq/mciseq.drv.spec
+++ b/dlls/winmm/mciseq/mciseq.drv.spec
--- a/dlls/winmm/mciwave/mciwave.drv.spec
+++ b/dlls/winmm/mciwave/mciwave.drv.spec
--- a/dlls/winmm/midimap/midimap.drv.spec
+++ b/dlls/winmm/midimap/midimap.drv.spec
--- a/dlls/winmm/mmsystem.spec
+++ b/dlls/winmm/mmsystem.spec
--- a/dlls/winmm/sound.spec
+++ b/dlls/winmm/sound.spec
--- a/dlls/winmm/wavemap/msacm.drv.spec
+++ b/dlls/winmm/wavemap/msacm.drv.spec
--- a/dlls/winmm/winearts/winearts.drv.spec
+++ b/dlls/winmm/winearts/winearts.drv.spec
--- a/dlls/winmm/wineoss/wineoss.drv.spec
+++ b/dlls/winmm/wineoss/wineoss.drv.spec
--- a/dlls/winmm/winmm.spec
+++ b/dlls/winmm/winmm.spec
--- a/dlls/winnls/winnls.spec
+++ b/dlls/winnls/winnls.spec
--- a/dlls/winnls/winnls32.spec
+++ b/dlls/winnls/winnls32.spec
--- a/dlls/winsock/winsock.spec
+++ b/dlls/winsock/winsock.spec
--- a/dlls/winsock/ws2_32.spec
+++ b/dlls/winsock/ws2_32.spec
--- a/dlls/winspool/winspool.drv.spec
+++ b/dlls/winspool/winspool.drv.spec
--- a/dlls/wintrust/wintrust.spec
+++ b/dlls/wintrust/wintrust.spec
--- a/dlls/wow32/wow32.spec
+++ b/dlls/wow32/wow32.spec
--- a/dlls/wsock32/wsock32.spec
+++ b/dlls/wsock32/wsock32.spec
--- a/dlls/x11drv/x11drv.spec
+++ b/dlls/x11drv/x11drv.spec
--- a/miscemu/Makefile.in
+++ b/miscemu/Makefile.in
--- a/miscemu/wine.spec
+++ b/miscemu/wine.spec
--- a/tools/winebuild/README
+++ b/tools/winebuild/README
--- a/tools/winebuild/import.c
+++ b/tools/winebuild/import.c
--- a/tools/winebuild/main.c
+++ b/tools/winebuild/main.c
--- a/tools/winebuild/parser.c
+++ b/tools/winebuild/parser.c
--- a/tools/winebuild/spec16.c
+++ b/tools/winebuild/spec16.c
--- a/tools/winebuild/spec32.c
+++ b/tools/winebuild/spec32.c