6 modified files
reactos/lib/user32/misc
diff -u -r1.10 -r1.11
--- dde.c 31 May 2004 19:52:47 -0000 1.10
+++ dde.c 13 Dec 2004 15:39:52 -0000 1.11
@@ -262,7 +262,7 @@
*/
static void WDML_IncrementInstanceId(WDML_INSTANCE* pInstance)
{
- DWORD id = InterlockedIncrement(&WDML_MaxInstanceID);
+ DWORD id = InterlockedIncrement((PLONG)&WDML_MaxInstanceID);
pInstance->instanceID = id;
TRACE("New instance id %ld allocated\n", id);
reactos/lib/user32/misc
diff -u -r1.2 -r1.3
--- ddeclient.c 29 Apr 2004 21:13:16 -0000 1.2
+++ ddeclient.c 13 Dec 2004 15:39:52 -0000 1.3
@@ -597,7 +597,7 @@
if (hMem)
{
- LPBYTE pDst;
+ PCHAR pDst;
pDst = GlobalLock(hMem);
if (pDst)
reactos/lib/user32/misc
diff -u -r1.35 -r1.36
--- desktop.c 13 Nov 2004 01:14:42 -0000 1.35
+++ desktop.c 13 Dec 2004 15:39:52 -0000 1.36
@@ -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
* PROJECT: ReactOS user32.dll
@@ -171,7 +171,7 @@
L"Control Panel\\Desktop",
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);
RegCloseKey(hKey);
}
reactos/lib/user32/windows
diff -u -r1.148 -r1.149
--- defwnd.c 12 Dec 2004 01:40:36 -0000 1.148
+++ defwnd.c 13 Dec 2004 15:39:52 -0000 1.149
@@ -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
* PROJECT: ReactOS user32.dll
@@ -41,9 +41,9 @@
/* GLOBALS *******************************************************************/
-static COLORREF SysColors[NUM_SYSCOLORS] = {0};
-static HPEN SysPens[NUM_SYSCOLORS] = {0};
-static HBRUSH SysBrushes[NUM_SYSCOLORS] = {0};
+COLORREF SysColors[NUM_SYSCOLORS] = {0};
+HPEN SysPens[NUM_SYSCOLORS] = {0};
+HBRUSH SysBrushes[NUM_SYSCOLORS] = {0};
/* Bits in the dwKeyData */
#define KEYDATA_ALT 0x2000
@@ -219,7 +219,7 @@
return(0);
}
- switch(LOWORD(lParam))
+ switch((INT_PTR) LOWORD(lParam))
{
case HTERROR:
{
reactos/lib/user32/windows
diff -u -r1.12 -r1.13
--- font.c 29 Nov 2004 16:51:10 -0000 1.12
+++ font.c 13 Dec 2004 15:39:52 -0000 1.13
@@ -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.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
* FILE: lib/user32/windows/input.c
@@ -750,7 +750,7 @@
int num_fit;
int word_broken;
int line_fits;
- int j_in_seg;
+ unsigned int j_in_seg;
int ellipsified;
*pprefix_offset = -1;
@@ -826,7 +826,7 @@
if (!line_fits && (format & DT_WORDBREAK))
{
const WCHAR *s;
- int chars_used;
+ unsigned int chars_used;
TEXT_WordBreak (hdc, dest+seg_j, maxl-seg_j, &j_in_seg,
max_seg_width, format, num_fit, &chars_used, &size);
line_fits = (size.cx <= max_seg_width);
reactos/lib/user32/windows
diff -u -r1.44 -r1.45
--- message.c 5 Dec 2004 03:50:33 -0000 1.44
+++ message.c 13 Dec 2004 15:39:52 -0000 1.45
@@ -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
* PROJECT: ReactOS user32.dll
@@ -1934,7 +1934,7 @@
return FALSE;
}
if (!gcLoadMPH++) {
- InterlockedExchange(&gfMessagePumpHook, 1);
+ InterlockedExchange((PLONG)&gfMessagePumpHook, 1);
}
LeaveCriticalSection(&gcsMPH);
return TRUE;
@@ -1947,7 +1947,7 @@
if(NtUserCallNoParam(NOPARAM_ROUTINE_UNINIT_MESSAGE_PUMP)) {
gcLoadMPH--;
if(!gcLoadMPH) {
- InterlockedExchange(&gfMessagePumpHook, 0);
+ InterlockedExchange((PLONG)&gfMessagePumpHook, 0);
gpfnInitMPH(TRUE, NULL);
ResetMessagePumpHook(&gmph);
gpfnInitMPH = 0;
CVSspam 0.2.8