Author: fireball Date: Sun Aug 1 12:50:40 2010 New Revision: 48393
URL: http://svn.reactos.org/svn/reactos?rev=48393&view=rev Log: - user32: Fix function definitions to match MS PSDK. To be submitted upstream.
Modified: branches/arwinss/reactos/dll/win32/user32/cursoricon.c branches/arwinss/reactos/dll/win32/user32/dialog.c branches/arwinss/reactos/dll/win32/user32/exticon.c branches/arwinss/reactos/dll/win32/user32/input.c branches/arwinss/reactos/dll/win32/user32/legacy.c branches/arwinss/reactos/dll/win32/user32/misc.c branches/arwinss/reactos/dll/win32/user32/msgbox.c
Modified: branches/arwinss/reactos/dll/win32/user32/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32... ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/cursoricon.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/cursoricon.c [iso-8859-1] Sun Aug 1 12:50:40 2010 @@ -1496,8 +1496,8 @@ INT nHeight, /* [in] the height of the provided bitmaps */ BYTE bPlanes, /* [in] the number of planes in the provided bitmaps */ BYTE bBitsPixel, /* [in] the number of bits per pixel of the lpXORbits bitmap */ - LPCVOID lpANDbits, /* [in] a monochrome bitmap representing the icon's mask */ - LPCVOID lpXORbits) /* [in] the icon's 'color' bitmap */ + CONST BYTE *lpANDbits, /* [in] a monochrome bitmap representing the icon's mask */ + CONST BYTE *lpXORbits) /* [in] the icon's 'color' bitmap */ { ICONINFO iinfo; HICON hIcon;
Modified: branches/arwinss/reactos/dll/win32/user32/dialog.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32... ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/dialog.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/dialog.c [iso-8859-1] Sun Aug 1 12:50:40 2010 @@ -1466,9 +1466,9 @@ * GetDialogBaseUnits (USER.243) * GetDialogBaseUnits (USER32.@) */ -DWORD WINAPI GetDialogBaseUnits(void) -{ - static DWORD units; +LONG WINAPI GetDialogBaseUnits(void) +{ + static LONG units;
if (!units) {
Modified: branches/arwinss/reactos/dll/win32/user32/exticon.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32... ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/exticon.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/exticon.c [iso-8859-1] Sun Aug 1 12:50:40 2010 @@ -119,9 +119,9 @@ while (min <= max) { pos = (min + max) / 2; - if (entry[pos].u1.s2.Id == id) + if (entry[pos].u1.Id == id) return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry[pos].u2.s3.OffsetToDirectory); - if (entry[pos].u1.s2.Id > id) max = pos - 1; + if (entry[pos].u1.Id > id) max = pos - 1; else min = pos + 1; } return NULL; @@ -488,7 +488,7 @@
while(n<iconDirCount && xprdeTmp) { - if(xprdeTmp->u1.s2.Id == iId) + if(xprdeTmp->u1.Id == iId) { nIconIndex = n; break;
Modified: branches/arwinss/reactos/dll/win32/user32/input.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32... ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/input.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/input.c [iso-8859-1] Sun Aug 1 12:50:40 2010 @@ -384,7 +384,7 @@ /****************************************************************** * RegisterRawInputDevices (USER32.@) */ -BOOL WINAPI DECLSPEC_HOTPATCH RegisterRawInputDevices(PRAWINPUTDEVICE pRawInputDevices, UINT uiNumDevices, UINT cbSize) +BOOL WINAPI DECLSPEC_HOTPATCH RegisterRawInputDevices(PCRAWINPUTDEVICE pRawInputDevices, UINT uiNumDevices, UINT cbSize) { FIXME("(pRawInputDevices=%p, uiNumDevices=%d, cbSize=%d) stub!\n", pRawInputDevices, uiNumDevices, cbSize);
@@ -582,7 +582,7 @@ /********************************************************************** * VkKeyScanExA (USER32.@) */ -WORD WINAPI VkKeyScanExA(CHAR cChar, HKL dwhkl) +SHORT WINAPI VkKeyScanExA(CHAR cChar, HKL dwhkl) { WCHAR wChar;
@@ -595,7 +595,7 @@ /****************************************************************************** * VkKeyScanExW (USER32.@) */ -WORD WINAPI VkKeyScanExW(WCHAR cChar, HKL dwhkl) +SHORT WINAPI VkKeyScanExW(WCHAR cChar, HKL dwhkl) { return USER_Driver->pVkKeyScanEx(cChar, dwhkl); }
Modified: branches/arwinss/reactos/dll/win32/user32/legacy.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32... ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/legacy.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/legacy.c [iso-8859-1] Sun Aug 1 12:50:40 2010 @@ -7,7 +7,6 @@ #include "wingdi.h" #include "winerror.h" #include "wine/winbase16.h" -#include "wine/winuser16.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(userlegacy);
Modified: branches/arwinss/reactos/dll/win32/user32/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32... ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/misc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/misc.c [iso-8859-1] Sun Aug 1 12:50:40 2010 @@ -472,7 +472,7 @@ /*********************************************************************** * EnumDisplayMonitors (USER32.@) */ -BOOL WINAPI EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) +BOOL WINAPI EnumDisplayMonitors( HDC hdc, LPCRECT rect, MONITORENUMPROC proc, LPARAM lp ) { return USER_Driver->pEnumDisplayMonitors( hdc, rect, proc, lp ); }
Modified: branches/arwinss/reactos/dll/win32/user32/msgbox.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32... ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/msgbox.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/msgbox.c [iso-8859-1] Sun Aug 1 12:50:40 2010 @@ -454,7 +454,7 @@ /************************************************************************** * MessageBoxIndirectA (USER32.@) */ -INT WINAPI MessageBoxIndirectA( LPMSGBOXPARAMSA msgbox ) +INT WINAPI MessageBoxIndirectA( CONST MSGBOXPARAMSA *msgbox ) { MSGBOXPARAMSW msgboxW; UNICODE_STRING textW, captionW, iconW; @@ -501,7 +501,7 @@ /************************************************************************** * MessageBoxIndirectW (USER32.@) */ -INT WINAPI MessageBoxIndirectW( LPMSGBOXPARAMSW msgbox ) +INT WINAPI MessageBoxIndirectW( CONST MSGBOXPARAMSW *msgbox ) { LPVOID tmplate; HRSRC hRes;