Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 28190: - Make a Subfolder for Patches. - Add w3seek's MinGW GCC 4.1.X Branch Patch.
by dreimer＠svn.reactos.org 06 Aug '07

06 Aug '07

Author: dreimer Date: Mon Aug 6 15:53:48 2007 New Revision: 28190 URL: http://svn.reactos.org/svn/reactos?rev=28190&view=rev Log: - Make a Subfolder for Patches. - Add w3seek's MinGW GCC 4.1.X Branch Patch. Added: trunk/tools/RosBE-Windows/Patches/ trunk/tools/RosBE-Windows/Patches/ld.patch trunk/tools/RosBE-Windows/Patches/mingw-lazy-port-gcc-4_1-branch.patch Removed: trunk/tools/RosBE-Windows/Root/ld.patch Added: trunk/tools/RosBE-Windows/Patches/ld.patch URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Patches/ld.pat… ============================================================================== --- trunk/tools/RosBE-Windows/Patches/ld.patch (added) +++ trunk/tools/RosBE-Windows/Patches/ld.patch Mon Aug 6 15:53:48 2007 @@ -1,0 +1,15 @@ +--- ld/pe-dll.c Thu Jul 19 13:12:24 2007 ++++ ld/pe-dll.c Fri Aug 3 09:53:58 2007 +@@ -524,10 +524,9 @@ + } + } + +- /* If we are not building a DLL, when there are no exports ++ /* If there are no exports + we do not build an export table at all. */ +- if (!pe_dll_export_everything && pe_def_file->num_exports == 0 +- && info->executable) ++ if (!pe_dll_export_everything && pe_def_file->num_exports == 0) + return; + + /* Now, maybe export everything else the default way. */ Added: trunk/tools/RosBE-Windows/Patches/mingw-lazy-port-gcc-4_1-branch.patch URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Patches/mingw-… ============================================================================== --- trunk/tools/RosBE-Windows/Patches/mingw-lazy-port-gcc-4_1-branch.patch (added) +++ trunk/tools/RosBE-Windows/Patches/mingw-lazy-port-gcc-4_1-branch.patch Mon Aug 6 15:53:48 2007 @@ -1,0 +1,278 @@ +Index: gcc/config/i386/cygming.h +=================================================================== +--- gcc/config/i386/cygming.h (revision 125623) ++++ gcc/config/i386/cygming.h (working copy) +@@ -335,6 +335,7 @@ + extern void i386_pe_file_end (void); + extern int i386_pe_dllexport_name_p (const char *); + extern int i386_pe_dllimport_name_p (const char *); ++extern void i386_pe_decorate_assembler_name (tree); + + /* For Win32 ABI compatibility */ + #undef DEFAULT_PCC_STRUCT_RETURN +@@ -412,6 +413,7 @@ + + #define TARGET_VALID_DLLIMPORT_ATTRIBUTE_P i386_pe_valid_dllimport_attribute_p + #define TARGET_CXX_ADJUST_CLASS_AT_DEFINITION i386_pe_adjust_class_at_definition ++#define TARGET_ASM_CHANGE_EXTERN_NAME i386_pe_decorate_assembler_name + + #undef TREE + +Index: gcc/config/i386/host-mingw32.c +=================================================================== +--- gcc/config/i386/host-mingw32.c (revision 125623) ++++ gcc/config/i386/host-mingw32.c (working copy) +@@ -28,6 +28,8 @@ + + + #define WIN32_LEAN_AND_MEAN /* Not so important if we have windows.h.gch. */ ++#include <tchar.h> ++#include <stdlib.h> + #include <windows.h> + + static void * mingw32_gt_pch_get_address (size_t, int); +@@ -47,7 +49,7 @@ + static const size_t pch_VA_max_size = 128 * 1024 * 1024; + + /* Granularity for reserving address space. */ +-static const size_t va_granularity = 0x10000; ++static size_t va_granularity = 0x10000; + + /* Print out the GetLastError() translation. */ + static inline void +@@ -70,7 +72,9 @@ + /* Granularity for reserving address space. */ + static size_t mingw32_gt_pch_alloc_granularity (void) + { +- return va_granularity; ++ SYSTEM_INFO SysInfo; ++ GetSystemInfo(&SysInfo); ++ return (va_granularity = (size_t)SysInfo.dwAllocationGranularity); + } + + /* Identify an address that's likely to be free in a subsequent invocation +@@ -125,9 +129,23 @@ + if ((offset & (va_granularity - 1)) != 0 || size > pch_VA_max_size) + return -1; + +- mmap_handle = CreateFileMapping ((HANDLE) _get_osfhandle (fd), +- NULL, PAGE_WRITECOPY | SEC_COMMIT, +- 0, 0, NULL); ++ srand(1); ++ while (1) ++ { ++ TCHAR szMappingName[26]; ++ ++ /* Generate a unique mapping name. This is neccessary to avoid ++ needing the SeCreateGlobalPrivilege privilege in certain cases */ ++ _stprintf(szMappingName, _T("Local\\MinGWGCCPCH%08X"), rand()); ++ mmap_handle = CreateFileMapping ((HANDLE) _get_osfhandle (fd), ++ NULL, PAGE_WRITECOPY | SEC_COMMIT, ++ 0, 0, szMappingName); ++ if (mmap_handle != NULL && GetLastError() == ERROR_ALREADY_EXISTS) ++ CloseHandle(mmap_handle); ++ else ++ break; ++ } ++ + if (mmap_handle == NULL) + { + w32_error (__FUNCTION__, __FILE__, __LINE__, "CreateFileMapping"); +Index: gcc/config/i386/winnt.c +=================================================================== +--- gcc/config/i386/winnt.c (revision 125623) ++++ gcc/config/i386/winnt.c (working copy) +@@ -335,33 +335,38 @@ + } + + void +-i386_pe_encode_section_info (tree decl, rtx rtl, int first) ++i386_pe_decorate_assembler_name (tree decl) + { +- default_encode_section_info (decl, rtl, first); ++ tree type_attributes = TYPE_ATTRIBUTES (TREE_TYPE (decl)); ++ tree newid = NULL_TREE; + +- if (first && TREE_CODE (decl) == FUNCTION_DECL) +- { +- tree type_attributes = TYPE_ATTRIBUTES (TREE_TYPE (decl)); +- tree newid = NULL_TREE; ++ if (lookup_attribute ("stdcall", type_attributes)) ++ newid = gen_stdcall_or_fastcall_suffix (decl, false); ++ else if (lookup_attribute ("fastcall", type_attributes)) ++ newid = gen_stdcall_or_fastcall_suffix (decl, true); ++ if (newid != NULL_TREE) ++ { ++ rtx rtlname = XEXP (DECL_RTL (decl), 0); ++ if (GET_CODE (rtlname) == MEM) ++ rtlname = XEXP (rtlname, 0); ++ XSTR (rtlname, 0) = IDENTIFIER_POINTER (newid); + +- if (lookup_attribute ("stdcall", type_attributes)) +- newid = gen_stdcall_or_fastcall_suffix (decl, false); +- else if (lookup_attribute ("fastcall", type_attributes)) +- newid = gen_stdcall_or_fastcall_suffix (decl, true); +- if (newid != NULL_TREE) +- { +- rtx rtlname = XEXP (rtl, 0); +- if (GET_CODE (rtlname) == MEM) +- rtlname = XEXP (rtlname, 0); +- XSTR (rtlname, 0) = IDENTIFIER_POINTER (newid); +- /* These attributes must be present on first declaration, ++ /* These attributes must be present on first declaration, + change_decl_assembler_name will warn if they are added + later and the decl has been referenced, but duplicate_decls + should catch the mismatch before this is called. */ + change_decl_assembler_name (decl, newid); +- } + } ++ } + ++void ++i386_pe_encode_section_info (tree decl, rtx rtl, int first) ++{ ++ default_encode_section_info (decl, rtl, first); ++ ++ if (first && TREE_CODE (decl) == FUNCTION_DECL) ++ i386_pe_decorate_assembler_name (decl); ++ + /* Mark the decl so we can tell from the rtl whether the object is + dllexport'd or dllimport'd. tree.c: merge_dllimport_decl_attributes + handles dllexport/dllimport override semantics. */ +Index: gcc/cp/method.c +=================================================================== +--- gcc/cp/method.c (revision 125623) ++++ gcc/cp/method.c (working copy) +@@ -350,6 +350,8 @@ + this translation unit. */ + TREE_ADDRESSABLE (function) = 1; + mark_used (function); ++ /* The DECL_ASSEMBLER_NAME of the thunked function may need modification. */ ++ targetm.asm_out.change_extern_name (function); + if (!emit_p) + return; + +Index: gcc/target-def.h +=================================================================== +--- gcc/target-def.h (revision 125623) ++++ gcc/target-def.h (working copy) +@@ -205,6 +205,10 @@ + #define TARGET_ASM_OUTPUT_DWARF_DTPREL NULL + #endif + ++#ifndef TARGET_ASM_CHANGE_EXTERN_NAME ++#define TARGET_ASM_CHANGE_EXTERN_NAME hook_void_tree ++#endif ++ + #define TARGET_ASM_ALIGNED_INT_OP \ + {TARGET_ASM_ALIGNED_HI_OP, \ + TARGET_ASM_ALIGNED_SI_OP, \ +@@ -248,7 +252,8 @@ + TARGET_ASM_FILE_END, \ + TARGET_ASM_EXTERNAL_LIBCALL, \ + TARGET_ASM_MARK_DECL_PRESERVED, \ +- TARGET_ASM_OUTPUT_DWARF_DTPREL} ++ TARGET_ASM_OUTPUT_DWARF_DTPREL, \ ++ TARGET_ASM_CHANGE_EXTERN_NAME} + + /* Scheduler hooks. All of these default to null pointers, which + haifa-sched.c looks for and handles. */ +Index: gcc/target.h +=================================================================== +--- gcc/target.h (revision 125623) ++++ gcc/target.h (working copy) +@@ -186,6 +186,13 @@ + /* Output a DTP-relative reference to a TLS symbol. */ + void (*output_dwarf_dtprel) (FILE *file, int size, rtx x); + ++/* This target hook allows the operating system to modify the extern ++ assembler name ++ of a DECL. For example, windows targets use this to decorate stdcall and ++ fastcall functions ++ with a a trailing '@n'. */ ++ void (*change_extern_name) (tree decl); ++ + } asm_out; + + /* Functions relating to instruction scheduling. */ +Index: libstdc++-v3/config/os/mingw32/os_defines.h +=================================================================== +--- libstdc++-v3/config/os/mingw32/os_defines.h (revision 125623) ++++ libstdc++-v3/config/os/mingw32/os_defines.h (working copy) +@@ -45,6 +45,13 @@ + #undef NOMINMAX + #define NOMINMAX 1 + ++// mingw32 local hack: Override _GLIBCXX_USE_WCHAR_T for wstring ++#define _GLIBCXX_USE_WSTRING 1 ++ ++// mingw32 local hack: Cast long double to doubles to workaround ++// printf bug. ++#define _GLIBCXX_NO_LONG_DOUBLE_IO 0 ++ + // See libstdc++/20806. + #define _GLIBCXX_HAVE_DOS_BASED_FILESYSTEM 1 + +Index: libstdc++-v3/include/bits/char_traits.h +=================================================================== +--- libstdc++-v3/include/bits/char_traits.h (revision 125623) ++++ libstdc++-v3/include/bits/char_traits.h (working copy) +@@ -295,7 +295,7 @@ + }; + + +-#ifdef _GLIBCXX_USE_WCHAR_T ++#if defined (_GLIBCXX_USE_WCHAR_T) || defined (_GLIBCXX_USE_WSTRING) + /// @brief 21.1.3.2 char_traits specializations + template<> + struct char_traits<wchar_t> +@@ -303,8 +303,10 @@ + typedef wchar_t char_type; + typedef wint_t int_type; + typedef streamoff off_type; ++#if defined (_GLIBCXX_USE_WCHAR_T) + typedef wstreampos pos_type; + typedef mbstate_t state_type; ++#endif + + static void + assign(char_type& __c1, const char_type& __c2) +Index: libstdc++-v3/include/bits/stringfwd.h +=================================================================== +--- libstdc++-v3/include/bits/stringfwd.h (revision 125623) ++++ libstdc++-v3/include/bits/stringfwd.h (working copy) +@@ -59,7 +59,7 @@ + + typedef basic_string<char> string; + +-#ifdef _GLIBCXX_USE_WCHAR_T ++#if defined (_GLIBCXX_USE_WCHAR_T) || defined (_GLIBCXX_USE_WSTRING) + template<> struct char_traits<wchar_t>; + + typedef basic_string<wchar_t> wstring; +Index: libstdc++-v3/include/c_std/std_cwchar.h +=================================================================== +--- libstdc++-v3/include/c_std/std_cwchar.h (revision 125623) ++++ libstdc++-v3/include/c_std/std_cwchar.h (working copy) +@@ -138,7 +138,7 @@ + #undef wprintf + #undef wscanf + +-#if _GLIBCXX_USE_WCHAR_T ++#if _GLIBCXX_USE_WCHAR_T || _GLIBCXX_USE_WSTRING + namespace std + { + using ::wint_t; +Index: libstdc++-v3/include/c_std/std_cwctype.h +=================================================================== +--- libstdc++-v3/include/c_std/std_cwctype.h (revision 125623) ++++ libstdc++-v3/include/c_std/std_cwctype.h (working copy) +@@ -75,7 +75,7 @@ + #undef wctrans + #undef wctype + +-#if _GLIBCXX_USE_WCHAR_T ++#if _GLIBCXX_USE_WCHAR_T || _GLIBCXX_USE_WSTRING + namespace std + { + using ::wint_t; // cwchar Removed: trunk/tools/RosBE-Windows/Root/ld.patch URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ld.patch?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/ld.patch (original) +++ trunk/tools/RosBE-Windows/Root/ld.patch (removed) @@ -1,15 +1,0 @@ ---- ld/pe-dll.c Thu Jul 19 13:12:24 2007 -+++ ld/pe-dll.c Fri Aug 3 09:53:58 2007 -@@ -524,10 +524,9 @@ - } - } - -- /* If we are not building a DLL, when there are no exports -+ /* If there are no exports - we do not build an export table at all. */ -- if (!pe_dll_export_everything && pe_def_file->num_exports == 0 -- && info->executable) -+ if (!pe_dll_export_everything && pe_def_file->num_exports == 0) - return; - - /* Now, maybe export everything else the default way. */

1 0

[hpoussin] 28189: Remove ARCH define in config.template.rbuild. It is a duplicate of the ROS_ARCH environment variable.
by hpoussin＠svn.reactos.org 06 Aug '07

06 Aug '07

Author: hpoussin Date: Mon Aug 6 13:25:03 2007 New Revision: 28189 URL: http://svn.reactos.org/svn/reactos?rev=28189&view=rev Log: Remove ARCH define in config.template.rbuild. It is a duplicate of the ROS_ARCH environment variable. Modified: trunk/reactos/Makefile trunk/reactos/config-ppc.template.rbuild trunk/reactos/config.template.rbuild Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=28189&r1=2818… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Mon Aug 6 13:25:03 2007 @@ -380,7 +380,7 @@ endif INSTALL_ := $(INSTALL)$(SEP) -RBUILD_FLAGS := -rReactOS-$(ARCH).rbuild +RBUILD_FLAGS := -rReactOS-$(ARCH).rbuild -DARCH=$(ARCH) $(INTERMEDIATE): ${mkdir} $@ Modified: trunk/reactos/config-ppc.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config-ppc.template.rbuild… ============================================================================== --- trunk/reactos/config-ppc.template.rbuild (original) +++ trunk/reactos/config-ppc.template.rbuild Mon Aug 6 13:25:03 2007 @@ -11,12 +11,6 @@ options can obtain any value specified in the comment before it. --> - - -<property name="ARCH" value="powerpc" />  - - -<property name="ARCH" value="i386" /> <!-- Sub-architecture to build for. Specify one of:

1 0

[hpoussin] 28188: Add -D option to add variables in generated file
by hpoussin＠svn.reactos.org 06 Aug '07

06 Aug '07

Author: hpoussin Date: Mon Aug 6 13:19:25 2007 New Revision: 28188 URL: http://svn.reactos.org/svn/reactos?rev=28188&view=rev Log: Add -D option to add variables in generated file Modified: trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/project.cpp trunk/reactos/tools/rbuild/rbuild.cpp trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Mon Aug 6 13:19:25 2007 @@ -1509,17 +1509,25 @@ Property::Property ( const XMLElement& node_, const Project& project_, const Module* module_ ) - : node(node_), project(project_), module(module_) + : project(project_), module(module_) { const XMLAttribute* att; - att = node.GetAttribute ( "name", true ); + att = node_.GetAttribute ( "name", true ); assert(att); name = att->value; - att = node.GetAttribute ( "value", true ); + att = node_.GetAttribute ( "value", true ); assert(att); value = att->value; +} + +Property::Property ( const Project& project_, + const Module* module_, + const std::string& name_, + const std::string& value_ ) + : project(project_), module(module_), name(name_), value(value_) +{ } void Modified: trunk/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/project.cpp?r… ============================================================================== --- trunk/reactos/tools/rbuild/project.cpp (original) +++ trunk/reactos/tools/rbuild/project.cpp Mon Aug 6 13:19:25 2007 @@ -103,13 +103,29 @@ Project::Project ( const Configuration& configuration, - const string& filename ) + const string& filename, + const std::map<std::string, std::string>* properties ) : xmlfile (filename), node (NULL), head (NULL), configuration (configuration) { _backend = NULL; + + if ( properties ) + { + std::map<string, string>::const_iterator it; + for (it = properties->begin (); it != properties->end (); it++) + { + const Property *existing = LookupProperty( it->first ); + if ( !existing ) + { + Property* property = new Property ( *this, NULL, it->first, it->second ); + non_if_data.properties.push_back (property ); + } + } + } + ReadXml(); } Modified: trunk/reactos/tools/rbuild/rbuild.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.cpp (original) +++ trunk/reactos/tools/rbuild/rbuild.cpp Mon Aug 6 13:19:25 2007 @@ -35,6 +35,7 @@ static string BuildSystem; static string RootXmlFile; static Configuration configuration; +static std::map<string, string> properties; bool ParseAutomaticDependencySwitch ( @@ -164,6 +165,28 @@ switchChar2 ); return false; } + return true; +} + +bool +ParseDefineSwitch ( char* switchStart ) +{ + string s = string ( switchStart + 2 ); + string::size_type separator = s.find ( '=' ); + if ( separator == string::npos || separator == 0 ) + { + printf ( "Invalid define switch: '%s'\n", switchStart ); + return false; + } + if ( s.find ( '=', separator + 1 ) != string::npos ) + { + printf ( "Invalid define switch: '%s'\n", switchStart ); + return false; + } + + string var = s.substr ( 0, separator ); + string val = s.substr ( separator + 1 ); + properties.insert ( std::pair<string, string> ( var, val ) ); return true; } @@ -202,6 +225,8 @@ return ParseMakeSwitch ( switchChar2 ); case 'p': return ParseProxyMakefileSwitch ( switchChar2 ); + case 'D': + return ParseDefineSwitch ( argv[index] ); default: printf ( "Unknown switch -%c\n", @@ -253,6 +278,7 @@ printf ( " tree.\n" ); printf ( " -vs{version} Version of MS VS project files. Default is %s.\n", MS_VS_DEF_VERSION ); printf ( " -vo{version|configuration} Adds subdirectory path to the default Intermediate-Outputdirectory.\n" ); + printf ( " -Dvar=val Set the value of 'var' variable to 'val'.\n" ); printf ( "\n" ); printf ( " buildsystem Target build system. Can be one of:\n" ); @@ -272,7 +298,7 @@ string projectFilename ( RootXmlFile ); printf ( "Reading build files..." ); - Project project ( configuration, projectFilename ); + Project project ( configuration, projectFilename, &properties ); printf ( "done\n" ); project.SetBackend ( Backend::Factory::Create ( Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Mon Aug 6 13:19:25 2007 @@ -215,7 +215,8 @@ IfableData non_if_data; Project ( const Configuration& configuration, - const std::string& filename ); + const std::string& filename, + const std::map<std::string, std::string>* properties = NULL ); ~Project (); void SetBackend ( Backend* backend ) { _backend = backend; } Backend& GetBackend() { return *_backend; } @@ -590,7 +591,6 @@ class Property { public: - const XMLElement& node; const Project& project; const Module* module; std::string name, value; @@ -598,6 +598,11 @@ Property ( const XMLElement& node_, const Project& project_, const Module* module_ ); + + Property ( const Project& project_, + const Module* module_, + const std::string& name_, + const std::string& value_ ); void ProcessXML(); };

1 0

[cfinck] 28187: Verify the login credentials with the data in the RosCMS Database instead of the data in the Bugzilla Database. This is necessary as the login data in the Bugzilla Database is not synchronized with the login data in the RosCMS Database due to our RosCMS Integration.
by cfinck＠svn.reactos.org 06 Aug '07

06 Aug '07

Author: cfinck Date: Mon Aug 6 13:17:37 2007 New Revision: 28187 URL: http://svn.reactos.org/svn/reactos?rev=28187&view=rev Log: Verify the login credentials with the data in the RosCMS Database instead of the data in the Bugzilla Database. This is necessary as the login data in the Bugzilla Database is not synchronized with the login data in the RosCMS Database due to our RosCMS Integration. Modified: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Login/ROSCMS.pm trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Verify/ROSCMS.pm Modified: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Login/ROSCMS.pm URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/Bu… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Login/ROSCMS.pm (original) +++ trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Login/ROSCMS.pm Mon Aug 6 13:17:37 2007 @@ -30,7 +30,7 @@ # Auth::Login class for RosCMS # based on the former class for Bugzilla 2.x by Gé van Geldorp and Michael Wirth and the Auth::Login::CGI class -# improved and made compatible with Bugzilla 3.x and Deskzilla by Colin Finck (2007-07-29) +# improved and made compatible with Bugzilla 3.x and Deskzilla by Colin Finck (2007-08-06) package Bugzilla::Auth::Login::ROSCMS; use strict; @@ -66,7 +66,9 @@ # No, then check for the RosCMS Login cookie my $dbh = Bugzilla->dbh; my $user_id; + my $roscms_user_id; my $session_id = $cgi->cookie($session_cookie_name); + if ( defined $session_id ) { my $session_id_clean = $session_id; trick_taint($session_id_clean); @@ -78,7 +80,7 @@ } my $browser_agent_clean = $ENV{'HTTP_USER_AGENT'}; trick_taint($browser_agent_clean); - my $query = "SELECT m.map_subsys_userid " . + my $query = "SELECT m.map_subsys_userid, m.map_roscms_userid " . " FROM $roscms_db_name.user_sessions s, " . " $roscms_db_name.users u, " . " $roscms_db_name.subsys_mappings m " . @@ -93,7 +95,8 @@ " AND m.map_roscms_userid = s.usersession_user_id " . " AND m.map_subsys_name = 'bugzilla'"; my @params = ($session_id_clean, $remote_addr_clean, $browser_agent_clean); - ($user_id) = $dbh->selectrow_array($query, undef, @params); + ($user_id, $roscms_user_id) = $dbh->selectrow_array($query, undef, @params); + if ($user_id) { # Update time of last session use $query = "UPDATE $roscms_db_name.user_sessions " . @@ -103,14 +106,16 @@ @params = ($session_id_clean); $dbh->do($query, undef, @params); - # Get the user name and the crypted password from the database + # Get the user name and the MD5 password from the database + # We don't check the password explicitly here as we only deal with the session cookie. + # To show the Verify module that it should trust us, we pass the MD5 password hash to it. This should be secure as long as we're the only one who knows this MD5 hash. my $username = user_id_to_login($user_id); - my $crypted_password = $dbh->selectrow_array("SELECT cryptpassword FROM profiles WHERE userid = ?", undef, $user_id); + (my $md5_password) = $dbh->selectrow_array("SELECT user_roscms_password FROM $roscms_db_name.users WHERE user_id = ?", undef, $roscms_user_id); # We need to set a parameter for the Auth::Persist::ROSCMS module $cgi->param('ROSCMS_login', 1); - return { username => $username, crypted_password => $crypted_password }; + return { username => $username, md5_password => $md5_password }; } } Modified: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Verify/ROSCMS.pm URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/Bu… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Verify/ROSCMS.pm (original) +++ trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Verify/ROSCMS.pm Mon Aug 6 13:17:37 2007 @@ -28,7 +28,7 @@ # Erik Stambaugh <erik(a)dasbistro.com> # Auth::Verify class for RosCMS -# developed by Colin Finck based on the Auth::Verify::DB class (2007-07-29) +# developed by Colin Finck based on the Auth::Verify::DB class (2007-08-06) package Bugzilla::Auth::Verify::ROSCMS; use strict; @@ -40,6 +40,10 @@ use Bugzilla::Util; use Bugzilla::User; +use Digest::MD5 qw(md5_hex); + +my $roscms_db_name = "roscms"; + sub check_credentials { my ($self, $login_data) = @_; my $dbh = Bugzilla->dbh; @@ -50,20 +54,24 @@ return { failure => AUTH_NO_SUCH_USER } unless $user_id; $login_data->{bz_username} = $username; - - my ($real_password_crypted) = $dbh->selectrow_array("SELECT cryptpassword FROM profiles WHERE userid = ?", undef, $user_id); - my $entered_password_crypted = $login_data->{crypted_password}; + my $md5_password = $login_data->{md5_password}; - if( !defined $entered_password_crypted ) { + if( !defined $md5_password ) + { my $password = $login_data->{password}; - - # Using the internal crypted password as the salt, - # crypt the password the user entered. - $entered_password_crypted = crypt($password, $real_password_crypted); + $md5_password = md5_hex($password); } + my $query = "SELECT u.user_roscms_password " . + "FROM $roscms_db_name.users u, " . + " $roscms_db_name.subsys_mappings m " . + "WHERE u.user_id = m.map_roscms_userid " . + " AND m.map_subsys_name = 'bugzilla' " . + " AND m.map_subsys_userid = ?"; + (my $valid_md5_password) = $dbh->selectrow_array($query, undef, $user_id); + return { failure => AUTH_LOGINFAILED } - if $entered_password_crypted ne $real_password_crypted; + if $md5_password ne $valid_md5_password; # The user's credentials are okay, so delete any outstanding # password tokens they may have generated.

1 0

[jimtabor] 28186: Moved Brush Origin to Dc_attr.
by jimtabor＠svn.reactos.org 06 Aug '07

06 Aug '07

Author: jimtabor Date: Mon Aug 6 12:28:54 2007 New Revision: 28186 URL: http://svn.reactos.org/svn/reactos?rev=28186&view=rev Log: Moved Brush Origin to Dc_attr. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/objects/brush.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Mon Aug 6 12:28:54 2007 @@ -35,9 +35,6 @@ GdiPath path; /* #endif */ - - short brushOrgX; - short brushOrgY; short breakTotalExtra; /* Total extra space for justification */ short breakCount; /* Break char. count */ Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/brush.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/brush.c Mon Aug 6 12:28:54 2007 @@ -717,8 +717,8 @@ { NTSTATUS Status = STATUS_SUCCESS; POINT SafePoint; - SafePoint.x = dc->w.brushOrgX; - SafePoint.y = dc->w.brushOrgY; + SafePoint.x = dc->Dc_Attr.ptlBrushOrigin.x; + SafePoint.y = dc->Dc_Attr.ptlBrushOrigin.y; _SEH_TRY { ProbeForWrite(Point, @@ -740,8 +740,8 @@ } } - dc->w.brushOrgX = XOrg; - dc->w.brushOrgY = YOrg; + dc->Dc_Attr.ptlBrushOrigin.x = XOrg; + dc->Dc_Attr.ptlBrushOrigin.y = YOrg; DC_UnlockDc(dc); return TRUE; Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Mon Aug 6 12:28:54 2007 @@ -1100,7 +1100,7 @@ DC_GET_VAL( COLORREF, NtGdiGetBkColor, Dc_Attr.crBackgroundClr ) DC_GET_VAL( INT, NtGdiGetBkMode, Dc_Attr.jBkMode ) -DC_GET_VAL_EX( GetBrushOrgEx, w.brushOrgX, w.brushOrgY, POINT, x, y ) +DC_GET_VAL_EX( GetBrushOrgEx, Dc_Attr.ptlBrushOrigin.x, Dc_Attr.ptlBrushOrigin.y, POINT, x, y ) DC_GET_VAL( HRGN, NtGdiGetClipRgn, w.hClipRgn ) HGDIOBJ STDCALL @@ -1272,8 +1272,8 @@ newdc->Dc_Attr.jBkMode = dc->Dc_Attr.jBkMode; newdc->Dc_Attr.crBackgroundClr = dc->Dc_Attr.crBackgroundClr; newdc->Dc_Attr.crForegroundClr = dc->Dc_Attr.crForegroundClr; - newdc->w.brushOrgX = dc->w.brushOrgX; - newdc->w.brushOrgY = dc->w.brushOrgY; + newdc->Dc_Attr.ptlBrushOrigin.x = dc->Dc_Attr.ptlBrushOrigin.x; + newdc->Dc_Attr.ptlBrushOrigin.y = dc->Dc_Attr.ptlBrushOrigin.y; newdc->Dc_Attr.lTextAlign = dc->Dc_Attr.lTextAlign; newdc->Dc_Attr.lTextExtra = dc->Dc_Attr.lTextExtra; newdc->w.breakTotalExtra = dc->w.breakTotalExtra; @@ -1355,8 +1355,8 @@ dc->Dc_Attr.jBkMode = dcs->Dc_Attr.jBkMode; dc->Dc_Attr.crBackgroundClr = dcs->Dc_Attr.crBackgroundClr; dc->Dc_Attr.crForegroundClr = dcs->Dc_Attr.crForegroundClr; - dc->w.brushOrgX = dcs->w.brushOrgX; - dc->w.brushOrgY = dcs->w.brushOrgY; + dc->Dc_Attr.ptlBrushOrigin.x = dcs->Dc_Attr.ptlBrushOrigin.x; + dc->Dc_Attr.ptlBrushOrigin.y = dcs->Dc_Attr.ptlBrushOrigin.y; dc->Dc_Attr.lTextAlign = dcs->Dc_Attr.lTextAlign; dc->Dc_Attr.lTextExtra = dcs->Dc_Attr.lTextExtra; dc->w.breakTotalExtra = dcs->w.breakTotalExtra; Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c Mon Aug 6 12:28:54 2007 @@ -2575,8 +2575,8 @@ ASSERT(pBrush); IntGdiInitBrushInstance(&BrushInst, pBrush, dc->XlateBrush); - BrushOrigin.x = dc->w.brushOrgX; - BrushOrigin.y = dc->w.brushOrgY; + BrushOrigin.x = dc->Dc_Attr.ptlBrushOrigin.x; + BrushOrigin.y = dc->Dc_Attr.ptlBrushOrigin.y; BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); /* FIXME - Handle BitmapObj == NULL !!!! */

1 0

[jimtabor] 28185: Fix typo.
by jimtabor＠svn.reactos.org 06 Aug '07

06 Aug '07

Author: jimtabor Date: Mon Aug 6 10:28:39 2007 New Revision: 28185 URL: http://svn.reactos.org/svn/reactos?rev=28185&view=rev Log: Fix typo. Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/path.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/path.c Mon Aug 6 10:28:39 2007 @@ -1606,7 +1606,7 @@ dc->Dc_Attr.ptlWindowOrg.y = ptWindowOrg.y; dc->Dc_Attr.szlViewportExt.cx = szViewportExt.cx; - dc->Dc_Attr.szlViewportExt.cx = szViewportExt.cy; + dc->Dc_Attr.szlViewportExt.cy = szViewportExt.cy; dc->Dc_Attr.ptlViewportOrg.x = ptViewportOrg.x; dc->Dc_Attr.ptlViewportOrg.y = ptViewportOrg.y;

1 0

[jimtabor] 28184: Move Window and Viewport Ext and Org to Dc_Attr. Tested it with qemu.
by jimtabor＠svn.reactos.org 06 Aug '07

06 Aug '07

Author: jimtabor Date: Mon Aug 6 09:13:47 2007 New Revision: 28184 URL: http://svn.reactos.org/svn/reactos?rev=28184&view=rev Log: Move Window and Viewport Ext and Org to Dc_Attr. Tested it with qemu. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/include/gdifloat.h trunk/reactos/subsystems/win32/win32k/objects/coord.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/path.c trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Mon Aug 6 09:13:47 2007 @@ -88,15 +88,6 @@ DRIVER_FUNCTIONS DriverFunctions; UNICODE_STRING DriverName; HANDLE DeviceDriver; - - INT wndOrgX; /* Window origin */ - INT wndOrgY; - INT wndExtX; /* Window extent */ - INT wndExtY; - INT vportOrgX; /* Viewport origin */ - INT vportOrgY; - INT vportExtX; /* Viewport extent */ - INT vportExtY; CLIPOBJ *CombinedClip; Modified: trunk/reactos/subsystems/win32/win32k/include/gdifloat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/gdifloat.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/gdifloat.h Mon Aug 6 09:13:47 2007 @@ -80,24 +80,24 @@ #define MulDiv( x, y, z ) EngMulDiv( x, y, z ) -#define XDPTOLP(dc,x) \ - (MulDiv(((x)-(dc)->vportOrgX), (dc)->wndExtX, (dc)->vportExtX) + (dc)->wndOrgX) -#define YDPTOLP(dc,y) \ - (MulDiv(((y)-(dc)->vportOrgY), (dc)->wndExtY, (dc)->vportExtY) + (dc)->wndOrgY) -#define XLPTODP(dc,x) \ - (MulDiv(((x)-(dc)->wndOrgX), (dc)->vportExtX, (dc)->wndExtX) + (dc)->vportOrgX) -#define YLPTODP(dc,y) \ - (MulDiv(((y)-(dc)->wndOrgY), (dc)->vportExtY, (dc)->wndExtY) + (dc)->vportOrgY) +#define XDPTOLP(dc,tx) \ + (MulDiv(((tx)-(dc)->Dc_Attr.ptlViewportOrg.x), (dc)->Dc_Attr.szlWindowExt.cx, (dc)->Dc_Attr.szlViewportExt.cx) + (dc)->Dc_Attr.ptlWindowOrg.x) +#define YDPTOLP(dc,ty) \ + (MulDiv(((ty)-(dc)->Dc_Attr.ptlViewportOrg.y), (dc)->Dc_Attr.szlWindowExt.cy, (dc)->Dc_Attr.szlViewportExt.cy) + (dc)->Dc_Attr.ptlWindowOrg.y) +#define XLPTODP(dc,tx) \ + (MulDiv(((tx)-(dc)->Dc_Attr.ptlWindowOrg.x), (dc)->Dc_Attr.szlViewportExt.cx, (dc)->Dc_Attr.szlWindowExt.cx) + (dc)->Dc_Attr.ptlViewportOrg.x) +#define YLPTODP(dc,ty) \ + (MulDiv(((ty)-(dc)->Dc_Attr.ptlWindowOrg.y), (dc)->Dc_Attr.szlViewportExt.cy, (dc)->Dc_Attr.szlWindowExt.cy) + (dc)->Dc_Attr.ptlViewportOrg.y) /* Device <-> logical size conversion */ -#define XDSTOLS(dc,x) \ - MulDiv((x), (dc)->wndExtX, (dc)->vportExtX) -#define YDSTOLS(dc,y) \ - MulDiv((y), (dc)->wndExtY, (dc)->vportExtY) -#define XLSTODS(dc,x) \ - MulDiv((x), (dc)->vportExtX, (dc)->wndExtX) -#define YLSTODS(dc,y) \ - MulDiv((y), (dc)->vportExtY, (dc)->wndExtY) +#define XDSTOLS(dc,tx) \ + MulDiv((tx), (dc)->Dc_Attr.szlWindowExt.cx, (dc)->Dc_Attr.szlViewportExt.cx) +#define YDSTOLS(dc,ty) \ + MulDiv((ty), (dc)->Dc_Attr.szlWindowExt.cy, (dc)->Dc_Attr.szlViewportExt.cy) +#define XLSTODS(dc,tx) \ + MulDiv((tx), (dc)->Dc_Attr.szlViewportExt.cx, (dc)->Dc_Attr.szlWindowExt.cx) +#define YLSTODS(dc,ty) \ + MulDiv((ty), (dc)->Dc_Attr.szlViewportExt.cy, (dc)->Dc_Attr.szlWindowExt.cy) #endif Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c Mon Aug 6 09:13:47 2007 @@ -37,18 +37,18 @@ void FASTCALL IntFixIsotropicMapping(PDC dc) { - ULONG xdim = EngMulDiv(dc->vportExtX, dc->GDIInfo->ulHorzSize, dc->GDIInfo->ulHorzRes) / dc->wndExtX; - ULONG ydim = EngMulDiv(dc->vportExtY, dc->GDIInfo->ulVertSize, dc->GDIInfo->ulVertRes) / dc->wndExtY; + ULONG xdim = EngMulDiv(dc->Dc_Attr.szlViewportExt.cx, dc->GDIInfo->ulHorzSize, dc->GDIInfo->ulHorzRes) / dc->Dc_Attr.szlWindowExt.cx; + ULONG ydim = EngMulDiv(dc->Dc_Attr.szlViewportExt.cy, dc->GDIInfo->ulVertSize, dc->GDIInfo->ulVertRes) / dc->Dc_Attr.szlWindowExt.cy; if (xdim > ydim) { - dc->vportExtX = dc->vportExtX * abs(ydim / xdim); - if (!dc->vportExtX) dc->vportExtX = 1; + dc->Dc_Attr.szlViewportExt.cx = dc->Dc_Attr.szlViewportExt.cx * abs(ydim / xdim); + if (!dc->Dc_Attr.szlViewportExt.cx) dc->Dc_Attr.szlViewportExt.cx = 1; } else { - dc->vportExtY = dc->vportExtY * abs(xdim / ydim); - if (!dc->vportExtY) dc->vportExtY = 1; + dc->Dc_Attr.szlViewportExt.cy = dc->Dc_Attr.szlViewportExt.cy * abs(xdim / ydim); + if (!dc->Dc_Attr.szlViewportExt.cy) dc->Dc_Attr.szlViewportExt.cy = 1; } } @@ -550,8 +550,8 @@ ProbeForWrite(UnsafePoint, sizeof(POINT), 1); - UnsafePoint->x = dc->vportOrgX; - UnsafePoint->y = dc->vportOrgY; + UnsafePoint->x = dc->Dc_Attr.ptlViewportOrg.x; + UnsafePoint->y = dc->Dc_Attr.ptlViewportOrg.y; } _SEH_HANDLE { @@ -567,8 +567,8 @@ } } - dc->vportOrgX += XOffset; - dc->vportOrgY += YOffset; + dc->Dc_Attr.ptlViewportOrg.x += XOffset; + dc->Dc_Attr.ptlViewportOrg.y += YOffset; DC_UpdateXforms(dc); DC_UnlockDc(dc); @@ -600,8 +600,8 @@ ProbeForWrite(Point, sizeof(POINT), 1); - Point->x = dc->wndOrgX; - Point->y = dc->wndOrgY; + Point->x = dc->Dc_Attr.ptlWindowOrg.x; + Point->y = dc->Dc_Attr.ptlWindowOrg.y; } _SEH_HANDLE { @@ -617,8 +617,8 @@ } } - dc->wndOrgX += XOffset; - dc->wndOrgY += YOffset; + dc->Dc_Attr.ptlWindowOrg.x += XOffset; + dc->Dc_Attr.ptlWindowOrg.y += YOffset; DC_UpdateXforms(dc); DC_UnlockDc(dc); @@ -710,46 +710,46 @@ switch (MapMode) { case MM_TEXT: - dc->wndExtX = 1; - dc->wndExtY = 1; - dc->vportExtX = 1; - dc->vportExtY = 1; + dc->Dc_Attr.szlWindowExt.cx = 1; + dc->Dc_Attr.szlWindowExt.cy = 1; + dc->Dc_Attr.szlViewportExt.cx = 1; + dc->Dc_Attr.szlViewportExt.cy = 1; break; case MM_LOMETRIC: case MM_ISOTROPIC: - dc->wndExtX = dc->GDIInfo->ulHorzSize * 10; - dc->wndExtY = dc->GDIInfo->ulVertSize * 10; - dc->vportExtX = dc->GDIInfo->ulHorzRes; - dc->vportExtY = -dc->GDIInfo->ulVertRes; + dc->Dc_Attr.szlWindowExt.cx = dc->GDIInfo->ulHorzSize * 10; + dc->Dc_Attr.szlWindowExt.cy = dc->GDIInfo->ulVertSize * 10; + dc->Dc_Attr.szlViewportExt.cx = dc->GDIInfo->ulHorzRes; + dc->Dc_Attr.szlViewportExt.cy = -dc->GDIInfo->ulVertRes; break; case MM_HIMETRIC: - dc->wndExtX = dc->GDIInfo->ulHorzSize * 100; - dc->wndExtY = dc->GDIInfo->ulVertSize * 100; - dc->vportExtX = dc->GDIInfo->ulHorzRes; - dc->vportExtY = -dc->GDIInfo->ulVertRes; + dc->Dc_Attr.szlWindowExt.cx = dc->GDIInfo->ulHorzSize * 100; + dc->Dc_Attr.szlWindowExt.cy = dc->GDIInfo->ulVertSize * 100; + dc->Dc_Attr.szlViewportExt.cx = dc->GDIInfo->ulHorzRes; + dc->Dc_Attr.szlViewportExt.cy = -dc->GDIInfo->ulVertRes; break; case MM_LOENGLISH: - dc->wndExtX = EngMulDiv(1000, dc->GDIInfo->ulHorzSize, 254); - dc->wndExtY = EngMulDiv(1000, dc->GDIInfo->ulVertSize, 254); - dc->vportExtX = dc->GDIInfo->ulHorzRes; - dc->vportExtY = -dc->GDIInfo->ulVertRes; + dc->Dc_Attr.szlWindowExt.cx = EngMulDiv(1000, dc->GDIInfo->ulHorzSize, 254); + dc->Dc_Attr.szlWindowExt.cy = EngMulDiv(1000, dc->GDIInfo->ulVertSize, 254); + dc->Dc_Attr.szlViewportExt.cx = dc->GDIInfo->ulHorzRes; + dc->Dc_Attr.szlViewportExt.cy = -dc->GDIInfo->ulVertRes; break; case MM_HIENGLISH: - dc->wndExtX = EngMulDiv(10000, dc->GDIInfo->ulHorzSize, 254); - dc->wndExtY = EngMulDiv(10000, dc->GDIInfo->ulVertSize, 254); - dc->vportExtX = dc->GDIInfo->ulHorzRes; - dc->vportExtY = -dc->GDIInfo->ulVertRes; + dc->Dc_Attr.szlWindowExt.cx = EngMulDiv(10000, dc->GDIInfo->ulHorzSize, 254); + dc->Dc_Attr.szlWindowExt.cy = EngMulDiv(10000, dc->GDIInfo->ulVertSize, 254); + dc->Dc_Attr.szlViewportExt.cx = dc->GDIInfo->ulHorzRes; + dc->Dc_Attr.szlViewportExt.cy = -dc->GDIInfo->ulVertRes; break; case MM_TWIPS: - dc->wndExtX = EngMulDiv(14400, dc->GDIInfo->ulHorzSize, 254); - dc->wndExtY = EngMulDiv(14400, dc->GDIInfo->ulVertSize, 254); - dc->vportExtX = dc->GDIInfo->ulHorzRes; - dc->vportExtY = -dc->GDIInfo->ulVertRes; + dc->Dc_Attr.szlWindowExt.cx = EngMulDiv(14400, dc->GDIInfo->ulHorzSize, 254); + dc->Dc_Attr.szlWindowExt.cy = EngMulDiv(14400, dc->GDIInfo->ulVertSize, 254); + dc->Dc_Attr.szlViewportExt.cx = dc->GDIInfo->ulHorzRes; + dc->Dc_Attr.szlViewportExt.cy = -dc->GDIInfo->ulVertRes; break; case MM_ANISOTROPIC: @@ -806,11 +806,11 @@ ProbeForWrite(Size, sizeof(SIZE), 1); - Size->cx = dc->vportExtX; - Size->cy = dc->vportExtY; - - dc->vportExtX = XExtent; - dc->vportExtY = YExtent; + Size->cx = dc->Dc_Attr.szlViewportExt.cx; + Size->cy = dc->Dc_Attr.szlViewportExt.cy; + + dc->Dc_Attr.szlViewportExt.cx = XExtent; + dc->Dc_Attr.szlViewportExt.cy = YExtent; if (dc->Dc_Attr.iMapMode == MM_ISOTROPIC) IntFixIsotropicMapping(dc); @@ -861,8 +861,8 @@ ProbeForWrite(Point, sizeof(POINT), 1); - Point->x = dc->vportOrgX; - Point->y = dc->vportOrgY; + Point->x = dc->Dc_Attr.ptlViewportOrg.x; + Point->y = dc->Dc_Attr.ptlViewportOrg.y; } _SEH_HANDLE { @@ -878,8 +878,8 @@ } } - dc->vportOrgX = X; - dc->vportOrgY = Y; + dc->Dc_Attr.ptlViewportOrg.x = X; + dc->Dc_Attr.ptlViewportOrg.y = Y; DC_UpdateXforms(dc); DC_UnlockDc(dc); @@ -924,8 +924,8 @@ ProbeForWrite(Size, sizeof(SIZE), 1); - Size->cx = dc->wndExtX; - Size->cy = dc->wndExtY; + Size->cx = dc->Dc_Attr.szlWindowExt.cx; + Size->cy = dc->Dc_Attr.szlWindowExt.cy; } _SEH_HANDLE { @@ -941,8 +941,8 @@ } } - dc->wndExtX = XExtent; - dc->wndExtY = YExtent; + dc->Dc_Attr.szlWindowExt.cx = XExtent; + dc->Dc_Attr.szlWindowExt.cy = YExtent; DC_UpdateXforms(dc); DC_UnlockDc(dc); @@ -975,8 +975,8 @@ ProbeForWrite(Point, sizeof(POINT), 1); - Point->x = dc->wndOrgX; - Point->y = dc->wndOrgY; + Point->x = dc->Dc_Attr.ptlWindowOrg.x; + Point->y = dc->Dc_Attr.ptlWindowOrg.y; } _SEH_HANDLE { @@ -992,8 +992,8 @@ } } - dc->wndOrgX = X; - dc->wndOrgY = Y; + dc->Dc_Attr.ptlWindowOrg.x = X; + dc->Dc_Attr.ptlWindowOrg.y = Y; DC_UpdateXforms(dc); DC_UnlockDc(dc); Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Mon Aug 6 09:13:47 2007 @@ -216,14 +216,14 @@ /* DriverName is copied in the AllocDC routine */ NewDC->DeviceDriver = OrigDC->DeviceDriver; - NewDC->wndOrgX = OrigDC->wndOrgX; - NewDC->wndOrgY = OrigDC->wndOrgY; - NewDC->wndExtX = OrigDC->wndExtX; - NewDC->wndExtY = OrigDC->wndExtY; - NewDC->vportOrgX = OrigDC->vportOrgX; - NewDC->vportOrgY = OrigDC->vportOrgY; - NewDC->vportExtX = OrigDC->vportExtX; - NewDC->vportExtY = OrigDC->vportExtY; + NewDC->Dc_Attr.ptlWindowOrg.x = OrigDC->Dc_Attr.ptlWindowOrg.x; + NewDC->Dc_Attr.ptlWindowOrg.y = OrigDC->Dc_Attr.ptlWindowOrg.y; + NewDC->Dc_Attr.szlWindowExt.cx = OrigDC->Dc_Attr.szlWindowExt.cx; + NewDC->Dc_Attr.szlWindowExt.cy = OrigDC->Dc_Attr.szlWindowExt.cy; + NewDC->Dc_Attr.ptlViewportOrg.x = OrigDC->Dc_Attr.ptlViewportOrg.x; + NewDC->Dc_Attr.ptlViewportOrg.y = OrigDC->Dc_Attr.ptlViewportOrg.y; + NewDC->Dc_Attr.szlViewportExt.cx = OrigDC->Dc_Attr.szlViewportExt.cx; + NewDC->Dc_Attr.szlViewportExt.cy = OrigDC->Dc_Attr.szlViewportExt.cy; /* Create default bitmap */ if (!(hBitmap = NtGdiCreateBitmap( 1, 1, 1, NewDC->w.bitsPerPixel, NULL ))) @@ -1294,14 +1294,14 @@ newdc->w.xformWorld2Vport = dc->w.xformWorld2Vport; newdc->w.xformVport2World = dc->w.xformVport2World; newdc->w.vport2WorldValid = dc->w.vport2WorldValid; - newdc->wndOrgX = dc->wndOrgX; - newdc->wndOrgY = dc->wndOrgY; - newdc->wndExtX = dc->wndExtX; - newdc->wndExtY = dc->wndExtY; - newdc->vportOrgX = dc->vportOrgX; - newdc->vportOrgY = dc->vportOrgY; - newdc->vportExtX = dc->vportExtX; - newdc->vportExtY = dc->vportExtY; + newdc->Dc_Attr.ptlWindowOrg.x = dc->Dc_Attr.ptlWindowOrg.x; + newdc->Dc_Attr.ptlWindowOrg.y = dc->Dc_Attr.ptlWindowOrg.y; + newdc->Dc_Attr.szlWindowExt.cx = dc->Dc_Attr.szlWindowExt.cx; + newdc->Dc_Attr.szlWindowExt.cy = dc->Dc_Attr.szlWindowExt.cy; + newdc->Dc_Attr.ptlViewportOrg.x = dc->Dc_Attr.ptlViewportOrg.x; + newdc->Dc_Attr.ptlViewportOrg.y = dc->Dc_Attr.ptlViewportOrg.y; + newdc->Dc_Attr.szlViewportExt.cx = dc->Dc_Attr.szlViewportExt.cx; + newdc->Dc_Attr.szlViewportExt.cy = dc->Dc_Attr.szlViewportExt.cy; newdc->hSelf = hnewdc; newdc->saveLevel = 0; @@ -1379,14 +1379,14 @@ dc->w.xformVport2World = dcs->w.xformVport2World; dc->w.vport2WorldValid = dcs->w.vport2WorldValid; - dc->wndOrgX = dcs->wndOrgX; - dc->wndOrgY = dcs->wndOrgY; - dc->wndExtX = dcs->wndExtX; - dc->wndExtY = dcs->wndExtY; - dc->vportOrgX = dcs->vportOrgX; - dc->vportOrgY = dcs->vportOrgY; - dc->vportExtX = dcs->vportExtX; - dc->vportExtY = dcs->vportExtY; + dc->Dc_Attr.ptlWindowOrg.x = dcs->Dc_Attr.ptlWindowOrg.x; + dc->Dc_Attr.ptlWindowOrg.y = dcs->Dc_Attr.ptlWindowOrg.y; + dc->Dc_Attr.szlWindowExt.cx = dcs->Dc_Attr.szlWindowExt.cx; + dc->Dc_Attr.szlWindowExt.cy = dcs->Dc_Attr.szlWindowExt.cy; + dc->Dc_Attr.ptlViewportOrg.x = dcs->Dc_Attr.ptlViewportOrg.x; + dc->Dc_Attr.ptlViewportOrg.y = dcs->Dc_Attr.ptlViewportOrg.y; + dc->Dc_Attr.szlViewportExt.cx = dcs->Dc_Attr.szlViewportExt.cx; + dc->Dc_Attr.szlViewportExt.cy = dcs->Dc_Attr.szlViewportExt.cy; dc->PalIndexed = dcs->PalIndexed; if (!(dc->w.flags & DC_MEMORY)) @@ -1778,10 +1778,10 @@ DC_GET_VAL( INT, NtGdiGetStretchBltMode, Dc_Attr.jStretchBltMode ) DC_GET_VAL( UINT, NtGdiGetTextAlign, Dc_Attr.lTextAlign ) DC_GET_VAL( COLORREF, NtGdiGetTextColor, Dc_Attr.crForegroundClr ) -DC_GET_VAL_EX( GetViewportExtEx, vportExtX, vportExtY, SIZE, cx, cy ) -DC_GET_VAL_EX( GetViewportOrgEx, vportOrgX, vportOrgY, POINT, x, y ) -DC_GET_VAL_EX( GetWindowExtEx, wndExtX, wndExtY, SIZE, cx, cy ) -DC_GET_VAL_EX( GetWindowOrgEx, wndOrgX, wndOrgY, POINT, x, y ) +DC_GET_VAL_EX( GetViewportExtEx, Dc_Attr.szlViewportExt.cx, Dc_Attr.szlViewportExt.cy, SIZE, cx, cy ) +DC_GET_VAL_EX( GetViewportOrgEx, Dc_Attr.ptlViewportOrg.x, Dc_Attr.ptlViewportOrg.y, POINT, x, y ) +DC_GET_VAL_EX( GetWindowExtEx, Dc_Attr.szlWindowExt.cx, Dc_Attr.szlWindowExt.cy, SIZE, cx, cy ) +DC_GET_VAL_EX( GetWindowOrgEx, Dc_Attr.ptlWindowOrg.x, Dc_Attr.ptlWindowOrg.y, POINT, x, y ) BOOL APIENTRY @@ -2205,10 +2205,12 @@ NewDC->Dc_Attr.iMapMode = MM_TEXT; // DC_Attr->iMapMode = MM_TEXT; - NewDC->wndExtX = 1.0f; - NewDC->wndExtY = 1.0f; - NewDC->vportExtX = 1.0f; - NewDC->vportExtY = 1.0f; + +//// HELP! FLOAT to INT !!!!!!!!! + NewDC->Dc_Attr.szlWindowExt.cx = 1.0f; + NewDC->Dc_Attr.szlWindowExt.cy = 1.0f; + NewDC->Dc_Attr.szlViewportExt.cx = 1.0f; + NewDC->Dc_Attr.szlViewportExt.cy = 1.0f; NewDC->Dc_Attr.crForegroundClr = 0; // NewDC->pDc_Attr->ulForegroundClr = 0; // Already Zero @@ -2313,14 +2315,14 @@ FLOAT scaleX, scaleY; /* Construct a transformation to do the window-to-viewport conversion */ - scaleX = (dc->wndExtX ? (FLOAT)dc->vportExtX / (FLOAT)dc->wndExtX : 0.0f); - scaleY = (dc->wndExtY ? (FLOAT)dc->vportExtY / (FLOAT)dc->wndExtY : 0.0f); + scaleX = (dc->Dc_Attr.szlWindowExt.cx ? (FLOAT)dc->Dc_Attr.szlViewportExt.cx / (FLOAT)dc->Dc_Attr.szlWindowExt.cx : 0.0f); + scaleY = (dc->Dc_Attr.szlWindowExt.cy ? (FLOAT)dc->Dc_Attr.szlViewportExt.cy / (FLOAT)dc->Dc_Attr.szlWindowExt.cy : 0.0f); xformWnd2Vport.eM11 = scaleX; xformWnd2Vport.eM12 = 0.0; xformWnd2Vport.eM21 = 0.0; xformWnd2Vport.eM22 = scaleY; - xformWnd2Vport.eDx = (FLOAT)dc->vportOrgX - scaleX * (FLOAT)dc->wndOrgX; - xformWnd2Vport.eDy = (FLOAT)dc->vportOrgY - scaleY * (FLOAT)dc->wndOrgY; + xformWnd2Vport.eDx = (FLOAT)dc->Dc_Attr.ptlViewportOrg.x - scaleX * (FLOAT)dc->Dc_Attr.ptlWindowOrg.x; + xformWnd2Vport.eDy = (FLOAT)dc->Dc_Attr.ptlViewportOrg.y - scaleY * (FLOAT)dc->Dc_Attr.ptlWindowOrg.y; /* Combine with the world transformation */ IntGdiCombineTransform(&dc->w.xformWorld2Vport, &dc->w.xformWorld2Wnd, &xformWnd2Vport); Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/path.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/path.c Mon Aug 6 09:13:47 2007 @@ -1487,10 +1487,10 @@ /* Set MM_TEXT */ dc->Dc_Attr.iMapMode = MM_TEXT; - dc->vportOrgX = 0; - dc->vportOrgY = 0; - dc->wndOrgX = 0; - dc->wndOrgY = 0; + dc->Dc_Attr.ptlViewportOrg.x = 0; + dc->Dc_Attr.ptlViewportOrg.y = 0; + dc->Dc_Attr.ptlWindowOrg.x = 0; + dc->Dc_Attr.ptlWindowOrg.y = 0; graphicsMode = dc->Dc_Attr.iGraphicsMode; dc->Dc_Attr.iGraphicsMode = GM_ADVANCED; IntGdiModifyWorldTransform(dc, &xform, MWT_IDENTITY); @@ -1600,15 +1600,15 @@ /* Restore the old mapping mode */ dc->Dc_Attr.iMapMode = mapMode; - dc->wndExtX = szWindowExt.cx; - dc->wndExtY = szWindowExt.cy; - dc->wndOrgX = ptWindowOrg.x; - dc->wndOrgY = ptWindowOrg.y; + dc->Dc_Attr.szlWindowExt.cx = szWindowExt.cx; + dc->Dc_Attr.szlWindowExt.cy = szWindowExt.cy; + dc->Dc_Attr.ptlWindowOrg.x = ptWindowOrg.x; + dc->Dc_Attr.ptlWindowOrg.y = ptWindowOrg.y; - dc->vportExtX = szViewportExt.cx; - dc->vportExtY = szViewportExt.cy; - dc->vportOrgX = ptViewportOrg.x; - dc->vportOrgY = ptViewportOrg.y; + dc->Dc_Attr.szlViewportExt.cx = szViewportExt.cx; + dc->Dc_Attr.szlViewportExt.cx = szViewportExt.cy; + dc->Dc_Attr.ptlViewportOrg.x = ptViewportOrg.x; + dc->Dc_Attr.ptlViewportOrg.y = ptViewportOrg.y; /* Restore the world transform */ dc->w.xformWorld2Wnd = xform; Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c Mon Aug 6 09:13:47 2007 @@ -1860,7 +1860,8 @@ if(NtGdiCombineRgn(hDest, hSrc, 0, RGN_COPY) == ERROR) goto done; - NtGdiOffsetRgn(hDest, dc->vportOrgX - dc->wndOrgX, dc->vportOrgY - dc->wndOrgY); + NtGdiOffsetRgn(hDest, dc->Dc_Attr.ptlViewportOrg.x - dc->Dc_Attr.ptlWindowOrg.x, + dc->Dc_Attr.ptlViewportOrg.y - dc->Dc_Attr.ptlWindowOrg.y); ret = TRUE; goto done; }

1 0

[jimtabor] 28183: Moved most of the old Win struct to Dc_Attr structure. Tested it with qemu.
by jimtabor＠svn.reactos.org 06 Aug '07

06 Aug '07

Author: jimtabor Date: Mon Aug 6 06:48:09 2007 New Revision: 28183 URL: http://svn.reactos.org/svn/reactos?rev=28183&view=rev Log: Moved most of the old Win struct to Dc_Attr structure. Tested it with qemu. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/brush.c trunk/reactos/subsystems/win32/win32k/objects/coord.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/fillshap.c trunk/reactos/subsystems/win32/win32k/objects/line.c trunk/reactos/subsystems/win32/win32k/objects/path.c trunk/reactos/subsystems/win32/win32k/objects/polyfill.c trunk/reactos/subsystems/win32/win32k/objects/region.c trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Mon Aug 6 06:48:09 2007 @@ -26,9 +26,6 @@ HRGN hClipRgn; /* Clip region (may be 0) */ HRGN hVisRgn; /* Visible region (must never be 0) */ HRGN hGCClipRgn; /* GC clip region (ClipRgn AND VisRgn) */ - HPEN hPen; - HBRUSH hBrush; - HFONT hFont; HBITMAP hBitmap; HBITMAP hFirstBitmap; /* Bitmap selected at creation of the DC */ @@ -39,19 +36,9 @@ GdiPath path; /* #endif */ - WORD ROPmode; - WORD polyFillMode; - WORD stretchBltMode; - WORD relAbsMode; - WORD backgroundMode; - COLORREF backgroundColor; - COLORREF textColor; - short brushOrgX; short brushOrgY; - WORD textAlign; /* Text alignment from SetTextAlign() */ - short charExtra; /* Spacing from SetTextCharacterExtra() */ short breakTotalExtra; /* Total extra space for justification */ short breakCount; /* Break char. count */ short breakExtra; /* breakTotalExtra / breakCount */ @@ -60,8 +47,6 @@ RECT totalExtent; BYTE bitsPerPixel; - INT MapMode; - INT GraphicsMode; /* Graphics mode */ INT DCOrgX; /* DC origin */ INT DCOrgY; @@ -92,6 +77,8 @@ HDC hSelf; HDC hNext; PDC_ATTR pDc_Attr; + INT DC_Type; + INT DC_Flags; DHPDEV PDev; HSURF FillPatternSurfaces[HS_DDI_MAX]; PGDIINFO GDIInfo; Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Mon Aug 6 06:48:09 2007 @@ -140,7 +140,7 @@ if (UsesPattern) { - BrushObj = BRUSHOBJ_LockBrush(DCDest->w.hBrush); + BrushObj = BRUSHOBJ_LockBrush(DCDest->Dc_Attr.hbrush); if (NULL == BrushObj) { if (UsesSource && hDCSrc != hDCDest) @@ -185,11 +185,11 @@ { if (DCDest->w.bitsPerPixel == 1) { - XlateObj = IntEngCreateMonoXlate(0, DestPalette, SourcePalette, DCSrc->w.backgroundColor); + XlateObj = IntEngCreateMonoXlate(0, DestPalette, SourcePalette, DCSrc->Dc_Attr.crBackgroundClr); } else if (DCSrc->w.bitsPerPixel == 1) { - XlateObj = IntEngCreateSrcMonoXlate(DestPalette, DCSrc->w.backgroundColor, DCSrc->w.textColor); + XlateObj = IntEngCreateSrcMonoXlate(DestPalette, DCSrc->Dc_Attr.crBackgroundClr, DCSrc->Dc_Attr.crForegroundClr); } else { @@ -1315,7 +1315,7 @@ if (UsesPattern) { - BrushObj = BRUSHOBJ_LockBrush(DCDest->w.hBrush); + BrushObj = BRUSHOBJ_LockBrush(DCDest->Dc_Attr.hbrush); if (NULL == BrushObj) { if (UsesSource && hDCSrc != hDCDest) @@ -1481,11 +1481,11 @@ { if (DCDest->w.bitsPerPixel == 1) { - XlateObj = IntEngCreateMonoXlate(0, DestPalette, SourcePalette, DCSrc->w.backgroundColor); + XlateObj = IntEngCreateMonoXlate(0, DestPalette, SourcePalette, DCSrc->Dc_Attr.crBackgroundClr); } else if (DCSrc->w.bitsPerPixel == 1) { - XlateObj = IntEngCreateSrcMonoXlate(DestPalette, DCSrc->w.backgroundColor, DCSrc->w.textColor); + XlateObj = IntEngCreateSrcMonoXlate(DestPalette, DCSrc->Dc_Attr.crBackgroundClr, DCSrc->Dc_Attr.crForegroundClr); } else { Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/brush.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/brush.c Mon Aug 6 06:48:09 2007 @@ -134,7 +134,7 @@ if (Pattern->SurfObj.iBitmapFormat == BMF_1BPP) { if (Dc->w.bitsPerPixel != 1) - Result = IntEngCreateSrcMonoXlate(Dc->w.hPalette, Dc->w.textColor, Dc->w.backgroundColor); + Result = IntEngCreateSrcMonoXlate(Dc->w.hPalette, Dc->Dc_Attr.crForegroundClr, Dc->Dc_Attr.crBackgroundClr); } else if (BrushObj->flAttrs & GDIBRUSH_IS_DIB) { @@ -823,7 +823,7 @@ return TRUE; } - BrushObj = BRUSHOBJ_LockBrush(dc->w.hBrush); + BrushObj = BRUSHOBJ_LockBrush(dc->Dc_Attr.hbrush); if (BrushObj == NULL) { SetLastWin32Error(ERROR_INVALID_HANDLE); Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c Mon Aug 6 06:48:09 2007 @@ -255,7 +255,7 @@ IntGetGraphicsMode ( PDC dc ) { ASSERT ( dc ); - return dc->w.GraphicsMode; + return dc->Dc_Attr.iGraphicsMode; } BOOL @@ -309,7 +309,7 @@ return 0; } - GraphicsMode = dc->w.GraphicsMode; + GraphicsMode = dc->Dc_Attr.iGraphicsMode; DC_UnlockDc(dc); return GraphicsMode; @@ -680,8 +680,8 @@ return 0; } - ret = dc->w.GraphicsMode; - dc->w.GraphicsMode = Mode; + ret = dc->Dc_Attr.iGraphicsMode; + dc->Dc_Attr.iGraphicsMode = Mode; DC_UnlockDc(dc); return ret; } @@ -701,11 +701,11 @@ return 0; } - PrevMapMode = dc->w.MapMode; - - if (MapMode != dc->w.MapMode || (MapMode != MM_ISOTROPIC && MapMode != MM_ANISOTROPIC)) - { - dc->w.MapMode = MapMode; + PrevMapMode = dc->Dc_Attr.iMapMode; + + if (MapMode != dc->Dc_Attr.iMapMode || (MapMode != MM_ISOTROPIC && MapMode != MM_ANISOTROPIC)) + { + dc->Dc_Attr.iMapMode = MapMode; switch (MapMode) { @@ -780,7 +780,7 @@ return FALSE; } - switch (dc->w.MapMode) + switch (dc->Dc_Attr.iMapMode) { case MM_HIENGLISH: case MM_HIMETRIC: @@ -812,7 +812,7 @@ dc->vportExtX = XExtent; dc->vportExtY = YExtent; - if (dc->w.MapMode == MM_ISOTROPIC) + if (dc->Dc_Attr.iMapMode == MM_ISOTROPIC) IntFixIsotropicMapping(dc); } _SEH_HANDLE @@ -903,7 +903,7 @@ return FALSE; } - switch (dc->w.MapMode) + switch (dc->Dc_Attr.iMapMode) { case MM_HIENGLISH: case MM_HIMETRIC: @@ -1024,7 +1024,7 @@ } /* Check that graphics mode is GM_ADVANCED */ - if ( dc->w.GraphicsMode != GM_ADVANCED ) + if ( dc->Dc_Attr.iGraphicsMode != GM_ADVANCED ) { DC_UnlockDc(dc); return FALSE; Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Mon Aug 6 06:48:09 2007 @@ -244,11 +244,11 @@ NewDC->PalIndexed = OrigDC->PalIndexed; NewDC->w.hPalette = OrigDC->w.hPalette; - NewDC->w.textColor = OrigDC->w.textColor; - NewDC->w.textAlign = OrigDC->w.textAlign; - NewDC->w.backgroundColor = OrigDC->w.backgroundColor; - NewDC->w.backgroundMode = OrigDC->w.backgroundMode; - NewDC->w.ROPmode = OrigDC->w.ROPmode; + NewDC->Dc_Attr.crForegroundClr = OrigDC->Dc_Attr.crForegroundClr; + NewDC->Dc_Attr.lTextAlign = OrigDC->Dc_Attr.lTextAlign; + NewDC->Dc_Attr.crBackgroundClr = OrigDC->Dc_Attr.crBackgroundClr; + NewDC->Dc_Attr.jBkMode = OrigDC->Dc_Attr.jBkMode; + NewDC->Dc_Attr.jROP2 = OrigDC->Dc_Attr.jROP2; DC_UnlockDc(NewDC); DC_UnlockDc(OrigDC); if (NULL != DisplayDC) @@ -908,7 +908,7 @@ { NewDC->PalIndexed = NtGdiGetStockObject(DEFAULT_PALETTE); NewDC->w.hPalette = NewDC->DevInfo->hpalDefault; - NewDC->w.ROPmode = R2_COPYPEN; + NewDC->Dc_Attr.jROP2 = R2_COPYPEN; DC_UnlockDc( NewDC ); @@ -1098,8 +1098,8 @@ return 0; } -DC_GET_VAL( COLORREF, NtGdiGetBkColor, w.backgroundColor ) -DC_GET_VAL( INT, NtGdiGetBkMode, w.backgroundMode ) +DC_GET_VAL( COLORREF, NtGdiGetBkColor, Dc_Attr.crBackgroundClr ) +DC_GET_VAL( INT, NtGdiGetBkMode, Dc_Attr.jBkMode ) DC_GET_VAL_EX( GetBrushOrgEx, w.brushOrgX, w.brushOrgY, POINT, x, y ) DC_GET_VAL( HRGN, NtGdiGetClipRgn, w.hClipRgn ) @@ -1122,16 +1122,16 @@ { case OBJ_PEN: case OBJ_EXTPEN: - SelObject = dc->w.hPen; + SelObject = dc->Dc_Attr.hpen; break; case OBJ_BRUSH: - SelObject = dc->w.hBrush; + SelObject = dc->Dc_Attr.hbrush; break; case OBJ_PAL: SelObject = dc->w.hPalette; break; case OBJ_FONT: - SelObject = dc->w.hFont; + SelObject = dc->Dc_Attr.hlfntNew; break; case OBJ_BITMAP: SelObject = dc->w.hBitmap; @@ -1221,9 +1221,9 @@ return CLR_INVALID; } - oldColor = dc->w.backgroundColor; - dc->w.backgroundColor = color; - hBrush = dc->w.hBrush; + oldColor = dc->Dc_Attr.crBackgroundClr; + dc->Dc_Attr.crBackgroundClr = color; + hBrush = dc->Dc_Attr.hbrush; DC_UnlockDc(dc); NtGdiSelectObject(hDC, hBrush); return oldColor; @@ -1253,9 +1253,9 @@ ASSERT( newdc ); newdc->w.flags = dc->w.flags | DC_SAVED; - newdc->w.hPen = dc->w.hPen; - newdc->w.hBrush = dc->w.hBrush; - newdc->w.hFont = dc->w.hFont; + newdc->Dc_Attr.hpen = dc->Dc_Attr.hpen; + newdc->Dc_Attr.hbrush = dc->Dc_Attr.hbrush; + newdc->Dc_Attr.hlfntNew = dc->Dc_Attr.hlfntNew; newdc->w.hBitmap = dc->w.hBitmap; newdc->w.hFirstBitmap = dc->w.hFirstBitmap; #if 0 @@ -1265,23 +1265,23 @@ newdc->w.hPalette = dc->w.hPalette; newdc->w.totalExtent = dc->w.totalExtent; newdc->w.bitsPerPixel = dc->w.bitsPerPixel; - newdc->w.ROPmode = dc->w.ROPmode; - newdc->w.polyFillMode = dc->w.polyFillMode; - newdc->w.stretchBltMode = dc->w.stretchBltMode; - newdc->w.relAbsMode = dc->w.relAbsMode; - newdc->w.backgroundMode = dc->w.backgroundMode; - newdc->w.backgroundColor = dc->w.backgroundColor; - newdc->w.textColor = dc->w.textColor; + newdc->Dc_Attr.jROP2 = dc->Dc_Attr.jROP2; + newdc->Dc_Attr.jFillMode = dc->Dc_Attr.jFillMode; + newdc->Dc_Attr.jStretchBltMode = dc->Dc_Attr.jStretchBltMode; + newdc->Dc_Attr.lRelAbs = dc->Dc_Attr.lRelAbs; + newdc->Dc_Attr.jBkMode = dc->Dc_Attr.jBkMode; + newdc->Dc_Attr.crBackgroundClr = dc->Dc_Attr.crBackgroundClr; + newdc->Dc_Attr.crForegroundClr = dc->Dc_Attr.crForegroundClr; newdc->w.brushOrgX = dc->w.brushOrgX; newdc->w.brushOrgY = dc->w.brushOrgY; - newdc->w.textAlign = dc->w.textAlign; - newdc->w.charExtra = dc->w.charExtra; + newdc->Dc_Attr.lTextAlign = dc->Dc_Attr.lTextAlign; + newdc->Dc_Attr.lTextExtra = dc->Dc_Attr.lTextExtra; newdc->w.breakTotalExtra = dc->w.breakTotalExtra; newdc->w.breakCount = dc->w.breakCount; newdc->w.breakExtra = dc->w.breakExtra; newdc->w.breakRem = dc->w.breakRem; - newdc->w.MapMode = dc->w.MapMode; - newdc->w.GraphicsMode = dc->w.GraphicsMode; + newdc->Dc_Attr.iMapMode = dc->Dc_Attr.iMapMode; + newdc->Dc_Attr.iGraphicsMode = dc->Dc_Attr.iGraphicsMode; #if 0 /* Apparently, the DC origin is not changed by [GS]etDCState */ newdc->w.DCOrgX = dc->w.DCOrgX; @@ -1348,23 +1348,23 @@ #endif dc->w.totalExtent = dcs->w.totalExtent; - dc->w.ROPmode = dcs->w.ROPmode; - dc->w.polyFillMode = dcs->w.polyFillMode; - dc->w.stretchBltMode = dcs->w.stretchBltMode; - dc->w.relAbsMode = dcs->w.relAbsMode; - dc->w.backgroundMode = dcs->w.backgroundMode; - dc->w.backgroundColor = dcs->w.backgroundColor; - dc->w.textColor = dcs->w.textColor; + dc->Dc_Attr.jROP2 = dcs->Dc_Attr.jROP2; + dc->Dc_Attr.jFillMode = dcs->Dc_Attr.jFillMode; + dc->Dc_Attr.jStretchBltMode = dcs->Dc_Attr.jStretchBltMode; + dc->Dc_Attr.lRelAbs = dcs->Dc_Attr.lRelAbs; + dc->Dc_Attr.jBkMode = dcs->Dc_Attr.jBkMode; + dc->Dc_Attr.crBackgroundClr = dcs->Dc_Attr.crBackgroundClr; + dc->Dc_Attr.crForegroundClr = dcs->Dc_Attr.crForegroundClr; dc->w.brushOrgX = dcs->w.brushOrgX; dc->w.brushOrgY = dcs->w.brushOrgY; - dc->w.textAlign = dcs->w.textAlign; - dc->w.charExtra = dcs->w.charExtra; + dc->Dc_Attr.lTextAlign = dcs->Dc_Attr.lTextAlign; + dc->Dc_Attr.lTextExtra = dcs->Dc_Attr.lTextExtra; dc->w.breakTotalExtra = dcs->w.breakTotalExtra; dc->w.breakCount = dcs->w.breakCount; dc->w.breakExtra = dcs->w.breakExtra; dc->w.breakRem = dcs->w.breakRem; - dc->w.MapMode = dcs->w.MapMode; - dc->w.GraphicsMode = dcs->w.GraphicsMode; + dc->Dc_Attr.iMapMode = dcs->Dc_Attr.iMapMode; + dc->Dc_Attr.iGraphicsMode = dcs->Dc_Attr.iGraphicsMode; #if 0 /* Apparently, the DC origin is not changed by [GS]etDCState */ dc->w.DCOrgX = dcs->w.DCOrgX; @@ -1424,11 +1424,11 @@ #endif NtGdiSelectObject( hDC, dcs->w.hBitmap ); - NtGdiSelectObject( hDC, dcs->w.hBrush ); - NtGdiSelectObject( hDC, dcs->w.hFont ); - NtGdiSelectObject( hDC, dcs->w.hPen ); - NtGdiSetBkColor( hDC, dcs->w.backgroundColor); - NtGdiSetTextColor( hDC, dcs->w.textColor); + NtGdiSelectObject( hDC, dcs->Dc_Attr.hbrush ); + NtGdiSelectObject( hDC, dcs->Dc_Attr.hlfntNew ); + NtGdiSelectObject( hDC, dcs->Dc_Attr.hpen ); + NtGdiSetBkColor( hDC, dcs->Dc_Attr.crBackgroundClr); + NtGdiSetTextColor( hDC, dcs->Dc_Attr.crForegroundClr); NtGdiSelectPalette( hDC, dcs->w.hPalette, FALSE ); @@ -1665,8 +1665,8 @@ return ret; } -DC_GET_VAL( INT, NtGdiGetMapMode, w.MapMode ) -DC_GET_VAL( INT, NtGdiGetPolyFillMode, w.polyFillMode ) +DC_GET_VAL( INT, NtGdiGetMapMode, Dc_Attr.iMapMode ) +DC_GET_VAL( INT, NtGdiGetPolyFillMode, Dc_Attr.jFillMode ) INT FASTCALL @@ -1773,11 +1773,11 @@ return iRetCount; } -DC_GET_VAL( INT, NtGdiGetRelAbs, w.relAbsMode ) -DC_GET_VAL( INT, NtGdiGetROP2, w.ROPmode ) -DC_GET_VAL( INT, NtGdiGetStretchBltMode, w.stretchBltMode ) -DC_GET_VAL( UINT, NtGdiGetTextAlign, w.textAlign ) -DC_GET_VAL( COLORREF, NtGdiGetTextColor, w.textColor ) +DC_GET_VAL( INT, NtGdiGetRelAbs, Dc_Attr.lRelAbs ) +DC_GET_VAL( INT, NtGdiGetROP2, Dc_Attr.jROP2 ) +DC_GET_VAL( INT, NtGdiGetStretchBltMode, Dc_Attr.jStretchBltMode ) +DC_GET_VAL( UINT, NtGdiGetTextAlign, Dc_Attr.lTextAlign ) +DC_GET_VAL( COLORREF, NtGdiGetTextColor, Dc_Attr.crForegroundClr ) DC_GET_VAL_EX( GetViewportExtEx, vportExtX, vportExtY, SIZE, cx, cy ) DC_GET_VAL_EX( GetViewportOrgEx, vportOrgX, vportOrgY, POINT, x, y ) DC_GET_VAL_EX( GetWindowExtEx, wndExtX, wndExtY, SIZE, cx, cy ) @@ -1968,8 +1968,8 @@ break; } - objOrg = (HGDIOBJ)dc->w.hPen; - dc->w.hPen = hGDIObj; + objOrg = (HGDIOBJ)dc->Dc_Attr.hpen; + dc->Dc_Attr.hpen = hGDIObj; if (dc->XlatePen != NULL) EngDeleteXlate(dc->XlatePen); dc->XlatePen = XlateObj; @@ -1991,8 +1991,8 @@ break; } - objOrg = (HGDIOBJ)dc->w.hBrush; - dc->w.hBrush = hGDIObj; + objOrg = (HGDIOBJ)dc->Dc_Attr.hbrush; + dc->Dc_Attr.hbrush = hGDIObj; if (dc->XlateBrush != NULL) EngDeleteXlate(dc->XlateBrush); dc->XlateBrush = XlateObj; @@ -2001,8 +2001,8 @@ case GDI_OBJECT_TYPE_FONT: if(NT_SUCCESS(TextIntRealizeFont((HFONT)hGDIObj))) { - objOrg = (HGDIOBJ)dc->w.hFont; - dc->w.hFont = (HFONT) hGDIObj; + objOrg = (HGDIOBJ)dc->Dc_Attr.hlfntNew; + dc->Dc_Attr.hlfntNew = (HFONT) hGDIObj; } break; @@ -2038,8 +2038,8 @@ } /* Reselect brush and pen to regenerate the XLATEOBJs. */ - NtGdiSelectObject ( hDC, dc->w.hBrush ); - NtGdiSelectObject ( hDC, dc->w.hPen ); + NtGdiSelectObject ( hDC, dc->Dc_Attr.hbrush ); + NtGdiSelectObject ( hDC, dc->Dc_Attr.hpen ); DC_UnlockDc ( dc ); hVisRgn = NtGdiCreateRectRgn ( 0, 0, pb->SurfObj.sizlBitmap.cx, pb->SurfObj.sizlBitmap.cy ); @@ -2099,11 +2099,11 @@ return wRet; } -DC_SET_MODE( NtGdiSetBkMode, w.backgroundMode, TRANSPARENT, OPAQUE ) -DC_SET_MODE( NtGdiSetPolyFillMode, w.polyFillMode, ALTERNATE, WINDING ) -// DC_SET_MODE( NtGdiSetRelAbs, w.relAbsMode, ABSOLUTE, RELATIVE ) -DC_SET_MODE( NtGdiSetROP2, w.ROPmode, R2_BLACK, R2_WHITE ) -DC_SET_MODE( NtGdiSetStretchBltMode, w.stretchBltMode, BLACKONWHITE, HALFTONE ) +DC_SET_MODE( NtGdiSetBkMode, Dc_Attr.jBkMode, TRANSPARENT, OPAQUE ) +DC_SET_MODE( NtGdiSetPolyFillMode, Dc_Attr.jFillMode, ALTERNATE, WINDING ) +// DC_SET_MODE( NtGdiSetRelAbs, Dc_Attr.lRelAbs, ABSOLUTE, RELATIVE ) +DC_SET_MODE( NtGdiSetROP2, Dc_Attr.jROP2, R2_BLACK, R2_WHITE ) +DC_SET_MODE( NtGdiSetStretchBltMode, Dc_Attr.jStretchBltMode, BLACKONWHITE, HALFTONE ) // ---------------------------------------------------- Private Interface @@ -2202,7 +2202,7 @@ NewDC->w.vport2WorldValid = TRUE; // DC_Attr->flXform = DEVICE_TO_PAGE_INVALID; // More research. - NewDC->w.MapMode = MM_TEXT; + NewDC->Dc_Attr.iMapMode = MM_TEXT; // DC_Attr->iMapMode = MM_TEXT; NewDC->wndExtX = 1.0f; @@ -2210,16 +2210,16 @@ NewDC->vportExtX = 1.0f; NewDC->vportExtY = 1.0f; - NewDC->w.textColor = 0; + NewDC->Dc_Attr.crForegroundClr = 0; // NewDC->pDc_Attr->ulForegroundClr = 0; // Already Zero // NewDC->pDc_Attr->crForegroundClr = 0; - NewDC->w.backgroundColor = 0xffffff; + NewDC->Dc_Attr.crBackgroundClr = 0xffffff; // DC_Attr->ulBackgroundClr = 0xffffff; // DC_Attr->crBackgroundClr = 0xffffff; - NewDC->w.hFont = NtGdiGetStockObject(SYSTEM_FONT); - TextIntRealizeFont(NewDC->w.hFont); + NewDC->Dc_Attr.hlfntNew = NtGdiGetStockObject(SYSTEM_FONT); + TextIntRealizeFont(NewDC->Dc_Attr.hlfntNew); // DC_Attr->hlfntNew = NtGdiGetStockObject(SYSTEM_FONT); NewDC->w.hPalette = NtGdiGetStockObject(DEFAULT_PALETTE); Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c Mon Aug 6 06:48:09 2007 @@ -31,7 +31,7 @@ &BrushInst.BrushObject, \ x, y, (x)+1, y, \ &RectBounds, \ - ROP2_TO_MIX(dc->w.ROPmode)); + ROP2_TO_MIX(dc->Dc_Attr.jROP2)); #define PUTLINE(x1,y1,x2,y2,BrushInst) \ ret = ret && IntEngLineTo(&BitmapObj->SurfObj, \ @@ -39,7 +39,7 @@ &BrushInst.BrushObject, \ x1, y1, x2, y2, \ &RectBounds, \ - ROP2_TO_MIX(dc->w.ROPmode)); + ROP2_TO_MIX(dc->Dc_Attr.jROP2)); BOOL FASTCALL IntGdiPolygon(PDC dc, @@ -91,16 +91,16 @@ } /* Now fill the polygon with the current brush. */ - FillBrushObj = BRUSHOBJ_LockBrush(dc->w.hBrush); + FillBrushObj = BRUSHOBJ_LockBrush(dc->Dc_Attr.hbrush); if (FillBrushObj && !(FillBrushObj->flAttrs & GDIBRUSH_IS_NULL)) { IntGdiInitBrushInstance(&FillBrushInst, FillBrushObj, dc->XlateBrush); - ret = FillPolygon ( dc, BitmapObj, &FillBrushInst.BrushObject, ROP2_TO_MIX(dc->w.ROPmode), UnsafePoints, Count, DestRect ); + ret = FillPolygon ( dc, BitmapObj, &FillBrushInst.BrushObject, ROP2_TO_MIX(dc->Dc_Attr.jROP2), UnsafePoints, Count, DestRect ); } BRUSHOBJ_UnlockBrush(FillBrushObj); /* get BRUSHOBJ from current pen. */ - PenBrushObj = PENOBJ_LockPen(dc->w.hPen); + PenBrushObj = PENOBJ_LockPen(dc->Dc_Attr.hpen); // Draw the Polygon Edges with the current pen ( if not a NULL pen ) if (PenBrushObj && !(PenBrushObj->flAttrs & GDIBRUSH_IS_NULL)) { @@ -121,7 +121,7 @@ UnsafePoints[1].x, /* To */ UnsafePoints[1].y, &DestRect, - ROP2_TO_MIX(dc->w.ROPmode)); /* MIX */ + ROP2_TO_MIX(dc->Dc_Attr.jROP2)); /* MIX */ if(!ret) break; UnsafePoints++; } @@ -213,7 +213,7 @@ return TRUE; } - FillBrush = BRUSHOBJ_LockBrush(dc->w.hBrush); + FillBrush = BRUSHOBJ_LockBrush(dc->Dc_Attr.hbrush); if (NULL == FillBrush) { DC_UnlockDc(dc); @@ -221,7 +221,7 @@ return FALSE; } - PenBrush = PENOBJ_LockPen(dc->w.hPen); + PenBrush = PENOBJ_LockPen(dc->Dc_Attr.hpen); if (NULL == PenBrush) { BRUSHOBJ_UnlockBrush(FillBrush); @@ -648,7 +648,7 @@ return TRUE; } - FillBrushObj = BRUSHOBJ_LockBrush(dc->w.hBrush); + FillBrushObj = BRUSHOBJ_LockBrush(dc->Dc_Attr.hbrush); if (NULL == FillBrushObj) { DC_UnlockDc(dc); @@ -671,7 +671,7 @@ RectBounds.bottom = Bottom; SurfObj = (SURFOBJ*) AccessUserObject((ULONG)dc->Surface); - HPenToBrushObj(&PenBrushObj, dc->w.hPen); + HPenToBrushObj(&PenBrushObj, dc->Dc_Attr.hpen); /* Number of points for the circle is 4 * sqrt(2) * Radius, start and end line have at most Radius points, so allocate at least @@ -1030,7 +1030,7 @@ DestRect.top = TopRect; DestRect.bottom = BottomRect; - FillBrushObj = BRUSHOBJ_LockBrush(dc->w.hBrush); + FillBrushObj = BRUSHOBJ_LockBrush(dc->Dc_Attr.hbrush); if ( FillBrushObj ) { @@ -1054,7 +1054,7 @@ BRUSHOBJ_UnlockBrush(FillBrushObj); /* get BRUSHOBJ from current pen. */ - PenBrushObj = PENOBJ_LockPen(dc->w.hPen); + PenBrushObj = PENOBJ_LockPen(dc->Dc_Attr.hpen); if (PenBrushObj == NULL) { SetLastWin32Error(ERROR_INVALID_HANDLE); @@ -1070,7 +1070,7 @@ if (!(PenBrushObj->flAttrs & GDIBRUSH_IS_NULL)) { - Mix = ROP2_TO_MIX(dc->w.ROPmode); + Mix = ROP2_TO_MIX(dc->Dc_Attr.jROP2); ret = ret && IntEngLineTo(&BitmapObj->SurfObj, dc->CombinedClip, &PenBrushInst.BrushObject, @@ -1195,7 +1195,7 @@ return FALSE; } - FillBrushObj = BRUSHOBJ_LockBrush(dc->w.hBrush); + FillBrushObj = BRUSHOBJ_LockBrush(dc->Dc_Attr.hbrush); if (FillBrushObj) { if (FillBrushObj->flAttrs & GDIBRUSH_IS_NULL) @@ -1210,7 +1210,7 @@ } } - PenBrushObj = PENOBJ_LockPen(dc->w.hPen); + PenBrushObj = PENOBJ_LockPen(dc->Dc_Attr.hpen); if (PenBrushObj) { if (PenBrushObj->flAttrs & GDIBRUSH_IS_NULL) Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/line.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/line.c Mon Aug 6 06:48:09 2007 @@ -100,7 +100,7 @@ Bounds.bottom = max(Points[0].y, Points[1].y); /* get BRUSHOBJ from current pen. */ - PenBrushObj = PENOBJ_LockPen( dc->w.hPen ); + PenBrushObj = PENOBJ_LockPen( dc->Dc_Attr.hpen ); /* FIXME - PenBrushObj can be NULL!!!! Don't assert here! */ ASSERT(PenBrushObj); @@ -113,7 +113,7 @@ Points[0].x, Points[0].y, Points[1].x, Points[1].y, &Bounds, - ROP2_TO_MIX(dc->w.ROPmode)); + ROP2_TO_MIX(dc->Dc_Attr.jROP2)); } BITMAPOBJ_UnlockBitmap ( BitmapObj ); @@ -204,7 +204,7 @@ return PATH_Polyline(dc, pt, Count); /* Get BRUSHOBJ from current pen. */ - PenBrushObj = PENOBJ_LockPen(dc->w.hPen); + PenBrushObj = PENOBJ_LockPen(dc->Dc_Attr.hpen); /* FIXME - PenBrushObj can be NULL! Don't assert here! */ ASSERT(PenBrushObj); @@ -230,7 +230,7 @@ IntGdiInitBrushInstance(&PenBrushInst, PenBrushObj, dc->XlatePen); Ret = IntEngPolyline(&BitmapObj->SurfObj, dc->CombinedClip, &PenBrushInst.BrushObject, Points, Count, - ROP2_TO_MIX(dc->w.ROPmode)); + ROP2_TO_MIX(dc->Dc_Attr.jROP2)); BITMAPOBJ_UnlockBitmap(BitmapObj); EngFreeMem(Points); Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/path.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/path.c Mon Aug 6 06:48:09 2007 @@ -284,7 +284,7 @@ else { /* FIXME: Should we empty the path even if conversion failed? */ - if(PATH_PathToRegion(pPath, pDc->w.polyFillMode, &hrgnRval)) + if(PATH_PathToRegion(pPath, pDc->Dc_Attr.jFillMode, &hrgnRval)) PATH_EmptyPath(pPath); } @@ -364,7 +364,7 @@ return FALSE; } /* Construct a region from the path */ - else if( PATH_PathToRegion( &dc->w.path, dc->w.polyFillMode, &hrgnPath ) ) + else if( PATH_PathToRegion( &dc->w.path, dc->Dc_Attr.jFillMode, &hrgnPath ) ) { success = IntGdiExtSelectClipRgn( dc, hrgnPath, Mode ) != ERROR; NtGdiDeleteObject( hrgnPath ); @@ -404,7 +404,7 @@ return FALSE; } - if( PATH_PathToRegion( pPath, dc->w.polyFillMode, &hrgn )) + if( PATH_PathToRegion( pPath, dc->Dc_Attr.jFillMode, &hrgn )) { /* Since PaintRgn interprets the region as being in logical coordinates * but the points we store for the path are already in device @@ -1115,7 +1115,7 @@ } /* In GM_COMPATIBLE, don't include bottom and right edges */ - if(dc->w.GraphicsMode==GM_COMPATIBLE) + if(dc->Dc_Attr.iGraphicsMode==GM_COMPATIBLE) { corners[1].x--; corners[1].y--; @@ -1478,7 +1478,7 @@ return FALSE; /* Save the mapping mode info */ - mapMode=dc->w.MapMode; + mapMode=dc->Dc_Attr.iMapMode; IntGetViewportExtEx(dc, &szViewportExt); IntGetViewportOrgEx(dc, &ptViewportOrg); IntGetWindowExtEx(dc, &szWindowExt); @@ -1486,15 +1486,15 @@ xform = dc->w.xformWorld2Wnd; /* Set MM_TEXT */ - dc->w.MapMode = MM_TEXT; + dc->Dc_Attr.iMapMode = MM_TEXT; dc->vportOrgX = 0; dc->vportOrgY = 0; dc->wndOrgX = 0; dc->wndOrgY = 0; - graphicsMode = dc->w.GraphicsMode; - dc->w.GraphicsMode = GM_ADVANCED; + graphicsMode = dc->Dc_Attr.iGraphicsMode; + dc->Dc_Attr.iGraphicsMode = GM_ADVANCED; IntGdiModifyWorldTransform(dc, &xform, MWT_IDENTITY); - dc->w.GraphicsMode = graphicsMode; + dc->Dc_Attr.iGraphicsMode = graphicsMode; /* Allocate enough memory for the worst case without beziers (one PT_MOVETO * and the rest PT_LINETO with PT_CLOSEFIGURE at the end) plus some buffer @@ -1599,7 +1599,7 @@ if(pLinePts)ExFreePool(pLinePts); /* Restore the old mapping mode */ - dc->w.MapMode = mapMode; + dc->Dc_Attr.iMapMode = mapMode; dc->wndExtX = szWindowExt.cx; dc->wndExtY = szWindowExt.cy; dc->wndOrgX = ptWindowOrg.x; Modified: trunk/reactos/subsystems/win32/win32k/objects/polyfill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/polyfill.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/polyfill.c Mon Aug 6 06:48:09 2007 @@ -578,7 +578,7 @@ if (NULL == list) return FALSE; - if ( WINDING == dc->w.polyFillMode ) + if ( WINDING == dc->Dc_Attr.jFillMode ) FillScanLine = POLYGONFILL_FillScanLineWinding; else /* default */ FillScanLine = POLYGONFILL_FillScanLineAlternate; Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c Mon Aug 6 06:48:09 2007 @@ -1855,7 +1855,7 @@ if(!dc) return ret; - if(dc->w.MapMode == MM_TEXT) // Requires only a translation + if(dc->Dc_Attr.iMapMode == MM_TEXT) // Requires only a translation { if(NtGdiCombineRgn(hDest, hSrc, 0, RGN_COPY) == ERROR) goto done; @@ -2570,7 +2570,7 @@ (PRECTL)visrgn->Buffer, (PRECTL)&visrgn->rdh.rcBound ); ASSERT( ClipRegion ); - pBrush = BRUSHOBJ_LockBrush(dc->w.hBrush); + pBrush = BRUSHOBJ_LockBrush(dc->Dc_Attr.hbrush); ASSERT(pBrush); IntGdiInitBrushInstance(&BrushInst, pBrush, dc->XlateBrush); Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Mon Aug 6 06:48:09 2007 @@ -1697,7 +1697,7 @@ { goto fail; } - hBrushFg = NtGdiCreateSolidBrush(XLATEOBJ_iXlate(XlateObj, dc->w.textColor), 0); + hBrushFg = NtGdiCreateSolidBrush(XLATEOBJ_iXlate(XlateObj, dc->Dc_Attr.crForegroundClr), 0); if ( !hBrushFg ) { goto fail; @@ -1708,9 +1708,9 @@ goto fail; } IntGdiInitBrushInstance(&BrushFgInst, BrushFg, NULL); - if ((fuOptions & ETO_OPAQUE) || dc->w.backgroundMode == OPAQUE) - { - hBrushBg = NtGdiCreateSolidBrush(XLATEOBJ_iXlate(XlateObj, dc->w.backgroundColor), 0); + if ((fuOptions & ETO_OPAQUE) || dc->Dc_Attr.jBkMode == OPAQUE) + { + hBrushBg = NtGdiCreateSolidBrush(XLATEOBJ_iXlate(XlateObj, dc->Dc_Attr.crBackgroundClr), 0); if ( !hBrushBg ) { goto fail; @@ -1758,13 +1758,13 @@ } else { - if (dc->w.backgroundMode == OPAQUE) + if (dc->Dc_Attr.jBkMode == OPAQUE) { fuOptions |= ETO_OPAQUE; } } - TextObj = TEXTOBJ_LockText(dc->w.hFont); + TextObj = TEXTOBJ_LockText(dc->Dc_Attr.hlfntNew); if(TextObj == NULL) { goto fail; @@ -1827,9 +1827,9 @@ * Process the vertical alignment and determine the yoff. */ - if (dc->w.textAlign & TA_BASELINE) + if (dc->Dc_Attr.lTextAlign & TA_BASELINE) yoff = 0; - else if (dc->w.textAlign & TA_BOTTOM) + else if (dc->Dc_Attr.lTextAlign & TA_BOTTOM) yoff = -face->size->metrics.descender >> 6; else /* TA_TOP */ yoff = face->size->metrics.ascender >> 6; @@ -1841,7 +1841,7 @@ * Process the horizontal alignment and modify XStart accordingly. */ - if (dc->w.textAlign & (TA_RIGHT | TA_CENTER)) + if (dc->Dc_Attr.lTextAlign & (TA_RIGHT | TA_CENTER)) { ULONGLONG TextWidth = 0; LPCWSTR TempText = String; @@ -1905,7 +1905,7 @@ previous = 0; - if (dc->w.textAlign & TA_RIGHT) + if (dc->Dc_Attr.lTextAlign & TA_RIGHT) { RealXStart -= TextWidth; } @@ -2205,7 +2205,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - hFont = dc->w.hFont; + hFont = dc->Dc_Attr.hlfntNew; TextObj = TEXTOBJ_LockText(hFont); DC_UnlockDc(dc); @@ -2349,7 +2349,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - hFont = dc->w.hFont; + hFont = dc->Dc_Attr.hlfntNew; TextObj = TEXTOBJ_LockText(hFont); DC_UnlockDc(dc); @@ -2515,7 +2515,7 @@ return GDI_ERROR; } eM11 = dc->w.xformWorld2Vport.eM11; - hFont = dc->w.hFont; + hFont = dc->Dc_Attr.hlfntNew; TextObj = TEXTOBJ_LockText(hFont); DC_UnlockDc(dc); if (!TextObj) @@ -3138,7 +3138,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return 0; } - hFont = dc->w.hFont; + hFont = dc->Dc_Attr.hlfntNew; TextObj = TEXTOBJ_LockText(hFont); DC_UnlockDc(dc); if (TextObj == NULL) @@ -3217,7 +3217,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return Ret; } - hFont = Dc->w.hFont; + hFont = Dc->Dc_Attr.hlfntNew; TextObj = TEXTOBJ_LockText(hFont); DC_UnlockDc( Dc ); if ( TextObj == NULL) @@ -3493,7 +3493,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - TextObj = TEXTOBJ_LockText(dc->w.hFont); + TextObj = TEXTOBJ_LockText(dc->Dc_Attr.hlfntNew); if ( TextObj ) { Result = TextIntGetTextExtentPoint(dc, TextObj, String, Count, MaxExtent, @@ -3621,7 +3621,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - TextObj = TEXTOBJ_LockText(dc->w.hFont); + TextObj = TEXTOBJ_LockText(dc->Dc_Attr.hlfntNew); if ( TextObj != NULL ) { Result = TextIntGetTextExtentPoint ( @@ -3671,7 +3671,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - hFont = Dc->w.hFont; + hFont = Dc->Dc_Attr.hlfntNew; DC_UnlockDc(Dc); TextObj = TEXTOBJ_LockText(hFont); @@ -3721,7 +3721,7 @@ return FALSE; } - TextObj = TEXTOBJ_LockText(dc->w.hFont); + TextObj = TEXTOBJ_LockText(dc->Dc_Attr.hlfntNew); if (NULL != TextObj) { FontGDI = ObjToGDI(TextObj->Font, FONT); @@ -3842,8 +3842,8 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return GDI_ERROR; } - prevAlign = dc->w.textAlign; - dc->w.textAlign = Mode; + prevAlign = dc->Dc_Attr.lTextAlign; + dc->Dc_Attr.lTextAlign = Mode; DC_UnlockDc( dc ); return prevAlign; } @@ -3863,9 +3863,9 @@ return CLR_INVALID; } - oldColor = dc->w.textColor; - dc->w.textColor = color; - hBrush = dc->w.hBrush; + oldColor = dc->Dc_Attr.crForegroundClr; + dc->Dc_Attr.crForegroundClr = color; + hBrush = dc->Dc_Attr.hbrush; DC_UnlockDc( dc ); NtGdiSelectObject(hDC, hBrush); return oldColor; @@ -3901,7 +3901,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return GDI_ERROR; } - hFont = Dc->w.hFont; + hFont = Dc->Dc_Attr.hlfntNew; TextObj = TEXTOBJ_LockText(hFont); DC_UnlockDc(Dc); @@ -4196,8 +4196,8 @@ return Ret; } DPRINT("TextCharacterExtra %d", CharExtra); - Ret = dc->w.charExtra; - if( Set ) dc->w.charExtra = CharExtra; + Ret = dc->Dc_Attr.lTextExtra; + if( Set ) dc->Dc_Attr.lTextExtra = CharExtra; DC_UnlockDc(dc); return (Ret); }

1 0

[tkreuzer] 28182: - convert a bunch of tests to regression tests as they succeed on ros - add tests for NtGdiGetRandomRgn
by tkreuzer＠svn.reactos.org 05 Aug '07

05 Aug '07

Author: tkreuzer Date: Mon Aug 6 03:05:02 2007 New Revision: 28182 URL: http://svn.reactos.org/svn/reactos?rev=28182&view=rev Log: - convert a bunch of tests to regression tests as they succeed on ros - add tests for NtGdiGetRandomRgn Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetRandomRgn.c Modified: trunk/rostests/apitests/gdi32api/tests/CreateCompatibleDC.c trunk/rostests/apitests/gdi32api/tests/CreateFont.c trunk/rostests/apitests/gdi32api/tests/CreatePen.c trunk/rostests/apitests/gdi32api/tests/ExtCreatePen.c trunk/rostests/apitests/gdi32api/tests/GetObject.c trunk/rostests/apitests/gdi32api/tests/GetStockObject.c trunk/rostests/apitests/gdi32api/tests/SetDCPenColor.c trunk/rostests/apitests/gdi32api/tests/SetSysColors.c trunk/rostests/apitests/w32knapi/testlist.c Modified: trunk/rostests/apitests/gdi32api/tests/CreateCompatibleDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/C… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/CreateCompatibleDC.c (original) +++ trunk/rostests/apitests/gdi32api/tests/CreateCompatibleDC.c Mon Aug 6 03:05:02 2007 @@ -13,7 +13,7 @@ } hDC = CreateCompatibleDC(hDCScreen); - TEST(hDC != NULL); + RTEST(hDC != NULL); // Test if first selected pen is BLACK_PEN (? or same as screen DC's pen?) TEST(SelectObject(hDC, GetStockObject(DC_PEN)) == GetStockObject(BLACK_PEN)); @@ -27,7 +27,7 @@ DeleteDC(hDC); hDC = CreateCompatibleDC(hDCScreen); hDC2 = CreateCompatibleDC(hOldDC); - TEST(hDC2 == NULL); + RTEST(hDC2 == NULL); if (hDC2 != NULL) DeleteDC(hDC2); // cleanup Modified: trunk/rostests/apitests/gdi32api/tests/CreateFont.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/C… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/CreateFont.c (original) +++ trunk/rostests/apitests/gdi32api/tests/CreateFont.c Mon Aug 6 03:05:02 2007 @@ -12,10 +12,10 @@ hFont = CreateFontA(15, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, INVALIDFONT); - TEST(hFont); - TEST(GetObjectA(hFont, sizeof(LOGFONTA), &logfonta) == sizeof(LOGFONTA)); - TEST(memcmp(logfonta.lfFaceName, INVALIDFONT, strlen(INVALIDFONT)) == 0); - TEST(logfonta.lfWeight == FW_DONTCARE); + RTEST(hFont); + RTEST(GetObjectA(hFont, sizeof(LOGFONTA), &logfonta) == sizeof(LOGFONTA)); + RTEST(memcmp(logfonta.lfFaceName, INVALIDFONT, strlen(INVALIDFONT)) == 0); + RTEST(logfonta.lfWeight == FW_DONTCARE); return APISTATUS_NORMAL; Modified: trunk/rostests/apitests/gdi32api/tests/CreatePen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/C… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/CreatePen.c (original) +++ trunk/rostests/apitests/gdi32api/tests/CreatePen.c Mon Aug 6 03:05:02 2007 @@ -22,36 +22,36 @@ /* PS_GEOMETRIC | PS_DASHDOT = 0x00001011 will become PS_SOLID */ logpen.lopnStyle = 22; hPen = CreatePen(PS_GEOMETRIC | PS_DASHDOT, 5, RGB(1,2,3)); - TEST(hPen); + RTEST(hPen); GetObject(hPen, sizeof(logpen), &logpen); - TEST(logpen.lopnStyle == PS_SOLID); + RTEST(logpen.lopnStyle == PS_SOLID); DeleteObject(hPen); /* PS_USERSTYLE will become PS_SOLID */ logpen.lopnStyle = 22; hPen = CreatePen(PS_USERSTYLE, 5, RGB(1,2,3)); - TEST(hPen); + RTEST(hPen); GetObject(hPen, sizeof(logpen), &logpen); - TEST(logpen.lopnStyle == PS_SOLID); + RTEST(logpen.lopnStyle == PS_SOLID); DeleteObject(hPen); /* PS_ALTERNATE will become PS_SOLID */ logpen.lopnStyle = 22; hPen = CreatePen(PS_ALTERNATE, 5, RGB(1,2,3)); - TEST(hPen); + RTEST(hPen); GetObject(hPen, sizeof(logpen), &logpen); - TEST(logpen.lopnStyle == PS_SOLID); + RTEST(logpen.lopnStyle == PS_SOLID); DeleteObject(hPen); /* PS_INSIDEFRAME is ok */ logpen.lopnStyle = 22; hPen = CreatePen(PS_INSIDEFRAME, 5, RGB(1,2,3)); - TEST(hPen); + RTEST(hPen); GetObject(hPen, sizeof(logpen), &logpen); - TEST(logpen.lopnStyle == PS_INSIDEFRAME); + RTEST(logpen.lopnStyle == PS_INSIDEFRAME); DeleteObject(hPen); - TEST(GetLastError() == ERROR_SUCCESS); + RTEST(GetLastError() == ERROR_SUCCESS); return APISTATUS_NORMAL; } Modified: trunk/rostests/apitests/gdi32api/tests/ExtCreatePen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/E… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/ExtCreatePen.c (original) +++ trunk/rostests/apitests/gdi32api/tests/ExtCreatePen.c Mon Aug 6 03:05:02 2007 @@ -14,14 +14,14 @@ if (!hPen) return FALSE; /* Test if we have an EXTPEN */ - TEST(GDI_HANDLE_GET_TYPE(hPen) == GDI_OBJECT_TYPE_EXTPEN); + RTEST(GDI_HANDLE_GET_TYPE(hPen) == GDI_OBJECT_TYPE_EXTPEN); DeleteObject(hPen); /* test userstyles */ hPen = ExtCreatePen(PS_GEOMETRIC | PS_USERSTYLE, 5, &logbrush, 17, (CONST DWORD*)&dwStyles); - TEST(hPen == 0); + RTEST(hPen == 0); hPen = ExtCreatePen(PS_GEOMETRIC | PS_USERSTYLE, 5, &logbrush, 16, (CONST DWORD*)&dwStyles); - TEST(hPen != 0); + RTEST(hPen != 0); DeleteObject(hPen); Modified: trunk/rostests/apitests/gdi32api/tests/GetObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GetObject.c (original) +++ trunk/rostests/apitests/gdi32api/tests/GetObject.c Mon Aug 6 03:05:02 2007 @@ -276,18 +276,18 @@ TEST(extlogpen.elpPenStyle == (PS_GEOMETRIC | PS_DASH)); TEST(extlogpen.elpWidth == 5); TEST(extlogpen.elpBrushStyle == 0); - TEST(extlogpen.elpColor == RGB(1,2,3)); - TEST(extlogpen.elpHatch == 22); - TEST(extlogpen.elpNumEntries == 0); + RTEST(extlogpen.elpColor == RGB(1,2,3)); + RTEST(extlogpen.elpHatch == 22); + RTEST(extlogpen.elpNumEntries == 0); DeleteObject(hPen); /* A maximum of 16 Styles is allowed */ hPen = ExtCreatePen(PS_GEOMETRIC | PS_USERSTYLE, 5, &logbrush, 16, (CONST DWORD*)&dwStyles); - TEST(GetObject(hPen, 0, NULL) == sizeof(EXTLOGPEN) + 15*sizeof(DWORD)); - TEST(GetObject(hPen, sizeof(EXTLOGPEN) + 15*sizeof(DWORD), &elpUserStyle) == sizeof(EXTLOGPEN) + 15*sizeof(DWORD)); - TEST(((EXTLOGPEN*)&elpUserStyle)->elpStyleEntry[0] == 0); - TEST(((EXTLOGPEN*)&elpUserStyle)->elpStyleEntry[1] == 1); - TEST(((EXTLOGPEN*)&elpUserStyle)->elpStyleEntry[15] == 15); + RTEST(GetObject(hPen, 0, NULL) == sizeof(EXTLOGPEN) + 15*sizeof(DWORD)); + RTEST(GetObject(hPen, sizeof(EXTLOGPEN) + 15*sizeof(DWORD), &elpUserStyle) == sizeof(EXTLOGPEN) + 15*sizeof(DWORD)); + RTEST(((EXTLOGPEN*)&elpUserStyle)->elpStyleEntry[0] == 0); + RTEST(((EXTLOGPEN*)&elpUserStyle)->elpStyleEntry[1] == 1); + RTEST(((EXTLOGPEN*)&elpUserStyle)->elpStyleEntry[15] == 15); DeleteObject(hPen); return TRUE; Modified: trunk/rostests/apitests/gdi32api/tests/GetStockObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GetStockObject.c (original) +++ trunk/rostests/apitests/gdi32api/tests/GetStockObject.c Mon Aug 6 03:05:02 2007 @@ -9,19 +9,19 @@ TEST(GetStockObject(21) != NULL); TEST(GetStockObject(-1) == NULL); TEST(GetStockObject(9) == NULL); - TEST(GetStockObject(22) == NULL); - TEST(GetLastError() == ERROR_SUCCESS); + RTEST(GetStockObject(22) == NULL); + RTEST(GetLastError() == ERROR_SUCCESS); /* Test for the stock bit */ - TEST((UINT)GetStockObject(WHITE_BRUSH) && GDI_HANDLE_STOCK_MASK); + RTEST((UINT)GetStockObject(WHITE_BRUSH) && GDI_HANDLE_STOCK_MASK); /* Test for correct types */ - TEST(GDI_HANDLE_GET_TYPE(GetStockObject(WHITE_BRUSH)) == GDI_OBJECT_TYPE_BRUSH); + RTEST(GDI_HANDLE_GET_TYPE(GetStockObject(WHITE_BRUSH)) == GDI_OBJECT_TYPE_BRUSH); TEST(GDI_HANDLE_GET_TYPE(GetStockObject(DC_BRUSH)) == GDI_OBJECT_TYPE_BRUSH); - TEST(GDI_HANDLE_GET_TYPE(GetStockObject(WHITE_PEN)) == GDI_OBJECT_TYPE_PEN); + RTEST(GDI_HANDLE_GET_TYPE(GetStockObject(WHITE_PEN)) == GDI_OBJECT_TYPE_PEN); TEST(GDI_HANDLE_GET_TYPE(GetStockObject(DC_PEN)) == GDI_OBJECT_TYPE_PEN); TEST(GDI_HANDLE_GET_TYPE(GetStockObject(ANSI_VAR_FONT)) == GDI_OBJECT_TYPE_FONT); - TEST(GDI_HANDLE_GET_TYPE(GetStockObject(DEFAULT_PALETTE)) == GDI_OBJECT_TYPE_PALETTE); + RTEST(GDI_HANDLE_GET_TYPE(GetStockObject(DEFAULT_PALETTE)) == GDI_OBJECT_TYPE_PALETTE); return APISTATUS_NORMAL; } Modified: trunk/rostests/apitests/gdi32api/tests/SetDCPenColor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/S… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/SetDCPenColor.c (original) +++ trunk/rostests/apitests/gdi32api/tests/SetDCPenColor.c Mon Aug 6 03:05:02 2007 @@ -6,7 +6,7 @@ HDC hScreenDC, hDC; // Test an incorrect DC - TEST(SetDCPenColor(0, RGB(0,0,0)) == CLR_INVALID); + RTEST(SetDCPenColor(0, RGB(0,0,0)) == CLR_INVALID); // Get the Screen DC hScreenDC = GetDC(NULL); @@ -34,7 +34,7 @@ // Test CLR_INVALID, it sets CLR_INVALID! SetDCPenColor(hDC, CLR_INVALID); - TEST(SetDCPenColor(hDC, RGB(0,0,0)) == CLR_INVALID); + RTEST(SetDCPenColor(hDC, RGB(0,0,0)) == CLR_INVALID); // Delete the DC DeleteDC(hDC); Modified: trunk/rostests/apitests/gdi32api/tests/SetSysColors.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/S… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/SetSysColors.c (original) +++ trunk/rostests/apitests/gdi32api/tests/SetSysColors.c Mon Aug 6 03:05:02 2007 @@ -18,11 +18,11 @@ } TEST((UINT)SetSysColors(0, nElements, crColors) == 1); - TEST((UINT)SetSysColors(1, nElements, crColors) == 1); - TEST((UINT)SetSysColors(2, nElements, crColors) == 1); + RTEST((UINT)SetSysColors(1, nElements, crColors) == 1); + RTEST((UINT)SetSysColors(2, nElements, crColors) == 1); /* try more than NUM_SYSCOLORS */ - TEST((UINT)SetSysColors(55, nElements, crColors) == 1); + RTEST((UINT)SetSysColors(55, nElements, crColors) == 1); /* restore old SysColors */ SetSysColors(NUM_SYSCOLORS, nElements, crOldColors); Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetRandomRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetRandomRgn.c (added) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetRandomRgn.c Mon Aug 6 03:05:02 2007 @@ -1,0 +1,74 @@ +#include "../w32knapi.h" + +W32KAPI +INT +APIENTRY +NtGdiGetRandomRgn( + IN HDC hdc, + IN HRGN hrgn, + IN INT iRgn) +{ + return (INT)Syscall(L"NtGdiGetRandomRgn", 3, &hdc); +} + + +INT +Test_NtGdiGetRandomRgn(PTESTINFO pti) +{ + HWND hWnd; + HDC hDC; + HRGN hrgn, hrgn2; + + /* Create a window */ + hWnd = CreateWindowW(L"BUTTON", L"TestWindow", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, + NULL, NULL, g_hInstance, 0); +// UpdateWindow(hWnd); + hDC = GetDC(hWnd); + + ASSERT1(hDC != NULL); + + hrgn = CreateRectRgn(0,0,0,0); + hrgn2 = CreateRectRgn(3,3,10,10); + SetLastError(ERROR_SUCCESS); + TEST(NtGdiGetRandomRgn(0, hrgn, 0) == -1); + TEST(GetLastError() == ERROR_INVALID_HANDLE); + + SetLastError(ERROR_SUCCESS); + TEST(NtGdiGetRandomRgn(hDC, 0, 0) == 0); + TEST(NtGdiGetRandomRgn(hDC, (HRGN)-5, 0) == 0); + TEST(NtGdiGetRandomRgn(hDC, hrgn, 0) == 0); + TEST(NtGdiGetRandomRgn(hDC, hrgn, 1) == 0); + TEST(NtGdiGetRandomRgn(hDC, hrgn, 2) == 0); + TEST(NtGdiGetRandomRgn(hDC, hrgn, 3) == 0); + TEST(NtGdiGetRandomRgn(hDC, hrgn, 4) == 1); + TEST(NtGdiGetRandomRgn(hDC, hrgn, 5) == 0); + TEST(NtGdiGetRandomRgn(hDC, hrgn, 10) == 0); + TEST(NtGdiGetRandomRgn(hDC, hrgn, -10) == 0); + RTEST(GetLastError() == ERROR_SUCCESS); + + SelectClipRgn(hDC, hrgn2); + TEST(NtGdiGetRandomRgn(hDC, hrgn, 1) == 1); + TEST(CombineRgn(hrgn, hrgn, hrgn, RGN_OR) == SIMPLEREGION); + TEST(CombineRgn(hrgn, hrgn, hrgn2, RGN_XOR) == NULLREGION); + + SetRectRgn(hrgn2,0,0,0,0); + SelectClipRgn(hDC, hrgn2); + TEST(NtGdiGetRandomRgn(hDC, hrgn, 1) == 1); + + TEST(CombineRgn(hrgn2, hrgn, hrgn2, RGN_XOR) == NULLREGION); + TEST(CombineRgn(hrgn2, hrgn, hrgn, RGN_OR) == NULLREGION); + + SelectClipRgn(hDC, NULL); + TEST(NtGdiGetRandomRgn(hDC, hrgn, 1) == 0); + + + TEST(NtGdiGetRandomRgn(hDC, hrgn, 4) == 1); + + RTEST(GetLastError() == ERROR_SUCCESS); + + DeleteDC(hDC); + DestroyWindow(hWnd); + + return APISTATUS_NORMAL; +} Modified: trunk/rostests/apitests/w32knapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/testlis… ============================================================================== --- trunk/rostests/apitests/w32knapi/testlist.c (original) +++ trunk/rostests/apitests/w32knapi/testlist.c Mon Aug 6 03:05:02 2007 @@ -9,6 +9,7 @@ #include "ntgdi/NtGdiArcInternal.c" //#include "ntgdi/NtGdiDoPalette.c" #include "ntgdi/NtGdiGetBitmapBits.c" +#include "ntgdi/NtGdiGetRandomRgn.c" #include "ntgdi/NtGdiSetBitmapBits.c" //#include "ntgdi/NtGdiSTROBJ_vEnumStart.c" @@ -26,6 +27,7 @@ { L"NtGdiArcInternal", Test_NtGdiArcInternal }, // { L"NtGdiDoPalette", Test_NtGdiDoPalette }, { L"NtGdiGetBitmapBits", Test_NtGdiGetBitmapBits }, + { L"NtGdiGetRandomRgn", Test_NtGdiGetRandomRgn }, { L"NtGdiSetBitmapBits", Test_NtGdiSetBitmapBits }, // { L"NtGdiSTROBJ_vEnumStart", Test_NtGdiSTROBJ_vEnumStart },

1 0

[jimtabor] 28181: Start of the dcattr migration.
by jimtabor＠svn.reactos.org 05 Aug '07

05 Aug '07

Author: jimtabor Date: Mon Aug 6 02:02:12 2007 New Revision: 28181 URL: http://svn.reactos.org/svn/reactos?rev=28181&view=rev Log: Start of the dcattr migration. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h trunk/reactos/subsystems/win32/win32k/include/dc.h Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Mon Aug 6 02:02:12 2007 @@ -89,6 +89,27 @@ #define GDI_ENTRY_GET_REUSECNT(e) \ ((((ULONG_PTR)(e)) & GDI_ENTRY_REUSE_MASK) >> GDI_ENTRY_REUSECNT_SHIFT) +/* DC OBJ Types */ +#define DC_TYPE_DIRECT 0 // normal device context +#define DC_TYPE_MEMORY 1 // memory device context +#define DC_TYPE_INFO 2 // information context + +/* DC OBJ Flags */ +#define DC_FLAG_DISPLAY 0x0001 +#define DC_FLAG_DIRECT 0x0002 +#define DC_FLAG_CANCELLED 0x0004 +#define DC_FLAG_PERMANENT 0x0008 +#define DC_FLAG_DIRTY_RAO 0x0010 +#define DC_FLAG_ACCUM_WMGR 0x0020 +#define DC_FLAG_ACCUM_APP 0x0040 +#define DC_FLAG_RESET 0x0080 +#define DC_FLAG_SYNCHRONIZEACCESS 0x0100 +#define DC_FLAG_EPSPRINTINGESCAPE 0x0200 +#define DC_FLAG_TEMPINFODC 0x0400 +#define DC_FLAG_FULLSCREEN 0x0800 +#define DC_FLAG_IN_CLONEPDEV 0x1000 +#define DC_FLAG_REDIRECTION 0x2000 +#define DC_FLAG_SHAREACCESS 0x4000 /* DC_ATTR Dirty Flags */ #define DIRTY_FILL 0x00000001 Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Mon Aug 6 02:02:12 2007 @@ -122,7 +122,8 @@ HPALETTE PalIndexed; WIN_DC_INFO w; - + DC_ATTR Dc_Attr; + HANDLE hFile; LPENHMETAHEADER emh;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs