mirror of
https://github.com/reactos/reactos.git
synced 2024-07-05 12:15:46 +00:00
win32 api compatibility fix
changed 'warnings' attribute of <module> to 'allowwarnings' to make it's function less ambiguous svn path=/trunk/; revision=17755
This commit is contained in:
parent
ffb05e59d0
commit
6b27e47c88
|
@ -1,4 +1,4 @@
|
|||
<module name="ftp" type="win32cui" installbase="system32" installname="ftp.exe" warnings="true">
|
||||
<module name="ftp" type="win32cui" installbase="system32" installname="ftp.exe" allowwarnings="true">
|
||||
<include base="ftp">.</include>
|
||||
<define name="__USE_W32API" />
|
||||
<define name="lint" />
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="ipconfig" type="win32cui" installbase="system32" installname="ipconfig.exe" warnings="true">
|
||||
<module name="ipconfig" type="win32cui" installbase="system32" installname="ipconfig.exe" allowwarnings="true">
|
||||
<include base="ipconfig">.</include>
|
||||
<define name="__USE_W32API" />
|
||||
<library>kernel32</library>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="netstat" type="win32cui" installbase="system32" installname="netstat.exe" warnings="true">
|
||||
<module name="netstat" type="win32cui" installbase="system32" installname="netstat.exe" allowwarnings="true">
|
||||
<include base="netstat">.</include>
|
||||
<define name="__USE_W32API" />
|
||||
<define name="_WIN32_IE">0x600</define>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="route" type="win32cui" installbase="system32" installname="route.exe" warnings="true">
|
||||
<module name="route" type="win32cui" installbase="system32" installname="route.exe" allowwarnings="true">
|
||||
<include base="route">.</include>
|
||||
<define name="__USE_W32API" />
|
||||
<library>kernel32</library>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="freeldr_base" type="objectlibrary" warnings="true">
|
||||
<module name="freeldr_base" type="objectlibrary" allowwarnings="true">
|
||||
<include base="freeldr_base">include</include>
|
||||
<include base="freeldr_base">cache</include>
|
||||
<include base="ntoskrnl">include</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="acpi" type="kernelmodedriver" installbase="system32/drivers" installname="acpi.sys" warnings="true">
|
||||
<module name="acpi" type="kernelmodedriver" installbase="system32/drivers" installname="acpi.sys" allowwarnings="true">
|
||||
<include base="acpi">include</include>
|
||||
<include base="acpi">ospm/include</include>
|
||||
<define name="__USE_W32API" />
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="pci" type="kernelmodedriver" installbase="system32/drivers" installname="pci.sys" warnings="true">
|
||||
<module name="pci" type="kernelmodedriver" installbase="system32/drivers" installname="pci.sys" allowwarnings="true">
|
||||
<include base="pci">.</include>
|
||||
<define name="__USE_W32API" />
|
||||
<library>ntoskrnl</library>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="sndblst" type="kernelmodedriver" warnings="true">
|
||||
<module name="sndblst" type="kernelmodedriver" allowwarnings="true">
|
||||
<include base="sndblst">.</include>
|
||||
<define name="__USE_W32API" />
|
||||
<library>ntoskrnl</library>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="ip" type="staticlibrary" warnings="true">
|
||||
<module name="ip" type="staticlibrary" allowwarnings="true">
|
||||
<define name="__NTDRIVER__"/>
|
||||
<define name="_SEH_NO_NATIVE_NLG"/>
|
||||
<define name="__USE_W32API"/>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="oskittcp" type="staticlibrary" warnings="true">
|
||||
<module name="oskittcp" type="staticlibrary" allowwarnings="true">
|
||||
<define name="__REACTOS__">1</define>
|
||||
<define name="__NTDRIVER__"/>
|
||||
<define name="KERNEL"/>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="disk" type="kernelmodedriver" installbase="system32/drivers" installname="disk.sys" warnings="true">
|
||||
<module name="disk" type="kernelmodedriver" installbase="system32/drivers" installname="disk.sys" allowwarnings="true">
|
||||
<bootstrap base="reactos" />
|
||||
<define name="__USE_W32API" />
|
||||
<linkerflag>-lgcc</linkerflag>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="usbstor" type="kernelmodedriver" installbase="system32/drivers" installname="usbstor.sys" warnings="true">
|
||||
<module name="usbstor" type="kernelmodedriver" installbase="system32/drivers" installname="usbstor.sys" allowwarnings="true">
|
||||
<define name="__USE_W32API" />
|
||||
<define name="DEBUG_MODE" />
|
||||
<include base="ntoskrnl">include</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="halxbox" type="kernelmodedll" warnings="true">
|
||||
<module name="halxbox" type="kernelmodedll" allowwarnings="true">
|
||||
<importlibrary definition="../../hal/hal.def" />
|
||||
<include base="hal_generic">../include</include>
|
||||
<include base="ntoskrnl">include</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="adns" type="staticlibrary" warnings="true">
|
||||
<module name="adns" type="staticlibrary" allowwarnings="true">
|
||||
<include base="adns">src</include>
|
||||
<include base="adns">adns_win32</include>
|
||||
<define name="__USE_W32API" />
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="cabinet" type="win32dll" baseaddress="${BASEADDRESS_CABINET}" installbase="system32" installname="cabinet.dll" warnings="true">
|
||||
<module name="cabinet" type="win32dll" baseaddress="${BASEADDRESS_CABINET}" installbase="system32" installname="cabinet.dll" allowwarnings="true">
|
||||
<importlibrary definition="cabinet.spec.def" />
|
||||
<include base="cabinet">.</include>
|
||||
<include base="ReactOS">include/wine</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" warnings="true">
|
||||
<module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" allowwarnings="true">
|
||||
<importlibrary definition="comctl32.spec.def" />
|
||||
<include base="comctl32">.</include>
|
||||
<include base="ReactOS">include/wine</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32" installname="comdlg32.dll" warnings="true" usewrc="false">
|
||||
<module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32" installname="comdlg32.dll" allowwarnings="true" usewrc="false">
|
||||
<importlibrary definition="comdlg32.spec.def" />
|
||||
<include base="comdlg32">.</include>
|
||||
<include base="ReactOS">include/wine</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="dbghelp" type="win32dll" baseaddress="${BASEADDRESS_DBGHELP}" installbase="system32" installname="dbghelp.dll" warnings="true">
|
||||
<module name="dbghelp" type="win32dll" baseaddress="${BASEADDRESS_DBGHELP}" installbase="system32" installname="dbghelp.dll" allowwarnings="true">
|
||||
<importlibrary definition="dbghelp.spec.def" />
|
||||
<include base="dbghelp">.</include>
|
||||
<include base="ReactOS">include/wine</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="devenum" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}" installbase="system32" installname="devenum.dll" warnings="true">
|
||||
<module name="devenum" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}" installbase="system32" installname="devenum.dll" allowwarnings="true">
|
||||
<importlibrary definition="devenum.spec.def" />
|
||||
<include base="devenum">.</include>
|
||||
<include base="ReactOS">include/wine</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="dinput" type="win32dll" baseaddress="${BASEADDRESS_DINPUT}" installbase="system32" installname="dinput.dll" warnings="true">
|
||||
<module name="dinput" type="win32dll" baseaddress="${BASEADDRESS_DINPUT}" installbase="system32" installname="dinput.dll" allowwarnings="true">
|
||||
<importlibrary definition="dinput.spec.def" />
|
||||
<include base="dinput">.</include>
|
||||
<include base="ReactOS">include/wine</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="dxdiagn" type="win32dll" baseaddress="${BASEADDRESS_DXDIAGN}" installbase="system32" installname="dxdiagn.dll" warnings="true">
|
||||
<module name="dxdiagn" type="win32dll" baseaddress="${BASEADDRESS_DXDIAGN}" installbase="system32" installname="dxdiagn.dll" allowwarnings="true">
|
||||
<importlibrary definition="dxdiagn.spec.def" />
|
||||
<include base="dxdiagn">.</include>
|
||||
<include base="ReactOS">include/wine</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="freetype" type="kernelmodedll" baseaddress="${BASEADDRESS_FREETYPE}" installbase="system32" installname="freetype.dll" entrypoint="0" warnings="true">
|
||||
<module name="freetype" type="kernelmodedll" baseaddress="${BASEADDRESS_FREETYPE}" installbase="system32" installname="freetype.dll" entrypoint="0" allowwarnings="true">
|
||||
<importlibrary definition="freetype.def" />
|
||||
<include base="freetype">include</include>
|
||||
<define name="_DISABLE_TIDENTS" />
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="glu32" type="win32dll" baseaddress="${BASEADDRESS_GLU32}" installbase="system32" installname="glu32.dll" warnings="true">
|
||||
<module name="glu32" type="win32dll" baseaddress="${BASEADDRESS_GLU32}" installbase="system32" installname="glu32.dll" allowwarnings="true">
|
||||
<importlibrary definition="glu32.def" />
|
||||
<include base="glu32">include</include>
|
||||
<include base="glu32">libnurbs/internals</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="imagehlp" type="win32dll" baseaddress="${BASEADDRESS_IMAGEHLP}" installbase="system32" installname="imagehlp.dll" warnings="true">
|
||||
<module name="imagehlp" type="win32dll" baseaddress="${BASEADDRESS_IMAGEHLP}" installbase="system32" installname="imagehlp.dll" allowwarnings="true">
|
||||
<importlibrary definition="imagehlp.def" />
|
||||
<include base="imagehlp">.</include>
|
||||
<include base="ReactOS">include/wine</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="iphlpapi" type="win32dll" baseaddress="${BASEADDRESS_IPHLPAPI}" installbase="system32" installname="iphlpapi.dll" warnings="true">
|
||||
<module name="iphlpapi" type="win32dll" baseaddress="${BASEADDRESS_IPHLPAPI}" installbase="system32" installname="iphlpapi.dll" allowwarnings="true">
|
||||
<importlibrary definition="iphlpapi.spec.def" />
|
||||
<include base="iphlpapi">include</include>
|
||||
<include base="ReactOS">include/wine</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="kbdbe" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdbe.dll" warnings="true">
|
||||
<module name="kbdbe" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdbe.dll" allowwarnings="true">
|
||||
<importlibrary definition="kbdbe.def" />
|
||||
<include base="ntoskrnl">include</include>
|
||||
<define name="_DISABLE_TIDENTS" />
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="kbdda" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdda.dll" warnings="true">
|
||||
<module name="kbdda" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdda.dll" allowwarnings="true">
|
||||
<importlibrary definition="kbdda.def" />
|
||||
<include base="ntoskrnl">include</include>
|
||||
<define name="_DISABLE_TIDENTS" />
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="kbddv" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbddv.dll" warnings="true">
|
||||
<module name="kbddv" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbddv.dll" allowwarnings="true">
|
||||
<importlibrary definition="kbddv.def" />
|
||||
<include base="ntoskrnl">include</include>
|
||||
<define name="_DISABLE_TIDENTS" />
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="kbdes" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdes.dll" warnings="true">
|
||||
<module name="kbdes" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdes.dll" allowwarnings="true">
|
||||
<importlibrary definition="kbdes.def" />
|
||||
<include base="ntoskrnl">include</include>
|
||||
<define name="_DISABLE_TIDENTS" />
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="kbdfr" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdfr.dll" warnings="true">
|
||||
<module name="kbdfr" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdfr.dll" allowwarnings="true">
|
||||
<importlibrary definition="kbdfr.def" />
|
||||
<include base="ntoskrnl">include</include>
|
||||
<define name="_DISABLE_TIDENTS" />
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="kbdgr" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdgr.dll" warnings="true">
|
||||
<module name="kbdgr" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdgr.dll" allowwarnings="true">
|
||||
<importlibrary definition="kbdgr.def" />
|
||||
<include base="ntoskrnl">include</include>
|
||||
<define name="_DISABLE_TIDENTS" />
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="kbdru" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdru.dll" warnings="true">
|
||||
<module name="kbdru" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdru.dll" allowwarnings="true">
|
||||
<importlibrary definition="kbdru.def" />
|
||||
<include base="ntoskrnl">include</include>
|
||||
<define name="_DISABLE_TIDENTS" />
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="kbdse" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdse.dll" warnings="true">
|
||||
<module name="kbdse" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdse.dll" allowwarnings="true">
|
||||
<importlibrary definition="kbdse.def" />
|
||||
<include base="ntoskrnl">include</include>
|
||||
<define name="_DISABLE_TIDENTS" />
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="kbdsg" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdsg.dll" warnings="true">
|
||||
<module name="kbdsg" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdsg.dll" allowwarnings="true">
|
||||
<importlibrary definition="kbdsg.def" />
|
||||
<include base="ntoskrnl">include</include>
|
||||
<define name="_DISABLE_TIDENTS" />
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="kbduk" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbduk.dll" warnings="true">
|
||||
<module name="kbduk" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbduk.dll" allowwarnings="true">
|
||||
<importlibrary definition="kbduk.def" />
|
||||
<include base="ntoskrnl">include</include>
|
||||
<define name="_DISABLE_TIDENTS" />
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="kbdus" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdus.dll" warnings="true">
|
||||
<module name="kbdus" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdus.dll" allowwarnings="true">
|
||||
<importlibrary definition="kbdus.def" />
|
||||
<include base="ntoskrnl">include</include>
|
||||
<define name="_DISABLE_TIDENTS" />
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="mesa32" type="win32dll" baseaddress="${BASEADDRESS_MESA32}" installbase="system32" installname="mesa32.dll" warnings="true">
|
||||
<module name="mesa32" type="win32dll" baseaddress="${BASEADDRESS_MESA32}" installbase="system32" installname="mesa32.dll" allowwarnings="true">
|
||||
<importlibrary definition="mesa32.def" />
|
||||
<linkerflag>-Wl,--enable-stdcall-fixup</linkerflag>
|
||||
<include base="mesa32">include</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="mpr" type="win32dll" baseaddress="${BASEADDRESS_MPR}" installbase="system32" installname="mpr.dll" warnings="true">
|
||||
<module name="mpr" type="win32dll" baseaddress="${BASEADDRESS_MPR}" installbase="system32" installname="mpr.dll" allowwarnings="true">
|
||||
<importlibrary definition="mpr.spec.def" />
|
||||
<include base="mpr">.</include>
|
||||
<include base="ReactOS">include/wine</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="msi" type="win32dll" baseaddress="${BASEADDRESS_MSI}" installbase="system32" installname="msi.dll" warnings="true">
|
||||
<module name="msi" type="win32dll" baseaddress="${BASEADDRESS_MSI}" installbase="system32" installname="msi.dll" allowwarnings="true">
|
||||
<importlibrary definition="msi.spec.def" />
|
||||
<include base="msi">.</include>
|
||||
<include base="ReactOS">include/wine</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="msimg32" type="win32dll" baseaddress="${BASEADDRESS_MSIMG32}" installbase="system32" installname="msimg32.dll" warnings="true">
|
||||
<module name="msimg32" type="win32dll" baseaddress="${BASEADDRESS_MSIMG32}" installbase="system32" installname="msimg32.dll" allowwarnings="true">
|
||||
<importlibrary definition="msimg32.spec.def" />
|
||||
<include base="msimg32">.</include>
|
||||
<include base="msimg32">include</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="netapi32" type="win32dll" baseaddress="${BASEADDRESS_NETAPI32}" installbase="system32" installname="netapi32.dll" warnings="true">
|
||||
<module name="netapi32" type="win32dll" baseaddress="${BASEADDRESS_NETAPI32}" installbase="system32" installname="netapi32.dll" allowwarnings="true">
|
||||
<importlibrary definition="netapi32.spec.def" />
|
||||
<include base="netapi32">.</include>
|
||||
<include base="ReactOS">include/wine</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="ole32" type="win32dll" baseaddress="${BASEADDRESS_OLE32}" installbase="system32" installname="ole32.dll" warnings="true">
|
||||
<module name="ole32" type="win32dll" baseaddress="${BASEADDRESS_OLE32}" installbase="system32" installname="ole32.dll" allowwarnings="true">
|
||||
<importlibrary definition="ole32.spec.def" />
|
||||
<include base="ole32">.</include>
|
||||
<include base="ReactOS">include/wine</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="oleaut32" type="win32dll" baseaddress="${BASEADDRESS_OLEAUT32}" installbase="system32" installname="oleaut32.dll" warnings="true">
|
||||
<module name="oleaut32" type="win32dll" baseaddress="${BASEADDRESS_OLEAUT32}" installbase="system32" installname="oleaut32.dll" allowwarnings="true">
|
||||
<importlibrary definition="oleaut32.spec.def" />
|
||||
<include base="oleaut32">.</include>
|
||||
<include base="ReactOS">include/wine</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="oledlg" type="win32dll" baseaddress="${BASEADDRESS_OLEDLG}" installbase="system32" installname="oledlg.dll" warnings="true">
|
||||
<module name="oledlg" type="win32dll" baseaddress="${BASEADDRESS_OLEDLG}" installbase="system32" installname="oledlg.dll" allowwarnings="true">
|
||||
<importlibrary definition="oledlg.spec.def" />
|
||||
<include base="oledlg">.</include>
|
||||
<include base="ReactOS">include/wine</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="riched20" type="win32dll" baseaddress="${BASEADDRESS_RICHED20}" installbase="system32" installname="riched20.dll" warnings="true">
|
||||
<module name="riched20" type="win32dll" baseaddress="${BASEADDRESS_RICHED20}" installbase="system32" installname="riched20.dll" allowwarnings="true">
|
||||
<importlibrary definition="riched20.spec.def" />
|
||||
<include base="riched20">.</include>
|
||||
<include base="ReactOS">include/wine</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="rpcrt4" type="win32dll" baseaddress="${BASEADDRESS_RPCRT4}" installbase="system32" installname="rpcrt4.dll" warnings="true">
|
||||
<module name="rpcrt4" type="win32dll" baseaddress="${BASEADDRESS_RPCRT4}" installbase="system32" installname="rpcrt4.dll" allowwarnings="true">
|
||||
<importlibrary definition="rpcrt4.spec.def" />
|
||||
<include base="rpcrt4">.</include>
|
||||
<include base="ReactOS">include/wine</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="setupapi" type="win32dll" baseaddress="${BASEADDRESS_SETUPAPI}" installbase="system32" installname="setupapi.dll" warnings="true">
|
||||
<module name="setupapi" type="win32dll" baseaddress="${BASEADDRESS_SETUPAPI}" installbase="system32" installname="setupapi.dll" allowwarnings="true">
|
||||
<importlibrary definition="setupapi.spec.def" />
|
||||
<include base="setupapi">.</include>
|
||||
<include base="ReactOS">include/wine</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="shdocvw" type="win32dll" baseaddress="${BASEADDRESS_SHDOCVW}" installbase="system32" installname="shdocvw.dll" usewrc="false" warnings="true">
|
||||
<module name="shdocvw" type="win32dll" baseaddress="${BASEADDRESS_SHDOCVW}" installbase="system32" installname="shdocvw.dll" usewrc="false" allowwarnings="true">
|
||||
<importlibrary definition="shdocvw.spec.def" />
|
||||
<include base="shdocvw">.</include>
|
||||
<include base="ReactOS">include/wine</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="shell32" type="win32dll" baseaddress="${BASEADDRESS_SHELL32}" installbase="system32" installname="shell32.dll" warnings="true">
|
||||
<module name="shell32" type="win32dll" baseaddress="${BASEADDRESS_SHELL32}" installbase="system32" installname="shell32.dll" allowwarnings="true">
|
||||
<importlibrary definition="shell32.spec.def" />
|
||||
<include base="shell32">.</include>
|
||||
<include base="ReactOS">include/wine</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="shlwapi" type="win32dll" baseaddress="${BASEADDRESS_SHLWAPI}" installbase="system32" installname="shlwapi.dll" warnings="true">
|
||||
<module name="shlwapi" type="win32dll" baseaddress="${BASEADDRESS_SHLWAPI}" installbase="system32" installname="shlwapi.dll" allowwarnings="true">
|
||||
<importlibrary definition="shlwapi.spec.def" />
|
||||
<include base="shlwapi">.</include>
|
||||
<include base="ReactOS">include/wine</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="twain_32" type="win32dll" baseaddress="${BASEADDRESS_TWAIN_32}" installbase="system32" installname="twain_32.dll" warnings="true">
|
||||
<module name="twain_32" type="win32dll" baseaddress="${BASEADDRESS_TWAIN_32}" installbase="system32" installname="twain_32.dll" allowwarnings="true">
|
||||
<importlibrary definition="twain_32.def" />
|
||||
<include base="twain_32">.</include>
|
||||
<define name="__USE_W32API" />
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="urlmon" type="win32dll" baseaddress="${BASEADDRESS_URLMON}" installbase="system32" installname="urlmon.dll" warnings="true">
|
||||
<module name="urlmon" type="win32dll" baseaddress="${BASEADDRESS_URLMON}" installbase="system32" installname="urlmon.dll" allowwarnings="true">
|
||||
<importlibrary definition="urlmon.spec.def" />
|
||||
<include base="urlmon">.</include>
|
||||
<include base="ReactOS">include/wine</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="user32" type="win32dll" baseaddress="${BASEADDRESS_USER32}" installbase="system32" installname="user32.dll" warnings="true">
|
||||
<module name="user32" type="win32dll" baseaddress="${BASEADDRESS_USER32}" installbase="system32" installname="user32.dll" allowwarnings="true">
|
||||
<importlibrary definition="user32.def" />
|
||||
<include base="user32">.</include>
|
||||
<include base="user32">include</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="uxtheme" type="win32dll" baseaddress="${BASEADDRESS_UXTHEME}" installbase="system32" installname="uxtheme.dll" warnings="true">
|
||||
<module name="uxtheme" type="win32dll" baseaddress="${BASEADDRESS_UXTHEME}" installbase="system32" installname="uxtheme.dll" allowwarnings="true">
|
||||
<importlibrary definition="uxtheme.spec.def" />
|
||||
<include base="uxtheme">.</include>
|
||||
<include base="ReactOS">include/wine</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="version" type="win32dll" baseaddress="${BASEADDRESS_VERSION}" installbase="system32" installname="version.dll" warnings="true">
|
||||
<module name="version" type="win32dll" baseaddress="${BASEADDRESS_VERSION}" installbase="system32" installname="version.dll" allowwarnings="true">
|
||||
<importlibrary definition="version.def" />
|
||||
<include base="ReactOS">include/wine</include>
|
||||
<define name="_DISABLE_TIDENTS" />
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="wininet" type="win32dll" baseaddress="${BASEADDRESS_WININET}" installbase="system32" installname="wininet.dll" warnings="true">
|
||||
<module name="wininet" type="win32dll" baseaddress="${BASEADDRESS_WININET}" installbase="system32" installname="wininet.dll" allowwarnings="true">
|
||||
<importlibrary definition="wininet.spec.def" />
|
||||
<include base="wininet">.</include>
|
||||
<include base="ReactOS">include/wine</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="midimap" type="win32dll" baseaddress="${BASEADDRESS_MIDIMAP}" installbase="system32" installname="midimap.dll" warnings="true">
|
||||
<module name="midimap" type="win32dll" baseaddress="${BASEADDRESS_MIDIMAP}" installbase="system32" installname="midimap.dll" allowwarnings="true">
|
||||
<importlibrary definition="midimap.spec.def" />
|
||||
<include base="midimap">.</include>
|
||||
<include base="ReactOS">include/wine</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="wavemap" type="win32dll" baseaddress="${BASEADDRESS_WAVEMAP}" installbase="system32" installname="wavemap.dll" warnings="true">
|
||||
<module name="wavemap" type="win32dll" baseaddress="${BASEADDRESS_WAVEMAP}" installbase="system32" installname="wavemap.dll" allowwarnings="true">
|
||||
<importlibrary definition="msacm.spec.def" />
|
||||
<include base="wavemap">.</include>
|
||||
<include base="ReactOS">include/wine</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="winmm" type="win32dll" baseaddress="${BASEADDRESS_WINMM}" installbase="system32" installname="winmm.dll" warnings="true">
|
||||
<module name="winmm" type="win32dll" baseaddress="${BASEADDRESS_WINMM}" installbase="system32" installname="winmm.dll" allowwarnings="true">
|
||||
<importlibrary definition="winmm.spec.def" />
|
||||
<include base="winmm">.</include>
|
||||
<include base="ReactOS">include/wine</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="advapi32_winetest" type="win32cui" installbase="bin" installname="advapi32_winetest.exe" warnings="true">
|
||||
<module name="advapi32_winetest" type="win32cui" installbase="bin" installname="advapi32_winetest.exe" allowwarnings="true">
|
||||
<include base="advapi32_winetest">.</include>
|
||||
<define name="__USE_W32API" />
|
||||
<library>advapi32</library>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="comctl32_winetest" type="win32cui" installbase="bin" installname="comctl32_winetest.exe" warnings="true">
|
||||
<module name="comctl32_winetest" type="win32cui" installbase="bin" installname="comctl32_winetest.exe" allowwarnings="true">
|
||||
<include base="comctl32_winetest">.</include>
|
||||
<define name="__USE_W32API" />
|
||||
<library>shlwapi</library>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="gdi32_winetest" type="win32cui" installbase="bin" installname="gdi32_winetest.exe" warnings="true">
|
||||
<module name="gdi32_winetest" type="win32cui" installbase="bin" installname="gdi32_winetest.exe" allowwarnings="true">
|
||||
<include base="gdi32_winetest">.</include>
|
||||
<define name="__USE_W32API" />
|
||||
<library>ntdll</library>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="kernel32_winetest" type="win32cui" installbase="bin" installname="kernel32_winetest.exe" warnings="true">
|
||||
<module name="kernel32_winetest" type="win32cui" installbase="bin" installname="kernel32_winetest.exe" allowwarnings="true">
|
||||
<include base="kernel32_winetest">.</include>
|
||||
<define name="__USE_W32API" />
|
||||
<library>ntdll</library>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="msvcrt_winetest" type="win32cui" installbase="bin" installname="msvcrt_winetest.exe" warnings="true">
|
||||
<module name="msvcrt_winetest" type="win32cui" installbase="bin" installname="msvcrt_winetest.exe" allowwarnings="true">
|
||||
<include base="msvcrt_winetest">.</include>
|
||||
<define name="__USE_W32API" />
|
||||
<library>ntdll</library>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="ntdll_winetest" type="win32cui" installbase="bin" installname="ntdll_winetest.exe" warnings="true">
|
||||
<module name="ntdll_winetest" type="win32cui" installbase="bin" installname="ntdll_winetest.exe" allowwarnings="true">
|
||||
<include base="ntdll_winetest">.</include>
|
||||
<define name="__USE_W32API" />
|
||||
<library>ntdll</library>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="psapi_winetest" type="win32cui" installbase="bin" installname="psapi_winetest.exe" warnings="true">
|
||||
<module name="psapi_winetest" type="win32cui" installbase="bin" installname="psapi_winetest.exe" allowwarnings="true">
|
||||
<include base="psapi_winetest">.</include>
|
||||
<define name="__USE_W32API" />
|
||||
<library>ntdll</library>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="setupapi_winetest" type="win32cui" installbase="bin" installname="setupapi_winetest.exe" warnings="true">
|
||||
<module name="setupapi_winetest" type="win32cui" installbase="bin" installname="setupapi_winetest.exe" allowwarnings="true">
|
||||
<include base="setupapi_winetest">.</include>
|
||||
<define name="__USE_W32API" />
|
||||
<library>ntdll</library>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="shell32_winetest" type="win32cui" installbase="bin" installname="shell32_winetest.exe" warnings="true">
|
||||
<module name="shell32_winetest" type="win32cui" installbase="bin" installname="shell32_winetest.exe" allowwarnings="true">
|
||||
<include base="shell32_winetest">.</include>
|
||||
<define name="__USE_W32API" />
|
||||
<library>ntdll</library>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="shlwapi_winetest" type="win32cui" installbase="bin" installname="shlwapi_winetest.exe" warnings="true">
|
||||
<module name="shlwapi_winetest" type="win32cui" installbase="bin" installname="shlwapi_winetest.exe" allowwarnings="true">
|
||||
<include base="shlwapi_winetest">.</include>
|
||||
<define name="__USE_W32API" />
|
||||
<library>ntdll</library>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="user32_winetest" type="win32cui" installbase="bin" installname="user32_winetest.exe" warnings="true">
|
||||
<module name="user32_winetest" type="win32cui" installbase="bin" installname="user32_winetest.exe" allowwarnings="true">
|
||||
<include base="user32_winetest">.</include>
|
||||
<define name="__USE_W32API" />
|
||||
<library>ntdll</library>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="version_winetest" type="win32cui" installbase="bin" installname="version_winetest.exe" warnings="true">
|
||||
<module name="version_winetest" type="win32cui" installbase="bin" installname="version_winetest.exe" allowwarnings="true">
|
||||
<include base="version_winetest">.</include>
|
||||
<define name="__USE_W32API" />
|
||||
<library>ntdll</library>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="dhcp" type="win32gui" installbase="system32" installname="dhcp.exe" warnings="true">
|
||||
<module name="dhcp" type="win32gui" installbase="system32" installname="dhcp.exe" allowwarnings="true">
|
||||
<include base="dhcp">.</include>
|
||||
<include base="dhcp">include</include>
|
||||
<define name="__USE_W32API" />
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="format" type="win32cui" installbase="system32" installname="format.exe" warnings="true">
|
||||
<module name="format" type="win32cui" installbase="system32" installname="format.exe" allowwarnings="true">
|
||||
<include base="format">.</include>
|
||||
<define name="__USE_W32API" />
|
||||
<library>ntdll</library>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="hostname" type="win32cui" installbase="system32" installname="hostname.exe" warnings="true">
|
||||
<module name="hostname" type="win32cui" installbase="system32" installname="hostname.exe" allowwarnings="true">
|
||||
<define name="__USE_W32API" />
|
||||
<library>kernel32</library>
|
||||
<file>hostname.c</file>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="msiexec" type="win32gui" installbase="system32" installname="msiexec.exe" warnings="true">
|
||||
<module name="msiexec" type="win32gui" installbase="system32" installname="msiexec.exe" allowwarnings="true">
|
||||
<include base="msiexec">.</include>
|
||||
<include base="ReactOS">include/wine</include>
|
||||
<define name="__REACTOS__" />
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="usetup" type="nativecui" installbase="system32" installname="usetup.exe" warnings="true">
|
||||
<module name="usetup" type="nativecui" installbase="system32" installname="usetup.exe" allowwarnings="true">
|
||||
<bootstrap base="reactos/system32" nameoncd="smss.exe" />
|
||||
<include base="usetup">.</include>
|
||||
<include base="zlib">.</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="winefile" type="win32gui" installbase="system32" installname="winefile.exe" warnings="true">
|
||||
<module name="winefile" type="win32gui" installbase="system32" installname="winefile.exe" allowwarnings="true">
|
||||
<include base="winefile">.</include>
|
||||
<define name="UNICODE" />
|
||||
<define name="__USE_W32API" />
|
||||
|
|
|
@ -131,7 +131,7 @@
|
|||
<file>xpstubs.c</file>
|
||||
</directory>
|
||||
</module>
|
||||
<module name="win32k" type="kernelmodedriver" installbase="system32" installname="win32k.sys" warnings="true">
|
||||
<module name="win32k" type="kernelmodedriver" installbase="system32" installname="win32k.sys" allowwarnings="true">
|
||||
<importlibrary definition="win32k.def" />
|
||||
<library>win32k_base</library>
|
||||
<library>pseh</library>
|
||||
|
|
|
@ -19,7 +19,10 @@
|
|||
|
||||
#include "mingw.h"
|
||||
#include <assert.h>
|
||||
#ifndef _MSC_VER
|
||||
#ifdef _MSC_VER
|
||||
#define popen _popen
|
||||
#define pclose _pclose
|
||||
#else
|
||||
#include <dirent.h>
|
||||
#endif//_MSC_VER
|
||||
#include "modulehandler.h"
|
||||
|
|
|
@ -1750,7 +1750,7 @@ MingwModuleHandler::GenerateOtherMacros ()
|
|||
string globalCflags = "-g";
|
||||
if ( backend->usePipe )
|
||||
globalCflags += " -pipe";
|
||||
if ( !module.enableWarnings )
|
||||
if ( !module.allowWarnings )
|
||||
globalCflags += " -Werror";
|
||||
|
||||
fprintf (
|
||||
|
|
|
@ -1003,7 +1003,7 @@
|
|||
<section>
|
||||
<title>Syntax</title>
|
||||
|
||||
<para><programlisting><module if="${MP}" ifnot="${MP}" name="msvcrt" type="win32dll" extension=".dll" entrypoint="_DllMain@12" baseaddress="0x70000000" mangledsymbols="true" installbase="system32" installname="msvcrt.dll" usewrc="false" warnings="true" aliasof="module1">
|
||||
<para><programlisting><module if="${MP}" ifnot="${MP}" name="msvcrt" type="win32dll" extension=".dll" entrypoint="_DllMain@12" baseaddress="0x70000000" mangledsymbols="true" installbase="system32" installname="msvcrt.dll" usewrc="false" allowwarnings="true" aliasof="module1">
|
||||
...
|
||||
</module></programlisting></para>
|
||||
</section>
|
||||
|
@ -1420,7 +1420,7 @@
|
|||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term>warnings</term>
|
||||
<term>allowwarnings</term>
|
||||
|
||||
<listitem>
|
||||
<para>Error out if false and at least one warning is emitted
|
||||
|
|
|
@ -107,7 +107,7 @@ Module element
|
|||
There can be zero or more modules per xml build file.
|
||||
|
||||
Syntax:
|
||||
<module if="${MP}" ifnot="${MP}" name="msvcrt" type="win32dll" extension=".dll" entrypoint="_DllMain@12" baseaddress="0x70000000" mangledsymbols="true" installbase="system32" installname="msvcrt.dll" usewrc="false" warnings="true" aliasof="module1">
|
||||
<module if="${MP}" ifnot="${MP}" name="msvcrt" type="win32dll" extension=".dll" entrypoint="_DllMain@12" baseaddress="0x70000000" mangledsymbols="true" installbase="system32" installname="msvcrt.dll" usewrc="false" allowwarnings="true" aliasof="module1">
|
||||
...
|
||||
</module>
|
||||
|
||||
|
@ -123,7 +123,7 @@ Attributes:
|
|||
installbase - Base directory of the generated file in the installation directory. This attribute is optional.
|
||||
installname - Name of generated file in the installation directory. This attribute is optional, but if not specified, the generated file is not copied to the installation directory.
|
||||
usewrc - Use WRC to compile resources if true. If false, windres is used. This attribute is optional. If not specified, WRC will be used.
|
||||
warnings - Error out if false and at least one warning is emitted during building of this module. This attribute is optional. If not specified, it is assumed to be false.
|
||||
allowwarnings - Error out if false and at least one warning is emitted during building of this module. This attribute is optional. If not specified, it is assumed to be false.
|
||||
aliasof - Name of module that is aliased.
|
||||
Value:
|
||||
None.
|
||||
|
|
|
@ -318,11 +318,20 @@ Module::Module ( const Project& project,
|
|||
else
|
||||
useWRC = true;
|
||||
|
||||
att = moduleNode.GetAttribute ( "warnings", false );
|
||||
att = moduleNode.GetAttribute ( "allowwarnings", false );
|
||||
if ( att == NULL )
|
||||
{
|
||||
att = moduleNode.GetAttribute ( "warnings", false );
|
||||
if ( att != NULL )
|
||||
{
|
||||
printf ( "%s: WARNING: 'warnings' attribute of <module> is deprecated, use 'allowwarnings' instead\n",
|
||||
moduleNode.location.c_str() );
|
||||
}
|
||||
}
|
||||
if ( att != NULL )
|
||||
enableWarnings = att->value == "true";
|
||||
allowWarnings = att->value == "true";
|
||||
else
|
||||
enableWarnings = false;
|
||||
allowWarnings = false;
|
||||
|
||||
att = moduleNode.GetAttribute ( "aliasof", false );
|
||||
if ( type == Alias && att != NULL )
|
||||
|
|
|
@ -80,7 +80,7 @@
|
|||
installbase %Text; #IMPLIED
|
||||
installname %Text; #IMPLIED
|
||||
usewrc %Text; #IMPLIED
|
||||
warnings %Text; #IMPLIED
|
||||
allowwarnings (true|false) "false"
|
||||
aliasof %Text; #IMPLIED
|
||||
>
|
||||
|
||||
|
|
|
@ -233,7 +233,7 @@ public:
|
|||
std::string installName;
|
||||
std::string aliasedModuleName;
|
||||
bool useWRC;
|
||||
bool enableWarnings;
|
||||
bool allowWarnings;
|
||||
bool enabled;
|
||||
|
||||
Module ( const Project& project,
|
||||
|
|
Loading…
Reference in a new issue