Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hyperion] 33633: - Remove WINE-isms from KeDeviceQueue code - Fix memory corruption that happened pretty much everytime you pressed a key or moved the mouse -- reponsible for countless crashes, including the famous ASSERT during 1-stage setup. - Remove anti-memory-corruption-workaround from VFAT - Note: If you're going to do use device queues in your driver, please learn how. Kthxbye. Patch by Alex Ionescu <alex.ionescu@reactos.org> _____ Alex, Marry me, KJK::Hyperion XOXOXO See issue #3116 for
by hyperion＠svn.reactos.org 22 May '08

22 May '08

Author: hyperion Date: Thu May 22 06:46:46 2008 New Revision: 33633 URL: http://svn.reactos.org/svn/reactos?rev=33633&view=rev Log: - Remove WINE-isms from KeDeviceQueue code - Fix memory corruption that happened pretty much everytime you pressed a key or moved the mouse -- reponsible for countless crashes, including the famous ASSERT during 1-stage setup. - Remove anti-memory-corruption-workaround from VFAT - Note: If you're going to do use device queues in your driver, please learn how. Kthxbye. Patch by Alex Ionescu <alex.ionescu(a)reactos.org> _____ Alex, Marry me, KJK::Hyperion XOXOXO See issue #3116 for more details. Modified: trunk/reactos/drivers/filesystems/fastfat/flush.c trunk/reactos/drivers/filesystems/fastfat/vfat.h trunk/reactos/drivers/input/kbdclass/kbdclass.c trunk/reactos/drivers/input/mouclass/mouclass.c trunk/reactos/ntoskrnl/ke/devqueue.c Modified: trunk/reactos/drivers/filesystems/fastfat/flush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/flush.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/flush.c [iso-8859-1] Thu May 22 06:46:46 2008 @@ -52,7 +52,6 @@ ListEntry = ListEntry->Flink; if (!vfatFCBIsDirectory(Fcb)) { - if (Fcb->PadPad51) continue; // Corrupt FCB ExAcquireResourceExclusiveLite(&Fcb->MainResource, TRUE); Status = VfatFlushFile(DeviceExt, Fcb); ExReleaseResourceLite (&Fcb->MainResource); Modified: trunk/reactos/drivers/filesystems/fastfat/vfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] Thu May 22 06:46:46 2008 @@ -322,21 +322,6 @@ { /* FCB header required by ROS/NT */ FSRTL_COMMON_FCB_HEADER RFCB; - ULONG PadPad; - ULONG PadPad2; - ULONG PadPad3; - ULONG PadPad4; - ULONG PadPad5; - ULONG PadPad50; - ULONG PadPad51; - ULONG PadPad52; - ULONG PadPad53; - ULONG PadPad54; - ULONG PadPad55; - ULONG PadPad56; - ULONG PadPad6; - ULONG PadPad7; - ULONG PadPad8; SECTION_OBJECT_POINTERS SectionObjectPointers; ERESOURCE MainResource; ERESOURCE PagingIoResource; Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] Thu May 22 06:46:46 2008 @@ -798,9 +798,6 @@ /* Go to next packet and complete this request */ Irp->IoStatus.Status = Status; - if (IsInStartIo) - IoStartNextPacket(DeviceObject, TRUE); - (VOID)IoSetCancelRoutine(Irp, NULL); IoCompleteRequest(Irp, IO_KEYBOARD_INCREMENT); DeviceExtension->PendingIrp = NULL; @@ -818,8 +815,6 @@ IoMarkIrpPending(Irp); DeviceExtension->PendingIrp = Irp; Status = STATUS_PENDING; - if (!IsInStartIo) - IoStartPacket(DeviceObject, Irp, NULL, NULL); } } return Status; Modified: trunk/reactos/drivers/input/mouclass/mouclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.c [iso-8859-1] Thu May 22 06:46:46 2008 @@ -774,9 +774,6 @@ /* Go to next packet and complete this request */ Irp->IoStatus.Status = Status; - if (IsInStartIo) - IoStartNextPacket(DeviceObject, TRUE); - (VOID)IoSetCancelRoutine(Irp, NULL); IoCompleteRequest(Irp, IO_MOUSE_INCREMENT); DeviceExtension->PendingIrp = NULL; @@ -794,8 +791,6 @@ IoMarkIrpPending(Irp); DeviceExtension->PendingIrp = Irp; Status = STATUS_PENDING; - if (!IsInStartIo) - IoStartPacket(DeviceObject, Irp, NULL, NULL); } } return Status; Modified: trunk/reactos/ntoskrnl/ke/devqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/devqueue.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/devqueue.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/devqueue.c [iso-8859-1] Thu May 22 06:46:46 2008 @@ -86,6 +86,8 @@ { KLOCK_QUEUE_HANDLE DeviceLock; BOOLEAN Inserted; + PLIST_ENTRY NextEntry; + PKDEVICE_QUEUE_ENTRY LastEntry; ASSERT_DEVICE_QUEUE(DeviceQueue); DPRINT("KeInsertByKeyDeviceQueue() DevQueue %p, Entry %p, SortKey 0x%x\n", DeviceQueue, DeviceQueueEntry, SortKey); @@ -105,12 +107,34 @@ } else { - /* Insert new entry after the last entry with SortKey less or equal to passed-in SortKey */ - InsertAscendingListFIFO(&DeviceQueue->DeviceListHead, - DeviceQueueEntry, - KDEVICE_QUEUE_ENTRY, - DeviceListEntry, - SortKey); + /* Make sure the list isn't empty */ + NextEntry = &DeviceQueue->DeviceListHead; + if (!IsListEmpty(NextEntry)) + { + /* Get the last entry */ + LastEntry = CONTAINING_RECORD(NextEntry->Blink, + KDEVICE_QUEUE_ENTRY, + DeviceListEntry); + + /* Check if our sort key is lower */ + if (SortKey < LastEntry->SortKey) + { + /* Loop each sort key */ + do + { + /* Get the next entry */ + NextEntry = NextEntry->Flink; + LastEntry = CONTAINING_RECORD(NextEntry, + KDEVICE_QUEUE_ENTRY, + DeviceListEntry); + + /* Keep looping until we find a place to insert */ + } while (SortKey >= LastEntry->SortKey); + } + } + + /* Now insert us */ + InsertTailList(NextEntry, &DeviceQueueEntry->DeviceListEntry); Inserted = TRUE; } @@ -199,39 +223,33 @@ KDEVICE_QUEUE_ENTRY, DeviceListEntry); - if (SortKey >= ReturnEntry->SortKey) - { + /* Check if we can just get the first entry */ + if (ReturnEntry->SortKey <= SortKey) + { + /* Get the first entry */ ReturnEntry = CONTAINING_RECORD(ListEntry->Flink, KDEVICE_QUEUE_ENTRY, DeviceListEntry); - - /* Remove it from the list */ - RemoveEntryList(&ReturnEntry->DeviceListEntry); } else { - /* Find entry with SortKey greater than or equal to the passed-in SortKey */ - LIST_FOR_EACH(ReturnEntry, &DeviceQueue->DeviceListHead, KDEVICE_QUEUE_ENTRY, DeviceListEntry) + /* Loop the list */ + ListEntry = DeviceQueue->DeviceListHead.Flink; + while (TRUE) { - /* Check if keys match */ - if (ReturnEntry->SortKey >= SortKey) - { - /* We found it, so just remove it */ - RemoveEntryList(&ReturnEntry->DeviceListEntry); - break; - } - } - - /* Check if we found something */ - if (!ReturnEntry) - { - /* Not found, return the first entry */ - ListEntry = RemoveHeadList(&DeviceQueue->DeviceListHead); + /* Get the next entry and check if the key is low enough */ ReturnEntry = CONTAINING_RECORD(ListEntry, KDEVICE_QUEUE_ENTRY, DeviceListEntry); + if (SortKey <= ReturnEntry->SortKey) break; + + /* Try the next one */ + ListEntry = ListEntry->Flink; } } + + /* We have an entry, remove it now */ + RemoveEntryList(&ReturnEntry->DeviceListEntry); /* Set it as non-inserted */ ReturnEntry->Inserted = FALSE;

1 0

[greatlrd] 33632: implemented GetTitleBarInfo in user32 it works now same as xp/vista left todo implemented it proper in win32k on the syscall NtUserGetTitleBarInfo that is stub at moment.
by greatlrd＠svn.reactos.org 22 May '08

22 May '08

Author: greatlrd Date: Thu May 22 03:39:24 2008 New Revision: 33632 URL: http://svn.reactos.org/svn/reactos?rev=33632&view=rev Log: implemented GetTitleBarInfo in user32 it works now same as xp/vista left todo implemented it proper in win32k on the syscall NtUserGetTitleBarInfo that is stub at moment. Modified: trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Thu May 22 03:39:24 2008 @@ -978,14 +978,13 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL GetTitleBarInfo(HWND hwnd, PTITLEBARINFO pti) { - UNIMPLEMENTED; - return FALSE; + return NtUserGetTitleBarInfo(hwnd,pti); } Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Thu May 22 03:39:24 2008 @@ -1480,8 +1480,8 @@ DWORD NTAPI NtUserGetTitleBarInfo( - DWORD Unknown0, - DWORD Unknown1); + HWND hwnd, + PTITLEBARINFO pti); BOOL NTAPI NtUserGetUpdateRect(HWND hWnd, LPRECT lpRect, BOOL fErase); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Thu May 22 03:39:24 2008 @@ -321,8 +321,8 @@ DWORD STDCALL NtUserGetTitleBarInfo( - DWORD Unknown0, - DWORD Unknown1) + HWND hwnd, + PTITLEBARINFO pti) { UNIMPLEMENTED

1 0

[fireball] 33631: - Fix a typo in this header's guard, prevents multiple inclusion.
by fireball＠svn.reactos.org 22 May '08

22 May '08

Author: fireball Date: Thu May 22 02:17:16 2008 New Revision: 33631 URL: http://svn.reactos.org/svn/reactos?rev=33631&view=rev Log: - Fix a typo in this header's guard, prevents multiple inclusion. Modified: trunk/reactos/include/reactos/windbgkd.h Modified: trunk/reactos/include/reactos/windbgkd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/windbgkd.h… ============================================================================== --- trunk/reactos/include/reactos/windbgkd.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/windbgkd.h [iso-8859-1] Thu May 22 02:17:16 2008 @@ -1,5 +1,5 @@ #ifndef _WINDBGKD_ -#define _WINDBGKG_ +#define _WINDBGKD_ // // Dependencies

1 0

[cfinck] 33630: Part 1 of the phpBB 3.x RosCMS Integration - The Design :-) - Delete the "subsilver2" skin, rename the "prosilver" skin to "roscms" - Modify this skin to fully integrate into the ReactOS Website Design. - Add a new root directory "css" for putting individual CSS files in. I start with "menu.css", which only contains the stuff relevant to the menu from "style.css". This file should be adopted by the other subsystems as well. - Modify the installation DB schema to activate PHP supp
by cfinck＠svn.reactos.org 21 May '08

21 May '08

Author: cfinck Date: Wed May 21 18:51:05 2008 New Revision: 33630 URL: http://svn.reactos.org/svn/reactos?rev=33630&view=rev Log: Part 1 of the phpBB 3.x RosCMS Integration - The Design :-) - Delete the "subsilver2" skin, rename the "prosilver" skin to "roscms" - Modify this skin to fully integrate into the ReactOS Website Design. - Add a new root directory "css" for putting individual CSS files in. I start with "menu.css", which only contains the stuff relevant to the menu from "style.css". This file should be adopted by the other subsystems as well. - Modify the installation DB schema to activate PHP support in templates (needed for the roscms skin) and choose the roscms skin by default. Added: trunk/web/reactos.org/htdocs/css/ trunk/web/reactos.org/htdocs/css/menu.css (with props) trunk/web/reactos.org/htdocs/forum/styles/roscms/ - copied from r33628, trunk/web/reactos.org/htdocs/forum/styles/prosilver/ Removed: trunk/web/reactos.org/htdocs/forum/styles/prosilver/ trunk/web/reactos.org/htdocs/forum/styles/roscms/theme/large.css trunk/web/reactos.org/htdocs/forum/styles/roscms/theme/medium.css trunk/web/reactos.org/htdocs/forum/styles/roscms/theme/normal.css trunk/web/reactos.org/htdocs/forum/styles/subsilver2/ Modified: trunk/web/reactos.org/htdocs/forum/cache/ (props changed) trunk/web/reactos.org/htdocs/forum/install/schemas/firebird_schema.sql (props changed) trunk/web/reactos.org/htdocs/forum/install/schemas/mssql_schema.sql (props changed) trunk/web/reactos.org/htdocs/forum/install/schemas/mysql_40_schema.sql (props changed) trunk/web/reactos.org/htdocs/forum/install/schemas/mysql_41_schema.sql (props changed) trunk/web/reactos.org/htdocs/forum/install/schemas/oracle_schema.sql (props changed) trunk/web/reactos.org/htdocs/forum/install/schemas/postgres_schema.sql (props changed) trunk/web/reactos.org/htdocs/forum/install/schemas/schema_data.sql (contents, props changed) trunk/web/reactos.org/htdocs/forum/install/schemas/sqlite_schema.sql (props changed) trunk/web/reactos.org/htdocs/forum/styles/roscms/imageset/imageset.cfg trunk/web/reactos.org/htdocs/forum/styles/roscms/style.cfg trunk/web/reactos.org/htdocs/forum/styles/roscms/template/overall_footer.ht… trunk/web/reactos.org/htdocs/forum/styles/roscms/template/overall_header.ht… trunk/web/reactos.org/htdocs/forum/styles/roscms/template/template.cfg trunk/web/reactos.org/htdocs/forum/styles/roscms/template/viewtopic_print.h… trunk/web/reactos.org/htdocs/forum/styles/roscms/theme/colours.css trunk/web/reactos.org/htdocs/forum/styles/roscms/theme/common.css trunk/web/reactos.org/htdocs/forum/styles/roscms/theme/links.css trunk/web/reactos.org/htdocs/forum/styles/roscms/theme/stylesheet.css trunk/web/reactos.org/htdocs/forum/styles/roscms/theme/theme.cfg Added: trunk/web/reactos.org/htdocs/css/menu.css URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/css/menu.cs… ============================================================================== --- trunk/web/reactos.org/htdocs/css/menu.css (added) +++ trunk/web/reactos.org/htdocs/css/menu.css [iso-8859-1] Wed May 21 18:51:05 2008 @@ -1,0 +1,118 @@ +body { + font-family: Verdana; + font-size: 12px; + margin: 0 0 1em 0; + padding: 0; /* Only affects Opera */ + background: #FFFFFF url('http://www.reactos.org/images/topbar.jpg') repeat-x scroll top left; +} + +.contentSmallTitle { + font-size: 14px; + font-weight: bold; + color: white; + background-color: #5984C3; + padding: 0px 0px 1px 10px; + margin-bottom: 3px; +} + +.contentSmallTitle a { + color: white; + text-decoration: none; +} + +.contentSmallTitle a:hover { + text-decoration: underline; +} + +#top { + margin: 0; + background: url('http://www.reactos.org/images/logo.jpg') no-repeat scroll 35px 0; + padding: 103px 0 26px 0; + color: #FFFFFF; + text-align: right; +} + +#top a { + font-size: 13px; + color: #FFFFFF; + text-decoration: none; + padding: 1px 5px 1px 5px; +} + +#top a:hover { + color: #000000; + background-color: #FFCC33; +} + +#topMenu { + font-size: 13px; + margin-left: 300px; + background-color: #5984C3; +} + +#topMenu p { + text-align: left; + margin: 0; +} + +#leftNav { + padding: 0px 10px 10px 7px; +} + +#leftNav ol { + margin: 0; + padding: 0; + list-style-type: none; + background-color: #EEEEEE; + border-top: #3F3849 0px solid; + border-right: #3F3849 1px solid; + border-left: #3F3849 1px solid; +} + +#leftNav ol li { + font-size: 12px; + font-weight: bold; + border-bottom: #3f3849 1px solid; +} + +#leftNav ol li a { + display: block; + width: 137px; + padding: 2px 4px 2px 4px; + + color: #3F3849; + text-decoration: none; + background-color: #EEEEEE; +} + +#leftNav ol li a:hover { + color: #000000; + background-color: #FFCC33; +} + +#leftNav ol li a.extern { + background: none; + padding-right: 0px; +} + +#leftNav .navTitle { + padding-left: 12px; + border-top: #3F3849 1px solid; + border-right: #3F3849 1px solid; + border-bottom: #3F3849 1px solid; + border-left: #3F3849 1px solid; + font-weight: bold; + font-size: 14px; + color: #FFFFFF; + background-color: #5984c3; +} + +#leftNav .navBox { + text-align: center; + padding: 2px; + background-color: #EEEEEE; + border-right: 1px solid #3F3849; + border-bottom: 1px solid #3F3849; + border-left: 1px solid #3F3849; + font-size: 13px; +} Propchange: trunk/web/reactos.org/htdocs/css/menu.css ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/web/reactos.org/htdocs/forum/cache/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Wed May 21 18:51:05 2008 @@ -1,0 +1,1 @@ +* Propchange: trunk/web/reactos.org/htdocs/forum/install/schemas/firebird_schema.sql ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/web/reactos.org/htdocs/forum/install/schemas/mssql_schema.sql ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/web/reactos.org/htdocs/forum/install/schemas/mysql_40_schema.sql ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/web/reactos.org/htdocs/forum/install/schemas/mysql_41_schema.sql ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/web/reactos.org/htdocs/forum/install/schemas/oracle_schema.sql ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/web/reactos.org/htdocs/forum/install/schemas/postgres_schema.sql ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/web/reactos.org/htdocs/forum/install/schemas/schema_data.sql URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/insta… ============================================================================== --- trunk/web/reactos.org/htdocs/forum/install/schemas/schema_data.sql [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/forum/install/schemas/schema_data.sql [iso-8859-1] Wed May 21 18:51:05 2008 @@ -210,7 +210,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_port', '25'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_username', ''); INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page', '25'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.1'); @@ -390,10 +390,10 @@ # -- phpbb_styles -INSERT INTO phpbb_styles (style_name, style_copyright, style_active, template_id, theme_id, imageset_id) VALUES ('prosilver', '© phpBB Group', 1, 1, 1, 1); +INSERT INTO phpbb_styles (style_name, style_copyright, style_active, template_id, theme_id, imageset_id) VALUES ('roscms', '© phpBB Group', 1, 1, 1, 1); # -- phpbb_styles_imageset -INSERT INTO phpbb_styles_imageset (imageset_name, imageset_copyright, imageset_path) VALUES ('prosilver', '© phpBB Group', 'prosilver'); +INSERT INTO phpbb_styles_imageset (imageset_name, imageset_copyright, imageset_path) VALUES ('roscms', '© phpBB Group', 'roscms'); # -- phpbb_styles_imageset_data INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('site_logo', 'site_logo.gif', '', 52, 139, 1); @@ -466,10 +466,10 @@ INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('subforum_unread', 'subforum_unread.gif', '', 9, 11, 1); # -- phpbb_styles_template -INSERT INTO phpbb_styles_template (template_name, template_copyright, template_path, bbcode_bitfield, template_storedb) VALUES ('prosilver', '© phpBB Group', 'prosilver', 'lNg=', 0); +INSERT INTO phpbb_styles_template (template_name, template_copyright, template_path, bbcode_bitfield, template_storedb) VALUES ('roscms', '© phpBB Group', 'roscms', 'lNg=', 0); # -- phpbb_styles_theme -INSERT INTO phpbb_styles_theme (theme_name, theme_copyright, theme_path, theme_storedb, theme_data) VALUES ('prosilver', '© phpBB Group', 'prosilver', 1, ''); +INSERT INTO phpbb_styles_theme (theme_name, theme_copyright, theme_path, theme_storedb, theme_data) VALUES ('roscms', '© phpBB Group', 'roscms', 1, ''); # -- Forums INSERT INTO phpbb_forums (forum_name, forum_desc, left_id, right_id, parent_id, forum_type, forum_posts, forum_topics, forum_topics_real, forum_last_post_id, forum_last_poster_id, forum_last_poster_name, forum_last_poster_colour, forum_last_post_time, forum_link, forum_password, forum_image, forum_rules, forum_rules_link, forum_rules_uid, forum_desc_uid, prune_days, prune_viewed, forum_parents) VALUES ('{L_FORUMS_FIRST_CATEGORY}', '', 1, 4, 0, 0, 1, 1, 1, 1, 2, 'Admin', 'AA0000', 972086460, '', '', '', '', '', '', '', 0, 0, ''); Propchange: trunk/web/reactos.org/htdocs/forum/install/schemas/schema_data.sql ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/web/reactos.org/htdocs/forum/install/schemas/sqlite_schema.sql ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/web/reactos.org/htdocs/forum/styles/roscms/imageset/imageset.cfg URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/style… ============================================================================== --- trunk/web/reactos.org/htdocs/forum/styles/roscms/imageset/imageset.cfg [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/forum/styles/roscms/imageset/imageset.cfg [iso-8859-1] Wed May 21 18:51:05 2008 @@ -17,7 +17,7 @@ # # General Information about this style -name = prosilver +name = roscms copyright = © phpBB Group, 2007 version = 3.0.0 Modified: trunk/web/reactos.org/htdocs/forum/styles/roscms/style.cfg URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/style… ============================================================================== --- trunk/web/reactos.org/htdocs/forum/styles/roscms/style.cfg [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/forum/styles/roscms/style.cfg [iso-8859-1] Wed May 21 18:51:05 2008 @@ -17,6 +17,6 @@ # # General Information about this style -name = prosilver +name = roscms copyright = © phpBB Group, 2007 version = 3.0.0 Modified: trunk/web/reactos.org/htdocs/forum/styles/roscms/template/overall_footer.ht… URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/style… ============================================================================== --- trunk/web/reactos.org/htdocs/forum/styles/roscms/template/overall_footer.ht… [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/forum/styles/roscms/template/overall_footer.ht… [iso-8859-1] Wed May 21 18:51:05 2008 @@ -38,6 +38,7 @@ </div> </div> +</td></tr></table> <div> <a id="bottom" name="bottom" accesskey="z"></a> Modified: trunk/web/reactos.org/htdocs/forum/styles/roscms/template/overall_header.ht… URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/style… ============================================================================== --- trunk/web/reactos.org/htdocs/forum/styles/roscms/template/overall_header.ht… [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/forum/styles/roscms/template/overall_header.ht… [iso-8859-1] Wed May 21 18:51:05 2008 @@ -15,10 +15,10 @@ <title>{SITENAME} • {L_MCP} • {L_UCP} • {PAGE_TITLE}</title>  <link href="{T_THEME_PATH}/bidi.css" rel="stylesheet" type="text/css" media="screen, projection" /> @@ -91,73 +88,64 @@ <body id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}"> + + readfile("http://www.reactos.org/en/subsys_extern_menu_top.html"); + readfile("http://www.reactos.org/en/subsys_extern_menu_left.html"); + + + <div class="navTitle">{L_FORUM}</div> + <ol> + <li><a href="{U_INDEX}" accesskey="h">{L_INDEX}</a></li> + <li><a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}">{L_MEMBERLIST}</a></li> + <li><a href="{U_FAQ}" title="{L_FAQ_EXPLAIN}">{L_FAQ}</a></li> + </ol> + <p></p> + +  + <form action="{U_SEARCH}" method="post" id="search"> + {S_SEARCH_HIDDEN_FIELDS} + + <div class="navTitle">{L_SEARCH}</div> + <div class="navBox"> + <input name="keywords" id="keywords" type="text" maxlength="128" title="{L_SEARCH_KEYWORDS}" class="inputbox search" value="{SEARCH_WORDS}{L_SEARCH_MINI}" onclick="if(this.value=='{LA_SEARCH_MINI}')this.value='';" onblur="if(this.value=='')this.value='{LA_SEARCH_MINI}';" /> + <input class="button2" value="{L_SEARCH}" type="submit" /><br /> + <a href="{U_SEARCH}" title="{L_SEARCH_ADV_EXPLAIN}">{L_SEARCH_ADV}</a> + </div> + </form> + <p></p> +  + + <div class="navTitle">Account</div> + <ol> +  + <li><a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="u">{L_PROFILE}</a></li> +  <li><a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}</a></li> + <li><a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a></li> + +  + <li><a href="{U_RESTORE_PERMISSIONS}">{L_RESTORE_PERMISSIONS}</a></li> +  +  + +  + <li><a href="{U_REGISTER}">{L_REGISTER}</a></li> + <li><a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="l">{L_LOGIN_LOGOUT}</a></li> +  + </ol> +</td> +<td> + +<div class="contentSmallTitle"><a href="http://www.reactos.org/en/community.html">ReactOS Community</a> > ReactOS Forum</div> + <div id="wrap"> <a id="top" name="top" accesskey="t"></a> <div id="page-header"> - <div class="headerbar"> - <div class="inner"><span class="corners-top"><span></span></span> - - <div id="site-description"> - <a href="{U_INDEX}" title="{L_INDEX}" id="logo">{SITE_LOGO_IMG}</a> - <h1>{SITENAME}</h1> - <p>{SITE_DESCRIPTION}</p> - <p style="display: none;"><a href="#start_here">{L_SKIP}</a></p> - </div> - -  - <div id="search-box"> - <form action="{U_SEARCH}" method="post" id="search"> - <fieldset> - <input name="keywords" id="keywords" type="text" maxlength="128" title="{L_SEARCH_KEYWORDS}" class="inputbox search" value="{SEARCH_WORDS}{L_SEARCH_MINI}" onclick="if(this.value=='{LA_SEARCH_MINI}')this.value='';" onblur="if(this.value=='')this.value='{LA_SEARCH_MINI}';" /> - <input class="button2" value="{L_SEARCH}" type="submit" /><br /> - <a href="{U_SEARCH}" title="{L_SEARCH_ADV_EXPLAIN}">{L_SEARCH_ADV}</a> {S_SEARCH_HIDDEN_FIELDS} - </fieldset> - </form> - </div> -  - - <span class="corners-bottom"><span></span></span></div> - </div> - - <div class="navbar"> - <div class="inner"><span class="corners-top"><span></span></span> - - <ul class="linklist navlinks"> - <li class="icon-home"><a href="{U_INDEX}" accesskey="h">{L_INDEX}</a>  <strong>‹</strong> <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a></li> - - <li class="rightside"><a href="#" onclick="fontsizeup(); return false;" onkeypress="fontsizeup(); return false;" class="fontsize" title="{L_CHANGE_FONT_SIZE}">{L_CHANGE_FONT_SIZE}</a></li> - - <li class="rightside"><a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}" class="sendemail">{L_EMAIL_TOPIC}</a></li> - <li class="rightside"><a href="{U_EMAIL_PM}" title="{L_EMAIL_PM}" class="sendemail">{L_EMAIL_PM}</a></li> - <li class="rightside"><a href="{U_PRINT_TOPIC}" title="{L_PRINT_TOPIC}" accesskey="p" class="print">{L_PRINT_TOPIC}</a></li> - <li class="rightside"><a href="{U_PRINT_PM}" title="{L_PRINT_PM}" accesskey="p" class="print">{L_PRINT_PM}</a></li> - </ul> - -  - <ul class="linklist leftside"> - <li class="icon-ucp"> - <a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="u">{L_PROFILE}</a> -  (<a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}</a>) • - <a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a> -  • - <a href="{U_RESTORE_PERMISSIONS}">{L_RESTORE_PERMISSIONS}</a> -  - </li> - </ul> -  - - <ul class="linklist rightside"> - <li class="icon-faq"><a href="{U_FAQ}" title="{L_FAQ_EXPLAIN}">{L_FAQ}</a></li> -  - <li class="icon-members"><a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}">{L_MEMBERLIST}</a></li> - <li class="icon-register"><a href="{U_REGISTER}">{L_REGISTER}</a></li> - <li class="icon-logout"><a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="l">{L_LOGIN_LOGOUT}</a></li> -  - </ul> - - <span class="corners-bottom"><span></span></span></div> - </div> - + <ul class="linklist"> + <li class="rightside"><a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}" class="sendemail">{L_EMAIL_TOPIC}</a></li> + <li class="rightside"><a href="{U_EMAIL_PM}" title="{L_EMAIL_PM}" class="sendemail">{L_EMAIL_PM}</a></li> + <li class="rightside"><a href="{U_PRINT_TOPIC}" title="{L_PRINT_TOPIC}" accesskey="p" class="print">{L_PRINT_TOPIC}</a></li> + <li class="rightside"><a href="{U_PRINT_PM}" title="{L_PRINT_PM}" accesskey="p" class="print">{L_PRINT_PM}</a></li> + </ul> </div> <a name="start_here"></a> Modified: trunk/web/reactos.org/htdocs/forum/styles/roscms/template/template.cfg URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/style… ============================================================================== --- trunk/web/reactos.org/htdocs/forum/styles/roscms/template/template.cfg [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/forum/styles/roscms/template/template.cfg [iso-8859-1] Wed May 21 18:51:05 2008 @@ -17,7 +17,7 @@ # # General Information about this template -name = prosilver +name = roscms copyright = © phpBB Group, 2007 version = 3.0.0 Modified: trunk/web/reactos.org/htdocs/forum/styles/roscms/template/viewtopic_print.h… URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/style… ============================================================================== --- trunk/web/reactos.org/htdocs/forum/styles/roscms/template/viewtopic_print.h… [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/forum/styles/roscms/template/viewtopic_print.h… [iso-8859-1] Wed May 21 18:51:05 2008 @@ -24,7 +24,7 @@ <div id="page-header"> <h1>{SITENAME}</h1> - <p>{SITE_DESCRIPTION}<br /><a href="{U_FORUM}">{U_FORUM}</a></p> + <a href="{U_FORUM}">{U_FORUM}</a></p> <h2>{TOPIC_TITLE}</h2> <p><a href="{U_TOPIC}">{U_TOPIC}</a></p> Modified: trunk/web/reactos.org/htdocs/forum/styles/roscms/theme/colours.css URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/style… ============================================================================== --- trunk/web/reactos.org/htdocs/forum/styles/roscms/theme/colours.css [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/forum/styles/roscms/theme/colours.css [iso-8859-1] Wed May 21 18:51:05 2008 @@ -233,25 +233,25 @@ Colours and backgrounds for links.css -------------------------------------------------------------- */ -a:link { color: #105289; } -a:visited { color: #105289; } -a:hover { color: #D31141; } -a:active { color: #368AD2; } +#wrap a:link { color: #105289; } +#wrap a:visited { color: #105289; } +#wrap a:hover { color: #D31141; } +#wrap a:active { color: #368AD2; } /* Links on gradient backgrounds */ -#search-box a:link, .navbg a:link, .forumbg .header a:link, .forabg .header a:link, th a:link { +#search-box a:link, #wrap .navbg a:link, #wrap .forumbg .header a:link, #wrap .forabg .header a:link, #wrap th a:link { color: #FFFFFF; } -#search-box a:visited, .navbg a:visited, .forumbg .header a:visited, .forabg .header a:visited, th a:visited { +#search-box a:visited, #wrap .navbg a:visited, #wrap .forumbg .header a:visited, #wrap .forabg .header a:visited, #wrap th a:visited { color: #FFFFFF; } -#search-box a:hover, .navbg a:hover, .forumbg .header a:hover, .forabg .header a:hover, th a:hover { +#search-box a:hover, #wrap .navbg a:hover, #wrap .forumbg .header a:hover, #wrap .forabg .header a:hover, #wrap th a:hover { color: #A8D8FF; } -#search-box a:active, .navbg a:active, .forumbg .header a:active, .forabg .header a:active, th a:active { +#search-box a:active, #wrap .navbg a:active, #wrap .forumbg .header a:active, #wrap .forabg .header a:active, #wrap th a:active { color: #C8E6FF; } Modified: trunk/web/reactos.org/htdocs/forum/styles/roscms/theme/common.css URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/style… ============================================================================== --- trunk/web/reactos.org/htdocs/forum/styles/roscms/theme/common.css [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/forum/styles/roscms/theme/common.css [iso-8859-1] Wed May 21 18:51:05 2008 @@ -1,4 +1,4 @@ -/* General proSilver Markup Styles +/* General roscms Markup Styles ---------------------------------------- */ * { @@ -7,25 +7,12 @@ padding: 0; } -html { - font-size: 100%; - /* Always show a scrollbar for short pages - stops the jump when the scrollbar appears. non-IE browsers */ - height: 100%; - margin-bottom: 1px; -} - -body { - /* Text-Sizing with ems: http://www.clagnut.com/blog/348/ */ - font-family: Verdana, Helvetica, Arial, sans-serif; - color: #828282; - background-color: #FFFFFF; - /*font-size: 62.5%; This sets the default font size to be equivalent to 10px */ - font-size: 10px; - margin: 0; - padding: 12px 0; -} - -h1 { +p { + /* Set the margin again for the separator elements for the menu items */ + margin-bottom: 1em; +} + +#wrap h1 { /* Forum name */ font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; margin-right: 200px; @@ -35,7 +22,7 @@ font-size: 2em; } -h2 { +#wrap h2 { /* Forum header titles */ font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; font-weight: normal; @@ -44,11 +31,11 @@ margin: 0.8em 0 0.2em 0; } -h2.solo { +#wrap h2.solo { margin-bottom: 1em; } -h3 { +#wrap h3 { /* Sub-headers (also used as post headers, but defined later) */ font-family: Arial, Helvetica, sans-serif; font-weight: bold; @@ -61,23 +48,23 @@ margin-top: 20px; } -h4 { +#wrap h4 { /* Forum and topic list titles */ font-family: "Trebuchet MS", Verdana, Helvetica, Arial, Sans-serif; font-size: 1.3em; } -p { +#wrap p { line-height: 1.3em; font-size: 1.1em; margin-bottom: 1.5em; } -img { +#wrap img { border-width: 0; } -hr { +#wrap hr { /* Also see tweaks.css */ border: 0 none #FFFFFF; border-top: 1px solid #CCCCCC; @@ -87,24 +74,27 @@ clear: both; } -hr.dashed { +#wrap hr.dashed { border-top: 1px dashed #CCCCCC; margin: 10px 0; } -hr.divider { +#wrap hr.divider { display: none; } -p.right { +#wrap p.right { text-align: right; } /* Main blocks ---------------------------------------- */ #wrap { - padding: 0 20px; - min-width: 650px; + font-family: Verdana, Helvetica, Arial, sans-serif; + color: #828282; + background-color: #FFFFFF; + font-size: 10px; + padding-right: 5px; } #simple-wrap { @@ -618,11 +608,6 @@ clear: both; } -#top { - position: absolute; - top: -20px; -} - .clear { display: block; clear: both; Removed: trunk/web/reactos.org/htdocs/forum/styles/roscms/theme/large.css URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/style… ============================================================================== --- trunk/web/reactos.org/htdocs/forum/styles/roscms/theme/large.css [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/forum/styles/roscms/theme/large.css (removed) @@ -1,3 +1,0 @@ -body { - font-size: 12px; -} Modified: trunk/web/reactos.org/htdocs/forum/styles/roscms/theme/links.css URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/style… ============================================================================== --- trunk/web/reactos.org/htdocs/forum/styles/roscms/theme/links.css [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/forum/styles/roscms/theme/links.css [iso-8859-1] Wed May 21 18:51:05 2008 @@ -1,10 +1,10 @@ /* proSilver Link Styles ---------------------------------------- */ -a:link { color: #898989; text-decoration: none; } -a:visited { color: #898989; text-decoration: none; } -a:hover { color: #d3d3d3; text-decoration: underline; } -a:active { color: #d2d2d2; text-decoration: none; } +#wrap a:link { color: #898989; text-decoration: none; } +#wrap a:visited { color: #898989; text-decoration: none; } +#wrap a:hover { color: #d3d3d3; text-decoration: underline; } +#wrap a:active { color: #d2d2d2; text-decoration: none; } /* Coloured usernames */ .username-coloured { Removed: trunk/web/reactos.org/htdocs/forum/styles/roscms/theme/medium.css URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/style… ============================================================================== --- trunk/web/reactos.org/htdocs/forum/styles/roscms/theme/medium.css [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/forum/styles/roscms/theme/medium.css (removed) @@ -1,3 +1,0 @@ -body { - font-size: 11px; -} Removed: trunk/web/reactos.org/htdocs/forum/styles/roscms/theme/normal.css URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/style… ============================================================================== --- trunk/web/reactos.org/htdocs/forum/styles/roscms/theme/normal.css [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/forum/styles/roscms/theme/normal.css (removed) @@ -1,3 +1,0 @@ -body { - font-size: 10px; -} Modified: trunk/web/reactos.org/htdocs/forum/styles/roscms/theme/stylesheet.css URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/style… ============================================================================== --- trunk/web/reactos.org/htdocs/forum/styles/roscms/theme/stylesheet.css [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/forum/styles/roscms/theme/stylesheet.css [iso-8859-1] Wed May 21 18:51:05 2008 @@ -1,9 +1,9 @@ /* phpBB 3.0 Style Sheet -------------------------------------------------------------- - Style name: proSilver + Style name: roscms Based on style: proSilver (this is the default phpBB 3 style) Original author: subBlue ( http://www.subBlue.com/ ) - Modified by: + Modified by: Colin Finck Copyright 2006 phpBB Group ( http://www.phpbb.com/ ) -------------------------------------------------------------- Modified: trunk/web/reactos.org/htdocs/forum/styles/roscms/theme/theme.cfg URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/style… ============================================================================== --- trunk/web/reactos.org/htdocs/forum/styles/roscms/theme/theme.cfg [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/forum/styles/roscms/theme/theme.cfg [iso-8859-1] Wed May 21 18:51:05 2008 @@ -19,7 +19,7 @@ # # General Information about this theme -name = prosilver +name = roscms copyright = © phpBB Group, 2007 version = 3.0.0

1 0

[jimtabor] 33629: Fix behavior if bmi null in NtGdiCreateDIBSection. Start internal functions for regions, includes a wine port get_region_type.
by jimtabor＠svn.reactos.org 21 May '08

21 May '08

Author: jimtabor Date: Wed May 21 17:32:13 2008 New Revision: 33629 URL: http://svn.reactos.org/svn/reactos?rev=33629&view=rev Log: Fix behavior if bmi null in NtGdiCreateDIBSection. Start internal functions for regions, includes a wine port get_region_type. Modified: trunk/reactos/subsystems/win32/win32k/include/region.h trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/subsystems/win32/win32k/include/region.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/region.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/region.h [iso-8859-1] Wed May 21 17:32:13 2008 @@ -38,6 +38,9 @@ BOOL FASTCALL IntGdiPaintRgn(PDC, HRGN ); HRGN FASTCALL GdiCreatePolyPolygonRgn(CONST PPOINT, CONST PINT, INT, INT ); +INT FASTCALL IntGdiCombineRgn(PROSRGNDATA, PROSRGNDATA, PROSRGNDATA, INT); +INT FASTCALL REGION_Complexity(PROSRGNDATA); + #define UnsafeIntCreateRectRgnIndirect(prc) \ NtGdiCreateRectRgn((prc)->left, (prc)->top, (prc)->right, (prc)->bottom) Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Wed May 21 17:32:13 2008 @@ -994,6 +994,8 @@ DC *dc; BOOL bDesktopDC = FALSE; + if (!bmi) return hbitmap; // Make sure. + // If the reference hdc is null, take the desktop dc if (hDC == 0) { 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 [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] Wed May 21 17:32:13 2008 @@ -483,6 +483,20 @@ } #endif /* not NDEBUG */ + +INT +FASTCALL +REGION_Complexity( PROSRGNDATA obj ) +{ + switch(obj->rdh.nCount) + { + DPRINT("Region Complexity -> %d",obj->rdh.nCount); + case 0: return NULLREGION; + case 1: return SIMPLEREGION; + default: return COMPLEXREGION; + } +} + static BOOL FASTCALL @@ -2064,6 +2078,62 @@ ExFreePool(pRgn->Buffer); return TRUE; } + +INT +FASTCALL +IntGdiCombineRgn(PROSRGNDATA destRgn, + PROSRGNDATA src1Rgn, + PROSRGNDATA src2Rgn, + INT CombineMode) +{ + INT result = ERROR; + + if (destRgn) + { + if (src1Rgn) + { + if (CombineMode == RGN_COPY) + { + if ( !REGION_CopyRegion(destRgn, src1Rgn) ) + return ERROR; + result = destRgn->rdh.iType; + } + else + { + if (src2Rgn) + { + switch (CombineMode) + { + case RGN_AND: + REGION_IntersectRegion(destRgn, src1Rgn, src2Rgn); + break; + case RGN_OR: + REGION_UnionRegion(destRgn, src1Rgn, src2Rgn); + break; + case RGN_XOR: + REGION_XorRegion(destRgn, src1Rgn, src2Rgn); + break; + case RGN_DIFF: + REGION_SubtractRegion(destRgn, src1Rgn, src2Rgn); + break; + } + result = destRgn->rdh.iType; + } + else if (src2Rgn == NULL) + { + DPRINT1("IntGdiCombineRgn requires hSrc2 != NULL for combine mode %d!\n", CombineMode); + } + } + } + } + else + { + DPRINT("IntGdiCombineRgn: hDest unavailable\n"); + result = ERROR; + } + return result; +} + // NtGdi Exported Functions INT

1 0

[cfinck] 33628: Commit an unmodified phpBB 3.0.1, so we can later track my changes. This will be my playground for getting it to work with RosCMS.
by cfinck＠svn.reactos.org 21 May '08

21 May '08

1 0

[hpoussin] 33627: Fix precompiled header name. According to http://gcc.gnu.org/onlinedocs/gcc/Precompiled-Headers.html , precompiled header name *must be* the name of the header followed by .gch See issue #3263 for more details.
by hpoussin＠svn.reactos.org 21 May '08

21 May '08

Author: hpoussin Date: Wed May 21 13:00:40 2008 New Revision: 33627 URL: http://svn.reactos.org/svn/reactos?rev=33627&view=rev Log: Fix precompiled header name. According to http://gcc.gnu.org/onlinedocs/gcc/Precompiled-Headers.html , precompiled header name *must be* the name of the header followed by .gch See issue #3263 for more details. Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Wed May 21 13:00:40 2008 @@ -1250,7 +1250,7 @@ return NULL; return new FileLocation ( IntermediateDirectory, module.pch->file->relative_path, - ReplaceExtension ( module.pch->file->name, "_" + module.name + ".gch" ) ); + module.pch->file->name + ".gch" ); } Rule arRule1 ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).a: $($(module_name)_OBJS) | $(INTERMEDIATE)$(SEP)$(source_dir)\n",

1 0

[hpoussin] 33626: Disable precompiled headers for files which are in more than one module (Precompiled header name have a fixed name, but modules may have different compile options)
by hpoussin＠svn.reactos.org 21 May '08

21 May '08

Author: hpoussin Date: Wed May 21 12:57:24 2008 New Revision: 33626 URL: http://svn.reactos.org/svn/reactos?rev=33626&view=rev Log: Disable precompiled headers for files which are in more than one module (Precompiled header name have a fixed name, but modules may have different compile options) Modified: trunk/reactos/lib/cmlib/cmlib.rbuild trunk/reactos/lib/inflib/inflib.rbuild trunk/reactos/lib/sdk/crt/crt.rbuild trunk/reactos/lib/sdk/crt/libcntpr.rbuild Modified: trunk/reactos/lib/cmlib/cmlib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.rbuild?rev… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.rbuild [iso-8859-1] Wed May 21 12:57:24 2008 @@ -7,7 +7,6 @@ <define name="_NTOSKRNL_" /> <define name="_NTSYSTEM_" /> <define name="NASSERT" /> - <pch>cmlib.h</pch> <file>cminit.c</file> <file>hivebin.c</file> <file>hivecell.c</file> @@ -26,7 +25,6 @@ <compilerflag>-Wwrite-strings</compilerflag> <compilerflag>-Wpointer-arith</compilerflag> <define name="CMLIB_HOST" /> - <pch>cmlib.h</pch> <file>cminit.c</file> <file>hivebin.c</file> <file>hivecell.c</file> Modified: trunk/reactos/lib/inflib/inflib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/inflib.rbuild?r… ============================================================================== --- trunk/reactos/lib/inflib/inflib.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/inflib/inflib.rbuild [iso-8859-1] Wed May 21 12:57:24 2008 @@ -4,7 +4,6 @@ <module name="inflib" type="staticlibrary"> <include base="inflib">.</include> <define name="__NO_CTYPE_INLINES" /> - <pch>inflib.h</pch> <file>infcore.c</file> <file>infget.c</file> <file>infput.c</file> @@ -22,7 +21,6 @@ <compilerflag>-Wmissing-prototypes</compilerflag> <define name="INFLIB_HOST" /> <include base="ReactOS">include</include> - <pch>inflib.h</pch> <file>infcore.c</file> <file>infget.c</file> <file>infput.c</file> Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Wed May 21 12:57:24 2008 @@ -12,7 +12,6 @@ <define name="_MSVCRT_" /> <define name="_MT" /> <define name="__NO_CTYPE_INLINES" /> - <pch>precomp.h</pch> <directory name="conio"> <file>cgets.c</file> <file>cprintf.c</file> Modified: trunk/reactos/lib/sdk/crt/libcntpr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.rbuil… ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] Wed May 21 12:57:24 2008 @@ -172,6 +172,4 @@ <file>wcsstr.c</file> <file>wcsrev.c</file> </directory> - - <pch>precomp.h</pch> </module>

1 0

[cfinck] 33625: Update to Bugzilla 3.0.4
by cfinck＠svn.reactos.org 21 May '08

21 May '08

1 0

[fireball] 33624: - Fix build.
by fireball＠svn.reactos.org 21 May '08

21 May '08

Author: fireball Date: Wed May 21 11:19:41 2008 New Revision: 33624 URL: http://svn.reactos.org/svn/reactos?rev=33624&view=rev Log: - Fix build. Modified: trunk/reactos/dll/win32/opengl32/gl.c Modified: trunk/reactos/dll/win32/opengl32/gl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/gl.c?re… ============================================================================== --- trunk/reactos/dll/win32/opengl32/gl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/gl.c [iso-8859-1] Wed May 21 11:19:41 2008 @@ -25,7 +25,6 @@ #include <windows.h> #include "teb.h" -#define C_ASSERT(e) extern char __C_ASSERT__[(e)?1:-1] C_ASSERT(FIELD_OFFSET(TEB, glTable) == 0xbe8); #include "opengl32.h"

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