ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
December 2012
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
12 participants
287 discussions
Start a n
N
ew thread
[fireball] 58062: [RAPPS] - Fix MPC download url. Patch CORE-6849 by serrox.
by fireball@svn.reactos.org
Author: fireball Date: Sun Dec 30 19:53:50 2012 New Revision: 58062 URL:
http://svn.reactos.org/svn/reactos?rev=58062&view=rev
Log: [RAPPS] - Fix MPC download url. Patch CORE-6849 by serrox. Modified: trunk/reactos/base/applications/rapps/rapps/mpc.txt Modified: trunk/reactos/base/applications/rapps/rapps/mpc.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra…
============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mpc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mpc.txt [iso-8859-1] Sun Dec 30 19:53:50 2012 @@ -8,7 +8,7 @@ Size = 7.0MB Category = 1 URLSite =
http://mpc-hc.sourceforge.net/
-URLDownload =
http://heanet.dl.sourceforge.netproject/mpc-hc/MPC%20HomeCinema%20-%20Win32…
+URLDownload =
http://heanet.dl.sourceforge.net/project/mpc-hc/MPC%20HomeCinema%20-%20Win3…
CDPath = none [Section.0407]
11 years, 11 months
1
0
0
0
[tkreuzer] 58061: [WIN32K] Add more ASSERTs
by tkreuzer@svn.reactos.org
Author: tkreuzer Date: Sun Dec 30 19:11:22 2012 New Revision: 58061 URL:
http://svn.reactos.org/svn/reactos?rev=58061&view=rev
Log: [WIN32K] Add more ASSERTs Modified: branches/dib_rewrite/win32ss/gdi/eng/bitblt_new.c branches/dib_rewrite/win32ss/gdi/eng/pdevobj.h branches/dib_rewrite/win32ss/gdi/eng/surface.c branches/dib_rewrite/win32ss/gdi/eng/surface.h branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c Modified: branches/dib_rewrite/win32ss/gdi/eng/bitblt_new.c URL:
http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/eng/bit…
============================================================================== --- branches/dib_rewrite/win32ss/gdi/eng/bitblt_new.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/eng/bitblt_new.c [iso-8859-1] Sun Dec 30 19:11:22 2012 @@ -132,6 +132,9 @@ ASSERT(prclTrg->top >= 0); ASSERT(prclTrg->right <= psoTrg->sizlBitmap.cx); ASSERT(prclTrg->bottom <= psoTrg->sizlBitmap.cy); + ASSERT_DEVLOCK(psoTrg); + ASSERT_DEVLOCK(psoSrc); + ASSERT_DEVLOCK(psoMask); rcTrg = *prclTrg; Modified: branches/dib_rewrite/win32ss/gdi/eng/pdevobj.h URL:
http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/eng/pde…
============================================================================== --- branches/dib_rewrite/win32ss/gdi/eng/pdevobj.h [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/eng/pdevobj.h [iso-8859-1] Sun Dec 30 19:11:22 2012 @@ -190,4 +190,11 @@ _In_ PPDEVOBJ ppdev, _Out_ PSIZEL psizl); +BOOL +FORCEINLINE +PDEVOBJ_bLockIsOwned(PPDEVOBJ ppdev) +{ + return ExIsResourceAcquiredExclusiveLite((PERESOURCE)ppdev->hsemDevLock); +} + #endif /* !__WIN32K_PDEVOBJ_H */ Modified: branches/dib_rewrite/win32ss/gdi/eng/surface.c URL:
http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/eng/sur…
============================================================================== --- branches/dib_rewrite/win32ss/gdi/eng/surface.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/eng/surface.c [iso-8859-1] Sun Dec 30 19:11:22 2012 @@ -291,6 +291,17 @@ return BI_BITFIELDS; } +BOOL +NTAPI +SURFACE_bIsDeviceSurface( + _In_ PSURFACE psurf) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)psurf->SurfObj.hdev; + + /* Check if the surface is the related PDEVOBJ's surface */ + return ((ppdev != 0) && (psurf == ppdev->pSurface)); +} + HBITMAP APIENTRY EngCreateBitmap( Modified: branches/dib_rewrite/win32ss/gdi/eng/surface.h URL:
http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/eng/sur…
============================================================================== --- branches/dib_rewrite/win32ss/gdi/eng/surface.h [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/eng/surface.h [iso-8859-1] Sun Dec 30 19:11:22 2012 @@ -81,6 +81,8 @@ PDEV_SURFACE = 0x80000000 }; +#define SURFOBJ_TO_SURFACE(pso) CONTAINING_RECORD(pso, SURFACE, SurfObj) + #define BMF_POOLALLOC 0x100 #define PDEV_SURFACE 0x80000000 @@ -131,6 +133,17 @@ SURFACE_iCompression( _In_ PSURFACE psurf); +BOOL +NTAPI +SURFACE_bIsDeviceSurface( + _In_ PSURFACE psurf); + +#define SURFOBJ_bIsDeviceSurface(pso) \ + SURFACE_bIsDeviceSurface(SURFOBJ_TO_SURFACE(pso)) + +#define ASSERT_DEVLOCK(pso) \ + ASSERT(!pso || !SURFOBJ_bIsDeviceSurface(pso) || \ + PDEVOBJ_bLockIsOwned((PPDEVOBJ)pso->hdev)) VOID @@ -146,3 +159,4 @@ *(PVOID*)&psurf->ppal = ppal; } + Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c URL:
http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/d…
============================================================================== --- branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c [iso-8859-1] Sun Dec 30 19:11:22 2012 @@ -1092,7 +1092,6 @@ if ((pbmi->bmiHeader.biSize < sizeof(BITMAPINFOHEADER)) || (pbmi->bmiHeader.biSize > cjMaxInfo)) { - iResult = 0; goto cleanup; }
11 years, 11 months
1
0
0
0
[tkreuzer] 58060: [PSEH3] Tiny asm optimization.
by tkreuzer@svn.reactos.org
Author: tkreuzer Date: Sun Dec 30 19:02:54 2012 New Revision: 58060 URL:
http://svn.reactos.org/svn/reactos?rev=58060&view=rev
Log: [PSEH3] Tiny asm optimization. Modified: trunk/reactos/include/reactos/libs/pseh/pseh3.h Modified: trunk/reactos/include/reactos/libs/pseh/pseh3.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/…
============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh3.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh3.h [iso-8859-1] Sun Dec 30 19:02:54 2012 @@ -95,18 +95,20 @@ /* This is an asm wrapper around _SEH3$_RegisterFrame */ #define _SEH3$_RegisterFrame(_TrylevelFrame, _DataTable, _Target) \ - asm goto ("call __SEH3$_RegisterFrame\n" \ + asm goto ("leal %0, %%ecx\n" \ + "call __SEH3$_RegisterFrame\n" \ : \ - : "c" (_TrylevelFrame), "a" (_DataTable) \ - : "edx", "memory" \ + : "m" (*(_TrylevelFrame)), "a" (_DataTable) \ + : "ecx", "edx", "memory" \ : _Target) /* This is an asm wrapper around _SEH3$_EnterTryLevel */ #define _SEH3$_RegisterTryLevel(_TrylevelFrame, _DataTable, _Target) \ - asm goto ("call __SEH3$_RegisterTryLevel\n" \ + asm goto ("leal %0, %%ecx\n" \ + "call __SEH3$_RegisterTryLevel\n" \ : \ - : "c" (_TrylevelFrame), "a" (_DataTable) \ - : "edx", "memory" \ + : "m" (*(_TrylevelFrame)), "a" (_DataTable) \ + : "ecx", "edx", "memory" \ : _Target) /* On GCC the filter function is a nested function with __fastcall calling
11 years, 11 months
1
0
0
0
[tkreuzer] 58059: [PSEH3] Apply the same mechanism to prevent inlining SEH using functions that was already applied to PSEH2.
by tkreuzer@svn.reactos.org
Author: tkreuzer Date: Sun Dec 30 18:01:34 2012 New Revision: 58059 URL:
http://svn.reactos.org/svn/reactos?rev=58059&view=rev
Log: [PSEH3] Apply the same mechanism to prevent inlining SEH using functions that was already applied to PSEH2. Modified: trunk/reactos/include/reactos/libs/pseh/pseh3.h Modified: trunk/reactos/include/reactos/libs/pseh/pseh3.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/…
============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh3.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh3.h [iso-8859-1] Sun Dec 30 18:01:34 2012 @@ -44,6 +44,9 @@ unsigned long Ebp; } SEH3$_REGISTRATION_FRAME ,*PSEH3$_REGISTRATION_FRAME; + +/* Prevent gcc from inlining functions that use SEH. */ +static inline __attribute__((always_inline)) __attribute__((returns_twice)) void _SEH3$_PreventInlining() {} extern inline __attribute__((always_inline,gnu_inline)) void _SEH3$_UnregisterFrame(volatile SEH3$_REGISTRATION_FRAME *RegistrationFrame) @@ -174,6 +177,7 @@ #define _SEH3_TRY \ + _SEH3$_PreventInlining(); \ /* Enter the outer scope */ \ do { \ /* Declare local labels */ \
11 years, 12 months
1
0
0
0
[ekohl] 58058: [INCLUDE] Add some user information types to ntsam.h and fix sam.idl accordingly.
by ekohl@svn.reactos.org
Author: ekohl Date: Sun Dec 30 17:28:21 2012 New Revision: 58058 URL:
http://svn.reactos.org/svn/reactos?rev=58058&view=rev
Log: [INCLUDE] Add some user information types to ntsam.h and fix sam.idl accordingly. Modified: trunk/reactos/include/ddk/ntsam.h trunk/reactos/include/reactos/idl/sam.idl Modified: trunk/reactos/include/ddk/ntsam.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntsam.h?rev=58…
============================================================================== --- trunk/reactos/include/ddk/ntsam.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntsam.h [iso-8859-1] Sun Dec 30 17:28:21 2012 @@ -192,6 +192,39 @@ #define SAM_HOURS_PER_WEEK (24 * SAM_DAYS_PER_WEEK) #define SAM_MINUTES_PER_WEEK (60 * SAM_HOURS_PER_WEEK) +/* Flags used in USER_ALL_INFORMATION.WhichField */ +#define USER_ALL_USERNAME 0x00000001 +#define USER_ALL_FULLNAME 0x00000002 +#define USER_ALL_USERID 0x00000004 +#define USER_ALL_PRIMARYGROUPID 0x00000008 +#define USER_ALL_ADMINCOMMENT 0x00000010 +#define USER_ALL_USERCOMMENT 0x00000020 +#define USER_ALL_HOMEDIRECTORY 0x00000040 +#define USER_ALL_HOMEDIRECTORYDRIVE 0x00000080 +#define USER_ALL_SCRIPTPATH 0x00000100 +#define USER_ALL_PROFILEPATH 0x00000200 +#define USER_ALL_WORKSTATIONS 0x00000400 +#define USER_ALL_LASTLOGON 0x00000800 +#define USER_ALL_LASTLOGOFF 0x00001000 +#define USER_ALL_LOGONHOURS 0x00002000 +#define USER_ALL_BADPASSWORDCOUNT 0x00004000 +#define USER_ALL_LOGONCOUNT 0x00008000 +#define USER_ALL_PASSWORDCANCHANGE 0x00010000 +#define USER_ALL_PASSWORDMUSTCHANGE 0x00020000 +#define USER_ALL_PASSWORDLASTSET 0x00040000 +#define USER_ALL_ACCOUNTEXPIRES 0x00080000 +#define USER_ALL_USERACCOUNTCONTROL 0x00100000 +#define USER_ALL_PARAMETERS 0x00200000 +#define USER_ALL_COUNTRYCODE 0x00400000 +#define USER_ALL_CODEPAGE 0x00800000 +#define USER_ALL_NTPASSWORDPRESENT 0x01000000 +#define USER_ALL_LMPASSWORDPRESENT 0x02000000 +#define USER_ALL_PRIVATEDATA 0x04000000 +#define USER_ALL_PASSWORDEXPIRED 0x08000000 +#define USER_ALL_SECURITYDESCRIPTOR 0x10000000 +#define USER_ALL_OWFPASSWORD 0x20000000 +#define USER_ALL_UNDEFINED_MASK 0xC0000000 + typedef PVOID SAM_HANDLE, *PSAM_HANDLE; typedef ULONG SAM_ENUMERATE_HANDLE, *PSAM_ENUMERATE_HANDLE; @@ -344,6 +377,12 @@ USHORT UnitsPerWeek; PUCHAR LogonHours; } LOGON_HOURS, *PLOGON_HOURS; + +typedef struct _SR_SECURITY_DESCRIPTOR +{ + ULONG Length; + PUCHAR SecurityDescriptor; +} SR_SECURITY_DESCRIPTOR, *PSR_SECURITY_DESCRIPTOR; typedef enum _USER_INFORMATION_CLASS { @@ -506,6 +545,55 @@ ULONG UserAccountControl; } USER_CONTROL_INFORMATION, *PUSER_CONTROL_INFORMATION; +typedef struct _USER_EXPIRES_INFORMATION +{ + LARGE_INTEGER AccountExpires; +} USER_EXPIRES_INFORMATION, *PUSER_EXPIRES_INFORMATION; + +typedef struct _USER_PARAMETERS_INFORMATION +{ + UNICODE_STRING Parameters; +} USER_PARAMETERS_INFORMATION, *PUSER_PARAMETERS_INFORMATION; + +#include "pshpack4.h" +typedef struct _USER_ALL_INFORMATION +{ + LARGE_INTEGER LastLogon; + LARGE_INTEGER LastLogoff; + LARGE_INTEGER PasswordLastSet; + LARGE_INTEGER AccountExpires; + LARGE_INTEGER PasswordCanChange; + LARGE_INTEGER PasswordMustChange; + UNICODE_STRING UserName; + UNICODE_STRING FullName; + UNICODE_STRING HomeDirectory; + UNICODE_STRING HomeDirectoryDrive; + UNICODE_STRING ScriptPath; + UNICODE_STRING ProfilePath; + UNICODE_STRING AdminComment; + UNICODE_STRING WorkStations; + UNICODE_STRING UserComment; + UNICODE_STRING Parameters; + UNICODE_STRING LmPassword; + UNICODE_STRING NtPassword; + UNICODE_STRING PrivateData; + SR_SECURITY_DESCRIPTOR SecurityDescriptor; + ULONG UserId; + ULONG PrimaryGroupId; + ULONG UserAccountControl; + ULONG WhichFields; + LOGON_HOURS LogonHours; + USHORT BadPasswordCount; + USHORT LogonCount; + USHORT CountryCode; + USHORT CodePage; + BOOLEAN LmPasswordPresent; + BOOLEAN NtPasswordPresent; + BOOLEAN PasswordExpired; + BOOLEAN PrivateDataSensitive; +} USER_ALL_INFORMATION, *PUSER_ALL_INFORMATION; +#include "poppack.h" + #define SAM_SID_COMPATIBILITY_ALL 0 #define SAM_SID_COMPATIBILITY_LAX 1 Modified: trunk/reactos/include/reactos/idl/sam.idl URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/sam.id…
============================================================================== --- trunk/reactos/include/reactos/idl/sam.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/sam.idl [iso-8859-1] Sun Dec 30 17:28:21 2012 @@ -459,12 +459,12 @@ { unsigned long UserAccountControl; } USER_CONTROL_INFORMATION, *PUSER_CONTROL_INFORMATION; -cpp_quote("#endif") typedef struct _USER_EXPIRES_INFORMATION { OLD_LARGE_INTEGER AccountExpires; } USER_EXPIRES_INFORMATION, *PUSER_EXPIRES_INFORMATION; +cpp_quote("#endif") typedef struct _SAMPR_LOGON_HOURS {
11 years, 12 months
1
0
0
0
[tkreuzer] 58057: [PSEH3] Hack the hack a bit more. Should fix annoying warnings about possible uninitialized variables. Also generates smaller code, by getting rid of a stray relative jump instruc...
by tkreuzer@svn.reactos.org
Author: tkreuzer Date: Sun Dec 30 17:11:02 2012 New Revision: 58057 URL:
http://svn.reactos.org/svn/reactos?rev=58057&view=rev
Log: [PSEH3] Hack the hack a bit more. Should fix annoying warnings about possible uninitialized variables. Also generates smaller code, by getting rid of a stray relative jump instruction. Modified: trunk/reactos/include/reactos/libs/pseh/pseh3.h Modified: trunk/reactos/include/reactos/libs/pseh/pseh3.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/…
============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh3.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh3.h [iso-8859-1] Sun Dec 30 17:11:02 2012 @@ -165,10 +165,12 @@ around into places that are never executed. */ #define _SEH3$_SCARE_GCC() \ void *plabel; \ + _SEH3$_ASM_GOTO("#\n", _SEH3$_l_BeforeTry); \ _SEH3$_ASM_GOTO("#\n", _SEH3$_l_HandlerTarget); \ + _SEH3$_ASM_GOTO("#\n", _SEH3$_l_OnException); \ asm volatile ("#" : "=a"(plabel) : "p"(&&_SEH3$_l_BeforeTry), "p"(&&_SEH3$_l_HandlerTarget), "p"(&&_SEH3$_l_OnException) \ : _SEH3$_CLOBBER_ON_EXCEPTION ); \ - goto *plabel; + goto _SEH3$_l_OnException; #define _SEH3_TRY \
11 years, 12 months
1
0
0
0
[tkreuzer] 58056: [PSEH2_TEST] Fix build with PSEH3
by tkreuzer@svn.reactos.org
Author: tkreuzer Date: Sun Dec 30 13:35:30 2012 New Revision: 58056 URL:
http://svn.reactos.org/svn/reactos?rev=58056&view=rev
Log: [PSEH2_TEST] Fix build with PSEH3 Modified: trunk/rostests/tests/pseh2/psehtest.c Modified: trunk/rostests/tests/pseh2/psehtest.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/tests/pseh2/psehtest.c?re…
============================================================================== --- trunk/rostests/tests/pseh2/psehtest.c [iso-8859-1] (original) +++ trunk/rostests/tests/pseh2/psehtest.c [iso-8859-1] Sun Dec 30 13:35:30 2012 @@ -2410,6 +2410,112 @@ //}}} //}}} +DEFINE_TEST(test_unvolatile) +{ + int val = 0; + + _SEH2_TRY + { + val = return_one(); + *((char*)0xc0000000) = 0; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + val = val + 3; + } + _SEH2_END; + + return (val == 4); +} + +DEFINE_TEST(test_unvolatile_2) +{ + int val = 0; + + _SEH2_TRY + { + val = 1; + *((char*)0xc0000000) = 0; + val = 2; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + val = val + 3; + } + _SEH2_END; + + return (val == 3) || (val == 4) || (val == 5); +} + +DEFINE_TEST(test_finally_goto) +{ + volatile int val = 0; + + _SEH2_TRY + { + val |= 1; + _SEH2_TRY + { + val |= 2; + goto next; + } + _SEH2_FINALLY + { + val |= 4; + *((char*)0xdeadc0de) = 0; + val |= 8; + } + _SEH2_END; + + val |= 16; +next: + val |= 32; + *((char*)0xdeadc0de) = 0; + val |= 64; + } + _SEH2_EXCEPT(1) + { + val |= 128; + } + _SEH2_END; + + return (val == (128|4|2|1)); +} + +DEFINE_TEST(test_nested_exception) +{ + volatile int val = 0; + + _SEH2_TRY + { + val |= 1; + _SEH2_TRY + { + val |= 2; + *((char*)0xdeadc0de) = 0; + val |= 4; + } + _SEH2_EXCEPT(1) + { + val |= 8; + *((char*)0xdeadc0de) = 0; + val |= 16; + } + _SEH2_END; + + val |= 32; + *((char*)0xdeadc0de) = 0; + val |= 64; + } + _SEH2_EXCEPT(1) + { + val |= 128; + } + _SEH2_END; + + return (val == (1|2|8|128)); +} + static LONG WINAPI unhandled_exception(PEXCEPTION_POINTERS ExceptionInfo) { @@ -2446,11 +2552,13 @@ return ret; } +#ifndef _PSEH3_H_ static int passthrough_handler(struct _EXCEPTION_RECORD * e, void * f, struct _CONTEXT * c, void * d) { return ExceptionContinueSearch; } +#endif static DECLSPEC_NOINLINE @@ -2459,12 +2567,14 @@ static int ret; static struct volatile_context before, after; static LPTOP_LEVEL_EXCEPTION_FILTER prev_unhandled_exception; +#ifndef _PSEH3_H_ static _SEH2Registration_t * prev_frame; _SEH2Registration_t passthrough_frame; +#endif prev_unhandled_exception = SetUnhandledExceptionFilter(&unhandled_exception); -#if defined(_X86_) +#if defined(_X86_) && !defined(_PSEH3_H_) prev_frame = (_SEH2Registration_t *)__readfsdword(0); passthrough_frame.SER_Prev = prev_frame; passthrough_frame.SER_Handler = passthrough_handler; @@ -2500,7 +2610,7 @@ ret = func(); #endif -#if defined(_X86_) +#if defined(_X86_) && !defined(_PSEH3_H_) if((_SEH2Registration_t *)__readfsdword(0) != &passthrough_frame || passthrough_frame.SER_Prev != prev_frame) { trace("exception registration list corrupted\n"); @@ -2638,6 +2748,11 @@ USE_TEST(test_bug_4004), USE_TEST(test_bug_4663), + + USE_TEST(test_unvolatile), + USE_TEST(test_unvolatile_2), + USE_TEST(test_finally_goto), + USE_TEST(test_nested_exception), }; size_t i;
11 years, 12 months
1
0
0
0
[hbelusca] 58055: [KERNEL32-CONSRV] * HANDLE_TYPE --> CONSOLE_HANDLE_TYPE because it hits "previous" definition of this enumeration (a totally different one from win32ss/include/ntuser.h) * Tempora...
by hbelusca@svn.reactos.org
Author: hbelusca Date: Sun Dec 30 13:25:50 2012 New Revision: 58055 URL:
http://svn.reactos.org/svn/reactos?rev=58055&view=rev
Log: [KERNEL32-CONSRV] * HANDLE_TYPE --> CONSOLE_HANDLE_TYPE because it hits "previous" definition of this enumeration (a totally different one from win32ss/include/ntuser.h) * Temporarily add a dummy member to the CONSOLE_CONNECTION_INFO structure, to make MSVC happy. Modified: branches/ros-csrss/dll/win32/kernel32/client/console/console.c branches/ros-csrss/include/reactos/subsys/win/conmsg.h Modified: branches/ros-csrss/dll/win32/kernel32/client/console/console.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl…
============================================================================== --- branches/ros-csrss/dll/win32/kernel32/client/console/console.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/kernel32/client/console/console.c [iso-8859-1] Sun Dec 30 13:25:50 2012 @@ -399,7 +399,7 @@ NTSTATUS Status = STATUS_SUCCESS; CONSOLE_API_MESSAGE ApiMessage; PCSRSS_OPEN_CONSOLE OpenConsoleRequest = &ApiMessage.Data.OpenConsoleRequest; - HANDLE_TYPE HandleType; + CONSOLE_HANDLE_TYPE HandleType; if (wsName && 0 == _wcsicmp(wsName, L"CONIN$")) { Modified: branches/ros-csrss/include/reactos/subsys/win/conmsg.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy…
============================================================================== --- branches/ros-csrss/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/win/conmsg.h [iso-8859-1] Sun Dec 30 13:25:50 2012 @@ -114,7 +114,7 @@ typedef struct _CONSOLE_CONNECTION_INFO { - + ULONG Dummy; } CONSOLE_CONNECTION_INFO, *PCONSOLE_CONNECTION_INFO; @@ -369,16 +369,16 @@ /* * Type of handles. */ -typedef enum _HANDLE_TYPE +typedef enum _CONSOLE_HANDLE_TYPE { HANDLE_INPUT = 0x01, HANDLE_OUTPUT = 0x02 -} HANDLE_TYPE; +} CONSOLE_HANDLE_TYPE; typedef struct { HANDLE Handle; - HANDLE_TYPE HandleType; + CONSOLE_HANDLE_TYPE HandleType; DWORD Access; BOOL Inheritable; DWORD ShareMode;
11 years, 12 months
1
0
0
0
[tkreuzer] 58054: [GDI32_APITEST] Fix a warning and improve code.
by tkreuzer@svn.reactos.org
Author: tkreuzer Date: Sun Dec 30 13:21:52 2012 New Revision: 58054 URL:
http://svn.reactos.org/svn/reactos?rev=58054&view=rev
Log: [GDI32_APITEST] Fix a warning and improve code. Modified: trunk/rostests/apitests/gdi32/CombineTransform.c trunk/rostests/apitests/gdi32/SetDCPenColor.c Modified: trunk/rostests/apitests/gdi32/CombineTransform.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CombineTra…
============================================================================== --- trunk/rostests/apitests/gdi32/CombineTransform.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CombineTransform.c [iso-8859-1] Sun Dec 30 13:21:52 2012 @@ -51,26 +51,21 @@ void Test_CombineTransform() { XFORM xform1, xform2, xform3; - BOOL ret; /* Test NULL paramters */ set_xform(&xform1, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); set_xform(&xform2, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); SetLastError(ERROR_SUCCESS); - ret = CombineTransform(&xform3, &xform1, NULL); - ok_int(ret, 0); - ret = CombineTransform(&xform3, NULL, &xform2); - ok_int(ret, 0); - ret = CombineTransform(NULL, &xform1, &xform2); - ok_int(ret, 0); + ok_int(CombineTransform(&xform3, &xform1, NULL), 0); + ok_int(CombineTransform(&xform3, NULL, &xform2), 0); + ok_int(CombineTransform(NULL, &xform1, &xform2), 0); ok_int(GetLastError(), ERROR_SUCCESS); /* 2 zero matrices */ set_xform(&xform1, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); set_xform(&xform2, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); SetLastError(ERROR_SUCCESS); - ret = CombineTransform(&xform3, &xform1, &xform2); - ok_int(ret, 1); + ok_int(CombineTransform(&xform3, &xform1, &xform2), 1); ok_xform(xform3, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); ok_int(GetLastError(), ERROR_SUCCESS); @@ -78,49 +73,42 @@ set_xform(&xform1, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); set_xform(&xform2, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); SetLastError(ERROR_SUCCESS); - ret = CombineTransform(&xform3, &xform1, &xform2); - ok_int(ret, 1); + ok_int(CombineTransform(&xform3, &xform1, &xform2), 1); ok_xform(xform3, 1.0, 0., 0., 1.0, 0., 0.); ok_int(GetLastError(), ERROR_SUCCESS); /* 2 Identity matrices with offsets */ set_xform(&xform1, 1.0, 0.0, 0.0, 1.0, 20.0, -100.0); set_xform(&xform2, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); - ret = CombineTransform(&xform3, &xform1, &xform2); - ok_int(ret, 1); + ok_int(CombineTransform(&xform3, &xform1, &xform2), 1); ok_xform(xform3, 1.0, 0., 0., 1.0, 20.0, -100.0); xform2.eDx = -60.0; xform2.eDy = -20; - ret = CombineTransform(&xform3, &xform1, &xform2); - ok_int(ret, 1); + ok_int(CombineTransform(&xform3, &xform1, &xform2), 1); ok_flt(xform3.eDx, -40.0); ok_flt(xform3.eDy, -120.0); /* add some stretching */ xform2.eM11 = 2; xform2.eM22 = 4; - ret = CombineTransform(&xform3, &xform1, &xform2); - ok_int(ret, 1); + ok_int(CombineTransform(&xform3, &xform1, &xform2), 1); ok_xform(xform3, 2.0, 0., 0., 4.0, -20.0, -420.0); /* add some more stretching */ xform1.eM11 = -2.5; xform1.eM22 = 0.5; - ret = CombineTransform(&xform3, &xform1, &xform2); - ok_int(ret, 1); + ok_int(CombineTransform(&xform3, &xform1, &xform2), 1); ok_xform(xform3, -5.0, 0., 0., 2.0, -20.0, -420.0); xform1.eM12 = 2.0; xform1.eM21 = -0.5; - ret = CombineTransform(&xform3, &xform1, &xform2); - ok_int(ret, 1); + ok_int(CombineTransform(&xform3, &xform1, &xform2), 1); ok_xform(xform3, -5.0, 8.0, -1.0, 2.0, -20.0, -420.0); xform2.eM12 = 4.0; xform2.eM21 = 6.5; - ret = CombineTransform(&xform3, &xform1, &xform2); - ok_int(ret, 1); + ok_int(CombineTransform(&xform3, &xform1, &xform2), 1); ok_xform(xform3, 8.0, -2.0, 2.25, 0.0, -670.0, -340.0); set_xform(&xform1, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); @@ -128,124 +116,105 @@ set_xform(&xform3, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); xform1.eDx = (FLOAT)4294967167.999999761; ok(xform1.eDx == 4294967040.0, "float rounding error.\n"); - ret = CombineTransform(&xform3, &xform1, &xform2); - ok(ret == 1, "expected ret = 1, got %d\n", ret); + ok_int(CombineTransform(&xform3, &xform1, &xform2), 1); ok_xform(xform3, 1.0, 0.0, 0.0, 1.0, 4294967040.0, 0.0); set_xform(&xform3, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); xform1.eDx = (FLOAT)4294967167.999999762; ok(xform1.eDx == 4294967296.0, "float rounding error.\n"); - ret = CombineTransform(&xform3, &xform1, &xform2); - ok_int(ret, 0); + ok_int(CombineTransform(&xform3, &xform1, &xform2), 0); ok_int(GetLastError(), ERROR_SUCCESS); ok_xform(xform3, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); xform1.eDx = (FLOAT)-4294967167.999999761; ok(xform1.eDx == -4294967040.0, "float rounding error.\n"); - ret = CombineTransform(&xform3, &xform1, &xform2); - ok_int(ret, 1); + ok_int(CombineTransform(&xform3, &xform1, &xform2), 1); xform1.eDx = (FLOAT)-4294967167.999999762; ok(xform1.eDx == -4294967296.0, "float rounding error.\n"); - ret = CombineTransform(&xform3, &xform1, &xform2); - ok_int(ret, 0); + ok_int(CombineTransform(&xform3, &xform1, &xform2), 0); ok_int(GetLastError(), ERROR_SUCCESS); xform1.eDx = 0; xform1.eDy = (FLOAT)4294967167.999999761; ok(xform1.eDy == 4294967040.0, "float rounding error.\n"); - ret = CombineTransform(&xform3, &xform1, &xform2); - ok_int(ret, 1); + ok_int(CombineTransform(&xform3, &xform1, &xform2), 1); xform2.eDy = 1; - ret = CombineTransform(&xform3, &xform1, &xform2); - ok_int(ret, 1); + ok_int(CombineTransform(&xform3, &xform1, &xform2), 1); ok_flt(xform3.eDy, 4294967040.0); xform1.eDy = (FLOAT)4294967167.999999762; ok(xform1.eDy == 4294967296.0, "float rounding error.\n"); - ret = CombineTransform(&xform3, &xform1, &xform2); - ok_int(ret, 0); + ok_int(CombineTransform(&xform3, &xform1, &xform2), 0); ok_int(GetLastError(), ERROR_SUCCESS); xform1.eDy = (FLOAT)-4294967167.999999761; ok(xform1.eDy == -4294967040.0, "float rounding error.\n"); - ret = CombineTransform(&xform3, &xform1, &xform2); - ok_int(ret, 1); + ok_int(CombineTransform(&xform3, &xform1, &xform2), 1); xform1.eDy = (FLOAT)-4294967167.999999762; ok(xform1.eDy == -4294967296.0, "float rounding error.\n"); - ret = CombineTransform(&xform3, &xform1, &xform2); - ok_int(ret, 0); + ok_int(CombineTransform(&xform3, &xform1, &xform2), 0); ok_int(GetLastError(), ERROR_SUCCESS); xform2.eDy = 10000; - ret = CombineTransform(&xform3, &xform1, &xform2); - ok_int(ret, 1); + ok_int(CombineTransform(&xform3, &xform1, &xform2), 1); set_xform(&xform1, 1000.0, 0.0, 0.0, 0.0, 0.0, 0.0); xform1.eDx = (FLOAT)-4294967167.999999762; xform2.eM11 = 1000.0; - ret = CombineTransform(&xform3, &xform1, &xform2); - ok_int(ret, 0); + ok_int(CombineTransform(&xform3, &xform1, &xform2), 0); ok_int(GetLastError(), ERROR_SUCCESS); xform1.eDx = 100000.0; xform2.eM11 = 100000.0; - ret = CombineTransform(&xform3, &xform1, &xform2); - ok_int(ret, 0); + ok_int(CombineTransform(&xform3, &xform1, &xform2), 0); ok_int(GetLastError(), ERROR_SUCCESS); /* Some undefined values */ set_xform(&xform1, geIND, 0.0, 0.0, geINF, 0.0, 0.0); xform2 = xform1; SetLastError(ERROR_SUCCESS); - ret = CombineTransform(&xform3, &xform1, &xform2); - ok_int(ret, 1); + ok_int(CombineTransform(&xform3, &xform1, &xform2), 1); ok_xform(xform3, geIND, 0.0, 0.0, geINF, 0.0, 0.0); ok_int(GetLastError(), ERROR_SUCCESS); set_xform(&xform2, 1.0, 1.0, 1.0, 1.0, 0.0, 0.0); - ret = CombineTransform(&xform3, &xform1, &xform2); - ok_int(ret, 1); + ok_int(CombineTransform(&xform3, &xform1, &xform2), 1); ok_xform(xform3, geIND, geIND, geINF, geINF, 0.0, 0.0); ok_int(GetLastError(), ERROR_SUCCESS); set_xform(&xform1, (FLOAT)18446743500000000000.0, 0.0, 1.0, 0.0, 0.0, 0.0); xform2 = xform1; - ret = CombineTransform(&xform3, &xform1, &xform2); - ok_int(ret, 1); + ok_int(CombineTransform(&xform3, &xform1, &xform2), 1); ok_flt(xform3.eM11, 340282326356119260000000000000000000000.0); xform1.eM11 = (FLOAT)18446745000000000000.0; - ret = CombineTransform(&xform3, &xform1, &xform2); - ok_int(ret, 1); + ok_int(CombineTransform(&xform3, &xform1, &xform2), 1); ok_flt(xform3.eM11, 340282346638528860000000000000000000000.0); xform1.eM11 = (FLOAT)18446746000000000000.0; - ret = CombineTransform(&xform3, &xform1, &xform2); + ok_int(CombineTransform(&xform3, &xform1, &xform2), 1); ok_long(*(DWORD*)&xform3.eM11, 0x7f800000); /* zero matrix + 1 invalid */ set_xform(&xform1, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); set_xform(&xform2, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); *(DWORD*)&xform2.eM22 = 0x7f800000; // (0.0F/0.0F) - ret = CombineTransform(&xform3, &xform1, &xform2); - ok_int(ret, 1); + ok_int(CombineTransform(&xform3, &xform1, &xform2), 1); ok_xform(xform3, 0.0, 0.0, 0.0, geIND, 0.0, 0.0); /* zero matrix + 1 invalid */ xform2 = xform1; *(DWORD*)&xform2.eM12 = 0x7f800000; // (0.0F/0.0F) - ret = CombineTransform(&xform3, &xform1, &xform2); - ok_int(ret, 1); + ok_int(CombineTransform(&xform3, &xform1, &xform2), 1); ok_xform(xform3, 0.0, geIND, 0.0, geIND, 0.0, 0.0); /* Some undefined values */ set_xform(&xform1, 0.0, geIND, 0.0, 0.0, 0.0, 0.0); set_xform(&xform2, geIND, 0.0, 0.0, geINF, 0.0, 0.0); - ret = CombineTransform(&xform3, &xform1, &xform2); - ok_int(ret, 1); + ok_int(CombineTransform(&xform3, &xform1, &xform2), 1); ok_xform(xform3, geIND, geIND, geIND, geIND, 0.0, 0.0); } @@ -253,70 +222,69 @@ void Test_CombineTransform_Inval(float eInval, float eOut) { XFORM xform1, xform2, xform3; - BOOL ret; /* zero matrix / M11 invalid */ set_xform(&xform1, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); set_xform(&xform2, eInval, 0.0, 0.0, 0.0, 0.0, 0.0); - ret = CombineTransform(&xform3, &xform1, &xform2); + ok_int(CombineTransform(&xform3, &xform1, &xform2), 1); ok_xform(xform3, eOut, 0.0, 0.0, 0.0, 0.0, 0.0); // -> M21 - ret = CombineTransform(&xform3, &xform2, &xform1); + ok_int(CombineTransform(&xform3, &xform2, &xform1), 1); ok_xform(xform3, eOut, 0.0, 0.0, 0.0, 0.0, 0.0); // -> M12 /* zero matrix / M12 invalid */ set_xform(&xform1, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); set_xform(&xform2, 0.0, eInval, 0.0, 0.0, 0.0, 0.0); - ret = CombineTransform(&xform3, &xform1, &xform2); + ok_int(CombineTransform(&xform3, &xform1, &xform2), 1); ok_xform(xform3, 0.0, eOut, 0.0, eOut, 0.0, 0.0); - ret = CombineTransform(&xform3, &xform2, &xform1); + ok_int(CombineTransform(&xform3, &xform2, &xform1), 1); ok_xform(xform3, eOut, eOut, 0.0, 0.0, 0.0, 0.0); /* zero matrix / M21 invalid */ set_xform(&xform1, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); set_xform(&xform2, 0.0, 0.0, eInval, 0.0, 0.0, 0.0); - ret = CombineTransform(&xform3, &xform1, &xform2); + ok_int(CombineTransform(&xform3, &xform1, &xform2), 1); ok_xform(xform3, eOut, 0.0, eOut, 0.0, 0.0, 0.0); - ret = CombineTransform(&xform3, &xform2, &xform1); + ok_int(CombineTransform(&xform3, &xform2, &xform1), 1); ok_xform(xform3, 0.0, 0.0, eOut, eOut, 0.0, 0.0); /* zero matrix / M22 invalid */ set_xform(&xform1, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); set_xform(&xform2, 0.0, 0.0, 0.0, eInval, 0.0, 0.0); - ret = CombineTransform(&xform3, &xform1, &xform2); + ok_int(CombineTransform(&xform3, &xform1, &xform2), 1); ok_xform(xform3, 0.0, 0.0, 0.0, eOut, 0.0, 0.0); // -> M12 - ret = CombineTransform(&xform3, &xform2, &xform1); + ok_int(CombineTransform(&xform3, &xform2, &xform1), 1); ok_xform(xform3, 0.0, 0.0, 0.0, eOut, 0.0, 0.0); // -> M21 /* zero matrix / M11,M12 invalid */ set_xform(&xform1, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); set_xform(&xform2, eInval, eInval, 0.0, 0.0, 0.0, 0.0); - ret = CombineTransform(&xform3, &xform1, &xform2); + ok_int(CombineTransform(&xform3, &xform1, &xform2), 1); ok_xform(xform3, eOut, eOut, eOut, eOut, 0.0, 0.0); - ret = CombineTransform(&xform3, &xform2, &xform1); + ok_int(CombineTransform(&xform3, &xform2, &xform1), 1); ok_xform(xform3, eOut, eOut, 0.0, 0.0, 0.0, 0.0); /* zero matrix / M11,M21 invalid */ set_xform(&xform1, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); set_xform(&xform2, eInval, 0.0, eInval, 0.0, 0.0, 0.0); - ret = CombineTransform(&xform3, &xform1, &xform2); + ok_int(CombineTransform(&xform3, &xform1, &xform2), 1); ok_xform(xform3, eOut, 0.0, eOut, 0.0, 0.0, 0.0); - ret = CombineTransform(&xform3, &xform2, &xform1); + ok_int(CombineTransform(&xform3, &xform2, &xform1), 1); ok_xform(xform3, eOut, eOut, eOut, eOut, 0.0, 0.0); /* zero matrix / M11,M22 invalid */ set_xform(&xform1, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); set_xform(&xform2, eInval, 0.0, 0.0, eInval, 0.0, 0.0); - ret = CombineTransform(&xform3, &xform1, &xform2); + ok_int(CombineTransform(&xform3, &xform1, &xform2), 1); ok_xform(xform3, eOut, 0.0, 0.0, eOut, 0.0, 0.0); // -> M12, M21 - ret = CombineTransform(&xform3, &xform2, &xform1); + ok_int(CombineTransform(&xform3, &xform2, &xform1), 1); ok_xform(xform3, eOut, 0.0, 0.0, eOut, 0.0, 0.0); /* zero matrix / M12,M21 invalid */ set_xform(&xform1, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); set_xform(&xform2, 0.0, eInval, eInval, 0.0, 0.0, 0.0); - ret = CombineTransform(&xform3, &xform1, &xform2); + ok_int(CombineTransform(&xform3, &xform1, &xform2), 1); ok_xform(xform3, eOut, eOut, eOut, eOut, 0.0, 0.0); - ret = CombineTransform(&xform3, &xform2, &xform1); + ok_int(CombineTransform(&xform3, &xform2, &xform1), 1); ok_xform(xform3, eOut, eOut, eOut, eOut, 0.0, 0.0); } Modified: trunk/rostests/apitests/gdi32/SetDCPenColor.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetDCPenCo…
============================================================================== --- trunk/rostests/apitests/gdi32/SetDCPenColor.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SetDCPenColor.c [iso-8859-1] Sun Dec 30 13:21:52 2012 @@ -60,6 +60,7 @@ #endif // Delete the DC + SelectObject(hDC, hbmpOld); DeleteDC(hDC); }
11 years, 12 months
1
0
0
0
[ekohl] 58053: [SAMSRV] Enable the use of generic access rights by mapping them to object specific right.
by ekohl@svn.reactos.org
Author: ekohl Date: Sun Dec 30 13:00:02 2012 New Revision: 58053 URL:
http://svn.reactos.org/svn/reactos?rev=58053&view=rev
Log: [SAMSRV] Enable the use of generic access rights by mapping them to object specific right. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?…
============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sun Dec 30 13:00:02 2012 @@ -17,6 +17,46 @@ static SID_IDENTIFIER_AUTHORITY NtSidAuthority = {SECURITY_NT_AUTHORITY}; +static GENERIC_MAPPING ServerMapping = +{ + SAM_SERVER_READ, + SAM_SERVER_WRITE, + SAM_SERVER_EXECUTE, + SAM_SERVER_ALL_ACCESS +}; + +static GENERIC_MAPPING DomainMapping = +{ + DOMAIN_READ, + DOMAIN_WRITE, + DOMAIN_EXECUTE, + DOMAIN_ALL_ACCESS +}; + +static GENERIC_MAPPING AliasMapping = +{ + ALIAS_READ, + ALIAS_WRITE, + ALIAS_EXECUTE, + ALIAS_ALL_ACCESS +}; + +static GENERIC_MAPPING GroupMapping = +{ + GROUP_READ, + GROUP_WRITE, + GROUP_EXECUTE, + GROUP_ALL_ACCESS +}; + +static GENERIC_MAPPING UserMapping = +{ + USER_READ, + USER_WRITE, + USER_EXECUTE, + USER_ALL_ACCESS +}; + /* FUNCTIONS *****************************************************************/ @@ -68,9 +108,11 @@ HeapFree(GetProcessHeap(), 0, ptr); } + void __RPC_USER SAMPR_HANDLE_rundown(SAMPR_HANDLE hHandle) { } + /* Function 0 */ NTSTATUS @@ -85,6 +127,11 @@ TRACE("SamrConnect(%p %p %lx)\n", ServerName, ServerHandle, DesiredAccess); + /* Map generic access rights */ + RtlMapGenericMask(&DesiredAccess, + &ServerMapping); + + /* Open the Server Object */ Status = SampOpenDbObject(NULL, NULL, L"SAM", @@ -100,6 +147,7 @@ return Status; } + /* Function 1 */ NTSTATUS NTAPI @@ -125,6 +173,7 @@ return Status; } + /* Function 2 */ NTSTATUS NTAPI @@ -136,6 +185,7 @@ return STATUS_NOT_IMPLEMENTED; } + /* Function 3 */ NTSTATUS NTAPI @@ -146,6 +196,7 @@ UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } + /* Function 4 */ NTSTATUS @@ -486,6 +537,10 @@ TRACE("SamrOpenDomain(%p %lx %p %p)\n", ServerHandle, DesiredAccess, DomainId, DomainHandle); + /* Map generic access rights */ + RtlMapGenericMask(&DesiredAccess, + &DomainMapping); + /* Validate the server handle */ Status = SampValidateDbObject(ServerHandle, SamDbServerObject, @@ -1652,6 +1707,10 @@ TRACE("SamrCreateGroupInDomain(%p %p %lx %p %p)\n", DomainHandle, Name, DesiredAccess, GroupHandle, RelativeId); + + /* Map generic access rights */ + RtlMapGenericMask(&DesiredAccess, + &GroupMapping); /* Validate the domain handle */ Status = SampValidateDbObject(DomainHandle, @@ -2018,6 +2077,10 @@ UserHandle == NULL || RelativeId == NULL) return STATUS_INVALID_PARAMETER; + + /* Map generic access rights */ + RtlMapGenericMask(&DesiredAccess, + &UserMapping); /* Validate the domain handle */ Status = SampValidateDbObject(DomainHandle, @@ -2472,6 +2535,10 @@ TRACE("SamrCreateAliasInDomain(%p %p %lx %p %p)\n", DomainHandle, AccountName, DesiredAccess, AliasHandle, RelativeId); + + /* Map generic access rights */ + RtlMapGenericMask(&DesiredAccess, + &AliasMapping); /* Validate the domain handle */ Status = SampValidateDbObject(DomainHandle, @@ -3452,6 +3519,10 @@ TRACE("SamrOpenGroup(%p %lx %lx %p)\n", DomainHandle, DesiredAccess, GroupId, GroupHandle); + /* Map generic access rights */ + RtlMapGenericMask(&DesiredAccess, + &GroupMapping); + /* Validate the domain handle */ Status = SampValidateDbObject(DomainHandle, SamDbDomainObject, @@ -3899,6 +3970,10 @@ TRACE("SamrOpenAlias(%p %lx %lx %p)\n", DomainHandle, DesiredAccess, AliasId, AliasHandle); + + /* Map generic access rights */ + RtlMapGenericMask(&DesiredAccess, + &AliasMapping); /* Validate the domain handle */ Status = SampValidateDbObject(DomainHandle, @@ -4564,6 +4639,10 @@ TRACE("SamrOpenUser(%p %lx %lx %p)\n", DomainHandle, DesiredAccess, UserId, UserHandle); + + /* Map generic access rights */ + RtlMapGenericMask(&DesiredAccess, + &UserMapping); /* Validate the domain handle */ Status = SampValidateDbObject(DomainHandle, @@ -6100,6 +6179,7 @@ return Status; } + /* Function 38 */ NTSTATUS NTAPI @@ -6284,6 +6364,10 @@ AccountType != USER_SERVER_TRUST_ACCOUNT && AccountType != USER_TEMP_DUPLICATE_ACCOUNT) return STATUS_INVALID_PARAMETER; + + /* Map generic access rights */ + RtlMapGenericMask(&DesiredAccess, + &UserMapping); /* Validate the domain handle */ Status = SampValidateDbObject(DomainHandle,
11 years, 12 months
1
0
0
0
← Newer
1
2
3
4
5
...
29
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
Results per page:
10
25
50
100
200