Ros-diffs January 2010

ros-diffs@reactos.org

26 participants
522 discussions

[dgorbachev] 45216: Remove duplicate definitions (now in time.c).
by dgorbachev＠svn.reactos.org 23 Jan '10

23 Jan '10

Author: dgorbachev Date: Sat Jan 23 22:24:36 2010 New Revision: 45216 URL: http://svn.reactos.org/svn/reactos?rev=45216&view=rev Log: Remove duplicate definitions (now in time.c). Modified: trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/clock.c Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Sat Jan 23 22:24:36 2010 @@ -134,6 +134,7 @@ extern PVOID KeRaiseUserExceptionDispatcher; extern ULONG KeTimeIncrement; extern ULONG KeTimeAdjustment; +extern LONG KiTickOffset; extern ULONG_PTR KiBugCheckData[5]; extern ULONG KiFreezeFlag; extern ULONG KiDPCTimeout; Modified: trunk/reactos/ntoskrnl/ke/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/clock.c?rev=45… ============================================================================== --- trunk/reactos/ntoskrnl/ke/clock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/clock.c [iso-8859-1] Sat Jan 23 22:24:36 2010 @@ -19,9 +19,7 @@ volatile KSYSTEM_TIME KeTickCount = { 0, 0, 0 }; ULONG KeMaximumIncrement; ULONG KeMinimumIncrement; -ULONG KeTimeAdjustment; ULONG KeTimeIncrement; -LONG KiTickOffset = 0; /* PRIVATE FUNCTIONS *********************************************************/

1 0

[mkupfer] 45215: - fix and add German translations
by mkupfer＠svn.reactos.org 23 Jan '10

23 Jan '10

Author: mkupfer Date: Sat Jan 23 21:18:23 2010 New Revision: 45215 URL: http://svn.reactos.org/svn/reactos?rev=45215&view=rev Log: - fix and add German translations Modified: trunk/reactos/dll/win32/netid/lang/de-DE.rc Modified: trunk/reactos/dll/win32/netid/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/de-DE… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/de-DE.rc [iso-8859-1] Sat Jan 23 21:18:23 2010 @@ -41,7 +41,7 @@ PUSHBUTTON "&Mehr...", 1003, 150, 102, 75, 14 GROUPBOX "Mitglied von", 1018, 7, 119, 219, 73 AUTORADIOBUTTON "&Domäne:", 1008, 17, 132, 192, 10, WS_GROUP - AUTORADIOBUTTON "&Abrbeitsgruppe:", 1004, 17, 161, 191, 10 + AUTORADIOBUTTON "&Arbeitsgruppe:", 1004, 17, 161, 191, 10 EDITTEXT 116, 28, 144, 181, 14, ES_AUTOHSCROLL | WS_GROUP PUSHBUTTON "Meine Domäne &finden", 1010, 7, 203, 109, 14, NOT WS_VISIBLE | WS_DISABLED EDITTEXT 1007, 28, 172, 181, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_OEMCONVERT @@ -75,12 +75,12 @@ 22 "Willkommen in der Arbeitsgruppe %1" 23 "Willkommen in der Domäne %1" 24 "Sie müssen den Computer neustarten, damit die Änderungen wirksam werden." - 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." + 25 "Sie können den Namen und die Zugehörigkeit dieses Computers ändern. Änderungen können sich auf den Zugriff auf Netzwerkressourcen auswirken." 1021 "Hinweis: Nur Administratoren können die Identifikation des Computers ändern." 1022 "Hinweis: Die Identifikation des Computers kann aus folgendem Grund nicht geändert werden:" - 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" + 1030 "Der Computername ""%s"" enthält unerlaubte Zeichen. Unerlaubte Zeichen sind ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / und ?" 3210 "&Details >>" 3220 "<< &Details" - 4000 "Information" - 4001 "Can't set new a computer name!" + 4000 "Information" + 4001 "Kann neuen Computernamen nicht setzen!" END

1 0

[sir_richard] 45214: [NTOS]: Export the C KiEoiHelper alongside the ASM Ke386EoiHelper. Yes, this is a "ReactOS-only" export, but really this interface is reserved for the HAL, and as long as we keep Ke386EoiHelper, the NT HAL should still work. Need to revisit/finalize this decision and whether or not we can emulate the C-interface with Ke386EoiHelper somehow (reliably).
by sir_richard＠svn.reactos.org 23 Jan '10

23 Jan '10

Author: sir_richard Date: Sat Jan 23 20:31:54 2010 New Revision: 45214 URL: http://svn.reactos.org/svn/reactos?rev=45214&view=rev Log: [NTOS]: Export the C KiEoiHelper alongside the ASM Ke386EoiHelper. Yes, this is a "ReactOS-only" export, but really this interface is reserved for the HAL, and as long as we keep Ke386EoiHelper, the NT HAL should still work. Need to revisit/finalize this decision and whether or not we can emulate the C-interface with Ke386EoiHelper somehow (reliably). Modified: trunk/reactos/ntoskrnl/ntoskrnl.pspec Modified: trunk/reactos/ntoskrnl/ntoskrnl.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.pspec?re… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] Sat Jan 23 20:31:54 2010 @@ -701,6 +701,7 @@ @ fastcall KefReleaseSpinLockFromDpcLevel(ptr) #ifdef _M_IX86 @ stdcall Kei386EoiHelper() +@ fastcall KiEoiHelper(ptr) /* FIXME: Evaluate decision */ #endif @ fastcall KiAcquireSpinLock(ptr) @ extern KiBugCheckData

1 0

[sir_richard] 45213: [NDK]: Some prototype fixes.
by sir_richard＠svn.reactos.org 23 Jan '10

23 Jan '10

Author: sir_richard Date: Sat Jan 23 20:29:33 2010 New Revision: 45213 URL: http://svn.reactos.org/svn/reactos?rev=45213&view=rev Log: [NDK]: Some prototype fixes. Modified: trunk/reactos/include/ndk/halfuncs.h trunk/reactos/include/ndk/kefuncs.h Modified: trunk/reactos/include/ndk/halfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/halfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/halfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/halfuncs.h [iso-8859-1] Sat Jan 23 20:29:33 2010 @@ -133,7 +133,7 @@ NTAPI HalBeginSystemInterrupt( KIRQL Irql, - ULONG Vector, + UCHAR Vector, PKIRQL OldIrql ); @@ -147,7 +147,7 @@ VOID NTAPI HalDisableSystemInterrupt( - ULONG Vector, + UCHAR Vector, KIRQL Irql ); @@ -155,7 +155,7 @@ BOOLEAN NTAPI HalEnableSystemInterrupt( - ULONG Vector, + UCHAR Vector, KIRQL Irql, KINTERRUPT_MODE InterruptMode ); @@ -165,7 +165,7 @@ NTAPI HalEndSystemInterrupt( KIRQL Irql, - ULONG Vector + UCHAR Vector ); #ifdef _ARM_ // FIXME: ndk/arm? armddk.h? Modified: trunk/reactos/include/ndk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/kefuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/kefuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/kefuncs.h [iso-8859-1] Sat Jan 23 20:29:33 2010 @@ -178,7 +178,6 @@ ); VOID -NTAPI KiUnexpectedInterrupt( VOID );

1 0

[sir_richard] 45212: [NTOS]: KiDispatchInterrupt crushes EBX, so maybe it should preserve it first? This only worked because KiDispatchInterrupt was only called by ASM code that already was magically aware of this fact, and preserved (or didn't use) EBX before making the call. Yuck!
by sir_richard＠svn.reactos.org 23 Jan '10

23 Jan '10

Author: sir_richard Date: Sat Jan 23 20:28:26 2010 New Revision: 45212 URL: http://svn.reactos.org/svn/reactos?rev=45212&view=rev Log: [NTOS]: KiDispatchInterrupt crushes EBX, so maybe it should preserve it first? This only worked because KiDispatchInterrupt was only called by ASM code that already was magically aware of this fact, and preserved (or didn't use) EBX before making the call. Yuck! Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Sat Jan 23 20:28:26 2010 @@ -320,6 +320,9 @@ .func KiDispatchInterrupt@0 _KiDispatchInterrupt@0: + /* Preserve EBX */ + push ebx + /* Get the PCR and disable interrupts */ mov ebx, PCR[KPCR_SELF] cli @@ -418,12 +421,14 @@ Return: /* All done */ + pop ebx ret QuantumEnd: /* Disable quantum end and process it */ mov byte ptr [ebx+KPCR_PRCB_QUANTUM_END], 0 call _KiQuantumEnd@0 + pop ebx ret .endfunc

1 0

[fireball] 45211: Jose Catena <jc1@diwaves.com> - Fix a typo in aulldvrm (one of the dividends was always wrong). See issue #5139 for more details.
by fireball＠svn.reactos.org 23 Jan '10

23 Jan '10

Author: fireball Date: Sat Jan 23 20:26:06 2010 New Revision: 45211 URL: http://svn.reactos.org/svn/reactos?rev=45211&view=rev Log: Jose Catena <jc1(a)diwaves.com> - Fix a typo in aulldvrm (one of the dividends was always wrong). See issue #5139 for more details. Modified: trunk/reactos/lib/sdk/crt/math/i386/aulldvrm_asm.s Modified: trunk/reactos/lib/sdk/crt/math/i386/aulldvrm_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/aull… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/aulldvrm_asm.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/aulldvrm_asm.s [iso-8859-1] Sat Jan 23 20:26:06 2010 @@ -89,7 +89,7 @@ #undef DVSRLO #undef DVSRHI #define DVNDLO [esp + 8] // stack address of dividend (a) -#define DVNDHI [esp + 8] // stack address of dividend (a) +#define DVNDHI [esp + 12] // stack address of dividend (a) #define DVSRLO [esp + 16] // stack address of divisor (b) #define DVSRHI [esp + 20] // stack address of divisor (b)

1 0

[sir_richard] 45210: [PERF]: Do not declare the PCR in KeGetPcr as volatile. It is only volatile as in "if there is a context switch, the PCR is different". You are in a LOT of trouble if the thread switches while your code is running in the first place, and your code is somehow running as a different thread! This change makes C code a lot neater, especially during PCR access, because it doesn't force reloading the PCR each time. For example, Read-Modify-Operations on the PCR, such as AND are 1
by sir_richard＠svn.reactos.org 23 Jan '10

23 Jan '10

Author: sir_richard Date: Sat Jan 23 19:28:14 2010 New Revision: 45210 URL: http://svn.reactos.org/svn/reactos?rev=45210&view=rev Log: [PERF]: Do not declare the PCR in KeGetPcr as volatile. It is only volatile as in "if there is a context switch, the PCR is different". You are in a LOT of trouble if the thread switches while your code is running in the first place, and your code is somehow running as a different thread! This change makes C code a lot neater, especially during PCR access, because it doesn't force reloading the PCR each time. For example, Read-Modify-Operations on the PCR, such as AND are 1 line of assembly instead of 3. This helps and will help further with the C HAL, as well as the C trap handlers. Modified: trunk/reactos/include/ndk/i386/ketypes.h Modified: trunk/reactos/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/ketypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/i386/ketypes.h [iso-8859-1] Sat Jan 23 19:28:14 2010 @@ -27,10 +27,10 @@ // KPCR Access for non-IA64 builds // #define K0IPCR ((ULONG_PTR)(KIP0PCRADDRESS)) -#define PCR ((volatile KPCR * const)K0IPCR) +#define PCR ((KPCR * const)K0IPCR) #if defined(CONFIG_SMP) || defined(NT_BUILD) #undef KeGetPcr -#define KeGetPcr() ((volatile KPCR * const)__readfsdword(0x1C)) +#define KeGetPcr() ((KPCR * const)__readfsdword(FIELD_OFFSET(KPCR, Self))) #endif //

1 0

[dgorbachev] 45209: Fix English translation of RApps. Andrew Faulds (ajfweb =at= googlemail =dot= com), bug #5138.
by dgorbachev＠svn.reactos.org 23 Jan '10

23 Jan '10

Author: dgorbachev Date: Sat Jan 23 18:26:30 2010 New Revision: 45209 URL: http://svn.reactos.org/svn/reactos?rev=45209&view=rev Log: Fix English translation of RApps. Andrew Faulds (ajfweb =at= googlemail =dot= com), bug #5138. Modified: trunk/reactos/base/applications/rapps/lang/en-US.rc Modified: trunk/reactos/base/applications/rapps/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] Sat Jan 23 18:26:30 2010 @@ -59,10 +59,10 @@ AUTOCHECKBOX "&Log of installation and removal of programs", IDC_LOG_ENABLED, 15, 46, 219, 12 GROUPBOX "Downloading", -1, 4, 65, 240, 51 - LTEXT "Folder for downloadings:", -1, 16, 75, 100, 9 + LTEXT "Downloads folder:", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP PUSHBUTTON "&Choose", IDC_CHOOSE, 187, 85, 50, 14 - AUTOCHECKBOX "&Delete installers of programs after installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 + AUTOCHECKBOX "&Delete program installer after installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 PUSHBUTTON "Default", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 @@ -184,9 +184,9 @@ IDS_AVAILABLEFORINST "Available for installation" IDS_UPDATES "Updates" IDS_APPLICATIONS "Applications" - IDS_CHOOSE_FOLDER_TEXT "Choose a folder which will be used for downloading of programs:" - IDS_CHOOSE_FOLDER_ERROR "You have specified a nonexistent folder!" - IDS_USER_NOT_ADMIN "You should be administrator for start ""ReactOS Applications Manager""!" + IDS_CHOOSE_FOLDER_TEXT "Choose a folder which will store Downloads:" + IDS_CHOOSE_FOLDER_ERROR "The folder you have specified does not exist." + IDS_USER_NOT_ADMIN "You must be an administrator to start ""ReactOS Applications Manager""!" IDS_APP_REG_REMOVE "Are you sure you want to delete the data on the installed program from the registry?" IDS_INFORMATION "Information" IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!"

1 0

[sserapion] 45208: - commctrl.h: revert a change from 45098 which is incorrect. - make some floating point math available on x64 - build fixes.
by sserapion＠svn.reactos.org 23 Jan '10

23 Jan '10

Author: sserapion Date: Sat Jan 23 05:18:57 2010 New Revision: 45208 URL: http://svn.reactos.org/svn/reactos?rev=45208&view=rev Log: - commctrl.h: revert a change from 45098 which is incorrect. - make some floating point math available on x64 - build fixes. Modified: branches/ros-amd64-bringup/reactos/hal/halx86/mp/halinit_mp.c branches/ros-amd64-bringup/reactos/include/crt/math.h branches/ros-amd64-bringup/reactos/include/psdk/commctrl.h branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c branches/ros-amd64-bringup/reactos/tools/rbuild/rbuild.vcproj Modified: branches/ros-amd64-bringup/reactos/hal/halx86/mp/halinit_mp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/mp/halinit_mp.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/mp/halinit_mp.c [iso-8859-1] Sat Jan 23 05:18:57 2010 @@ -21,11 +21,6 @@ ULONG_PTR KernelBase; /***************************************************************************/ - -VOID NTAPI HalpInitializePICs(IN BOOLEAN EnableInterrupts) -{ - UNIMPLEMENTED; -} VOID HalpInitPhase0(PLOADER_PARAMETER_BLOCK LoaderBlock) Modified: branches/ros-amd64-bringup/reactos/include/crt/math.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/math.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/crt/math.h [iso-8859-1] Sat Jan 23 05:18:57 2010 @@ -106,40 +106,40 @@ float __cdecl _hypotf(float _X,float _Y); #endif - float frexpf(float _X,int *_Y); - float __cdecl ldexpf(float _X,int _Y); - long double __cdecl ldexpl(long double _X,int _Y); - float __cdecl acosf(float _X); - float __cdecl asinf(float _X); - float __cdecl atanf(float _X); - float __cdecl atan2f(float _X,float _Y); - float __cdecl cosf(float _X); - float __cdecl sinf(float _X); - float __cdecl tanf(float _X); - float __cdecl coshf(float _X); - float __cdecl sinhf(float _X); - float __cdecl tanhf(float _X); - float __cdecl expf(float _X); - float expm1f(float _X); - float __cdecl logf(float _X); - float __cdecl log10f(float _X); - float __cdecl modff(float _X,float *_Y); - float __cdecl powf(float _X,float _Y); - float __cdecl sqrtf(float _X); - float __cdecl ceilf(float _X); - float __cdecl floorf(float _X); - float __cdecl fmodf(float _X,float _Y); - float __cdecl _hypotf(float _X,float _Y); - float __cdecl fabsf(float _X); + extern float frexpf(float _X,int *_Y); + extern float __cdecl ldexpf(float _X,int _Y); + extern long double __cdecl ldexpl(long double _X,int _Y); + extern float __cdecl acosf(float _X); + extern float __cdecl asinf(float _X); + extern float __cdecl atanf(float _X); + extern float __cdecl atan2f(float _X,float _Y); + extern float __cdecl cosf(float _X); + extern float __cdecl sinf(float _X); + extern float __cdecl tanf(float _X); + extern float __cdecl coshf(float _X); + extern float __cdecl sinhf(float _X); + extern float __cdecl tanhf(float _X); + extern float __cdecl expf(float _X); + extern float expm1f(float _X); + extern float __cdecl logf(float _X); + extern float __cdecl log10f(float _X); + extern float __cdecl modff(float _X,float *_Y); + extern float __cdecl powf(float _X,float _Y); + extern float __cdecl sqrtf(float _X); + extern float __cdecl ceilf(float _X); + extern float __cdecl floorf(float _X); + extern float __cdecl fmodf(float _X,float _Y); + extern float __cdecl _hypotf(float _X,float _Y); + extern float __cdecl fabsf(float _X); #if !defined(__ia64__) && !defined(_M_IA64) /* from libmingwex */ - float __cdecl _copysignf (float _Number,float _Sign); - float __cdecl _chgsignf (float _X); - float __cdecl _logbf(float _X); - float __cdecl _nextafterf(float _X,float _Y); - int __cdecl _finitef(float _X); - int __cdecl _isnanf(float _X); - int __cdecl _fpclassf(float _X); + extern float __cdecl _copysignf (float _Number,float _Sign); + extern float __cdecl _chgsignf (float _X); + extern float __cdecl _logbf(float _X); + extern float __cdecl _nextafterf(float _X,float _Y); + extern int __cdecl _finitef(float _X); + extern int __cdecl _isnanf(float _X); + extern int __cdecl _fpclassf(float _X); #endif #if defined(__GNUC__) @@ -237,14 +237,22 @@ #ifndef __NO_ISOCEXT #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) \ - || !defined __STRICT_ANSI__ || defined __GLIBCPP__ - -#if !defined(_MSC_VER) -#define NAN (0.0F/0.0F) -#define HUGE_VALF (1.0F/0.0F) -#define HUGE_VALL (1.0L/0.0L) -#define INFINITY (1.0F/0.0F) -#endif + || !defined __STRICT_ANSI__ || defined __cplusplus + +#if __MINGW_GNUC_PREREQ(3, 3) +#define HUGE_VALF __builtin_huge_valf() +#define HUGE_VALL __builtin_huge_vall() +#define INFINITY __builtin_inf() +#define NAN __builtin_nan("") +#elif !defined(_MSC_VER) +extern const float __INFF; +#define HUGE_VALF __INFF +extern const long double __INFL; +#define HUGE_VALL __INFL +#define INFINITY HUGE_VALF +extern const double __QNAN; +#define NAN __QNAN +#endif /* __MINGW_GNUC_PREREQ(3, 3) */ #define FP_NAN 0x0100 @@ -320,6 +328,9 @@ /* 7.12.3.4 */ /* We don't need to worry about truncation here: A NaN stays a NaN. */ + extern int __cdecl __isnan (double) __MINGW_ATTRIB_PURE; + extern int __cdecl __isnanf (float) __MINGW_ATTRIB_PURE; + extern int __cdecl __isnanl (long double) __MINGW_ATTRIB_PURE; __CRT_INLINE int __cdecl __isnan (double _x) { @@ -354,6 +365,9 @@ #define isnormal(x) (fpclassify(x) == FP_NORMAL) /* 7.12.3.6 The signbit macro */ + extern int __cdecl __signbit (double) __MINGW_ATTRIB_PURE; + extern int __cdecl __signbitf (float) __MINGW_ATTRIB_PURE; + extern int __cdecl __signbitl (long double) __MINGW_ATTRIB_PURE; __CRT_INLINE int __cdecl __signbit (double x) { unsigned short stw; __fxam(x, stw); Modified: branches/ros-amd64-bringup/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/commctrl.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/commctrl.h [iso-8859-1] Sat Jan 23 05:18:57 2010 @@ -2809,7 +2809,7 @@ (LPARAM)(HTREEITEM)(hitem)) #define TreeView_EnsureVisible(hwnd, hitem) \ - (BOOL)SNDMSG((hwnd), TVM_ENSUREVISIBLE, 0, (LPARAM)(UINT)(hitem)) + (BOOL)SNDMSG((hwnd), TVM_ENSUREVISIBLE, 0, (LPARAM)(hitem)) #define TreeView_SortChildrenCB(hwnd, psort, recurse) \ (BOOL)SNDMSG((hwnd), TVM_SORTCHILDRENCB, (WPARAM)recurse, \ Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] Sat Jan 23 05:18:57 2010 @@ -16,7 +16,7 @@ #include "../ARM3/miarm.h" -#ifndef KDBG +#ifdef _WINKD_ extern PMMPTE MmDebugPte; #endif @@ -448,7 +448,7 @@ MmFirstReservedMappingPte->u.Hard.PageFrameNumber = MI_HYPERSPACE_PTES; MmLastReservedMappingPte = MiAddressToPte((PVOID)MI_MAPPING_RANGE_END); -#ifndef KDBG +#ifdef _WINKD_ /* Setup debug mapping PTE */ MmDebugPte = MxGetPte(MI_DEBUG_MAPPING); #endif Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/rbuild.vcproj URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/rbuild.vcproj [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/rbuild.vcproj [iso-8859-1] Sat Jan 23 05:18:57 2010 @@ -137,6 +137,7 @@ BasicRuntimeChecks="3" RuntimeLibrary="1" DefaultCharIsUnsigned="true" + OpenMP="true" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Debug/rbuild.pch" AssemblerListingLocation=".\Debug/"

1 0

[fireball] 45207: - Sync up to Wine-1.1.37.
by fireball＠svn.reactos.org 22 Jan '10

22 Jan '10

Author: fireball Date: Fri Jan 22 23:40:03 2010 New Revision: 45207 URL: http://svn.reactos.org/svn/reactos?rev=45207&view=rev Log: - Sync up to Wine-1.1.37. Modified: branches/arwinss/reactos/dll/win32/gdi32/ (props changed) branches/arwinss/reactos/dll/win32/gdi32/freetype.c branches/arwinss/reactos/dll/win32/user32/ (props changed) branches/arwinss/reactos/dll/win32/user32/defwnd.c branches/arwinss/reactos/dll/win32/user32/input.c branches/arwinss/reactos/dll/win32/user32/menu.c branches/arwinss/reactos/dll/win32/user32/misc.c branches/arwinss/reactos/dll/win32/user32/scroll.c branches/arwinss/reactos/dll/win32/winex11.drv/ (props changed) branches/arwinss/reactos/dll/win32/winex11.drv/keyboard.c branches/arwinss/reactos/dll/win32/winex11.drv/systray.c branches/arwinss/reactos/subsystems/win32/win32k/wine/ (props changed) branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c Propchange: branches/arwinss/reactos/dll/win32/gdi32/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jan 22 23:40:03 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/win32/gdi32:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 /trunk/reactos/dll/win32/gdi32:42000-44999,45097-45099 -/vendor/wine/dlls/gdi32/current:43136,43149,43398,43708,44151,44715,45044 +/vendor/wine/dlls/gdi32/current:43136,43149,43398,43708,44151,44715,45044,45206 Modified: branches/arwinss/reactos/dll/win32/gdi32/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/freetype.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/freetype.c [iso-8859-1] Fri Jan 22 23:40:03 2010 @@ -2246,7 +2246,7 @@ BOOL WineEngRemoveFontResourceEx(LPCWSTR file, DWORD flags, PVOID pdv) { GDI_CheckNotLock(); - FIXME(":stub\n"); + FIXME("(%s, %x, %p): stub\n", debugstr_w(file), flags, pdv); return TRUE; } @@ -6761,25 +6761,25 @@ INT WineEngAddFontResourceEx(LPCWSTR file, DWORD flags, PVOID pdv) { - FIXME(":stub\n"); + FIXME("(%s, %x, %p): stub\n", debugstr_w(file), flags, pdv); return 1; } INT WineEngRemoveFontResourceEx(LPCWSTR file, DWORD flags, PVOID pdv) { - FIXME(":stub\n"); + FIXME("(%s, %x, %p): stub\n", debugstr_w(file), flags, pdv); return TRUE; } HANDLE WineEngAddFontMemResourceEx(PVOID pbFont, DWORD cbFont, PVOID pdv, DWORD *pcFonts) { - FIXME(":stub\n"); + FIXME("(%p, %u, %p, %p): stub\n", pbFont, cbFont, pdv, pcFonts); return NULL; } UINT WineEngGetTextCharsetInfo(GdiFont *font, LPFONTSIGNATURE fs, DWORD flags) { - FIXME(":stub\n"); + FIXME("(%p, %p, %u): stub\n", font, fs, flags); return DEFAULT_CHARSET; } Propchange: branches/arwinss/reactos/dll/win32/user32/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jan 22 23:40:03 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/win32/user32:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 /trunk/reactos/dll/win32/user32:42000-44999,45097-45099 -/vendor/wine/dlls/user32/current:43136,43149,43398,43708,44151,44715,45044 +/vendor/wine/dlls/user32/current:43136,43149,43398,43708,44151,44715,45044,45206 Modified: branches/arwinss/reactos/dll/win32/user32/defwnd.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/defwnd.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/defwnd.c [iso-8859-1] Fri Jan 22 23:40:03 2010 @@ -561,7 +561,11 @@ } } else if( wParam == VK_F10 ) + { + if (GetKeyState(VK_SHIFT) & 0x8000) + SendMessageW( hwnd, WM_CONTEXTMENU, (WPARAM)hwnd, MAKELPARAM(-1, -1) ); iF10Key = 1; + } else if( wParam == VK_ESCAPE && (GetKeyState(VK_SHIFT) & 0x8000)) SendMessageW( hwnd, WM_SYSCOMMAND, SC_KEYMENU, ' ' ); break; Modified: branches/arwinss/reactos/dll/win32/user32/input.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/input.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/input.c [iso-8859-1] Fri Jan 22 23:40:03 2010 @@ -101,12 +101,15 @@ } SERVER_END_REQ; - USER_Driver->pSetCapture( hwnd, gui_flags ); - - if (previous && previous != hwnd) - SendMessageW( previous, WM_CAPTURECHANGED, 0, (LPARAM)hwnd ); - - if (prev_ret) *prev_ret = previous; + if (ret) + { + USER_Driver->pSetCapture( hwnd, gui_flags ); + + if (previous && previous != hwnd) + SendMessageW( previous, WM_CAPTURECHANGED, 0, (LPARAM)hwnd ); + + if (prev_ret) *prev_ret = previous; + } return ret; } @@ -226,7 +229,7 @@ */ HWND WINAPI DECLSPEC_HOTPATCH SetCapture( HWND hwnd ) { - HWND previous; + HWND previous = 0; set_capture_window( hwnd, 0, &previous ); return previous; @@ -241,7 +244,7 @@ BOOL ret = set_capture_window( 0, 0, NULL ); /* Somebody may have missed some mouse movements */ - mouse_event( MOUSEEVENTF_MOVE, 0, 0, 0, 0 ); + if (ret) mouse_event( MOUSEEVENTF_MOVE, 0, 0, 0, 0 ); return ret; } Modified: branches/arwinss/reactos/dll/win32/user32/menu.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/menu.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/menu.c [iso-8859-1] Fri Jan 22 23:40:03 2010 @@ -3120,6 +3120,7 @@ switch(msg.wParam) { case VK_MENU: + case VK_F10: fEndMenu = TRUE; break; Modified: branches/arwinss/reactos/dll/win32/user32/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/misc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/misc.c [iso-8859-1] Fri Jan 22 23:40:03 2010 @@ -521,8 +521,8 @@ */ HDEVNOTIFY WINAPI RegisterDeviceNotificationA(HANDLE hnd, LPVOID notifyfilter, DWORD flags) { - FIXME("(hwnd=%p, filter=%p,flags=0x%08x),\n" - "\treturns a fake device notification handle!\n", hnd,notifyfilter,flags ); + FIXME("(hwnd=%p, filter=%p,flags=0x%08x) returns a fake device notification handle!\n", + hnd,notifyfilter,flags ); return (HDEVNOTIFY) 0xcafecafe; } @@ -551,8 +551,8 @@ */ HDEVNOTIFY WINAPI RegisterDeviceNotificationW(HANDLE hRecepient, LPVOID pNotificationFilter, DWORD dwFlags) { - FIXME("(hwnd=%p, filter=%p,flags=0x%08x),\n" - "\treturns a fake device notification handle!\n", hRecepient,pNotificationFilter,dwFlags ); + FIXME("(hwnd=%p, filter=%p,flags=0x%08x) returns a fake device notification handle!\n", + hRecepient,pNotificationFilter,dwFlags ); return (HDEVNOTIFY) 0xcafeaffe; } Modified: branches/arwinss/reactos/dll/win32/user32/scroll.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/scroll.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/scroll.c [iso-8859-1] Fri Jan 22 23:40:03 2010 @@ -317,6 +317,7 @@ { INT thumbSize; INT pixels = vertical ? rect->bottom-rect->top : rect->right-rect->left; + INT range; if ((pixels -= 2*(GetSystemMetrics(SM_CXVSCROLL) - SCROLL_ARROW_THUMB_OVERLAP)) <= 0) return infoPtr->minVal; @@ -333,9 +334,12 @@ pos = max( 0, pos - (GetSystemMetrics(SM_CXVSCROLL) - SCROLL_ARROW_THUMB_OVERLAP) ); if (pos > pixels) pos = pixels; - if (!infoPtr->page) pos *= infoPtr->maxVal - infoPtr->minVal; - else pos *= infoPtr->maxVal - infoPtr->minVal - infoPtr->page + 1; - return infoPtr->minVal + ((pos + pixels / 2) / pixels); + if (!infoPtr->page) + range = infoPtr->maxVal - infoPtr->minVal; + else + range = infoPtr->maxVal - infoPtr->minVal - infoPtr->page + 1; + + return infoPtr->minVal + MulDiv(pos, range, pixels); } /*********************************************************************** Propchange: branches/arwinss/reactos/dll/win32/winex11.drv/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jan 22 23:40:03 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/win32/winex11.drv:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 /trunk/reactos/dll/win32/winex11.drv:42000-44999,45097-45099 -/vendor/wine/dlls/winex11.drv/current:43149,43398,43708,44151,44715,45044 +/vendor/wine/dlls/winex11.drv/current:43149,43398,43708,44151,44715,45044,45206 Modified: branches/arwinss/reactos/dll/win32/winex11.drv/keyboard.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/keyboard.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/keyboard.c [iso-8859-1] Fri Jan 22 23:40:03 2010 @@ -1141,6 +1141,11 @@ * depending on the NumLock state */ return nonchar_key_vkey[keysym & 0xFF]; + /* Pressing the Pause/Break key alone produces VK_PAUSE vkey, while + * pressing Ctrl+Pause/Break produces VK_CANCEL. */ + if ((e->state & ControlMask) && (keysym == XK_Break)) + return VK_CANCEL; + TRACE_(key)("e->keycode = %x\n", e->keycode); return keyc2vkey[e->keycode]; Modified: branches/arwinss/reactos/dll/win32/winex11.drv/systray.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/systray.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/systray.c [iso-8859-1] Fri Jan 22 23:40:03 2010 @@ -344,7 +344,7 @@ if (icon->window) { struct x11drv_win_data *data = X11DRV_get_win_data( icon->window ); - if (data) XClearArea( gdi_display, data->client_window, 0, 0, 0, 0, True ); + if (data) XClearArea( thread_display(), data->client_window, 0, 0, 0, 0, True ); } } Propchange: branches/arwinss/reactos/subsystems/win32/win32k/wine/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jan 22 23:40:03 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/wine:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 /trunk/reactos/subsystems/win32/win32k/wine:42000-43126,43669-44999,45097-45099 -/vendor/wine/server/current:43708,44715,45044 +/vendor/wine/server/current:43708,44715,45044,45206 Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c [iso-8859-1] Fri Jan 22 23:40:03 2010 @@ -2285,6 +2285,12 @@ { struct thread_input *input = queue->input; + /* if in menu mode, reject all requests to change focus, except if the menu bit is set */ + if (input->menu_owner && !(req->flags & CAPTURE_MENU)) + { + set_error(STATUS_ACCESS_DENIED); + return; + } reply->previous = input->capture; input->capture = get_user_full_handle( req->handle ); input->menu_owner = (req->flags & CAPTURE_MENU) ? input->capture : 0;

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
53
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2010