Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-04 00:13:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fix compilation errors with GCC 4.0-20041205.

Browse source 
svn path=/trunk/; revision=12082
This commit is contained in:
Filip Navara 2004-12-13 15:39:52 +00:00
parent dc866ac5b0
commit 963cbda1e0
6 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/lib/user32/misc/dde.c
View file

@ -262,7 +262,7 @@ BOOL WINAPI DdeSetQualityOfService(HWND hwndClient, CONST SECURITY_QUALITY_OF_SE
*/ */
static void WDML_IncrementInstanceId(WDML_INSTANCE* pInstance) static void WDML_IncrementInstanceId(WDML_INSTANCE* pInstance)
{ {
DWORD id = InterlockedIncrement(&WDML_MaxInstanceID); DWORD id = InterlockedIncrement((PLONG)&WDML_MaxInstanceID);
pInstance->instanceID = id; pInstance->instanceID = id;
TRACE("New instance id %ld allocated\n", id); TRACE("New instance id %ld allocated\n", id);

2
reactos/lib/user32/misc/ddeclient.c
View file

@ -597,7 +597,7 @@ static HGLOBAL WDML_BuildExecuteCommand(WDML_CONV* pConv, LPCVOID pData, DWORD c
if (hMem) if (hMem)
{ {
LPBYTE pDst; PCHAR pDst;
pDst = GlobalLock(hMem); pDst = GlobalLock(hMem);
if (pDst) if (pDst)

4
reactos/lib/user32/misc/desktop.c
View file

@ -1,4 +1,4 @@
/* $Id: desktop.c,v 1.35 2004/11/13 01:14:42 rcampbell Exp $ /* $Id: desktop.c,v 1.36 2004/12/13 15:39:52 navaraf Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS user32.dll * PROJECT: ReactOS user32.dll
@ -171,7 +171,7 @@ SystemParametersInfoA(UINT uiAction,
L"Control Panel\\Desktop", L"Control Panel\\Desktop",
0, KEY_SET_VALUE, &hKey) == ERROR_SUCCESS) 0, KEY_SET_VALUE, &hKey) == ERROR_SUCCESS)
{ {
Ret = RegSetValueExA(hKey, "Wallpaper", 0, REG_SZ, (lpWallpaper != NULL ? lpWallpaper : ""), Ret = RegSetValueExA(hKey, "Wallpaper", 0, REG_SZ, (LPBYTE)(lpWallpaper != NULL ? lpWallpaper : ""),
(lpWallpaper != NULL ? (lstrlenA(lpWallpaper) + 1) * sizeof(CHAR) : sizeof(CHAR)) == ERROR_SUCCESS); (lpWallpaper != NULL ? (lstrlenA(lpWallpaper) + 1) * sizeof(CHAR) : sizeof(CHAR)) == ERROR_SUCCESS);
RegCloseKey(hKey); RegCloseKey(hKey);
} }

10
reactos/lib/user32/windows/defwnd.c
View file

@ -1,4 +1,4 @@
/* $Id: defwnd.c,v 1.148 2004/12/12 01:40:36 weiden Exp $ /* $Id: defwnd.c,v 1.149 2004/12/13 15:39:52 navaraf Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS user32.dll * PROJECT: ReactOS user32.dll
@ -41,9 +41,9 @@ void FASTCALL MenuInitSysMenuPopup(HMENU Menu, DWORD Style, DWORD ClsStyle, LONG
/* GLOBALS *******************************************************************/ /* GLOBALS *******************************************************************/
static COLORREF SysColors[NUM_SYSCOLORS] = {0}; COLORREF SysColors[NUM_SYSCOLORS] = {0};
static HPEN SysPens[NUM_SYSCOLORS] = {0}; HPEN SysPens[NUM_SYSCOLORS] = {0};
static HBRUSH SysBrushes[NUM_SYSCOLORS] = {0}; HBRUSH SysBrushes[NUM_SYSCOLORS] = {0};
/* Bits in the dwKeyData */ /* Bits in the dwKeyData */
#define KEYDATA_ALT 0x2000 #define KEYDATA_ALT 0x2000
@ -219,7 +219,7 @@ DefWndHandleSetCursor(HWND hWnd, WPARAM wParam, LPARAM lParam, ULONG Style)
return(0); return(0);
} }
switch(LOWORD(lParam)) switch((INT_PTR) LOWORD(lParam))
{ {
case HTERROR: case HTERROR:
{ {

6
reactos/lib/user32/windows/font.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: font.c,v 1.12 2004/11/29 16:51:10 navaraf Exp $ /* $Id: font.c,v 1.13 2004/12/13 15:39:52 navaraf Exp $
* *
* PROJECT: ReactOS user32.dll * PROJECT: ReactOS user32.dll
* FILE: lib/user32/windows/input.c * FILE: lib/user32/windows/input.c
@ -750,7 +750,7 @@ static const WCHAR *TEXT_NextLineW( HDC hdc, const WCHAR *str, int *count,
int num_fit; int num_fit;
int word_broken; int word_broken;
int line_fits; int line_fits;
int j_in_seg; unsigned int j_in_seg;
int ellipsified; int ellipsified;
*pprefix_offset = -1; *pprefix_offset = -1;
@ -826,7 +826,7 @@ static const WCHAR *TEXT_NextLineW( HDC hdc, const WCHAR *str, int *count,
if (!line_fits && (format & DT_WORDBREAK)) if (!line_fits && (format & DT_WORDBREAK))
{ {
const WCHAR *s; const WCHAR *s;
int chars_used; unsigned int chars_used;
TEXT_WordBreak (hdc, dest+seg_j, maxl-seg_j, &j_in_seg, TEXT_WordBreak (hdc, dest+seg_j, maxl-seg_j, &j_in_seg,
max_seg_width, format, num_fit, &chars_used, &size); max_seg_width, format, num_fit, &chars_used, &size);
line_fits = (size.cx <= max_seg_width); line_fits = (size.cx <= max_seg_width);

6
reactos/lib/user32/windows/message.c
View file

@ -1,4 +1,4 @@
/* $Id: message.c,v 1.44 2004/12/05 03:50:33 navaraf Exp $ /* $Id: message.c,v 1.45 2004/12/13 15:39:52 navaraf Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS user32.dll * PROJECT: ReactOS user32.dll
@ -1934,7 +1934,7 @@ BOOL WINAPI RegisterMessagePumpHook(MESSAGEPUMPHOOKPROC Hook)
return FALSE; return FALSE;
} }
if (!gcLoadMPH++) { if (!gcLoadMPH++) {
InterlockedExchange(&gfMessagePumpHook, 1); InterlockedExchange((PLONG)&gfMessagePumpHook, 1);
} }
LeaveCriticalSection(&gcsMPH); LeaveCriticalSection(&gcsMPH);
return TRUE; return TRUE;
@ -1947,7 +1947,7 @@ BOOL WINAPI UnregisterMessagePumpHook(VOID)
if(NtUserCallNoParam(NOPARAM_ROUTINE_UNINIT_MESSAGE_PUMP)) { if(NtUserCallNoParam(NOPARAM_ROUTINE_UNINIT_MESSAGE_PUMP)) {
gcLoadMPH--; gcLoadMPH--;
if(!gcLoadMPH) { if(!gcLoadMPH) {
InterlockedExchange(&gfMessagePumpHook, 0); InterlockedExchange((PLONG)&gfMessagePumpHook, 0);
gpfnInitMPH(TRUE, NULL); gpfnInitMPH(TRUE, NULL);
ResetMessagePumpHook(&gmph); ResetMessagePumpHook(&gmph);
gpfnInitMPH = 0; gpfnInitMPH = 0;