12 May
2005
12 May
'05
9:03 p.m.
Merge 12736:14980 from trunk
Modified: branches/xmlbuildsystem/rosapps/Makefile
Modified: branches/xmlbuildsystem/rosapps/cmdutils/mode/makefile
Modified: branches/xmlbuildsystem/rosapps/cmdutils/mode/mode.c
Modified: branches/xmlbuildsystem/rosapps/cmdutils/touch/touch.c
Modified: branches/xmlbuildsystem/rosapps/cmdutils/touch/various.h
Deleted: branches/xmlbuildsystem/rosapps/control/
Deleted: branches/xmlbuildsystem/rosapps/ctlpanel/
Modified: branches/xmlbuildsystem/rosapps/demos/maze/Makefile
Modified: branches/xmlbuildsystem/rosapps/dflat32/editbox.c
Modified: branches/xmlbuildsystem/rosapps/dflat32/slidebox.c
Deleted: branches/xmlbuildsystem/rosapps/games/ArchBlackmann/
Added: branches/xmlbuildsystem/rosapps/games/solitaire/
Modified: branches/xmlbuildsystem/rosapps/games/winemine/Makefile
Modified: branches/xmlbuildsystem/rosapps/games/winemine/main.c
Deleted: branches/xmlbuildsystem/rosapps/hcalc/
Modified: branches/xmlbuildsystem/rosapps/mc/pc/chmod.c
Modified: branches/xmlbuildsystem/rosapps/mc/pc/util_nt.c
Modified: branches/xmlbuildsystem/rosapps/mc/slang/slvideo.c
Modified: branches/xmlbuildsystem/rosapps/mc/src/file.c
Modified: branches/xmlbuildsystem/rosapps/mc/src/panel.h
Modified: branches/xmlbuildsystem/rosapps/mc/src/screen.c
Added: branches/xmlbuildsystem/rosapps/net/netreg/
Modified: branches/xmlbuildsystem/rosapps/net/niclist/makefile
Modified: branches/xmlbuildsystem/rosapps/net/niclist/niclist.c
Modified: branches/xmlbuildsystem/rosapps/notevil/makefile
Modified: branches/xmlbuildsystem/rosapps/notevil/notevil.rc
Modified: branches/xmlbuildsystem/rosapps/notevil/resource.h
Added: branches/xmlbuildsystem/rosapps/packmgr/
Modified: branches/xmlbuildsystem/rosapps/sysutils/chkdsk.rc
Modified: branches/xmlbuildsystem/rosapps/sysutils/chklib.c
Added: branches/xmlbuildsystem/rosapps/sysutils/ctm/En.rc
Added: branches/xmlbuildsystem/rosapps/sysutils/ctm/Fr.rc
Modified: branches/xmlbuildsystem/rosapps/sysutils/ctm/Makefile
Modified: branches/xmlbuildsystem/rosapps/sysutils/ctm/ctm.c
Modified: branches/xmlbuildsystem/rosapps/sysutils/ctm/ctm.h
Modified: branches/xmlbuildsystem/rosapps/sysutils/ctm/ctm.rc
Added: branches/xmlbuildsystem/rosapps/sysutils/ctm/resource.h
Modified: branches/xmlbuildsystem/rosapps/sysutils/format.c
Modified: branches/xmlbuildsystem/rosapps/sysutils/format.rc
Deleted: branches/xmlbuildsystem/rosapps/sysutils/kill/.cvsignore
Modified: branches/xmlbuildsystem/rosapps/sysutils/kill/kill.c
Added: branches/xmlbuildsystem/rosapps/sysutils/kill/kill.rc
Modified: branches/xmlbuildsystem/rosapps/sysutils/kill/makefile
Modified: branches/xmlbuildsystem/rosapps/sysutils/ldd.c
Modified: branches/xmlbuildsystem/rosapps/sysutils/pedump.c
Modified:
branches/xmlbuildsystem/rosapps/sysutils/regexpl/ArgumentParser.cpp
Modified:
branches/xmlbuildsystem/rosapps/sysutils/regexpl/Completion.cpp
Modified: branches/xmlbuildsystem/rosapps/sysutils/regexpl/Console.cpp
Modified: branches/xmlbuildsystem/rosapps/sysutils/regexpl/Makefile
Modified: branches/xmlbuildsystem/rosapps/sysutils/regexpl/Pattern.cpp
Modified: branches/xmlbuildsystem/rosapps/sysutils/regexpl/Prompt.cpp
Modified:
branches/xmlbuildsystem/rosapps/sysutils/regexpl/RegistryExplorer.cpp
Modified:
branches/xmlbuildsystem/rosapps/sysutils/regexpl/RegistryExplorer.h
Modified:
branches/xmlbuildsystem/rosapps/sysutils/regexpl/RegistryKey.cpp
Modified:
branches/xmlbuildsystem/rosapps/sysutils/regexpl/RegistryTree.cpp
Modified:
branches/xmlbuildsystem/rosapps/sysutils/regexpl/SecurityDescriptor.cpp
Modified: branches/xmlbuildsystem/rosapps/sysutils/regexpl/Settings.cpp
Modified:
branches/xmlbuildsystem/rosapps/sysutils/regexpl/ShellCommand.cpp
Modified:
branches/xmlbuildsystem/rosapps/sysutils/regexpl/ShellCommandChangeKey.c
pp
Modified:
branches/xmlbuildsystem/rosapps/sysutils/regexpl/ShellCommandConnect.cpp
Modified:
branches/xmlbuildsystem/rosapps/sysutils/regexpl/ShellCommandDACL.cpp
Modified:
branches/xmlbuildsystem/rosapps/sysutils/regexpl/ShellCommandDOKA.cpp
Modified:
branches/xmlbuildsystem/rosapps/sysutils/regexpl/ShellCommandDeleteKey.c
pp
Modified:
branches/xmlbuildsystem/rosapps/sysutils/regexpl/ShellCommandDeleteValue
.cpp
Modified:
branches/xmlbuildsystem/rosapps/sysutils/regexpl/ShellCommandDir.cpp
Modified:
branches/xmlbuildsystem/rosapps/sysutils/regexpl/ShellCommandExit.cpp
Modified:
branches/xmlbuildsystem/rosapps/sysutils/regexpl/ShellCommandHelp.cpp
Modified:
branches/xmlbuildsystem/rosapps/sysutils/regexpl/ShellCommandNewKey.cpp
Modified:
branches/xmlbuildsystem/rosapps/sysutils/regexpl/ShellCommandOwner.cpp
Modified:
branches/xmlbuildsystem/rosapps/sysutils/regexpl/ShellCommandSACL.cpp
Modified:
branches/xmlbuildsystem/rosapps/sysutils/regexpl/ShellCommandSetValue.cp
p
Modified:
branches/xmlbuildsystem/rosapps/sysutils/regexpl/ShellCommandValue.cpp
Modified:
branches/xmlbuildsystem/rosapps/sysutils/regexpl/ShellCommandVersion.cpp
Modified:
branches/xmlbuildsystem/rosapps/sysutils/regexpl/ShellCommandsLinkedList
.cpp
Modified:
branches/xmlbuildsystem/rosapps/sysutils/regexpl/TextHistory.cpp
Modified: branches/xmlbuildsystem/rosapps/sysutils/regexpl/ph.h
Modified: branches/xmlbuildsystem/rosapps/sysutils/regexpl/regexpl.rc
Modified: branches/xmlbuildsystem/rosapps/sysutils/tcat/cat.c
Modified: branches/xmlbuildsystem/rosapps/sysutils/tlist/tlist.c
Modified: branches/xmlbuildsystem/rosapps/sysutils/win32err.c
Modified: branches/xmlbuildsystem/rosapps/sysutils/win32err.h
Modified: branches/xmlbuildsystem/rosapps/sysutils/wmain.c
Modified: branches/xmlbuildsystem/rosapps/tests/Makefile
Modified: branches/xmlbuildsystem/rosapps/tests/accelerator/Makefile
Modified: branches/xmlbuildsystem/rosapps/tests/diskspeed/diskspeed.c
Added: branches/xmlbuildsystem/rosapps/tests/polytest/Makefile
Modified: branches/xmlbuildsystem/rosapps/tests/tokentest/tokentest.c
Modified: branches/xmlbuildsystem/rosapps/tests/zwcontinue/zwcontinue.c
Modified: branches/xmlbuildsystem/rosapps/winfile/dialogs.c
Modified: branches/xmlbuildsystem/rosapps/winfile/treeview.h
_____
Modified: branches/xmlbuildsystem/rosapps/Makefile
--- branches/xmlbuildsystem/rosapps/Makefile 2005-05-12 20:26:34 UTC
(rev 15247)
+++ branches/xmlbuildsystem/rosapps/Makefile 2005-05-12 21:03:51 UTC
(rev 15248)
@@ -16,9 +16,12 @@
devutils$(SEP)zoomin \
dflat32 \
games$(SEP)winemine \
- hcalc \
+ games$(SEP)solitaire \
mc \
notevil \
+ packmgr$(SEP)lib \
+ packmgr$(SEP)cmd-line \
+ packmgr$(SEP)gui \
sysutils \
sysutils$(SEP)ctm \
sysutils$(SEP)kill \
@@ -27,7 +30,6 @@
net$(SEP)niclist \
net$(SEP)ncftp \
sysutils$(SEP)regexpl \
- tests \
welcome \
winfile
_____
Modified: branches/xmlbuildsystem/rosapps/cmdutils/mode/makefile
--- branches/xmlbuildsystem/rosapps/cmdutils/mode/makefile
2005-05-12 20:26:34 UTC (rev 15247)
+++ branches/xmlbuildsystem/rosapps/cmdutils/mode/makefile
2005-05-12 21:03:51 UTC (rev 15248)
@@ -11,7 +11,7 @@
TARGET_OBJECTS = $(TARGET_NAME).o
-#TARGET_GCCLIBS = iberty
+TARGET_CFLAGS = -D__USE_W32API
include $(PATH_TO_TOP)/rules.mak
_____
Modified: branches/xmlbuildsystem/rosapps/cmdutils/mode/mode.c
--- branches/xmlbuildsystem/rosapps/cmdutils/mode/mode.c
2005-05-12 20:26:34 UTC (rev 15247)
+++ branches/xmlbuildsystem/rosapps/cmdutils/mode/mode.c
2005-05-12 21:03:51 UTC (rev 15248)
@@ -23,6 +23,7 @@
#include <windows.h>
#include <string.h>
#include <stdio.h>
+#include <tchar.h>
#define MAX_PORTNAME_LEN 20
#define MAX_COMPORT_NUM 10
@@ -31,20 +32,20 @@
#define NUM_ELEMENTS(a) (sizeof(a)/sizeof(a[0]))
#define ASSERT(a)
-const char* usage_strings[] = {
- "Device Status: MODE [device] [/STATUS]",
- "Select code page: MODE CON[:] CP SELECT=yyy",
- "Code page status: MODE CON[:] CP [/STATUS]",
- "Display mode: MODE CON[:] [COLS=c] [LINES=n]",
- "Typematic rate: MODE CON[:] [RATE=r DELAY=d]",
- "Redirect printing: MODE LPTn[:]=COMm[:]",
- "Serial port: MODE COMm[:] [BAUD=b] [PARITY=p] [DATA=d]
[STOP=s]\n" \
- " [to=on|off] [xon=on|off]
[odsr=on|off]\n" \
- " [octs=on|off] [dtr=on|off|hs]\n" \
- " [rts=on|off|hs|tg] [idsr=on|off]",
+const TCHAR* const usage_strings[] = {
+ _T("Device Status: MODE [device] [/STATUS]"),
+ _T("Select code page: MODE CON[:] CP SELECT=yyy"),
+ _T("Code page status: MODE CON[:] CP [/STATUS]"),
+ _T("Display mode: MODE CON[:] [COLS=c] [LINES=n]"),
+ _T("Typematic rate: MODE CON[:] [RATE=r DELAY=d]"),
+ _T("Redirect printing: MODE LPTn[:]=COMm[:]"),
+ _T("Serial port: MODE COMm[:] [BAUD=b] [PARITY=p] [DATA=d]
[STOP=s]\n") \
+ _T(" [to=on|off] [xon=on|off]
[odsr=on|off]\n") \
+ _T(" [octs=on|off] [dtr=on|off|hs]\n") \
+ _T(" [rts=on|off|hs|tg] [idsr=on|off]"),
};
-const char* parity_strings[] = {
+const TCHAR* const parity_strings[] = {
_T("None"), // default
_T("Odd"), // only symbol in this set to have a 'd' in it
_T("Even"), // ... 'v' in it
@@ -52,72 +53,72 @@
_T("Space") // ... 's' and/or a 'c' in it
};
-const char* control_strings[] = { "OFF", "ON", "HANDSHAKE",
"TOGGLE" };
+const TCHAR* const control_strings[] = { _T("OFF"), _T("ON"),
_T("HANDSHAKE"), _T("TOGGLE") };
-const char* stopbit_strings[] = { _T("1"), _T("1.5"),
_T("2") };
+const TCHAR* const stopbit_strings[] = { _T("1"), _T("1.5"),
_T("2") };
int Usage()
{
int i;
- printf("\nConfigures system devices.\n\n");
- for (i = 0; i < NUM_ELEMENTS(usage_strings); i++) {
- printf("%s\n", usage_strings[i]);
- }
- printf("\n");
- return 0;
+ _tprintf(_T("\nConfigures system devices.\n\n"));
+ for (i = 0; i < NUM_ELEMENTS(usage_strings); i++) {
+ _tprintf(_T("%s\n"), usage_strings[i]);
+ }
+ _tprintf(_T("\n"));
+ return 0;
}
int QueryDevices()
{
- char buffer[5000];
+ TCHAR buffer[10240];
int len;
- char* ptr = buffer;
+ TCHAR* ptr = buffer;
*ptr = '\0';
if (QueryDosDevice(NULL, buffer, NUM_ELEMENTS(buffer))) {
while (*ptr != '\0') {
- len = strlen(ptr);
- if (strstr(ptr, "COM")) {
- printf(" Found serial device - %s\n", ptr);
- } else if (strstr(ptr, "PRN")) {
- printf(" Found printer device - %s\n", ptr);
- } else if (strstr(ptr, "LPT")) {
- printf(" Found parallel device - %s\n", ptr);
+ len = _tcslen(ptr);
+ if (_tcsstr(ptr, _T("COM"))) {
+ _tprintf(_T(" Found serial device - %s\n"), ptr);
+ } else if (_tcsstr(ptr, _T("PRN"))) {
+ _tprintf(_T(" Found printer device - %s\n"), ptr);
+ } else if (_tcsstr(ptr, _T("LPT"))) {
+ _tprintf(_T(" Found parallel device - %s\n"), ptr);
} else {
- printf(" Found other device - %s\n", ptr);
+ _tprintf(_T(" Found other device - %s\n"), ptr);
}
ptr += (len+1);
}
} else {
- printf(" ERROR: QueryDosDevice(...) failed.\n");
+ _tprintf(_T(" ERROR: QueryDosDevice(...) failed.\n"));
}
return 1;
}
-int ShowParrallelStatus(int nPortNum)
+int ShowParallelStatus(int nPortNum)
{
- char buffer[250];
- char szPortName[MAX_PORTNAME_LEN];
+ TCHAR buffer[250];
+ TCHAR szPortName[MAX_PORTNAME_LEN];
- sprintf(szPortName, "LPT%d", nPortNum);
- printf("\nStatus for device LPT%d:\n", nPortNum);
- printf("-----------------------\n");
+ _stprintf(szPortName, _T("LPT%d"), nPortNum);
+ _tprintf(_T("\nStatus for device LPT%d:\n"), nPortNum);
+ _tprintf(_T("-----------------------\n"));
if (QueryDosDevice(szPortName, buffer, NUM_ELEMENTS(buffer))) {
- char* ptr = strrchr(buffer, '\\');
+ TCHAR* ptr = _tcsrchr(buffer, '\\');
if (ptr != NULL) {
- if (0 == strcmp(szPortName, ++ptr)) {
- printf(" Printer output is not being rerouted.\n");
+ if (0 == _tcscmp(szPortName, ++ptr)) {
+ _tprintf(_T(" Printer output is not being
rerouted.\n"));
} else {
- printf(" Printer output is being rerouted to serial
port %s\n", ptr);
+ _tprintf(_T(" Printer output is being rerouted to
serial port %s\n"), ptr);
}
return 0;
} else {
- printf(" QueryDosDevice(%s) returned unrecogised form
%s.\n", szPortName, buffer);
+ _tprintf(_T(" QueryDosDevice(%s) returned unrecogised
form %s.\n"), szPortName, buffer);
}
} else {
- printf(" ERROR: QueryDosDevice(%s) failed.\n", szPortName);
+ _tprintf(_T(" ERROR: QueryDosDevice(%s) failed.\n"),
szPortName);
}
return 1;
}
@@ -129,20 +130,20 @@
CONSOLE_SCREEN_BUFFER_INFO ConsoleScreenBufferInfo;
HANDLE hConsoleOutput = GetStdHandle(STD_OUTPUT_HANDLE);
- printf("\nStatus for device CON:\n");
- printf("-----------------------\n");
+ _tprintf(_T("\nStatus for device CON:\n"));
+ _tprintf(_T("-----------------------\n"));
if (GetConsoleScreenBufferInfo(hConsoleOutput,
&ConsoleScreenBufferInfo)) {
- printf(" Lines: %d\n",
ConsoleScreenBufferInfo.dwSize.Y);
- printf(" Columns: %d\n",
ConsoleScreenBufferInfo.dwSize.X);
+ _tprintf(_T(" Lines: %d\n"),
ConsoleScreenBufferInfo.dwSize.Y);
+ _tprintf(_T(" Columns: %d\n"),
ConsoleScreenBufferInfo.dwSize.X);
}
if (SystemParametersInfo(SPI_GETKEYBOARDDELAY, 0, &dwKbdDelay, 0))
{
- printf(" Keyboard delay: %d\n", dwKbdDelay);
+ _tprintf(_T(" Keyboard delay: %d\n"), dwKbdDelay);
}
if (SystemParametersInfo(SPI_GETKEYBOARDSPEED, 0, &dwKbdSpeed, 0))
{
- printf(" Keyboard rate: %d\n", dwKbdSpeed);
+ _tprintf(_T(" Keyboard rate: %d\n"), dwKbdSpeed);
}
- printf(" Code page: %d\n", GetConsoleOutputCP());
- return 0;
+ _tprintf(_T(" Code page: %d\n"), GetConsoleOutputCP());
+ return 0;
}
static
@@ -150,12 +151,12 @@
{
BOOL result;
HANDLE hPort;
- char szPortName[MAX_PORTNAME_LEN];
+ TCHAR szPortName[MAX_PORTNAME_LEN];
ASSERT(pDCB);
ASSERT(pCommTimeouts);
- sprintf(szPortName, _T("COM%d"), nPortNum);
+ _stprintf(szPortName, _T("COM%d"), nPortNum);
hPort = CreateFile(szPortName,
GENERIC_READ|GENERIC_WRITE,
0, // exclusive
@@ -165,7 +166,8 @@
NULL); // no template
if (hPort == (HANDLE)-1) {
- printf("Illegal device name - %s\n", szPortName);
+ _tprintf(_T("Illegal device name - %s\n"), szPortName);
+ _tprintf(_T("Last error = 0x%lx\n"), GetLastError());
return FALSE;
}
if (bWrite) {
@@ -174,7 +176,7 @@
result = GetCommState(hPort, pDCB);
}
if (!result) {
- printf("Failed to %s the status for device COM%d:\n", bWrite ?
"set" : "get", nPortNum);
+ _tprintf(_T("Failed to %s the status for device COM%d:\n"),
bWrite ? _T("set") : _T("get"), nPortNum);
CloseHandle(hPort);
return FALSE;
}
@@ -184,7 +186,7 @@
result = GetCommTimeouts(hPort, pCommTimeouts);
}
if (!result) {
- printf("Failed to %s Timeout status for device COM%d:\n",
bWrite ? "set" : "get", nPortNum);
+ _tprintf(_T("Failed to %s Timeout status for device COM%d:\n"),
bWrite ? _T("set") : _T("get"), nPortNum);
CloseHandle(hPort);
return FALSE;
@@ -198,46 +200,46 @@
HANDLE hPort;
DCB dcb;
COMMTIMEOUTS CommTimeouts;
- char szPortName[MAX_PORTNAME_LEN];
+ TCHAR szPortName[MAX_PORTNAME_LEN];
if (!SerialPortQuery(nPortNum, &dcb, &CommTimeouts, FALSE)) {
return 1;
}
if (dcb.Parity > NUM_ELEMENTS(parity_strings)) {
- printf("ERROR: Invalid value for Parity Bits %d:\n",
dcb.Parity);
+ _tprintf(_T("ERROR: Invalid value for Parity Bits %d:\n"),
dcb.Parity);
dcb.Parity = 0;
}
if (dcb.StopBits > NUM_ELEMENTS(stopbit_strings)) {
- printf("ERROR: Invalid value for Stop Bits %d:\n",
dcb.StopBits);
+ _tprintf(_T("ERROR: Invalid value for Stop Bits %d:\n"),
dcb.StopBits);
dcb.StopBits = 0;
}
- printf("\nStatus for device COM%d:\n", nPortNum);
- printf("-----------------------\n");
- printf(" Baud: %d\n", dcb.BaudRate);
- printf(" Parity: %s\n", parity_strings[dcb.Parity]);
- printf(" Data Bits: %d\n", dcb.ByteSize);
- printf(" Stop Bits: %s\n", stopbit_strings[dcb.StopBits]);
- printf(" Timeout: %s\n",
CommTimeouts.ReadIntervalTimeout ? "ON" : "OFF");
- printf(" XON/XOFF: %s\n", dcb.fOutX ? "ON" :
"OFF");
- printf(" CTS handshaking: %s\n", dcb.fOutxCtsFlow ? "ON" :
"OFF");
- printf(" DSR handshaking: %s\n", dcb.fOutxDsrFlow ? "ON" :
"OFF");
- printf(" DSR sensitivity: %s\n", dcb.fDsrSensitivity ? "ON" :
"OFF");
- printf(" DTR circuit: %s\n",
control_strings[dcb.fDtrControl]);
- printf(" RTS circuit: %s\n",
control_strings[dcb.fRtsControl]);
- return 0;
+ _tprintf(_T("\nStatus for device COM%d:\n"), nPortNum);
+ _tprintf(_T("-----------------------\n"));
+ _tprintf(_T(" Baud: %d\n"), dcb.BaudRate);
+ _tprintf(_T(" Parity: %s\n"),
parity_strings[dcb.Parity]);
+ _tprintf(_T(" Data Bits: %d\n"), dcb.ByteSize);
+ _tprintf(_T(" Stop Bits: %s\n"),
stopbit_strings[dcb.StopBits]);
+ _tprintf(_T(" Timeout: %s\n"),
CommTimeouts.ReadIntervalTimeout ? _T("ON") : _T("OFF"));
+ _tprintf(_T(" XON/XOFF: %s\n"), dcb.fOutX ? _T("ON") :
_T("OFF"));
+ _tprintf(_T(" CTS handshaking: %s\n"), dcb.fOutxCtsFlow ?
_T("ON") : _T("OFF"));
+ _tprintf(_T(" DSR handshaking: %s\n"), dcb.fOutxDsrFlow ?
_T("ON") : _T("OFF"));
+ _tprintf(_T(" DSR sensitivity: %s\n"), dcb.fDsrSensitivity ?
_T("ON") : _T("OFF"));
+ _tprintf(_T(" DTR circuit: %s\n"),
control_strings[dcb.fDtrControl]);
+ _tprintf(_T(" RTS circuit: %s\n"),
control_strings[dcb.fRtsControl]);
+ return 0;
}
-int SetParrallelState(int nPortNum)
+int SetParallelState(int nPortNum)
{
- char szPortName[MAX_PORTNAME_LEN];
- char szTargetPath[MAX_PORTNAME_LEN];
+ TCHAR szPortName[MAX_PORTNAME_LEN];
+ TCHAR szTargetPath[MAX_PORTNAME_LEN];
- sprintf(szPortName, _T("LPT%d"), nPortNum);
- sprintf(szTargetPath, _T("COM%d"), nPortNum);
+ _stprintf(szPortName, _T("LPT%d"), nPortNum);
+ _stprintf(szTargetPath, _T("COM%d"), nPortNum);
if (!DefineDosDevice(DDD_REMOVE_DEFINITION, szPortName,
szTargetPath)) {
DWORD error = GetLastError();
- printf("SetParrallelState(%d) - DefineDosDevice(%s) failed:
%x\n", nPortNum, error);
+ _tprintf(_T("SetParallelState(%d) - DefineDosDevice(%s) failed:
%x\n"), nPortNum, error);
}
return 0;
}
@@ -269,67 +271,67 @@
}
static
-int ExtractModeSerialParams(const char* param)
+int ExtractModeSerialParams(const TCHAR* param)
{
- if ( strstr(param, "OFF")) {
+ if ( _tcsstr(param, _T("OFF"))) {
return 0;
- } else if (strstr(param, "ON")) {
+ } else if (_tcsstr(param, _T("ON"))) {
return 1;
- } else if (strstr(param, "HS")) {
+ } else if (_tcsstr(param, _T("HS"))) {
return 2;
- } else if (strstr(param, "TG")) {
+ } else if (_tcsstr(param, _T("TG"))) {
return 3;
}
return -1;
}
-int SetSerialState(int nPortNum, int args, char *argv[])
+int SetSerialState(int nPortNum, int args, TCHAR *argv[])
{
int arg;
int value;
DCB dcb;
COMMTIMEOUTS CommTimeouts;
- char buf[MAX_COMPARAM_LEN+1];
+ TCHAR buf[MAX_COMPARAM_LEN+1];
if (SerialPortQuery(nPortNum, &dcb, &CommTimeouts, FALSE)) {
for (arg = 2; arg < args; arg++) {
- if (strlen(argv[arg]) > MAX_COMPARAM_LEN) {
- printf("Invalid parameter (too long) - %s\n",
argv[arg]);
+ if (_tcslen(argv[arg]) > MAX_COMPARAM_LEN) {
+ _tprintf(_T("Invalid parameter (too long) - %s\n"),
argv[arg]);
return 1;
}
- strcpy(buf, argv[arg]);
- strupr(buf);
- if (strstr(buf, "BAUD=")) {
- dcb.BaudRate = atol(buf+5);
- } else if (strstr(buf, "PARITY=")) {
- if (strchr(buf, 'D')) {
+ _tcscpy(buf, argv[arg]);
+ _tcslwr(buf);
+ if (_tcsstr(buf, _T("baud="))) {
+ _tscanf(buf+5, "%lu", &dcb.BaudRate);
+ } else if (_tcsstr(buf, _T("parity="))) {
+ if (_tcschr(buf, 'D')) {
dcb.Parity = 1;
- } else if (strchr(buf, 'V')) {
+ } else if (_tcschr(buf, 'V')) {
dcb.Parity = 2;
- } else if (strchr(buf, 'M')) {
+ } else if (_tcschr(buf, 'M')) {
dcb.Parity = 3;
- } else if (strchr(buf, 'S')) {
+ } else if (_tcschr(buf, 'S')) {
dcb.Parity = 4;
} else {
dcb.Parity = 0;
}
- } else if (strstr(buf, "DATA=")) {
- dcb.ByteSize = atol(buf+5);
- } else if (strstr(buf, "STOP=")) {
- if (strchr(buf, '5')) {
+ } else if (_tcsstr(buf, _T("data="))) {
+ _tscanf(buf+5, "%lu", &dcb.ByteSize);
+ } else if (_tcsstr(buf, _T("stop="))) {
+ if (_tcschr(buf, '5')) {
dcb.StopBits = 1;
- } else if (strchr(buf, '2')) {
+ } else if (_tcschr(buf, '2')) {
dcb.StopBits = 2;
} else {
dcb.StopBits = 0;
}
- } else if (strstr(buf, "TO=")) { // to=on|off
+ } else if (_tcsstr(buf, _T("to="))) { // to=on|off
value = ExtractModeSerialParams(buf);
if (value != -1) {
} else {
goto invalid_serial_parameter;
}
- } else if (strstr(buf, "XON=")) { // xon=on|off
+ } else if (_tcsstr(buf, _T("xon="))) { // xon=on|off
value = ExtractModeSerialParams(buf);
if (value != -1) {
dcb.fOutX = value;
@@ -337,35 +339,35 @@
} else {
goto invalid_serial_parameter;
}
- } else if (strstr(buf, "ODSR=")) { // odsr=on|off
+ } else if (_tcsstr(buf, _T("odsr="))) { // odsr=on|off
value = ExtractModeSerialParams(buf);
if (value != -1) {
dcb.fOutxDsrFlow = value;
} else {
goto invalid_serial_parameter;
}
- } else if (strstr(buf, "OCTS=")) { // octs=on|off
+ } else if (_tcsstr(buf, _T("octs="))) { // octs=on|off
value = ExtractModeSerialParams(buf);
if (value != -1) {
dcb.fOutxCtsFlow = value;
} else {
goto invalid_serial_parameter;
}
- } else if (strstr(buf, "DTR=")) { // dtr=on|off|hs
+ } else if (_tcsstr(buf, _T("dtr="))) { // dtr=on|off|hs
value = ExtractModeSerialParams(buf);
if (value != -1) {
dcb.fDtrControl = value;
} else {
goto invalid_serial_parameter;
}
- } else if (strstr(buf, "RTS=")) { // rts=on|off|hs|tg
+ } else if (_tcsstr(buf, _T("rts="))) { // rts=on|off|hs|tg
value = ExtractModeSerialParams(buf);
if (value != -1) {
dcb.fRtsControl = value;
} else {
goto invalid_serial_parameter;
}
- } else if (strstr(buf, "IDSR=")) { // idsr=on|off
+ } else if (_tcsstr(buf, _T("idsr="))) { // idsr=on|off
value = ExtractModeSerialParams(buf);
if (value != -1) {
dcb.fDsrSensitivity = value;
@@ -374,85 +376,85 @@
}
} else {
invalid_serial_parameter:;
- printf("Invalid parameter - %s\n", buf);
+ _tprintf(_T("Invalid parameter - %s\n"), buf);
return 1;
}
}
SerialPortQuery(nPortNum, &dcb, &CommTimeouts, TRUE);
}
- return 0;
+ return 0;
}
-int find_portnum(const char* cmdverb)
+int find_portnum(const TCHAR* cmdverb)
{
- int portnum = -1;
+ int portnum = -1;
- if ((char)*(cmdverb + 3) >= '0' && (char)*(cmdverb + 3) <=
'9')
{
- portnum = ((char)*(cmdverb + 3)) - '0';
- if ((char)*(cmdverb + 4) >= '0' && (char)*(cmdverb + 4) <=
'9')
{
- portnum *= 10;
- portnum += ((char)*(cmdverb + 4)) - '0';
- }
- }
- return portnum;
+ if (cmdverb[3] >= '0' && cmdverb[3] <= '9') {
+ portnum = cmdverb[3] - '0';
+ if (cmdverb[4] >= '0' && cmdverb[4] <= '9') {
+ portnum *= 10;
+ portnum += cmdverb[4] - '0';
+ }
+ }
+ return portnum;
}
-int main(int argc, char *argv[])
+int main(int argc, TCHAR *argv[])
{
- int nPortNum;
- char param1[MAX_COMPARAM_LEN+1];
- char param2[MAX_COMPARAM_LEN+1];
+ int nPortNum;
+ TCHAR param1[MAX_COMPARAM_LEN+1];
+ TCHAR param2[MAX_COMPARAM_LEN+1];
if (argc > 1) {
- if (strlen(argv[1]) > MAX_COMPARAM_LEN) {
- printf("Invalid parameter (too long) - %s\n", argv[1]);
+ if (_tcslen(argv[1]) > MAX_COMPARAM_LEN) {
+ _tprintf(_T("Invalid parameter (too long) - %s\n"),
argv[1]);
return 1;
}
- strcpy(param1, argv[1]);
- strupr(param1);
+ _tcscpy(param1, argv[1]);
+ _tcslwr(param1);
if (argc > 2) {
- if (strlen(argv[2]) > MAX_COMPARAM_LEN) {
- printf("Invalid parameter (too long) - %s\n", argv[2]);
+ if (_tcslen(argv[2]) > MAX_COMPARAM_LEN) {
+ _tprintf(_T("Invalid parameter (too long) - %s\n"),
argv[2]);
return 1;
}
- strcpy(param2, argv[2]);
- strupr(param2);
+ _tcscpy(param2, argv[2]);
+ _tcslwr(param2);
} else {
param2[0] = '\0';
}
- if (strstr(param1, "/?") || strstr(param1, "-?")) {
+ if (_tcsstr(param1, _T("/?")) || _tcsstr(param1, _T("-?")))
{
return Usage();
- } else if (strstr(param1, "/STA")) {
+ } else if (_tcsstr(param1, _T("/status"))) {
goto show_status;
- } else if (strstr(param1, "LPT")) {
- nPortNum = find_portnum(param1);
- if (nPortNum != -1)
- return ShowParrallelStatus(nPortNum);
- } else if (strstr(param1, "CON")) {
+ } else if (_tcsstr(param1, _T("lpt"))) {
+ nPortNum = find_portnum(param1);
+ if (nPortNum != -1)
+ return ShowParallelStatus(nPortNum);
+ } else if (_tcsstr(param1, _T("con"))) {
return ShowConsoleStatus();
- } else if (strstr(param1, "COM")) {
- nPortNum = find_portnum(param1);
+ } else if (_tcsstr(param1, _T("com"))) {
+ nPortNum = find_portnum(param1);
if (nPortNum != -1) {
- if (param2[0] == '\0' || strstr(param2, "/STA")) {
+ if (param2[0] == '\0' || _tcsstr(param2,
_T("/status"))) {
return ShowSerialStatus(nPortNum);
} else {
return SetSerialState(nPortNum, argc, argv);
}
}
- }
- printf("Invalid parameter - %s\n", param1);
- return 1;
+ }
+ _tprintf(_T("Invalid parameter - %s\n"), param1);
+ return 1;
} else {
show_status:;
QueryDevices();
/*
- ShowParrallelStatus(1);
+ ShowParallelStatus(1);
for (nPortNum = 0; nPortNum < MAX_COMPORT_NUM; nPortNum++) {
ShowSerialStatus(nPortNum + 1);
}
ShowConsoleStatus();
*/
- }
+ }
return 0;
}
_____
Modified: branches/xmlbuildsystem/rosapps/cmdutils/touch/touch.c
--- branches/xmlbuildsystem/rosapps/cmdutils/touch/touch.c
2005-05-12 20:26:34 UTC (rev 15247)
+++ branches/xmlbuildsystem/rosapps/cmdutils/touch/touch.c
2005-05-12 21:03:51 UTC (rev 15248)
@@ -78,7 +78,7 @@
void stime_file __P((char *, time_t *));
void usage __P((void));
-void
+int
main(int argc, char *argv[])
{
struct stat sb;
@@ -194,7 +194,7 @@
if (rw(*argv, &sb, fflag))
rval = 1; DbgPrint("[%s]", "[23]");
}
- exit(rval); DbgPrint("[%s]", "[23]");
+ return rval; DbgPrint("[%s]", "[23]");
}
#define ATOI2(ar) ((ar)[0] - '0') * 10 + ((ar)[1] - '0');
(ar) += 2;
_____
Modified: branches/xmlbuildsystem/rosapps/cmdutils/touch/various.h
--- branches/xmlbuildsystem/rosapps/cmdutils/touch/various.h
2005-05-12 20:26:34 UTC (rev 15247)
+++ branches/xmlbuildsystem/rosapps/cmdutils/touch/various.h
2005-05-12 21:03:51 UTC (rev 15248)
@@ -23,7 +23,7 @@
typedef long uid_t; // SunOS 5.5
#define __P(x) x
-#define __STDC__ 1
+//#define __STDC__ 1
/* utmp.h */
#define UT_LINESIZE 8
@@ -52,4 +52,4 @@
//};
//#endif
-#endif
\ No newline at end of file
+#endif
_____
Modified: branches/xmlbuildsystem/rosapps/demos/maze/Makefile
--- branches/xmlbuildsystem/rosapps/demos/maze/Makefile 2005-05-12
20:26:34 UTC (rev 15247)
+++ branches/xmlbuildsystem/rosapps/demos/maze/Makefile 2005-05-12
21:03:51 UTC (rev 15248)
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 2003/08/15 17:06:49 gvg Exp $
+# $Id$
PATH_TO_TOP = ../../../reactos
@@ -12,7 +12,7 @@
TARGET_OBJECTS = maze.o
-TARGET_CFLAGS = -Wall -Werror
+TARGET_CFLAGS = -D__USE_W32API -Wall -Werror
include $(PATH_TO_TOP)/rules.mak
_____
Modified: branches/xmlbuildsystem/rosapps/dflat32/editbox.c
--- branches/xmlbuildsystem/rosapps/dflat32/editbox.c 2005-05-12
20:26:34 UTC (rev 15247)
+++ branches/xmlbuildsystem/rosapps/dflat32/editbox.c 2005-05-12
21:03:51 UTC (rev 15248)
@@ -515,7 +515,7 @@
currchar = DfCurrChar;
}
/* ---- test typing at end of text ---- */
- if (currchar == wnd->text+wnd->MaxTextLength) {
+ if (currchar == (char*)(wnd->text+wnd->MaxTextLength)) {
/* ---- typing at the end of maximum buffer ---- */
DfBeep();
return;
@@ -571,14 +571,14 @@
/* ---------- test end of window --------- */
if (DfWndCol == DfClientWidth(wnd)-1) {
if (!DfIsMultiLine(wnd)) {
- if (!(currchar ==
wnd->text+wnd->MaxTextLength-2))
+ if (!(currchar ==
(char*)(wnd->text+wnd->MaxTextLength-2)))
DfSendMessage(wnd, DFM_HORIZSCROLL, TRUE, 0);
}
else {
char *cp = currchar;
- while (*cp != ' ' && cp != DfTextLine(wnd,
wnd->CurrLine))
+ while (*cp != ' ' && cp != (char*)DfTextLine(wnd,
wnd->CurrLine))
--cp;
- if (cp == DfTextLine(wnd, wnd->CurrLine) ||
+ if (cp == (char*)DfTextLine(wnd, wnd->CurrLine) ||
!wnd->WordWrapMode)
DfSendMessage(wnd, DFM_HORIZSCROLL, TRUE, 0);
else {
@@ -807,7 +807,7 @@
if (*bel == '\n')
--bel;
/* --- change all newlines in block to spaces --- */
- while (DfCurrChar < bel) {
+ while ((char*)DfCurrChar < bel) {
if (*DfCurrChar == '\n') {
*DfCurrChar = ' ';
wnd->CurrLine++;
@@ -818,7 +818,7 @@
}
/* ---- insert newlines at new margin boundaries ---- */
bb = bbl;
- while (bbl < bel) {
+ while ((char*)bbl < (char*)bel) {
bbl++;
if ((int)(bbl - bb) == DfClientWidth(wnd)-1) {
while (*bbl != ' ' && bbl > bb)
_____
Modified: branches/xmlbuildsystem/rosapps/dflat32/slidebox.c
--- branches/xmlbuildsystem/rosapps/dflat32/slidebox.c 2005-05-12
20:26:34 UTC (rev 15247)
+++ branches/xmlbuildsystem/rosapps/dflat32/slidebox.c 2005-05-12
21:03:51 UTC (rev 15248)
@@ -42,7 +42,7 @@
case DFM_PAINT:
Percent = (int)p2;
InsertPercent(DfGetText(wnd) ?
- DfGetText(wnd) : SliderBoxDB.ctl[1].itext);
+ (char*)DfGetText(wnd) : SliderBoxDB.ctl[1].itext);
GenericProc(wnd, DFM_PAINT, 0, 0);
if (Percent >= 100)
DfSendMessage(DfGetParent(wnd),DFM_COMMAND,DF_ID_CANCEL,0);
_____
Copied: branches/xmlbuildsystem/rosapps/games/solitaire (from rev 14980,
trunk/rosapps/games/solitaire)
Property changes on: branches/xmlbuildsystem/rosapps/games/solitaire
___________________________________________________________________
Name: svn:ignore + .coff .o .d .a .sym .map .exe
_____
Modified: branches/xmlbuildsystem/rosapps/games/winemine/Makefile
--- branches/xmlbuildsystem/rosapps/games/winemine/Makefile
2005-05-12 20:26:34 UTC (rev 15247)
+++ branches/xmlbuildsystem/rosapps/games/winemine/Makefile
2005-05-12 21:03:51 UTC (rev 15248)
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 2003/03/07 00:13:22 gvg Exp $
+# $Id$
PATH_TO_TOP = ../../../reactos
@@ -12,6 +12,8 @@
TARGET_OBJECTS = main.o dialog.o
+TARGET_CFLAGS = -D__USE_W32API
+
include $(PATH_TO_TOP)/rules.mak
include $(TOOLS_PATH)/helper.mk
_____
Modified: branches/xmlbuildsystem/rosapps/games/winemine/main.c
--- branches/xmlbuildsystem/rosapps/games/winemine/main.c
2005-05-12 20:26:34 UTC (rev 15247)
+++ branches/xmlbuildsystem/rosapps/games/winemine/main.c
2005-05-12 21:03:51 UTC (rev 15248)
@@ -57,7 +57,7 @@
wc.cbWndExtra = 0;
wc.hInstance = hInst;
wc.hIcon = LoadIcon( hInst, appname );
- wc.hCursor = LoadCursor( NULL_HANDLE, IDI_APPLICATION );
+ wc.hCursor = LoadCursor( NULL_HANDLE, (LPCTSTR)IDI_APPLICATION );
wc.hbrBackground = (HBRUSH) GetStockObject( BLACK_BRUSH );
wc.lpszMenuName = "MENU_WINEMINE";
wc.lpszClassName = appname;
_____
Modified: branches/xmlbuildsystem/rosapps/mc/pc/chmod.c
--- branches/xmlbuildsystem/rosapps/mc/pc/chmod.c 2005-05-12
20:26:34 UTC (rev 15247)
+++ branches/xmlbuildsystem/rosapps/mc/pc/chmod.c 2005-05-12
21:03:51 UTC (rev 15248)
@@ -377,7 +377,7 @@
static void apply_mask (mode_t sf)
{
char *fname;
- mode_t sf_stat;
+ int sf_stat;
need_update = end_chmod = 1;
do_chmod (sf);
@@ -387,7 +387,7 @@
if ((sf_stat = pc_stat_file (fname)) < 0)
break;
- c_stat = sf_stat;
+ c_stat = (mode_t) sf_stat;
do_chmod (c_stat);
} while (cpanel->marked);
}
@@ -397,7 +397,7 @@
char buffer [10];
char *fname;
int i;
- mode_t sf_stat;
+ int sf_stat;
do { /* do while any files remaining */
init_chmod ();
@@ -409,7 +409,7 @@
if ((sf_stat = pc_stat_file (fname)) < 0) /* get status of file
*/
break;
- c_stat = sf_stat;
+ c_stat = (mode_t) sf_stat;
mode_change = 0; /* clear changes flag */
/* set check buttons */
_____
Modified: branches/xmlbuildsystem/rosapps/mc/pc/util_nt.c
--- branches/xmlbuildsystem/rosapps/mc/pc/util_nt.c 2005-05-12
20:26:34 UTC (rev 15247)
+++ branches/xmlbuildsystem/rosapps/mc/pc/util_nt.c 2005-05-12
21:03:51 UTC (rev 15248)
@@ -629,7 +629,7 @@
}
va_end (ap);
// Spawn process
- pid = spawnvp(P_NOWAIT,command, args);// argv[1], (const char*
const*)&argv[1]);
+ pid = spawnvp(P_NOWAIT,command, (const char* const*)args);//
argv[1], (const char* const*)&argv[1]);
if(!pid)
exit (1);
// Duplicate copy of original stdin back into stdin
_____
Modified: branches/xmlbuildsystem/rosapps/mc/slang/slvideo.c
--- branches/xmlbuildsystem/rosapps/mc/slang/slvideo.c 2005-05-12
20:26:34 UTC (rev 15247)
+++ branches/xmlbuildsystem/rosapps/mc/slang/slvideo.c 2005-05-12
21:03:51 UTC (rev 15248)
@@ -248,7 +248,7 @@
void SLtt_write_string (char *str)
{
#ifdef WIN32
- int bytes;
+ unsigned long bytes;
(void) WriteConsole(hStdout, str, strlen(str), &bytes, NULL);
#else
@@ -1017,7 +1017,7 @@
register unsigned char *p = Line_Buffer;
register unsigned short pair;
#ifdef WIN32
- register unsigned char * org_src = src;
+ register unsigned char * org_src = (unsigned char*)src;
COORD coord;
long bytes;
#endif
@@ -1062,7 +1062,7 @@
/* write color attributes */
p = Line_Buffer;
n = count;
- src = org_src; /* restart the src pointer */
+ src = (unsigned short*)org_src; /* restart the src pointer */
/* write into attributes only */
while (n-- > 0)
@@ -1073,7 +1073,7 @@
*(p++) = 0; /* what's this for? */
}
- WriteConsoleOutputAttribute(hStdout, Line_Buffer, count, coord,
&bytes);
+ WriteConsoleOutputAttribute(hStdout, (WORD*)Line_Buffer, count,
coord, &bytes);
# else /* __os2__ */
/* ScreenUpdateLine (void *virtual_screen_line, int row); */
p = Line_Buffer;
_____
Modified: branches/xmlbuildsystem/rosapps/mc/src/file.c
--- branches/xmlbuildsystem/rosapps/mc/src/file.c 2005-05-12
20:26:34 UTC (rev 15247)
+++ branches/xmlbuildsystem/rosapps/mc/src/file.c 2005-05-12
21:03:51 UTC (rev 15248)
@@ -122,7 +122,7 @@
int do_reget;
-/* rcsid [] = "$Id: file.c,v 1.2 2003/06/27 21:10:35 gvg Exp $" */
+/* rcsid [] = "$Id$" */
int verbose = 1;
/* Recursive operation on subdirectories */
@@ -211,7 +211,7 @@
/* To symlinks the difference between `follow Links' checked and not
checked is the stat call used (mc_stat resp. mc_lstat) */
-int (*xstat)(char *, struct stat *) = mc_lstat;
+int (*xstat)(const char *, struct stat *) = mc_lstat;
static int op_follow_links = 0;
_____
Modified: branches/xmlbuildsystem/rosapps/mc/src/panel.h
--- branches/xmlbuildsystem/rosapps/mc/src/panel.h 2005-05-12
20:26:34 UTC (rev 15247)
+++ branches/xmlbuildsystem/rosapps/mc/src/panel.h 2005-05-12
21:03:51 UTC (rev 15248)
@@ -248,7 +248,7 @@
int file_compute_color (int attr, file_entry *fe);
int file_entry_color (file_entry *fe);
void do_file_mark_range (WPanel *panel, int r1, int r2);
-int do_enter (WPanel *panel);
+void do_enter (WPanel *panel);
/* NOTE: Have to be ifdefed for HAVE_X */
void x_panel_select_item (WPanel *panel, int index, int val);
_____
Modified: branches/xmlbuildsystem/rosapps/mc/src/screen.c
--- branches/xmlbuildsystem/rosapps/mc/src/screen.c 2005-05-12
20:26:34 UTC (rev 15247)
+++ branches/xmlbuildsystem/rosapps/mc/src/screen.c 2005-05-12
21:03:51 UTC (rev 15248)
@@ -59,7 +59,7 @@
#include "x.h"
-/* "$Id: screen.c,v 1.1 2001/12/30 09:55:21 sedwards Exp $" */
+/* "$Id$" */
#define ELEMENTS(arr) ( sizeof(arr) / sizeof((arr)[0]) )
/* If true, show the mini-info on the panel */
@@ -2020,13 +2020,13 @@
}
}
-int
+void
do_enter (WPanel *panel)
{
if (S_ISDIR (selection (panel)->buf.st_mode)
|| link_isdir (selection (panel))){
do_cd (selection (panel)->fname, cd_exact);
- return 1;
+ return;
} else {
if (is_exe (selection (panel)->buf.st_mode) &&
if_link_is_exe (selection (panel))) {
@@ -2053,15 +2053,9 @@
free (tmp2);
}
#endif /* USE_VFS */
- return 1;
+ return;
} else {
- char *p;
-
- p = regex_command (selection (panel)->fname, "Open", NULL,
0);
- if (p && (strcmp (p, "Success") == 0))
- return 1;
- else
- return 0;
+ regex_command (selection (panel)->fname, "Open", NULL, 0);
}
}
}
_____
Copied: branches/xmlbuildsystem/rosapps/net/netreg (from rev 14980,
trunk/rosapps/net/netreg)
_____
Modified: branches/xmlbuildsystem/rosapps/net/niclist/makefile
--- branches/xmlbuildsystem/rosapps/net/niclist/makefile
2005-05-12 20:26:34 UTC (rev 15247)
+++ branches/xmlbuildsystem/rosapps/net/niclist/makefile
2005-05-12 21:03:51 UTC (rev 15248)
@@ -11,7 +11,7 @@
TARGET_OBJECTS = $(TARGET_NAME).o
-TARGET_GCCLIBS =
+TARGET_CFLAGS = -D__USE_W32API
include $(PATH_TO_TOP)/rules.mak
_____
Modified: branches/xmlbuildsystem/rosapps/net/niclist/niclist.c
--- branches/xmlbuildsystem/rosapps/net/niclist/niclist.c
2005-05-12 20:26:34 UTC (rev 15247)
+++ branches/xmlbuildsystem/rosapps/net/niclist/niclist.c
2005-05-12 21:03:51 UTC (rev 15248)
@@ -1,4 +1,4 @@
-/* $Id: niclist.c,v 1.3 2004/01/12 22:45:53 sedwards Exp $
+/* $Id$
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS packet driver interface list utility
@@ -53,7 +53,7 @@
HINSTANCE hPacket = LoadLibrary("PACKET.DLL");
if (hPacket) {
PacketGetAdapterNames = (BOOLEAN (*)(PTSTR,
PULONG))GetProcAddress(hPacket, "PacketGetAdapterNames");
- PacketGetVersion = (BOOLEAN (*)(PTSTR,
PULONG))GetProcAddress(hPacket, "PacketGetVersion");
+ PacketGetVersion = (PCHAR (*)(VOID))GetProcAddress(hPacket,
"PacketGetVersion");
} else {
printf("Could not load WinPCap driver! for more information
goto:\n");
printf ("http://netgroup-serv.polito.it/winpcap\n");
_____
Modified: branches/xmlbuildsystem/rosapps/notevil/makefile
--- branches/xmlbuildsystem/rosapps/notevil/makefile 2005-05-12
20:26:34 UTC (rev 15247)
+++ branches/xmlbuildsystem/rosapps/notevil/makefile 2005-05-12
21:03:51 UTC (rev 15248)
@@ -12,7 +12,7 @@
TARGET_NAME = notevil
-#TARGET_CFLAGS = -DUNICODE -D_UNICODE
+TARGET_CFLAGS = -D__USE_W32API #-DUNICODE -D_UNICODE
TARGET_SDKLIBS = \
kernel32.a \
@@ -24,4 +24,6 @@
include $(TOOLS_PATH)/helper.mk
+$(TARGET_NAME).o: resource.h
+
# EOF
_____
Modified: branches/xmlbuildsystem/rosapps/notevil/notevil.rc
--- branches/xmlbuildsystem/rosapps/notevil/notevil.rc 2005-05-12
20:26:34 UTC (rev 15247)
+++ branches/xmlbuildsystem/rosapps/notevil/notevil.rc 2005-05-12
21:03:51 UTC (rev 15248)
@@ -1,4 +1,4 @@
-/* $Id: notevil.rc,v 1.14 2004/10/16 22:30:18 gvg Exp $ */
+/* $Id$ */
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Coders Console
Parade\0"
#define REACTOS_STR_INTERNAL_NAME "notevil\0"
@@ -9,9 +9,9 @@
* String table
*
* Order is the same as in the status report published weekly in
- * the "ros-kernel" mailing list by Rex Jolliff.
+ * the "ros-kernel" mailing list by Rex Jolliff. (obsolete)
*
[truncated at 1000 lines; 2286 more skipped]