Made some more spec file entries optional or unnecessary.

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 $<

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

dlls/avicap32/avicap32.spec

-name avicap32
-
 @ stub capCreateCaptureWindowA
 @ stub capCreateCaptureWindowW
 @ stdcall capGetDriverDescriptionA(long ptr long ptr long) capGetDriverDescriptionA

dlls/avifil32/avifil32.spec

-name	avifil32
-
 @ stub    AVIBuildFilter
 @ stub    AVIBuildFilterA
 @ stub    AVIBuildFilterW

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

dlls/comcat/comcat.spec

-name comcat
 init COMCAT_DllEntryPoint
 
 @ stdcall DllCanUnloadNow() COMCAT_DllCanUnloadNow

dlls/comctl32/comctl32.spec

-name	comctl32
 init	COMCTL32_LibMain
 
 # Functions exported by the Win95 comctl32.dll

dlls/commdlg/comdlg32.spec

-name	comdlg32
 init	COMDLG32_DllEntryPoint
 
 @ stdcall ChooseColorA(ptr) ChooseColorA

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

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
-

dlls/crypt32/crypt32.spec

-name crypt32
-
 @ stub CertAddCRLContextToStore
 @ stub CertAddCTLContextToStore
 @ stub CertAddCertificateContextToStore

dlls/dciman32/dciman32.spec

-name	dciman32
-
 @ stub    DCIBeginAccess
 @ stdcall DCICloseProvider(long) DCICloseProvider
 @ stub    DCICreateOffscreen

dlls/ddraw/ddraw.spec

-name ddraw
 init DDRAW_DllMain
 
 @ stub DDHAL32_VidMemAlloc

dlls/devenum/devenum.spec

-name devenum
-
 @ stub DllCanUnloadNow
 @ stub DllGetClassObject
 @ stub DllRegisterServer

dlls/dinput/dinput.spec

-name dinput
 init Init
 
 @ stdcall DirectInputCreateA(long long ptr ptr) DirectInputCreateA

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

dlls/dplay/dplay.spec

 # First DirectPlay dll. Replaced by dplayx.dll.
-name dplay
 
 @ forward DirectPlayCreate dplayx.DirectPlayCreate
 @ forward DirectPlayEnumerate dplayx.DirectPlayEnumerate

dlls/dplayx/dplayx.spec

-name dplayx
 init DPLAYX_LibMain
 
   1 stdcall DirectPlayCreate(ptr ptr ptr) DirectPlayCreate

dlls/dsound/dsound.spec

-name dsound
-
 0 stub DirectSoundUnknown
 1 stdcall DirectSoundCreate(ptr ptr ptr) DirectSoundCreate8
 2 stdcall DirectSoundEnumerateA(ptr ptr) DirectSoundEnumerateA

dlls/gdi/dispdib.spec

-name	dispdib
-type	win16
-owner	gdi32
-
 1 pascal16 DisplayDib(ptr ptr word) DisplayDib

dlls/gdi/gdi.exe.spec

-name	gdi
-type	win16
-heap	65488  # 65536 - 16 (instance data) - 32 (stock objects)
-file	gdi.exe
-owner	gdi32
+heap	65520
 rsrc	version16.res
 
 1   pascal   SetBkColor(word long) SetBkColor16

dlls/gdi/gdi32.spec

-name    gdi32
 init    MAIN_GdiInit
 
 # ordinal exports

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

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

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
-
-

dlls/imagehlp/imagehlp.spec

-name	imagehlp
 init	IMAGEHLP_LibMain
 
 @ stdcall BindImage(str str str) BindImage

dlls/imm32/imm.spec

-name	imm
-type	win16
-owner	imm32
-
 4   stub IMMGETDEFAULTIMEWND
 7   stub IMMGETDESCRIPTIONA
 8   stub IMMGETIMEFILENAMEA

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

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
-

dlls/kernel/kernel32.spec

-name	kernel32
 init	MAIN_KernelInit
 
 # Functions exported by the Win95 kernel32.dll

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)

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

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

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

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

dlls/kernel/windebug.spec

-name	windebug
-type	win16
-owner	kernel32
-
   1 stub     WINDEBUG
   2 stub     WEP
   3 pascal -register WinNotify() WinNotify16

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

dlls/lzexpand/lz32.spec

-name	lz32
-
 @ stdcall CopyLZFile(long long) CopyLZFile
 @ stdcall GetExpandedNameA(str ptr) GetExpandedNameA
 @ stdcall GetExpandedNameW(wstr ptr) GetExpandedNameW

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

dlls/mapi32/mapi32.spec

-name mapi32
-
 @ stub BMAPIAddress
 @ stub BMAPIDetails
 @ stub BMAPIFindNext

dlls/mpr/mpr.spec

-name mpr
-
 # ordinal exports
  1 stub @
  2 stub @

dlls/msacm/imaadp32/imaadp32.acm.spec

-name imaadp32
-file imaadp32.acm
-
 @ stdcall DriverProc (long long long long long) ADPCM_DriverProc

dlls/msacm/msacm.spec

-name	msacm
-type	win16
-owner	msacm32
-
   1 stub     WEP
   2 stub     DRIVERPROC
   3 stub     ___EXPORTEDSTUB

dlls/msacm/msacm32.spec

-name msacm32
 init MSACM32_LibMain
 
 @ stdcall acmDriverAddA(ptr long long long long) acmDriverAddA

dlls/msacm/msadp32/msadp32.acm.spec

-name msadp32
-file msadp32.acm
-
 @ stdcall DriverProc (long long long long long) ADPCM_DriverProc

dlls/msacm/msg711/msg711.acm.spec

-name msg711
-file msg711.acm
-
 @ stdcall DriverProc(long long long long long) G711_DriverProc

dlls/msacm/winemp3/winemp3.acm.spec

-name winemp3
-file winemp3.acm
-
 @ stdcall DriverProc(long long long long long) MPEG3_DriverProc

dlls/msdmo/msdmo.spec

-name msdmo
-
 @ stub DMOEnum
 @ stub DMOGetName
 @ stub DMOGetTypes
@@ -15,4 +13,3 @@ name msdmo
 @ stub MoDuplicateMediaType
 @ stub MoFreeMediaType
 @ stub MoInitMediaType
-

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

dlls/msisys/msisys.ocx.spec

-name	msisys
-file	msisys.ocx
 init	MSISYS_DllMain
 
 @ stdcall DllCanUnloadNow() MSISYS_DllCanUnloadNow

dlls/msnet32/msnet32.spec

-name msnet32
-
   1 stub @
   2 stub @
   3 stub @
@@ -96,4 +94,3 @@ name msnet32
  94 stub @
  95 stub @
  96 stub @
-  

dlls/msrle32/msrle32.spec

-name msrle32
-
 @ stub DriverProc #(long long long long long)
-

dlls/msvcrt/msvcrt.spec

 # msvcrt.dll - MS VC++ Run Time Library
-name    msvcrt
 init    MSVCRT_Init
 
 @ cdecl $I10_OUTPUT() MSVCRT_I10_OUTPUT

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 #

dlls/msvideo/msvfw32.spec

-name	msvfw32
-
 # Yes, ICCompress,ICDecompress,MCIWnd* and ICDraw* are cdecl (VFWAPIV).
 # The rest is stdcall (VFWAPI) however. -Marcus Meissner, 990124
 

dlls/msvideo/msvideo.spec

-name msvideo
-type win16
-owner msvfw32
-
 2 pascal VideoForWindowsVersion() VideoForWindowsVersion
 20 stub VIDEOGETNUMDEVS
 21 stub VIDEOGETERRORTEXT

dlls/netapi32/netapi32.spec

-name	netapi32
 init	NETAPI32_LibMain
 
 1 stdcall Netbios(ptr) Netbios
-

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

dlls/ole32/compobj.spec

-name	compobj
-type	win16
-owner	ole32
-
 1 pascal CoBuildVersion() CoBuildVersion
 2 pascal CoInitialize(long) CoInitialize16
 3 pascal CoUninitialize() CoUninitialize16

dlls/ole32/ole2.spec

-name	ole2
-type	win16
-owner	ole32
-
 1 pascal OleBuildVersion() OleBuildVersion
 2 pascal OleInitialize(ptr) OleInitialize
 3 pascal OleUninitialize() OleUninitialize

dlls/ole32/ole2conv.spec

-name	ole2conv
-type	win16
-owner	ole32
-
 1 stub GETFILTERINFO
 2 stub IMPORTGR
 3 stub GETFILTERPREF

dlls/ole32/ole2nls.spec

-name	ole2nls
-type	win16
-owner	ole32
-
 1 pascal GetUserDefaultLCID() GetUserDefaultLCID16
 2 pascal GetSystemDefaultLCID() GetSystemDefaultLCID16
 3 pascal16 GetUserDefaultLangID() GetUserDefaultLangID16

dlls/ole32/ole2prox.spec

-name	ole2prox
-type	win16
-owner	ole32
-
 1 stub DLLGETCLASSOBJECT
 #2 WEP
 #3 ___EXPORTEDSTUB

dlls/ole32/ole2thk.spec

-name	ole2thk
-type	win16
-owner	ole32
-
 1 stub WEP
 2 stub ROT16_ISRUNNING16
 3 stub ISWIN32SHANDLE

dlls/ole32/ole32.spec

-name	ole32
 init	OLE32_DllEntryPoint
 
   1 stub BindMoniker                # stdcall (ptr long ptr ptr) return 0,ERR_NOTIMPLEMENTED

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

dlls/oleaut32/ole2disp.spec

-name	ole2disp
-type	win16
-owner	oleaut32
-
 1 stub DLLGETCLASSOBJECT
 2 pascal SysAllocString(str)		SysAllocString16
 3 pascal SysReallocString(ptr str)	SysReAllocString16

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

dlls/oleaut32/typelib.spec

-name typelib
-type win16
-owner oleaut32
-
 2  stub CREATETYPELIB
 3  pascal LoadTypeLib(ptr ptr) LoadTypeLib16
 4  stub LHASHVALOFNAMESYS

dlls/olecli/olecli.spec

-name	olecli
-type	win16
-owner	olecli32
-
 #1 WEP
 2 stub OLEDELETE
 3 stub OLESAVETOSTREAM

dlls/olecli/olecli32.spec

-name olecli32
-
    1 stub WEP
    2 stub OleDelete
    3 forward OleSaveToStream ole32.OleSaveToStream

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

dlls/olepro32/olepro32.spec

-name olepro32
-
 248 forward OleIconToCursor OLEAUT32.OleIconToCursor
 249 forward OleCreatePropertyFrameIndirect OLEAUT32.OleCreatePropertyFrameIndirect
 250 forward OleCreatePropertyFrame OLEAUT32.OleCreatePropertyFrame

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

dlls/olesvr/olesvr32.spec

-name	olesvr32
-
  1 stub WEP
  2 stdcall OleRegisterServer(str ptr ptr long long) OleRegisterServer
  3 stub OleRevokeServer

dlls/opengl32/opengl32.spec

-name opengl32
 init OpenGL32_Init
 
 @  stdcall wglCreateContext(long) wglCreateContext

dlls/psapi/psapi.spec

-name    psapi
-
 @ stdcall EmptyWorkingSet(long) EmptyWorkingSet
 @ stdcall EnumDeviceDrivers(ptr long ptr) EnumDeviceDrivers
 @ stdcall EnumProcessModules(long ptr long ptr) EnumProcessModules

dlls/qcap/qcap.spec

-name qcap
-
 @ stub DllCanUnloadNow
 @ stub DllGetClassObject
 @ stub DllRegisterServer
 @ stub DllUnregisterServer
-

dlls/quartz/quartz.spec

-name	quartz
-
 @ stub AMGetErrorTextA
 @ stub AMGetErrorTextW
 @ stub AmpFactorToDB
@@ -8,4 +6,3 @@ name	quartz
 @ stub DllGetClassObject
 @ stub DllRegisterServer
 @ stub DllUnregisterServer
-

dlls/rasapi32/rasapi16.spec

-name    rasapi16
-type    win16
-owner	rasapi32
-
 #1 stub	WEP
 #2 stub	DLLENTRYPOINT
 3 stub	RNA1632_THUNKDATA16

dlls/rasapi32/rasapi32.spec

-name	rasapi32
-
  1  stub RasAutodialAddressToNetwork
  2  stub RasAutodialEntryToNetwork
  3  stub RasConnectionNotificationA

dlls/richedit/riched32.spec

-name	riched32
 init	RICHED32_LibMain
 
 2 stdcall DllGetVersion (ptr) RICHED32_DllGetVersion

dlls/rpcrt4/rpcrt4.spec

-name	rpcrt4
 init	RPCRT4_LibMain
 
 @ stub DceErrorInqTextA

dlls/serialui/serialui.spec

-name	serialui
 init	SERIALUI_LibMain
 
 2 stdcall EnumPropPages(ptr ptr ptr) SERIALUI_EnumPropPages

dlls/setupapi/setupapi.spec

-name setupapi
-
 @ stub AddMiniIconToList
 @ stub AddTagToGroupOrderListEntry
 @ stub AppendStringToMultiSz

dlls/setupapi/setupx.spec

-name    setupx
-type    win16
-owner	setupapi
-
 1    stub     WEP
 2    pascal16 IpOpen(str ptr) IpOpen16
 3    stub     IpOpenAppend #(str word)

dlls/shdocvw/shdocvw.spec

-name	shdocvw
-
 # ordinal exports
 101 stub @
 102 stub @

dlls/shell32/shell.spec

-name	shell
-type	win16
-owner	shell32
 rsrc	version16.res
 
   1 pascal   RegOpenKey(long str ptr) RegOpenKey16

dlls/shell32/shell32.spec

-name	shell32
 init	Shell32LibMain
 
 # Functions exported by the Win95 shell32.dll

dlls/shfolder/shfolder.spec

-name shfolder
-
 @ forward SHGetFolderPathA shell32.SHGetFolderPathA
 @ forward SHGetFolderPathW shell32.SHGetFolderPathW

dlls/shlwapi/shlwapi.spec

-name shlwapi
 init SHLWAPI_LibMain
 
 1   stdcall @(str ptr) SHLWAPI_1

dlls/snmpapi/snmpapi.spec

-name    snmpapi
 init    SNMPAPI_DllMain
 
 @ stub SnmpSvcAddrIsIpx

dlls/sti/sti.spec

-name sti
-
 @ stub DllCanUnloadNow
 @ stub DllGetClassObject
 @ stub DllRegisterServer

dlls/tapi32/tapi32.spec

-name	tapi32
-
 @ stdcall lineAccept(long str long) lineAccept
 @ stdcall lineAddProvider(str long ptr) lineAddProvider
 @ stdcall lineAddToConference(long long) lineAddToConference

dlls/ttydrv/ttydrv.spec

-name	ttydrv
 init	TTYDRV_Init
 
 # GDI driver

dlls/twain/twain_32.spec

-name	twain_32
 init	TWAIN_LibMain
 
 @ stdcall DSM_Entry(ptr ptr long long long ptr) DSM_Entry

dlls/url/url.spec

-name url
-
 @ stub AddMIMEFileTypesPS
 @ stub AutodialHookCallback
 @ stub DllCanUnloadNow

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
-

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