Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 32743: - make Simplecall definitions (NtUserCallXxx) compatible to different Win versions (currently XP and Vista), using an enum and conditional compiling - move incompatible definitions to the bottom of ntuser.h (bad section) - fix parameters of NtUserCallHwnd* and move the rest of them to simplecall.c
by tkreuzer＠svn.reactos.org 22 Mar '08

22 Mar '08

Author: tkreuzer Date: Fri Mar 21 21:53:56 2008 New Revision: 32743 URL: http://svn.reactos.org/svn/reactos?rev=3D32743&view=3Drev Log: - make Simplecall definitions (NtUserCallXxx) compatible to different Win v= ersions (currently XP and Vista), using an enum and conditional compiling - move incompatible definitions to the bottom of ntuser.h (bad section) - fix parameters of NtUserCallHwnd* and move the rest of them to simplecall= .c Modified: trunk/reactos/dll/win32/user32/windows/hook.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c Modified: trunk/reactos/dll/win32/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/wind= ows/hook.c?rev=3D32743&r1=3D32742&r2=3D32743&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/hook.c (original) +++ trunk/reactos/dll/win32/user32/windows/hook.c Fri Mar 21 21:53:56 2008 @@ -197,7 +197,7 @@ STDCALL DeregisterShellHookWindow(HWND hWnd) { - return NtUserCallHwnd(HWND_ROUTINE_DEREGISTERSHELLHOOKWINDOW, (DWORD)hWn= d); + return NtUserCallHwnd(hWnd, HWND_ROUTINE_DEREGISTERSHELLHOOKWINDOW); } = /* @@ -207,7 +207,7 @@ STDCALL RegisterShellHookWindow(HWND hWnd) { - return NtUserCallHwnd(HWND_ROUTINE_REGISTERSHELLHOOKWINDOW, (DWORD)hWnd); + return NtUserCallHwnd(hWnd, HWND_ROUTINE_REGISTERSHELLHOOKWINDOW); } = /* Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32= k/ntuser.h?rev=3D32743&r1=3D32742&r2=3D32743&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 21:53:56 2008 @@ -479,30 +479,199 @@ DWORD BufferSize, DWORD *Count); = -enum { +/* apfnSimpleCall indices from Windows XP SP 2 */ +/* TODO: Check for differences in Windows 2000, 2003 and 2008 */ +#define WIN32K_VERSION NTDDI_WINXPSP2 // FIXME: this should go somewhere e= lse + +enum SimpleCallRoutines +{ + NOPARAM_ROUTINE_CREATEMENU, + NOPARAM_ROUTINE_CREATEMENUPOPUP, +#if (WIN32K_VERSION >=3D NTDDI_VISTA) + NOPARAM_ROUTINE_ALLOWFOREGNDACTIVATION, + NOPARAM_ROUTINE_MSQCLEARWAKEMASK, + NOPARAM_ROUTINE_CREATESYSTEMTHREADS, + NOPARAM_ROUTINE_DESTROY_CARET, +#endif + NOPARAM_ROUTINE_ENABLEPROCWNDGHSTING, +#if (WIN32K_VERSION < NTDDI_VISTA) + NOPARAM_ROUTINE_MSQCLEARWAKEMASK, + NOPARAM_ROUTINE_ALLOWFOREGNDACTIVATION, + NOPARAM_ROUTINE_DESTROY_CARET, +#endif + NOPARAM_ROUTINE_GETDEVICECHANGEINFO, + NOPARAM_ROUTINE_GETIMESHOWSTATUS, + NOPARAM_ROUTINE_GETINPUTDESKTOP, + NOPARAM_ROUTINE_GETMSESSAGEPOS, +#if (WIN32K_VERSION >=3D NTDDI_VISTA) + NOPARAM_ROUTINE_HANDLESYSTHRDCREATFAIL, +#else + NOPARAM_ROUTINE_GETREMOTEPROCID, +#endif + NOPARAM_ROUTINE_HIDECURSORNOCAPTURE, + NOPARAM_ROUTINE_LOADCURSANDICOS, +#if (WIN32K_VERSION >=3D NTDDI_VISTA) + NOPARAM_ROUTINE_LOADUSERAPIHOOK, + NOPARAM_ROUTINE_PREPAREFORLOGOFF, /* 0x0f */ +#endif + NOPARAM_ROUTINE_RELEASECAPTURE, + NOPARAM_ROUTINE_RESETDBLCLICK, + NOPARAM_ROUTINE_ZAPACTIVEANDFOUS, + NOPARAM_ROUTINE_REMOTECONSHDWSTOP, + NOPARAM_ROUTINE_REMOTEDISCONNECT, + NOPARAM_ROUTINE_REMOTELOGOFF, + NOPARAM_ROUTINE_REMOTENTSECURITY, + NOPARAM_ROUTINE_REMOTESHDWSETUP, + NOPARAM_ROUTINE_REMOTESHDWSTOP, + NOPARAM_ROUTINE_REMOTEPASSTHRUENABLE, + NOPARAM_ROUTINE_REMOTEPASSTHRUDISABLE, + NOPARAM_ROUTINE_REMOTECONNECTSTATE, + NOPARAM_ROUTINE_UPDATEPERUSERIMMENABLING, + NOPARAM_ROUTINE_USERPWRCALLOUTWORKER, +#if (WIN32K_VERSION >=3D NTDDI_VISTA) + NOPARAM_ROUTINE_WAKERITFORSHTDWN, +#endif + NOPARAM_ROUTINE_INIT_MESSAGE_PUMP, + NOPARAM_ROUTINE_UNINIT_MESSAGE_PUMP, +#if (WIN32K_VERSION < NTDDI_VISTA) + NOPARAM_ROUTINE_LOADUSERAPIHOOK, +#endif + ONEPARAM_ROUTINE_BEGINDEFERWNDPOS, +#if (WIN32K_VERSION >=3D NTDDI_VISTA) + ONEPARAM_ROUTINE_GETSENDMSGRECVR, +#endif + ONEPARAM_ROUTINE_WINDOWFROMDC, + ONEPARAM_ROUTINE_ALLOWSETFOREGND, + ONEPARAM_ROUTINE_CREATEEMPTYCUROBJECT, +#if (WIN32K_VERSION < NTDDI_VISTA) + ONEPARAM_ROUTINE_CREATESYSTEMTHREADS, +#endif + ONEPARAM_ROUTINE_CSDDEUNINITIALIZE, + ONEPARAM_ROUTINE_DIRECTEDYIELD, + ONEPARAM_ROUTINE_ENUMCLIPBOARDFORMATS, +#if (WIN32K_VERSION < NTDDI_VISTA) + ONEPARAM_ROUTINE_GETCURSORPOS, +#endif + ONEPARAM_ROUTINE_GETINPUTEVENT, + ONEPARAM_ROUTINE_GETKEYBOARDLAYOUT, + ONEPARAM_ROUTINE_GETKEYBOARDTYPE, + ONEPARAM_ROUTINE_GETPROCDEFLAYOUT, + ONEPARAM_ROUTINE_GETQUEUESTATUS, + ONEPARAM_ROUTINE_GETWINSTAINFO, +#if (WIN32K_VERSION < NTDDI_VISTA) + ONEPARAM_ROUTINE_HANDLESYSTHRDCREATFAIL, +#endif + ONEPARAM_ROUTINE_LOCKFOREGNDWINDOW, + ONEPARAM_ROUTINE_LOADFONTS, + ONEPARAM_ROUTINE_MAPDEKTOPOBJECT, + ONEPARAM_ROUTINE_MESSAGEBEEP, + ONEPARAM_ROUTINE_PLAYEVENTSOUND, + ONEPARAM_ROUTINE_POSTQUITMESSAGE, +#if (WIN32K_VERSION < NTDDI_VISTA) + ONEPARAM_ROUTINE_PREPAREFORLOGOFF, +#endif + ONEPARAM_ROUTINE_REALIZEPALETTE, + ONEPARAM_ROUTINE_REGISTERLPK, +#if (WIN32K_VERSION >=3D NTDDI_VISTA) + ONEPARAM_ROUTINE_REGISTERSYSTEMTHREAD, +#endif + ONEPARAM_ROUTINE_REMOTERECONNECT, + ONEPARAM_ROUTINE_REMOTETHINWIRESTATUS, + ONEPARAM_ROUTINE_RELEASEDC, +#if (WIN32K_VERSION >=3D NTDDI_VISTA) + ONEPARAM_ROUTINE_REMOTENOTIFY, +#endif + ONEPARAM_ROUTINE_REPLYMESSAGE, + ONEPARAM_ROUTINE_SETCARETBLINKTIME, + ONEPARAM_ROUTINE_SETDBLCLICKTIME, +#if (WIN32K_VERSION < NTDDI_VISTA) + ONEPARAM_ROUTINE_SETIMESHOWSTATUS, +#endif + ONEPARAM_ROUTINE_SETMESSAGEEXTRAINFO, + ONEPARAM_ROUTINE_SETPROCDEFLAYOUT, +#if (WIN32K_VERSION >=3D NTDDI_VISTA) + ONEPARAM_ROUTINE_SETWATERMARKSTRINGS, +#endif + ONEPARAM_ROUTINE_SHOWCURSOR, + ONEPARAM_ROUTINE_SHOWSTARTGLASS, + ONEPARAM_ROUTINE_SWAPMOUSEBUTTON, + X_ROUTINE_WOWMODULEUNLOAD, +#if (WIN32K_VERSION < NTDDI_VISTA) + X_ROUTINE_REMOTENOTIFY, +#endif + HWND_ROUTINE_DEREGISTERSHELLHOOKWINDOW, + HWND_ROUTINE_DWP_GETENABLEDPOPUP, + HWND_ROUTINE_GETWNDCONTEXTHLPID, HWND_ROUTINE_REGISTERSHELLHOOKWINDOW, - HWND_ROUTINE_DEREGISTERSHELLHOOKWINDOW + HWND_ROUTINE_SETMSGBOX, + HWNDOPT_ROUTINE_SETPROGMANWINDOW, + HWNDOPT_ROUTINE_SETTASKMANWINDOW, + HWNDPARAM_ROUTINE_GETCLASSICOCUR, + HWNDPARAM_ROUTINE_CLEARWINDOWSTATE, + HWNDPARAM_ROUTINE_KILLSYSTEMTIMER, + HWNDPARAM_ROUTINE_SETDIALOGPOINTER, + HWNDPARAM_ROUTINE_SETVISIBLE, + HWNDPARAM_ROUTINE_SETWNDCONTEXTHLPID, + HWNDPARAM_ROUTINE_SETWINDOWSTATE, + HWNDLOCK_ROUTINE_WINDOWHASSHADOW, /* correct prefix ? */ + HWNDLOCK_ROUTINE_ARRANGEICONICWINDOWS, + HWNDLOCK_ROUTINE_DRAWMENUBAR, + HWNDLOCK_ROUTINE_CHECKIMESHOWSTATUSINTHRD, + HWNDLOCK_ROUTINE_GETSYSMENUHANDLE, + HWNDLOCK_ROUTINE_REDRAWFRAME, + HWNDLOCK_ROUTINE_REDRAWFRAMEANDHOOK, + HWNDLOCK_ROUTINE_SETDLGSYSMENU, + HWNDLOCK_ROUTINE_SETFOREGROUNDWINDOW, + HWNDLOCK_ROUTINE_SETSYSMENU, + HWNDLOCK_ROUTINE_UPDATECKIENTRECT, + HWNDLOCK_ROUTINE_UPDATEWINDOW, + X_ROUTINE_IMESHOWSTATUSCHANGE, + TWOPARAM_ROUTINE_ENABLEWINDOW, + TWOPARAM_ROUTINE_REDRAWTITLE, + TWOPARAM_ROUTINE_SHOWOWNEDPOPUPS, + TWOPARAM_ROUTINE_SWITCHTOTHISWINDOW, + TWOPARAM_ROUTINE_UPDATEWINDOWS, + TWOPARAM_ROUTINE_VALIDATERGN, +#if (WIN32K_VERSION >=3D NTDDI_VISTA) + TWOPARAM_ROUTINE_CHANGEWNDMSGFILTER, + TWOPARAM_ROUTINE_GETCURSORPOS, +#endif + TWOPARAM_ROUTINE_GETHDEVNAME, + TWOPARAM_ROUTINE_INITANSIOEM, + TWOPARAM_ROUTINE_NLSSENDIMENOTIFY, +#if (WIN32K_VERSION >=3D NTDDI_VISTA) + TWOPARAM_ROUTINE_REGISTERGHSTWND, +#endif + TWOPARAM_ROUTINE_REGISTERLOGONPROCESS, +#if (WIN32K_VERSION >=3D NTDDI_VISTA) + TWOPARAM_ROUTINE_REGISTERSBLFROSTWND, +#else + TWOPARAM_ROUTINE_REGISTERSYSTEMTHREAD, +#endif + TWOPARAM_ROUTINE_REGISTERUSERHUNGAPPHANDLERS, + TWOPARAM_ROUTINE_SHADOWCLEANUP, + TWOPARAM_ROUTINE_REMOTESHADOWSTART, + TWOPARAM_ROUTINE_SETCARETPOS, + TWOPARAM_ROUTINE_SETCURSORPOS, +#if (WIN32K_VERSION >=3D NTDDI_VISTA) + TWOPARAM_ROUTINE_SETPHYSCURSORPOS, +#endif + TWOPARAM_ROUTINE_UNHOOKWINDOWSHOOK, + TWOPARAM_ROUTINE_WOWCLEANUP }; = DWORD NTAPI NtUserCallHwnd( - DWORD Unknown0, - DWORD Unknown1); - -#define HWNDLOCK_ROUTINE_ARRANGEICONICWINDOWS 0x54 -#define HWNDLOCK_ROUTINE_DRAWMENUBAR 0x55 -#define HWNDLOCK_ROUTINE_REDRAWFRAME 0x58 -#define HWNDLOCK_ROUTINE_SETFOREGROUNDWINDOW 0x5B -#define HWNDLOCK_ROUTINE_UPDATEWINDOW 0x5E + HWND hWnd, + DWORD Routine); + BOOL NTAPI NtUserCallHwndLock( HWND hWnd, DWORD Routine); = -#define HWNDOPT_ROUTINE_SETPROGMANWINDOW 0x4A -#define HWNDOPT_ROUTINE_SETTASKMANWINDOW 0x4B HWND NTAPI NtUserCallHwndOpt( @@ -512,16 +681,16 @@ DWORD NTAPI NtUserCallHwndParam( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2); + HWND hWnd, + DWORD Param, + DWORD Routine); = DWORD NTAPI NtUserCallHwndParamLock( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2); + HWND hWnd, + DWORD Param, + DWORD Routine); = BOOL NTAPI @@ -537,82 +706,17 @@ WPARAM wParam, LPARAM lParam); = -#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_GETMESSAGEEXTRAINFO 0xffff0005 -#define NOPARAM_ROUTINE_ANYPOPUP 0xffff0006 -#define NOPARAM_ROUTINE_CSRSS_INITIALIZED 0xffff0007 DWORD NTAPI NtUserCallNoParam( DWORD Routine); = -#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_ENABLEWINDOW 0x60 -#define TWOPARAM_ROUTINE_SHOWOWNEDPOPUPS 0x62 -#define TWOPARAM_ROUTINE_SWITCHTOTHISWINDOW 0x63 - -#define TWOPARAM_ROUTINE_GETWINDOWRGNBOX 0xfffd0048 /* Private ROS */ -#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_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 -#define TWOPARAM_ROUTINE_ROS_REGSYSCLASSES 0x1003 -#define TWOPARAM_ROUTINE_ROS_UPDATEUISTATE 0x1004 DWORD NTAPI NtUserCallTwoParam( @@ -638,19 +742,20 @@ DWORD STDCALL NtUserCheckImeHotKey( - DWORD dwUnknown1, - DWORD dwUnknown2); + DWORD dwUnknown1, + DWORD dwUnknown2); = HWND NTAPI -NtUserChildWindowFromPointEx(HWND Parent, - LONG x, - LONG y, - UINT Flags); +NtUserChildWindowFromPointEx( + HWND Parent, + LONG x, + LONG y, + UINT Flags); = BOOL NTAPI NtUserClipCursor( - RECT *lpRect); + RECT *lpRect); = BOOL NTAPI @@ -669,9 +774,9 @@ DWORD NTAPI NtUserConsoleControl( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3); + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3); = DWORD NTAPI @@ -2367,8 +2472,54 @@ = = /* NtUserBad -* ReactOS-specific NtUser calls and their related structures, both which= shouldn't exist. + * ReactOS-specific NtUser calls and their related structures, both which = shouldn't exist. */ + +#define NOPARAM_ROUTINE_REGISTER_PRIMITIVE 0xffff0001 +#define NOPARAM_ROUTINE_GETMESSAGEEXTRAINFO 0xffff0005 +#define NOPARAM_ROUTINE_ANYPOPUP 0xffff0006 +#define NOPARAM_ROUTINE_CSRSS_INITIALIZED 0xffff0007 +#define ONEPARAM_ROUTINE_GETMENU 0xfffe0001 // usermode +#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 // CREATE_EMPTY_C= URSOR_OBJECT ? +#define ONEPARAM_ROUTINE_MSQSETWAKEMASK 0xfffe0027 +#define ONEPARAM_ROUTINE_REGISTERUSERMODULE 0xfffe0031 +#define ONEPARAM_ROUTINE_GETWNDCONTEXTHLPID 0xfffe0047 // use HWND_ROUTI= NE_GETWNDCONTEXTHLPID +#define ONEPARAM_ROUTINE_GETCURSORPOSITION 0xfffe0048 // use ONEPARAM_ = or TWOPARAM routine ? + +#define TWOPARAM_ROUTINE_ENABLEWINDOW 0x60 +#define TWOPARAM_ROUTINE_SHOWOWNEDPOPUPS 0x62 +#define TWOPARAM_ROUTINE_SWITCHTOTHISWINDOW 0x63 +#define TWOPARAM_ROUTINE_GETWINDOWRGNBOX 0xfffd0048 // user mode +#define TWOPARAM_ROUTINE_GETWINDOWRGN 0xfffd0049 // user mode +#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_SETWNDCONTEXTHLPID 0xfffd0058 // use HWNDPARAM_RO= UTINE_SETWNDCONTEXTHLPID +#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 +#define TWOPARAM_ROUTINE_ROS_REGSYSCLASSES 0x1003 +#define TWOPARAM_ROUTINE_ROS_UPDATEUISTATE 0x1004 = DWORD NTAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/ntuser/ntstubs.c?rev=3D32743&r1=3D32742&r2=3D32743&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/ntstubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Fri Mar 21 21:53= :56 2008 @@ -64,54 +64,6 @@ UNIMPLEMENTED; return 0; } - -DWORD -STDCALL -NtUserCallHwnd( - DWORD Unknown0, - DWORD Unknown1) -{ - switch (Unknown0) - { - case HWND_ROUTINE_REGISTERSHELLHOOKWINDOW: - if (IntIsWindow((HWND) Unknown1)) - return IntRegisterShellHookWindow((HWND) Unknown1); - return FALSE; - break; - case HWND_ROUTINE_DEREGISTERSHELLHOOKWINDOW: - if (IntIsWindow((HWND) Unknown1)) - return IntDeRegisterShellHookWindow((HWND) Unknown1); - return FALSE; - } - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL -NtUserCallHwndParam( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL -NtUserCallHwndParamLock( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) -{ - UNIMPLEMENTED - - return 0; -} - = DWORD STDCALL Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/ntuser/simplecall.c?rev=3D32743&r1=3D32742&r2=3D32743&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/simplecall.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c Fri Mar 21 21= :53:56 2008 @@ -823,21 +823,68 @@ HWND STDCALL NtUserCallHwndOpt( - HWND Param, + HWND hWnd, DWORD Routine) { switch (Routine) { case HWNDOPT_ROUTINE_SETPROGMANWINDOW: - GetW32ThreadInfo()->Desktop->hProgmanWindow =3D Param; + GetW32ThreadInfo()->Desktop->hProgmanWindow =3D hWnd; break; = case HWNDOPT_ROUTINE_SETTASKMANWINDOW: - GetW32ThreadInfo()->Desktop->hTaskManWindow =3D Param; - break; - } - - return Param; + GetW32ThreadInfo()->Desktop->hTaskManWindow =3D hWnd; + break; + } + + return hWnd; } = +DWORD +STDCALL +NtUserCallHwnd( + HWND hWnd, + DWORD Routine) +{ + switch (Routine) + { + case HWND_ROUTINE_REGISTERSHELLHOOKWINDOW: + if (IntIsWindow(hWnd)) + return IntRegisterShellHookWindow(hWnd); + return FALSE; + break; + case HWND_ROUTINE_DEREGISTERSHELLHOOKWINDOW: + if (IntIsWindow(hWnd)) + return IntDeRegisterShellHookWindow(hWnd); + return FALSE; + } + UNIMPLEMENTED; + + return 0; +} + +DWORD +STDCALL +NtUserCallHwndParam( + HWND hWnd, + DWORD Param, + DWORD Routine) +{ + UNIMPLEMENTED; + + return 0; +} + +DWORD +STDCALL +NtUserCallHwndParamLock( + HWND hWnd, + DWORD Param, + DWORD Routine) +{ + UNIMPLEMENTED; + + return 0; +} + /* EOF */

1 0

[tkreuzer] 32742: update NTDDI defines
by tkreuzer＠svn.reactos.org 22 Mar '08

22 Mar '08

Author: tkreuzer Date: Fri Mar 21 21:23:08 2008 New Revision: 32742 URL: http://svn.reactos.org/svn/reactos?rev=3D32742&view=3Drev Log: update NTDDI defines Modified: trunk/reactos/include/psdk/sdkddkver.h Modified: trunk/reactos/include/psdk/sdkddkver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sdkddkve= r.h?rev=3D32742&r1=3D32741&r2=3D32742&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/psdk/sdkddkver.h (original) +++ trunk/reactos/include/psdk/sdkddkver.h Fri Mar 21 21:23:08 2008 @@ -48,9 +48,28 @@ #define NTDDI_WINXP 0x05010000 #define NTDDI_WINXPSP1 0x05010100 #define NTDDI_WINXPSP2 0x05010200 +#define NTDDI_WINXPSP3 0x05010300 +#define NTDDI_WINXPSP4 0x05010400 #define NTDDI_WS03 0x05020000 #define NTDDI_WS03SP1 0x05020100 -#define NTDDI_LONGHORN 0x06000000 +#define NTDDI_WS03SP2 0x05020200 +#define NTDDI_WS03SP3 0x05020300 +#define NTDDI_WS03SP4 0x05020400 +#define NTDDI_WIN6 0x06000000 +#define NTDDI_WIN6SP1 0x06000100 +#define NTDDI_WIN6SP2 0x06000200 +#define NTDDI_WIN6SP3 0x06000300 +#define NTDDI_WIN6SP4 0x06000400 +#define NTDDI_LONGHORN NTDDI_WIN6 +#define NTDDI_VISTA NTDDI_WIN6 +#define NTDDI_VISTASP1 NTDDI_WIN6SP1 +#define NTDDI_VISTASP2 NTDDI_WIN6SP2 +#define NTDDI_VISTASP3 NTDDI_WIN6SP3 +#define NTDDI_VISTASP4 NTDDI_WIN6SP4 +#define NTDDI_WS08 NTDDI_WIN6SP1 +#define NTDDI_WS08SP2 NTDDI_WIN6SP2 +#define NTDDI_WS08SP3 NTDDI_WIN6SP3 +#define NTDDI_WS08SP4 NTDDI_WIN6SP4 = /* Macros to get the NTDDI for a given WIN32 */ #define NTDDI_VERSION_FROM_WIN32_WINNT2(ver) ver##0000

1 0

[greatlrd] 32741: implement NdisGetCurrentProcessorCounts
by greatlrd＠svn.reactos.org 22 Mar '08

22 Mar '08

Author: greatlrd Date: Fri Mar 21 19:38:09 2008 New Revision: 32741 URL: http://svn.reactos.org/svn/reactos?rev=3D32741&view=3Drev Log: implement NdisGetCurrentProcessorCounts Modified: trunk/reactos/drivers/network/ndis/include/ndissys.h trunk/reactos/drivers/network/ndis/ndis/stubs.c Modified: trunk/reactos/drivers/network/ndis/include/ndissys.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/= include/ndissys.h?rev=3D32741&r1=3D32740&r2=3D32741&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/network/ndis/include/ndissys.h (original) +++ trunk/reactos/drivers/network/ndis/include/ndissys.h Fri Mar 21 19:38:0= 9 2008 @@ -507,6 +507,14 @@ KeReleaseSpinLock(_Lock, OldIrql); \ } = +/* missing protypes */ +VOID +NTAPI +ExGetCurrentProcessorCounts( + PULONG ThreadKernelTime, + PULONG TotalCpuTime, + PULONG ProcessorNumber); + #endif /* __NDISSYS_H */ = /* EOF */ Modified: trunk/reactos/drivers/network/ndis/ndis/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/= ndis/stubs.c?rev=3D32741&r1=3D32740&r2=3D32741&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/network/ndis/ndis/stubs.c (original) +++ trunk/reactos/drivers/network/ndis/ndis/stubs.c Fri Mar 21 19:38:09 2008 @@ -462,7 +462,7 @@ = = /* - * @unimplemented + * @implemented */ VOID EXPORT @@ -477,7 +477,7 @@ * NDIS 5.0 */ { - UNIMPLEMENTED + ExGetCurrentProcessorCounts( (PULONG) pIdleCount, (PULONG) pKernelAndU= ser, (PULONG) pIndex); = } = =

1 0

[greatlrd] 32740: implemented NdisSystemProcessorCount
by greatlrd＠svn.reactos.org 22 Mar '08

22 Mar '08

Author: greatlrd Date: Fri Mar 21 19:26:53 2008 New Revision: 32740 URL: http://svn.reactos.org/svn/reactos?rev=3D32740&view=3Drev Log: implemented NdisSystemProcessorCount Modified: trunk/reactos/drivers/network/ndis/ndis/stubs.c Modified: trunk/reactos/drivers/network/ndis/ndis/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/= ndis/stubs.c?rev=3D32740&r1=3D32739&r2=3D32740&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/network/ndis/ndis/stubs.c (original) +++ trunk/reactos/drivers/network/ndis/ndis/stubs.c Fri Mar 21 19:26:53 2008 @@ -384,14 +384,14 @@ = = /* - * @unimplemented + * @implemented */ CCHAR EXPORT NdisSystemProcessorCount( VOID) { - return (CCHAR)1; + return (CCHAR)KeNumberProcessors; } = =

1 0

[greatlrd] 32739: implemented NdisGetSystemUptime, thx kjk for the help getting it faster against my frist code, that was never commited.
by greatlrd＠svn.reactos.org 22 Mar '08

22 Mar '08

Author: greatlrd Date: Fri Mar 21 19:17:18 2008 New Revision: 32739 URL: http://svn.reactos.org/svn/reactos?rev=3D32739&view=3Drev Log: implemented NdisGetSystemUptime, thx kjk for the help getting it faster aga= inst my frist code, that was never commited. = Modified: trunk/reactos/drivers/network/ndis/ndis/stubs.c Modified: trunk/reactos/drivers/network/ndis/ndis/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/= ndis/stubs.c?rev=3D32739&r1=3D32738&r2=3D32739&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/network/ndis/ndis/stubs.c (original) +++ trunk/reactos/drivers/network/ndis/ndis/stubs.c Fri Mar 21 19:17:18 2008 @@ -522,7 +522,7 @@ = = /* - * @unimplemented + * @implemented */ VOID EXPORT @@ -534,8 +534,9 @@ * NOTES: * NDIS 5.0 */ -{ - UNIMPLEMENTED +{ = + /* Get the uptime of the system in msec */ + *pSystemUpTime =3D ( (SharedUserData->TickCountLowDeprecated * Share= dUserData->TickCountMultiplier) / 0x1000000); = } = =

1 0

[dreimer] 32738: Small fix for Polish Resource File of USetup.
by dreimer＠svn.reactos.org 21 Mar '08

21 Mar '08

Author: dreimer Date: Fri Mar 21 17:15:29 2008 New Revision: 32738 URL: http://svn.reactos.org/svn/reactos?rev=3D32738&view=3Drev Log: Small fix for Polish Resource File of USetup. Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h 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=3D32738&r1=3D32737&r2=3D32738&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 Fri Mar 21 17:15:29 2008 @@ -363,31 +363,31 @@ TEXT_STYLE_NORMAL }, { - 8, + 24, 11, "Komputer:", TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { - 8, + 24, 12, "Ekran:", TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { - 8, + 24, 13, "Klawiatura:", TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { - 8, + 24, 14, "Uk=C2=88. klawiatury:", TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { - 8, + 24, 16, "Zapisz:", TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT

1 0

[dreimer] 32737: Update Polish and German Resources of USetup. Now working according to recent chnages. Polish Update by Olaf Siejka.
by dreimer＠svn.reactos.org 21 Mar '08

21 Mar '08

Author: dreimer Date: Fri Mar 21 16:11:09 2008 New Revision: 32737 URL: http://svn.reactos.org/svn/reactos?rev=3D32737&view=3Drev Log: Update Polish and German Resources of USetup. Now working according to rece= nt chnages. Polish Update by Olaf Siejka. Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/pl-PL.h 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=3D32737&r1=3D32736&r2=3D32737&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 Fri Mar 21 16:11:09 2008 @@ -36,8 +36,8 @@ { 0, 0, - " ENTER =3D Fortsetzen F3 =3D Beenden", - TEXT_TYPE_STATUS + "ENTER =3D Fortsetzen F3 =3D Beenden", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -112,8 +112,8 @@ { 0, 0, - " ENTER =3D Fortsetzen R =3D Reparieren F3 =3D Beenden", - TEXT_TYPE_STATUS + "ENTER =3D Fortsetzen R =3D Reparieren F3 =3D Beenden", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -125,12 +125,6 @@ = static MUI_ENTRY deDEIntroPageEntries[] =3D { - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, { 4, 3, @@ -212,8 +206,8 @@ { 0, 0, - " ENTER =3D Fortsetzen F3 =3D Beenden", - TEXT_TYPE_STATUS + "ENTER =3D Fortsetzen F3 =3D Beenden", + TEXT_TYPE_STATUS| TEXT_PADDING_BIG }, { 0, @@ -336,8 +330,8 @@ { 0, 0, - " ENTER =3D Zur=C2=81ck", - TEXT_TYPE_STATUS + "ENTER =3D Zur=C2=81ck", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -362,34 +356,34 @@ TEXT_STYLE_NORMAL }, { - 8, + 24, 11, - " Computer:", - TEXT_STYLE_NORMAL - }, - { - 8, + "Computer:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, 12, - " Bildschirm:", - TEXT_STYLE_NORMAL, - }, - { - 8, + "Bildschirm:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, 13, - " Tastatur:", - TEXT_STYLE_NORMAL - }, - { - 8, + "Tastatur:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, 14, " Tastaturlayout:", - TEXT_STYLE_NORMAL - }, - { - 8, + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, 16, - " Akzeptieren:", - TEXT_STYLE_NORMAL + "Akzeptieren:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { 25, @@ -429,8 +423,8 @@ { 0, 0, - " ENTER =3D Fortsetzen F3 =3D Beenden", - TEXT_TYPE_STATUS + "ENTER =3D Fortsetzen F3 =3D Beenden", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -493,8 +487,8 @@ { 0, 0, - " ESC =3D Hauptseite ENTER =3D Neustarten", - TEXT_TYPE_STATUS + "ESC =3D Hauptseite ENTER =3D Neustarten", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -544,8 +538,8 @@ { 0, 0, - " ENTER =3D Fortsetzen ESC =3D Abbrechen F3 =3D Beenden", - TEXT_TYPE_STATUS + "ENTER =3D Fortsetzen ESC =3D Abbrechen F3 =3D Beenden", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -584,8 +578,8 @@ { 0, 0, - " Cache wird geleert", - TEXT_TYPE_STATUS + "Cache wird geleert", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -630,8 +624,8 @@ { 0, 0, - " Bitte warten ...", - TEXT_TYPE_STATUS, + "Bitte warten ...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -681,8 +675,8 @@ { 0, 0, - " ENTER =3D Fortsetzen ESC =3D Abbrechen F3 =3D Beenden", - TEXT_TYPE_STATUS + "ENTER =3D Fortsetzen ESC =3D Abbrechen F3 =3D Beenden", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -727,8 +721,8 @@ { 0, 0, - " ENTER =3D Computer neustarten", - TEXT_TYPE_STATUS + "ENTER =3D Computer neustarten", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -773,8 +767,8 @@ { 0, 0, - " ENTER =3D Fortsetzen F3 =3D Beenden", - TEXT_TYPE_STATUS + "ENTER =3D Fortsetzen F3 =3D Beenden", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -832,8 +826,8 @@ { 0, 0, - " Bitte warten...", - TEXT_TYPE_STATUS + "Bitte warten...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -872,8 +866,8 @@ { 0, 0, - " ENTER =3D Fortfahren F3 =3D Beenden", - TEXT_TYPE_STATUS + "ENTER =3D Fortfahren F3 =3D Beenden", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -918,8 +912,8 @@ { 0, 0, - " ENTER =3D Fortfahren F3 =3D Beenden", - TEXT_TYPE_STATUS + "ENTER =3D Fortfahren F3 =3D Beenden", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -938,27 +932,27 @@ TEXT_STYLE_UNDERLINE }, { - 11, + 0, 12, "Bitte warten Sie w=C2=84hrend ReactOS Setup die ReactOS Dateien", - TEXT_STYLE_NORMAL - }, - { - 11, + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, 13, "in das Installationsverzeichnis kopiert.", - TEXT_STYLE_NORMAL - }, - { - 11, + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, 14, "Dieser Vorgang kann mehrere Minuten in Anspruch nehmen.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - " \xB3 B= itte warten... ", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 50, + 0, + "\xB3 Bitte warten... ", TEXT_TYPE_STATUS }, { @@ -1004,8 +998,8 @@ { 0, 0, - " ENTER =3D Fortfahren F3 =3D Abbrechen", - TEXT_TYPE_STATUS + "ENTER =3D Fortfahren F3 =3D Abbrechen", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1056,8 +1050,8 @@ { 0, 0, - " ENTER =3D Fortfahren ESC =3D Abbrechen F3 =3D Beenden", - TEXT_TYPE_STATUS + "ENTER =3D Fortfahren ESC =3D Abbrechen F3 =3D Beenden", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1108,8 +1102,8 @@ { 0, 0, - " ENTER =3D Fortfahren ESC =3D Abbrechen F3 =3D Beenden", - TEXT_TYPE_STATUS + "ENTER =3D Fortfahren ESC =3D Abbrechen F3 =3D Beenden", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1137,8 +1131,8 @@ { 0, 0, - " Erstelle Liste der zu kopierenden Dateien...", - TEXT_TYPE_STATUS + "Erstelle Liste der zu kopierenden Dateien...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1184,8 +1178,8 @@ { 0, 0, - " ENTER =3D Fortfahren ESC =3D Abbrechen F3 =3D Beenden", - TEXT_TYPE_STATUS + "ENTER =3D Fortfahren ESC =3D Abbrechen F3 =3D Beenden", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, = { @@ -1231,8 +1225,8 @@ { 0, 0, - " D =3D L=C2=94sche Partition ESC =3D Abbrechen F3 =3D Beend= en", - TEXT_TYPE_STATUS + "D =3D L=C2=94sche Partition ESC =3D Abbrechen F3 =3D Beenden", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1259,8 +1253,8 @@ { 0, 0, - " Registry Hives erstellen...", - TEXT_TYPE_STATUS + "Registry Hives erstellen...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, 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=3D32737&r1=3D32736&r2=3D32737&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 Fri Mar 21 16:11:09 2008 @@ -5,7 +5,6 @@ * IRC: irc.freenode.net #reactos-pl; */ = - #ifndef LANG_PL_PL_H__ #define LANG_PL_PL_H__ = @@ -44,8 +43,8 @@ { 0, 0, - " ENTER =3D Kontynuacja F3 =3D Wyj=C2=98cie", - TEXT_TYPE_STATUS + "ENTER =3D Kontynuacja F3 =3D Wyj=C2=98cie", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -120,8 +119,8 @@ { 0, 0, - " ENTER =3D Kontynuacja R =3D Naprawa F3 =3D Wyj=C2=98cie", - TEXT_TYPE_STATUS + "ENTER =3D Kontynuacja R =3D Naprawa F3 =3D Wyj=C2=98cie", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -214,8 +213,8 @@ { 0, 0, - " ENTER =3D Kontynuacja F3 =3D Wyj=C2=98cie", - TEXT_TYPE_STATUS + "ENTER =3D Kontynuacja F3 =3D Wyj=C2=98cie", + TEXT_TYPE_STATUS| TEXT_PADDING_BIG }, { 0, @@ -338,8 +337,8 @@ { 0, 0, - " ENTER =3D Powr=C2=A2t", - TEXT_TYPE_STATUS + "ENTER =3D Powr=C2=A2t", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -366,32 +365,32 @@ { 8, 11, - " Komputer:", - TEXT_STYLE_NORMAL + "Komputer:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { 8, 12, - " Ekran:", - TEXT_STYLE_NORMAL, + "Ekran:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { 8, 13, - " Klawiatura:", - TEXT_STYLE_NORMAL + "Klawiatura:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { 8, 14, "Uk=C2=88. klawiatury:", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { 8, 16, - " Zapisz:", - TEXT_STYLE_NORMAL + "Zapisz:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { 25, @@ -431,8 +430,8 @@ { 0, 0, - " ENTER =3D Kontynuacja F3 =3D Wyj=C2=98cie", - TEXT_TYPE_STATUS + "ENTER =3D Kontynuacja F3 =3D Wyj=C2=98cie", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -495,8 +494,8 @@ { 0, 0, - " ESC =3D Menu g=C2=88=C2=A2wne ENTER =3D Restart", - TEXT_TYPE_STATUS + "ESC =3D Menu g=C2=88=C2=A2wne ENTER =3D Restart", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -546,8 +545,8 @@ { 0, 0, - " ENTER =3D Kontynuacja ESC =3D Anulowanie F3 =3D Wyj=C2=98c= ie", - TEXT_TYPE_STATUS + "ENTER =3D Kontynuacja ESC =3D Anulowanie F3 =3D Wyj=C2=98cie", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -586,8 +585,8 @@ { 0, 0, - " Czyszczenie pami=C2=A9ci Cache", - TEXT_TYPE_STATUS + "Czyszczenie pami=C2=A9ci Cache", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -632,8 +631,8 @@ { 0, 0, - " Prosz=C2=A9 czeka=C2=86 ...", - TEXT_TYPE_STATUS, + "Prosz=C2=A9 czeka=C2=86 ...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, }, { 0, @@ -683,8 +682,8 @@ { 0, 0, - " ENTER =3D Kontynuacja ESC =3D Anulowanie F3 =3D Wyj=C2=98c= ie", - TEXT_TYPE_STATUS + "ENTER =3D Kontynuacja ESC =3D Anulowanie F3 =3D Wyj=C2=98cie", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -729,8 +728,8 @@ { 0, 0, - " ENTER =3D Restart komputera", - TEXT_TYPE_STATUS + "ENTER =3D Restart komputera", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -775,8 +774,8 @@ { 0, 0, - " ENTER =3D Kontynuacja F3 =3D Wyj=C2=98cie", - TEXT_TYPE_STATUS + "ENTER =3D Kontynuacja F3 =3D Wyj=C2=98cie", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -834,8 +833,8 @@ { 0, 0, - " Prosz=C2=A9 czeka=C2=86...", - TEXT_TYPE_STATUS + "Prosz=C2=A9 czeka=C2=86...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -868,8 +867,8 @@ { 0, 0, - " ENTER =3D Kontynuacja F3 =3D Wyj=C2=98cie", - TEXT_TYPE_STATUS + "ENTER =3D Kontynuacja F3 =3D Wyj=C2=98cie", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -920,8 +919,8 @@ { 0, 0, - " ENTER =3D Kontynuacja F3 =3D Wyj=C2=98cie", - TEXT_TYPE_STATUS + "ENTER =3D Kontynuacja F3 =3D Wyj=C2=98cie", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -943,24 +942,24 @@ 11, 12, "Prosz=C2=A9 czeka=C2=86, Instalator ReactOS kopiuje pliki do wybr= anego", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER }, { 30, 13, "katalogu.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER }, { 20, 14, "To mo=C2=BEe zaj=C2=A5=C2=86 kilka minut.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - " \xB3 P= rosz=C2=A9 czeka=C2=86... ", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 50, + 0, + "\xB3 Please wait... ", TEXT_TYPE_STATUS }, { @@ -1006,8 +1005,8 @@ { 0, 0, - " ENTER =3D Kontynuacja F3 =3D Wyj=C2=98cie", - TEXT_TYPE_STATUS + "ENTER =3D Kontynuacja F3 =3D Wyj=C2=98cie", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1058,8 +1057,8 @@ { 0, 0, - " ENTER =3D Kontynuacja ESC =3D Anulowanie F3 =3D Wyj=C2=98c= ie", - TEXT_TYPE_STATUS + "ENTER =3D Kontynuacja ESC =3D Anulowanie F3 =3D Wyj=C2=98cie", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1110,8 +1109,8 @@ { 0, 0, - " ENTER =3D Kontynuacja ESC =3D Anulowanie F3 =3D Wyj=C2=98c= ie", - TEXT_TYPE_STATUS + "ENTER =3D Kontynuacja ESC =3D Anulowanie F3 =3D Wyj=C2=98cie", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1133,14 +1132,14 @@ { 6, 8, - "Instalator tw=C2=A2j komputer do skopiowania plik=C2=A2w systemu= . ", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - " Tworzenie listy plik=C2=A2w do skopiowania...", - TEXT_TYPE_STATUS + "Instalator przygotuje tw=C2=A2j komputer do skopiowania plik=C2= =A2w systemu. ", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Tworzenie listy plik=C2=A2w do skopiowania...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1186,8 +1185,8 @@ { 0, 0, - " ENTER =3D Kontynuacja ESC =3D Anulowanie F3 =3D Wyj=C2=98c= ie", - TEXT_TYPE_STATUS + "ENTER =3D Kontynuacja ESC =3D Anulowanie F3 =3D Wyj=C2=98cie", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, = { @@ -1233,8 +1232,8 @@ { 0, 0, - " D =3D Skasowanie partycji ESC =3D Anulowanie F3 =3D Wyj=C2= =98cie", - TEXT_TYPE_STATUS + "D =3D Skasowanie partycji ESC =3D Anulowanie F3 =3D Wyj=C2=98= cie", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1261,8 +1260,8 @@ { 0, 0, - " Tworzenie ga=C2=88=C2=A9zi rejestru...", - TEXT_TYPE_STATUS + "Tworzenie ga=C2=88=C2=A9zi rejestru...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0,

1 0

[hpoussin] 32736: Revert part of r32735 ; we can't use C preprocessor on .spec files, because comments also start with '#'
by hpoussin＠svn.reactos.org 21 Mar '08

21 Mar '08

Author: hpoussin Date: Fri Mar 21 06:54:27 2008 New Revision: 32736 URL: http://svn.reactos.org/svn/reactos?rev=3D32736&view=3Drev Log: Revert part of r32735 ; we can't use C preprocessor on .spec files, because= comments also start with '#' Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/= mingw/modulehandler.cpp?rev=3D32736&r1=3D32735&r2=3D32736&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/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Fri Mar 21 0= 6:54:27 2008 @@ -1284,11 +1284,9 @@ "\t$(ECHO_WMC)\n" "\t$(Q)$(WMC_TARGET) -i -H $(INTERMEDIATE)$(SEP)include$(SE= P)reactos$(SEP)$(source_name_noext).h -o $(INTERMEDIATE)$(SEP)$(source_dir)= $(SEP)$(source_name_noext).rc $(source)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t).rc", "$(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext= ).h", NULL ); -Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext).spec.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERME= DIATE)$(SEP)$(source_dir) $(TEMPORARY)\n" +Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext).spec.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERME= DIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WINEBLD)\n" - "\t${gcc} -xc -E ${$(module_name)_RCFLAGS} $(source) = > $(TEMPORARY)$(SEP)$(module_name).spec.tmp\n" - "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(IN= TERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E= $(TEMPORARY)$(SEP)$(module_name).spec.tmp\n" - "\t-@${rm} $(TEMPORARY)$(SEP)$(module_name).spec.tmp = 2>$(NUL)\n" + "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(IN= TERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E= $(source)\n" "$(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_na= me_noext).stubs.c: $(source_path)$(SEP)$(source_name_noext).spec $(WINEBUIL= D_TARGET)\n" "\t$(ECHO_WINEBLD)\n" "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(IN= TERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).stubs.c --pedll $= (source_path)$(SEP)$(source_name_noext).spec\n"

1 0

[hpoussin] 32735: Add preprocessor support for .spec files (exports can be different between architectures) MingwModuleHandler::GetDefinitionFilename() can return NULL if no <importlibrary> tag exist
by hpoussin＠svn.reactos.org 21 Mar '08

21 Mar '08

Author: hpoussin Date: Fri Mar 21 04:28:42 2008 New Revision: 32735 URL: http://svn.reactos.org/svn/reactos?rev=3D32735&view=3Drev Log: Add preprocessor support for .spec files (exports can be different between = architectures) MingwModuleHandler::GetDefinitionFilename() can return NULL if no <importli= brary> tag exist Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/= mingw/modulehandler.cpp?rev=3D32735&r1=3D32734&r2=3D32735&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/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Fri Mar 21 0= 4:28:42 2008 @@ -1284,9 +1284,11 @@ "\t$(ECHO_WMC)\n" "\t$(Q)$(WMC_TARGET) -i -H $(INTERMEDIATE)$(SEP)include$(SE= P)reactos$(SEP)$(source_name_noext).h -o $(INTERMEDIATE)$(SEP)$(source_dir)= $(SEP)$(source_name_noext).rc $(source)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t).rc", "$(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext= ).h", NULL ); -Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext).spec.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERME= DIATE)$(SEP)$(source_dir)\n" +Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext).spec.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERME= DIATE)$(SEP)$(source_dir) $(TEMPORARY)\n" "\t$(ECHO_WINEBLD)\n" - "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(IN= TERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E= $(source_path)$(SEP)$(source_name_noext).spec\n" + "\t${gcc} -xc -E ${$(module_name)_RCFLAGS} $(source) = > $(TEMPORARY)$(SEP)$(module_name).spec.tmp\n" + "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(IN= TERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E= $(TEMPORARY)$(SEP)$(module_name).spec.tmp\n" + "\t-@${rm} $(TEMPORARY)$(SEP)$(module_name).spec.tmp = 2>$(NUL)\n" "$(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_na= me_noext).stubs.c: $(source_path)$(SEP)$(source_name_noext).spec $(WINEBUIL= D_TARGET)\n" "\t$(ECHO_WINEBLD)\n" "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(IN= TERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).stubs.c --pedll $= (source_path)$(SEP)$(source_name_noext).spec\n" @@ -1672,7 +1674,7 @@ fprintf ( fMakefile, "%s: %s %s $(RSYM_TARGET) $(PEFIXUP_TARGET) | %s\n", target_macro.c_str (), - backend->GetFullName ( *definitionFilename ).c_str (), + definitionFilename ? backend->GetFullName ( *definitionFilename ).c_str = () : "", dependencies.c_str (), target_folder.c_str () ); fprintf ( fMakefile, "\t$(ECHO_LD)\n" ); @@ -1700,7 +1702,7 @@ fprintf ( fMakefile, "\t${dlltool} --dllname %s --def %s --output-exp %s%s%s\n", targetName.c_str (), - backend->GetFullName ( *definitionFilename ).c_str (), + definitionFilename ? backend->GetFullName ( *definitionFilenam= e ).c_str () : "", backend->GetFullName ( temp_exp ).c_str (), module.mangledSymbols ? "" : " --kill-at", module.underscoreSymbols ? " --add-underscore" : "" ); @@ -1750,7 +1752,8 @@ GenerateRunStripCode (); GenerateCleanObjectsAsYouGoCode (); = - delete definitionFilename; + if ( definitionFilename ) + delete definitionFilename; delete target_file; } = @@ -1856,22 +1859,22 @@ MingwModuleHandler::GenerateArchiveTarget () { const FileLocation *archiveFilename =3D GetModuleArchiveFilename (); + const FileLocation *definitionFilename =3D GetDefinitionFilename (); = arRule1.Execute ( fMakefile, backend, module, archiveFilename, clean_file= s ); = - if ( IsStaticLibrary ( module ) && module.importLibrary ) - { - const FileLocation *definitionFilename =3D GetDefinitionFilename (); - + if ( IsStaticLibrary ( module ) && definitionFilename ) + { fprintf ( fMakefile, "\t${dlltool} --dllname %s --def %s --output-lib $@%s%s\n", module.importLibrary->dllname.c_str (), backend->GetFullName ( *definitionFilename ).c_str (), module.mangledSymbols ? "" : " --kill-at", module.underscoreSymbols ? " --add-underscore" : "" ); - + } + + if ( definitionFilename ) delete definitionFilename; - } = if(module.type =3D=3D HostStaticLibrary) arHostRule2.Execute ( fMakefile, backend, module, archiveFilename, clean= _files ); @@ -2357,20 +2360,18 @@ const FileLocation* MingwModuleHandler::GetDefinitionFilename () const { - if ( module.importLibrary !=3D NULL ) - { - DirectoryLocation directory; - if ( IsWineModule () ) - directory =3D IntermediateDirectory; - else - directory =3D SourceDirectory; - - return new FileLocation ( directory, - module.importLibrary->source->relative_path, - module.importLibrary->source->name ); - } + if ( module.importLibrary =3D=3D NULL ) + return NULL; + + DirectoryLocation directory; + if ( IsWineModule () ) + directory =3D IntermediateDirectory; else - return new FileLocation ( SourceDirectory, "tools" + sSep + "rbuild", "e= mpty.def" ); + directory =3D SourceDirectory; + + return new FileLocation ( directory, + module.importLibrary->source->relative_path, + module.importLibrary->source->name ); } = void @@ -2380,15 +2381,21 @@ { const FileLocation *library_target =3D GetImportLibraryFilename ( module= , &clean_files ); const FileLocation *defFilename =3D GetDefinitionFilename (); + string empty =3D "tools" + sSep + "rbuild" + sSep + "empty.def"; = vector<FileLocation> deps; GetDefinitionDependencies ( deps ); = fprintf ( fMakefile, "# IMPORT LIBRARY RULE:\n" ); = - fprintf ( fMakefile, "%s: %s", - backend->GetFullName ( *library_target ).c_str (), - backend->GetFullName ( *defFilename ).c_str () ); + fprintf ( fMakefile, "%s:", + backend->GetFullName ( *library_target ).c_str () ); + + if ( defFilename ) + { + fprintf ( fMakefile, " %s", + backend->GetFullName ( *defFilename ).c_str () ); + } = size_t i, iend =3D deps.size(); for ( i =3D 0; i < iend; i++ ) @@ -2403,12 +2410,14 @@ fprintf ( fMakefile, "\t${dlltool} --dllname %s --def %s --output-lib %s%s%s\n\n", module.output->name.c_str (), - backend->GetFullName ( *defFilename ).c_str (), + defFilename ? backend->GetFullName ( *defFilename ).c_str () + : empty.c_str (), backend->GetFullName ( *library_target ).c_str (), module.mangledSymbols ? "" : " --kill-at", module.underscoreSymbols ? " --add-underscore" : "" ); = - delete defFilename; + if ( defFilename ) + delete defFilename; delete library_target; } }

1 0

[hpoussin] 32734: Fix warnings
by hpoussin＠svn.reactos.org 21 Mar '08

21 Mar '08

Author: hpoussin Date: Fri Mar 21 04:25:17 2008 New Revision: 32734 URL: http://svn.reactos.org/svn/reactos?rev=3D32734&view=3Drev Log: Fix warnings Modified: trunk/reactos/base/applications/screensavers/3dtext/3dtext.spec trunk/reactos/base/applications/screensavers/logon/logon.spec Modified: trunk/reactos/base/applications/screensavers/3dtext/3dtext.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/scr= eensavers/3dtext/3dtext.spec?rev=3D32734&r1=3D32733&r2=3D32734&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/applications/screensavers/3dtext/3dtext.spec (origin= al) +++ trunk/reactos/base/applications/screensavers/3dtext/3dtext.spec Fri Mar= 21 04:25:17 2008 @@ -1,2 +1,2 @@ @ stdcall ScreenSaverProc(ptr long ptr ptr) -@ stdcall ScreenSaverConfigureDialog(ptr long ptr ptr) +@ stdcall ScreenSaverConfigureDialog(ptr long ptr ptr) Modified: trunk/reactos/base/applications/screensavers/logon/logon.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/scr= eensavers/logon/logon.spec?rev=3D32734&r1=3D32733&r2=3D32734&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/applications/screensavers/logon/logon.spec (original) +++ trunk/reactos/base/applications/screensavers/logon/logon.spec Fri Mar 2= 1 04:25:17 2008 @@ -1,2 +1,2 @@ @ stdcall ScreenSaverProc(ptr long ptr ptr) -@ stdcall ScreenSaverConfigureDialog(ptr long ptr ptr) +@ stdcall ScreenSaverConfigureDialog(ptr long ptr ptr)

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