Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 32733: Finish Stefan Ginsberg patch from rev 32726.
by jimtabor＠svn.reactos.org 21 Mar '08

21 Mar '08

Author: jimtabor Date: Fri Mar 21 01:55:43 2008 New Revision: 32733 URL: http://svn.reactos.org/svn/reactos?rev=3D32733&view=3Drev Log: Finish Stefan Ginsberg patch from rev 32726. Modified: trunk/reactos/include/reactos/win32k/ntuser.h Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32= k/ntuser.h?rev=3D32733&r1=3D32732&r2=3D32733&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Fri Mar 21 01:55:43 2008 @@ -2370,11 +2370,6 @@ * ReactOS-specific NtUser calls and their related structures, both which= shouldn't exist. */ = -NTSTATUS -NTAPI -NtUserAcquireOrReleaseInputOwnership( - BOOLEAN Release); - DWORD NTAPI NtUserBuildMenuItemList( @@ -2642,17 +2637,6 @@ PNTUSERSENDMESSAGEINFO Info); = /* use NtUserMessageCall */ -BOOL -NTAPI -NtUserSendMessageCallback( - HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam, - SENDASYNCPROC lpCallBack, - ULONG_PTR dwData); - -/* use NtUserMessageCall */ LRESULT NTAPI NtUserSendMessageTimeout(HWND hWnd, UINT Msg,

1 0

[jimtabor] 32732: Sorry Timo! I think I forgot to remove these months ago.
by jimtabor＠svn.reactos.org 21 Mar '08

21 Mar '08

Author: jimtabor Date: Fri Mar 21 00:42:48 2008 New Revision: 32732 URL: http://svn.reactos.org/svn/reactos?rev=3D32732&view=3Drev Log: Sorry Timo! I think I forgot to remove these months ago. Modified: trunk/reactos/include/reactos/win32k/ntuser.h Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32= k/ntuser.h?rev=3D32732&r1=3D32731&r2=3D32732&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Fri Mar 21 00:42:48 2008 @@ -589,10 +589,7 @@ #define TWOPARAM_ROUTINE_SHOWOWNEDPOPUPS 0x62 #define TWOPARAM_ROUTINE_SWITCHTOTHISWINDOW 0x63 = -#define TWOPARAM_ROUTINE_SETDCPENCOLOR 0xfffd0045 /* Private ROS */ -#define TWOPARAM_ROUTINE_SETDCBRUSHCOLOR 0xfffd0046 -#define TWOPARAM_ROUTINE_GETDCCOLOR 0xfffd0047 -#define TWOPARAM_ROUTINE_GETWINDOWRGNBOX 0xfffd0048 +#define TWOPARAM_ROUTINE_GETWINDOWRGNBOX 0xfffd0048 /* Private ROS */ #define TWOPARAM_ROUTINE_GETWINDOWRGN 0xfffd0049 #define TWOPARAM_ROUTINE_SETMENUBARHEIGHT 0xfffd0050 #define TWOPARAM_ROUTINE_SETMENUITEMRECT 0xfffd0051 @@ -2373,25 +2370,6 @@ * ReactOS-specific NtUser calls and their related structures, both which= shouldn't exist. */ = -/* The following macros don't belong to ntuser, but are part of gdi */ - -/* Should be done in usermode */ -#define NtUserGetDCBrushColor(hbr) \ - (COLORREF)NtUserCallTwoParam((DWORD)(hbr), OBJ_BRUSH, TWOPARAM_ROUTINE_G= ETDCCOLOR) - -/* Should be done in usermode */ -#define NtUserGetDCPenColor(hbr) \ - (COLORREF)NtUserCallTwoParam((DWORD)(hbr), OBJ_PEN, TWOPARAM_ROUTINE_GET= DCCOLOR) - -/* Should be done in usermode */ -#define NtUserSetDCBrushColor(hbr, crColor) \ - (COLORREF)NtUserCallTwoParam((DWORD)(hbr), (DWORD)crColor, TWOPARAM_ROUT= INE_SETDCBRUSHCOLOR) - -/* Should be done in usermode */ -#define NtUserSetDCPenColor(hbr, crColor) \ - (COLORREF)NtUserCallTwoParam((DWORD)(hbr), (DWORD)crColor, TWOPARAM_ROUT= INE_SETDCPENCOLOR) - - NTSTATUS NTAPI NtUserAcquireOrReleaseInputOwnership(

1 0

[tkreuzer] 32731: remove a reference to GDIOBJ_AllocObjDepricated
by tkreuzer＠svn.reactos.org 21 Mar '08

21 Mar '08

Author: tkreuzer Date: Thu Mar 20 19:19:50 2008 New Revision: 32731 URL: http://svn.reactos.org/svn/reactos?rev=3D32731&view=3Drev Log: remove a reference to GDIOBJ_AllocObjDepricated Modified: trunk/reactos/subsystems/win32/win32k/objects/metafile.c Modified: trunk/reactos/subsystems/win32/win32k/objects/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/objects/metafile.c?rev=3D32731&r1=3D32730&r2=3D32731&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/objects/metafile.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/metafile.c Thu Mar 20 19:= 19:50 2008 @@ -230,23 +230,20 @@ NtClose( Dc->hFile ); } = - hmf =3D GDIOBJ_AllocObjDepricated(GdiHandleTable, GDI_OBJECT_TYPE_ENHMET= AFILE); - if (hmf !=3D NULL) + phmf =3D GDIOBJ_AllocObjWithHandle(GdiHandleTable, GDI_OBJECT_TYPE_ENHME= TAFILE); + if (phmf !=3D NULL) { - phmf =3D GDIOBJ_LockObj(GdiHandleTable, hmf, GDI_OBJECT_TYPE_ENHMETAF= ILE); - if (phmf !=3D NULL) - { - if (Dc->hFile !=3D NULL) - { - phmf->on_disk =3D TRUE; - } - else - { - phmf->on_disk =3D FALSE; - } - GDIOBJ_UnlockObjByPtr(GdiHandleTable, phmf); - phmf->emh =3D Dc->emh; - } + hmf =3D phmf->BaseObject.hHmgr; + if (Dc->hFile !=3D NULL) + { + phmf->on_disk =3D TRUE; + } + else + { + phmf->on_disk =3D FALSE; + } + phmf->emh =3D Dc->emh; + GDIOBJ_UnlockObjByPtr(GdiHandleTable, phmf); } = Dc->emh =3D NULL; /* So it won't be deleted */

1 0

[tkreuzer] 32730: ntuser/misc.c was huge, split it into sysparams.c, simplecall.c and misc.c
by tkreuzer＠svn.reactos.org 21 Mar '08

21 Mar '08

Author: tkreuzer Date: Thu Mar 20 19:07:06 2008 New Revision: 32730 URL: http://svn.reactos.org/svn/reactos?rev=3D32730&view=3Drev Log: ntuser/misc.c was huge, split it into sysparams.c, simplecall.c and misc.c Added: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c - copied, changed from r32724, trunk/reactos/subsystems/win32/win32k/= ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c - copied, changed from r32724, trunk/reactos/subsystems/win32/win32k/= ntuser/misc.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/win32k.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/ntuser/misc.c?rev=3D32730&r1=3D32729&r2=3D32730&view=3Ddiff Copied: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c (from r32= 724, trunk/reactos/subsystems/win32/win32k/ntuser/misc.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/ntuser/simplecall.c?p2=3Dtrunk/reactos/subsystems/win32/win32k/ntuser/si= mplecall.c&p1=3Dtrunk/reactos/subsystems/win32/win32k/ntuser/misc.c&r1=3D32= 724&r2=3D32730&rev=3D32730&view=3Ddiff Copied: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c (from r327= 24, trunk/reactos/subsystems/win32/win32k/ntuser/misc.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/ntuser/sysparams.c?p2=3Dtrunk/reactos/subsystems/win32/win32k/ntuser/sys= params.c&p1=3Dtrunk/reactos/subsystems/win32/win32k/ntuser/misc.c&r1=3D3272= 4&r2=3D32730&rev=3D32730&view=3Ddiff Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/win32k.rbuild?rev=3D32730&r1=3D32729&r2=3D32730&view=3Ddiff

1 0

[tkreuzer] 32729: - started fixing NtUserCallXxx defines - moved bad NtUserXxx macros to bottom - added some comments to ntuser bad stuff
by tkreuzer＠svn.reactos.org 21 Mar '08

21 Mar '08

Author: tkreuzer Date: Thu Mar 20 19:01:33 2008 New Revision: 32729 URL: http://svn.reactos.org/svn/reactos?rev=3D32729&view=3Drev Log: - started fixing NtUserCallXxx defines - moved bad NtUserXxx macros to bottom - added some comments to ntuser bad stuff Modified: trunk/reactos/include/reactos/win32k/ntuser.h Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32= k/ntuser.h?rev=3D32729&r1=3D32728&r2=3D32729&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Thu Mar 20 19:01:33 2008 @@ -506,7 +506,7 @@ HWND NTAPI NtUserCallHwndOpt( - HWND Param, + HWND hWnd, DWORD Routine); = DWORD @@ -539,11 +539,14 @@ = #define NOPARAM_ROUTINE_CREATEMENU 0x0 #define NOPARAM_ROUTINE_CREATEMENUPOPUP 0x1 +//#define ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING 0x2 #define NOPARAM_ROUTINE_MSQCLEARWAKEMASK 0x3 +//#define ONEPARAM_ROUTINE_ALLOWFOREGNDACTIVATION 0x04 +#define NOPARAM_ROUTINE_DESTROY_CARET 0x5 +#define NOPARAM_ROUTINE_INIT_MESSAGE_PUMP 0x1b +#define NOPARAM_ROUTINE_UNINIT_MESSAGE_PUMP 0x1c + #define NOPARAM_ROUTINE_REGISTER_PRIMITIVE 0xffff0001 /* Private ROS */ -#define NOPARAM_ROUTINE_DESTROY_CARET 0xffff0002 -#define NOPARAM_ROUTINE_UNINIT_MESSAGE_PUMP 0xffff0003 -#define NOPARAM_ROUTINE_INIT_MESSAGE_PUMP 0xffff0004 #define NOPARAM_ROUTINE_GETMESSAGEEXTRAINFO 0xffff0005 #define NOPARAM_ROUTINE_ANYPOPUP 0xffff0006 #define NOPARAM_ROUTINE_CSRSS_INITIALIZED 0xffff0007 @@ -552,61 +555,62 @@ NtUserCallNoParam( DWORD Routine); = -#define ONEPARAM_ROUTINE_GETMENU 0x01 -#define ONEPARAM_ROUTINE_ISWINDOWUNICODE 0x02 -#define ONEPARAM_ROUTINE_WINDOWFROMDC 0x03 -#define ONEPARAM_ROUTINE_GETWNDCONTEXTHLPID 0x04 -#define ONEPARAM_ROUTINE_SWAPMOUSEBUTTON 0x05 -#define ONEPARAM_ROUTINE_SETCARETBLINKTIME 0x06 -#define ONEPARAM_ROUTINE_GETCARETINFO 0x07 -#define ONEPARAM_ROUTINE_SWITCHCARETSHOWING 0x08 -#define ONEPARAM_ROUTINE_ENUMCLIPBOARDFORMATS 0x09 -#define ONEPARAM_ROUTINE_SETMESSAGEEXTRAINFO 0x0a -#define ONEPARAM_ROUTINE_GETCURSORPOSITION 0x0b -#define ONEPARAM_ROUTINE_ISWINDOWINDESTROY 0x0c -#define ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING 0x0d -#define ONEPARAM_ROUTINE_GETDESKTOPMAPPING 0x0e -#define ONEPARAM_ROUTINE_GETWINDOWINSTANCE 0x10 -#define ONEPARAM_ROUTINE_CREATECURICONHANDLE 0x25 -#define ONEPARAM_ROUTINE_MSQSETWAKEMASK 0x27 -#define ONEPARAM_ROUTINE_GETKEYBOARDTYPE 0x28 -#define ONEPARAM_ROUTINE_GETKEYBOARDLAYOUT 0x29 -#define ONEPARAM_ROUTINE_SHOWCURSOR 0x30 -#define ONEPARAM_ROUTINE_REGISTERUSERMODULE 0x31 +#define ONEPARAM_ROUTINE_WINDOWFROMDC 0x1f +#define ONEPARAM_ROUTINE_ENUMCLIPBOARDFORMATS 0x25 +#define ONEPARAM_ROUTINE_GETCURSORPOSITION 0x26 +#define ONEPARAM_ROUTINE_GETKEYBOARDLAYOUT 0x28 +#define ONEPARAM_ROUTINE_GETKEYBOARDTYPE 0x29 #define ONEPARAM_ROUTINE_REALIZEPALETTE 0x35 #define ONEPARAM_ROUTINE_RELEASEDC 0x39 +#define ONEPARAM_ROUTINE_SETCARETBLINKTIME 0x3b +#define ONEPARAM_ROUTINE_SETMESSAGEEXTRAINFO 0x3e +#define ONEPARAM_ROUTINE_SHOWCURSOR 0x40 +#define ONEPARAM_ROUTINE_SWAPMOUSEBUTTON 0x42 +#define ONEPARAM_ROUTINE_GETWNDCONTEXTHLPID 0x47 + +#define ONEPARAM_ROUTINE_GETMENU 0xfffe0001 /* Private ROS */ +#define ONEPARAM_ROUTINE_ISWINDOWUNICODE 0xfffe0002 +#define ONEPARAM_ROUTINE_GETCARETINFO 0xfffe0007 +#define ONEPARAM_ROUTINE_SWITCHCARETSHOWING 0xfffe0008 +#define ONEPARAM_ROUTINE_ISWINDOWINDESTROY 0xfffe000c +#define ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING 0xfffe000d +#define ONEPARAM_ROUTINE_GETDESKTOPMAPPING 0xfffe000e +#define ONEPARAM_ROUTINE_GETWINDOWINSTANCE 0xfffe0010 +#define ONEPARAM_ROUTINE_CREATECURICONHANDLE 0xfffe0025 +#define ONEPARAM_ROUTINE_MSQSETWAKEMASK 0xfffe0027 +#define ONEPARAM_ROUTINE_REGISTERUSERMODULE 0xfffe0031 DWORD NTAPI NtUserCallOneParam( DWORD Param, DWORD Routine); = -#define TWOPARAM_ROUTINE_SETDCPENCOLOR 0x45 -#define TWOPARAM_ROUTINE_SETDCBRUSHCOLOR 0x46 -#define TWOPARAM_ROUTINE_GETDCCOLOR 0x47 -#define TWOPARAM_ROUTINE_GETWINDOWRGNBOX 0x48 -#define TWOPARAM_ROUTINE_GETWINDOWRGN 0x49 -#define TWOPARAM_ROUTINE_SETMENUBARHEIGHT 0x50 -#define TWOPARAM_ROUTINE_SETMENUITEMRECT 0x51 -#define TWOPARAM_ROUTINE_SETGUITHRDHANDLE 0x52 +#define TWOPARAM_ROUTINE_ENABLEWINDOW 0x60 +#define TWOPARAM_ROUTINE_SHOWOWNEDPOPUPS 0x62 +#define TWOPARAM_ROUTINE_SWITCHTOTHISWINDOW 0x63 + +#define TWOPARAM_ROUTINE_SETDCPENCOLOR 0xfffd0045 /* Private ROS */ +#define TWOPARAM_ROUTINE_SETDCBRUSHCOLOR 0xfffd0046 +#define TWOPARAM_ROUTINE_GETDCCOLOR 0xfffd0047 +#define TWOPARAM_ROUTINE_GETWINDOWRGNBOX 0xfffd0048 +#define TWOPARAM_ROUTINE_GETWINDOWRGN 0xfffd0049 +#define TWOPARAM_ROUTINE_SETMENUBARHEIGHT 0xfffd0050 +#define TWOPARAM_ROUTINE_SETMENUITEMRECT 0xfffd0051 +#define TWOPARAM_ROUTINE_SETGUITHRDHANDLE 0xfffd0052 #define MSQ_STATE_CAPTURE 0x1 #define MSQ_STATE_ACTIVE 0x2 #define MSQ_STATE_FOCUS 0x3 #define MSQ_STATE_MENUOWNER 0x4 #define MSQ_STATE_MOVESIZE 0x5 #define MSQ_STATE_CARET 0x6 -#define TWOPARAM_ROUTINE_ENABLEWINDOW 0x53 -#define TWOPARAM_ROUTINE_UNKNOWN 0x54 -#define TWOPARAM_ROUTINE_SHOWOWNEDPOPUPS 0x55 -#define TWOPARAM_ROUTINE_SWITCHTOTHISWINDOW 0x56 -#define TWOPARAM_ROUTINE_SETWNDCONTEXTHLPID 0x58 -#define TWOPARAM_ROUTINE_SETCARETPOS 0x60 -#define TWOPARAM_ROUTINE_GETWINDOWINFO 0x61 -#define TWOPARAM_ROUTINE_REGISTERLOGONPROC 0x62 -#define TWOPARAM_ROUTINE_GETSYSCOLORBRUSHES 0x63 -#define TWOPARAM_ROUTINE_GETSYSCOLORPENS 0x64 -#define TWOPARAM_ROUTINE_GETSYSCOLORS 0x65 -#define TWOPARAM_ROUTINE_SETSYSCOLORS 0x66 +#define TWOPARAM_ROUTINE_SETWNDCONTEXTHLPID 0xfffd0058 +#define TWOPARAM_ROUTINE_SETCARETPOS 0xfffd0060 +#define TWOPARAM_ROUTINE_GETWINDOWINFO 0xfffd0061 +#define TWOPARAM_ROUTINE_REGISTERLOGONPROC 0xfffd0062 +#define TWOPARAM_ROUTINE_GETSYSCOLORBRUSHES 0xfffd0063 +#define TWOPARAM_ROUTINE_GETSYSCOLORPENS 0xfffd0064 +#define TWOPARAM_ROUTINE_GETSYSCOLORS 0xfffd0065 +#define TWOPARAM_ROUTINE_SETSYSCOLORS 0xfffd0066 // use NtUserSetSys= Colors #define TWOPARAM_ROUTINE_ROS_SHOWWINDOW 0x1000 #define TWOPARAM_ROUTINE_ROS_ISACTIVEICON 0x1001 #define TWOPARAM_ROUTINE_ROS_NCDESTROY 0x1002 @@ -919,7 +923,7 @@ LPCRECT lprcClip, MONITORENUMPROC lpfnEnum, LPARAM dwData );*/ -/* FIXME: The call below is ros-specific and should be rewritten to use t= he same params as the correct call above. */ = +/* FIXME: The call below is ros-specific and should be rewritten to use t= he same params as the correct call above. */ INT NTAPI NtUserEnumDisplayMonitors( @@ -2338,18 +2342,6 @@ DWORD NTAPI NtUserYieldTask(VOID); - -#define NtUserGetDCBrushColor(hbr) \ - (COLORREF)NtUserCallTwoParam((DWORD)(hbr), OBJ_BRUSH, TWOPARAM_ROUTINE_G= ETDCCOLOR) - -#define NtUserGetDCPenColor(hbr) \ - (COLORREF)NtUserCallTwoParam((DWORD)(hbr), OBJ_PEN, TWOPARAM_ROUTINE_GET= DCCOLOR) - -#define NtUserSetDCBrushColor(hbr, crColor) \ - (COLORREF)NtUserCallTwoParam((DWORD)(hbr), (DWORD)crColor, TWOPARAM_ROUT= INE_SETDCBRUSHCOLOR) - -#define NtUserSetDCPenColor(hbr, crColor) \ - (COLORREF)NtUserCallTwoParam((DWORD)(hbr), (DWORD)crColor, TWOPARAM_ROUT= INE_SETDCPENCOLOR) = /* lParam of DDE messages */ typedef struct tagKMDDEEXECUTEDATA @@ -2381,6 +2373,24 @@ * ReactOS-specific NtUser calls and their related structures, both which= shouldn't exist. */ = +/* The following macros don't belong to ntuser, but are part of gdi */ + +/* Should be done in usermode */ +#define NtUserGetDCBrushColor(hbr) \ + (COLORREF)NtUserCallTwoParam((DWORD)(hbr), OBJ_BRUSH, TWOPARAM_ROUTINE_G= ETDCCOLOR) + +/* Should be done in usermode */ +#define NtUserGetDCPenColor(hbr) \ + (COLORREF)NtUserCallTwoParam((DWORD)(hbr), OBJ_PEN, TWOPARAM_ROUTINE_GET= DCCOLOR) + +/* Should be done in usermode */ +#define NtUserSetDCBrushColor(hbr, crColor) \ + (COLORREF)NtUserCallTwoParam((DWORD)(hbr), (DWORD)crColor, TWOPARAM_ROUT= INE_SETDCBRUSHCOLOR) + +/* Should be done in usermode */ +#define NtUserSetDCPenColor(hbr, crColor) \ + (COLORREF)NtUserCallTwoParam((DWORD)(hbr), (DWORD)crColor, TWOPARAM_ROUT= INE_SETDCPENCOLOR) + = NTSTATUS NTAPI @@ -2393,13 +2403,14 @@ HMENU hMenu, PVOID Buffer, ULONG nBufSize, - DWORD Reserved); = - + DWORD Reserved); + +/* Use ONEPARAM_ROUTINE_CREATEEMPTYCURSOROBJECT (0x21) ? */ HANDLE NTAPI NtUserCreateCursorIconHandle( PICONINFO IconInfo, - BOOL Indirect); = + BOOL Indirect); = = typedef struct _WNDPROC_INFO @@ -2412,7 +2423,7 @@ NTAPI NtUserDereferenceWndProcHandle(IN HANDLE wpHandle, OUT PWNDPROC_INFO wpInf= o); = - +/* Use ONEPARAM_ROUTINE_ENUMCLIPBOARDFORMATS */ UINT NTAPI NtUserEnumClipboardFormats( @@ -2426,14 +2437,17 @@ NTAPI NtUserGetCapture(VOID); = +/* Should be done in usermode */ ULONG_PTR NTAPI NtUserGetClassLong(HWND hWnd, INT Offset, BOOL Ansi); = +/* Should be done in usermode */ BOOL NTAPI NtUserGetClientOrigin(HWND hWnd, LPPOINT Point); = +/* Should be done in usermode */ BOOL NTAPI NtUserGetClientRect(HWND hWnd, LPRECT Rect); @@ -2467,6 +2481,7 @@ IN HMONITOR hMonitor, OUT LPMONITORINFO pMonitorInfo); = +/* Should be done in usermode */ HANDLE NTAPI NtUserGetProp(HWND hWnd, ATOM Atom); @@ -2494,10 +2509,12 @@ NTAPI NtUserGetWindow(HWND hWnd, UINT Relationship); = +/* Should be done in usermode */ LONG NTAPI NtUserGetWindowLong(HWND hWnd, DWORD Index, BOOL Ansi); = +/* Should be done in usermode */ BOOL NTAPI NtUserGetWindowRect(HWND hWnd, LPRECT Rect); @@ -2638,6 +2655,7 @@ WNDPROC Proc; } NTUSERSENDMESSAGEINFO, *PNTUSERSENDMESSAGEINFO; = +/* use NtUserMessageCall */ LRESULT NTAPI NtUserSendMessage(HWND hWnd, UINT Msg, @@ -2645,6 +2663,7 @@ LPARAM lParam, PNTUSERSENDMESSAGEINFO Info); = +/* use NtUserMessageCall */ BOOL NTAPI NtUserSendMessageCallback( @@ -2655,6 +2674,7 @@ SENDASYNCPROC lpCallBack, ULONG_PTR dwData); = +/* use NtUserMessageCall */ LRESULT NTAPI NtUserSendMessageTimeout(HWND hWnd, UINT Msg, @@ -2665,7 +2685,7 @@ ULONG_PTR *uResult, PNTUSERSENDMESSAGEINFO Info); = - +/* use NtUserMessageCall */ BOOL NTAPI NtUserSendNotifyMessage(

1 0

[cfinck] 32728: Revert r32724 I didn't notice that the "msiserver.h" was not recreated by "msi_msiserver_typelib". Thanks to Usurp for pointing this out. Welcome back, circular dependency ; -)
by cfinck＠svn.reactos.org 20 Mar '08

20 Mar '08

Author: cfinck Date: Thu Mar 20 15:10:28 2008 New Revision: 32728 URL: http://svn.reactos.org/svn/reactos?rev=3D32728&view=3Drev Log: Revert r32724 I didn't notice that the "msiserver.h" was not recreated by "msi_msiserver_= typelib". Thanks to Usurp for pointing this out. Welcome back, circular dependency ;-) Modified: trunk/reactos/dll/win32/msi/msi.rbuild Modified: trunk/reactos/dll/win32/msi/msi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.rbu= ild?rev=3D32728&r1=3D32727&r2=3D32728&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/msi/msi.rbuild (original) +++ trunk/reactos/dll/win32/msi/msi.rbuild Thu Mar 20 15:10:28 2008 @@ -50,6 +50,7 @@ <file>update.c</file> <file>upgrade.c</file> <file>where.c</file> + <file>msiserver.idl</file> <file>msi.rc</file> <include base=3D"msi" root=3D"intermediate">.</include> <file>msi.spec</file>

1 0

[mpiulachs] 32727: - Show full filename while copying files. automatically move "copying file" when necessary like windows usetup does - update en-us localization file to make use of r32722 - update STRING_COPY in all localization files - other minor changes
by mpiulachs＠svn.reactos.org 20 Mar '08

20 Mar '08

Author: mpiulachs Date: Thu Mar 20 13:28:37 2008 New Revision: 32727 URL: http://svn.reactos.org/svn/reactos?rev=3D32727&view=3Drev Log: - Show full filename while copying files. automatically move "copying file"= when necessary like windows usetup does - update en-us localization file to make use of r32722 - update STRING_COPY in all localization files - other minor changes Modified: trunk/reactos/base/setup/usetup/interface/consup.c trunk/reactos/base/setup/usetup/interface/consup.h trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/cs-CZ.h trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/uk-UA.h Modified: trunk/reactos/base/setup/usetup/interface/consup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/int= erface/consup.c?rev=3D32727&r1=3D32726&r2=3D32727&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/interface/consup.c (original) +++ trunk/reactos/base/setup/usetup/interface/consup.c Thu Mar 20 13:28:37 = 2008 @@ -204,44 +204,6 @@ } = VOID -CONSOLE_SetStatusText( - IN LPCSTR fmt, ...) -{ - CHAR Buffer[128]; - va_list ap; - COORD coPos; - DWORD Written; - - va_start(ap, fmt); - vsprintf(Buffer, fmt, ap); - va_end(ap); - - coPos.X =3D 0; - coPos.Y =3D yScreen - 1; - - FillConsoleOutputAttribute( - StdOutput, - BACKGROUND_WHITE, - xScreen, - coPos, - &Written); - - FillConsoleOutputCharacterA( - StdOutput, - ' ', - xScreen, - coPos, - &Written); - - WriteConsoleOutputCharacterA( - StdOutput, - Buffer, - (ULONG)strlen(Buffer), - coPos, - &Written); -} - -VOID CONSOLE_InvertTextXY( IN SHORT x, IN SHORT y, @@ -391,6 +353,110 @@ } = VOID +CONSOLE_SetStatusText( + IN LPCSTR fmt, ...) +{ + CHAR Buffer[128]; + va_list ap; + COORD coPos; + DWORD Written; + + va_start(ap, fmt); + vsprintf(Buffer, fmt, ap); + va_end(ap); + + coPos.X =3D 0; + coPos.Y =3D yScreen - 1; + + FillConsoleOutputAttribute( + StdOutput, + BACKGROUND_WHITE, + xScreen, + coPos, + &Written); + + FillConsoleOutputCharacterA( + StdOutput, + ' ', + xScreen, + coPos, + &Written); + + WriteConsoleOutputCharacterA( + StdOutput, + Buffer, + (ULONG)strlen(Buffer), + coPos, + &Written); +} + +VOID +CONSOLE_SetStatusTextX( + IN SHORT x, + IN LPCSTR fmt, ...) +{ + CHAR Buffer[128]; + va_list ap; + COORD coPos; + DWORD Written; + + va_start(ap, fmt); + vsprintf(Buffer, fmt, ap); + va_end(ap); + + coPos.X =3D 0; + coPos.Y =3D yScreen - 1; + + FillConsoleOutputAttribute( + StdOutput, + BACKGROUND_WHITE, + xScreen, + coPos, + &Written); + + FillConsoleOutputCharacterA( + StdOutput, + ' ', + xScreen, + coPos, + &Written); + + coPos.X =3D x; + + WriteConsoleOutputCharacterA( + StdOutput, + Buffer, + (ULONG)strlen(Buffer), + coPos, + &Written); +} + +VOID +CONSOLE_SetStatusTextAutoFitX( + IN SHORT x, + IN LPCSTR fmt, ...) +{ + CHAR Buffer[128]; + DWORD Length; + va_list ap; + + va_start(ap, fmt); + vsprintf(Buffer, fmt, ap); + va_end(ap); + + Length =3D (ULONG)strlen(Buffer); + + if (Length + x <=3D 79) + { + CONSOLE_SetStatusTextX (x , Buffer); + } + else + { + CONSOLE_SetStatusTextX (79 - Length , Buffer); + } +} + +VOID CONSOLE_SetInvertedTextXY( IN SHORT x, IN SHORT y, @@ -537,49 +603,55 @@ = if (Flags & TEXT_TYPE_STATUS) { + coPos.X =3D x; coPos.Y =3D yScreen - 1; - coPos.X =3D 0; } else /* TEXT_TYPE_REGULAR (Default) */ { - coPos.X =3D x; + coPos.X =3D x; coPos.Y =3D y; } = - if (Flags & TEXT_ALIGN_LEFT) - { - coPos.X =3D 0; - = + if (Flags & TEXT_ALIGN_CENTER) + { + coPos.X =3D (xScreen - Length) /2; = + } + else if(Flags & TEXT_ALIGN_RIGHT) + { + coPos.X =3D coPos.X - Length; = + + if (Flags & TEXT_PADDING_SMALL) + { + coPos.X -=3D 1; + } + else if (Flags & TEXT_PADDING_MEDIUM) + { + coPos.X -=3D 2; = + } + else if (Flags & TEXT_PADDING_BIG) + { + coPos.X -=3D 3; + } + } + else /* TEXT_ALIGN_LEFT (Default) */ + { if (Flags & TEXT_PADDING_SMALL) { coPos.X +=3D 1; } + else if (Flags & TEXT_PADDING_MEDIUM) + { + coPos.X +=3D 2; = + } = else if (Flags & TEXT_PADDING_BIG) { - coPos.X +=3D 2; = + coPos.X +=3D 3; } } - else if (Flags & TEXT_ALIGN_RIGHT) - { - coPos.X =3D coPos.X - Length; = - - if (Flags & TEXT_PADDING_SMALL) - { - coPos.X -=3D 1; - } - else if (Flags & TEXT_PADDING_BIG) - { - coPos.X -=3D 2; = - } - } - else if (Flags & TEXT_ALIGN_CENTER) - { - coPos.X =3D (xScreen - Length) /2; = - } = if (Flags & TEXT_TYPE_STATUS) { - CONSOLE_SetStatusText(Text); + CONSOLE_SetStatusTextX(coPos.X, Text); } else /* TEXT_TYPE_REGULAR (Default) */ { Modified: trunk/reactos/base/setup/usetup/interface/consup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/int= erface/consup.h?rev=3D32727&r1=3D32726&r2=3D32727&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/interface/consup.h (original) +++ trunk/reactos/base/setup/usetup/interface/consup.h Thu Mar 20 13:28:37 = 2008 @@ -47,8 +47,9 @@ #define TEXT_ALIGN_CENTER 0x00000100 = /* Text padding */ -#define TEXT_PADDING_SMALL 0x00000200 -#define TEXT_PADDING_BIG 0x00000400 +#define TEXT_PADDING_SMALL 0x00000200 /* One space */ +#define TEXT_PADDING_MEDIUM 0x00000400 /* Two spaces */ +#define TEXT_PADDING_BIG 0x00000800 /* Three spaces */ = extern HANDLE StdInput, StdOutput; extern SHORT xScreen, yScreen; @@ -158,6 +159,16 @@ IN LPCSTR fmt, ...); = VOID +CONSOLE_SetStatusTextX( + IN SHORT x, + IN LPCSTR fmt, ...); + +VOID +CONSOLE_SetStatusTextAutoFitX( + IN SHORT x, + IN LPCSTR fmt, ...); + +VOID CONSOLE_SetTextXY( IN SHORT x, IN SHORT y, Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/int= erface/usetup.c?rev=3D32727&r1=3D32726&r2=3D32727&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Thu Mar 20 13:28:37 = 2008 @@ -3002,13 +3002,13 @@ case SPFILENOTIFY_STARTSUBQUEUE: CopyContext->TotalOperations =3D (ULONG)Param2; ProgressSetStepCount(CopyContext->ProgressBar, - CopyContext->TotalOperations); + CopyContext->TotalOperations); SetupUpdateMemoryInfo(CopyContext, TRUE); break; = case SPFILENOTIFY_STARTCOPY: /* Display copy message */ - CONSOLE_SetStatusText(MUIGetString(STRING_COPYING), (PWSTR)Par= am1); + CONSOLE_SetStatusTextAutoFitX (45 , MUIGetString(STRING_COPYIN= G), (PWSTR)Param1); SetupUpdateMemoryInfo(CopyContext, FALSE); break; = Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/bg-BG.h?rev=3D32727&r1=3D32726&r2=3D32727&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/lang/bg-BG.h (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h Thu Mar 20 13:28:37 2008 @@ -1608,7 +1608,7 @@ {STRING_TXTSETUPFAILED, "=C2=8D=C2=A5 =C2=A1=C2=A5 =C2=AD=C2=A0=C2=AC=C2=A5=C3=A0=C2=A5=C2=AD = =C3=A0=C2=A0=C2=A7=C2=A4=C2=A5=C2=AB '%S'\n=C2=A2 TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 =C2=87=C2=A0=C2=AF=C2= =A8=C3=A1 =C2=AD=C2=A0 =C3=A4=C2=A0=C2=A9=C2=AB: %S"}, + "\xB3 =C2=87=C2=A0=C2=AF=C2=A8=C3=A1 =C2=AD=C2=A0 =C3=A4=C2=A0=C2=A9= =C2=AB: %S"}, {STRING_SETUPCOPYINGFILES, "=C2=92=C2=A5=C3=A7=C2=A5 =C2=A7=C2=A0=C2=AF=C2=A8=C3=A1=C2=A2=C2=A0= =C2=AD=C2=A5 =C2=AD=C2=A0 =C3=A4=C2=A0=C2=A9=C2=AB=C2=AE=C2=A2=C2=A5=C3=A2= =C2=A5..."}, {STRING_PAGEDMEM, Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/cs-CZ.h?rev=3D32727&r1=3D32726&r2=3D32727&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/lang/cs-CZ.h (original) +++ trunk/reactos/base/setup/usetup/lang/cs-CZ.h Thu Mar 20 13:28:37 2008 @@ -1605,7 +1605,7 @@ {STRING_TXTSETUPFAILED, "Nepoda=C3=BDilo se naj=C2=A1t sekci '%S' v souboru\n TXTSETUP.SIF.\n"= }, {STRING_COPYING, - " \xB3 Kop=C2=A1ruj= i soubor: %S"}, + "\xB3 Kop=C2=A1ruji soubor: %S"}, {STRING_SETUPCOPYINGFILES, "Instalace kop=C2=A1ruje soubory..."}, {STRING_PAGEDMEM, Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/de-DE.h?rev=3D32727&r1=3D32726&r2=3D32727&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/lang/de-DE.h (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h Thu Mar 20 13:28:37 2008 @@ -1605,7 +1605,7 @@ {STRING_TXTSETUPFAILED, "Setup konnte die '%S' Sektion\nin TXTSETUP.SIF nicht finden.\n"}, {STRING_COPYING, - " \xB3 Kopiere Datei: %S"}, + "\xB3 Kopiere Datei: %S"}, {STRING_SETUPCOPYINGFILES, "Setup kopiert Dateien..."}, {STRING_PAGEDMEM, Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/el-GR.h?rev=3D32727&r1=3D32726&r2=3D32727&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/lang/el-GR.h (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h Thu Mar 20 13:28:37 2008 @@ -1599,7 +1599,7 @@ {STRING_TXTSETUPFAILED, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copying file: %S"}, + "\xB3 Copying file: %S"}, {STRING_SETUPCOPYINGFILES, "Setup is copying files..."}, {STRING_PAGEDMEM, Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/en-US.h?rev=3D32727&r1=3D32726&r2=3D32727&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/lang/en-US.h (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h Thu Mar 20 13:28:37 2008 @@ -36,8 +36,8 @@ { 0, 0, - " ENTER =3D Continue F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -112,8 +112,8 @@ { 0, 0, - " ENTER =3D Continue R =3D Repair F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue R =3D Repair F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -206,8 +206,8 @@ { 0, 0, - " ENTER =3D Continue F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue F3 =3D Quit", + TEXT_TYPE_STATUS| TEXT_PADDING_BIG }, { 0, @@ -330,8 +330,8 @@ { 0, 0, - " ENTER =3D Return", - TEXT_TYPE_STATUS + "ENTER =3D Return", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -423,8 +423,8 @@ { 0, 0, - " ENTER =3D Continue F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -487,8 +487,8 @@ { 0, 0, - " ESC =3D Main page ENTER =3D Reboot", - TEXT_TYPE_STATUS + "ESC =3D Main page ENTER =3D Reboot", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -538,8 +538,8 @@ { 0, 0, - " ENTER =3D Continue ESC =3D Cancel F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue ESC =3D Cancel F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -578,8 +578,8 @@ { 0, 0, - " Flushing cache", - TEXT_TYPE_STATUS + "Flushing cache", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -624,8 +624,8 @@ { 0, 0, - " Please wait ...", - TEXT_TYPE_STATUS, + "Please wait ...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, }, { 0, @@ -675,8 +675,8 @@ { 0, 0, - " ENTER =3D Continue ESC =3D Cancel F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue ESC =3D Cancel F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -721,8 +721,8 @@ { 0, 0, - " ENTER =3D Reboot computer", - TEXT_TYPE_STATUS + "ENTER =3D Reboot computer", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -767,8 +767,8 @@ { 0, 0, - " ENTER =3D Continue F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -826,8 +826,8 @@ { 0, 0, - " Please wait...", - TEXT_TYPE_STATUS + "Please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -860,8 +860,8 @@ { 0, 0, - " ENTER =3D Continue F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -912,8 +912,8 @@ { 0, 0, - " ENTER =3D Continue F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -950,9 +950,9 @@ TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER }, { - 0, - 0, - " \xB3 P= lease wait... ", + 50, + 0, + "\xB3 Please wait... ", TEXT_TYPE_STATUS }, { @@ -998,8 +998,8 @@ { 0, 0, - " ENTER =3D Continue F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1050,8 +1050,8 @@ { 0, 0, - " ENTER =3D Continue ESC =3D Cancel F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue ESC =3D Cancel F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1102,8 +1102,8 @@ { 0, 0, - " ENTER =3D Continue ESC =3D Cancel F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue ESC =3D Cancel F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1131,8 +1131,8 @@ { 0, 0, - " Building the file copy list...", - TEXT_TYPE_STATUS + "Building the file copy list...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1178,8 +1178,8 @@ { 0, 0, - " ENTER =3D Continue ESC =3D Cancel F3 =3D Quit", - TEXT_TYPE_STATUS + "ENTER =3D Continue ESC =3D Cancel F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, = { @@ -1225,8 +1225,8 @@ { 0, 0, - " D =3D Delete Partition ESC =3D Cancel F3 =3D Quit", - TEXT_TYPE_STATUS + "D =3D Delete Partition ESC =3D Cancel F3 =3D Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1253,8 +1253,8 @@ { 0, 0, - " Creating registry hives...", - TEXT_TYPE_STATUS + "Creating registry hives...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1599,7 +1599,7 @@ {STRING_TXTSETUPFAILED, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copying file: %S"}, + "\xB3 Copying file: %S"}, {STRING_SETUPCOPYINGFILES, "Setup is copying files..."}, {STRING_PAGEDMEM, Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/es-ES.h?rev=3D32727&r1=3D32726&r2=3D32727&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/lang/es-ES.h (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h Thu Mar 20 13:28:37 2008 @@ -356,34 +356,34 @@ TEXT_STYLE_NORMAL }, { - 8, + 24, 11, - " Equipo:", - TEXT_STYLE_NORMAL - }, - { - 8, + "Equipo:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, 12, - " Pantalla:", - TEXT_STYLE_NORMAL, - }, - { - 8, + "Pantalla:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, 13, - " Teclado:", - TEXT_STYLE_NORMAL - }, - { - 8, + "Teclado:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, 14, - " Disp. Teclado:", - TEXT_STYLE_NORMAL - }, - { - 8, + "Disp. Teclado:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, 16, - " Aceptar:", - TEXT_STYLE_NORMAL + "Aceptar:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { 25, @@ -932,22 +932,22 @@ TEXT_STYLE_UNDERLINE }, { - 11, + 0, 12, "Por favor espere mientras el Instalador de ReactOS copia", - TEXT_STYLE_NORMAL - }, - { - 30, + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, 13, "archivos en su carpeta de instalaci=C2=A2n de ReactOS.", - TEXT_STYLE_NORMAL - }, - { - 20, + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, 14, "Esta operaci=C2=A2n puede durar varios minutos.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER }, { 0, @@ -1598,7 +1598,7 @@ {STRING_TXTSETUPFAILED, "El instalador fall=C2=A2 al buscar la secci=C2=A2n\nin TXTSETUP.SIF.\= n"}, {STRING_COPYING, - " \xB3 Copiando archivo: %S"= }, + "\xB3 Copiando archivo: %S"}, {STRING_SETUPCOPYINGFILES, "El instalador est=C2=A0 copiando archivos..."}, {STRING_PAGEDMEM, Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/fr-FR.h?rev=3D32727&r1=3D32726&r2=3D32727&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/lang/fr-FR.h (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h Thu Mar 20 13:28:37 2008 @@ -1611,7 +1611,7 @@ {STRING_TXTSETUPFAILED, "Setup n'a pu trouver la section '%S'\ndans TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copie du fichier: %S"}, + "\xB3 Copie du fichier: %S"}, {STRING_SETUPCOPYINGFILES, "Setup copie les fichiers..."}, {STRING_PAGEDMEM, Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/it-IT.h?rev=3D32727&r1=3D32726&r2=3D32727&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/lang/it-IT.h (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h Thu Mar 20 13:28:37 2008 @@ -1599,7 +1599,7 @@ {STRING_TXTSETUPFAILED, "Setup non ha trovato la sezione '%S' \nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copia di: %S"}, + "\xB3 Copia di: %S"}, {STRING_SETUPCOPYINGFILES, "Copia dei file in corso..."}, {STRING_PAGEDMEM, Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/lt-LT.h?rev=3D32727&r1=3D32726&r2=3D32727&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/lang/lt-LT.h (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h Thu Mar 20 13:28:37 2008 @@ -1608,7 +1608,7 @@ {STRING_TXTSETUPFAILED, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copying file: %S"}, + "\xB3 Copying file: %S"}, {STRING_SETUPCOPYINGFILES, "Setup is copying files..."}, {STRING_PAGEDMEM, Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/pl-PL.h?rev=3D32727&r1=3D32726&r2=3D32727&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/lang/pl-PL.h (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h Thu Mar 20 13:28:37 2008 @@ -1607,7 +1607,7 @@ {STRING_TXTSETUPFAILED, "Instalator nie by=C2=88 w stanie odnale=C2=AB=C2=86 sekji '%S'\nw pli= ku TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Kopiowanie plik=C2=A2w: %S"}, + "\xB3 Kopiowanie plik=C2=A2w: %S"}, {STRING_SETUPCOPYINGFILES, "Instalator kopiuje pliki..."}, {STRING_PAGEDMEM, Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/ru-RU.h?rev=3D32727&r1=3D32726&r2=3D32727&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/lang/ru-RU.h (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h Thu Mar 20 13:28:37 2008 @@ -1599,7 +1599,7 @@ {STRING_TXTSETUPFAILED, "=C2=8F=C3=A0=C2=AE=C2=A3=C3=A0=C2=A0=C2=AC=C2=AC=C2=A0 =C3=A3=C3=A1= =C3=A2=C2=A0=C2=AD=C2=AE=C2=A2=C2=AA=C2=A8 =C2=AD=C2=A5 =C3=A1=C2=AC=C2=AE= =C2=A3=C2=AB=C2=A0 =C2=AD=C2=A0=C2=A9=C3=A2=C2=A8 =C3=A1=C2=A5=C2=AA=C3=A6= =C2=A8=C3=AE '%S'\n=C2=A2 =C3=A4=C2=A0=C2=A9=C2=AB=C2=A5 TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 =C2=8A=C2=AE=C2=AF=C2= =A8=C3=A0=C2=AE=C2=A2=C2=A0=C2=AD=C2=A8=C2=A5: %S"}, + "\xB3 =C2=8A=C2=AE=C2=AF=C2=A8=C3=A0=C2=AE=C2=A2=C2=A0=C2=AD=C2=A8=C2= =A5: %S"}, {STRING_SETUPCOPYINGFILES, "=C2=8F=C3=A0=C2=AE=C2=A3=C3=A0=C2=A0=C2=AC=C2=AC=C2=A0 =C3=A3=C3=A1= =C3=A2=C2=A0=C2=AD=C2=AE=C2=A2=C2=AA=C2=A8 =C2=AA=C2=AE=C2=AF=C2=A8=C3=A0= =C3=A3=C2=A5=C3=A2 =C3=A4=C2=A0=C2=A9=C2=AB=C3=AB..."}, {STRING_PAGEDMEM, Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/sk-SK.h?rev=3D32727&r1=3D32726&r2=3D32727&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/lang/sk-SK.h (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h Thu Mar 20 13:28:37 2008 @@ -1604,7 +1604,7 @@ {STRING_TXTSETUPFAILED, "In=C3=A7tal=C2=A0tor zlyhal pri h=C2=96adan=C2=A1 sekcie '%S'\nv s=C2= =A3bore TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Kop=C2=A1ruje sa s=C2= =A3bor: %S"}, + "\xB3 Kop=C2=A1ruje sa s=C2=A3bor: %S"}, {STRING_SETUPCOPYINGFILES, "In=C3=A7tal=C2=A0tor kop=C2=A1ruje s=C2=A3bory..."}, {STRING_PAGEDMEM, Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/sv-SE.h?rev=3D32727&r1=3D32726&r2=3D32727&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/lang/sv-SE.h (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h Thu Mar 20 13:28:37 2008 @@ -1598,7 +1598,7 @@ {STRING_TXTSETUPFAILED, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copying file: %S"}, + "\xB3 Copying file: %S"}, {STRING_SETUPCOPYINGFILES, "Setup is copying files..."}, {STRING_PAGEDMEM, Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/uk-UA.h?rev=3D32727&r1=3D32726&r2=3D32727&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/lang/uk-UA.h (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h Thu Mar 20 13:28:37 2008 @@ -1599,7 +1599,7 @@ {STRING_TXTSETUPFAILED, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copying file: %S"}, + "\xB3 Copying file: %S"}, {STRING_SETUPCOPYINGFILES, "Setup is copying files..."}, {STRING_PAGEDMEM,

1 0

[tkreuzer] 32726: patch by Stefan Ginsberg (stefan__100__ AT hotmail DOT com): - remove NtUserAcquireOrReleaseInputOwnership and NtUserSendMessageCallback - move ros specific types belonging to ros specific ntuser calls into ntuser.h near the respective prototypes - add a commented out GDI_DEBUG define to gdiobj.c
by tkreuzer＠svn.reactos.org 20 Mar '08

20 Mar '08

Author: tkreuzer Date: Thu Mar 20 09:30:42 2008 New Revision: 32726 URL: http://svn.reactos.org/svn/reactos?rev=3D32726&view=3Drev Log: patch by Stefan Ginsberg (stefan__100__ AT hotmail DOT com): - remove NtUserAcquireOrReleaseInputOwnership and NtUserSendMessageCallback - move ros specific types belonging to ros specific ntuser calls into ntuse= r.h near the respective prototypes - add a commented out GDI_DEBUG define to gdiobj.c Modified: trunk/reactos/dll/win32/user32/user32.def trunk/reactos/dll/win32/user32/windows/input.c trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/include/reactos/win32k/ntusrtyp.h trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/user32/user32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user= 32.def?rev=3D32726&r1=3D32725&r2=3D32726&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/user32/user32.def (original) +++ trunk/reactos/dll/win32/user32/user32.def Thu Mar 20 09:30:42 2008 @@ -521,7 +521,6 @@ PostThreadMessageA@16 PostThreadMessageW@16 PrintWindow@12 -PrivateCsrssAcquireOrReleaseInputOwnership@4 PrivateCsrssRegisterPrimitive@0 PrivateCsrssManualGuiCheck@4 PrivateCsrssInitialized@0 Modified: trunk/reactos/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/wind= ows/input.c?rev=3D32726&r1=3D32725&r2=3D32726&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/user32/windows/input.c (original) +++ trunk/reactos/dll/win32/user32/windows/input.c Thu Mar 20 09:30:42 2008 @@ -582,16 +582,6 @@ PrivateCsrssRegisterPrimitive(VOID) { NtUserCallNoParam(NOPARAM_ROUTINE_REGISTER_PRIMITIVE); -} - -/* - * Another private call for CSRSS - */ -VOID -STDCALL -PrivateCsrssAcquireOrReleaseInputOwnership(BOOL Release) -{ - NtUserAcquireOrReleaseInputOwnership(Release); } = /* Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/wind= ows/message.c?rev=3D32726&r1=3D32725&r2=3D32726&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/user32/windows/message.c (original) +++ trunk/reactos/dll/win32/user32/windows/message.c Thu Mar 20 09:30:42 20= 08 @@ -1829,7 +1829,7 @@ = = /* - * @implemented + * @unimplemented */ BOOL STDCALL @@ -1841,18 +1841,13 @@ SENDASYNCPROC lpCallBack, ULONG_PTR dwData) { - return NtUserSendMessageCallback( - hWnd, - Msg, - wParam, - lParam, - lpCallBack, - dwData); -} - - -/* - * @implemented + UNIMPLEMENTED; + return FALSE; +} + + +/* + * @unimplemented */ BOOL STDCALL @@ -1864,13 +1859,8 @@ SENDASYNCPROC lpCallBack, ULONG_PTR dwData) { - return NtUserSendMessageCallback( - hWnd, - Msg, - wParam, - lParam, - lpCallBack, - dwData); + UNIMPLEMENTED; + return FALSE; } = = Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32= k/ntuser.h?rev=3D32726&r1=3D32725&r2=3D32726&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Thu Mar 20 09:30:42 2008 @@ -2378,7 +2378,7 @@ = = /* NtUserBad -* ReactOS-specific NtUser calls which shouldn't exist. +* ReactOS-specific NtUser calls and their related structures, both which= shouldn't exist. */ = = @@ -2522,6 +2522,34 @@ NTAPI NtUserManualGuiCheck(LONG Check); = + + +/* (other FocusedItem values give the position of the focused item) */ +#define NO_SELECTED_ITEM 0xffff + +typedef struct tagROSMENUINFO +{ + /* ----------- MENUINFO ----------- */ + DWORD cbSize; + DWORD fMask; + DWORD dwStyle; + UINT cyMax; + HBRUSH hbrBack; + DWORD dwContextHelpID; + ULONG_PTR dwMenuData; + /* ----------- Extra ----------- */ + HMENU Self; /* Handle of this menu */ + WORD Flags; /* Menu flags (MF_POPUP, MF_SYSMENU) */ + UINT FocusedItem; /* Currently focused item */ + UINT MenuItemCount; /* Number of items in the menu */ + HWND Wnd; /* Window containing the menu */ + WORD Width; /* Width of the whole menu */ + WORD Height; /* Height of the whole menu */ + HWND WndOwner; /* window receiving the messages for ownerdraw */ + BOOL TimeToHide; /* Request hiding when receiving a second click in = the top-level menu item */ + SIZE maxBmpSize; /* Maximum size of the bitmap items in MIIM_BITMAP = state */ +} ROSMENUINFO, *PROSMENUINFO; + BOOL NTAPI NtUserMenuInfo( @@ -2529,6 +2557,29 @@ PROSMENUINFO lpmi, BOOL fsog ); + + + +typedef struct tagROSMENUITEMINFO +{ + /* ----------- MENUITEMINFOW ----------- */ + UINT cbSize; + UINT fMask; + UINT fType; + UINT fState; + UINT wID; + HMENU hSubMenu; + HBITMAP hbmpChecked; + HBITMAP hbmpUnchecked; + DWORD dwItemData; + LPWSTR dwTypeData; + UINT cch; + HBITMAP hbmpItem; + /* ----------- Extra ----------- */ + RECT Rect; /* Item area (relative to menu window) */ + UINT XTab; /* X position of text after Tab */ + LPWSTR Text; /* Copy of the text pointer in MenuItem->Text */ +} ROSMENUITEMINFO, *PROSMENUITEMINFO; = BOOL NTAPI Modified: trunk/reactos/include/reactos/win32k/ntusrtyp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32= k/ntusrtyp.h?rev=3D32726&r1=3D32725&r2=3D32726&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/include/reactos/win32k/ntusrtyp.h (original) +++ trunk/reactos/include/reactos/win32k/ntusrtyp.h Thu Mar 20 09:30:42 2008 @@ -120,51 +120,4 @@ BYTE Showing; } THRDCARETINFO, *PTHRDCARETINFO; = -typedef struct tagROSMENUINFO -{ - /* ----------- MENUINFO ----------- */ - DWORD cbSize; - DWORD fMask; - DWORD dwStyle; - UINT cyMax; - HBRUSH hbrBack; - DWORD dwContextHelpID; - ULONG_PTR dwMenuData; - /* ----------- Extra ----------- */ - HMENU Self; /* Handle of this menu */ - WORD Flags; /* Menu flags (MF_POPUP, MF_SYSMENU) */ - UINT FocusedItem; /* Currently focused item */ - UINT MenuItemCount; /* Number of items in the menu */ - HWND Wnd; /* Window containing the menu */ - WORD Width; /* Width of the whole menu */ - WORD Height; /* Height of the whole menu */ - HWND WndOwner; /* window receiving the messages for ownerdraw */ - BOOL TimeToHide; /* Request hiding when receiving a second click in = the top-level menu item */ - SIZE maxBmpSize; /* Maximum size of the bitmap items in MIIM_BITMAP = state */ -} ROSMENUINFO, *PROSMENUINFO; - -/* (other FocusedItem values give the position of the focused item) */ -#define NO_SELECTED_ITEM 0xffff - -typedef struct tagROSMENUITEMINFO -{ - /* ----------- MENUITEMINFOW ----------- */ - UINT cbSize; - UINT fMask; - UINT fType; - UINT fState; - UINT wID; - HMENU hSubMenu; - HBITMAP hbmpChecked; - HBITMAP hbmpUnchecked; - DWORD dwItemData; - LPWSTR dwTypeData; - UINT cch; - HBITMAP hbmpItem; - /* ----------- Extra ----------- */ - RECT Rect; /* Item area (relative to menu window) */ - UINT XTab; /* X position of text after Tab */ - LPWSTR Text; /* Copy of the text pointer in MenuItem->Text */ -} ROSMENUITEMINFO, *PROSMENUITEMINFO; - #endif Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/ntuser/input.c?rev=3D32726&r1=3D32725&r2=3D32726&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c Thu Mar 20 09:30:4= 2 2008 @@ -832,13 +832,6 @@ } = = -NTSTATUS STDCALL -NtUserAcquireOrReleaseInputOwnership(BOOLEAN Release) -{ - return STATUS_SUCCESS; -} - - NTSTATUS FASTCALL InitInputImpl(VOID) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/ntuser/message.c?rev=3D32726&r1=3D32725&r2=3D32726&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c Thu Mar 20 09:30= :42 2008 @@ -1687,19 +1687,6 @@ END_CLEANUP; } = -BOOL STDCALL -NtUserSendMessageCallback(HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam, - SENDASYNCPROC lpCallBack, - ULONG_PTR dwData) -{ - UNIMPLEMENTED; - - return 0; -} - = BOOL FASTCALL UserSendNotifyMessage(HWND hWnd, Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/objects/gdiobj.c?rev=3D32726&r1=3D32725&r2=3D32726&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Thu Mar 20 09:30= :42 2008 @@ -29,6 +29,8 @@ = /* FIXME include right header for KeRosDumpStackFrames */ VOID NTAPI KeRosDumpStackFrames(PULONG, ULONG); + +//#define GDI_DEBUG = #ifdef GDI_DEBUG BOOLEAN STDCALL KiRosPrintAddress(PVOID Address); @@ -730,6 +732,7 @@ * The object is currently locked, so freeing is forbidden! */ DPRINT1("Object->cExclusiveLock =3D %d\n", Object->cExclus= iveLock); + GDIDBG_TRACECALLER(); GDIDBG_TRACELOCKER(GDI_HANDLE_GET_INDEX(hObj)); ASSERT(FALSE); } Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/w32ksvc.db?rev=3D32726&r1=3D32725&r2=3D32726&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Thu Mar 20 09:30:42 20= 08 @@ -679,7 +679,6 @@ NtGdiSetViewportOrgEx 4 NtGdiSetWindowExtEx 4 NtGdiSetWindowOrgEx 4 -NtUserAcquireOrReleaseInputOwnership 1 NtUserBuildMenuItemList 4 NtUserCreateCursorIconHandle 2 NtUserDereferenceWndProcHandle 2 @@ -714,7 +713,6 @@ NtUserRegisterClassEx 6 NtUserRegisterClipboardFormat 1 NtUserSendMessage 5 -NtUserSendMessageCallback 6 NtUserSendMessageTimeout 8 NtUserSendNotifyMessage 4 NtUserSetScrollBarInfo 3

1 0

[cfinck] 32725: - The implementation of the "Mouse Reset" command differs much from chip to chip. While most return an ACK or NACK as the first byte to indicate, whether a mouse is plugged in or not, some systems (like ECS K7S5A Pro, SiS735 chipset) always return an ACK and 0xAA. Only the last byte indicates the status of the actual mouse. It is either sent as 0x00 or not. Therefore only get the first two bytes in a loop and issue just one i8042ReadDataWait command for the last byte. This reduce
by cfinck＠svn.reactos.org 20 Mar '08

20 Mar '08

Author: cfinck Date: Thu Mar 20 07:21:34 2008 New Revision: 32725 URL: http://svn.reactos.org/svn/reactos?rev=3D32725&view=3Drev Log: - The implementation of the "Mouse Reset" command differs much from chip to= chip. While most return an ACK or NACK as the first byte to indicate, whether a= mouse is plugged in or not, some systems (like ECS K7S5A Pro, SiS735 chips= et) always return an ACK and 0xAA. Only the last byte indicates the status of the actual mouse. It is either= sent as 0x00 or not. Therefore only get the first two bytes in a loop and issue just one i8042= ReadDataWait command for the last byte. This reduced the "black screen time" in 1st stage setup (after loading th= e drivers and before showing the language selection screen) from 45 seconds= to 3 seconds on my K7S5A Pro system. I also tested this change with three other systems, with and without mous= e, and they are still detected properly. - Wait 50 microseconds, when we got no data after the Mouse Reset and befor= e trying it again. This way, the implementation doesn't depend on the system speed. - Break the loop, when the CTRL_SELF_TEST command completed successfully. - Remove the return values from i8042DetectKeyboard and i8042DetectMouse. We just used them for outputting debug info if no keyboard or mouse was d= etected. But this info is already printed by the procedures themselves. This way, I could also drop one variable in i8042DetectMouse :-) Modified: trunk/reactos/drivers/input/i8042prt/pnp.c Modified: trunk/reactos/drivers/input/i8042prt/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042pr= t/pnp.c?rev=3D32725&r1=3D32724&r2=3D32725&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/input/i8042prt/pnp.c (original) +++ trunk/reactos/drivers/input/i8042prt/pnp.c Thu Mar 20 07:21:34 2008 @@ -4,6 +4,7 @@ * FILE: drivers/input/i8042prt/pnp.c * PURPOSE: IRP_MJ_PNP operations * PROGRAMMERS: Copyright 2006-2007 Herv=C3=A9 Poussineau (hpoussin@reacto= s.org) + * Copyright 2008 Colin Finck (mail(a)colinfinck.de) */ = /* INCLUDES **************************************************************= ****/ @@ -100,13 +101,17 @@ return Status; } = - if (Value =3D=3D KBD_RESEND) + if (Value =3D=3D KBD_SELF_TEST_OK) + { + INFO_(I8042PRT, "CTRL_SELF_TEST completed successfully!\n"); + break; + } + else if (Value =3D=3D KBD_RESEND) { TRACE_(I8042PRT, "Resending...\n", Value); KeStallExecutionProcessor(50); - continue; - } - else if (Value !=3D KBD_SELF_TEST_OK) + } + else { WARN_(I8042PRT, "Got 0x%02x instead of 0x55\n", Value); return STATUS_IO_DEVICE_ERROR; @@ -134,7 +139,7 @@ return STATUS_SUCCESS; } = -static BOOLEAN +static VOID i8042DetectKeyboard( IN PPORT_DEVICE_EXTENSION DeviceExtension) { @@ -148,7 +153,7 @@ if (!NT_SUCCESS(Status)) { WARN_(I8042PRT, "Can't finish SET_LEDS (0x%08lx)\n", Status); - return FALSE; + return; } } else @@ -158,19 +163,18 @@ = /* Turn on translation and SF (Some machines don't reboot if SF is not se= t, see ReactOS bug #1842) */ if (!i8042ChangeMode(DeviceExtension, 0, CCB_TRANSLATE | CCB_SYSTEM_FLAG)) - return FALSE; - - return TRUE; -} - -static BOOLEAN + return; + + INFO_(I8042PRT, "Keyboard detected\n"); +} + +static VOID i8042DetectMouse( IN PPORT_DEVICE_EXTENSION DeviceExtension) { - BOOLEAN Ok =3D FALSE; NTSTATUS Status; UCHAR Value; - UCHAR ExpectedReply[] =3D { MOUSE_ACK, 0xAA, 0x00 }; + UCHAR ExpectedReply[] =3D { MOUSE_ACK, 0xAA }; UCHAR ReplyByte; = i8042Flush(DeviceExtension); @@ -179,9 +183,20 @@ ||!i8042Write(DeviceExtension, DeviceExtension->DataPort, MOU_CMD_RESET= )) { WARN_(I8042PRT, "Failed to write reset command to mouse\n"); - goto cleanup; - } - + goto failure; + } + + /* The implementation of the "Mouse Reset" command differs much from chip= to chip. + + By default, the first byte is an ACK, when the mouse is plugged in and= working and NACK when it's not. + On success, the next bytes are 0xAA and 0x00. + + But on some systems (like ECS K7S5A Pro, SiS 735 chipset), we always g= et an ACK and 0xAA. + Only the last byte indicates, whether a mouse is plugged in. + It is either sent or not, so there is no byte, which indicates a failu= re here. + + After the Mouse Reset command was issued, it usually takes some time u= ntil we get a response. + So get the first two bytes in a loop. */ for (ReplyByte =3D 0; ReplyByte < sizeof(ExpectedReply) / sizeof(ExpectedReply[0]); ReplyByte++) @@ -191,39 +206,55 @@ do { Status =3D i8042ReadDataWait(DeviceExtension, &Value); + + if(!NT_SUCCESS(Status)) + { + /* Wait some time before trying again */ + KeStallExecutionProcessor(50); + } } while (Status =3D=3D STATUS_IO_TIMEOUT && Counter--); = if (!NT_SUCCESS(Status)) { WARN_(I8042PRT, "No ACK after mouse reset, status 0x%08lx\n", Status); - goto cleanup; + goto failure; } else if (Value !=3D ExpectedReply[ReplyByte]) { - WARN_(I8042PRT, "Unexpected reply: 0x%02x (expected 0x%02x)\n", - Value, ExpectedReply[ReplyByte]); - goto cleanup; - } - } - - Ok =3D TRUE; - -cleanup: - if (!Ok) - { - /* There is probably no mouse present. On some systems, - the probe locks the entire keyboard controller. Let's - try to get access to the keyboard again by sending a - reset */ - i8042Flush(DeviceExtension); - i8042Write(DeviceExtension, DeviceExtension->ControlPort, CTRL_SELF_TEST= ); - i8042ReadDataWait(DeviceExtension, &Value); - i8042Flush(DeviceExtension); - } - - INFO_(I8042PRT, "Mouse %sdetected\n", Ok ? "" : "not "); - - return Ok; + WARN_(I8042PRT, "Unexpected reply: 0x%02x (expected 0x%02x)\n", Value, = ExpectedReply[ReplyByte]); + goto failure; + } + } + + /* Finally get the third byte, but only try it one time (see above). + Otherwise this takes around 45 seconds on a K7S5A Pro, when no mouse i= s plugged in. */ + Status =3D i8042ReadDataWait(DeviceExtension, &Value); + + if(!NT_SUCCESS(Status)) + { + WARN_(I8042PRT, "Last byte was not transmitted after mouse reset, status= 0x%08lx\n", Status); + goto failure; + } + else if(Value !=3D 0x00) + { + WARN_(I8042PRT, "Last byte after mouse reset was not 0x00, but 0x%02x\n"= , Value); + goto failure; + } + + INFO_(I8042PRT, "Mouse detected\n"); + return; + +failure: + /* There is probably no mouse present. On some systems, + the probe locks the entire keyboard controller. Let's + try to get access to the keyboard again by sending a + reset */ + i8042Flush(DeviceExtension); + i8042Write(DeviceExtension, DeviceExtension->ControlPort, CTRL_SELF_TEST); + i8042ReadDataWait(DeviceExtension, &Value); + i8042Flush(DeviceExtension); + + INFO_(I8042PRT, "Mouse not detected\n"); } = static NTSTATUS @@ -387,12 +418,10 @@ return STATUS_UNSUCCESSFUL; } TRACE_(I8042PRT, "Detecting keyboard\n"); - if (!i8042DetectKeyboard(DeviceExtension)) - INFO_(I8042PRT, "No keyboard detected!\n"); + i8042DetectKeyboard(DeviceExtension); = TRACE_(I8042PRT, "Detecting mouse\n"); - if (!i8042DetectMouse(DeviceExtension)) - INFO_(I8042PRT, "No mouse detected!\n"); + i8042DetectMouse(DeviceExtension); = INFO_(I8042PRT, "Keyboard present: %s\n", DeviceExtension->Flags & KEYBO= ARD_PRESENT ? "YES" : "NO"); INFO_(I8042PRT, "Mouse present : %s\n", DeviceExtension->Flags & MOUSE= _PRESENT ? "YES" : "NO");

1 0

[cfinck] 32724: Remove the "<file>msiserver.idl</file>" entry from the msi module, so it's not built twice. As msi depends on msi_msiserver_typelib, we can be sure that "msiserver.idl" is built before msi, so it's there when it's needed. Fixes the last circular dependency.
by cfinck＠svn.reactos.org 19 Mar '08

19 Mar '08

Author: cfinck Date: Wed Mar 19 12:42:08 2008 New Revision: 32724 URL: http://svn.reactos.org/svn/reactos?rev=3D32724&view=3Drev Log: Remove the "<file>msiserver.idl</file>" entry from the msi module, so it's = not built twice. As msi depends on msi_msiserver_typelib, we can be sure that "msiserver.idl= " is built before msi, so it's there when it's needed. Fixes the last circular dependency. Modified: trunk/reactos/dll/win32/msi/msi.rbuild Modified: trunk/reactos/dll/win32/msi/msi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.rbu= ild?rev=3D32724&r1=3D32723&r2=3D32724&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/msi/msi.rbuild (original) +++ trunk/reactos/dll/win32/msi/msi.rbuild Wed Mar 19 12:42:08 2008 @@ -50,7 +50,6 @@ <file>update.c</file> <file>upgrade.c</file> <file>where.c</file> - <file>msiserver.idl</file> <file>msi.rc</file> <include base=3D"msi" root=3D"intermediate">.</include> <file>msi.spec</file>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs