Ros-diffs July 2010

ros-diffs@reactos.org

17 participants
467 discussions

[fireball] 48388: [INCLUDE/WINE] - Update Wine-specific headers to Wine-1.3. - Remove unneeded 16 bit header, and add a bit of stuff into another legacy header. - Indicate in config.h that there is a freetype library present.
by fireball＠svn.reactos.org 31 Jul '10

31 Jul '10

Author: fireball Date: Sat Jul 31 22:39:22 2010 New Revision: 48388 URL: http://svn.reactos.org/svn/reactos?rev=48388&view=rev Log: [INCLUDE/WINE] - Update Wine-specific headers to Wine-1.3. - Remove unneeded 16 bit header, and add a bit of stuff into another legacy header. - Indicate in config.h that there is a freetype library present. Removed: trunk/reactos/include/reactos/wine/winuser16.h Modified: trunk/reactos/include/reactos/wine/config.h trunk/reactos/include/reactos/wine/test.h trunk/reactos/include/reactos/wine/windef16.h trunk/reactos/include/reactos/wine/wingdi16.h Modified: trunk/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/confi… ============================================================================== --- trunk/reactos/include/reactos/wine/config.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/config.h [iso-8859-1] Sat Jul 31 22:39:22 2010 @@ -99,37 +99,43 @@ #define HAVE_FPCLASS 1 /* Define if FreeType 2 is installed */ -/* #undef HAVE_FREETYPE */ +#define HAVE_FREETYPE 1 /* Define to 1 if you have the <freetype/freetype.h> header file. */ -/* #undef HAVE_FREETYPE_FREETYPE_H */ +#define HAVE_FREETYPE_FREETYPE_H 1 /* Define to 1 if you have the <freetype/ftglyph.h> header file. */ -/* #undef HAVE_FREETYPE_FTGLYPH_H */ +#define HAVE_FREETYPE_FTGLYPH_H 1 + +/* Define to 1 if you have the <freetype/ftlcdfil.h> header file. */ +#define HAVE_FREETYPE_FTLCDFIL_H 1 + +/* Define to 1 if you have the <freetype/ftmodapi.h> header file. */ +#define HAVE_FREETYPE_FTMODAPI_H 1 /* Define to 1 if you have the <freetype/ftnames.h> header file. */ /* #undef HAVE_FREETYPE_FTNAMES_H */ /* Define to 1 if you have the <freetype/ftoutln.h> header file. */ -/* #undef HAVE_FREETYPE_FTOUTLN_H */ +#define HAVE_FREETYPE_FTOUTLN_H 1 /* Define to 1 if you have the <freetype/ftsnames.h> header file. */ -/* #undef HAVE_FREETYPE_FTSNAMES_H */ +#define HAVE_FREETYPE_FTSNAMES_H 1 /* Define if you have the <freetype/fttrigon.h> header file. */ -/* #undef HAVE_FREETYPE_FTTRIGON_H */ +#define HAVE_FREETYPE_FTTRIGON_H 1 /* Define to 1 if you have the <freetype/ftwinfnt.h> header file. */ -/* #undef HAVE_FREETYPE_FTWINFNT_H */ +#define HAVE_FREETYPE_FTWINFNT_H 1 /* Define to 1 if you have the <freetype/internal/sfnt.h> header file. */ /* #undef HAVE_FREETYPE_INTERNAL_SFNT_H */ /* Define to 1 if you have the <freetype/ttnameid.h> header file. */ -/* #undef HAVE_FREETYPE_TTNAMEID_H */ +#define HAVE_FREETYPE_TTNAMEID_H 1 /* Define to 1 if you have the <freetype/tttables.h> header file. */ -/* #undef HAVE_FREETYPE_TTTABLES_H */ +#define HAVE_FREETYPE_TTTABLES_H 1 /* Define to 1 if the system has the type `fsblkcnt_t'. */ /* #undef HAVE_FSBLKCNT_T */ @@ -144,7 +150,13 @@ /* #undef HAVE_FSTATVFS */ /* Define to 1 if you have the <ft2build.h> header file. */ -/* #undef HAVE_FT2BUILD_H */ +#define HAVE_FT2BUILD_H 1 + +/* Define to 1 if you have the `FT_Load_Sfnt_Table' function. */ +/* #undef HAVE_FT_LOAD_SFNT_TABLE */ + +/* Define to 1 if the system has the type `FT_TrueTypeEngineType'. */ +#define HAVE_FT_TRUETYPEENGINETYPE 1 /* Define to 1 if you have the `ftruncate' function. */ #define HAVE_FTRUNCATE 1 Modified: trunk/reactos/include/reactos/wine/test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/test.… ============================================================================== --- trunk/reactos/include/reactos/wine/test.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/test.h [iso-8859-1] Sat Jul 31 22:39:22 2010 @@ -237,8 +237,7 @@ data=TlsGetValue(tls_index); if (!data) { - data=HeapAlloc(GetProcessHeap(), 0, sizeof(tls_data)); - data->todo_level = 0; + data=HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(tls_data)); data->str_pos = data->strings; TlsSetValue(tls_index,data); } @@ -593,6 +592,8 @@ if (GetEnvironmentVariableA( "WINETEST_INTERACTIVE", p, sizeof(p) )) winetest_interactive = atoi(p); if (GetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", p, sizeof(p) )) report_success = atoi(p); + if (!winetest_interactive) SetErrorMode( SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX ); + if (!argv[1]) { if (winetest_testlist[0].name && !winetest_testlist[1].name) /* only one test */ Modified: trunk/reactos/include/reactos/wine/windef16.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winde… ============================================================================== --- trunk/reactos/include/reactos/wine/windef16.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/windef16.h [iso-8859-1] Sat Jul 31 22:39:22 2010 @@ -28,7 +28,9 @@ #endif #include <windef.h> #include <winbase.h> -#include <wine/exception.h> +#ifndef _NTNDK_ +#include <exception.h> // ROS Hack +#endif /* Standard data types */ typedef unsigned short BOOL16; Modified: trunk/reactos/include/reactos/wine/wingdi16.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wingd… ============================================================================== --- trunk/reactos/include/reactos/wine/wingdi16.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/wingdi16.h [iso-8859-1] Sat Jul 31 22:39:22 2010 @@ -29,6 +29,24 @@ typedef struct { + INT16 lfHeight; + INT16 lfWidth; + INT16 lfEscapement; + INT16 lfOrientation; + INT16 lfWeight; + BYTE lfItalic; + BYTE lfUnderline; + BYTE lfStrikeOut; + BYTE lfCharSet; + BYTE lfOutPrecision; + BYTE lfClipPrecision; + BYTE lfQuality; + BYTE lfPitchAndFamily; + CHAR lfFaceName[LF_FACESIZE]; +} LOGFONT16, *LPLOGFONT16; + +typedef struct +{ INT16 mm; INT16 xExt; INT16 yExt; Removed: trunk/reactos/include/reactos/wine/winuser16.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winus… ============================================================================== --- trunk/reactos/include/reactos/wine/winuser16.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winuser16.h (removed) @@ -1,26 +1,0 @@ -/* - * Copyright (C) the Wine project - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef __WINE_WINE_WINUSER16_H -#define __WINE_WINE_WINUSER16_H - -#ifndef CB_SETITEMDATA16 -#define CB_SETITEMDATA16 (WM_USER+17) -#endif - -#endif /* __WINE_WINE_WINUSER16_H */

1 0

[fireball] 48387: [PSDK] - Make some winuser.h functions conforming to MS PSDK.
by fireball＠svn.reactos.org 31 Jul '10

31 Jul '10

Author: fireball Date: Sat Jul 31 22:36:22 2010 New Revision: 48387 URL: http://svn.reactos.org/svn/reactos?rev=48387&view=rev Log: [PSDK] - Make some winuser.h functions conforming to MS PSDK. Modified: trunk/reactos/dll/win32/user32/windows/font.c trunk/reactos/dll/win32/user32/windows/input.c trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/dll/win32/user32/windows/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/f… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/font.c [iso-8859-1] Sat Jul 31 22:36:22 2010 @@ -66,7 +66,7 @@ LPCSTR lpString, int nCount, int nTabPositions, - CONST LPINT lpnTabStopPositions, + CONST INT *lpnTabStopPositions, int nTabOrigin) { LONG ret; @@ -196,7 +196,7 @@ LPCWSTR lpString, int nCount, int nTabPositions, - CONST LPINT lpnTabStopPositions, + CONST INT *lpnTabStopPositions, int nTabOrigin) { return TEXT_TabbedTextOut(hDC, X, Y, lpString, nCount, nTabPositions, lpnTabStopPositions, nTabOrigin, TRUE); @@ -213,7 +213,7 @@ LPCSTR lpString, int nCount, int nTabPositions, - CONST LPINT lpnTabStopPositions) + CONST INT *lpnTabStopPositions) { LONG ret; DWORD len = MultiByteToWideChar(CP_ACP, 0, lpString, nCount, NULL, 0); @@ -241,7 +241,7 @@ LPCWSTR lpString, int nCount, int nTabPositions, - CONST LPINT lpnTabStopPositions) + CONST INT *lpnTabStopPositions) { return TEXT_TabbedTextOut(hDC, 0, 0, lpString, nCount, nTabPositions, lpnTabStopPositions, 0, FALSE); } Modified: trunk/reactos/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/input.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/input.c [iso-8859-1] Sat Jul 31 22:36:22 2010 @@ -398,7 +398,7 @@ int WINAPI ToAscii(UINT uVirtKey, UINT uScanCode, - CONST PBYTE lpKeyState, + CONST BYTE *lpKeyState, LPWORD lpChar, UINT uFlags) { @@ -412,7 +412,7 @@ int WINAPI ToAsciiEx(UINT uVirtKey, UINT uScanCode, - CONST PBYTE lpKeyState, + CONST BYTE *lpKeyState, LPWORD lpChar, UINT uFlags, HKL dwhkl) @@ -434,7 +434,7 @@ int WINAPI ToUnicode(UINT wVirtKey, UINT wScanCode, - CONST PBYTE lpKeyState, + CONST BYTE *lpKeyState, LPWSTR pwszBuff, int cchBuff, UINT wFlags) @@ -450,13 +450,13 @@ int WINAPI ToUnicodeEx(UINT wVirtKey, UINT wScanCode, - CONST PBYTE lpKeyState, + CONST BYTE *lpKeyState, LPWSTR pwszBuff, int cchBuff, UINT wFlags, HKL dwhkl) { - return NtUserToUnicodeEx( wVirtKey, wScanCode, lpKeyState, pwszBuff, cchBuff, + return NtUserToUnicodeEx( wVirtKey, wScanCode, (PBYTE)lpKeyState, pwszBuff, cchBuff, wFlags, dwhkl ); } Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Sat Jul 31 22:36:22 2010 @@ -4163,8 +4163,8 @@ #define GetSysModalWindow() (NULL) HMENU WINAPI GetSystemMenu(HWND,BOOL); int WINAPI GetSystemMetrics(int); -DWORD WINAPI GetTabbedTextExtentA(HDC,LPCSTR,int,int,CONST LPINT); -DWORD WINAPI GetTabbedTextExtentW(HDC,LPCWSTR,int,int,CONST LPINT); +DWORD WINAPI GetTabbedTextExtentA(HDC,LPCSTR,int,int,CONST INT*); +DWORD WINAPI GetTabbedTextExtentW(HDC,LPCWSTR,int,int,CONST INT*); LONG WINAPI GetWindowLongA(HWND,int); LONG WINAPI GetWindowLongW(HWND,int); #ifdef _WIN64 @@ -4491,13 +4491,13 @@ #endif /* (_WIN32_WINNT >= 0x0500) */ BOOL WINAPI SystemParametersInfoA(UINT,UINT,PVOID,UINT); BOOL WINAPI SystemParametersInfoW(UINT,UINT,PVOID,UINT); -LONG WINAPI TabbedTextOutA(HDC,int,int,LPCSTR,int,int,CONST LPINT,int); -LONG WINAPI TabbedTextOutW(HDC,int,int,LPCWSTR,int,int,CONST LPINT,int); +LONG WINAPI TabbedTextOutA(HDC,int,int,LPCSTR,int,int,CONST INT*,int); +LONG WINAPI TabbedTextOutW(HDC,int,int,LPCWSTR,int,int,CONST INT*,int); WORD WINAPI TileWindows(HWND,UINT,LPCRECT,UINT,const HWND *); -int WINAPI ToAscii(UINT,UINT,CONST PBYTE,LPWORD,UINT); -int WINAPI ToAsciiEx(UINT,UINT,CONST PBYTE,LPWORD,UINT,HKL); -int WINAPI ToUnicode(UINT,UINT,CONST PBYTE,LPWSTR,int,UINT); -int WINAPI ToUnicodeEx(UINT,UINT,CONST PBYTE,LPWSTR,int,UINT,HKL); +int WINAPI ToAscii(UINT,UINT,CONST BYTE*,LPWORD,UINT); +int WINAPI ToAsciiEx(UINT,UINT,CONST BYTE*,LPWORD,UINT,HKL); +int WINAPI ToUnicode(UINT,UINT,CONST BYTE*,LPWSTR,int,UINT); +int WINAPI ToUnicodeEx(UINT,UINT,CONST BYTE*,LPWSTR,int,UINT,HKL); BOOL WINAPI TrackMouseEvent(LPTRACKMOUSEEVENT); BOOL WINAPI TrackPopupMenu(HMENU,UINT,int,int,int,HWND,LPCRECT); BOOL WINAPI TrackPopupMenuEx(HMENU,UINT,int,int,HWND,LPTPMPARAMS);

1 0

[fireball] 48386: - Fix build, sorry.
by fireball＠svn.reactos.org 31 Jul '10

31 Jul '10

Author: fireball Date: Sat Jul 31 22:20:34 2010 New Revision: 48386 URL: http://svn.reactos.org/svn/reactos?rev=48386&view=rev Log: - Fix build, sorry. Modified: trunk/reactos/dll/win32/version/resource.c Modified: trunk/reactos/dll/win32/version/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/version/resource… ============================================================================== --- trunk/reactos/dll/win32/version/resource.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/version/resource.c [iso-8859-1] Sat Jul 31 22:20:34 2010 @@ -83,9 +83,9 @@ while (min <= max) { pos = (min + max) / 2; - if (entry[pos].u.Id == id) - return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry[pos].u2.s.OffsetToDirectory); - if (entry[pos].u.Id > id) max = pos - 1; + if (entry[pos].u1.Id == id) + return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry[pos].u2.s3.OffsetToDirectory); + if (entry[pos].u1.Id > id) max = pos - 1; else min = pos + 1; } return NULL; @@ -104,7 +104,7 @@ const IMAGE_RESOURCE_DIRECTORY_ENTRY *entry; entry = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(dir + 1); - return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry->u2.s.OffsetToDirectory); + return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry->u2.s3.OffsetToDirectory); }

1 0

[ekohl] 48385: [LSASRV] Add more well known sids to the lookup list.
by ekohl＠svn.reactos.org 31 Jul '10

31 Jul '10

Author: ekohl Date: Sat Jul 31 22:02:13 2010 New Revision: 48385 URL: http://svn.reactos.org/svn/reactos?rev=48385&view=rev Log: [LSASRV] Add more well known sids to the lookup list. Modified: trunk/reactos/dll/win32/lsasrv/sids.c Modified: trunk/reactos/dll/win32/lsasrv/sids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/sids.c?re… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/sids.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/sids.c [iso-8859-1] Sat Jul 31 22:02:13 2010 @@ -101,47 +101,47 @@ static const WCHAR Users[] = { 'U','s','e','r','s',0 }; static const AccountSid ACCOUNT_SIDS[] = { - { WinNullSid, NULL_SID, Blank, SidTypeWellKnownGroup }, - { WinWorldSid, Everyone, Blank, SidTypeWellKnownGroup }, - { WinLocalSid, LOCAL, Blank, SidTypeWellKnownGroup }, - { WinCreatorOwnerSid, CREATOR_OWNER, Blank, SidTypeWellKnownGroup }, - { WinCreatorGroupSid, CREATOR_GROUP, Blank, SidTypeWellKnownGroup }, - { WinCreatorOwnerServerSid, CREATOR_OWNER_SERVER, Blank, SidTypeWellKnownGroup }, - { WinCreatorGroupServerSid, CREATOR_GROUP_SERVER, Blank, SidTypeWellKnownGroup }, - { WinNtAuthoritySid, NT_Pseudo_Domain, NT_Pseudo_Domain, SidTypeDomain }, - { WinDialupSid, DIALUP, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinNetworkSid, NETWORK, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinBatchSid, BATCH, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinInteractiveSid, INTERACTIVE, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinServiceSid, SERVICE, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinAnonymousSid, ANONYMOUS_LOGON, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinProxySid, PROXY, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinEnterpriseControllersSid, ENTERPRISE_DOMAIN_CONTROLLERS, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinSelfSid, SELF, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinAuthenticatedUserSid, Authenticated_Users, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinRestrictedCodeSid, RESTRICTED, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinTerminalServerSid, TERMINAL_SERVER_USER, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinRemoteLogonIdSid, REMOTE_INTERACTIVE_LOGON, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinLocalSystemSid, SYSTEM, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinLocalServiceSid, LOCAL_SERVICE, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinNetworkServiceSid, NETWORK_SERVICE, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinBuiltinDomainSid, BUILTIN, BUILTIN, SidTypeDomain }, - { WinBuiltinAdministratorsSid, Administrators, BUILTIN, SidTypeAlias }, - { WinBuiltinUsersSid, Users, BUILTIN, SidTypeAlias }, - { WinBuiltinGuestsSid, Guests, BUILTIN, SidTypeAlias }, - { WinBuiltinPowerUsersSid, Power_Users, BUILTIN, SidTypeAlias }, - { WinBuiltinAccountOperatorsSid, Account_Operators, BUILTIN, SidTypeAlias }, - { WinBuiltinSystemOperatorsSid, Server_Operators, BUILTIN, SidTypeAlias }, - { WinBuiltinPrintOperatorsSid, Print_Operators, BUILTIN, SidTypeAlias }, - { WinBuiltinBackupOperatorsSid, Backup_Operators, BUILTIN, SidTypeAlias }, - { WinBuiltinReplicatorSid, Replicators, BUILTIN, SidTypeAlias }, - { WinBuiltinPreWindows2000CompatibleAccessSid, Pre_Windows_2000_Compatible_Access, BUILTIN, SidTypeAlias }, - { WinBuiltinRemoteDesktopUsersSid, Remote_Desktop_Users, BUILTIN, SidTypeAlias }, - { WinBuiltinNetworkConfigurationOperatorsSid, Network_Configuration_Operators, BUILTIN, SidTypeAlias }, +// { WinNullSid, NULL_SID, Blank, SidTypeWellKnownGroup }, +// { WinWorldSid, Everyone, Blank, SidTypeWellKnownGroup }, +// { WinLocalSid, LOCAL, Blank, SidTypeWellKnownGroup }, +// { WinCreatorOwnerSid, CREATOR_OWNER, Blank, SidTypeWellKnownGroup }, +// { WinCreatorGroupSid, CREATOR_GROUP, Blank, SidTypeWellKnownGroup }, +// { WinCreatorOwnerServerSid, CREATOR_OWNER_SERVER, Blank, SidTypeWellKnownGroup }, +// { WinCreatorGroupServerSid, CREATOR_GROUP_SERVER, Blank, SidTypeWellKnownGroup }, +// { WinNtAuthoritySid, NT_Pseudo_Domain, NT_Pseudo_Domain, SidTypeDomain }, +// { WinDialupSid, DIALUP, NT_AUTHORITY, SidTypeWellKnownGroup }, +// { WinNetworkSid, NETWORK, NT_AUTHORITY, SidTypeWellKnownGroup }, +// { WinBatchSid, BATCH, NT_AUTHORITY, SidTypeWellKnownGroup }, +// { WinInteractiveSid, INTERACTIVE, NT_AUTHORITY, SidTypeWellKnownGroup }, +// { WinServiceSid, SERVICE, NT_AUTHORITY, SidTypeWellKnownGroup }, +// { WinAnonymousSid, ANONYMOUS_LOGON, NT_AUTHORITY, SidTypeWellKnownGroup }, +// { WinProxySid, PROXY, NT_AUTHORITY, SidTypeWellKnownGroup }, +// { WinEnterpriseControllersSid, ENTERPRISE_DOMAIN_CONTROLLERS, NT_AUTHORITY, SidTypeWellKnownGroup }, +// { WinSelfSid, SELF, NT_AUTHORITY, SidTypeWellKnownGroup }, +// { WinAuthenticatedUserSid, Authenticated_Users, NT_AUTHORITY, SidTypeWellKnownGroup }, +// { WinRestrictedCodeSid, RESTRICTED, NT_AUTHORITY, SidTypeWellKnownGroup }, +// { WinTerminalServerSid, TERMINAL_SERVER_USER, NT_AUTHORITY, SidTypeWellKnownGroup }, +// { WinRemoteLogonIdSid, REMOTE_INTERACTIVE_LOGON, NT_AUTHORITY, SidTypeWellKnownGroup }, +// { WinLocalSystemSid, SYSTEM, NT_AUTHORITY, SidTypeWellKnownGroup }, +// { WinLocalServiceSid, LOCAL_SERVICE, NT_AUTHORITY, SidTypeWellKnownGroup }, +// { WinNetworkServiceSid, NETWORK_SERVICE, NT_AUTHORITY, SidTypeWellKnownGroup }, +// { WinBuiltinDomainSid, BUILTIN, BUILTIN, SidTypeDomain }, +// { WinBuiltinAdministratorsSid, Administrators, BUILTIN, SidTypeAlias }, +// { WinBuiltinUsersSid, Users, BUILTIN, SidTypeAlias }, +// { WinBuiltinGuestsSid, Guests, BUILTIN, SidTypeAlias }, +// { WinBuiltinPowerUsersSid, Power_Users, BUILTIN, SidTypeAlias }, +// { WinBuiltinAccountOperatorsSid, Account_Operators, BUILTIN, SidTypeAlias }, +// { WinBuiltinSystemOperatorsSid, Server_Operators, BUILTIN, SidTypeAlias }, +// { WinBuiltinPrintOperatorsSid, Print_Operators, BUILTIN, SidTypeAlias }, +// { WinBuiltinBackupOperatorsSid, Backup_Operators, BUILTIN, SidTypeAlias }, +// { WinBuiltinReplicatorSid, Replicators, BUILTIN, SidTypeAlias }, +// { WinBuiltinPreWindows2000CompatibleAccessSid, Pre_Windows_2000_Compatible_Access, BUILTIN, SidTypeAlias }, +// { WinBuiltinRemoteDesktopUsersSid, Remote_Desktop_Users, BUILTIN, SidTypeAlias }, +// { WinBuiltinNetworkConfigurationOperatorsSid, Network_Configuration_Operators, BUILTIN, SidTypeAlias }, { WinNTLMAuthenticationSid, NTML_Authentication, NT_AUTHORITY, SidTypeWellKnownGroup }, { WinDigestAuthenticationSid, Digest_Authentication, NT_AUTHORITY, SidTypeWellKnownGroup }, { WinSChannelAuthenticationSid, SChannel_Authentication, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinThisOrganizationSid, This_Organization, NT_AUTHORITY, SidTypeWellKnownGroup }, +// { WinThisOrganizationSid, This_Organization, NT_AUTHORITY, SidTypeWellKnownGroup }, { WinOtherOrganizationSid, Other_Organization, NT_AUTHORITY, SidTypeWellKnownGroup }, { WinBuiltinPerfMonitoringUsersSid, Performance_Monitor_Users, BUILTIN, SidTypeAlias }, { WinBuiltinPerfLoggingUsersSid, Performance_Log_Users, BUILTIN, SidTypeAlias }, @@ -275,7 +275,7 @@ LsapCreateSid(&NtAuthority, 0, NULL, - L"", + L"NT Pseudo Domain", L"NT Pseudo Domain", SidTypeDomain); @@ -332,6 +332,246 @@ L"ANONYMOUS LOGON", L"NT AUTHORITY", SidTypeWellKnownGroup); + + /* Proxy Sid */ + SubAuthorities[0] = SECURITY_PROXY_RID; + LsapCreateSid(&NtAuthority, + 1, + SubAuthorities, + L"PROXY", + L"NT AUTHORITY", + SidTypeWellKnownGroup); + + /* Enterprise Controllers Sid */ + SubAuthorities[0] = SECURITY_ENTERPRISE_CONTROLLERS_RID; + LsapCreateSid(&NtAuthority, + 1, + SubAuthorities, + L"ENTERPRISE DOMAIN CONTROLLERS", + L"NT AUTHORITY", + SidTypeWellKnownGroup); + + /* Principal Self Sid */ + SubAuthorities[0] = SECURITY_PRINCIPAL_SELF_RID; + LsapCreateSid(&NtAuthority, + 1, + SubAuthorities, + L"SELF", + L"NT AUTHORITY", + SidTypeWellKnownGroup); + + /* Authenticated Users Sid */ + SubAuthorities[0] = SECURITY_AUTHENTICATED_USER_RID; + LsapCreateSid(&NtAuthority, + 1, + SubAuthorities, + L"Authenticated Users", + L"NT AUTHORITY", + SidTypeWellKnownGroup); + + /* Restricted Code Sid */ + SubAuthorities[0] = SECURITY_RESTRICTED_CODE_RID; + LsapCreateSid(&NtAuthority, + 1, + SubAuthorities, + L"RESTRICTED", + L"NT AUTHORITY", + SidTypeWellKnownGroup); + + /* Terminal Server Sid */ + SubAuthorities[0] = SECURITY_TERMINAL_SERVER_RID; + LsapCreateSid(&NtAuthority, + 1, + SubAuthorities, + L"TERMINAL SERVER USER", + L"NT AUTHORITY", + SidTypeWellKnownGroup); + + /* Remote Logon Sid */ + SubAuthorities[0] = SECURITY_REMOTE_LOGON_RID; + LsapCreateSid(&NtAuthority, + 1, + SubAuthorities, + L"REMOTE INTERACTIVE LOGON", + L"NT AUTHORITY", + SidTypeWellKnownGroup); + + /* This Organization Sid */ + SubAuthorities[0] = SECURITY_THIS_ORGANIZATION_RID; + LsapCreateSid(&NtAuthority, + 1, + SubAuthorities, + L"This Organization", + L"NT AUTHORITY", + SidTypeWellKnownGroup); + + /* Local System Sid */ + SubAuthorities[0] = SECURITY_LOCAL_SYSTEM_RID; + LsapCreateSid(&NtAuthority, + 1, + SubAuthorities, + L"SYSTEM", + L"NT AUTHORITY", + SidTypeWellKnownGroup); + + /* Local Service Sid */ + SubAuthorities[0] = SECURITY_LOCAL_SERVICE_RID; + LsapCreateSid(&NtAuthority, + 1, + SubAuthorities, + L"LOCAL SERVICE", + L"NT AUTHORITY", + SidTypeWellKnownGroup); + + /* Network Service Sid */ + SubAuthorities[0] = SECURITY_NETWORK_SERVICE_RID; + LsapCreateSid(&NtAuthority, + 1, + SubAuthorities, + L"NETWORK SERVICE", + L"NT AUTHORITY", + SidTypeWellKnownGroup); + + /* Builtin Domain Sid */ + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; + LsapCreateSid(&NtAuthority, + 1, + SubAuthorities, + L"BUILTIN", + L"BUILTIN", + SidTypeDomain); + + /* Administrators Alias Sid */ + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; + SubAuthorities[1] = DOMAIN_ALIAS_RID_ADMINS; + LsapCreateSid(&NtAuthority, + 2, + SubAuthorities, + L"Administrators", + L"BUILTIN", + SidTypeAlias); + + /* Users Alias Sid */ + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; + SubAuthorities[1] = DOMAIN_ALIAS_RID_USERS; + LsapCreateSid(&NtAuthority, + 2, + SubAuthorities, + L"Users", + L"BUILTIN", + SidTypeAlias); + + /* Guests Alias Sid */ + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; + SubAuthorities[1] = DOMAIN_ALIAS_RID_GUESTS; + LsapCreateSid(&NtAuthority, + 2, + SubAuthorities, + L"Guests", + L"BUILTIN", + SidTypeAlias); + + /* Power User Alias Sid */ + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; + SubAuthorities[1] = DOMAIN_ALIAS_RID_POWER_USERS; + LsapCreateSid(&NtAuthority, + 2, + SubAuthorities, + L"Power User", + L"BUILTIN", + SidTypeAlias); + + /* Account Operators Alias Sid */ + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; + SubAuthorities[1] = DOMAIN_ALIAS_RID_ACCOUNT_OPS; + LsapCreateSid(&NtAuthority, + 2, + SubAuthorities, + L"Account Operators", + L"BUILTIN", + SidTypeAlias); + + /* System Operators Alias Sid */ + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; + SubAuthorities[1] = DOMAIN_ALIAS_RID_SYSTEM_OPS; + LsapCreateSid(&NtAuthority, + 2, + SubAuthorities, + L"Server Operators", + L"BUILTIN", + SidTypeAlias); + + /* Print Operators Alias Sid */ + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; + SubAuthorities[1] = DOMAIN_ALIAS_RID_PRINT_OPS; + LsapCreateSid(&NtAuthority, + 2, + SubAuthorities, + L"Print Operators", + L"BUILTIN", + SidTypeAlias); + + /* Backup Operators Alias Sid */ + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; + SubAuthorities[1] = DOMAIN_ALIAS_RID_BACKUP_OPS; + LsapCreateSid(&NtAuthority, + 2, + SubAuthorities, + L"Backup Operators", + L"BUILTIN", + SidTypeAlias); + + /* Replicators Alias Sid */ + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; + SubAuthorities[1] = DOMAIN_ALIAS_RID_REPLICATOR; + LsapCreateSid(&NtAuthority, + 2, + SubAuthorities, + L"Replicators", + L"BUILTIN", + SidTypeAlias); + +#if 0 + /* RAS Servers Alias Sid */ + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; + SubAuthorities[1] = DOMAIN_ALIAS_RID_RAS_SERVERS; + LsapCreateSid(&NtAuthority, + 2, + SubAuthorities, + L"Backup Operators", + L"BUILTIN", + SidTypeAlias); +#endif + + /* Pre-Windows 2000 Compatible Access Alias Sid */ + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; + SubAuthorities[1] = DOMAIN_ALIAS_RID_PREW2KCOMPACCESS; + LsapCreateSid(&NtAuthority, + 2, + SubAuthorities, + L"Pre-Windows 2000 Compatible Access", + L"BUILTIN", + SidTypeAlias); + + /* Remote Desktop Users Alias Sid */ + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; + SubAuthorities[1] = DOMAIN_ALIAS_RID_REMOTE_DESKTOP_USERS; + LsapCreateSid(&NtAuthority, + 2, + SubAuthorities, + L"Remote Desktop Users", + L"BUILTIN", + SidTypeAlias); + + /* Network Configuration Operators Alias Sid */ + SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; + SubAuthorities[1] = DOMAIN_ALIAS_RID_NETWORK_CONFIGURATION_OPS; + LsapCreateSid(&NtAuthority, + 2, + SubAuthorities, + L"Network Configuration Operators", + L"BUILTIN", + SidTypeAlias); /* FIXME: Add more well known sids */

1 0

[fireball] 48384: [PSDK] - Get back to old/compatible way of declaring dummy unions and structs for IMAGE_RESOURCE_DIRECTORY_ENTRY. Also, second nameless structure is called DUMMYSTRUCTNAME3 to be compatible with Wine's code which, for some reason, expects WORD Id wrapped into yet another struct, depending on endiannes.
by fireball＠svn.reactos.org 31 Jul '10

31 Jul '10

Author: fireball Date: Sat Jul 31 21:40:40 2010 New Revision: 48384 URL: http://svn.reactos.org/svn/reactos?rev=48384&view=rev Log: [PSDK] - Get back to old/compatible way of declaring dummy unions and structs for IMAGE_RESOURCE_DIRECTORY_ENTRY. Also, second nameless structure is called DUMMYSTRUCTNAME3 to be compatible with Wine's code which, for some reason, expects WORD Id wrapped into yet another struct, depending on endiannes. Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Jul 31 21:40:40 2010 @@ -4187,16 +4187,16 @@ _ANONYMOUS_STRUCT struct { DWORD NameOffset:31; DWORD NameIsString:1; - } DUMMYSTRUCTNAME; + } DUMMYSTRUCTNAME1; DWORD Name; WORD Id; - } DUMMYUNIONNAME; + } DUMMYUNIONNAME1; _ANONYMOUS_UNION union { DWORD OffsetToData; _ANONYMOUS_STRUCT struct { DWORD OffsetToDirectory:31; DWORD DataIsDirectory:1; - } DUMMYSTRUCTNAME; + } DUMMYSTRUCTNAME3; } DUMMYUNIONNAME2; } IMAGE_RESOURCE_DIRECTORY_ENTRY, *PIMAGE_RESOURCE_DIRECTORY_ENTRY;

1 0

[ilardig] 48383: [freeldr] - Patch by Carlo Bramini reviewed by lassy: The CF must be tested when reading time because the legacy DS12x87 chip shows a condition where it's updating its time registers and if it's the case then the call should be retried later. Now the time is valid when both CF flags for date and time are good at the same time. It's better to send the correct value of CF with the proper field to the REGS structure instead of hoping that the flag won't be changed by compiled code.
by ilardig＠svn.reactos.org 31 Jul '10

31 Jul '10

Author: ilardig Date: Sat Jul 31 21:00:40 2010 New Revision: 48383 URL: http://svn.reactos.org/svn/reactos?rev=48383&view=rev Log: [freeldr] - Patch by Carlo Bramini reviewed by lassy: The CF must be tested when reading time because the legacy DS12x87 chip shows a condition where it's updating its time registers and if it's the case then the call should be retried later. Now the time is valid when both CF flags for date and time are good at the same time. It's better to send the correct value of CF with the proper field to the REGS structure instead of hoping that the flag won't be changed by compiled code. In the Int386() function I did the fix for acquiring the status flags to send to the software interrupt. I also think it is also a good idea to always clear the direction flag before doing movsb/movsw/movsd in this function. Since we are working with DOS stuff, the state of the direction register could be unknown, who knows what happens after those INT opcodes. Afterall I don't think that adding these two "cld" would be a big problem. See issue #2786 for more details. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/int386.S trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c trunk/reactos/boot/freeldr/freeldr/include/arch.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/int386.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/int386.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/int386.S [iso-8859-1] Sat Jul 31 21:00:40 2010 @@ -23,6 +23,10 @@ #define ASM #include <arch.h> +/* Only these flags are propagated into Int386() */ +#define FLAGS_PROP (I386FLAG_CF | \ + I386FLAG_ZF | \ + I386FLAG_SF) Int386_REGS: @@ -85,6 +89,7 @@ movl $Int386_REGS,%edi movl Int386_regsin,%esi movl $0x24,%ecx + cld rep movsb @@ -101,6 +106,16 @@ movw %cs:Int386_gs,%ax movw %ax,%gs /* GS register */ + /* Prepare EFLAGS for recover */ + pushf + movw %cs:Int386_eflags, %ax + popw %cx + andw $FLAGS_PROP, %ax + andw $~FLAGS_PROP, %cx + orw %cx, %ax + pushw %ax + + /* Recover general purpose registers */ movl %cs:Int386_eax,%eax /* EAX register */ movl %cs:Int386_ebx,%ebx /* EBX register */ movl %cs:Int386_ecx,%ecx /* ECX register */ @@ -108,6 +123,9 @@ movl %cs:Int386_esi,%esi /* ESI register */ movl %cs:Int386_edi,%edi /* EDI register */ + + /* Recover previously prepared flags */ + popf /* Do not set the flags register */ /* only return its value in regsout */ @@ -149,6 +167,7 @@ movl $Int386_REGS,%esi movl Int386_regsout,%edi movl $0x24,%ecx + cld rep movsb Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c [iso-8859-1] Sat Jul 31 21:00:40 2010 @@ -27,56 +27,66 @@ static TIMEINFO TimeInfo; REGS Regs; - /* Some BIOSes, such as the 1998/07/25 system ROM - * in the Compaq Deskpro EP/SB, leave CF unchanged - * if successful, so CF should be cleared before - * calling this function. */ - __writeeflags(__readeflags() & ~EFLAGS_CF); + for (;;) + { + /* Some BIOSes, such as the 1998/07/25 system ROM + * in the Compaq Deskpro EP/SB, leave CF unchanged + * if successful, so CF should be cleared before + * calling this function. */ + Regs.x.eflags = 0; +// __writeeflags(__readeflags() & ~EFLAGS_CF); - /* Int 1Ah AH=04h - * TIME - GET REAL-TIME CLOCK DATE (AT,XT286,PS) - * - * AH = 04h - * CF clear to avoid bug - * Return: - * CF clear if successful - * CH = century (BCD) - * CL = year (BCD) - * DH = month (BCD) - * DL = day (BCD) - * CF set on error - */ - Regs.b.ah = 0x04; - Int386(0x1A, &Regs, &Regs); + /* Int 1Ah AH=04h + * TIME - GET REAL-TIME CLOCK DATE (AT,XT286,PS) + * + * AH = 04h + * CF clear to avoid bug + * Return: + * CF clear if successful + * CH = century (BCD) + * CL = year (BCD) + * DH = month (BCD) + * DL = day (BCD) + * CF set on error + */ + Regs.b.ah = 0x04; + Int386(0x1A, &Regs, &Regs); - TimeInfo.Year = 100 * BCD_INT(Regs.b.ch) + BCD_INT(Regs.b.cl); - TimeInfo.Month = BCD_INT(Regs.b.dh); - TimeInfo.Day = BCD_INT(Regs.b.dl); + if (!INT386_SUCCESS(Regs)) continue; - /* Some BIOSes leave CF unchanged if successful, - * so CF should be cleared before calling this function. */ - __writeeflags(__readeflags() & ~EFLAGS_CF); + TimeInfo.Year = 100 * BCD_INT(Regs.b.ch) + BCD_INT(Regs.b.cl); + TimeInfo.Month = BCD_INT(Regs.b.dh); + TimeInfo.Day = BCD_INT(Regs.b.dl); - /* Int 1Ah AH=02h - * TIME - GET REAL-TIME CLOCK TIME (AT,XT286,PS) - * - * AH = 02h - * CF clear to avoid bug - * Return: - * CF clear if successful - * CH = hour (BCD) - * CL = minutes (BCD) - * DH = seconds (BCD) - * DL = daylight savings flag (00h standard time, 01h daylight time) - * CF set on error (i.e. clock not running or in middle of update) - */ - Regs.b.ah = 0x02; - Int386(0x1A, &Regs, &Regs); + /* Some BIOSes leave CF unchanged if successful, + * so CF should be cleared before calling this function. */ + Regs.x.eflags = 0; +// __writeeflags(__readeflags() & ~EFLAGS_CF); - TimeInfo.Hour = BCD_INT(Regs.b.ch); - TimeInfo.Minute = BCD_INT(Regs.b.cl); - TimeInfo.Second = BCD_INT(Regs.b.dh); + /* Int 1Ah AH=02h + * TIME - GET REAL-TIME CLOCK TIME (AT,XT286,PS) + * + * AH = 02h + * CF clear to avoid bug + * Return: + * CF clear if successful + * CH = hour (BCD) + * CL = minutes (BCD) + * DH = seconds (BCD) + * DL = daylight savings flag (00h standard time, 01h daylight time) + * CF set on error (i.e. clock not running or in middle of update) + */ + Regs.b.ah = 0x02; + Int386(0x1A, &Regs, &Regs); + if (!INT386_SUCCESS(Regs)) continue; + + TimeInfo.Hour = BCD_INT(Regs.b.ch); + TimeInfo.Minute = BCD_INT(Regs.b.cl); + TimeInfo.Second = BCD_INT(Regs.b.dh); + + break; + } return &TimeInfo; } Modified: trunk/reactos/boot/freeldr/freeldr/include/arch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch.h [iso-8859-1] Sat Jul 31 21:00:40 2010 @@ -58,6 +58,19 @@ #define EXTERN(x) .global x; x: +// Flag Masks +#define I386FLAG_CF 0x0001 // Carry Flag +#define I386FLAG_RESV1 0x0002 // Reserved - Must be 1 +#define I386FLAG_PF 0x0004 // Parity Flag +#define I386FLAG_RESV2 0x0008 // Reserved - Must be 0 +#define I386FLAG_AF 0x0010 // Auxiliary Flag +#define I386FLAG_RESV3 0x0020 // Reserved - Must be 0 +#define I386FLAG_ZF 0x0040 // Zero Flag +#define I386FLAG_SF 0x0080 // Sign Flag +#define I386FLAG_TF 0x0100 // Trap Flag (Single Step) +#define I386FLAG_IF 0x0200 // Interrupt Flag +#define I386FLAG_DF 0x0400 // Direction Flag +#define I386FLAG_OF 0x0800 // Overflow Flag #ifndef ASM @@ -148,20 +161,6 @@ // specifically handles linear addresses. int Int386(int ivec, REGS* in, REGS* out); -// Flag Masks -#define I386FLAG_CF 0x0001 // Carry Flag -#define I386FLAG_RESV1 0x0002 // Reserved - Must be 1 -#define I386FLAG_PF 0x0004 // Parity Flag -#define I386FLAG_RESV2 0x0008 // Reserved - Must be 0 -#define I386FLAG_AF 0x0010 // Auxiliary Flag -#define I386FLAG_RESV3 0x0020 // Reserved - Must be 0 -#define I386FLAG_ZF 0x0040 // Zero Flag -#define I386FLAG_SF 0x0080 // Sign Flag -#define I386FLAG_TF 0x0100 // Trap Flag (Single Step) -#define I386FLAG_IF 0x0200 // Interrupt Flag -#define I386FLAG_DF 0x0400 // Direction Flag -#define I386FLAG_OF 0x0800 // Overflow Flag - // This macro tests the Carry Flag // If CF is set then the call failed (usually) #define INT386_SUCCESS(regs) ((regs.x.eflags & I386FLAG_CF) == 0)

1 0

[fireball] 48382: - Merge 44999:48380 of psdk/wingdi.h
by fireball＠svn.reactos.org 31 Jul '10

31 Jul '10

Author: fireball Date: Sat Jul 31 12:20:50 2010 New Revision: 48382 URL: http://svn.reactos.org/svn/reactos?rev=48382&view=rev Log: - Merge 44999:48380 of psdk/wingdi.h Modified: branches/arwinss/reactos/include/psdk/wingdi.h (contents, props changed) Modified: branches/arwinss/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/wi… ============================================================================== --- branches/arwinss/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/psdk/wingdi.h [iso-8859-1] Sat Jul 31 12:20:50 2010 @@ -69,7 +69,7 @@ #define DI_MASK 1 #define DI_NORMAL 3 #define DI_APPBANDING 1 -#define DI_NOMIRROR 0x0010 +#define DI_NOMIRROR 16 #define EMR_HEADER 1 #define EMR_POLYBEZIER 2 #define EMR_POLYGON 3 @@ -185,15 +185,15 @@ #define EMR_SETICMPROFILEW 113 #define EMR_ALPHABLEND 114 #define EMR_ALPHADIBBLEND 115 -#define EMR_SETLAYOUT 115 +#define EMR_SETLAYOUT 115 #define EMR_TRANSPARENTBLT 116 #define EMR_TRANSPARENTDIB 117 -#define EMR_RESERVED_117 117 +#define EMR_RESERVED_117 117 #define EMR_GRADIENTFILL 118 -#define EMR_SETLINKEDUFI 119 +#define EMR_SETLINKEDUFIS 119 #define EMR_SETTEXTJUSTIFICATION 120 #define EMR_COLORMATCHTOTARGETW 121 -#define EMR_CREATECOLORSPACEW 122 +#define EMR_CREATECOLORSPACEW 122 #define EMR_MIN 1 #define EMR_MAX 122 @@ -273,16 +273,16 @@ #define META_CREATEFONTINDIRECT 0x2FB #define META_CREATEBRUSHINDIRECT 0x2FC #define META_CREATEREGION 0x6FF -#define META_DRAWTEXT 0x062F -#define META_RESETDC 0x014C -#define META_STARTDOC 0x014D -#define META_STARTPAGE 0x004F -#define META_ENDPAGE 0x0050 -#define META_ABORTDOC 0x0052 -#define META_ENDDOC 0x005E -#define META_CREATEBRUSH 0x00F8 -#define META_CREATEBITMAPINDIRECT 0x02FD -#define META_CREATEBITMAP 0x06FE +#define META_DRAWTEXT 0x062F +#define META_RESETDC 0x014C +#define META_STARTDOC 0x014D +#define META_STARTPAGE 0x004F +#define META_ENDPAGE 0x0050 +#define META_ABORTDOC 0x0052 +#define META_ENDDOC 0x005E +#define META_CREATEBRUSH 0x00F8 +#define META_CREATEBITMAPINDIRECT 0x02FD +#define META_CREATEBITMAP 0x06FE #define PT_MOVETO 6 #define PT_LINETO 2 #define PT_BEZIERTO 4 @@ -429,8 +429,8 @@ #define PROOF_QUALITY 2 #define NONANTIALIASED_QUALITY 3 #define ANTIALIASED_QUALITY 4 -#define CLEARTYPE_QUALITY 5 -#define CLEARTYPE_NATURAL_QUALITY 6 +#define CLEARTYPE_QUALITY 5 +#define CLEARTYPE_NATURAL_QUALITY 6 #define DEFAULT_PITCH 0 #define FIXED_PITCH 1 #define VARIABLE_PITCH 2 @@ -1065,7 +1065,7 @@ #define BS_DIBPATTERNPT 6 #define BS_PATTERN8X8 7 #define BS_DIBPATTERN8X8 8 -#define BS_MONOPATTERN 9 +#define BS_MONOPATTERN 9 #define LCS_CALIBRATED_RGB 0 #define LCS_DEVICE_RGB 1 #define LCS_DEVICE_CMYK 2 @@ -1715,7 +1715,7 @@ typedef struct tagEMRCREATEBRUSHINDIRECT { EMR emr; DWORD ihBrush; - LOGBRUSH lb; + LOGBRUSH32 lb; } EMRCREATEBRUSHINDIRECT,*PEMRCREATEBRUSHINDIRECT; typedef LONG LCSCSTYPE; typedef LONG LCSGAMUTMATCH; @@ -1897,11 +1897,11 @@ EXTLOGFONTW elfw; } EMREXTCREATEFONTINDIRECTW,*PEMREXTCREATEFONTINDIRECTW; typedef struct tagEXTLOGPEN { - UINT elpPenStyle; - UINT elpWidth; + DWORD elpPenStyle; + DWORD elpWidth; UINT elpBrushStyle; COLORREF elpColor; - LONG elpHatch; + ULONG_PTR elpHatch; DWORD elpNumEntries; DWORD elpStyleEntry[1]; } EXTLOGPEN,*PEXTLOGPEN,*LPEXTLOGPEN,*NPEXTLOGPEN; @@ -2212,24 +2212,24 @@ LONG cySrc; } EMRSTRETCHBLT,*PEMRSTRETCHBLT; typedef struct tagEMRALPHABLEND { - EMR emr; - RECTL rclBounds; - LONG xDest; - LONG yDest; - LONG cxDest; - LONG cyDest; - DWORD dwRop; - LONG xSrc; - LONG ySrc; - XFORM xformSrc; - COLORREF crBkColorSrc; - DWORD iUsageSrc; - DWORD offBmiSrc; - DWORD cbBmiSrc; - DWORD offBitsSrc; - DWORD cbBitsSrc; - LONG cxSrc; - LONG cySrc; + EMR emr; + RECTL rclBounds; + LONG xDest; + LONG yDest; + LONG cxDest; + LONG cyDest; + DWORD dwRop; + LONG xSrc; + LONG ySrc; + XFORM xformSrc; + COLORREF crBkColorSrc; + DWORD iUsageSrc; + DWORD offBmiSrc; + DWORD cbBmiSrc; + DWORD offBitsSrc; + DWORD cbBitsSrc; + LONG cxSrc; + LONG cySrc; } EMRALPHABLEND, *PEMRALPHABLEND; typedef struct tagEMRSTRETCHDIBITS { EMR emr; @@ -2900,7 +2900,7 @@ HENHMETAFILE WINAPI CopyEnhMetaFileW(HENHMETAFILE,LPCWSTR); HMETAFILE WINAPI CopyMetaFileA(HMETAFILE,LPCSTR); HMETAFILE WINAPI CopyMetaFileW(HMETAFILE,LPCWSTR); -HBITMAP WINAPI CreateBitmap(int,int,UINT,UINT,PCVOID); +HBITMAP WINAPI CreateBitmap(int,int,UINT,UINT,CONST VOID*); HBITMAP WINAPI CreateBitmapIndirect(const BITMAP*); HBRUSH WINAPI CreateBrushIndirect(const LOGBRUSH*); HCOLORSPACE WINAPI CreateColorSpaceA(LPLOGCOLORSPACEA); @@ -2909,9 +2909,9 @@ HDC WINAPI CreateCompatibleDC(HDC); HDC WINAPI CreateDCA(LPCSTR,LPCSTR,LPCSTR,const DEVMODEA*); HDC WINAPI CreateDCW(LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*); -HBITMAP WINAPI CreateDIBitmap(HDC,const BITMAPINFOHEADER*,DWORD,PCVOID,const BITMAPINFO*,UINT); +HBITMAP WINAPI CreateDIBitmap(HDC,CONST BITMAPINFOHEADER*,DWORD,CONST VOID*,CONST BITMAPINFO*,UINT); HBRUSH WINAPI CreateDIBPatternBrush(HGLOBAL,UINT); -HBRUSH WINAPI CreateDIBPatternBrushPt(PCVOID,UINT); +HBRUSH WINAPI CreateDIBPatternBrushPt(CONST VOID*,UINT); HBITMAP WINAPI CreateDIBSection(HDC,const BITMAPINFO*,UINT,PVOID*,HANDLE,DWORD); HBITMAP WINAPI CreateDiscardableBitmap(HDC,int,int); HRGN WINAPI CreateEllipticRgn(int,int,int,int); @@ -3050,7 +3050,9 @@ UINT WINAPI GetEnhMetaFilePixelFormat(HENHMETAFILE,UINT,PIXELFORMATDESCRIPTOR*); DWORD WINAPI GetFontData(HDC,DWORD,DWORD,PVOID,DWORD); DWORD WINAPI GetFontLanguageInfo(HDC); +#if (_WIN32_WINNT >= 0x0500) DWORD WINAPI GetFontUnicodeRanges(HDC,LPGLYPHSET); +#endif DWORD WINAPI GetGlyphIndicesA(HDC,LPCSTR,INT,LPWORD,DWORD); DWORD WINAPI GetGlyphIndicesW(HDC,LPCWSTR,INT,LPWORD,DWORD); DWORD WINAPI GetGlyphOutlineA(HDC,UINT,UINT,LPGLYPHMETRICS,DWORD,PVOID,const MAT2*); @@ -3091,8 +3093,8 @@ UINT WINAPI GetSystemPaletteUse(HDC); UINT WINAPI GetTextAlign(HDC); int WINAPI GetTextCharacterExtra(HDC); -UINT WINAPI GetTextCharset(HDC); -UINT WINAPI GetTextCharsetInfo(HDC,LPFONTSIGNATURE,DWORD); +int WINAPI GetTextCharset(HDC); +int WINAPI GetTextCharsetInfo(HDC,LPFONTSIGNATURE,DWORD); COLORREF WINAPI GetTextColor(HDC); BOOL WINAPI GetTextExtentExPointA(HDC,LPCSTR,int,int,LPINT,LPINT,LPSIZE); BOOL WINAPI GetTextExtentExPointW( HDC,LPCWSTR,int,int,LPINT,LPINT,LPSIZE ); @@ -3133,11 +3135,11 @@ BOOL WINAPI PlgBlt(HDC,const POINT*,HDC,int,int,int,int,HBITMAP,int,int); BOOL WINAPI PolyBezier(HDC,const POINT*,DWORD); BOOL WINAPI PolyBezierTo(HDC,const POINT*,DWORD); -BOOL WINAPI PolyDraw(HDC,const POINT*,const BYTE*,DWORD); +BOOL WINAPI PolyDraw(HDC,const POINT*,const BYTE*,int); BOOL WINAPI Polygon(HDC,const POINT*,int); BOOL WINAPI Polyline(HDC,const POINT*,int); BOOL WINAPI PolylineTo(HDC,const POINT*,DWORD); -BOOL WINAPI PolyPolygon(HDC,const POINT*,const INT*,DWORD); +BOOL WINAPI PolyPolygon(HDC,const POINT*,const INT*,int); BOOL WINAPI PolyPolyline(HDC,const POINT*,const DWORD*,DWORD); BOOL WINAPI PolyTextOutA(HDC,const POLYTEXTA*,int); BOOL WINAPI PolyTextOutW(HDC,const POLYTEXTW*,int); @@ -3168,7 +3170,7 @@ HPALETTE WINAPI SelectPalette(HDC,HPALETTE,BOOL); int WINAPI SetAbortProc(HDC,ABORTPROC); int WINAPI SetArcDirection(HDC,int); -LONG WINAPI SetBitmapBits(HBITMAP,LONG,PCVOID); +LONG WINAPI SetBitmapBits(HBITMAP,DWORD,CONST VOID*); BOOL WINAPI SetBitmapDimensionEx(HBITMAP,int,int,LPSIZE); COLORREF WINAPI SetBkColor(HDC,COLORREF); int WINAPI SetBkMode(HDC,int); @@ -3182,8 +3184,8 @@ #endif BOOL WINAPI SetDeviceGammaRamp(HDC,PVOID); UINT WINAPI SetDIBColorTable(HDC,UINT,UINT,const RGBQUAD*); -int WINAPI SetDIBits(HDC,HBITMAP,UINT,UINT,PCVOID,const BITMAPINFO*,UINT); -int WINAPI SetDIBitsToDevice(HDC,int,int,DWORD,DWORD,int,int,UINT,UINT,PCVOID,const BITMAPINFO*,UINT); +int WINAPI SetDIBits(HDC,HBITMAP,UINT,UINT,CONST VOID*,CONST BITMAPINFO*,UINT); +int WINAPI SetDIBitsToDevice(HDC,int,int,DWORD,DWORD,int,int,UINT,UINT,CONST VOID*,CONST BITMAPINFO*,UINT); HENHMETAFILE WINAPI SetEnhMetaFileBits(UINT,const BYTE*); int WINAPI SetGraphicsMode(HDC,int); int WINAPI SetICMMode(HDC,int); Propchange: branches/arwinss/reactos/include/psdk/wingdi.h ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sat Jul 31 12:20:50 2010 @@ -1,0 +1,2 @@ +/branches/ros-amd64-bringup/reactos/include/psdk/wingdi.h:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454 +/trunk/reactos/include/psdk/wingdi.h:42000-48381

1 0

[gadamopoulos] 48381: [explorer] - Using msvc doesn't mean using ms sdks
by gadamopoulos＠svn.reactos.org 31 Jul '10

31 Jul '10

Author: gadamopoulos Date: Sat Jul 31 12:16:03 2010 New Revision: 48381 URL: http://svn.reactos.org/svn/reactos?rev=48381&view=rev Log: [explorer] - Using msvc doesn't mean using ms sdks Modified: trunk/reactos/base/shell/explorer/utility/utility.h Modified: trunk/reactos/base/shell/explorer/utility/utility.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/utility.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/utility/utility.h [iso-8859-1] Sat Jul 31 12:16:03 2010 @@ -39,9 +39,7 @@ #include <windowsx.h> // for SelectBrush(), ListBox_SetSel(), SubclassWindow(), ... #include <commctrl.h> -#ifndef _MSC_VER #include <objbase.h> -#endif #include <oleauto.h> // for VARIANT #include <malloc.h> // for alloca()

1 0

[fireball] 48380: - Fix incorrect function definitions. To be submitted upstream.
by fireball＠svn.reactos.org 31 Jul '10

31 Jul '10

Author: fireball Date: Sat Jul 31 12:08:50 2010 New Revision: 48380 URL: http://svn.reactos.org/svn/reactos?rev=48380&view=rev Log: - Fix incorrect function definitions. To be submitted upstream. Modified: branches/arwinss/reactos/dll/win32/gdi32/bitmap.c branches/arwinss/reactos/dll/win32/gdi32/enhmetafile.c branches/arwinss/reactos/dll/win32/gdi32/font.c branches/arwinss/reactos/dll/win32/gdi32/painting.c Modified: branches/arwinss/reactos/dll/win32/gdi32/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/bitmap.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/bitmap.c [iso-8859-1] Sat Jul 31 12:08:50 2010 @@ -433,7 +433,7 @@ */ LONG WINAPI SetBitmapBits( HBITMAP hbitmap, /* [in] Handle to bitmap */ - LONG count, /* [in] Number of bytes in bitmap array */ + DWORD count, /* [in] Number of bytes in bitmap array */ LPCVOID bits) /* [in] Address of array with bitmap bits */ { BITMAPOBJ *bmp; Modified: branches/arwinss/reactos/dll/win32/gdi32/enhmetafile.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/enhmetafile.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/enhmetafile.c [iso-8859-1] Sat Jul 31 12:08:50 2010 @@ -177,7 +177,7 @@ X(EMR_TRANSPARENTBLT), X(EMR_RESERVED_117), X(EMR_GRADIENTFILL), -X(EMR_SETLINKEDUFI), +X(EMR_SETLINKEDUFIS), X(EMR_SETTEXTJUSTIFICATION), X(EMR_COLORMATCHTOTARGETW), X(EMR_CREATECOLORSPACEW) @@ -2180,7 +2180,7 @@ case EMR_SETICMPROFILEW: case EMR_TRANSPARENTBLT: case EMR_GRADIENTFILL: - case EMR_SETLINKEDUFI: + case EMR_SETLINKEDUFIS: case EMR_COLORMATCHTOTARGETW: case EMR_CREATECOLORSPACEW: Modified: branches/arwinss/reactos/dll/win32/gdi32/font.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/font.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/font.c [iso-8859-1] Sat Jul 31 12:08:50 2010 @@ -3218,7 +3218,7 @@ /*********************************************************************** * GetTextCharset (GDI32.@) */ -UINT WINAPI GetTextCharset(HDC hdc) +int WINAPI GetTextCharset(HDC hdc) { /* MSDN docs say this is equivalent */ return GetTextCharsetInfo(hdc, NULL, 0); @@ -3227,7 +3227,7 @@ /*********************************************************************** * GetTextCharsetInfo (GDI32.@) */ -UINT WINAPI GetTextCharsetInfo(HDC hdc, LPFONTSIGNATURE fs, DWORD flags) +int WINAPI GetTextCharsetInfo(HDC hdc, LPFONTSIGNATURE fs, DWORD flags) { UINT ret = DEFAULT_CHARSET; DC *dc = get_dc_ptr(hdc); Modified: branches/arwinss/reactos/dll/win32/gdi32/painting.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/painting.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/painting.c [iso-8859-1] Sat Jul 31 12:08:50 2010 @@ -671,7 +671,7 @@ * PolyPolygon (GDI32.@) */ BOOL WINAPI PolyPolygon( HDC hdc, const POINT* pt, const INT* counts, - UINT polygons ) + int polygons ) { BOOL ret = FALSE; DC * dc = get_dc_ptr( hdc ); @@ -883,7 +883,7 @@ * PolyDraw (GDI32.@) */ BOOL WINAPI PolyDraw(HDC hdc, const POINT *lppt, const BYTE *lpbTypes, - DWORD cCount) + int cCount) { DC *dc; BOOL result = FALSE;

1 0

[fireball] 48379: [PSDK] - Fix GetTextCharsetInfo prototype according to MS Platform SDK.
by fireball＠svn.reactos.org 31 Jul '10

31 Jul '10

Author: fireball Date: Sat Jul 31 12:02:46 2010 New Revision: 48379 URL: http://svn.reactos.org/svn/reactos?rev=48379&view=rev Log: [PSDK] - Fix GetTextCharsetInfo prototype according to MS Platform SDK. Modified: trunk/reactos/include/psdk/wingdi.h Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Sat Jul 31 12:02:46 2010 @@ -3094,7 +3094,7 @@ UINT WINAPI GetTextAlign(HDC); int WINAPI GetTextCharacterExtra(HDC); int WINAPI GetTextCharset(HDC); -UINT WINAPI GetTextCharsetInfo(HDC,LPFONTSIGNATURE,DWORD); +int WINAPI GetTextCharsetInfo(HDC,LPFONTSIGNATURE,DWORD); COLORREF WINAPI GetTextColor(HDC); BOOL WINAPI GetTextExtentExPointA(HDC,LPCSTR,int,int,LPINT,LPINT,LPSIZE); BOOL WINAPI GetTextExtentExPointW( HDC,LPCWSTR,int,int,LPINT,LPINT,LPSIZE );

1 0

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 July 2010