DWORD dwUptime = SnmpSvcGetUptime();
- _tprintf(_T("SNMP uptime: %d\n"), dwUptime);
+ _tprintf(_T("SNMP uptime: %ld\n"), dwUptime);
SnmpUtilMemFree(pCache);
} else {
* Had to remove local handling. Otherwise, same as whois.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1989, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static char sccsid[] = "@(#)finger.c 8.5 (Berkeley) 5/4/95";
-#endif /* not lint */
-
/*
* Finger prints out information about users. It is not portable since
* certain fields (e.g. the full user name, office, and phone numbers) are
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)net.c 8.4 (Berkeley) 4/28/95";
-#endif /* not lint */
-
#include <sys/types.h>
#include <winsock2.h>
#include "unistd.h"
if (!(host = rindex(name, '@')))
return;
- *host++ = NULL;
+ *host++ = 0;
if (isdigit(*host) && (defaddr.s_addr = inet_addr(host)) != -1) {
def.h_name = host;
def.h_addr_list = alist;
-<module name="ftp" type="win32cui" installbase="system32" installname="ftp.exe">\r
+<module name="ftp" type="win32cui" installbase="system32" installname="ftp.exe" warnings="true">\r
<include base="ftp">.</include>\r
<define name="__USE_W32API" />\r
<library>kernel32</library>\r
-<module name="ipconfig" type="win32cui" installbase="system32" installname="ipconfig.exe">\r
+<module name="ipconfig" type="win32cui" installbase="system32" installname="ipconfig.exe" warnings="true">\r
<include base="ipconfig">.</include>\r
<define name="__USE_W32API" />\r
<library>kernel32</library>\r
-<module name="netstat" type="win32cui" installbase="system32" installname="netstat.exe">\r
+<module name="netstat" type="win32cui" installbase="system32" installname="netstat.exe" warnings="true">\r
<include base="netstat">.</include>\r
<define name="__USE_W32API" />\r
<define name="_WIN32_IE">0x600</define>\r
UINT i;
PCHAR p;
- printf("Buffer (0x%X) Size (0x%X).\n", Buffer, Size);
+ printf("Buffer (0x%p) Size (0x%lX).\n", Buffer, Size);
p = (PCHAR)Buffer;
for (i = 0; i < Size; i++) {
VOID TimeToMsString(LPSTR String, LARGE_INTEGER Time)
{
- UINT i, Length;
CHAR Convstr[40];
LARGE_INTEGER LargeTime;
PMIB_IPFORWARDTABLE IpForwardTable;
DWORD Error;
ULONG Size = 0;
- char Destination[IPBUF], Gateway[IPBUF], Netmask[IPBUF],
- Index[IPBUF], Metric[IPBUF];
+ char Destination[IPBUF], Gateway[IPBUF], Netmask[IPBUF];
int i;
if( (Error = GetIpForwardTable( NULL, &Size, TRUE )) ==
inet_ntoa( IN_ADDR_OF(IpForwardTable->table[i].
dwForwardNextHop) ) );
- printf( "%-16s%-16s%-16s%-10d%-10d\n",
+ printf( "%-16s%-16s%-16s%-10ld%-10ld\n",
Destination,
Netmask,
Gateway,
* more convenient fdopen()/fprintf() to send()/recv().
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static char sccsid[] = "@(#)whois.c 8.1 (Berkeley) 6/6/93";
-#endif /* not lint */
-
#include <sys/types.h>
#include <winsock2.h>
/* #include <sys/socket.h> */
/* #include <netinet/in.h> */
/* #include <netdb.h> */
#include <stdio.h>
+#include <stdlib.h>
/* #include <various.h> */
#include <getopt.h>
putchar(ch);
leave(0);
+ return 0;
}
void usage()
<property name="BASEADDRESS_SECUR32" value="0x6b3A0000" />\r
<property name="BASEADDRESS_SMDLL" value="0x6b3B0000" />\r
<property name="BASEADDRESS_URLMON" value="0x6b3C0000" />\r
+<property name="BASEADDRESS_SERIALUI" value="0x6b3D0000" />\r
<property name="BASEADDRESS_CARDS" value="0x701a0000" />\r
<property name="BASEADDRESS_WININET" value="0x70200000" />\r
<property name="BASEADDRESS_ACLUI" value="0x71550000" />\r
<property name="BASEADDRESS_MMDRV" value="0x77500000" />\r
<property name="BASEADDRESS_CRTDLL" value="0x77630000" />\r
<property name="BASEADDRESS_MSAFD" value="0x777a0000" />\r
+<property name="BASEADDRESS_MSI" value="0x777b0000" />\r
<property name="BASEADDRESS_SNMPAPI" value="0x777c0000" />\r
<property name="BASEADDRESS_WINMM" value="0x777d0000" />\r
<property name="BASEADDRESS_WS2HELP" value="0x777e0000" />\r
-<module name="freeldr_base" type="objectlibrary">\r
+<module name="freeldr_base" type="objectlibrary" warnings="true">\r
<include base="freeldr_base">include</include>\r
<include base="freeldr_base">cache</include>\r
<include base="ntoskrnl">include</include>\r
-<module name="acpi" type="kernelmodedriver" installbase="system32/drivers" installname="acpi.sys">\r
+<module name="acpi" type="kernelmodedriver" installbase="system32/drivers" installname="acpi.sys" warnings="true">\r
<include base="acpi">include</include>\r
<include base="acpi">ospm/include</include>\r
<library>ntoskrnl</library>\r
<directory name="pci">\r
<xi:include href="pci/pci.xml" />\r
</directory>\r
+<directory name="serenum">\r
+ <xi:include href="serenum/serenum.xml" />\r
+</directory>\r
--- /dev/null
+<module name="serenum" type="kernelmodedriver" installbase="system32/drivers" installname="serenum.sys">
+ <include base="serenum">.</include>
+ <define name="__USE_W32API" />
+ <library>ntoskrnl</library>
+ <library>hal</library>
+ <file>detect.c</file>
+ <file>fdo.c</file>
+ <file>misc.c</file>
+ <file>pdo.c</file>
+ <file>serenum.c</file>
+ <file>serenum.rc</file>
+</module>
VOID BeginPlayback(UINT BasePort, UINT BitDepth, UINT Channels, UINT BlockSize)
{
- CHAR Command;
-
DPRINT("BeginPlayback(%d, %d, %d, %d)\n", BasePort, BitDepth, Channels, BlockSize);
// switch(BitDepth)
{
DEVICE_DESCRIPTION Desc;
ULONG MappedRegs = 0;
- NTSTATUS Status;
PDEVICE_EXTENSION Device = DeviceObject->DeviceExtension;
KEVENT DMAEvent;
KIRQL OldIrql;
for (i = 0; ValidIRQs[i] != 0xffff; i ++)
{
- UCHAR ThisIRQ = ValidIRQs[i];
- UCHAR bConfig = (UCHAR)(0x40 |
- (ThisIRQ == 7 ? 0x08 :
- ThisIRQ == 9 ? 0x10 :
- ThisIRQ == 10 ? 0x18 :
- ThisIRQ == 11 ? 0x20 :
- 0));
-
// Consult the card
// OUTPORT(pHw, BOARD_CONFIG, bConfig);
// else
// Compaq stuff?
{
- UCHAR CompaqPIDR;
UCHAR Expected;
switch (Parameters->IRQ)
IN PKINTERRUPT pInterrupt,
IN PVOID Context)
{
- PDEVICE_OBJECT DeviceObject = (PDEVICE_OBJECT)Context;
- PDEVICE_EXTENSION Parameters = DeviceObject->DeviceExtension;
-
DPRINT("*** Processing ISR ***\n");
// What do we do here then?
{
// Check to make sure the reset was acknowledged:
for (TimeOut = SB_TIMEOUT;
- Status = (SB_READ_DATA(BasePort) != SB_DSP_READY) && TimeOut > 0;
+ (Status = (SB_READ_DATA(BasePort) != SB_DSP_READY) && (TimeOut > 0));
TimeOut --);
}
NT status STATUS_SUCCESS if successful
*/
{
- NTSTATUS s;
-
DPRINT("SaveSettings() unimplemented\n");
// UNIMPLEMENTED;
{
PIO_STACK_LOCATION Stack;
PDEVICE_EXTENSION DeviceExtension;
- UINT ByteCount;
- PBYTE Data;
DPRINT("BlasterDeviceControl() called!\n");
{
// while((inb(base+0x0e)&0x80)==0); //Wait until there is something to read
// return inb(base+0x0a);
+ return 0;
}
/************************************'
unsigned char irq,dma8,dma16;
unsigned char read_dsp(unsigned short base);
void write_dsp(unsigned short base,unsigned char data);
-//sb_status detect_dsp(SB16* sb16);
+sb_status detect_dsp(SB16* sb16);
sb_status reset_dsp(unsigned short base_address);
// outb(base+0x04,reg);
// return inb(base+0x05);
+ return 0;
}
unsigned char get_irq(SB16* sb16)
* RETURNS: Success or failure
*/
{
+#if 0
PDEVICE_OBJECT DeviceObject;
NTSTATUS ret;
DriverObject->MajorFunction[IRP_MJ_WRITE] = Dispatch;
DriverObject->MajorFunction[IRP_MJ_WRITE] = Dispatch;
DriverObject->DriverUnload = NULL;
-
+#endif
return(STATUS_SUCCESS);
}
ULONG OldIRQ;
PKINTERRUPT IrqObject;
-BOOLEAN DMAOutputISR(PKINTERRUPT Interrupt, PVOID ServiceContext)
+BOOLEAN STDCALL DMAOutputISR(PKINTERRUPT Interrupt, PVOID ServiceContext)
{
DPRINT1("interrupt\n");
return FALSE;
KIRQL Dirql;
KAFFINITY Affinity;
PKINTERRUPT IrqObject;
- unsigned int mask,newmask;
+ unsigned int newmask;
unsigned int i;
unsigned int tmp[255];
-<module name="oskittcp" type="staticlibrary">\r
- <define name="__REACTOS__">1</define>\r
+<module name="oskittcp" type="staticlibrary" warnings="true">\r
+ <define name="__REACTOS__">1</define>\r
<define name="__NTDRIVER__"/>\r
<define name="KERNEL"/>\r
<define name="_DISABLE_TIDENTS"/>\r
-<module name="cabinet" type="win32dll" baseaddress="${BASEADDRESS_CABINET}" installbase="system32" installname="cabinet.dll">\r
+<module name="cabinet" type="win32dll" baseaddress="${BASEADDRESS_CABINET}" installbase="system32" installname="cabinet.dll" warnings="true">\r
<importlibrary definition="cabinet.spec.def" />\r
<include base="cabinet">.</include>\r
<include base="ReactOS">include/wine</include>\r
-<module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll">\r
+<module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" warnings="true">\r
<importlibrary definition="comctl32.spec.def" />\r
<include base="comctl32">.</include>\r
<include base="ReactOS">include/wine</include>\r
-<module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32" installname="comdlg32.dll">\r
+<module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32" installname="comdlg32.dll" warnings="true">\r
<importlibrary definition="comdlg32.spec.def" />\r
<include base="comdlg32">.</include>\r
<include base="ReactOS">include/wine</include>\r
-<module name="dbghelp" type="win32dll" baseaddress="${BASEADDRESS_DBGHELP}" installbase="system32" installname="dbghelp.dll">\r
+<module name="dbghelp" type="win32dll" baseaddress="${BASEADDRESS_DBGHELP}" installbase="system32" installname="dbghelp.dll" warnings="true">\r
<importlibrary definition="dbghelp.spec.def" />\r
<include base="dbghelp">.</include>\r
<include base="ReactOS">include/wine</include>\r
-<module name="devenum" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}" installbase="system32" installname="devenum.dll">\r
+<module name="devenum" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}" installbase="system32" installname="devenum.dll" warnings="true">\r
<importlibrary definition="devenum.spec.def" />\r
<include base="devenum">.</include>\r
<include base="ReactOS">include/wine</include>\r
-<module name="dinput" type="win32dll" baseaddress="${BASEADDRESS_DINPUT}" installbase="system32" installname="dinput.dll">\r
+<module name="dinput" type="win32dll" baseaddress="${BASEADDRESS_DINPUT}" installbase="system32" installname="dinput.dll" warnings="true">\r
<importlibrary definition="dinput.spec.def" />\r
<include base="dinput">.</include>\r
<include base="ReactOS">include/wine</include>\r
<directory name="msgina">\r
<xi:include href="msgina/msgina.xml" />\r
</directory>\r
+<directory name="msi">\r
+ <xi:include href="msi/msi.xml" />\r
+</directory>\r
<directory name="msimg32">\r
<xi:include href="msimg32/msimg32.xml" />\r
</directory>\r
<directory name="secur32">\r
<xi:include href="secur32/secur32.xml" />\r
</directory>\r
+<directory name="serialui">\r
+ <xi:include href="serialui/serialui.xml" />\r
+</directory>\r
<directory name="setupapi">\r
<xi:include href="setupapi/setupapi.xml" />\r
</directory>\r
-<module name="iphlpapi" type="win32dll" baseaddress="${BASEADDRESS_IPHLPAPI}" installbase="system32" installname="iphlpapi.dll">\r
+<module name="iphlpapi" type="win32dll" baseaddress="${BASEADDRESS_IPHLPAPI}" installbase="system32" installname="iphlpapi.dll" warnings="true">\r
<importlibrary definition="iphlpapi.spec.def" />\r
<include base="iphlpapi">include</include>\r
<include base="ReactOS">include/wine</include>\r
-<module name="kbdda" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdda.dll">\r
+<module name="kbdda" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdda.dll" warnings="true">\r
<importlibrary definition="kbdda.def" />\r
<include base="ntoskrnl">include</include>\r
<define name="_DISABLE_TIDENTS" />\r
-<module name="kbddv" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbddv.dll">\r
+<module name="kbddv" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbddv.dll" warnings="true">\r
<importlibrary definition="kbddv.def" />\r
<include base="ntoskrnl">include</include>\r
<define name="_DISABLE_TIDENTS" />\r
-<module name="kbdes" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdes.dll">\r
+<module name="kbdes" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdes.dll" warnings="true">\r
<importlibrary definition="kbdes.def" />\r
<include base="ntoskrnl">include</include>\r
<define name="_DISABLE_TIDENTS" />\r
-<module name="kbdfr" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdfr.dll">\r
+<module name="kbdfr" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdfr.dll" warnings="true">\r
<importlibrary definition="kbdfr.def" />\r
<include base="ntoskrnl">include</include>\r
<define name="_DISABLE_TIDENTS" />\r
-<module name="kbdgr" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdgr.dll">\r
+<module name="kbdgr" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdgr.dll" warnings="true">\r
<importlibrary definition="kbdgr.def" />\r
<include base="ntoskrnl">include</include>\r
<define name="_DISABLE_TIDENTS" />\r
-<module name="kbdse" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdse.dll">\r
+<module name="kbdse" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdse.dll" warnings="true">\r
<importlibrary definition="kbdse.def" />\r
<include base="ntoskrnl">include</include>\r
<define name="_DISABLE_TIDENTS" />\r
-<module name="kbduk" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbduk.dll">\r
+<module name="kbduk" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbduk.dll" warnings="true">\r
<importlibrary definition="kbduk.def" />\r
<include base="ntoskrnl">include</include>\r
<define name="_DISABLE_TIDENTS" />\r
-<module name="kbdus" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdus.dll">\r
+<module name="kbdus" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdus.dll" warnings="true">\r
<importlibrary definition="kbdus.def" />\r
<include base="ntoskrnl">include</include>\r
<define name="_DISABLE_TIDENTS" />\r
--- /dev/null
+<module name="msi" type="win32dll" baseaddress="${BASEADDRESS_MSI}" installbase="system32" installname="msi.dll" warnings="true">
+ <importlibrary definition="msi.spec.def" />
+ <include base="msi">.</include>
+ <include base="ReactOS">include/wine</include>
+ <define name="__REACTOS__" />
+ <define name="__USE_W32API" />
+ <define name="_WIN32_IE">0x600</define>
+ <define name="_WIN32_WINNT">0x501</define>
+ <define name="WINVER">0x501</define>
+ <library>wine</library>
+ <library>uuid</library>
+ <library>ntdll</library>
+ <library>kernel32</library>
+ <library>user32</library>
+ <library>gdi32</library>
+ <library>advapi32</library>
+ <library>shell32</library>
+ <library>winmm</library>
+ <library>cabinet</library>
+ <library>ole32</library>
+ <library>oleaut32</library>
+ <library>version</library>
+ <file>action.c</file>
+ <file>appsearch.c</file>
+ <file>cond.tab.c</file>
+ <file>create.c</file>
+ <file>custom.c</file>
+ <file>delete.c</file>
+ <file>dialog.c</file>
+ <file>distinct.c</file>
+ <file>format.c</file>
+ <file>handle.c</file>
+ <file>insert.c</file>
+ <file>msi.c</file>
+ <file>msiquery.c</file>
+ <file>order.c</file>
+ <file>package.c</file>
+ <file>preview.c</file>
+ <file>record.c</file>
+ <file>registry.c</file>
+ <file>regsvr.c</file>
+ <file>select.c</file>
+ <file>sql.tab.c</file>
+ <file>string.c</file>
+ <file>suminfo.c</file>
+ <file>table.c</file>
+ <file>tokenize.c</file>
+ <file>update.c</file>
+ <file>where.c</file>
+ <file>msi.spec</file>
+ <file>msi.rc</file>
+</module>
LONG Exchange,
LONG Comperand)
{
- PVOID ret;
+ LONG ret;
__asm__ ( /* lock for SMP systems */
"lock\n\t"
"cmpxchgl %2,(%1)"
-<module name="ole32" type="win32dll" baseaddress="${BASEADDRESS_OLE32}" installbase="system32" installname="ole32.dll">\r
+<module name="ole32" type="win32dll" baseaddress="${BASEADDRESS_OLE32}" installbase="system32" installname="ole32.dll" warnings="true">\r
<importlibrary definition="ole32.spec.def" />\r
<include base="ole32">.</include>\r
<include base="ReactOS">include/wine</include>\r
-<module name="oleaut32" type="win32dll" baseaddress="${BASEADDRESS_OLEAUT32}" installbase="system32" installname="oleaut32.dll">\r
+<module name="oleaut32" type="win32dll" baseaddress="${BASEADDRESS_OLEAUT32}" installbase="system32" installname="oleaut32.dll" warnings="true">\r
<importlibrary definition="oleaut32.spec.def" />\r
<include base="oleaut32">.</include>\r
<include base="ReactOS">include/wine</include>\r
-<module name="riched20" type="win32dll" baseaddress="${BASEADDRESS_RICHED20}">
+<module name="riched20" type="win32dll" baseaddress="${BASEADDRESS_RICHED20}" warnings="true">
<importlibrary definition="riched20.spec.def" />
<include base="riched20">.</include>
<include base="ReactOS">include/wine</include>
-<module name="rpcrt4" type="win32dll" baseaddress="${BASEADDRESS_RPCRT4}">\r
+<module name="rpcrt4" type="win32dll" baseaddress="${BASEADDRESS_RPCRT4}" warnings="true">\r
<importlibrary definition="rpcrt4.spec.def" />\r
<include base="rpcrt4">.</include>\r
<include base="ReactOS">include/wine</include>\r
--- /dev/null
+<module name="serialui" type="win32dll" baseaddress="${BASEADDRESS_SERIALUI}">
+ <importlibrary definition="serialui.def" />
+ <include base="serialui">.</include>
+ <define name="__USE_W32API" />
+ <define name="UNICODE" />
+ <define name="_UNICODE" />
+ <library>kernel32</library>
+ <library>user32</library>
+ <library>shlwapi</library>
+ <file>serialui.c</file>
+ <file>serialui.rc</file>
+</module>
-<module name="setupapi" type="win32dll" baseaddress="${BASEADDRESS_SETUPAPI}" installbase="system32" installname="setupapi.dll">\r
+<module name="setupapi" type="win32dll" baseaddress="${BASEADDRESS_SETUPAPI}" installbase="system32" installname="setupapi.dll" warnings="true">\r
<importlibrary definition="setupapi.spec.def" />\r
<include base="setupapi">.</include>\r
<include base="ReactOS">include/wine</include>\r
-<module name="shdocvw" type="win32dll" baseaddress="${BASEADDRESS_SHDOCVW}" installbase="system32" installname="shdocvw.dll">\r
+<module name="shdocvw" type="win32dll" baseaddress="${BASEADDRESS_SHDOCVW}" installbase="system32" installname="shdocvw.dll" warnings="true">\r
<importlibrary definition="shdocvw.spec.def" />\r
<include base="shdocvw">.</include>\r
<include base="ReactOS">include/wine</include>\r
-<module name="shell32" type="win32dll" baseaddress="${BASEADDRESS_SHELL32}" installbase="system32" installname="shell32.dll">\r
+<module name="shell32" type="win32dll" baseaddress="${BASEADDRESS_SHELL32}" installbase="system32" installname="shell32.dll" warnings="true">\r
<importlibrary definition="shell32.spec.def" />\r
<include base="shell32">.</include>\r
<include base="ReactOS">include/wine</include>\r
-<module name="shlwapi" type="win32dll" baseaddress="${BASEADDRESS_SHLWAPI}" installbase="system32" installname="shlwapi.dll">\r
+<module name="shlwapi" type="win32dll" baseaddress="${BASEADDRESS_SHLWAPI}" installbase="system32" installname="shlwapi.dll" warnings="true">\r
<importlibrary definition="shlwapi.spec.def" />\r
<include base="shlwapi">.</include>\r
<include base="ReactOS">include/wine</include>\r
-<module name="urlmon" type="win32dll" baseaddress="${BASEADDRESS_URLMON}" installbase="system32" installname="urlmon.dll">\r
+<module name="urlmon" type="win32dll" baseaddress="${BASEADDRESS_URLMON}" installbase="system32" installname="urlmon.dll" warnings="true">\r
<importlibrary definition="urlmon.spec.def" />\r
<include base="urlmon">.</include>\r
<include base="ReactOS">include/wine</include>\r
WCHAR szLinkPath[MAX_PATH];
WCHAR szArguments[MAX_PATH];
WCHAR szCommand[MAX_PATH];
- WIN32_FIND_DATA FindData;
+ WIN32_FIND_DATAW FindData;
HANDLE hFind;
LPWSTR Ptr;
DWORD dwLength;
wcscat (szLinkPath, L".lnk");
DPRINT ("Link path: '%S'\n", szLinkPath);
- return DeleteFile (szLinkPath);
+ return DeleteFileW (szLinkPath);
}
WCHAR szLinkPath[MAX_PATH];
WCHAR szArguments[MAX_PATH];
WCHAR szCommand[MAX_PATH];
- WIN32_FIND_DATA FindData;
+ WIN32_FIND_DATAW FindData;
HANDLE hFind;
LPWSTR Ptr;
DWORD dwLength;
return FALSE;
}
- if (RegSetValueEx (hDstKey,
+ if (RegSetValueExW (hDstKey,
lpNameBuffer,
0,
dwType,
HKEY hKey;
/* Load profiles directory path */
- if (!LoadString(hInstance,
+ if (!LoadStringW(hInstance,
IDS_PROFILEPATH,
szBuffer,
MAX_PATH))
}
/* Set 'Fonts' folder path */
- GetWindowsDirectory(szBuffer, MAX_PATH);
+ GetWindowsDirectoryW(szBuffer, MAX_PATH);
wcscat(szBuffer, L"\\media\\fonts");
dwLength = (wcslen(szBuffer) + 1) * sizeof(WCHAR);
RegCloseKey(hKey);
/* Load 'Program Files' location */
- if (!LoadString(hInstance,
+ if (!LoadStringW(hInstance,
IDS_PROGRAMFILES,
szBuffer,
MAX_PATH))
-<module name="winmm" type="win32dll" baseaddress="${BASEADDRESS_WINMM}" installbase="system32" installname="winmm.dll">\r
+<module name="winmm" type="win32dll" baseaddress="${BASEADDRESS_WINMM}" installbase="system32" installname="winmm.dll" warnings="true">\r
<importlibrary definition="winmm.spec.def" />\r
<include base="winmm">.</include>\r
<include base="ReactOS">include/wine</include>\r
-<module name="calc" type="win32gui" installbase="system32" installname="calc.exe">\r
+<module name="calc" type="win32gui" installbase="system32" installname="calc.exe" warnings="true">\r
<include base="calc">.</include>\r
<define name="__USE_W32API" />\r
<define name="_WIN32_IE">0x0501</define>\r
<directory name="format">\r
<xi:include href="format/format.xml" />\r
</directory>\r
+<directory name="msiexec">\r
+ <xi:include href="msiexec/msiexec.xml" />\r
+</directory>\r
<directory name="notepad">\r
<xi:include href="notepad/notepad.xml" />\r
</directory>\r
--- /dev/null
+<module name="msiexec" type="win32gui" installbase="system32" installname="msiexec.exe" warnings="true">
+ <include base="msiexec">.</include>
+ <include base="ReactOS">include/wine</include>
+ <define name="__REACTOS__" />
+ <define name="__USE_W32API" />
+ <define name="_WIN32_IE">0x501</define>
+ <define name="_WIN32_WINNT">0x501</define>
+ <define name="WINVER">0x501</define>
+ <library>uuid</library>
+ <library>wine</library>
+ <library>ntdll</library>
+ <library>kernel32</library>
+ <library>user32</library>
+ <library>advapi32</library>
+ <library>ole32</library>
+ <library>msi</library>
+ <file>msiexec.c</file>
+ <file>version.rc</file>
+</module>
* WM_DESTROY - post a quit message and return
*
*/
-INT_PTR CALLBACK
+LRESULT CALLBACK
ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
static short last_split;
INT_PTR CALLBACK modify_dword_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
WNDPROC oldproc;
- TCHAR* valueData;
HWND hwndValue;
int len;
TCHAR ValueString[32];
INT_PTR CALLBACK modify_binary_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
- PVOID valueData;
HWND hwndValue;
int len;
*
*/
-INT_PTR CALLBACK
+LRESULT CALLBACK
FrameWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
switch (message) {
#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */
#include <windows.h>
#include <commctrl.h>
+#include <stdio.h>
+#include <stdlib.h>
#include <tchar.h>
#include "hexedit.h"
dx = hed->LeftMargin;
/* draw address */
- _stprintf(addr, _T("%04X"), linestart);
+ _stprintf(addr, _T("%04lX"), linestart);
TextOut(hDC, dx, dy, addr, 4);
dx += ((4 + hed->AddressSpacing) * hed->CharWidth);
static DWORD
HEXEDIT_HitRegionTest(PHEXEDIT_DATA hed, POINTS pt)
{
- WINDOWINFO wi;
int d;
if(pt.x <= hed->LeftMargin)
hed->hBuffer = LocalReAlloc(hed->hBuffer, hed->MaxBuffer, LMEM_MOVEABLE);
HEXEDIT_Update(hed);
}
+ return 0;
}
/*** Message Proc *************************************************************/
break;
case REG_MULTI_SZ:
{
- LPTSTR src, str, cursrc;
+ LPTSTR src, str;
if(dwCount >= 2)
{
src = (LPTSTR)ValBuf;
return g_invertSort ? _tcscmp(r->name, l->name) : _tcscmp(l->name, r->name);
}
-static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
-{
- switch (LOWORD(wParam)) {
- /* case ID_FILE_OPEN: */
- /* break; */
- default:
- return FALSE;
- }
- return TRUE;
-}
-
BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result)
{
NMLVDISPINFO* Info;
}
else
{
- LONG ret;
//if((ret = RenameValue(lineinfo->name, Info->item.pszText)) != ERROR_SUCCESS)
{
TCHAR msg[128], caption[128];
#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */
#include <windows.h>
#include <commctrl.h>
+#include <accctrl.h>
+#include <unknwn.h>
#include <stdlib.h>
#include <tchar.h>
#include <process.h>
#include "main.h"
#include "hexedit.h"
-
+#include "security.h"
BOOL ProcessCmdLine(LPSTR lpCmdLine);
if(!AclUiAvailable)
{
HMENU hEditMenu;
- int mePos;
/* hide the Edit/Permissions... menu entry */
hEditMenu = GetSubMenu(hMenuFrame, 1);
if(hEditMenu != NULL)
extern void ShowAboutBox(HWND hWnd);
/* childwnd.c */
-extern INT_PTR CALLBACK ChildWndProc(HWND, UINT, WPARAM, LPARAM);
+extern LRESULT CALLBACK ChildWndProc(HWND, UINT, WPARAM, LPARAM);
/* framewnd.c */
-extern INT_PTR CALLBACK FrameWndProc(HWND, UINT, WPARAM, LPARAM);
+extern LRESULT CALLBACK FrameWndProc(HWND, UINT, WPARAM, LPARAM);
extern void SetupStatusBar(HWND hWnd, BOOL bResize);
extern void UpdateStatusBar(void);
#include <limits.h>
#include <stdio.h>
+#include <ctype.h>
#include <windows.h>
#include <winnt.h>
#include <winreg.h>
Implementation of the CRegKeySecurity interface
******************************************************************************/
+ static ifaceCRegKeySecurityVbtl efvt =
+{
+ /* IUnknown methods */
+ CRegKeySecurity_fnQueryInterface,
+ CRegKeySecurity_fnAddRef,
+ CRegKeySecurity_fnRelease,
+
+ /* CRegKeySecurity methods */
+ CRegKeySecurity_fnGetObjectInformation,
+ CRegKeySecurity_fnGetSecurity,
+ CRegKeySecurity_fnSetSecurity,
+ CRegKeySecurity_fnGetAccessRights,
+ CRegKeySecurity_fnMapGeneric,
+ CRegKeySecurity_fnGetInheritTypes,
+ CRegKeySecurity_fnPropertySheetPageCallback
+};
+
SI_ACCESS RegAccess[] = {
{&GUID_NULL, KEY_ALL_ACCESS, (LPWSTR)MAKEINTRESOURCE(IDS_ACCESS_FULLCONTROL), SI_ACCESS_GENERAL | SI_ACCESS_SPECIFIC},
{&GUID_NULL, KEY_READ, (LPWSTR)MAKEINTRESOURCE(IDS_ACCESS_READ), SI_ACCESS_GENERAL},
LPCTSTR lpKeyName)
{
BOOL Result;
- HMODULE hAclEditDll;
LPWSTR Machine, KeyName;
HKEY hInfoKey;
LPREGKEYSECURITY RegKeySecurity;
PACL* ppSacl,
PSECURITY_DESCRIPTOR* ppSecurityDescriptor);
+extern BOOL
+InitializeAclUiDll(VOID);
+
+extern VOID
+UnloadAclUiDll(VOID);
+
DEFINE_GUID(IID_CRegKeySecurity, 0x965fc360, 0x16ff, 0x11d0, 0x0091, 0xcb,0x00,0xaa,0x00,0xbb,0xb7,0x23);
/******************************************************************************
UINT uMsg,
SI_PAGE_TYPE uPage);
-static ifaceCRegKeySecurityVbtl efvt =
-{
- /* IUnknown methods */
- CRegKeySecurity_fnQueryInterface,
- CRegKeySecurity_fnAddRef,
- CRegKeySecurity_fnRelease,
-
- /* CRegKeySecurity methods */
- CRegKeySecurity_fnGetObjectInformation,
- CRegKeySecurity_fnGetSecurity,
- CRegKeySecurity_fnSetSecurity,
- CRegKeySecurity_fnGetAccessRights,
- CRegKeySecurity_fnMapGeneric,
- CRegKeySecurity_fnGetInheritTypes,
- CRegKeySecurity_fnPropertySheetPageCallback
-};
-
#endif /* _REGEXP_SECURITY_H */
/* EOF */
return errorReport;\r
}\r
\r
+VOID\r
ReleaseErrorReport(LPERROR_REPORT errorReport)\r
{\r
if (errorReport->YourEmail)\r
{\r
PCHAR pch = (PCHAR)responseBuffer;\r
ULONG length = 0;\r
- INT contentLength = 0;\r
fd_set fdset[1];\r
struct timeval timeout;\r
- CHAR buf[4000];\r
\r
FD_ZERO(&fdset);\r
FD_SET(socket, &fdset);\r
SOCKET socket;\r
HANDLE hThread;\r
INT error;\r
- INT i;\r
\r
if (AbortSubmission != 0)\r
goto done;\r
LPSTR lpszCmdLine,\r
int nCmdShow)\r
{\r
- WORD wVersionRequested;\r
- WSADATA wsaData;\r
- INT error;\r
- INT version;\r
- WCHAR *lc;\r
+ WORD wVersionRequested;\r
+ WSADATA wsaData;\r
+ INT error;\r
\r
hAppInstance = hInstance;\r
\r
LoadString(hAppInstance, IDS_FAILED_TO_INITIALIZE_WINSOCK, format, sizeof(format) / sizeof(WCHAR));\r
wsprintf(message, format, error);\r
MessageBox(NULL, message, NULL, MB_ICONWARNING);\r
- return;\r
+ return 0;\r
}\r
\r
CreateWizard();\r
\r
- WSACleanup();\r
+ WSACleanup();\r
\r
return 0;\r
}\r
-<module name="usetup" type="nativecui" installbase="system32" installname="usetup.exe">\r
+<module name="usetup" type="nativecui" installbase="system32" installname="usetup.exe" warnings="true">\r
<bootstrap base="reactos/system32" nameoncd="smss.exe" />\r
<include base="usetup">.</include>\r
<include base="zlib">.</include>\r
-<module name="winefile" type="win32gui" installbase="system32" installname="winefile.exe">\r
+<module name="winefile" type="win32gui" installbase="system32" installname="winefile.exe" warnings="true">\r
<include base="winefile">.</include>\r
<define name="UNICODE" />\r
<define name="__USE_W32API" />\r
/* EMPTY FOR NOW */
-/* Hope I didn't delete existing defs!! Check CVS version of this file.. */
\ No newline at end of file
+/* Hope I didn't delete existing defs!! Check CVS version of this file.. */
GenerateGlobalCFlagsAndProperties (\r
"=",\r
ProjectNode.non_if_data );\r
- fprintf ( fMakefile, "PROJECT_RCFLAGS = $(PROJECT_CFLAGS)\n" );\r
- fprintf ( fMakefile, "PROJECT_WIDLFLAGS = $(PROJECT_CFLAGS)\n" );\r
- fprintf ( fMakefile, "PROJECT_LFLAGS = %s\n",\r
+ fprintf ( fMakefile, "PROJECT_RCFLAGS := $(PROJECT_CFLAGS)\n" );\r
+ fprintf ( fMakefile, "PROJECT_WIDLFLAGS := $(PROJECT_CFLAGS)\n" );\r
+ fprintf ( fMakefile, "PROJECT_LFLAGS := %s\n",\r
GenerateProjectLFLAGS ().c_str () );\r
+ fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall\n" );\r
fprintf ( fMakefile, "\n" );\r
}\r
\r
string globalCflags = "-g";\r
if ( backend->usePipe )\r
globalCflags += " -pipe";\r
+ if ( !module.enableWarnings )\r
+ globalCflags += " -Werror";\r
\r
fprintf (\r
fMakefile,\r
useWRC = att->value == "true";\r
else\r
useWRC = true;\r
+\r
+ att = moduleNode.GetAttribute ( "warnings", false );\r
+ if ( att != NULL )\r
+ enableWarnings = att->value == "true";\r
+ else\r
+ enableWarnings = false;\r
}\r
\r
Module::~Module ()\r
std::string installBase;\r
std::string installName;\r
bool useWRC;\r
+ bool enableWarnings;\r
\r
Module ( const Project& project,\r
const XMLElement& moduleNode,\r
There can be zero or more modules per xml build file.\r
\r
Syntax:\r
- <module name="msvcrt" type="win32dll" extension=".dll" entrypoint="_DllMain@12" baseaddress="0x70000000" mangledsymbols="true" installbase="system32" installname="msvcrt.dll" usewrc="false">\r
+ <module name="msvcrt" type="win32dll" extension=".dll" entrypoint="_DllMain@12" baseaddress="0x70000000" mangledsymbols="true" installbase="system32" installname="msvcrt.dll" usewrc="false" warnings="true">\r
...\r
</module>\r
\r
installbase - Base directory of the generated file in the installation directory. This attribute is optional.\r
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.\r
usewrc - Use WRC to compile resources if true. If false, windres is used. This attribute is optional. If not specified, WRC will be used.\r
+ 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.\r
\r
Value:\r
None.\r
projects / reactos.git / commitdiff