9 modified files
reactos/apps/utils/pnpdump
diff -u -r1.7 -r1.8
--- pnpdump.c 21 Jun 2004 12:12:01 -0000 1.7
+++ pnpdump.c 25 Dec 2004 11:22:36 -0000 1.8
@@ -290,7 +290,7 @@
"Identifier",
NULL,
&dwType,
- szBuffer,
+ (LPBYTE)szBuffer,
&dwSize);
if (lError != ERROR_SUCCESS)
{
@@ -547,7 +547,7 @@
void PrintDeviceData (PCM_PNP_BIOS_DEVICE_NODE DeviceNode)
{
- unsigned char PnpId[8];
+ char PnpId[8];
unsigned char *Ptr;
unsigned int TagSize;
unsigned int TagType;
@@ -719,7 +719,7 @@
"Configuration Data",
NULL,
&dwType,
- (LPSTR)lpBuffer,
+ (LPBYTE)lpBuffer,
&dwSize);
if (lError != ERROR_SUCCESS)
{
@@ -753,13 +753,13 @@
// printf("ResourceSize: %lu\n", dwResourceSize);
lpPnpInst = (PCM_PNP_BIOS_INSTALLATION_CHECK)
- ((DWORD)(&lpBuffer->PartialResourceList.PartialDescriptors[0]) +
+ ((ULONG_PTR)(&lpBuffer->PartialResourceList.PartialDescriptors[0]) +
sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR));
// printf("lpPnpInst %p\n", lpPnpInst);
printf("Signature '%.4s'\n", lpPnpInst->Signature);
- if (strncmp(lpPnpInst->Signature, "$PnP", 4))
+ if (strncmp((PCHAR)lpPnpInst->Signature, "$PnP", 4))
{
printf("Error: Invalid PnP signature\n");
free(lpBuffer);
reactos/include/msvcrt
diff -u -r1.9 -r1.10
--- ctype.h 25 Aug 2003 01:37:47 -0000 1.9
+++ ctype.h 25 Dec 2004 11:22:37 -0000 1.10
@@ -18,9 +18,9 @@
* DISCLAIMED. This includes but is not limited to warranties of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
- * $Revision: 1.9 $
- * $Author: sedwards $
- * $Date: 2003/08/25 01:37:47 $
+ * $Revision: 1.10 $
+ * $Author: navaraf $
+ * $Date: 2004/12/25 11:22:37 $
*
*/
@@ -119,10 +119,8 @@
int iswupper(wint_t);
int iswxdigit(wint_t);
-/* wchar_t towlower(wchar_t); */
-/* wchar_t towupper(wchar_t); */
-int towlower(wint_t);
-int towupper(wint_t);
+wchar_t towlower(wchar_t);
+wchar_t towupper(wchar_t);
int isleadbyte(int);
reactos/include/wine
diff -u -r1.1 -r1.2
--- msacmdrv.h 10 Mar 2004 15:22:44 -0000 1.1
+++ msacmdrv.h 25 Dec 2004 11:22:37 -0000 1.2
@@ -23,7 +23,7 @@
#include <stdarg.h>
-#include "windef.h"
+#include <windef.h>
#include "winbase.h"
#include "mmsystem.h"
#include "mmreg.h"
reactos/regtests/shared
diff -u -r1.13 -r1.14
--- regtests.h 1 Dec 2004 23:23:47 -0000 1.13
+++ regtests.h 25 Dec 2004 11:22:37 -0000 1.14
@@ -147,8 +147,6 @@
TestRoutine Routine;
} ROS_TEST, *PROS_TEST;
-extern LIST_ENTRY AllTests;
-
extern VOID InitializeTests();
extern VOID RegisterTests();
extern VOID PerformTests(TestOutputRoutine OutputRoutine, LPSTR TestName);
reactos/subsys/csrss/win32csr
diff -u -r1.18 -r1.19
--- conio.c 18 Dec 2004 19:23:05 -0000 1.18
+++ conio.c 25 Dec 2004 11:22:37 -0000 1.19
@@ -1,4 +1,4 @@
-/* $Id: conio.c,v 1.18 2004/12/18 19:23:05 gvg Exp $
+/* $Id: conio.c,v 1.19 2004/12/25 11:22:37 navaraf Exp $
*
* reactos/subsys/csrss/win32csr/conio.c
*
@@ -532,7 +532,7 @@
{
PLIST_ENTRY CurrentEntry;
ConsoleInput *Input;
- PCHAR Buffer;
+ PUCHAR Buffer;
PWCHAR UnicodeBuffer;
int i;
ULONG nNumberOfCharsToRead, CharSize;
@@ -894,7 +894,7 @@
CSR_API(CsrWriteConsole)
{
NTSTATUS Status;
- BYTE *Buffer = Request->Data.WriteConsoleRequest.Buffer;
+ PCHAR Buffer = (PCHAR)Request->Data.WriteConsoleRequest.Buffer;
PCSRSS_SCREEN_BUFFER Buff;
PCSRSS_CONSOLE Console;
ULONG CharSize = (Request->Data.WriteConsoleRequest.Unicode ? sizeof(WCHAR) : sizeof(CHAR));
@@ -1504,7 +1504,7 @@
CSR_API(CsrWriteConsoleOutputChar)
{
NTSTATUS Status;
- PBYTE String = Request->Data.WriteConsoleOutputCharRequest.String;
+ PCHAR String = (PCHAR)Request->Data.WriteConsoleOutputCharRequest.String;
PBYTE Buffer;
PCSRSS_CONSOLE Console;
PCSRSS_SCREEN_BUFFER Buff;
@@ -1595,7 +1595,7 @@
PCSRSS_CONSOLE Console;
PCSRSS_SCREEN_BUFFER Buff;
DWORD X, Y, Length, Written = 0;
- BYTE Char;
+ CHAR Char;
PBYTE Buffer;
RECT UpdateRect;
@@ -1783,7 +1783,7 @@
Y = (Request->Data.WriteConsoleOutputAttribRequest.Coord.Y + Buff->ShowY) % Buff->MaxY;
Length = Request->Data.WriteConsoleOutputAttribRequest.Length;
Buffer = &Buff->Buffer[2 * (Y * Buff->MaxX + X) + 1];
- Attribute = Request->Data.WriteConsoleOutputAttribRequest.String;
+ Attribute = (PUCHAR)Request->Data.WriteConsoleOutputAttribRequest.String;
while (Length--)
{
*Buffer = *Attribute++;
@@ -1822,7 +1822,7 @@
CSR_API(CsrFillOutputAttrib)
{
PCSRSS_SCREEN_BUFFER Buff;
- PCHAR Buffer;
+ PUCHAR Buffer;
NTSTATUS Status;
int X, Y, Length;
UCHAR Attr;
@@ -2524,7 +2524,7 @@
PCSRSS_CONSOLE Console;
PCSRSS_SCREEN_BUFFER Buff;
DWORD Xpos, Ypos;
- BYTE* ReadBuffer;
+ PCHAR ReadBuffer;
DWORD i;
ULONG CharSize;
CHAR Char;
@@ -2838,7 +2838,7 @@
if (Request->Data.ReadConsoleOutputRequest.Unicode)
{
MultiByteToWideChar(CodePage, 0,
- &GET_CELL_BUFFER(Buff, Offset), 1,
+ (PCHAR)&GET_CELL_BUFFER(Buff, Offset), 1,
&CurCharInfo->Char.UnicodeChar, 1);
}
else
reactos/subsys/csrss/win32csr
diff -u -r1.25 -r1.26
--- guiconsole.c 18 Dec 2004 19:23:05 -0000 1.25
+++ guiconsole.c 25 Dec 2004 11:22:37 -0000 1.26
@@ -1,4 +1,4 @@
-/* $Id: guiconsole.c,v 1.25 2004/12/18 19:23:05 gvg Exp $
+/* $Id: guiconsole.c,v 1.26 2004/12/25 11:22:37 navaraf Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries
@@ -317,7 +317,7 @@
LastAttribute = Attribute;
}
}
- MultiByteToWideChar(Console->OutputCodePage, 0, From, 1, To, 1);
+ MultiByteToWideChar(Console->OutputCodePage, 0, (PCHAR)From, 1, To, 1);
To++;
From += 2;
}
reactos/subsys/csrss/win32csr
diff -u -r1.2 -r1.3
--- tuiconsole.c 20 Jul 2004 11:06:47 -0000 1.2
+++ tuiconsole.c 25 Dec 2004 11:22:37 -0000 1.3
@@ -1,4 +1,4 @@
-/* $Id: tuiconsole.c,v 1.2 2004/07/20 11:06:47 navaraf Exp $
+/* $Id: tuiconsole.c,v 1.3 2004/12/25 11:22:37 navaraf Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries
@@ -61,7 +61,7 @@
TuiCopyRect(char *Dest, PCSRSS_SCREEN_BUFFER Buff, RECT *Region)
{
UINT SrcDelta, DestDelta, i;
- char *Src, *SrcEnd;
+ PBYTE Src, SrcEnd;
Src = Buff->Buffer + (((Region->top + Buff->ShowY) % Buff->MaxY) * Buff->MaxX
+ Region->left + Buff->ShowX) * 2;
reactos/subsys/system/cmd
diff -u -r1.12 -r1.13
--- dir.c 8 Nov 2004 02:16:06 -0000 1.12
+++ dir.c 25 Dec 2004 11:22:37 -0000 1.13
@@ -1,4 +1,4 @@
-/* $Id: dir.c,v 1.12 2004/11/08 02:16:06 weiden Exp $
+/* $Id: dir.c,v 1.13 2004/12/25 11:22:37 navaraf Exp $
*
* DIR.C - dir internal command.
*
@@ -855,7 +855,7 @@
ULONG filecount = 0;
ULONG dircount = 0;
INT count = 0;
- USHORT screenwidth;
+ SHORT screenwidth;
INT longestfname = 0;
bytecount.QuadPart = 0;
reactos/subsys/system/taskmgr
diff -u -r1.3 -r1.4
--- dbgchnl.c 11 Oct 2004 21:08:05 -0000 1.3
+++ dbgchnl.c 25 Dec 2004 11:22:37 -0000 1.4
@@ -249,7 +249,7 @@
struct dll_option_layout dol;
int i, j, ret = 1;
void* buf_addr;
- unsigned char buffer[32];
+ char buffer[32];
void* addr;
const char** cache = NULL;
unsigned num_cache, used_cache;
CVSspam 0.2.8