Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-20 20:36:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix some more warnings (gcc 4.2)

Browse source 
svn path=/trunk/; revision=25567
This commit is contained in:
Christoph von Wittich 2007-01-21 20:10:17 +00:00
parent e32b29f0a0
commit 745785f093
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/dll/win32/user32/windows/accel.c
View file

@ -233,7 +233,7 @@ HACCEL WINAPI LoadAcceleratorsW(HINSTANCE hInstance, LPCWSTR lpTableName)
return U32LoadAccelerators return U32LoadAccelerators
( (
hInstance, hInstance,
FindResourceExW(hInstance, MAKEINTRESOURCEW(RT_ACCELERATOR), lpTableName, 0) FindResourceExW(hInstance, (LPCWSTR) RT_ACCELERATOR, lpTableName, 0)
); );
} }
@ -245,7 +245,7 @@ HACCEL WINAPI LoadAcceleratorsA(HINSTANCE hInstance, LPCSTR lpTableName)
{ {
HRSRC Accel; HRSRC Accel;
Accel = FindResourceExA(hInstance, MAKEINTRESOURCEA(RT_ACCELERATOR), lpTableName, 0); Accel = FindResourceExA(hInstance, (LPCSTR) RT_ACCELERATOR, lpTableName, 0);
if (NULL == Accel) if (NULL == Accel)
{ {
return NULL; return NULL;

4
reactos/dll/win32/user32/windows/bitmap.c
View file

@ -236,8 +236,8 @@ LoadCursorIconImage(
fuLoad & (LR_DEFAULTCOLOR | LR_MONOCHROME)); fuLoad & (LR_DEFAULTCOLOR | LR_MONOCHROME));
h2Resource = FindResourceW(hinst, MAKEINTRESOURCEW(id), h2Resource = FindResourceW(hinst, MAKEINTRESOURCEW(id),
Icon ? MAKEINTRESOURCEW(RT_ICON) : Icon ? (LPCWSTR) RT_ICON :
MAKEINTRESOURCEW(RT_CURSOR)); (LPCWSTR) RT_CURSOR);
if (h2Resource == NULL) if (h2Resource == NULL)
return NULL; return NULL;

2
reactos/drivers/network/tcpip/tcpip/proto.c
View file

@ -24,7 +24,7 @@ NTSTATUS TiGetProtocolNumber(
if (*Name++ != (WCHAR)L'\\') if (*Name++ != (WCHAR)L'\\')
return STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL;
if (*Name == (WCHAR)NULL) if (*Name == L'\0')
return STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL;
RtlInitUnicodeString(&us, Name); RtlInitUnicodeString(&us, Name);

2
reactos/hal/halx86/generic/halinit.c
View file

@ -123,7 +123,7 @@ HalInitSystem(IN ULONG BootPhase,
((PKIPCR)KeGetPcr())->IDT[0x30].ExtendedOffset = ((PKIPCR)KeGetPcr())->IDT[0x30].ExtendedOffset =
(USHORT)(((ULONG_PTR)HalpClockInterrupt >> 16) & 0xFFFF); (USHORT)(((ULONG_PTR)HalpClockInterrupt >> 16) & 0xFFFF);
((PKIPCR)KeGetPcr())->IDT[0x30].Offset = ((PKIPCR)KeGetPcr())->IDT[0x30].Offset =
(USHORT)HalpClockInterrupt; (ULONG_PTR)HalpClockInterrupt;
HalEnableSystemInterrupt(0x30, CLOCK2_LEVEL, Latched); HalEnableSystemInterrupt(0x30, CLOCK2_LEVEL, Latched);
/* Initialize DMA. NT does this in Phase 0 */ /* Initialize DMA. NT does this in Phase 0 */

2
reactos/hal/halx86/mp/halinit.c
View file

@ -123,7 +123,7 @@ HalInitSystem(IN ULONG BootPhase,
((PKIPCR)KeGetPcr())->IDT[0x30].ExtendedOffset = ((PKIPCR)KeGetPcr())->IDT[0x30].ExtendedOffset =
(USHORT)(((ULONG_PTR)HalpClockInterrupt >> 16) & 0xFFFF); (USHORT)(((ULONG_PTR)HalpClockInterrupt >> 16) & 0xFFFF);
((PKIPCR)KeGetPcr())->IDT[0x30].Offset = ((PKIPCR)KeGetPcr())->IDT[0x30].Offset =
(USHORT)HalpClockInterrupt; (ULONG_PTR)HalpClockInterrupt;
HalEnableSystemInterrupt(0x30, CLOCK2_LEVEL, Latched); HalEnableSystemInterrupt(0x30, CLOCK2_LEVEL, Latched);
/* Initialize DMA. NT does this in Phase 0 */ /* Initialize DMA. NT does this in Phase 0 */

2
reactos/subsystems/win32/csrss/win32csr/guiconsole.c
View file

@ -1874,7 +1874,7 @@ GuiInit(VOID)
wc.style = 0; wc.style = 0;
wc.hInstance = (HINSTANCE) GetModuleHandleW(NULL); wc.hInstance = (HINSTANCE) GetModuleHandleW(NULL);
wc.hIcon = LoadIconW(Win32CsrDllHandle, MAKEINTRESOURCEW(1)); wc.hIcon = LoadIconW(Win32CsrDllHandle, MAKEINTRESOURCEW(1));
wc.hCursor = LoadCursorW(NULL, MAKEINTRESOURCEW(IDC_ARROW)); wc.hCursor = LoadCursorW(NULL, IDC_ARROW);
wc.hbrBackground = NULL; wc.hbrBackground = NULL;
wc.lpszMenuName = NULL; wc.lpszMenuName = NULL;
wc.cbClsExtra = 0; wc.cbClsExtra = 0;