Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 14:53:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed compiling problems

Browse source 
svn path=/trunk/; revision=7019
This commit is contained in:
Thomas Bluemel 2003-12-14 13:26:20 +00:00
parent 09feaad3e1
commit df4f47d0df
4 changed files with 55 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

67
reactos/include/win32k/ntuser.h
View file

@ -169,14 +169,15 @@ STDCALL
NtUserCallNoParam( NtUserCallNoParam(
DWORD Routine); DWORD Routine);
#define ONEPARAM_ROUTINE_GETMENU 0x01 #define ONEPARAM_ROUTINE_GETMENU 0x01
#define ONEPARAM_ROUTINE_ISWINDOWUNICODE 0x02 #define ONEPARAM_ROUTINE_ISWINDOWUNICODE 0x02
#define ONEPARAM_ROUTINE_WINDOWFROMDC 0x03 #define ONEPARAM_ROUTINE_WINDOWFROMDC 0x03
#define ONEPARAM_ROUTINE_GETWNDCONTEXTHLPID 0x04 #define ONEPARAM_ROUTINE_GETWNDCONTEXTHLPID 0x04
#define ONEPARAM_ROUTINE_SWAPMOUSEBUTTON 0x05 #define ONEPARAM_ROUTINE_SWAPMOUSEBUTTON 0x05
#define ONEPARAM_ROUTINE_SETCARETBLINKTIME 0x06 #define ONEPARAM_ROUTINE_SETCARETBLINKTIME 0x06
#define ONEPARAM_ROUTINE_GETCARETINFO 0x07 #define ONEPARAM_ROUTINE_GETCARETINFO 0x07
#define ONEPARAM_ROUTINE_SWITCHCARETSHOWING 0x08 #define ONEPARAM_ROUTINE_SWITCHCARETSHOWING 0x08
#define ONEPARAM_ROUTINE_ENUMCLIPBOARDFORMATS 0x09
DWORD DWORD
STDCALL STDCALL
NtUserCallOneParam( NtUserCallOneParam(
@ -198,11 +199,11 @@ NtUserCallTwoParam(
DWORD Param2, DWORD Param2,
DWORD Routine); DWORD Routine);
DWORD BOOL
STDCALL STDCALL
NtUserChangeClipboardChain( NtUserChangeClipboardChain(
DWORD Unknown0, HWND hWndRemove,
DWORD Unknown1); HWND hWndNewNext);
LONG LONG
STDCALL STDCALL
@ -231,7 +232,7 @@ STDCALL
NtUserClipCursor( NtUserClipCursor(
RECT *lpRect); RECT *lpRect);
DWORD BOOL
STDCALL STDCALL
NtUserCloseClipboard(VOID); NtUserCloseClipboard(VOID);
@ -610,20 +611,20 @@ NtUserGetClassName(HWND hWnd,
LPWSTR lpClassName, LPWSTR lpClassName,
ULONG nMaxCount); ULONG nMaxCount);
DWORD HANDLE
STDCALL STDCALL
NtUserGetClipboardData( NtUserGetClipboardData(
DWORD Unknown0, UINT uFormat,
DWORD Unknown1); DWORD Unknown1);
DWORD INT
STDCALL STDCALL
NtUserGetClipboardFormatName( NtUserGetClipboardFormatName(
DWORD Unknown0, UINT format,
DWORD Unknown1, PUNICODE_STRING FormatName,
DWORD Unknown2); INT cchMaxCount);
DWORD HWND
STDCALL STDCALL
NtUserGetClipboardOwner(VOID); NtUserGetClipboardOwner(VOID);
@ -631,7 +632,7 @@ DWORD
STDCALL STDCALL
NtUserGetClipboardSequenceNumber(VOID); NtUserGetClipboardSequenceNumber(VOID);
DWORD HWND
STDCALL STDCALL
NtUserGetClipboardViewer(VOID); NtUserGetClipboardViewer(VOID);
@ -818,15 +819,15 @@ NtUserGetObjectInformation(
DWORD nLength, DWORD nLength,
PDWORD nLengthNeeded); PDWORD nLengthNeeded);
DWORD HWND
STDCALL STDCALL
NtUserGetOpenClipboardWindow(VOID); NtUserGetOpenClipboardWindow(VOID);
DWORD INT
STDCALL STDCALL
NtUserGetPriorityClipboardFormat( NtUserGetPriorityClipboardFormat(
DWORD Unknown0, UINT *paFormatPriorityList,
DWORD Unknown1); INT cFormats);
HWINSTA HWINSTA
STDCALL STDCALL
@ -960,10 +961,10 @@ STDCALL
WINBOOL bErase); WINBOOL bErase);
DWORD WINBOOL
STDCALL STDCALL
NtUserIsClipboardFormatAvailable( NtUserIsClipboardFormatAvailable(
DWORD Unknown0); UINT format);
BOOL BOOL
STDCALL STDCALL
@ -1098,10 +1099,10 @@ NtUserNotifyWinEvent(
DWORD Unknown2, DWORD Unknown2,
DWORD Unknown3); DWORD Unknown3);
DWORD BOOL
STDCALL STDCALL
NtUserOpenClipboard( NtUserOpenClipboard(
DWORD Unknown0, HWND hWnd,
DWORD Unknown1); DWORD Unknown1);
HDESK HDESK
@ -1316,17 +1317,17 @@ NtUserSetClassWord(
DWORD Unknown1, DWORD Unknown1,
DWORD Unknown2); DWORD Unknown2);
DWORD HANDLE
STDCALL STDCALL
NtUserSetClipboardData( NtUserSetClipboardData(
DWORD Unknown0, UINT uFormat,
DWORD Unknown1, HANDLE hMem,
DWORD Unknown2); DWORD Unknown2);
DWORD HWND
STDCALL STDCALL
NtUserSetClipboardViewer( NtUserSetClipboardViewer(
DWORD Unknown0); HWND hWndNewViewer);
DWORD DWORD
STDCALL STDCALL

11
reactos/lib/user32/windows/clipboard.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: clipboard.c,v 1.6 2003/12/14 12:39:32 navaraf Exp $ /* $Id: clipboard.c,v 1.7 2003/12/14 13:26:20 weiden Exp $
* *
* PROJECT: ReactOS user32.dll * PROJECT: ReactOS user32.dll
* FILE: lib/user32/windows/input.c * FILE: lib/user32/windows/input.c
@ -96,6 +96,7 @@ INT STDCALL
GetClipboardFormatNameA(UINT format, LPSTR lpszFormatName, int cchMaxCount) GetClipboardFormatNameA(UINT format, LPSTR lpszFormatName, int cchMaxCount)
{ {
LPWSTR lpBuffer; LPWSTR lpBuffer;
UNICODE_STRING FormatName;
INT Length; INT Length;
lpBuffer = HEAP_alloc(cchMaxCount * sizeof(WCHAR)); lpBuffer = HEAP_alloc(cchMaxCount * sizeof(WCHAR));
@ -104,7 +105,8 @@ GetClipboardFormatNameA(UINT format, LPSTR lpszFormatName, int cchMaxCount)
SetLastError(ERROR_OUTOFMEMORY); SetLastError(ERROR_OUTOFMEMORY);
return 0; return 0;
} }
Length = NtUserGetClipboardFormatName(format, lpBuffer, cchMaxCount); RtlInitUnicodeString(&FormatName, lpBuffer);
Length = NtUserGetClipboardFormatName(format, &FormatName, cchMaxCount);
HEAP_strcpyWtoA(lpszFormatName, lpBuffer, Length); HEAP_strcpyWtoA(lpszFormatName, lpBuffer, Length);
HEAP_free(lpBuffer); HEAP_free(lpBuffer);
@ -117,7 +119,10 @@ GetClipboardFormatNameA(UINT format, LPSTR lpszFormatName, int cchMaxCount)
INT STDCALL INT STDCALL
GetClipboardFormatNameW(UINT format, LPWSTR lpszFormatName, INT cchMaxCount) GetClipboardFormatNameW(UINT format, LPWSTR lpszFormatName, INT cchMaxCount)
{ {
return NtUserGetClipboardFormatName(format, lpszFormatName, cchMaxCount); UNICODE_STRING FormatName;
RtlInitUnicodeString(&FormatName, lpszFormatName);
return NtUserGetClipboardFormatName(format, &FormatName, cchMaxCount);
} }
/* /*

2
reactos/subsys/win32k/ntuser/clipboard.c
View file

@ -115,7 +115,7 @@ NtUserGetClipboardData(UINT uFormat, DWORD Unknown1)
} }
INT STDCALL INT STDCALL
NtUserGetClipboardFormatName(UINT format, LPWSTR lpszFormatName, NtUserGetClipboardFormatName(UINT format, PUNICODE_STRING FormatName,
INT cchMaxCount) INT cchMaxCount)
{ {
UNIMPLEMENTED UNIMPLEMENTED

23
reactos/subsys/win32k/objects/cursoricon.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: cursoricon.c,v 1.38 2003/12/13 22:38:29 weiden Exp $ */ /* $Id: cursoricon.c,v 1.39 2003/12/14 13:26:20 weiden Exp $ */
#undef WIN32_LEAN_AND_MEAN #undef WIN32_LEAN_AND_MEAN
@ -120,9 +120,10 @@ IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor, BOOL Fo
/* FIXME use the desktop's HDC instead of using ScreenDeviceContext */ /* FIXME use the desktop's HDC instead of using ScreenDeviceContext */
PDC dc = DC_LockDc(IntGetScreenDC()); PDC dc = DC_LockDc(IntGetScreenDC());
if(!dc) if(!dc)
{ {
return Ret; return Ret;
} }
SurfObj = (PSURFOBJ)AccessUserObject((ULONG) dc->Surface); SurfObj = (PSURFOBJ)AccessUserObject((ULONG) dc->Surface);
SurfGDI = (PSURFGDI)AccessInternalObject((ULONG) dc->Surface); SurfGDI = (PSURFGDI)AccessInternalObject((ULONG) dc->Surface);
DevInfo = dc->DevInfo; DevInfo = dc->DevInfo;
@ -151,7 +152,7 @@ IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor, BOOL Fo
/* TODO: Fixme. Logic is screwed above */ /* TODO: Fixme. Logic is screwed above */
ASSERT(NewCursor); ASSERT(NewCursor);
MaskBmpObj = BITMAPOBJ_LockBitmap(NewCursor->IconInfo.hbmMask); MaskBmpObj = BITMAPOBJ_LockBitmap(NewCursor->IconInfo.hbmMask);
if(MaskBmpObj) if(MaskBmpObj)
{ {
@ -214,17 +215,17 @@ IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor, BOOL Fo
SPS_CHANGE); SPS_CHANGE);
if(hMask) if(hMask)
{ {
EngDeleteSurface(hMask); EngDeleteSurface(hMask);
} }
if(hColor) if(hColor)
{ {
EngDeleteSurface(hColor); EngDeleteSurface(hColor);
} }
if(XlateObj) if(XlateObj)
{ {
EngDeleteXlate(XlateObj); EngDeleteXlate(XlateObj);
} }
if(SurfGDI->PointerStatus == SPS_DECLINE) if(SurfGDI->PointerStatus == SPS_DECLINE)
DbgPrint("SetCursor: DrvSetPointerShape() returned SPS_DECLINE\n"); DbgPrint("SetCursor: DrvSetPointerShape() returned SPS_DECLINE\n");