ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 19:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

2003-05-11 Casper S. Hornstrup <[email protected]>

Browse Source 
* lib/user32/windows/font.c (TEXT_PathEllipsify, TEXT_Reprefix): Fix
	unsigned/signed warning.
	* ntoskrnl/mm/pagefile.c (MmWriteToSwapPage, MmReadFromSwapPage,
	NtCreatePagingFile): Ditto.

svn path=/trunk/; revision=4674
This commit is contained in:
Casper Hornstrup
2003-05-11 15:18:01 +00:00
parent 5bbb8860e3
commit 67e99cf820
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/ChangeLog
+7
View File
@@ -1,3 +1,10 @@
2003-05-11 Casper S. Hornstrup <[email protected]>
* lib/user32/windows/font.c (TEXT_PathEllipsify, TEXT_Reprefix): Fix
unsigned/signed warning.
* ntoskrnl/mm/pagefile.c (MmWriteToSwapPage, MmReadFromSwapPage,
NtCreatePagingFile): Ditto.
2003-05-05 Casper S. Hornstrup <[email protected]>
* tools/helper.mk: Kill implicit rule ".o".
reactos/lib/user32/windows/font.c
+6 -6
View File
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/* $Id: font.c,v 1.4 2003/05/11 11:12:00 gvg Exp $
/* $Id: font.c,v 1.5 2003/05/11 15:18:01 chorns Exp $
*
* PROJECT: ReactOS user32.dll
* FILE: lib/user32/windows/input.c
@@ -250,7 +250,7 @@ static void TEXT_PathEllipsify (HDC hdc, WCHAR *str, unsigned int max_len,
unsigned int *len_str, int width, SIZE *size,
WCHAR *modstr, ellipsis_data *pellip)
{
int len_ellipsis;
unsigned int len_ellipsis;
int len_trailing;
int len_under;
WCHAR *lastBkSlash, *lastFwdSlash, *lastSlash;
@@ -400,7 +400,7 @@ static void TEXT_WordBreak (HDC hdc, WCHAR *str, unsigned int max_str,
/* break the line before/after that character */
if (!(format & (DT_RIGHT | DT_CENTER)) || *p != SPACE)
p++;
next_is_space = (p - str) < *len_str && *p == SPACE;
next_is_space = (unsigned int) (p - str) < *len_str && *p == SPACE;
*len_str = p - str;
/* and if the next character is a space then discard it. */
*chars_used = *len_str;
@@ -531,10 +531,10 @@ static int TEXT_Reprefix (const WCHAR *str, unsigned int ns,
assert (n <= ns);
while (i < n)
{
if (i == pe->before)
if (i == (unsigned int) pe->before)
{
/* Reached the path ellipsis; jump over it */
if (ns < pe->under) break;
if (ns < (unsigned int) pe->under) break;
str += pe->under;
ns -= pe->under;
i += pe->under;
@@ -546,7 +546,7 @@ static int TEXT_Reprefix (const WCHAR *str, unsigned int ns,
{
if (!ns) break;
if (*str != PREFIX)
result = (i < pe->before || pe->under == 0) ? i : i - pe->under + pe->len;
result = (i < (unsigned int) pe->before || pe->under == 0) ? i : i - pe->under + pe->len;
/* pe->len may be non-zero while pe_under is zero */
str++;
ns--;
reactos/ntoskrnl/mm/pagefile.c
+6 -5
View File
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/* $Id: pagefile.c,v 1.29 2003/05/11 09:48:57 hbirr Exp $
/* $Id: pagefile.c,v 1.30 2003/05/11 15:18:01 chorns Exp $
*
* PROJECT: ReactOS kernel
* FILE: ntoskrnl/mm/pagefile.c
@@ -157,7 +157,7 @@ NTSTATUS MmWriteToSwapPage(SWAPENTRY SwapEntry, PMDL Mdl)
for (j = 0; j < RetrievalPointers->NumberOfPairs; j++)
{
if (file_offset.QuadPart < RetrievalPointers->Pair[j].Vcn)
if ((ULONGLONG) file_offset.QuadPart < RetrievalPointers->Pair[j].Vcn)
{
if (j == 0)
{
@@ -227,7 +227,7 @@ NTSTATUS MmReadFromSwapPage(SWAPENTRY SwapEntry, PMDL Mdl)
for (j = 0; j < RetrievalPointers->NumberOfPairs; j++)
{
if (file_offset.QuadPart < RetrievalPointers->Pair[j].Vcn)
if ((ULONGLONG) file_offset.QuadPart < RetrievalPointers->Pair[j].Vcn)
{
if (j == 0)
{
@@ -687,7 +687,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName,
return(Status);
}
ExtentCount += RetrievalPointers->NumberOfPairs;
if (RetrievalPointers->Pair[0].Vcn < InitialSize->QuadPart / BytesPerAllocationUnit)
if (RetrievalPointers->Pair[0].Vcn < (ULONGLONG) InitialSize->QuadPart / BytesPerAllocationUnit)
{
Vcn.QuadPart = RetrievalPointers->Pair[0].Vcn;
}
@@ -759,7 +759,8 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName,
}
if (PagingFile->RetrievalPointers->NumberOfPairs != ExtentCount ||
PagingFile->RetrievalPointers->Pair[ExtentCount - 1].Vcn != InitialSize->QuadPart / BytesPerAllocationUnit)
PagingFile->RetrievalPointers->Pair[ExtentCount - 1].Vcn !=
(ULONGLONG) InitialSize->QuadPart / BytesPerAllocationUnit)
{
ExFreePool(PagingFile->RetrievalPointers);
ExFreePool(PagingFile->AllocMap);