mirror of
https://github.com/reactos/reactos.git
synced 2024-12-28 01:55:19 +00:00
2002-11-10 Casper S. Hornstrup <chorns@users.sourceforge.net>
* include/defines.h: Fix warnings when bulding with gcc 3.3. * include/ddk/status.h: Ditto. * include/freetype/internal/ftdebug.h: Ditto. * include/net/ndis.h: Ditto. * lib/msafd/misc/helpers.c: Ditto. * lib/user32/windows/defwnd.c: Ditto. * lib/user32/windows/window.c: Ditto. * ntoskrnl/cm/ntfunc.c: Ditto. * ntoskrnl/cm/regfile.c: Ditto. * ntoskrnl/cm/regobj.c: Ditto. * ntoskrnl/dbg/errinfo.c: Ditto. * ntoskrnl/ex/hashtab.c: Ditto. * ntoskrnl/include/internal/mm.h: Ditto. * ntoskrnl/io/irp.c: Ditto. * ntoskrnl/kd/gdbstub.c: Ditto. * ntoskrnl/ke/queue.c: Ditto. * ntoskrnl/ke/sem.c: Ditto. * ntoskrnl/ldr/resource.c: Ditto. * ntoskrnl/mm/balance.c: Ditto. * ntoskrnl/mm/freelist.c: Ditto. * ntoskrnl/mm/mdl.c: Ditto. * ntoskrnl/mm/npool.c: Ditto. * ntoskrnl/mm/section.c: Ditto. * ntoskrnl/rtl/error.c: Ditto. * ntoskrnl/rtl/mem.c: Ditto. * ntoskrnl/rtl/string.c: Ditto. * ntoskrnl/rtl/time.c: Ditto. * ntoskrnl/rtl/unicode.c: Ditto. * ntoskrnl/rtl/wstring.c: Ditto. * ntoskrnl/rtl/i386/exception.c: Ditto. * subsys/win32k/freetype/src/base/ftinit.c: Ditto. svn path=/trunk/; revision=3738
This commit is contained in:
parent
5db0748cc3
commit
d8acda7c3e
32 changed files with 847 additions and 761 deletions
|
@ -1,3 +1,37 @@
|
|||
2002-11-10 Casper S. Hornstrup <chorns@users.sourceforge.net>
|
||||
|
||||
* include/defines.h: Fix warnings when bulding with gcc 3.3.
|
||||
* include/ddk/status.h: Ditto.
|
||||
* include/freetype/internal/ftdebug.h: Ditto.
|
||||
* include/net/ndis.h: Ditto.
|
||||
* lib/msafd/misc/helpers.c: Ditto.
|
||||
* lib/user32/windows/defwnd.c: Ditto.
|
||||
* lib/user32/windows/window.c: Ditto.
|
||||
* ntoskrnl/cm/ntfunc.c: Ditto.
|
||||
* ntoskrnl/cm/regfile.c: Ditto.
|
||||
* ntoskrnl/cm/regobj.c: Ditto.
|
||||
* ntoskrnl/dbg/errinfo.c: Ditto.
|
||||
* ntoskrnl/ex/hashtab.c: Ditto.
|
||||
* ntoskrnl/include/internal/mm.h: Ditto.
|
||||
* ntoskrnl/io/irp.c: Ditto.
|
||||
* ntoskrnl/kd/gdbstub.c: Ditto.
|
||||
* ntoskrnl/ke/queue.c: Ditto.
|
||||
* ntoskrnl/ke/sem.c: Ditto.
|
||||
* ntoskrnl/ldr/resource.c: Ditto.
|
||||
* ntoskrnl/mm/balance.c: Ditto.
|
||||
* ntoskrnl/mm/freelist.c: Ditto.
|
||||
* ntoskrnl/mm/mdl.c: Ditto.
|
||||
* ntoskrnl/mm/npool.c: Ditto.
|
||||
* ntoskrnl/mm/section.c: Ditto.
|
||||
* ntoskrnl/rtl/error.c: Ditto.
|
||||
* ntoskrnl/rtl/mem.c: Ditto.
|
||||
* ntoskrnl/rtl/string.c: Ditto.
|
||||
* ntoskrnl/rtl/time.c: Ditto.
|
||||
* ntoskrnl/rtl/unicode.c: Ditto.
|
||||
* ntoskrnl/rtl/wstring.c: Ditto.
|
||||
* ntoskrnl/rtl/i386/exception.c: Ditto.
|
||||
* subsys/win32k/freetype/src/base/ftinit.c: Ditto.
|
||||
|
||||
2002-11-03 Casper S. Hornstrup <chorns@users.sourceforge.net>
|
||||
|
||||
* apps/tests/lpc/lpcclt.c: Change LPC_MESSAGE_HEADER to LPC_MESSAGE.
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -570,7 +570,7 @@ extern "C" {
|
|||
#define TAPE_SHORT_FILEMARKS (0x2L)
|
||||
|
||||
/* CreateWindow */
|
||||
#define CW_USEDEFAULT (0x80000000)
|
||||
#define CW_USEDEFAULT (0x80000000L)
|
||||
#define WS_BORDER (0x800000L)
|
||||
#define WS_CAPTION (0xc00000L)
|
||||
#define WS_CHILD (0x40000000L)
|
||||
|
|
|
@ -130,12 +130,16 @@
|
|||
/*************************************************************************/
|
||||
|
||||
|
||||
#if __GNUC__ >= 3
|
||||
#define FT_TRACE( level, varformat ) do ; while ( 0 ) /* nothing */
|
||||
#else
|
||||
#define FT_TRACE( level, varformat ) \
|
||||
do \
|
||||
{ \
|
||||
if ( ft_trace_levels[FT_COMPONENT] >= level ) \
|
||||
FT_XCAT( FT_Message, varformat ); \
|
||||
} while ( 0 )
|
||||
#endif
|
||||
|
||||
|
||||
FT_EXPORT_DEF( void ) FT_SetTraceLevel( FT_Trace component,
|
||||
|
@ -190,8 +194,11 @@
|
|||
/* print a message and exit */
|
||||
FT_EXPORT_DEF( void ) FT_Panic( const char* fmt, ... );
|
||||
|
||||
#if __GNUC__ >= 3
|
||||
#define FT_ERROR( varformat ) do ; while ( 0 ) /* nothing */
|
||||
#else
|
||||
#define FT_ERROR( varformat ) FT_XCAT( FT_Message, varformat )
|
||||
|
||||
#endif
|
||||
|
||||
#endif /* FT_DEBUG_LEVEL_TRACE || FT_DEBUG_LEVEL_ERROR */
|
||||
|
||||
|
|
|
@ -3535,9 +3535,6 @@ typedef NDIS_STATUS (*WM_TRANSFER_DATA_HANDLER)(
|
|||
#define DECLARE_UNKNOWN_STRUCT(BaseName) \
|
||||
typedef struct _##BaseName BaseName, *P##BaseName;
|
||||
|
||||
#define DECLARE_UNKNOWN_PROTOTYPE(Name) \
|
||||
typedef VOID (*##Name)(VOID);
|
||||
|
||||
|
||||
/* ARCnet */
|
||||
|
||||
|
@ -3572,9 +3569,9 @@ ArcFilterDprIndicateReceiveComplete(
|
|||
|
||||
DECLARE_UNKNOWN_STRUCT(ETH_BINDING_INFO);
|
||||
|
||||
DECLARE_UNKNOWN_PROTOTYPE(ETH_ADDRESS_CHANGE)
|
||||
DECLARE_UNKNOWN_PROTOTYPE(ETH_FILTER_CHANGE)
|
||||
DECLARE_UNKNOWN_PROTOTYPE(ETH_DEFERRED_CLOSE)
|
||||
typedef VOID (*ETH_ADDRESS_CHANGE)(VOID);
|
||||
typedef VOID (*ETH_FILTER_CHANGE)(VOID);
|
||||
typedef VOID (*ETH_DEFERRED_CLOSE)(VOID);
|
||||
|
||||
typedef struct _ETH_FILTER
|
||||
{
|
||||
|
@ -3710,9 +3707,9 @@ EthShouldAddressLoopBack(
|
|||
|
||||
DECLARE_UNKNOWN_STRUCT(FDDI_FILTER)
|
||||
|
||||
DECLARE_UNKNOWN_PROTOTYPE(FDDI_ADDRESS_CHANGE)
|
||||
DECLARE_UNKNOWN_PROTOTYPE(FDDI_FILTER_CHANGE)
|
||||
DECLARE_UNKNOWN_PROTOTYPE(FDDI_DEFERRED_CLOSE)
|
||||
typedef VOID (*FDDI_ADDRESS_CHANGE)(VOID);
|
||||
typedef VOID (*FDDI_FILTER_CHANGE)(VOID);
|
||||
typedef VOID (*FDDI_DEFERRED_CLOSE)(VOID);
|
||||
|
||||
|
||||
NDIS_STATUS
|
||||
|
@ -3860,10 +3857,10 @@ FddiShouldAddressLoopBack(
|
|||
|
||||
DECLARE_UNKNOWN_STRUCT(TR_FILTER)
|
||||
|
||||
DECLARE_UNKNOWN_PROTOTYPE(TR_ADDRESS_CHANGE)
|
||||
DECLARE_UNKNOWN_PROTOTYPE(TR_GROUP_CHANGE)
|
||||
DECLARE_UNKNOWN_PROTOTYPE(TR_FILTER_CHANGE)
|
||||
DECLARE_UNKNOWN_PROTOTYPE(TR_DEFERRED_CLOSE)
|
||||
typedef VOID (*TR_ADDRESS_CHANGE)(VOID);
|
||||
typedef VOID (*TR_GROUP_CHANGE)(VOID);
|
||||
typedef VOID (*TR_FILTER_CHANGE)(VOID);
|
||||
typedef VOID (*TR_DEFERRED_CLOSE)(VOID);
|
||||
|
||||
|
||||
NDIS_STATUS
|
||||
|
|
|
@ -100,35 +100,74 @@ PWSHELPER_DLL LocateHelperDLL(
|
|||
}
|
||||
|
||||
|
||||
#define GET_ENTRY_POINT(helper, exportname, identifier) { \
|
||||
PVOID entry; \
|
||||
\
|
||||
entry = GetProcAddress(helper->hModule, exportname); \
|
||||
if (!entry) \
|
||||
return ERROR_BAD_PROVIDER; \
|
||||
((PVOID)helper->EntryTable.##identifier) = entry; \
|
||||
}
|
||||
|
||||
|
||||
INT GetHelperDLLEntries(
|
||||
PWSHELPER_DLL HelperDLL)
|
||||
{
|
||||
GET_ENTRY_POINT(HelperDLL, "WSHAddressToString", lpWSHAddressToString);
|
||||
GET_ENTRY_POINT(HelperDLL, "WSHEnumProtocols", lpWSHEnumProtocols);
|
||||
GET_ENTRY_POINT(HelperDLL, "WSHGetBroadcastSockaddr", lpWSHGetBroadcastSockaddr);
|
||||
GET_ENTRY_POINT(HelperDLL, "WSHGetProviderGuid", lpWSHGetProviderGuid);
|
||||
GET_ENTRY_POINT(HelperDLL, "WSHGetSockaddrType", lpWSHGetSockaddrType);
|
||||
GET_ENTRY_POINT(HelperDLL, "WSHGetSocketInformation", lpWSHGetSocketInformation);
|
||||
GET_ENTRY_POINT(HelperDLL, "WSHGetWildcardSockaddr", lpWSHGetWildcardSockaddr);
|
||||
GET_ENTRY_POINT(HelperDLL, "WSHGetWinsockMapping", lpWSHGetWinsockMapping);
|
||||
GET_ENTRY_POINT(HelperDLL, "WSHGetWSAProtocolInfo", lpWSHGetWSAProtocolInfo);
|
||||
GET_ENTRY_POINT(HelperDLL, "WSHIoctl", lpWSHIoctl);
|
||||
GET_ENTRY_POINT(HelperDLL, "WSHJoinLeaf", lpWSHJoinLeaf);
|
||||
GET_ENTRY_POINT(HelperDLL, "WSHNotify", lpWSHNotify);
|
||||
GET_ENTRY_POINT(HelperDLL, "WSHOpenSocket", lpWSHOpenSocket);
|
||||
GET_ENTRY_POINT(HelperDLL, "WSHOpenSocket2", lpWSHOpenSocket2);
|
||||
GET_ENTRY_POINT(HelperDLL, "WSHSetSocketInformation", lpWSHSetSocketInformation);
|
||||
GET_ENTRY_POINT(HelperDLL, "WSHStringToAddress", lpWSHStringToAddress);
|
||||
PVOID e;
|
||||
|
||||
e = GetProcAddress(HelperDLL->hModule, "WSHAddressToString");
|
||||
if (!e) return ERROR_BAD_PROVIDER;
|
||||
((PVOID) HelperDLL->EntryTable.lpWSHAddressToString) = e;
|
||||
|
||||
e = GetProcAddress(HelperDLL->hModule, "WSHEnumProtocols");
|
||||
if (!e) return ERROR_BAD_PROVIDER;
|
||||
((PVOID) HelperDLL->EntryTable.lpWSHEnumProtocols) = e;
|
||||
|
||||
e = GetProcAddress(HelperDLL->hModule, "WSHGetBroadcastSockaddr");
|
||||
if (!e) return ERROR_BAD_PROVIDER;
|
||||
((PVOID) HelperDLL->EntryTable.lpWSHGetBroadcastSockaddr) = e;
|
||||
|
||||
e = GetProcAddress(HelperDLL->hModule, "WSHGetProviderGuid");
|
||||
if (!e) return ERROR_BAD_PROVIDER;
|
||||
((PVOID) HelperDLL->EntryTable.lpWSHGetProviderGuid) = e;
|
||||
|
||||
e = GetProcAddress(HelperDLL->hModule, "WSHGetSockaddrType");
|
||||
if (!e) return ERROR_BAD_PROVIDER;
|
||||
((PVOID) HelperDLL->EntryTable.lpWSHGetSockaddrType) = e;
|
||||
|
||||
e = GetProcAddress(HelperDLL->hModule, "WSHGetSocketInformation");
|
||||
if (!e) return ERROR_BAD_PROVIDER;
|
||||
((PVOID) HelperDLL->EntryTable.lpWSHGetSocketInformation) = e;
|
||||
|
||||
e = GetProcAddress(HelperDLL->hModule, "WSHGetWildcardSockaddr");
|
||||
if (!e) return ERROR_BAD_PROVIDER;
|
||||
((PVOID) HelperDLL->EntryTable.lpWSHGetWildcardSockaddr) = e;
|
||||
|
||||
e = GetProcAddress(HelperDLL->hModule, "WSHGetWinsockMapping");
|
||||
if (!e) return ERROR_BAD_PROVIDER;
|
||||
((PVOID) HelperDLL->EntryTable.lpWSHGetWinsockMapping) = e;
|
||||
|
||||
e = GetProcAddress(HelperDLL->hModule, "WSHGetWSAProtocolInfo");
|
||||
if (!e) return ERROR_BAD_PROVIDER;
|
||||
((PVOID) HelperDLL->EntryTable.lpWSHGetWSAProtocolInfo) = e;
|
||||
|
||||
e = GetProcAddress(HelperDLL->hModule, "WSHIoctl");
|
||||
if (!e) return ERROR_BAD_PROVIDER;
|
||||
((PVOID) HelperDLL->EntryTable.lpWSHIoctl) = e;
|
||||
|
||||
e = GetProcAddress(HelperDLL->hModule, "WSHJoinLeaf");
|
||||
if (!e) return ERROR_BAD_PROVIDER;
|
||||
((PVOID) HelperDLL->EntryTable.lpWSHJoinLeaf) = e;
|
||||
|
||||
e = GetProcAddress(HelperDLL->hModule, "WSHNotify");
|
||||
if (!e) return ERROR_BAD_PROVIDER;
|
||||
((PVOID) HelperDLL->EntryTable.lpWSHNotify) = e;
|
||||
|
||||
e = GetProcAddress(HelperDLL->hModule, "WSHOpenSocket");
|
||||
if (!e) return ERROR_BAD_PROVIDER;
|
||||
((PVOID) HelperDLL->EntryTable.lpWSHOpenSocket) = e;
|
||||
|
||||
e = GetProcAddress(HelperDLL->hModule, "WSHOpenSocket2");
|
||||
if (!e) return ERROR_BAD_PROVIDER;
|
||||
((PVOID) HelperDLL->EntryTable.lpWSHOpenSocket2) = e;
|
||||
|
||||
e = GetProcAddress(HelperDLL->hModule, "WSHSetSocketInformation");
|
||||
if (!e) return ERROR_BAD_PROVIDER;
|
||||
((PVOID) HelperDLL->EntryTable.lpWSHSetSocketInformation) = e;
|
||||
|
||||
e = GetProcAddress(HelperDLL->hModule, "WSHStringToAddress");
|
||||
if (!e) return ERROR_BAD_PROVIDER;
|
||||
((PVOID) HelperDLL->EntryTable.lpWSHStringToAddress) = e;
|
||||
|
||||
return NO_ERROR;
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: defwnd.c,v 1.14 2002/11/05 20:59:48 hbirr Exp $
|
||||
/* $Id: defwnd.c,v 1.15 2002/11/10 18:17:40 chorns Exp $
|
||||
*
|
||||
* COPYRIGHT: See COPYING in the top level directory
|
||||
* PROJECT: ReactOS user32.dll
|
||||
|
@ -691,7 +691,7 @@ DefWndTrackMinMaxBox(HWND hWnd, WPARAM wParam)
|
|||
continue;
|
||||
}
|
||||
|
||||
Pressed = DefWndHitTestNC(hWnd, Msg.pt) == wParam;
|
||||
Pressed = DefWndHitTestNC(hWnd, Msg.pt) == (LRESULT) wParam;
|
||||
if (Pressed != OldState)
|
||||
{
|
||||
if (wParam == HTMINBUTTON)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: window.c,v 1.15 2002/10/31 00:02:01 dwelch Exp $
|
||||
/* $Id: window.c,v 1.16 2002/11/10 18:17:40 chorns Exp $
|
||||
*
|
||||
* COPYRIGHT: See COPYING in the top level directory
|
||||
* PROJECT: ReactOS user32.dll
|
||||
|
@ -286,15 +286,15 @@ CreateWindowExA(DWORD dwExStyle,
|
|||
|
||||
/* Fixup default coordinates. */
|
||||
sw = SW_SHOW;
|
||||
if (x == CW_USEDEFAULT || nWidth == CW_USEDEFAULT)
|
||||
if (x == (LONG) CW_USEDEFAULT || nWidth == (LONG) CW_USEDEFAULT)
|
||||
{
|
||||
if (dwStyle & (WS_CHILD | WS_POPUP))
|
||||
{
|
||||
if (x == CW_USEDEFAULT)
|
||||
if (x == (LONG) CW_USEDEFAULT)
|
||||
{
|
||||
x = y = 0;
|
||||
}
|
||||
if (nWidth == CW_USEDEFAULT)
|
||||
if (nWidth == (LONG) CW_USEDEFAULT)
|
||||
{
|
||||
nWidth = nHeight = 0;
|
||||
}
|
||||
|
@ -305,9 +305,9 @@ CreateWindowExA(DWORD dwExStyle,
|
|||
|
||||
GetStartupInfoA(&info);
|
||||
|
||||
if (x == CW_USEDEFAULT)
|
||||
if (x == (LONG) CW_USEDEFAULT)
|
||||
{
|
||||
if (y != CW_USEDEFAULT)
|
||||
if (y != (LONG) CW_USEDEFAULT)
|
||||
{
|
||||
sw = y;
|
||||
}
|
||||
|
@ -315,7 +315,7 @@ CreateWindowExA(DWORD dwExStyle,
|
|||
y = (info.dwFlags & STARTF_USEPOSITION) ? info.dwY : 0;
|
||||
}
|
||||
|
||||
if (nWidth == CW_USEDEFAULT)
|
||||
if (nWidth == (LONG) CW_USEDEFAULT)
|
||||
{
|
||||
if (info.dwFlags & STARTF_USESIZE)
|
||||
{
|
||||
|
@ -391,15 +391,15 @@ CreateWindowExW(DWORD dwExStyle,
|
|||
|
||||
/* Fixup default coordinates. */
|
||||
sw = SW_SHOW;
|
||||
if (x == CW_USEDEFAULT || nWidth == CW_USEDEFAULT)
|
||||
if (x == (LONG) CW_USEDEFAULT || nWidth == (LONG) CW_USEDEFAULT)
|
||||
{
|
||||
if (dwStyle & (WS_CHILD | WS_POPUP))
|
||||
{
|
||||
if (x == CW_USEDEFAULT)
|
||||
if (x == (LONG) CW_USEDEFAULT)
|
||||
{
|
||||
x = y = 0;
|
||||
}
|
||||
if (nWidth == CW_USEDEFAULT)
|
||||
if (nWidth == (LONG) CW_USEDEFAULT)
|
||||
{
|
||||
nWidth = nHeight = 0;
|
||||
}
|
||||
|
@ -410,9 +410,9 @@ CreateWindowExW(DWORD dwExStyle,
|
|||
|
||||
GetStartupInfoW(&info);
|
||||
|
||||
if (x == CW_USEDEFAULT)
|
||||
if (x == (LONG) CW_USEDEFAULT)
|
||||
{
|
||||
if (y != CW_USEDEFAULT)
|
||||
if (y != (LONG) CW_USEDEFAULT)
|
||||
{
|
||||
sw = y;
|
||||
}
|
||||
|
@ -420,7 +420,7 @@ CreateWindowExW(DWORD dwExStyle,
|
|||
y = (info.dwFlags & STARTF_USEPOSITION) ? info.dwY : 0;
|
||||
}
|
||||
|
||||
if (nWidth == CW_USEDEFAULT)
|
||||
if (nWidth == (LONG) CW_USEDEFAULT)
|
||||
{
|
||||
if (info.dwFlags & STARTF_USESIZE)
|
||||
{
|
||||
|
|
|
@ -1292,7 +1292,7 @@ NtSetValueKey(IN HANDLE KeyHandle,
|
|||
RtlMoveMemory(&ValueCell->DataOffset, Data, DataSize);
|
||||
}
|
||||
/* If new data size is <= current then overwrite current data */
|
||||
else if (DataSize <= (ValueCell->DataSize & 0x7fffffff))
|
||||
else if (DataSize <= (ULONG) (ValueCell->DataSize & 0x7fffffff))
|
||||
{
|
||||
DataCell = CmiGetBlock(RegistryHive, ValueCell->DataOffset,&pBin);
|
||||
RtlCopyMemory(DataCell->Data, Data, DataSize);
|
||||
|
|
|
@ -945,7 +945,7 @@ CmiGetMaxValueDataLength(PREGISTRY_HIVE RegistryHive,
|
|||
{
|
||||
PVALUE_LIST_CELL ValueListCell;
|
||||
PVALUE_CELL CurValueCell;
|
||||
ULONG MaxValueData;
|
||||
LONG MaxValueData;
|
||||
ULONG i;
|
||||
|
||||
VERIFY_KEY_CELL(KeyCell);
|
||||
|
@ -1010,7 +1010,7 @@ CmiScanForSubKey(IN PREGISTRY_HIVE RegistryHive,
|
|||
if (Attributes & OBJ_CASE_INSENSITIVE)
|
||||
{
|
||||
if ((HashBlock->Table[i].KeyOffset != 0) &&
|
||||
(HashBlock->Table[i].KeyOffset != -1) &&
|
||||
(HashBlock->Table[i].KeyOffset != (ULONG_PTR)-1) &&
|
||||
(_strnicmp(KeyName, (PCHAR) &HashBlock->Table[i].HashValue, 4) == 0))
|
||||
{
|
||||
CurSubKeyCell = CmiGetBlock(RegistryHive,
|
||||
|
@ -1032,7 +1032,7 @@ CmiScanForSubKey(IN PREGISTRY_HIVE RegistryHive,
|
|||
else
|
||||
{
|
||||
if (HashBlock->Table[i].KeyOffset != 0 &&
|
||||
HashBlock->Table[i].KeyOffset != -1 &&
|
||||
HashBlock->Table[i].KeyOffset != (ULONG_PTR) -1 &&
|
||||
!strncmp(KeyName, (PCHAR) &HashBlock->Table[i].HashValue, 4))
|
||||
{
|
||||
CurSubKeyCell = CmiGetBlock(RegistryHive,
|
||||
|
@ -1147,7 +1147,7 @@ CmiAddSubKey(PREGISTRY_HIVE RegistryHive,
|
|||
return Status;
|
||||
}
|
||||
|
||||
if (KeyCell->HashTableOffset == -1)
|
||||
if (KeyCell->HashTableOffset == (ULONG_PTR) -1)
|
||||
{
|
||||
Status = CmiAllocateHashTableBlock(RegistryHive,
|
||||
&HashBlock,
|
||||
|
@ -1333,7 +1333,7 @@ CmiAddValueToKey(IN PREGISTRY_HIVE RegistryHive,
|
|||
KeyCell->ValuesOffset = VLBOffset;
|
||||
}
|
||||
else if ((KeyCell->NumberOfValues
|
||||
>= ((LONG) (ValueListCell->CellSize - 4)) / (LONG) sizeof(BLOCK_OFFSET)))
|
||||
>= (ULONG) ((LONG) (ValueListCell->CellSize - 4)) / (LONG) sizeof(BLOCK_OFFSET)))
|
||||
{
|
||||
Status = CmiAllocateBlock(RegistryHive,
|
||||
(PVOID) &NewValueListCell,
|
||||
|
@ -1896,7 +1896,7 @@ CmiGetBlock(PREGISTRY_HIVE RegistryHive,
|
|||
if (ppBin)
|
||||
*ppBin = NULL;
|
||||
|
||||
if ((BlockOffset == 0) || (BlockOffset == -1))
|
||||
if ((BlockOffset == 0) || (BlockOffset == (ULONG_PTR) -1))
|
||||
return NULL;
|
||||
|
||||
if (IsVolatileHive(RegistryHive))
|
||||
|
|
|
@ -466,7 +466,7 @@ CmiGetLinkTarget(PREGISTRY_HIVE RegistryHive,
|
|||
}
|
||||
|
||||
TargetPath->Length = min(TargetPath->MaximumLength - sizeof(WCHAR),
|
||||
ValueCell->DataSize);
|
||||
(ULONG) ValueCell->DataSize);
|
||||
|
||||
if (ValueCell->DataSize > 0)
|
||||
{
|
||||
|
|
|
@ -212,7 +212,7 @@ DbgGetErrorText(NTSTATUS ErrorCode, PUNICODE_STRING ErrorText, ULONG Flags)
|
|||
{
|
||||
for (i = 0; FacList[i].Name != NULL; i++)
|
||||
{
|
||||
if (FacList[i].Code == NT_FACILITY(ErrorCode))
|
||||
if (FacList[i].Code == (ULONG) NT_FACILITY(ErrorCode))
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
|
|
@ -195,7 +195,7 @@ ExInitializeHashTable(IN PHASH_TABLE HashTable,
|
|||
IN BOOLEAN UseNonPagedPool)
|
||||
{
|
||||
BOOLEAN Status;
|
||||
LONG Index;
|
||||
ULONG Index;
|
||||
|
||||
RtlZeroMemory(HashTable, sizeof(HASH_TABLE));
|
||||
|
||||
|
|
|
@ -437,7 +437,7 @@ MiZeroPage(PHYSICAL_ADDRESS PhysPage);
|
|||
BOOLEAN
|
||||
MmIsAccessedAndResetAccessPage(struct _EPROCESS* Process, PVOID Address);
|
||||
|
||||
#define STATUS_MM_RESTART_OPERATION (0xD0000001)
|
||||
#define STATUS_MM_RESTART_OPERATION ((NTSTATUS)0xD0000001)
|
||||
|
||||
NTSTATUS
|
||||
MmCreateVirtualMappingForKernel(PVOID Address,
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: irp.c,v 1.45 2002/10/03 19:39:56 robd Exp $
|
||||
/* $Id: irp.c,v 1.46 2002/11/10 18:17:41 chorns Exp $
|
||||
*
|
||||
* COPYRIGHT: See COPYING in the top level directory
|
||||
* PROJECT: ReactOS kernel
|
||||
|
@ -221,13 +221,13 @@ IofCompleteRequest(PIRP Irp,
|
|||
* thread making the request
|
||||
*/
|
||||
{
|
||||
unsigned int i;
|
||||
ULONG i;
|
||||
NTSTATUS Status;
|
||||
|
||||
DPRINT("IoCompleteRequest(Irp %x, PriorityBoost %d) Event %x THread %x\n",
|
||||
Irp,PriorityBoost, Irp->UserEvent, PsGetCurrentThread());
|
||||
|
||||
for (i=Irp->CurrentLocation;i<Irp->StackCount;i++)
|
||||
for (i=Irp->CurrentLocation;i<(ULONG)Irp->StackCount;i++)
|
||||
{
|
||||
if (Irp->Stack[i].CompletionRoutine != NULL)
|
||||
{
|
||||
|
|
|
@ -406,7 +406,7 @@ GspMem2Hex (PCHAR Address,
|
|||
|
||||
if (MayFault)
|
||||
MemoryFaultRoutine = GspSetMemoryError;
|
||||
for (i = 0; i < Count; i++)
|
||||
for (i = 0; i < (ULONG) Count; i++)
|
||||
{
|
||||
ch = GspGetChar (Address++);
|
||||
if (MayFault && GspMemoryError)
|
||||
|
|
|
@ -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: queue.c,v 1.3 2002/09/08 10:23:29 chorns Exp $
|
||||
/* $Id: queue.c,v 1.4 2002/11/10 18:17:41 chorns Exp $
|
||||
*
|
||||
* PROJECT: ReactOS kernel
|
||||
* FILE: ntoskrnl/ke/queue.c
|
||||
|
@ -48,7 +48,7 @@ KeInitializeQueue(IN PKQUEUE Queue,
|
|||
InitializeListHead(&Queue->EntryListHead);
|
||||
InitializeListHead(&Queue->ThreadListEntry);
|
||||
Queue->CurrentCount = 0;
|
||||
Queue->MaximumCount = (Count == 0) ? KeNumberProcessors : Count;
|
||||
Queue->MaximumCount = (Count == 0) ? (ULONG) KeNumberProcessors : Count;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -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: sem.c,v 1.11 2002/09/08 10:23:29 chorns Exp $
|
||||
/* $Id: sem.c,v 1.12 2002/11/10 18:17:41 chorns Exp $
|
||||
*
|
||||
* PROJECT: ReactOS kernel
|
||||
* FILE: ntoskrnl/ke/sem.c
|
||||
|
@ -89,7 +89,7 @@ KeReleaseSemaphore (PKSEMAPHORE Semaphore,
|
|||
KeAcquireDispatcherDatabaseLock(Wait);
|
||||
|
||||
InitialState = Semaphore->Header.SignalState;
|
||||
if (Semaphore->Limit < InitialState + Adjustment ||
|
||||
if (Semaphore->Limit < (LONG) InitialState + Adjustment ||
|
||||
InitialState > InitialState + Adjustment)
|
||||
{
|
||||
ExRaiseStatus(STATUS_SEMAPHORE_LIMIT_EXCEEDED);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: resource.c,v 1.3 2002/09/08 10:23:31 chorns Exp $
|
||||
/* $Id: resource.c,v 1.4 2002/11/10 18:17:41 chorns Exp $
|
||||
*
|
||||
* COPYRIGHT: See COPYING in the top level directory
|
||||
* PROJECT: ReactOS kernel
|
||||
|
@ -120,7 +120,7 @@ LdrFindResource_U(PVOID BaseAddress,
|
|||
{
|
||||
ws = (PWCHAR)((ULONG)ResDir + (ResEntry->Name & 0x7FFFFFFF));
|
||||
if (!wcsncmp((PWCHAR)Id, ws + 1, *ws ) &&
|
||||
wcslen((PWCHAR)Id) == (int)*ws )
|
||||
wcslen((PWCHAR)Id) == (ULONG)*ws )
|
||||
{
|
||||
goto found;
|
||||
}
|
||||
|
|
|
@ -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: balance.c,v 1.13 2002/09/08 10:23:32 chorns Exp $
|
||||
/* $Id: balance.c,v 1.14 2002/11/10 18:17:42 chorns Exp $
|
||||
*
|
||||
* PROJECT: ReactOS kernel
|
||||
* FILE: ntoskrnl/mm/balance.c
|
||||
|
@ -171,7 +171,7 @@ MiRebalanceMemoryConsumers(VOID)
|
|||
NTSTATUS Status;
|
||||
|
||||
Target = (MiMinimumAvailablePages - MiNrAvailablePages) + MiPagesRequired;
|
||||
Target = min(Target, MiMinimumPagesPerRun);
|
||||
Target = min(Target, (LONG) MiMinimumPagesPerRun);
|
||||
|
||||
for (i = 0; i < MC_MAXIMUM && Target > 0; i++)
|
||||
{
|
||||
|
|
|
@ -122,7 +122,7 @@ MmGetContinuousPages(ULONG NumberOfBytes,
|
|||
{
|
||||
ULONG NrPages;
|
||||
ULONG i;
|
||||
ULONG start;
|
||||
LONG start;
|
||||
ULONG length;
|
||||
KIRQL oldIrql;
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: mdl.c,v 1.46 2002/11/05 20:45:09 hbirr Exp $
|
||||
/* $Id: mdl.c,v 1.47 2002/11/10 18:17:42 chorns Exp $
|
||||
*
|
||||
* COPYRIGHT: See COPYING in the top level directory
|
||||
* PROJECT: ReactOS kernel
|
||||
|
@ -396,7 +396,7 @@ MmBuildMdlForNonPagedPool (PMDL Mdl)
|
|||
* byte offset and length
|
||||
*/
|
||||
{
|
||||
int va;
|
||||
ULONG va;
|
||||
Mdl->MdlFlags = Mdl->MdlFlags |
|
||||
(MDL_SOURCE_IS_NONPAGED_POOL | MDL_PAGES_LOCKED);
|
||||
for (va=0; va < ((Mdl->Size - sizeof(MDL)) / sizeof(ULONG)); va++)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: npool.c,v 1.63 2002/11/05 20:47:05 hbirr Exp $
|
||||
/* $Id: npool.c,v 1.64 2002/11/10 18:17:42 chorns Exp $
|
||||
*
|
||||
* COPYRIGHT: See COPYING in the top level directory
|
||||
* PROJECT: ReactOS kernel
|
||||
|
@ -840,7 +840,7 @@ static void* grow_kernel_pool(unsigned int size, ULONG Tag, PVOID Caller)
|
|||
ULONG nr_pages = PAGE_ROUND_UP(size + sizeof(BLOCK_HDR)) / PAGE_SIZE;
|
||||
ULONG start;
|
||||
BLOCK_HDR* blk=NULL;
|
||||
int i;
|
||||
ULONG i;
|
||||
KIRQL oldIrql;
|
||||
NTSTATUS Status;
|
||||
PVOID block = NULL;
|
||||
|
|
|
@ -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: section.c,v 1.100 2002/11/05 20:50:02 hbirr Exp $
|
||||
/* $Id: section.c,v 1.101 2002/11/10 18:17:42 chorns Exp $
|
||||
*
|
||||
* PROJECT: ReactOS kernel
|
||||
* FILE: ntoskrnl/mm/section.c
|
||||
|
@ -1773,7 +1773,7 @@ MmProtectSectionView(PMADDRESS_SPACE AddressSpace,
|
|||
NTSTATUS Status;
|
||||
|
||||
Length =
|
||||
min(Length, MemoryArea->BaseAddress + MemoryArea->Length - BaseAddress);
|
||||
min(Length, (ULONG) (MemoryArea->BaseAddress + MemoryArea->Length - BaseAddress));
|
||||
Region = MmFindRegion(MemoryArea->BaseAddress,
|
||||
&MemoryArea->Data.SectionData.RegionListHead,
|
||||
BaseAddress, NULL);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: error.c,v 1.5 2002/09/08 10:23:41 chorns Exp $
|
||||
/* $Id: error.c,v 1.6 2002/11/10 18:17:42 chorns Exp $
|
||||
*
|
||||
* COPYRIGHT: See COPYING in the top level directory
|
||||
* PROJECT: ReactOS kernel
|
||||
|
@ -871,10 +871,10 @@ RtlNtStatusToDosErrorNoTeb(IN NTSTATUS Status)
|
|||
|
||||
while (Table->Start)
|
||||
{
|
||||
if (Status < Table->Start)
|
||||
if (Status < (NTSTATUS) Table->Start)
|
||||
break;
|
||||
|
||||
if (Status < Table->End)
|
||||
if (Status < (NTSTATUS) Table->End)
|
||||
{
|
||||
DWORD ret = Table->Table[Status - Table->Start];
|
||||
if (!ret)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: exception.c,v 1.2 2002/10/26 09:53:16 dwelch Exp $
|
||||
/* $Id: exception.c,v 1.3 2002/11/10 18:17:42 chorns Exp $
|
||||
*
|
||||
* COPYRIGHT: See COPYING in the top level directory
|
||||
* PROJECT: ReactOS kernel
|
||||
|
@ -152,7 +152,7 @@ RtlpDispatchException(IN PEXCEPTION_RECORD ExceptionRecord,
|
|||
|
||||
DPRINT("RegistrationFrame is 0x%X\n", RegistrationFrame);
|
||||
|
||||
while ((ULONG_PTR)RegistrationFrame != -1)
|
||||
while ((ULONG_PTR)RegistrationFrame != (ULONG_PTR)-1)
|
||||
{
|
||||
EXCEPTION_RECORD ExceptionRecord2;
|
||||
DWORD Temp = 0;
|
||||
|
@ -363,7 +363,7 @@ RtlUnwind(PEXCEPTION_REGISTRATION RegistrationFrame,
|
|||
Context.Eax = EaxValue;
|
||||
|
||||
// Begin traversing the list of EXCEPTION_REGISTRATION
|
||||
while ((ULONG_PTR)ERHead != -1)
|
||||
while ((ULONG_PTR)ERHead != (ULONG_PTR)-1)
|
||||
{
|
||||
EXCEPTION_RECORD er2;
|
||||
|
||||
|
@ -466,7 +466,7 @@ RtlUnwind(PEXCEPTION_REGISTRATION RegistrationFrame,
|
|||
DPRINT("Ran out of exception registrations. RegistrationFrame is (0x%X)\n",
|
||||
RegistrationFrame);
|
||||
|
||||
if ((ULONG_PTR)RegistrationFrame == -1)
|
||||
if ((ULONG_PTR)RegistrationFrame == (ULONG_PTR)-1)
|
||||
NtContinue(&Context, FALSE);
|
||||
else
|
||||
NtRaiseException(pExceptRec, &Context, 0);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: mem.c,v 1.16 2002/09/08 10:23:41 chorns Exp $
|
||||
/* $Id: mem.c,v 1.17 2002/11/10 18:17:42 chorns Exp $
|
||||
*
|
||||
* COPYRIGHT: See COPYING in the top level directory
|
||||
* PROJECT: ReactOS kernel
|
||||
|
@ -78,7 +78,7 @@ RtlCompareMemory (
|
|||
* RETURNS: Number of equal bytes
|
||||
*/
|
||||
{
|
||||
int i,total;
|
||||
ULONG i,total;
|
||||
|
||||
for (i=0,total=0;i<Length;i++)
|
||||
{
|
||||
|
@ -109,7 +109,7 @@ RtlCompareMemoryUlong (
|
|||
{
|
||||
PULONG ptr = (PULONG)Source;
|
||||
ULONG len = Length / sizeof(ULONG);
|
||||
int i;
|
||||
ULONG i;
|
||||
|
||||
for (i = 0; i < len; i++)
|
||||
{
|
||||
|
|
|
@ -60,7 +60,7 @@ char* _strnset(char* szToFill, int szFill, size_t sizeMaxFill)
|
|||
{
|
||||
char *t = szToFill;
|
||||
int i = 0;
|
||||
while (*szToFill != 0 && i < sizeMaxFill)
|
||||
while (*szToFill != 0 && i < (int) sizeMaxFill)
|
||||
{
|
||||
*szToFill = szFill;
|
||||
szToFill++;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: time.c,v 1.14 2002/09/30 20:54:59 hbirr Exp $
|
||||
/* $Id: time.c,v 1.15 2002/11/10 18:17:42 chorns Exp $
|
||||
*
|
||||
* COPYRIGHT: See COPYING in the top level directory
|
||||
* PROJECT: ReactOS kernel
|
||||
|
@ -32,8 +32,8 @@
|
|||
#define DAYSPERLEAPYEAR 366
|
||||
#define MONSPERYEAR 12
|
||||
|
||||
#define TICKSTO1970 0x019db1ded53e8000
|
||||
#define TICKSTO1980 0x01a8e79fe1d58000
|
||||
#define TICKSTO1970 0x019db1ded53e8000LL
|
||||
#define TICKSTO1980 0x01a8e79fe1d58000LL
|
||||
|
||||
|
||||
static const int YearLengths[2] = {DAYSPERNORMALYEAR, DAYSPERLEAPYEAR};
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: unicode.c,v 1.24 2002/10/20 03:13:51 robd Exp $
|
||||
/* $Id: unicode.c,v 1.25 2002/11/10 18:17:42 chorns Exp $
|
||||
*
|
||||
* COPYRIGHT: See COPYING in the top level directory
|
||||
* PROJECT: ReactOS kernel
|
||||
|
@ -735,7 +735,7 @@ RtlIntegerToChar(IN ULONG Value,
|
|||
tp++;
|
||||
}
|
||||
|
||||
if (tp - temp >= Length)
|
||||
if ((ULONG) (tp - temp) >= Length)
|
||||
return STATUS_BUFFER_TOO_SMALL;
|
||||
|
||||
sp = String;
|
||||
|
|
|
@ -60,7 +60,7 @@ wchar_t *_wcsnset (wchar_t* wsToFill, wchar_t wcFill, size_t sizeMaxFill)
|
|||
{
|
||||
wchar_t *t = wsToFill;
|
||||
int i = 0;
|
||||
while( *wsToFill != 0 && i < sizeMaxFill)
|
||||
while( *wsToFill != 0 && i < (int) sizeMaxFill)
|
||||
{
|
||||
*wsToFill = wcFill;
|
||||
wsToFill++;
|
||||
|
@ -193,7 +193,7 @@ size_t wcslen(const wchar_t *s)
|
|||
|
||||
wchar_t * wcsncat(wchar_t *dest, const wchar_t *src, size_t count)
|
||||
{
|
||||
int i, j;
|
||||
unsigned int i, j;
|
||||
|
||||
for (j = 0; dest[j] != 0; j++)
|
||||
;
|
||||
|
@ -224,7 +224,7 @@ int wcsncmp(const wchar_t *cs, const wchar_t *ct, size_t count)
|
|||
|
||||
wchar_t *wcsncpy(wchar_t *dest, const wchar_t *src, size_t count)
|
||||
{
|
||||
int i;
|
||||
unsigned int i;
|
||||
|
||||
for (i = 0; i < count; i++)
|
||||
{
|
||||
|
|
|
@ -39,6 +39,7 @@
|
|||
|
||||
#include <freetype/config/ftconfig.h>
|
||||
#include <freetype/internal/ftobjs.h>
|
||||
|
||||
#include <freetype/internal/ftdebug.h>
|
||||
#include <freetype/ftmodule.h>
|
||||
|
||||
|
|
Loading…
Reference in a new issue