Ros-diffs January 2009

ros-diffs@reactos.org

30 participants
755 discussions

[sginsberg] 38751: - KDBG: Correct the use of PsLookupThread/ProcessByThread/ProcessId -- the caller must dereference the Thread/Process after use

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Tue Jan 13 18:34:24 2009 New Revision: 38751 URL: http://svn.reactos.org/svn/reactos?rev=38751&view=rev Log: - KDBG: Correct the use of PsLookupThread/ProcessByThread/ProcessId -- the caller must dereference the Thread/Process after use Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.c?rev=38… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] Tue Jan 13 18:34:24 2009 @@ -1082,6 +1082,7 @@ if (KeIsExecutingDpc() && Process != KdbCurrentProcess) { KdbpPrint("Cannot attach to thread within another process while executing a DPC.\n"); + ObDereferenceObject(Thread); return FALSE; } @@ -1130,6 +1131,7 @@ KdbCurrentProcess = Process; } + ObDereferenceObject(Thread); return TRUE; } @@ -1158,6 +1160,7 @@ } Entry = Process->ThreadListHead.Flink; + ObDereferenceObject(Process); if (Entry == &KdbCurrentProcess->ThreadListHead) { KdbpPrint("No threads in process 0x%08x, cannot attach to process!\n", (ULONG)ProcessId); Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Tue Jan 13 18:34:24 2009 @@ -1090,6 +1090,7 @@ PLIST_ENTRY Entry; PETHREAD Thread = NULL; PEPROCESS Process = NULL; + BOOLEAN ReferencedThread = FALSE, ReferencedProcess = FALSE; PULONG Esp; PULONG Ebp; ULONG Eip; @@ -1118,6 +1119,9 @@ KdbpPrint("thread: Invalid process id!\n"); return TRUE; } + + /* Remember our reference */ + ReferencedProcess = TRUE; } Entry = Process->ThreadListHead.Flink; @@ -1127,6 +1131,7 @@ KdbpPrint("No threads in process 0x%08x!\n", ul); else KdbpPrint("No threads in current process!\n"); + if (ReferencedProcess) ObDereferenceObject(Process); return TRUE; } @@ -1181,6 +1186,9 @@ Entry = Entry->Flink; } while (Entry != &Process->ThreadListHead); + + /* Release our reference, if any */ + if (ReferencedProcess) ObDereferenceObject(Process); } else if (Argc >= 2 && _stricmp(Argv[1], "attach") == 0) { @@ -1219,6 +1227,9 @@ KdbpPrint("thread: Invalid thread id!\n"); return TRUE; } + + /* Remember our reference */ + ReferencedThread = TRUE; } if (Thread->Tcb.State < (DeferredReady + 1)) @@ -1248,6 +1259,8 @@ Thread->Tcb.TrapFrame, NPX_STATE_TO_STRING(Thread->Tcb.NpxState), Thread->Tcb.NpxState); + /* Release our reference if we had one */ + if (ReferencedThread) ObDereferenceObject(Thread); } return TRUE; @@ -1260,6 +1273,7 @@ { PLIST_ENTRY Entry; PEPROCESS Process; + BOOLEAN ReferencedProcess = FALSE; PCHAR State, pend, str1, str2; ULONG ul; extern LIST_ENTRY PsActiveProcessHead; @@ -1341,6 +1355,9 @@ KdbpPrint("proc: Invalid process id!\n"); return TRUE; } + + /* Remember our reference */ + ReferencedProcess = TRUE; } State = ((Process->Pcb.State == ProcessInMemory) ? "In Memory" : @@ -1353,6 +1370,9 @@ Process->UniqueProcessId, State, Process->Pcb.State, Process->ImageFileName); + + /* Release our reference, if any */ + if (ReferencedProcess) ObDereferenceObject(Process); } return TRUE;

15 years, 8 months

[sginsberg] 38750: - NtUserSetWindowsHookEx: Don't leak a thread reference in case we are passed a Thread Id

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Tue Jan 13 17:41:34 2009 New Revision: 38750 URL: http://svn.reactos.org/svn/reactos?rev=38750&view=rev Log: - NtUserSetWindowsHookEx: Don't leak a thread reference in case we are passed a Thread Id Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Tue Jan 13 17:41:34 2009 @@ -1156,6 +1156,11 @@ ClientInfo->phkCurrent = 0; UserDereferenceObject(Hook); + + if (NULL != Thread) + { + ObDereferenceObject(Thread); + } ObDereferenceObject(WinStaObj); RETURN( Handle);

15 years, 8 months

[dgoette] 38749: rework entries acl handling to be more dynamic

by dgoette＠svn.reactos.org

Author: dgoette Date: Tue Jan 13 16:48:53 2009 New Revision: 38749 URL: http://svn.reactos.org/svn/reactos?rev=38749&view=rev Log: rework entries acl handling to be more dynamic Removed: branches/danny-web/reactos.org/htdocs/roscms/lib/Security.class.php Modified: branches/danny-web/reactos.org/htdocs/roscms/convert3to4.sql branches/danny-web/reactos.org/htdocs/roscms/lib/Data.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/Editor_Website.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/Export_QuickInfo.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/Export_XML.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/Log.class.php Modified: branches/danny-web/reactos.org/htdocs/roscms/convert3to4.sql URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/convert3to4.sql [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/convert3to4.sql [iso-8859-1] Tue Jan 13 16:48:53 2009 @@ -146,59 +146,81 @@ -- -------------------------------------------------------- --- create access lists --- -------------------------------------------------------- -CREATE TABLE roscms_rel_groups_access ( - acl_id bigint(20) unsigned NOT NULL COMMENT '->access(id)', +-- table for entry areas +-- -------------------------------------------------------- +CREATE TABLE roscms_entries_areas ( + id bigint(20) unsigned NOT NULL auto_increment, + name varchar(30) NOT NULL, + name_short varchar(15) NOT NULL, + description varchar(255) NOT NULL, + PRIMARY KEY (id), + UNIQUE KEY name_short (name_short), + UNIQUE KEY `name` (name) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +INSERT INTO roscms_entries_areas VALUES +(1, 'Translate', 'translate', 'user can translate this entry to the lang he has set in his profile'), +(2, 'Edit', 'edit', 'modify content of this entry'), +(3, 'View Metadata', 'metadata', 'view Metadata tab '), +(4, 'View History', 'history', 'view History tab'), +(5, 'View Fields', 'fields', 'view fields tab'), +(6, 'View Entry Tab', 'entry', 'view entry tab'), +(7, 'View Security', 'security', 'view security tab'), +(8, 'View Depencies', 'depencies', 'view depencies tab'), +(9, 'System metadata', 'system_meta', 'modify System metadata'), +(10, 'Change ACL', 'acl', 'modify ACL for this entry'), +(11, 'Add Fields', 'add_fields', 'add new text fields'), +(12, 'Read', 'read', 'can view this entry'); + + + +-- -------------------------------------------------------- +-- table for acl +-- -------------------------------------------------------- +CREATE TABLE roscms_rel_acl ( + id bigint(20) unsigned NOT NULL auto_increment, + right_id bigint(20) unsigned NOT NULL COMMENT '->entries_areas(id)', + access_id bigint(20) unsigned NOT NULL COMMENT '->entries_access(id)', group_id bigint(20) unsigned NOT NULL COMMENT '->groups(id)', - can_read tinyint(1) NOT NULL default '0', - can_write tinyint(1) NOT NULL default '0', - can_add tinyint(1) NOT NULL default '0', - can_delete tinyint(1) NOT NULL default '0', - can_publish tinyint(1) NOT NULL default '0', - can_translate tinyint(1) NOT NULL default '0', - PRIMARY KEY (acl_id,group_id) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - -INSERT INTO roscms_rel_groups_access -SELECT + PRIMARY KEY (id), + UNIQUE KEY right_id (right_id,access_id,group_id) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +-- convert table +INSERT INTO roscms_rel_acl +SELECT DISTINCT + NULL, a.id, - g.id, - s.sec_lev1_read, - s.sec_lev1_write, - s.sec_lev1_add, - s.sec_lev1_add, - s.sec_lev1_pub, - s.sec_lev1_trans -FROM roscms_entries_access a JOIN data_security s ON a.name_short=s.sec_name JOIN roscms_groups g WHERE g.security_level = 1 -UNION -SELECT - a.id, - g.id, - s.sec_lev2_read, - s.sec_lev2_write, - s.sec_lev2_add, - s.sec_lev2_add, - s.sec_lev2_pub, - s.sec_lev2_trans -FROM roscms_entries_access a JOIN data_security s ON a.name_short=s.sec_name JOIN roscms_groups g WHERE g.security_level = 2 -UNION -SELECT - a.id, - g.id, - s.sec_lev3_read, - s.sec_lev3_write, - s.sec_lev3_add, - s.sec_lev3_add, - s.sec_lev3_pub, - s.sec_lev3_trans -FROM roscms_entries_access a JOIN data_security s ON a.name_short=s.sec_name JOIN roscms_groups g WHERE g.security_level = 3; - -UPDATE roscms_rel_groups_access ga JOIN roscms_groups g ON ga.group_id=g.id JOIN roscms_entries_access a ON ga.acl_id=a.id JOIN data_security s ON a.name_short=s.sec_name -SET ga.can_read=TRUE, ga.can_write=TRUE, ga.can_add=TRUE, ga.can_delete=TRUE, ga.can_publish=TRUE, ga.can_translate=TRUE WHERE s.sec_allow LIKE CONCAT('%',g.name_short,'%'); - -UPDATE roscms_rel_groups_access ga JOIN roscms_groups g ON ga.group_id=g.id JOIN roscms_entries_access a ON ga.acl_id=a.id JOIN data_security s ON a.name_short=s.sec_name -SET ga.can_read=FALSE, ga.can_write=FALSE, ga.can_add=FALSE, ga.can_delete=FALSE, ga.can_publish=FALSE, ga.can_translate=FALSE WHERE s.sec_deny LIKE CONCAT('%',g.name_short,'%'); + r.id, + g.id +FROM roscms_entries_access a JOIN data_security s ON a.name_short=s.sec_name JOIN roscms_groups g JOIN roscms_entries_areas r WHERE ((( + (g.security_level = 1 AND s.sec_lev1_read = 1 AND r.name_short='read') +OR (g.security_level = 1 AND s.sec_lev1_write = 1 AND r.name_short='edit') +OR (g.security_level = 1 AND s.sec_lev1_add = 1 AND r.name_short='add_fields') +OR (g.security_level = 1 AND s.sec_lev1_trans = 1 AND r.name_short='translate') + +OR (g.security_level = 2 AND s.sec_lev2_read = 1 AND r.name_short='read') +OR (g.security_level = 2 AND s.sec_lev2_write = 1 AND r.name_short='edit') +OR (g.security_level = 2 AND s.sec_lev2_add = 1 AND r.name_short='add_fields') +OR (g.security_level = 2 AND s.sec_lev2_trans = 1 AND r.name_short='translate') + +OR (g.security_level = 3 AND s.sec_lev3_read = 1 AND r.name_short='read') +OR (g.security_level = 3 AND s.sec_lev3_write = 1 AND r.name_short='edit') +OR (g.security_level = 3 AND s.sec_lev3_add = 1 AND (r.name_short='add_fields' OR r.name_short='fields' OR r.name_short='security' OR r.name_short='acl' OR r.name_short='entry')) +OR (g.security_level = 3 AND s.sec_lev3_trans = 1 AND r.name_short='translate') + +OR (s.sec_allow LIKE CONCAT('%',s.sec_allow,'%') AND r.name_short='read') +OR (s.sec_allow LIKE CONCAT('%',s.sec_allow,'%') AND r.name_short='edit') +OR (s.sec_allow LIKE CONCAT('%',s.sec_allow,'%') AND r.name_short='add_fields') +OR (s.sec_allow LIKE CONCAT('%',s.sec_allow,'%') AND r.name_short='translate') + +OR (g.security_level = 3 AND r.name_short='system_meta') +OR (g.security_level > 1 AND r.name_short='depencies') + +OR r.name_short = 'metadata' +OR r.name_short = 'history') +AND NOT s.sec_deny LIKE CONCAT('%',g.name_short,'%')) +OR s.sec_allow LIKE CONCAT('%',g.name_short,'%')); @@ -292,11 +314,11 @@ id bigint(20) unsigned NOT NULL auto_increment, type enum('page','content','dynamic','script','template','system') collate utf8_unicode_ci NOT NULL, name varchar(64) collate utf8_unicode_ci NOT NULL, - acl_id bigint(20) unsigned COMMENT '->access(id)', + access_id bigint(20) unsigned COMMENT '->access(id)', old_id int(11) NOT NULL, old_archive tinyint(1) NOT NULL, PRIMARY KEY (id), - KEY acl_id (acl_id), + KEY access_id (access_id), KEY type (type), KEY name (name) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; @@ -668,11 +690,11 @@ -- -------------------------------------------------------- UPDATE roscms_entries SET type = 'dynamic' WHERE type='page' AND (name='news_page' OR name='newsletter' OR name='interview'); -INSERT INTO roscms_entries (type, name, acl_id) +INSERT INTO roscms_entries (type, name, access_id) SELECT DISTINCT 'content', CONCAT(d.name,'_',t.value), - d.acl_id + d.access_id FROM roscms_entries d JOIN roscms_entries_revisions r ON r.data_id=d.id JOIN roscms_entries_tags t ON t.rev_id=r.id WHERE t.name='number' AND d.type='content'; Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Data.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Data.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Data.class.php [iso-8859-1] Tue Jan 13 16:48:53 2009 @@ -363,7 +363,7 @@ */ public static function update( $data_id, $data_name, $data_type, $data_acl, $update_links ) { - $stmt=&DBConnection::getInstance()->prepare("SELECT name, type, acl_id FROM ".ROSCMST_ENTRIES." WHERE id = :data_id LIMIT 1"); + $stmt=&DBConnection::getInstance()->prepare("SELECT name, type, access_id FROM ".ROSCMST_ENTRIES." WHERE id = :data_id LIMIT 1"); $stmt->bindParam('data_id',$data_id,PDO::PARAM_INT); $stmt->execute(); $data = $stmt->fetchOnce(PDO::FETCH_ASSOC); @@ -446,12 +446,12 @@ } // end data_name changes // change ACL - if ($data_acl != '' && $data_acl != $data['acl_id']) { - $stmt=&DBConnection::getInstance()->prepare("UPDATE ".ROSCMST_ENTRIES." SET acl_id = :acl_new WHERE id = :data_id LIMIT 1"); + if ($data_acl != '' && $data_acl != $data['access_id']) { + $stmt=&DBConnection::getInstance()->prepare("UPDATE ".ROSCMST_ENTRIES." SET access_id = :acl_new WHERE id = :data_id LIMIT 1"); $stmt->bindParam('acl_new',$data_acl); $stmt->bindParam('data_id',$data_id); $stmt->execute(); - Log::writeMedium('data-acl changed: '.$data['acl_id'].' => '.$data_acl.Log::prepareInfo($data_id).'{altersecurityfields}'); + Log::writeMedium('data-acl changed: '.$data['access_id'].' => '.$data_acl.Log::prepareInfo($data_id).'{altersecurityfields}'); } } // end of member function getCookieDomain @@ -794,6 +794,48 @@ /** * * + * @param int rev_id + * @return bool + * @access public + */ + public static function hasAccess( $data_id, $area ) + { + $stmt=&DBConnection::getInstance()->prepare("SELECT 1 FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_ACL." a ON d.access_id=a.access_id JOIN ".ROSCMST_GROUPS." g ON g.id=a.group_id JOIN ".ROSCMST_MEMBERSHIPS." m ON m.group_id=g.id JOIN ".ROSCMST_RIGHTS." r ON r.id=a.right_id WHERE d.id=:data_id AND m.user_id =:user_id AND r.name_short=:area LIMIT 1"); + $stmt->bindParam('data_id',$data_id,PDO::PARAM_INT); + $stmt->bindParam('area',$area,PDO::PARAM_STR); + $stmt->bindParam('user_id',ThisUser::getInstance()->id(),PDO::PARAM_INT); + $stmt->execute(); + return ($stmt->fetchColumn()!==false); + } + + + + /** + * + * + * @param int rev_id + * @return bool + * @access public + */ + public static function hasAccessAsList( $area ) + { + $acl = 'NULL,'; + $stmt=&DBConnection::getInstance()->prepare("SELECT DISTINCT a.access_id FROM ".ROSCMST_ACL." a JOIN ".ROSCMST_GROUPS." g ON g.id=a.group_id JOIN ".ROSCMST_MEMBERSHIPS." m ON m.group_id=g.id JOIN ".ROSCMST_RIGHTS." r ON r.id=a.right_id WHERE m.user_id =:user_id AND r.name_short=:area"); + $stmt->bindParam('area',$area,PDO::PARAM_STR); + $stmt->bindParam('user_id',ThisUser::getInstance()->id(),PDO::PARAM_INT); + $stmt->execute(); + while ($list = $stmt->fetch(PDO::FETCH_ASSOC)) { + if ($acl != 'NULL,') $acl .= ','; + $acl .= $list['access_id']; + } + return $acl; + } + + + + /** + * + * * @param int data_id * @param int rev_id * @param bool archive_mode @@ -825,7 +867,7 @@ } // data_revision - $stmt=&DBConnection::getInstance()->prepare("SELECT r.data_id, d.name, d.type, d.acl_id, r.version, r.user_id, r.lang_id, r.datetime FROM ".ROSCMST_REVISIONS." r JOIN ".ROSCMST_ENTRIES." d ON r.data_id=d.id WHERE r.id = :rev_id LIMIT 1"); + $stmt=&DBConnection::getInstance()->prepare("SELECT r.data_id, d.name, d.type, d.access_id, r.version, r.user_id, r.lang_id, r.datetime FROM ".ROSCMST_REVISIONS." r JOIN ".ROSCMST_ENTRIES." d ON r.data_id=d.id WHERE r.id = :rev_id LIMIT 1"); $stmt->bindParam('rev_id',$rev_id,PDO::PARAM_INT); $stmt->execute(); $revision = $stmt->fetchOnce(PDO::FETCH_ASSOC); Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Editor_Website.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Editor_Website.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Editor_Website.class.php [iso-8859-1] Tue Jan 13 16:48:53 2009 @@ -233,7 +233,7 @@ $revision = $stmt->fetchOnce(); // check if user has translator access - if (Security::hasRight($revision['data_id'], 'translate')) { + if (Data::hasAccess($revision['data_id'], 'translate')) { // copy existing entry to new language if (Data::copy($revision['id'], 1 /* copy mode */, $_GET['d_r_lang'])) { @@ -330,7 +330,7 @@ echo '<span id="elmcount" class="'.$text_num.'"> </span>'; } - if (Security::hasRight($this->data_id, 'write')) { + if (Data::hasAccess($this->data_id, 'edit')) { echo_strip(' <button type="button" id="bsavedraft" onclick="'."saveAsDraft(".$this->data_id.",".$this->rev_id.")".'">Save as Draft</button>   <input name="editautosavemode" type="hidden" value="true" />'); @@ -752,7 +752,7 @@ if ($thisuser->hasAccess('system_tags')) { echo_strip(' <br /> - <h3>Add Label'.(Security::hasAccess($this->data_id, 'add') ? ' or System Metadata' : '').'</h3> + <h3>Add Label'.(Data::hasAccess($this->data_id, 'system_meta') ? ' or System Metadata' : '').'</h3> <label for="addtags1" class="normal">Name:</label>  <input type="text" id="addtags1" size="15" maxlength="100" value="" />  <label for="addtags2" class="normal">Value:</label>  @@ -760,7 +760,7 @@ <button type="button" onclick="'."addLabelOrTag(".$this->rev_id.",'addtags1','addtags2','0')".'">Add Label</button> '); // add new system tags - if (Security::hasRight($this->data_id, 'add')) { + if (Data::hasAccess($this->data_id, 'system_meta')) { echo '<button type="button" onclick="'."addLabelOrTag(".$this->rev_id.",'addtags1','addtags2',-1)".'">Add Sys</button>'; } } @@ -887,7 +887,7 @@ */ private function showEntryDetailsSecurity( ) { - $stmt=&DBConnection::getInstance()->prepare("SELECT id, name, type, acl_id FROM ".ROSCMST_ENTRIES." WHERE id = :data_id LIMIT 1"); + $stmt=&DBConnection::getInstance()->prepare("SELECT id, name, type, access_id FROM ".ROSCMST_ENTRIES." WHERE id = :data_id LIMIT 1"); $stmt->bindParam('data_id',$this->data_id,PDO::PARAM_INT); $stmt->execute(); $data = $stmt->fetchOnce(); @@ -917,7 +917,7 @@ $stmt=&DBConnection::getInstance()->prepare("SELECT id, name FROM ".ROSCMST_ACCESS." ORDER BY name ASC"); $stmt->execute(); while ($access = $stmt->fetch(PDO::FETCH_ASSOC)) { - echo '<option value="'.$access['id'].'"'.(($access['id'] == $data['acl_id']) ? ' selected="selected"' : '').'>'.$access['name'].'</option>'; + echo '<option value="'.$access['id'].'"'.(($access['id'] == $data['access_id']) ? ' selected="selected"' : '').'>'.$access['name'].'</option>'; } echo_strip(' </select> Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Export_QuickInfo.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Export_QuickInfo.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Export_QuickInfo.class.php [iso-8859-1] Tue Jan 13 16:48:53 2009 @@ -46,7 +46,7 @@ private function getInfo( ) { // get current revision - $stmt=&DBConnection::getInstance()->prepare("SELECT u.name AS user_name, l.name AS language, r.data_id, d.name, d.type, a.name AS acl, r.id, r.version, datetime FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_REVISIONS." r ON r.data_id = d.id JOIN ".ROSCMST_USERS." u ON r.user_id=u.id JOIN ".ROSCMST_LANGUAGES." l ON l.id=r.lang_id JOIN ".ROSCMST_ACCESS." a ON a.id=d.acl_id WHERE r.id = :rev_id LIMIT 1"); + $stmt=&DBConnection::getInstance()->prepare("SELECT u.name AS user_name, l.name AS language, r.data_id, d.name, d.type, a.name AS acl, r.id, r.version, datetime FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_REVISIONS." r ON r.data_id = d.id JOIN ".ROSCMST_USERS." u ON r.user_id=u.id JOIN ".ROSCMST_LANGUAGES." l ON l.id=r.lang_id JOIN ".ROSCMST_ACCESS." a ON a.id=d.access_id WHERE r.id = :rev_id LIMIT 1"); $stmt->bindParam('rev_id',$_GET['d_r_id'],PDO::PARAM_INT); $stmt->execute(); $revision = $stmt->fetchOnce(PDO::FETCH_ASSOC); Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Export_XML.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Export_XML.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Export_XML.class.php [iso-8859-1] Tue Jan 13 16:48:53 2009 @@ -131,9 +131,8 @@ } // check if there are entries which are found by filter settings - $stmt=&DBConnection::getInstance()->prepare("SELECT COUNT(*) FROM ".ROSCMST_REVISIONS." r JOIN ".ROSCMST_ENTRIES." d ON r.data_id = d.id ".$this->sql_from." WHERE r.version >= 0 AND r.archive = :archive ".Security::getACL('read')." ".$this->sql_where); + $stmt=&DBConnection::getInstance()->prepare("SELECT COUNT(*) FROM ".ROSCMST_REVISIONS." r JOIN ".ROSCMST_ENTRIES." d ON r.data_id = d.id ".$this->sql_from." WHERE r.version >= 0 AND r.archive = :archive AND d.access_id IN(".Data::hasAccessAsList('read').") ".$this->sql_where); $stmt->bindParam('archive',$this->archive_mode,PDO::PARAM_BOOL); - $stmt->execute(); $ptm_entries = $stmt->fetchColumn(); @@ -155,7 +154,7 @@ $stmt_stext=&DBConnection::getInstance()->prepare("SELECT content FROM ".ROSCMST_STEXT." WHERE rev_id = :rev_id AND name = 'title' LIMIT 1"); $stmt_lang=&DBConnection::getInstance()->prepare("SELECT name FROM ".ROSCMST_LANGUAGES." WHERE id = :lang LIMIT 1"); $stmt_user=&DBConnection::getInstance()->prepare("SELECT name FROM ".ROSCMST_USERS." WHERE id = :user_id LIMIT 1"); - $stmt_acl=&DBConnection::getInstance()->prepare("SELECT name FROM ".ROSCMST_ACCESS." WHERE id = :acl_id LIMIT 1"); + $stmt_acl=&DBConnection::getInstance()->prepare("SELECT name FROM ".ROSCMST_ACCESS." WHERE id = :access_id LIMIT 1"); // make the order command ready for usage if ($this->sql_order == '') { @@ -166,7 +165,7 @@ } // proceed entries - $stmt=&DBConnection::getInstance()->prepare("SELECT r.data_id, d.name, d.type, d.acl_id, r.id, r.version, r.lang_id, r.datetime, r.user_id ".$this->sql_select." FROM ".ROSCMST_REVISIONS." r JOIN ".ROSCMST_ENTRIES." d ON r.data_id = d.id ".$this->sql_from." WHERE r.version >= 0 AND r.archive = :archive ".Security::getACL('read')." ".$this->sql_where." ".$this->sql_order." LIMIT :limit OFFSET :offset"); + $stmt=&DBConnection::getInstance()->prepare("SELECT r.data_id, d.name, d.type, d.access_id, r.id, r.version, r.lang_id, r.datetime, r.user_id ".$this->sql_select." FROM ".ROSCMST_REVISIONS." r JOIN ".ROSCMST_ENTRIES." d ON r.data_id = d.id ".$this->sql_from." WHERE r.version >= 0 AND r.archive = :archive AND d.access_id IN(".Data::hasAccessAsList('read').") ".$this->sql_where." ".$this->sql_order." LIMIT :limit OFFSET :offset"); $stmt->bindParam('archive',$this->archive_mode,PDO::PARAM_BOOL); $stmt->bindValue('limit',0+$this->page_limit,PDO::PARAM_INT); $stmt->bindValue('offset',0+$page_offset,PDO::PARAM_INT); @@ -208,7 +207,7 @@ $line_status = 'transb'; // figure out if user can translate things - if (Security::hasRight($row['data_id'], 'translate')) { + if (Data::hasAccess($row['data_id'], 'translate')) { $row['data_id2'] = 'tr'.$row['data_id']; $row['id'] = 'tr'.$row['id']; $row['datetime'] = 'translate!'; @@ -279,7 +278,7 @@ $column_list_row .= $row['type']; break; case 'Security': - $stmt_acl->bindParam('acl_id',$row['acl_id'],PDO::PARAM_INT); + $stmt_acl->bindParam('access_id',$row['access_id'],PDO::PARAM_INT); $stmt_acl->execute(); $acl = $stmt_acl->fetchColumn(); if ($acl != '') { @@ -303,7 +302,7 @@ $column_list_row .= '|'; // has person right to write / edit entries ? - if (Security::hasRight($row['data_id'], 'write')) { + if (Data::hasAccess($row['data_id'], 'edit')) { $security = 'write'; } @@ -427,7 +426,7 @@ $this->sql_order .= "d.type "; break; case 'security': // security (ACL) - $this->sql_order .= "d.acl_id "; + $this->sql_order .= "d.access_id "; break; case 'revid': // revision-id $this->sql_order .= "r.id "; @@ -592,7 +591,7 @@ // security (ACL) case 'i': - $this->sql_where .= "d.acl_id".($type_b=='is' ? '=':'!=').DBConnection::getInstance()->quote($type_c,PDO::PARAM_STR); + $this->sql_where .= "d.access_id".($type_b=='is' ? '=':'!=').DBConnection::getInstance()->quote($type_c,PDO::PARAM_STR); break; // metadata Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Log.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Log.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Log.class.php [iso-8859-1] Tue Jan 13 16:48:53 2009 @@ -176,7 +176,7 @@ // if no log is started yet, create a new log id if ($log_id === false) { - $stmt=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_ENTRIES." ( id, name, type, acl_id ) VALUES ( NULL, :data_name, 'system', NULL )"); + $stmt=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_ENTRIES." ( id, name, type, access_id ) VALUES ( NULL, :data_name, 'system', NULL )"); $stmt->bindParam('data_name',$log_entry,PDO::PARAM_STR); $stmt->execute(); Removed: branches/danny-web/reactos.org/htdocs/roscms/lib/Security.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Security.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Security.class.php (removed) @@ -1,134 +1,0 @@ -<?php - /* - RosCMS - ReactOS Content Management System - Copyright (C) 2007 Klemens Friedl <frik85(a)reactos.org> - 2008 Danny Götte <dangerground(a)web.de> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - - -/** - * class Security - * - */ -class Security -{ - - /** Aggregations: */ - - /** Compositions: */ - - /*** Attributes: ***/ - - - /** - * - * - * @param string kind kind of access is asked for - * @return ACL - * @access public - */ - public function getACL( $kind ) - { - $thisuser = &ThisUser::getInstance(); - - $acl = ''; - $sec_access = false; // security access already granted ? - - // go through acl's - $stmt=&DBConnection::getInstance()->prepare("SELECT a.id, b.can_read, b.can_add, b.can_write, b.can_delete, b.can_publish, b.can_translate FROM ".ROSCMST_ACCESS." a JOIN ".ROSCMST_ENTRY_AREA." b ON a.id=b.acl_id JOIN ".ROSCMST_MEMBERSHIPS." m ON m.group_id = b.group_id WHERE m.user_id = :user_id"); - $stmt->bindParam('user_id',$thisuser->id(),PDO::PARAM_INT); - $stmt->execute(); - while ($access = $stmt->fetch(PDO::FETCH_ASSOC)) { - - // add entries, remove them if they're on the deny list - if ($access['can_'.$kind] == true) { - if ($sec_access) { - $acl .= " , "; - } - $acl .= DBConnection::getInstance()->quote($access['id'],PDO::PARAM_INT); - $sec_access = true; - } - } // while - - // group our acl list, or fail because no rights to access - if ($sec_access > 0) { - $acl = " AND d.acl_id IN(". $acl .", NULL) "; - } - else { - $acl = " AND FALSE "; - } - - return $acl; - } // end of member function getACL - - - - /** - * Constructs a list of things the user can do - * - * @param int data_id - * @return rights list - * @access private - */ - private function getRightsList( $data_id ) - { - $thisuser = &ThisUser::getInstance(); - - // get rights - $stmt=&DBConnection::getInstance()->prepare("SELECT name_short FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_ACCESS." a ON d.acl_id=a.id JOIN ".ROSCMST_ENTRY_AREA." b ON a.id=b.acl_id JOIN ".ROSCMST_MEMBERSHIPS." m ON m.group_id=b.group_id WHERE d.id = :data_id AND m.user_id=:user_id"); - $stmt->bindParam('data_id',$rev_id,PDO::PARAM_INT); - $stmt->bindParam('user_id',$thisuser->id(),PDO::PARAM_INT); - $stmt->execute() or die('Rev-Entry "'.$rev_id.'" not found [usergroups].'); - - // create a list with rights - while($list = $stmt->fetch(PDO::FETCH_ASSOC)) { - $rights['read'] |= ($list['can_read'] == true); - $rights['write'] |= ($list['can_write'] == true); - $rights['add'] |= ($list['can_add'] == true); - $rights['delete'] |= ($list['can_delete'] == true); - $rights['publish'] |= ($list['can_publish'] == true); - $rights['translate'] |= ($list['can_translate'] == true); - } - - - - return $rights; - } // end of member function getRightsList - - - /** - * checks if the user has the given right to do things - * - * @param int data_id - * @param string kind kind of rights e.g. 'read' - * @return - * @access public - */ - public function hasRight( $data_id, $area ) - { -return true; - $stmt=&DBConnection::getInstance()->prepare("SELECT 1 FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_ACL." a ON a.acl_id=d.acl_id JOIN ".ROSCMST_ENTRY_AREA." e ON e.acl_id=a.id JOIN ".ROSCMST_RIGHTS." r ON r.id=e.right_id JOIN ".ROSCMST_GROUPS." g ON g.id=e.group_id JOIN ".ROSCMST_MEMBERSHIPS." m ON m.group_id=g.id WHERE r.name_short=:area AND m.user_id=:user_id AND d.id=:data_id LIMIT 1"); - $stmt->bindParam('data_id',$data_id,PDO::PARAM_INT); - $stmt->bindParam('area',$area,PDO::PARAM_STR); - $stmt->bindParam('user_id',ThisUser::getInstance()->id(),PDO::PARAM_INT); - return $stmt->execute(); - } // end of member function hasRight - - - -} // end of Security -?>

15 years, 8 months

[janderwald] 38748: - Copy provided PCM_RESOURCE_LIST when a new ResourceList is created

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Jan 13 16:36:03 2009 New Revision: 38748 URL: http://svn.reactos.org/svn/reactos?rev=38748&view=rev Log: - Copy provided PCM_RESOURCE_LIST when a new ResourceList is created Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c [iso-8859-1] Tue Jan 13 16:36:03 2009 @@ -106,7 +106,7 @@ for (Index = 0; Index < This->TranslatedResourceList->List[0].PartialResourceList.Count; Index ++ ) { PartialDescriptor = &This->TranslatedResourceList->List[0].PartialResourceList.PartialDescriptors[Index]; - + DPRINT1("Descriptor Type %u\n", PartialDescriptor->Type); if (PartialDescriptor->Type == Type) { /* Yay! Finally found one that matches! */ @@ -114,7 +114,7 @@ } } - DPRINT("Found %d\n", Count); + DPRINT("Found %d type %d\n", Count, Type); return Count; } @@ -299,9 +299,11 @@ OUT PRESOURCELIST* OutResourceList, IN PUNKNOWN OuterUnknown OPTIONAL, IN POOL_TYPE PoolType, - IN PCM_RESOURCE_LIST TranslatedResources, - IN PCM_RESOURCE_LIST UntranslatedResources) -{ + IN PCM_RESOURCE_LIST TranslatedResourceList, + IN PCM_RESOURCE_LIST UntranslatedResourceList) +{ + PCM_RESOURCE_LIST NewUntranslatedResources, NewTranslatedResources; + ULONG NewTranslatedSize, NewUntranslatedSize; IResourceListImpl* NewList; /* TODO: Validate parameters */ @@ -317,11 +319,32 @@ } /* Initialize */ + + NewTranslatedSize = sizeof(CM_RESOURCE_LIST) + (TranslatedResourceList[0].List->PartialResourceList.Count-1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + NewTranslatedResources = ExAllocatePoolWithTag(PoolType, NewTranslatedSize, TAG_PORTCLASS); + if (!NewTranslatedResources) + { + ExFreePoolWithTag(NewList, TAG_PORTCLASS); + return STATUS_INSUFFICIENT_RESOURCES; + } + + NewUntranslatedSize = sizeof(CM_RESOURCE_LIST) + (UntranslatedResourceList[0].List->PartialResourceList.Count-1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + NewUntranslatedResources = ExAllocatePoolWithTag(PoolType, NewUntranslatedSize, TAG_PORTCLASS); + if (!NewUntranslatedResources) + { + ExFreePoolWithTag(NewList, TAG_PORTCLASS); + ExFreePoolWithTag(NewTranslatedResources, TAG_PORTCLASS); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlCopyMemory(NewTranslatedResources, TranslatedResourceList, sizeof(CM_RESOURCE_LIST) + (TranslatedResourceList[0].List->PartialResourceList.Count-1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); + RtlCopyMemory(NewUntranslatedResources, UntranslatedResourceList, sizeof(CM_RESOURCE_LIST) + (UntranslatedResourceList[0].List->PartialResourceList.Count-1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); + NewList->lpVtbl = (IResourceListVtbl*)&vt_ResourceListVtbl; NewList->ref = 1; NewList->OuterUnknown = OuterUnknown; - NewList->TranslatedResourceList= TranslatedResources; - NewList->UntranslatedResourceList = UntranslatedResources; + NewList->TranslatedResourceList= NewTranslatedResources; + NewList->UntranslatedResourceList = NewUntranslatedResources; NewList->PoolType = PoolType; /* Increment our usage count and set the pointer to this object */

15 years, 8 months

[cgutman] 38747: - Don't store a null pointer to the protocol table

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Jan 13 11:42:01 2009 New Revision: 38747 URL: http://svn.reactos.org/svn/reactos?rev=38747&view=rev Log: - Don't store a null pointer to the protocol table Modified: branches/aicom-network-fixes/lib/drivers/ip/network/ip.c Modified: branches/aicom-network-fixes/lib/drivers/ip/network/ip.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/ip.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/ip.c [iso-8859-1] Tue Jan 13 11:42:01 2009 @@ -346,6 +346,21 @@ } +VOID DefaultProtocolHandler( + PIP_INTERFACE Interface, + PIP_PACKET IPPacket) +/* + * FUNCTION: Default handler for Internet protocols + * ARGUMENTS: + * NTE = Pointer to net table entry which the packet was received on + * IPPacket = Pointer to an IP packet that was received + */ +{ + TI_DbgPrint(MID_TRACE, ("[IF %x] Packet of unknown Internet protocol " + "discarded.\n", Interface)); +} + + VOID IPRegisterProtocol( UINT ProtocolNumber, IP_PROTOCOL_HANDLER Handler) @@ -363,22 +378,7 @@ return; } - ProtocolTable[ProtocolNumber] = Handler; -} - - -VOID DefaultProtocolHandler( - PIP_INTERFACE Interface, - PIP_PACKET IPPacket) -/* - * FUNCTION: Default handler for Internet protocols - * ARGUMENTS: - * NTE = Pointer to net table entry which the packet was received on - * IPPacket = Pointer to an IP packet that was received - */ -{ - TI_DbgPrint(MID_TRACE, ("[IF %x] Packet of unknown Internet protocol " - "discarded.\n", Interface)); + ProtocolTable[ProtocolNumber] = Handler ? Handler : DefaultProtocolHandler; }

15 years, 8 months

[jimtabor] 38745: - Re-implement NtUserDispatchMessage and implement NtUserValidateTimerCallback.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Jan 13 06:16:06 2009 New Revision: 38745 URL: http://svn.reactos.org/svn/reactos?rev=38745&view=rev Log: - Re-implement NtUserDispatchMessage and implement NtUserValidateTimerCallback. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/painting.h trunk/reactos/subsystems/win32/win32k/include/timer.h trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/timer.c trunk/reactos/subsystems/win32/win32k/objects/pen.c 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] Tue Jan 13 06:16:06 2009 @@ -2679,12 +2679,12 @@ HWND hWnd, CONST RECT *lpRect); -DWORD -NTAPI +BOOL +APIENTRY NtUserValidateTimerCallback( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3); + HWND hWnd, + WPARAM wParam, + LPARAM lParam); DWORD NTAPI Modified: trunk/reactos/subsystems/win32/win32k/include/painting.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/painting.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/painting.h [iso-8859-1] Tue Jan 13 06:16:06 2009 @@ -13,5 +13,6 @@ IntGetPaintMessage(HWND hWnd, UINT MsgFilterMin, UINT MsgFilterMax, PTHREADINFO Thread, MSG *Message, BOOL Remove); INT FASTCALL UserRealizePalette(HDC); +INT FASTCALL co_UserGetUpdateRgn(PWINDOW_OBJECT, HRGN, BOOL); #endif /* _WIN32K_PAINTING_H */ Modified: trunk/reactos/subsystems/win32/win32k/include/timer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/timer.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/timer.h [iso-8859-1] Tue Jan 13 06:16:06 2009 @@ -13,8 +13,20 @@ TIMERPROC pfn; // lpTimerFunc } TIMER, *PTIMER; +// +// Timer structure flags. +// +#define TMRF_READY 0x0001 +#define TMRF_SYSTEM 0x0002 +#define TMRF_RIT 0x0004 +#define TMRF_INIT 0x0008 +#define TMRF_ONESHOT 0x0010 +#define TMRF_WAITING 0x0020 + NTSTATUS FASTCALL InitTimerImpl(VOID); BOOL FASTCALL IntKillTimer(HWND Wnd, UINT_PTR IDEvent, BOOL SystemTimer); UINT_PTR FASTCALL IntSetTimer(HWND Wnd, UINT_PTR IDEvent, UINT Elapse, TIMERPROC TimerFunc, BOOL SystemTimer); +PTIMER FASTCALL FindSystemTimer(PMSG); +BOOL FASTCALL ValidateTimerCallback(PW32THREADINFO,PWINDOW_OBJECT,WPARAM,LPARAM); #endif /* _WIN32K_TIMER_H */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Tue Jan 13 06:16:06 2009 @@ -341,6 +341,62 @@ } } +LRESULT +FASTCALL +IntDispatchMessage(PMSG pMsg) +{ + LRESULT retval; + PWINDOW_OBJECT Window = NULL; + + if (pMsg->hwnd) + { + Window = UserGetWindowObject(pMsg->hwnd); + if (!Window || !Window->Wnd) return 0; + } + + if (((pMsg->message == WM_SYSTIMER) || + (pMsg->message == WM_TIMER)) && + (pMsg->lParam) ) + { + if (pMsg->message == WM_TIMER) + { + if (ValidateTimerCallback(GetW32ThreadInfo(),Window,pMsg->wParam,pMsg->lParam)) + { + return co_IntCallWindowProc((WNDPROC)pMsg->lParam, + TRUE, + pMsg->hwnd, + WM_TIMER, + pMsg->wParam, + (LPARAM)EngGetTickCount(), + sizeof(LPARAM)); + } + return 0; + } + else + { + PTIMER pTimer = FindSystemTimer(pMsg); + if (pTimer && pTimer->pfn) + { + pTimer->pfn(pMsg->hwnd, WM_SYSTIMER, (UINT)pMsg->wParam, (DWORD)EngGetTickCount()); + } + return 0; + } + } + // Need a window! + if (!Window) return 0; + + retval = co_IntPostOrSendMessage(pMsg->hwnd, pMsg->message, pMsg->wParam, pMsg->lParam); + + if (pMsg->message == WM_PAINT) + { + /* send a WM_NCPAINT and WM_ERASEBKGND if the non-client area is still invalid */ + HRGN hrgn = NtGdiCreateRectRgn( 0, 0, 0, 0 ); + co_UserGetUpdateRgn( Window, hrgn, TRUE ); + NtGdiDeleteObject( hrgn ); + } + return retval; +} + BOOL APIENTRY @@ -407,8 +463,27 @@ LRESULT APIENTRY NtUserDispatchMessage(PMSG UnsafeMsgInfo) { - UNIMPLEMENTED; - return 0; + LRESULT Res = 0; + BOOL Hit = FALSE; + MSG SafeMsg; + + UserEnterExclusive(); + _SEH2_TRY + { + ProbeForRead(UnsafeMsgInfo, sizeof(MSG), 1); + RtlCopyMemory(&SafeMsg, UnsafeMsgInfo, sizeof(MSG)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + Hit = TRUE; + } + _SEH2_END; + + if (!Hit) Res = IntDispatchMessage(&SafeMsg); + + UserLeave(); + return Res; } 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] Tue Jan 13 06:16:06 2009 @@ -1098,15 +1098,30 @@ return 0; } -DWORD +BOOL APIENTRY NtUserValidateTimerCallback( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3) -{ - UNIMPLEMENTED; - return 0; + HWND hWnd, + WPARAM wParam, + LPARAM lParam) +{ + BOOL Ret = FALSE; + PWINDOW_OBJECT Window = NULL; + + UserEnterShared(); + + if (hWnd) + { + Window = UserGetWindowObject(hWnd); + if (!Window || !Window->Wnd) + goto Exit; + } + + Ret = ValidateTimerCallback(GetW32ThreadInfo(), Window, wParam, lParam); + +Exit: + UserLeave(); + return Ret; } DWORD Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Tue Jan 13 06:16:06 2009 @@ -55,6 +55,54 @@ /* FUNCTIONS *****************************************************************/ +PTIMER +FASTCALL +FindSystemTimer(PMSG pMsg) +{ + PTIMER pTmr = FirstpTmr; + KeEnterCriticalRegion(); + do + { + if (!pTmr) break; + + if ( pMsg->lParam == (LPARAM)pTmr->pfn && + (pTmr->flags & TMRF_SYSTEM) ) + break; + + pTmr = (PTIMER)pTmr->ptmrList.Flink; + } while (pTmr != FirstpTmr); + KeLeaveCriticalRegion(); + + return pTmr; +} + +BOOL +FASTCALL +ValidateTimerCallback(PW32THREADINFO pti, + PWINDOW_OBJECT Window, + WPARAM wParam, + LPARAM lParam) +{ + PTIMER pTmr = FirstpTmr; + + if (!pTmr) return FALSE; + + KeEnterCriticalRegion(); + do + { + if ( (lParam == (LPARAM)pTmr->pfn) && + (pTmr->flags & (TMRF_SYSTEM|TMRF_RIT)) && + (pTmr->pti->pi == pti->pi) ) + break; + + pTmr = (PTIMER)pTmr->ptmrList.Flink; + } while (pTmr != FirstpTmr); + KeLeaveCriticalRegion(); + + if (!pTmr) return FALSE; + + return TRUE; +} UINT_PTR FASTCALL IntSetTimer(HWND Wnd, UINT_PTR IDEvent, UINT Elapse, TIMERPROC TimerFunc, BOOL SystemTimer) @@ -228,7 +276,6 @@ return STATUS_SUCCESS; } - UINT_PTR APIENTRY Modified: trunk/reactos/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] Tue Jan 13 06:16:06 2009 @@ -85,7 +85,7 @@ // If nWidth is zero, the pen is a single pixel wide, regardless of the current transformation. if ((bOldStylePen) && (!dwWidth) && (dwPenStyle & PS_STYLE_MASK) != PS_SOLID) - dwWidth = 1; + dwWidth = 1; PenObject->ptPenWidth.x = dwWidth; PenObject->ptPenWidth.y = 0;

15 years, 8 months

[fireball] 38744: - Remove unneeded functions. - Cleanup, reformat, remove static.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Jan 13 06:13:21 2009 New Revision: 38744 URL: http://svn.reactos.org/svn/reactos?rev=38744&view=rev Log: - Remove unneeded functions. - Cleanup, reformat, remove static. Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastio.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastio.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastio.c [iso-8859-1] Tue Jan 13 06:13:21 2009 @@ -1,16 +1,21 @@ /* - * FILE: drivers/fs/vfat/fastio.c - * PURPOSE: Fast IO routines. - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PROGRAMMER: Herve Poussineau (hpoussin(a)reactos.org) + * PROJECT: ReactOS FAT file system driver + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/filesystems/fastfat/fastio.c + * PURPOSE: Fast IO routines + * PROGRAMMERS: Herve Poussineau (hpoussin(a)reactos.org) */ + +/* INCLUDES *****************************************************************/ #define NDEBUG #include "fastfat.h" -static BOOLEAN NTAPI -VfatFastIoCheckIfPossible(IN PFILE_OBJECT FileObject, +/* FUNCTIONS ****************************************************************/ + +BOOLEAN +NTAPI +FatFastIoCheckIfPossible(IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Lenght, IN BOOLEAN Wait, @@ -19,311 +24,195 @@ OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject) { - /* Prevent all Fast I/O requests */ - DPRINT("VfatFastIoCheckIfPossible(): returning FALSE.\n"); - return FALSE; -} - -static BOOLEAN NTAPI -VfatFastIoRead(IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN BOOLEAN Wait, - IN ULONG LockKey, - OUT PVOID Buffer, - OUT PIO_STATUS_BLOCK IoStatus, + /* Prevent all Fast I/O requests */ + DPRINT("FatFastIoCheckIfPossible(): returning FALSE.\n"); + return FALSE; +} + +BOOLEAN +NTAPI +FatFastIoRead(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN BOOLEAN Wait, + IN ULONG LockKey, + OUT PVOID Buffer, + OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject) { - DPRINT("VfatFastIoRead()\n"); - return FALSE; -} - -static BOOLEAN NTAPI -VfatFastIoWrite(IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN BOOLEAN Wait, - IN ULONG LockKey, - OUT PVOID Buffer, - OUT PIO_STATUS_BLOCK IoStatus, - IN PDEVICE_OBJECT DeviceObject) -{ - DPRINT("VfatFastIoWrite()\n"); - return FALSE; -} - -static BOOLEAN NTAPI -VfatFastIoQueryBasicInfo(IN PFILE_OBJECT FileObject, - IN BOOLEAN Wait, - OUT PFILE_BASIC_INFORMATION Buffer, - OUT PIO_STATUS_BLOCK IoStatus, - IN PDEVICE_OBJECT DeviceObject) -{ - DPRINT("VfatFastIoQueryBasicInfo()\n"); - return FALSE; -} - -static BOOLEAN NTAPI -VfatFastIoQueryStandardInfo(IN PFILE_OBJECT FileObject, - IN BOOLEAN Wait, - OUT PFILE_STANDARD_INFORMATION Buffer, - OUT PIO_STATUS_BLOCK IoStatus, - IN PDEVICE_OBJECT DeviceObject) -{ - DPRINT("VfatFastIoQueryStandardInfo\n"); - return FALSE; -} - -static BOOLEAN NTAPI -VfatFastIoLock(IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN PLARGE_INTEGER Length, - PEPROCESS ProcessId, - ULONG Key, - BOOLEAN FailImmediately, - BOOLEAN ExclusiveLock, - OUT PIO_STATUS_BLOCK IoStatus, - IN PDEVICE_OBJECT DeviceObject) -{ - DPRINT("VfatFastIoLock\n"); - return FALSE; -} - -static BOOLEAN NTAPI -VfatFastIoUnlockSingle(IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN PLARGE_INTEGER Length, - PEPROCESS ProcessId, - ULONG Key, - OUT PIO_STATUS_BLOCK IoStatus, - IN PDEVICE_OBJECT DeviceObject) -{ - DPRINT("VfatFastIoUnlockSingle\n"); - return FALSE; -} - -static BOOLEAN NTAPI -VfatFastIoUnlockAll(IN PFILE_OBJECT FileObject, - PEPROCESS ProcessId, - OUT PIO_STATUS_BLOCK IoStatus, - IN PDEVICE_OBJECT DeviceObject) -{ - DPRINT("VfatFastIoUnlockAll\n"); - return FALSE; -} - -static BOOLEAN NTAPI -VfatFastIoUnlockAllByKey(IN PFILE_OBJECT FileObject, - PVOID ProcessId, - ULONG Key, - OUT PIO_STATUS_BLOCK IoStatus, - IN PDEVICE_OBJECT DeviceObject) -{ - DPRINT("VfatFastIoUnlockAllByKey\n"); - return FALSE; -} - -static BOOLEAN NTAPI -VfatFastIoDeviceControl(IN PFILE_OBJECT FileObject, - IN BOOLEAN Wait, - IN PVOID InputBuffer OPTIONAL, - IN ULONG InputBufferLength, - OUT PVOID OutputBuffer OPTIONAL, - IN ULONG OutputBufferLength, - IN ULONG IoControlCode, - OUT PIO_STATUS_BLOCK IoStatus, - IN PDEVICE_OBJECT DeviceObject) -{ - DPRINT("VfatFastIoDeviceControl\n"); - return FALSE; -} - -static VOID NTAPI -VfatAcquireFileForNtCreateSection(IN PFILE_OBJECT FileObject) -{ - DPRINT("VfatAcquireFileForNtCreateSection\n"); -} - -static VOID NTAPI -VfatReleaseFileForNtCreateSection(IN PFILE_OBJECT FileObject) -{ - DPRINT("VfatReleaseFileForNtCreateSection\n"); -} - -static VOID NTAPI -VfatFastIoDetachDevice(IN PDEVICE_OBJECT SourceDevice, - IN PDEVICE_OBJECT TargetDevice) -{ - DPRINT("VfatFastIoDetachDevice\n"); -} - -static BOOLEAN NTAPI -VfatFastIoQueryNetworkOpenInfo(IN PFILE_OBJECT FileObject, + DPRINT("FatFastIoRead()\n"); + return FALSE; +} + +BOOLEAN +NTAPI +FatFastIoWrite(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN BOOLEAN Wait, + IN ULONG LockKey, + OUT PVOID Buffer, + OUT PIO_STATUS_BLOCK IoStatus, + IN PDEVICE_OBJECT DeviceObject) +{ + DPRINT("FatFastIoWrite()\n"); + return FALSE; +} + +BOOLEAN +NTAPI +FatFastIoQueryBasicInfo(IN PFILE_OBJECT FileObject, + IN BOOLEAN Wait, + OUT PFILE_BASIC_INFORMATION Buffer, + OUT PIO_STATUS_BLOCK IoStatus, + IN PDEVICE_OBJECT DeviceObject) +{ + DPRINT("FatFastIoQueryBasicInfo()\n"); + return FALSE; +} + +BOOLEAN +NTAPI +FatFastIoQueryStandardInfo(IN PFILE_OBJECT FileObject, + IN BOOLEAN Wait, + OUT PFILE_STANDARD_INFORMATION Buffer, + OUT PIO_STATUS_BLOCK IoStatus, + IN PDEVICE_OBJECT DeviceObject) +{ + DPRINT("FatFastIoQueryStandardInfo\n"); + return FALSE; +} + +BOOLEAN +NTAPI +FatFastIoLock(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN PLARGE_INTEGER Length, + PEPROCESS ProcessId, + ULONG Key, + BOOLEAN FailImmediately, + BOOLEAN ExclusiveLock, + OUT PIO_STATUS_BLOCK IoStatus, + IN PDEVICE_OBJECT DeviceObject) +{ + DPRINT("FatFastIoLock\n"); + return FALSE; +} + +BOOLEAN +NTAPI +FatFastIoUnlockSingle(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN PLARGE_INTEGER Length, + PEPROCESS ProcessId, + ULONG Key, + OUT PIO_STATUS_BLOCK IoStatus, + IN PDEVICE_OBJECT DeviceObject) +{ + DPRINT("FatFastIoUnlockSingle\n"); + return FALSE; +} + +BOOLEAN +NTAPI +FatFastIoUnlockAll(IN PFILE_OBJECT FileObject, + PEPROCESS ProcessId, + OUT PIO_STATUS_BLOCK IoStatus, + IN PDEVICE_OBJECT DeviceObject) +{ + DPRINT("FatFastIoUnlockAll\n"); + return FALSE; +} + +BOOLEAN +NTAPI +FatFastIoUnlockAllByKey(IN PFILE_OBJECT FileObject, + PVOID ProcessId, + ULONG Key, + OUT PIO_STATUS_BLOCK IoStatus, + IN PDEVICE_OBJECT DeviceObject) +{ + DPRINT("FatFastIoUnlockAllByKey\n"); + return FALSE; +} + +BOOLEAN +NTAPI +FatFastIoQueryNetworkOpenInfo(IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, - OUT PFILE_NETWORK_OPEN_INFORMATION Buffer, - OUT PIO_STATUS_BLOCK IoStatus, - IN PDEVICE_OBJECT DeviceObject) -{ - DPRINT("VfatFastIoQueryNetworkOpenInfo\n"); - return FALSE; -} - -static NTSTATUS NTAPI -VfatAcquireForModWrite(IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER EndingOffset, - OUT PERESOURCE* ResourceToRelease, - IN PDEVICE_OBJECT DeviceObject) -{ - DPRINT("VfatAcquireForModWrite\n"); - return STATUS_INVALID_DEVICE_REQUEST; -} - -static BOOLEAN NTAPI -VfatMdlRead(IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN ULONG LockKey, - OUT PMDL* MdlChain, - OUT PIO_STATUS_BLOCK IoStatus, - IN PDEVICE_OBJECT DeviceObject) -{ - DPRINT("VfatMdlRead\n"); - return FALSE; -} - -static BOOLEAN NTAPI -VfatMdlReadComplete(IN PFILE_OBJECT FileObject, - IN PMDL MdlChain, - IN PDEVICE_OBJECT DeviceObject) -{ - DPRINT("VfatMdlReadComplete\n"); - return FALSE; -} - -static BOOLEAN NTAPI -VfatPrepareMdlWrite(IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN ULONG LockKey, - OUT PMDL* MdlChain, - OUT PIO_STATUS_BLOCK IoStatus, - IN PDEVICE_OBJECT DeviceObject) -{ - DPRINT("VfatPrepareMdlWrite\n"); - return FALSE; -} - -static BOOLEAN NTAPI -VfatMdlWriteComplete(IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN PMDL MdlChain, - IN PDEVICE_OBJECT DeviceObject) -{ - DPRINT("VfatMdlWriteComplete\n"); - return FALSE; -} - -static BOOLEAN NTAPI -VfatFastIoReadCompressed(IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN ULONG LockKey, - OUT PVOID Buffer, - OUT PMDL* MdlChain, - OUT PIO_STATUS_BLOCK IoStatus, - OUT PCOMPRESSED_DATA_INFO CompressedDataInfo, - IN ULONG CompressedDataInfoLength, - IN PDEVICE_OBJECT DeviceObject) -{ - DPRINT("VfatFastIoReadCompressed\n"); - return FALSE; -} - -static BOOLEAN NTAPI -VfatFastIoWriteCompressed(IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN ULONG LockKey, - IN PVOID Buffer, - OUT PMDL* MdlChain, - OUT PIO_STATUS_BLOCK IoStatus, - IN PCOMPRESSED_DATA_INFO CompressedDataInfo, - IN ULONG CompressedDataInfoLength, - IN PDEVICE_OBJECT DeviceObject) -{ - DPRINT("VfatFastIoWriteCompressed\n"); - return FALSE; -} - -static BOOLEAN NTAPI -VfatMdlReadCompleteCompressed(IN PFILE_OBJECT FileObject, - IN PMDL MdlChain, - IN PDEVICE_OBJECT DeviceObject) -{ - DPRINT("VfatMdlReadCompleteCompressed\n"); - return FALSE; -} - -static BOOLEAN NTAPI -VfatMdlWriteCompleteCompressed(IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN PMDL MdlChain, - IN PDEVICE_OBJECT DeviceObject) -{ - DPRINT("VfatMdlWriteCompleteCompressed\n"); - return FALSE; -} - -static BOOLEAN NTAPI -VfatFastIoQueryOpen(IN PIRP Irp, - OUT PFILE_NETWORK_OPEN_INFORMATION NetworkInformation, - IN PDEVICE_OBJECT DeviceObject) -{ - DPRINT("VfatFastIoQueryOpen\n"); - return FALSE; -} - -static NTSTATUS NTAPI -VfatReleaseForModWrite(IN PFILE_OBJECT FileObject, - IN PERESOURCE ResourceToRelease, - IN PDEVICE_OBJECT DeviceObject) -{ - DPRINT("VfatReleaseForModWrite\n"); - return STATUS_INVALID_DEVICE_REQUEST; -} - -static NTSTATUS NTAPI -VfatAcquireForCcFlush(IN PFILE_OBJECT FileObject, - IN PDEVICE_OBJECT DeviceObject) -{ - PVFATFCB Fcb = (PVFATFCB)FileObject->FsContext; - - DPRINT("VfatAcquireForCcFlush\n"); - - /* Make sure it is not a volume lock */ - ASSERT(!(Fcb->Flags & FCB_IS_VOLUME)); - - /* Acquire the resource */ - ExAcquireResourceExclusiveLite(&(Fcb->MainResource), TRUE); - - return STATUS_SUCCESS; -} - -static NTSTATUS NTAPI -VfatReleaseForCcFlush(IN PFILE_OBJECT FileObject, - IN PDEVICE_OBJECT DeviceObject) -{ - PVFATFCB Fcb = (PVFATFCB)FileObject->FsContext; - - DPRINT("VfatReleaseForCcFlush\n"); - - /* Make sure it is not a volume lock */ - ASSERT(!(Fcb->Flags & FCB_IS_VOLUME)); - - /* Release the resource */ - ExReleaseResourceLite(&(Fcb->MainResource)); - - return STATUS_SUCCESS; + OUT PFILE_NETWORK_OPEN_INFORMATION Buffer, + OUT PIO_STATUS_BLOCK IoStatus, + IN PDEVICE_OBJECT DeviceObject) +{ + DPRINT("FatFastIoQueryNetworkOpenInfo\n"); + return FALSE; +} + +BOOLEAN +NTAPI +FatMdlRead(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN ULONG LockKey, + OUT PMDL* MdlChain, + OUT PIO_STATUS_BLOCK IoStatus, + IN PDEVICE_OBJECT DeviceObject) +{ + DPRINT("FatMdlRead\n"); + return FALSE; +} + +BOOLEAN +NTAPI +FatMdlReadComplete(IN PFILE_OBJECT FileObject, + IN PMDL MdlChain, + IN PDEVICE_OBJECT DeviceObject) +{ + DPRINT("FatMdlReadComplete\n"); + return FALSE; +} + +BOOLEAN +NTAPI +FatPrepareMdlWrite(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN ULONG LockKey, + OUT PMDL* MdlChain, + OUT PIO_STATUS_BLOCK IoStatus, + IN PDEVICE_OBJECT DeviceObject) +{ + DPRINT("FatPrepareMdlWrite\n"); + return FALSE; +} + +BOOLEAN +NTAPI +FatMdlWriteComplete(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN PMDL MdlChain, + IN PDEVICE_OBJECT DeviceObject) +{ + DPRINT("FatMdlWriteComplete\n"); + return FALSE; +} + +NTSTATUS +NTAPI +FatAcquireForCcFlush(IN PFILE_OBJECT FileObject, + IN PDEVICE_OBJECT DeviceObject) +{ + DPRINT("FatAcquireForCcFlush\n"); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +FatReleaseForCcFlush(IN PFILE_OBJECT FileObject, + IN PDEVICE_OBJECT DeviceObject) +{ + DPRINT("FatReleaseForCcFlush\n"); + return STATUS_SUCCESS; } BOOLEAN @@ -331,27 +220,15 @@ FatAcquireForLazyWrite(IN PVOID Context, IN BOOLEAN Wait) { - PVFATFCB Fcb = (PVFATFCB)Context; - ASSERT(Fcb); - DPRINT("VfatAcquireForLazyWrite(): Fcb %p\n", Fcb); - - if (!ExAcquireResourceExclusiveLite(&(Fcb->MainResource), Wait)) - { - DPRINT("VfatAcquireForLazyWrite(): ExReleaseResourceLite failed.\n"); - return FALSE; - } - return TRUE; + DPRINT("FatAcquireForLazyWrite()\n"); + return FALSE; } VOID NTAPI FatReleaseFromLazyWrite(IN PVOID Context) { - PVFATFCB Fcb = (PVFATFCB)Context; - ASSERT(Fcb); - DPRINT("VfatReleaseFromLazyWrite(): Fcb %p\n", Fcb); - - ExReleaseResourceLite(&(Fcb->MainResource)); + DPRINT("FatReleaseFromLazyWrite()\n"); } BOOLEAN @@ -359,27 +236,15 @@ FatAcquireForReadAhead(IN PVOID Context, IN BOOLEAN Wait) { - PVFATFCB Fcb = (PVFATFCB)Context; - ASSERT(Fcb); - DPRINT("VfatAcquireForReadAhead(): Fcb %p\n", Fcb); - - if (!ExAcquireResourceExclusiveLite(&(Fcb->MainResource), Wait)) - { - DPRINT("VfatAcquireForReadAhead(): ExReleaseResourceLite failed.\n"); - return FALSE; - } - return TRUE; + DPRINT("FatAcquireForReadAhead()\n"); + return FALSE; } VOID NTAPI FatReleaseFromReadAhead(IN PVOID Context) { - PVFATFCB Fcb = (PVFATFCB)Context; - ASSERT(Fcb); - DPRINT("VfatReleaseFromReadAhead(): Fcb %p\n", Fcb); - - ExReleaseResourceLite(&(Fcb->MainResource)); + DPRINT("FatReleaseFromReadAhead()\n"); } BOOLEAN @@ -400,33 +265,24 @@ VOID FatInitFastIoRoutines(PFAST_IO_DISPATCH FastIoDispatch) { - FastIoDispatch->SizeOfFastIoDispatch = sizeof(FAST_IO_DISPATCH); - FastIoDispatch->FastIoCheckIfPossible = VfatFastIoCheckIfPossible; - FastIoDispatch->FastIoRead = VfatFastIoRead; - FastIoDispatch->FastIoWrite = VfatFastIoWrite; - FastIoDispatch->FastIoQueryBasicInfo = VfatFastIoQueryBasicInfo; - FastIoDispatch->FastIoQueryStandardInfo = VfatFastIoQueryStandardInfo; - FastIoDispatch->FastIoLock = VfatFastIoLock; - FastIoDispatch->FastIoUnlockSingle = VfatFastIoUnlockSingle; - FastIoDispatch->FastIoUnlockAll = VfatFastIoUnlockAll; - FastIoDispatch->FastIoUnlockAllByKey = VfatFastIoUnlockAllByKey; - FastIoDispatch->FastIoDeviceControl = VfatFastIoDeviceControl; - FastIoDispatch->AcquireFileForNtCreateSection = VfatAcquireFileForNtCreateSection; - FastIoDispatch->ReleaseFileForNtCreateSection = VfatReleaseFileForNtCreateSection; - FastIoDispatch->FastIoDetachDevice = VfatFastIoDetachDevice; - FastIoDispatch->FastIoQueryNetworkOpenInfo = VfatFastIoQueryNetworkOpenInfo; - FastIoDispatch->MdlRead = VfatMdlRead; - FastIoDispatch->MdlReadComplete = VfatMdlReadComplete; - FastIoDispatch->PrepareMdlWrite = VfatPrepareMdlWrite; - FastIoDispatch->MdlWriteComplete = VfatMdlWriteComplete; - FastIoDispatch->FastIoReadCompressed = VfatFastIoReadCompressed; - FastIoDispatch->FastIoWriteCompressed = VfatFastIoWriteCompressed; - FastIoDispatch->MdlReadCompleteCompressed = VfatMdlReadCompleteCompressed; - FastIoDispatch->MdlWriteCompleteCompressed = VfatMdlWriteCompleteCompressed; - FastIoDispatch->FastIoQueryOpen = VfatFastIoQueryOpen; - FastIoDispatch->AcquireForModWrite = VfatAcquireForModWrite; - FastIoDispatch->ReleaseForModWrite = VfatReleaseForModWrite; - FastIoDispatch->AcquireForCcFlush = VfatAcquireForCcFlush; - FastIoDispatch->ReleaseForCcFlush = VfatReleaseForCcFlush; -} - + /* Set Fast I/O dispatcher callbacks */ + FastIoDispatch->SizeOfFastIoDispatch = sizeof(FAST_IO_DISPATCH); + FastIoDispatch->FastIoCheckIfPossible = FatFastIoCheckIfPossible; + FastIoDispatch->FastIoRead = FatFastIoRead; + FastIoDispatch->FastIoWrite = FatFastIoWrite; + FastIoDispatch->FastIoQueryBasicInfo = FatFastIoQueryBasicInfo; + FastIoDispatch->FastIoQueryStandardInfo = FatFastIoQueryStandardInfo; + FastIoDispatch->FastIoLock = FatFastIoLock; + FastIoDispatch->FastIoUnlockSingle = FatFastIoUnlockSingle; + FastIoDispatch->FastIoUnlockAll = FatFastIoUnlockAll; + FastIoDispatch->FastIoUnlockAllByKey = FatFastIoUnlockAllByKey; + FastIoDispatch->FastIoQueryNetworkOpenInfo = FatFastIoQueryNetworkOpenInfo; + FastIoDispatch->MdlRead = FatMdlRead; + FastIoDispatch->MdlReadComplete = FatMdlReadComplete; + FastIoDispatch->PrepareMdlWrite = FatPrepareMdlWrite; + FastIoDispatch->MdlWriteComplete = FatMdlWriteComplete; + FastIoDispatch->AcquireForCcFlush = FatAcquireForCcFlush; + FastIoDispatch->ReleaseForCcFlush = FatReleaseForCcFlush; +} + +/* EOF */

15 years, 8 months

[cgutman] 38743: - Merge aicom-network-fixes up to r38730

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Jan 12 20:34:39 2009 New Revision: 38743 URL: http://svn.reactos.org/svn/reactos?rev=38743&view=rev Log: - Merge aicom-network-fixes up to r38730 Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c trunk/reactos/lib/drivers/ip/network/ip.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Mon Jan 12 20:34:39 2009 @@ -1553,6 +1553,7 @@ IF->Unicast.Address.IPv4Address = IpAddrChange->Address; IF->Netmask.Type = IP_ADDRESS_V4; IF->Netmask.Address.IPv4Address = IpAddrChange->Netmask; + IF->Broadcast.Type = IP_ADDRESS_V4; IF->Broadcast.Address.IPv4Address = IF->Unicast.Address.IPv4Address | ~IF->Netmask.Address.IPv4Address; @@ -1587,6 +1588,8 @@ IF->Unicast.Address.IPv4Address = 0; IF->Netmask.Type = IP_ADDRESS_V4; IF->Netmask.Address.IPv4Address = 0; + IF->Broadcast.Type = IP_ADDRESS_V4; + IF->Broadcast.Address.IPv4Address = 0; Status = STATUS_SUCCESS; } } EndFor(IF); Modified: trunk/reactos/lib/drivers/ip/network/ip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/ip.… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] Mon Jan 12 20:34:39 2009 @@ -147,7 +147,8 @@ TI_DbgPrint(MIN_TRACE, ("IPv6 datagram discarded.\n")); return; default: - Protocol = 0; + TI_DbgPrint(MIN_TRACE, ("Unrecognized datagram discarded.\n")); + return; } if (Protocol < IP_PROTOCOL_TABLE_SIZE) @@ -308,22 +309,20 @@ PNEIGHBOR_CACHE_ENTRY NCE; IP_ADDRESS GeneralRoute; - TCPDisposeInterfaceData( IF->TCPContext ); - IF->TCPContext = NULL; - - TI_DbgPrint(DEBUG_IP,("Removing interface Addr %s\n", A2S(&IF->Unicast))); - TI_DbgPrint(DEBUG_IP,(" Mask %s\n", A2S(&IF->Netmask))); - - AddrWidenAddress(&GeneralRoute,&IF->Unicast,&IF->Netmask); - - RouterRemoveRoute(&GeneralRoute, &IF->Unicast); - - /* Remove permanent NCE, but first we have to find it */ NCE = NBLocateNeighbor(&IF->Unicast); if (NCE) - NBRemoveNeighbor(NCE); - else - TI_DbgPrint(DEBUG_IP, ("Could not delete IF route (0x%X)\n", IF)); + { + TCPDisposeInterfaceData( IF->TCPContext ); + + TI_DbgPrint(DEBUG_IP,("Removing interface Addr %s\n", A2S(&IF->Unicast))); + TI_DbgPrint(DEBUG_IP,(" Mask %s\n", A2S(&IF->Netmask))); + + AddrWidenAddress(&GeneralRoute,&IF->Unicast,&IF->Netmask); + + RouterRemoveRoute(&GeneralRoute, &IF->Unicast); + + NBRemoveNeighbor(NCE); + } } VOID IPUnregisterInterface(

15 years, 8 months

[weiden] 38742: Remove unused code

by weiden＠svn.reactos.org

Author: weiden Date: Mon Jan 12 18:34:32 2009 New Revision: 38742 URL: http://svn.reactos.org/svn/reactos?rev=38742&view=rev Log: Remove unused code Modified: trunk/reactos/base/shell/explorer-new/desktop.c trunk/reactos/base/shell/explorer-new/precomp.h trunk/reactos/base/shell/explorer-new/undoc.h Modified: trunk/reactos/base/shell/explorer-new/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/de… ============================================================================== --- trunk/reactos/base/shell/explorer-new/desktop.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/desktop.c [iso-8859-1] Mon Jan 12 18:34:32 2009 @@ -20,8 +20,6 @@ #include <precomp.h> -#if USE_API_SHCREATEDESKTOP - typedef struct _DESKCREATEINFO { HANDLE hEvent; @@ -36,6 +34,8 @@ IShellDesktopTray *pSdt; HANDLE hDesktop; HRESULT hRet; + + OleInitialize(NULL); hRet = ITrayWindow_QueryInterface(DeskCreateInfo->Tray, &IID_IShellDesktopTray, @@ -130,1317 +130,3 @@ { return; } - -#else /* USE_API_SHCREATEDESKTOP == 0 */ - -/* - ****************************************************************************** - * NOTE: This could may be reused in a shell implementation of * - * SHCreateShellFolderView(). * - ****************************************************************************** - */ - -HRESULT WINAPI -SHCreateShellFolderView( - const SFV_CREATE *pcsfv, - IShellView **ppsv) -{ - CSFV csfv; - - ZeroMemory(&csfv, sizeof(CSFV)); - csfv.cbSize = sizeof(CSFV); - csfv.pshf = pcsfv->pshf; - csfv.psvOuter = pcsfv->psvOuter; - /* FIXME: handle pcsfv->psfvcb */ - return SHCreateShellFolderViewEx(&csfv, ppsv); -} - - -/* - ****************************************************************************** - * NOTE: This could may be reused in a shell implementation of * - * SHCreateDesktop(). * - ****************************************************************************** - */ - -#define IShellView2 IShellView -#define IShellView2_Release(This) IShellView_Release((This)) -#define IShellView2_CreateViewWindow2(This, Params) IShellView_CreateViewWindow((This), (Params)->psvPrev, (Params)->pfs, (Params)->psbOwner, (Params)->prcView, &(Params)->hwndView) - -#include "undoc.h" -#define WM_SHELL_ADDDRIVENOTIFY (WM_USER + 0x100) - -static const IShellBrowserVtbl IDesktopShellBrowserImpl_Vtbl; -static const ICommDlgBrowserVtbl IDesktopShellBrowserImpl_ICommDlgBrowser_Vtbl; -static const IServiceProviderVtbl IDesktopShellBrowserImpl_IServiceProvider_Vtbl; -static const IShellFolderViewCBVtbl IDesktopShellBrowserImpl_IShellFolderViewCB_Vtbl; - -/* - * IShellBrowser - */ - -typedef struct -{ - const IShellBrowserVtbl *lpVtbl; - const ICommDlgBrowserVtbl *lpVtblCommDlgBrowser; - const IServiceProviderVtbl *lpVtblServiceProvider; - const IShellFolderViewCBVtbl *lpVtblShellFolderViewCB; - LONG Ref; - - IShellView2 *DesktopView2; - IShellView *DesktopView; - IShellBrowser *DefaultShellBrowser; - HWND hWnd; - HWND hWndShellView; - HWND hWndDesktopListView; - - ITrayWindow *Tray; - - LPITEMIDLIST pidlDesktopDirectory; - LPITEMIDLIST pidlDesktop; - IDropTarget *DropTarget; - - ULONG ChangeNotificationId; -} IDesktopShellBrowserImpl; - -static IUnknown * -IUnknown_from_impl(IDesktopShellBrowserImpl *This) -{ - return (IUnknown *)&This->lpVtbl; -} - -static IShellBrowser * -IShellBrowser_from_impl(IDesktopShellBrowserImpl *This) -{ - return (IShellBrowser *)&This->lpVtbl; -} - -static IOleWindow * -IOleWindow_from_impl(IDesktopShellBrowserImpl *This) -{ - return (IOleWindow *)&This->lpVtbl; -} - -static ICommDlgBrowser * -ICommDlgBrowser_from_impl(IDesktopShellBrowserImpl *This) -{ - return (ICommDlgBrowser *)&This->lpVtblCommDlgBrowser; -} - -static IServiceProvider * -IServiceProvider_from_impl(IDesktopShellBrowserImpl *This) -{ - return (IServiceProvider *)&This->lpVtblServiceProvider; -} - -static IShellFolderViewCB * -IShellFolderViewCB_from_impl(IDesktopShellBrowserImpl *This) -{ - return (IShellFolderViewCB *)&This->lpVtblShellFolderViewCB; -} - -static IDesktopShellBrowserImpl * -impl_from_IShellBrowser(IShellBrowser *iface) -{ - return (IDesktopShellBrowserImpl *)((ULONG_PTR)iface - FIELD_OFFSET(IDesktopShellBrowserImpl, - lpVtbl)); -} - -static IDesktopShellBrowserImpl * -impl_from_ICommDlgBrowser(ICommDlgBrowser *iface) -{ - return (IDesktopShellBrowserImpl *)((ULONG_PTR)iface - FIELD_OFFSET(IDesktopShellBrowserImpl, - lpVtblCommDlgBrowser)); -} - -static IDesktopShellBrowserImpl * -impl_from_IServiceProvider(IServiceProvider *iface) -{ - return (IDesktopShellBrowserImpl *)((ULONG_PTR)iface - FIELD_OFFSET(IDesktopShellBrowserImpl, - lpVtblServiceProvider)); -} - -static IDesktopShellBrowserImpl * -impl_from_IShellFolderViewCB(IShellFolderViewCB *iface) -{ - return (IDesktopShellBrowserImpl *)((ULONG_PTR)iface - FIELD_OFFSET(IDesktopShellBrowserImpl, - lpVtblShellFolderViewCB)); -} - -static VOID -IDesktopShellBrowserImpl_Free(IDesktopShellBrowserImpl *This) -{ - if (This->DropTarget != NULL) - { - IDropTarget_Release(This->DropTarget); - This->DropTarget = NULL; - } - - if (This->Tray != NULL) - { - ITrayWindow_Release(This->Tray); - This->Tray = NULL; - } - - if (This->pidlDesktopDirectory != NULL) - { - ILFree(This->pidlDesktopDirectory); - This->pidlDesktopDirectory = NULL; - } - - if (This->pidlDesktop != NULL) - { - ILFree(This->pidlDesktop); - This->pidlDesktop = NULL; - } - - HeapFree(hProcessHeap, - 0, - This); -} - -static VOID -IDesktopShellBrowserImpl_Destroy(IDesktopShellBrowserImpl *This) -{ - if (This->ChangeNotificationId != 0) - { - SHChangeNotifyDeregister(This->ChangeNotificationId); - This->ChangeNotificationId = 0; - } - - if (This->Tray != NULL) - { - ITrayWindow_Close(This->Tray); - This->Tray = NULL; - } - - if (This->DropTarget != NULL && This->hWndDesktopListView != NULL) - { - RevokeDragDrop(This->hWndDesktopListView); - This->hWndDesktopListView = NULL; - } - - if (This->DesktopView2 != NULL) - { - IShellView2_Release(This->DesktopView2); - } - - if (This->DesktopView != NULL) - { - if (This->hWndShellView != NULL) - { - IShellView_DestroyViewWindow(This->DesktopView); - } - - IShellView_Release(This->DesktopView); - This->DesktopView = NULL; - This->hWndShellView = NULL; - This->hWndDesktopListView = NULL; - } -} - -static HRESULT -IDesktopShellBrowserImpl_GetNotify(IN OUT IDesktopShellBrowserImpl *This, - OUT LPITEMIDLIST *ppidl, - OUT LONG *plEvents) -{ - *ppidl = This->pidlDesktopDirectory; - *plEvents = SHCNE_DISKEVENTS; - return S_OK; -} - -static ULONG STDMETHODCALLTYPE -IDesktopShellBrowserImpl_Release(IN OUT IShellBrowser *iface) -{ - IDesktopShellBrowserImpl *This = impl_from_IShellBrowser(iface); - ULONG Ret; - - Ret = InterlockedDecrement(&This->Ref); - if (Ret == 0) - IDesktopShellBrowserImpl_Free(This); - - return Ret; -} - -static ULONG STDMETHODCALLTYPE -IDesktopShellBrowserImpl_AddRef(IN OUT IShellBrowser *iface) -{ - IDesktopShellBrowserImpl *This = impl_from_IShellBrowser(iface); - - return InterlockedIncrement(&This->Ref); -} - -static HRESULT STDMETHODCALLTYPE -IDesktopShellBrowserImpl_QueryInterface(IN OUT IShellBrowser *iface, - IN REFIID riid, - OUT LPVOID *ppvObj) -{ - IDesktopShellBrowserImpl *This; - - if (ppvObj == NULL) - return E_POINTER; - - This = impl_from_IShellBrowser(iface); - - if (IsEqualIID(riid, - &IID_IUnknown)) - { - *ppvObj = IUnknown_from_impl(This); - } - else if (This->DefaultShellBrowser != NULL) - { - return IShellBrowser_QueryInterface(This->DefaultShellBrowser, - riid, - ppvObj); - } - else if (IsEqualIID(riid, - &IID_IOleWindow)) - { - *ppvObj = IOleWindow_from_impl(This); - } - else if (IsEqualIID(riid, - &IID_IShellBrowser)) - { - *ppvObj = IShellBrowser_from_impl(This); - } - else if (IsEqualIID(riid, - &IID_ICommDlgBrowser)) - { - *ppvObj = ICommDlgBrowser_from_impl(This); - } - else if (IsEqualIID(riid, - &IID_IServiceProvider)) - { - *ppvObj = IServiceProvider_from_impl(This); - } - else if (IsEqualIID(riid, - &IID_IShellFolderViewCB)) - { - *ppvObj = IShellFolderViewCB_from_impl(This); - } - else - { - *ppvObj = NULL; - return E_NOINTERFACE; - } - - IDesktopShellBrowserImpl_AddRef(iface); - return S_OK; -} - -static IDesktopShellBrowserImpl * -IDesktopShellBrowserImpl_Construct(IN HWND hwndParent, - IN LPCREATESTRUCT lpCreateStruct OPTIONAL) -{ - IDesktopShellBrowserImpl *This; - IShellBrowser *ShellBrowser; - IShellFolder *psfDesktopFolder; -#if 1 - SFV_CREATE csfv; -#endif - FOLDERSETTINGS fs; - HRESULT hr; - RECT rcClient; - SHChangeNotifyEntry cne; - - This = HeapAlloc(hProcessHeap, - 0, - sizeof(*This)); - if (This == NULL) - return NULL; - - ZeroMemory(This, - sizeof(*This)); - This->lpVtbl = &IDesktopShellBrowserImpl_Vtbl; - This->lpVtblCommDlgBrowser = &IDesktopShellBrowserImpl_ICommDlgBrowser_Vtbl; - This->lpVtblServiceProvider = &IDesktopShellBrowserImpl_IServiceProvider_Vtbl; - This->lpVtblShellFolderViewCB = &IDesktopShellBrowserImpl_IShellFolderViewCB_Vtbl; - This->Ref = 1; - This->hWnd = hwndParent; - - ShellBrowser = IShellBrowser_from_impl(This); - - This->pidlDesktopDirectory = SHCloneSpecialIDList(This->hWnd, - CSIDL_DESKTOPDIRECTORY, - FALSE); - - hr = SHGetSpecialFolderLocation(This->hWnd, - CSIDL_DESKTOP, - &This->pidlDesktop); - if (!SUCCEEDED(hr)) - goto Fail; - -#if 1 - hr = SHGetDesktopFolder(&psfDesktopFolder); -#else - hr = CoCreateInstance(&CLSID_ShellDesktop, - NULL, - CLSCTX_INPROC, - &IID_IShellFolder, - (PVOID*)&psfDesktopFolder); -#endif - if (!SUCCEEDED(hr)) - goto Fail; - -#if 0 - hr = IShellFolder_CreateViewObject(psfDesktopFolder, - This->hWnd, - &IID_IShellView, - (PVOID*)&This->DesktopView); -#else - csfv.cbSize = sizeof(csfv); - csfv.pshf = psfDesktopFolder; - csfv.psvOuter = NULL; - - hr = IDesktopShellBrowserImpl_QueryInterface(ShellBrowser, - &IID_IShellFolderViewCB, - (PVOID*)&csfv.psfvcb); - if (!SUCCEEDED(hr)) - csfv.psfvcb = NULL; - - hr = SHCreateShellFolderView(&csfv, - &This->DesktopView); - - IShellFolder_Release(psfDesktopFolder); - - if (csfv.psfvcb != NULL) - csfv.psfvcb->lpVtbl->Release(csfv.psfvcb); -#endif - if (!SUCCEEDED(hr)) - goto Fail; - - hr = IShellView_QueryInterface(This->DesktopView, - &IID_IShellView2, - (PVOID*)&This->DesktopView2); - if (!SUCCEEDED(hr)) - This->DesktopView2 = NULL; - - if (lpCreateStruct == NULL) - { - if (!GetClientRect(This->hWnd, - &rcClient)) - { - goto Fail; - } - } - else - { - rcClient.left = 0; - rcClient.top = 0; - rcClient.right = lpCreateStruct->cx; - rcClient.bottom = lpCreateStruct->cy; - } - - fs.ViewMode = FVM_ICON; - fs.fFlags = FWF_DESKTOP | FWF_NOCLIENTEDGE | FWF_NOSCROLL | FWF_TRANSPARENT; - if (This->DesktopView2 != NULL) - { - SV2CVW2_PARAMS params; - - params.cbSize = sizeof(params); - params.psvPrev = NULL; - params.pfs = &fs; - params.psbOwner = ShellBrowser; - params.prcView = &rcClient; - params.pvid = &VID_LargeIcons; - hr = IShellView2_CreateViewWindow2(This->DesktopView2, - &params); - - if (FAILED(hr)) - goto DefCreateViewWindow; - This->hWndShellView = params.hwndView; - } - else - { -DefCreateViewWindow: - hr = IShellView_CreateViewWindow(This->DesktopView, - NULL, - &fs, - ShellBrowser, - &rcClient, - &This->hWndShellView); - } - if (!SUCCEEDED(hr)) - goto Fail; - - IShellView_EnableModeless(This->DesktopView, - TRUE); - - hr = IShellView_UIActivate(This->DesktopView, - SVUIA_ACTIVATE_FOCUS); - if (!SUCCEEDED(hr)) - { - IShellView_DestroyViewWindow(This->DesktopView); - -Fail: - /* NOTE: the other references will be released in the - WM_NCDESTROY handler! */ - IDesktopShellBrowserImpl_Release(ShellBrowser); - return NULL; - } - - /* Now get the real window handle to the list view control! - We need to assume it is the child window of the default - shell view window. There doesn't seem to be another way - to get to the list view window handle... */ - This->hWndDesktopListView = FindWindowEx(This->hWndShellView, - NULL, - WC_LISTVIEW, - NULL); - - if (This->hWndDesktopListView != NULL) - { - /* Register drag&drop */ - hr = IShellView_QueryInterface(This->DesktopView, - &IID_IDropTarget, - (PVOID*)&This->DropTarget); - if (SUCCEEDED(hr)) - { - hr = RegisterDragDrop(This->hWndDesktopListView, - This->DropTarget); - if (!SUCCEEDED(hr)) - { - IDropTarget_Release(This->DropTarget); - This->DropTarget = NULL; - } - } - } - - /* Register a notification that is triggered when a new drive is added and the shell - should open that drive in a new window, such as USB sticks. */ - cne.pidl = NULL; - cne.fRecursive = TRUE; - This->ChangeNotificationId = SHChangeNotifyRegister(This->hWnd, - SHCNRF_ShellLevel | SHCNRF_NewDelivery, - SHCNE_DRIVEADDGUI, - WM_SHELL_ADDDRIVENOTIFY, - 1, - &cne); - - /* Create the tray window */ - This->Tray = CreateTrayWindow(); - return This; -} - -static HRESULT STDMETHODCALLTYPE -IDesktopShellBrowserImpl_GetWindow(IN OUT IShellBrowser *iface, - OUT HWND *phwnd) -{ - IDesktopShellBrowserImpl *This = impl_from_IShellBrowser(iface); - - if (This->hWnd != NULL) - { - *phwnd = This->hWnd; - return S_OK; - } - - *phwnd = NULL; - return E_UNEXPECTED; -} - -static HRESULT STDMETHODCALLTYPE -IDesktopShellBrowserImpl_ContextSensitiveHelp(IN OUT IShellBrowser *iface, - IN BOOL fEnterMode) -{ - return E_NOTIMPL; -} - -static HRESULT STDMETHODCALLTYPE -IDesktopShellBrowserImpl_InsertMenusSB(IN OUT IShellBrowser *iface, - IN HMENU hmenuShared, - OUT LPOLEMENUGROUPWIDTHS lpMenuWidths) -{ - return E_NOTIMPL; -} - -static HRESULT STDMETHODCALLTYPE -IDesktopShellBrowserImpl_SetMenuSB(IN OUT IShellBrowser *iface, - IN HMENU hmenuShared, - IN HOLEMENU holemenuRes, - IN HWND hwndActiveObject) -{ - return E_NOTIMPL; -} - -static HRESULT STDMETHODCALLTYPE -IDesktopShellBrowserImpl_RemoveMenusSB(IN OUT IShellBrowser *iface, - IN HMENU hmenuShared) -{ - return E_NOTIMPL; -} - -static HRESULT STDMETHODCALLTYPE -IDesktopShellBrowserImpl_SetStatusTextSB(IN OUT IShellBrowser *iface, - IN LPCOLESTR lpszStatusText) -{ - return E_NOTIMPL; -} - -static HRESULT STDMETHODCALLTYPE -IDesktopShellBrowserImpl_EnableModelessSB(IN OUT IShellBrowser *iface, - IN BOOL fEnable) -{ - return E_NOTIMPL; -} - -static HRESULT STDMETHODCALLTYPE -IDesktopShellBrowserImpl_TranslateAcceleratorSB(IN OUT IShellBrowser *iface, - IN LPMSG lpmsg, - IN WORD wID) -{ - return S_FALSE; -} - -static HRESULT STDMETHODCALLTYPE -IDesktopShellBrowserImpl_BrowseObject(IN OUT IShellBrowser *iface, - IN LPCITEMIDLIST pidl, - IN UINT wFlags) -{ - return E_NOTIMPL; -} - -static HRESULT STDMETHODCALLTYPE -IDesktopShellBrowserImpl_GetViewStateStream(IN OUT IShellBrowser *iface, - IN DWORD grfMode, - OUT IStream **ppStrm) -{ - IDesktopShellBrowserImpl *This = impl_from_IShellBrowser(iface); - static WCHAR szItemPos[] = L"ItemPos"; - HRESULT hRet; - IPropertyBag *PropBag = NULL; - WCHAR szPropName[64]; - - /* Determine the name of the property that contains the stream of - icon positions */ - wcscpy(szPropName, - szItemPos); - hRet = SHGetPerScreenResName(szPropName + wcslen(szPropName), - (sizeof(szPropName) / sizeof(szPropName[0])) - wcslen(szPropName), - 0); - if (SUCCEEDED(hRet)) - { - /* Locate the property bag for the desktop */ - hRet = SHGetViewStatePropertyBag(This->pidlDesktop, - L"Desktop", - SHGVSPB_FOLDERNODEFAULTS | SHGVSPB_ROAM, - &IID_IPropertyBag, - (PVOID*)&PropBag); - - if (SUCCEEDED(hRet)) - { - /* Create a stream for the ItemPos property */ - hRet = SHPropertyBag_ReadStream(PropBag, - szPropName, - ppStrm); - - IPropertyBag_Release(PropBag); - - if (SUCCEEDED(hRet)) - { - /* FIXME: For some reason the shell doesn't position the icons... */ - } - } - } - - return hRet; -} - -static HWND -DesktopGetWindowControl(IN IDesktopShellBrowserImpl *This, - IN UINT id) -{ - switch (id) - { - case FCW_TOOLBAR: - case FCW_STATUS: - case FCW_TREE: - case FCW_PROGRESS: - return NULL; - - default: - return NULL; - } - -} - -static HRESULT STDMETHODCALLTYPE -IDesktopShellBrowserImpl_GetControlWindow(IN OUT IShellBrowser *iface, - IN UINT id, - OUT HWND *lphwnd) -{ - IDesktopShellBrowserImpl *This = impl_from_IShellBrowser(iface); - HWND hWnd; - - hWnd = DesktopGetWindowControl(This, - id); - if (hWnd != NULL) - { - *lphwnd = hWnd; - return S_OK; - } - - *lphwnd = NULL; - return E_NOTIMPL; -} - -static HRESULT STDMETHODCALLTYPE -IDesktopShellBrowserImpl_SendControlMsg(IN OUT IShellBrowser *iface, - IN UINT id, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam, - OUT LRESULT *pret) -{ - IDesktopShellBrowserImpl *This = impl_from_IShellBrowser(iface); - HWND hWnd; - - if (pret == NULL) - return E_POINTER; - - hWnd = DesktopGetWindowControl(This, - id); - if (hWnd != NULL) - { - *pret = SendMessage(hWnd, - uMsg, - wParam, - lParam); - return S_OK; - } - - return E_NOTIMPL; -} - -static HRESULT STDMETHODCALLTYPE -IDesktopShellBrowserImpl_QueryActiveShellView(IN OUT IShellBrowser *iface, - OUT IShellView **ppshv) -{ - IShellView *ActiveView; - IDesktopShellBrowserImpl *This = impl_from_IShellBrowser(iface); - - ActiveView = This->DesktopView; - IDesktopShellBrowserImpl_AddRef(iface); - *ppshv = ActiveView; - - return S_OK; -} - -static HRESULT STDMETHODCALLTYPE -IDesktopShellBrowserImpl_OnViewWindowActive(IN OUT IShellBrowser *iface, - IN OUT IShellView *ppshv) -{ - return E_NOTIMPL; -} - -static HRESULT STDMETHODCALLTYPE -IDesktopShellBrowserImpl_SetToolbarItems(IN OUT IShellBrowser *iface, - IN LPTBBUTTON lpButtons, - IN UINT nButtons, - IN UINT uFlags) -{ - return E_NOTIMPL; -} - -static const IShellBrowserVtbl IDesktopShellBrowserImpl_Vtbl = -{ - /* IUnknown */ - IDesktopShellBrowserImpl_QueryInterface, - IDesktopShellBrowserImpl_AddRef, - IDesktopShellBrowserImpl_Release, - /* IOleWindow */ - IDesktopShellBrowserImpl_GetWindow, - IDesktopShellBrowserImpl_ContextSensitiveHelp, - /* IShellBrowser */ - IDesktopShellBrowserImpl_InsertMenusSB, - IDesktopShellBrowserImpl_SetMenuSB, - IDesktopShellBrowserImpl_RemoveMenusSB, - IDesktopShellBrowserImpl_SetStatusTextSB, - IDesktopShellBrowserImpl_EnableModelessSB, - IDesktopShellBrowserImpl_TranslateAcceleratorSB, - IDesktopShellBrowserImpl_BrowseObject, - IDesktopShellBrowserImpl_GetViewStateStream, - IDesktopShellBrowserImpl_GetControlWindow, - IDesktopShellBrowserImpl_SendControlMsg, - IDesktopShellBrowserImpl_QueryActiveShellView, - IDesktopShellBrowserImpl_OnViewWindowActive, - IDesktopShellBrowserImpl_SetToolbarItems -}; - -/* - * ICommDlgBrowser - */ - -static HRESULT STDMETHODCALLTYPE -IDesktopShellBrowserImpl_ICommDlgBrowser_QueryInterface(IN OUT ICommDlgBrowser *iface, - IN REFIID riid, - OUT LPVOID *ppvObj) -{ - IDesktopShellBrowserImpl *This = impl_from_ICommDlgBrowser(iface); - IShellBrowser *ShellBrowser = IShellBrowser_from_impl(This); - - return IDesktopShellBrowserImpl_QueryInterface(ShellBrowser, - riid, - ppvObj); -} - -static ULONG STDMETHODCALLTYPE -IDesktopShellBrowserImpl_ICommDlgBrowser_Release(IN OUT ICommDlgBrowser *iface) -{ - IDesktopShellBrowserImpl *This = impl_from_ICommDlgBrowser(iface); - IShellBrowser *ShellBrowser = IShellBrowser_from_impl(This); - - return IDesktopShellBrowserImpl_Release(ShellBrowser); -} - -static ULONG STDMETHODCALLTYPE -IDesktopShellBrowserImpl_ICommDlgBrowser_AddRef(IN OUT ICommDlgBrowser *iface) -{ - IDesktopShellBrowserImpl *This = impl_from_ICommDlgBrowser(iface); - IShellBrowser *ShellBrowser = IShellBrowser_from_impl(This); - - return IDesktopShellBrowserImpl_AddRef(ShellBrowser); -} - -static HRESULT STDMETHODCALLTYPE -IDesktopShellBrowserImpl_ICommDlgBrowser_OnDefaultCommand(IN OUT ICommDlgBrowser *iface, - IN OUT IShellView *ppshv) -{ - return E_NOTIMPL; -} - -static HRESULT STDMETHODCALLTYPE -IDesktopShellBrowserImpl_ICommDlgBrowser_OnStateChange(IN OUT ICommDlgBrowser *iface, - IN OUT IShellView *ppshv, - IN ULONG uChange) -{ - return S_OK; -} - -static HRESULT STDMETHODCALLTYPE -IDesktopShellBrowserImpl_ICommDlgBrowser_IncludeObject(IN OUT ICommDlgBrowser *iface, - IN OUT IShellView *ppshv, - IN LPCITEMIDLIST pidl) -{ - return S_OK; -} - -static const ICommDlgBrowserVtbl IDesktopShellBrowserImpl_ICommDlgBrowser_Vtbl = -{ - /* IUnknown */ - IDesktopShellBrowserImpl_ICommDlgBrowser_QueryInterface, - IDesktopShellBrowserImpl_ICommDlgBrowser_AddRef, - IDesktopShellBrowserImpl_ICommDlgBrowser_Release, - /* ICommDlgBrowser */ - IDesktopShellBrowserImpl_ICommDlgBrowser_OnDefaultCommand, - IDesktopShellBrowserImpl_ICommDlgBrowser_OnStateChange, - IDesktopShellBrowserImpl_ICommDlgBrowser_IncludeObject -}; - -/* - * IServiceProvider - */ - -static HRESULT STDMETHODCALLTYPE -IDesktopShellBrowserImpl_IServiceProvider_QueryInterface(IN OUT IServiceProvider *iface, - IN REFIID riid, - OUT LPVOID *ppvObj) -{ - IDesktopShellBrowserImpl *This = impl_from_IServiceProvider(iface); - IShellBrowser *ShellBrowser = IShellBrowser_from_impl(This); - - return IDesktopShellBrowserImpl_QueryInterface(ShellBrowser, - riid, - ppvObj); -} - -static ULONG STDMETHODCALLTYPE -IDesktopShellBrowserImpl_IServiceProvider_Release(IN OUT IServiceProvider *iface) -{ - IDesktopShellBrowserImpl *This = impl_from_IServiceProvider(iface); - IShellBrowser *ShellBrowser = IShellBrowser_from_impl(This); - - return IDesktopShellBrowserImpl_Release(ShellBrowser); -} - -static ULONG STDMETHODCALLTYPE -IDesktopShellBrowserImpl_IServiceProvider_AddRef(IN OUT IServiceProvider *iface) -{ - IDesktopShellBrowserImpl *This = impl_from_IServiceProvider(iface); - IShellBrowser *ShellBrowser = IShellBrowser_from_impl(This); - - return IDesktopShellBrowserImpl_AddRef(ShellBrowser); -} - -static HRESULT STDMETHODCALLTYPE -IDesktopShellBrowserImpl_IServiceProvider_QueryService(IN OUT IServiceProvider *iface, - IN REFGUID guidService, - IN REFIID riid, - OUT PVOID *ppv) -{ - /* FIXME - handle guidService */ - return IDesktopShellBrowserImpl_IServiceProvider_QueryInterface(iface, - riid, - ppv); -} - -static const IServiceProviderVtbl IDesktopShellBrowserImpl_IServiceProvider_Vtbl = -{ - /* IUnknown */ - IDesktopShellBrowserImpl_IServiceProvider_QueryInterface, - IDesktopShellBrowserImpl_IServiceProvider_AddRef, - IDesktopShellBrowserImpl_IServiceProvider_Release, - /* IServiceProvider */ - IDesktopShellBrowserImpl_IServiceProvider_QueryService -}; - -/* - * IShellFolderViewCB - */ - -static HRESULT STDMETHODCALLTYPE -IDesktopShellBrowserImpl_IShellFolderViewCB_QueryInterface(IN OUT IShellFolderViewCB *iface, - IN REFIID riid, - OUT LPVOID *ppvObj) -{ - IDesktopShellBrowserImpl *This = impl_from_IShellFolderViewCB(iface); - IShellBrowser *ShellBrowser = IShellBrowser_from_impl(This); - - return IDesktopShellBrowserImpl_QueryInterface(ShellBrowser, - riid, - ppvObj); -} - -static ULONG STDMETHODCALLTYPE -IDesktopShellBrowserImpl_IShellFolderViewCB_Release(IN OUT IShellFolderViewCB *iface) -{ - IDesktopShellBrowserImpl *This = impl_from_IShellFolderViewCB(iface); - IShellBrowser *ShellBrowser = IShellBrowser_from_impl(This); - - return IDesktopShellBrowserImpl_Release(ShellBrowser); -} - -static ULONG STDMETHODCALLTYPE -IDesktopShellBrowserImpl_IShellFolderViewCB_AddRef(IN OUT IShellFolderViewCB *iface) -{ - IDesktopShellBrowserImpl *This = impl_from_IShellFolderViewCB(iface); - IShellBrowser *ShellBrowser = IShellBrowser_from_impl(This); - - return IDesktopShellBrowserImpl_AddRef(ShellBrowser); -} - -static HRESULT STDMETHODCALLTYPE -IDesktopShellBrowserImpl_IShellFolderViewCB_MessageSFVCB(IN OUT IShellFolderViewCB *iface, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam) -{ - IDesktopShellBrowserImpl *This = impl_from_IShellFolderViewCB(iface); - HRESULT hr = S_OK; - switch (uMsg) - { - case SFVM_GETNOTIFY: - hr = IDesktopShellBrowserImpl_GetNotify(This, - (LPITEMIDLIST *)wParam, - (LONG *)lParam); - break; - - case SFVM_FSNOTIFY: - hr = S_OK; - break; - - default: - hr = E_NOTIMPL; - break; - } - - return hr; -} - -static const IShellFolderViewCBVtbl IDesktopShellBrowserImpl_IShellFolderViewCB_Vtbl = -{ - /* IUnknown */ - IDesktopShellBrowserImpl_IShellFolderViewCB_QueryInterface, - IDesktopShellBrowserImpl_IShellFolderViewCB_AddRef, - IDesktopShellBrowserImpl_IShellFolderViewCB_Release, - /* IShellFolderViewCB */ - IDesktopShellBrowserImpl_IShellFolderViewCB_MessageSFVCB -}; - -/*****************************************************************************/ - -static const TCHAR szProgmanClassName[] = TEXT("Progman"); -static const TCHAR szProgmanWindowName[] = TEXT("Program Manager"); - -static VOID -PositionIcons(IN OUT IDesktopShellBrowserImpl *This, - IN const RECT *prcDesktopRect) -{ - /* FIXME - Move all icons and align them on the destop. Before moving, we should - check if we're moving an icon above an existing one. If so, we should - let the list view control arrange the icons */ - return; -} - -static VOID -UpdateWorkArea(IN OUT IDesktopShellBrowserImpl *This, - IN const RECT *prcDesktopRect) -{ - RECT rcDesktopRect; - LONG Style; - - Style = GetWindowLong(This->hWndDesktopListView, - GWL_STYLE); - - if (!(Style & LVS_AUTOARRANGE ) && - GetWindowRect(This->hWnd, - &rcDesktopRect)) - { - /* Only resize the desktop if it was resized to something other - than the virtual screen size/position! */ - if (!EqualRect(prcDesktopRect, - &rcDesktopRect)) - { - SetWindowPos(This->hWnd, - NULL, - prcDesktopRect->left, - prcDesktopRect->top, - prcDesktopRect->right - prcDesktopRect->left, - prcDesktopRect->bottom - prcDesktopRect->top, - SWP_NOZORDER | SWP_NOACTIVATE); - - /* Let's try to rearrange the icons on the desktop. This is - especially neccessary when switching screen resolutions... */ - PositionIcons(This, - prcDesktopRect); - } - } -} - -static LRESULT CALLBACK -ProgmanWindowProc(IN HWND hwnd, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam) -{ - IDesktopShellBrowserImpl *This = NULL; - LRESULT Ret = FALSE; - - if (uMsg != WM_NCCREATE) - { - This = (IDesktopShellBrowserImpl*)GetWindowLongPtr(hwnd, - 0); - } - - if (This != NULL || uMsg == WM_NCCREATE) - { - switch (uMsg) - { - case WM_ERASEBKGND: - PaintDesktop((HDC)wParam); - break; - - case WM_GETISHELLBROWSER: - Ret = (LRESULT)IShellBrowser_from_impl(This); - break; - - case WM_SHELL_ADDDRIVENOTIFY: - { - HANDLE hLock; - LPITEMIDLIST *ppidl; - LONG lEventId; - - hLock = SHChangeNotification_Lock((HANDLE)wParam, - (DWORD)lParam, - &ppidl, - &lEventId); - if (hLock != NULL) - { - /* FIXME */ - SHChangeNotification_Unlock(hLock); - } - break; - } - - case WM_SIZE: - if (wParam == SIZE_MINIMIZED) - { - /* Hey, we're the desktop!!! */ - ShowWindow(hwnd, - SW_RESTORE); - } - else - { - RECT rcDesktop; - - rcDesktop.left = GetSystemMetrics(SM_XVIRTUALSCREEN); - rcDesktop.top = GetSystemMetrics(SM_YVIRTUALSCREEN); - rcDesktop.right = GetSystemMetrics(SM_CXVIRTUALSCREEN); - rcDesktop.bottom = GetSystemMetrics(SM_CYVIRTUALSCREEN); - - UpdateWorkArea(This, - &rcDesktop); - } - break; - - case WM_SYSCOLORCHANGE: - { - InvalidateRect(This->hWnd, - NULL, - TRUE); - - if (This->hWndShellView != NULL) - { - /* Forward the message */ - SendMessage(This->hWndShellView, - WM_SYSCOLORCHANGE, - wParam, - lParam); - } - break; - } - - case WM_NCCREATE: - { - LPCREATESTRUCT CreateStruct = (LPCREATESTRUCT)lParam; - This = IDesktopShellBrowserImpl_Construct(hwnd, - CreateStruct); - if (This == NULL) - break; - - SetWindowLongPtr(hwnd, - 0, - (LONG_PTR)This); - - if (This->hWndShellView != NULL) - SetShellWindowEx(This->hWnd, - This->hWndDesktopListView); - else - SetShellWindow(This->hWnd); - - Ret = TRUE; - break; - } - - case WM_DESTROY: - { - IDesktopShellBrowserImpl_Destroy(This); - break; - } - - case WM_NCDESTROY: - { - IDesktopShellBrowserImpl_Release(IShellBrowser_from_impl(This)); - - PostQuitMessage(0); - break; - } - - default: - Ret = DefWindowProc(hwnd, uMsg, wParam, lParam); - break; - } - } - - return Ret; -} - -static BOOL -RegisterProgmanWindowClass(VOID) -{ - WNDCLASS wcProgman; - - wcProgman.style = CS_DBLCLKS; - wcProgman.lpfnWndProc = ProgmanWindowProc; - wcProgman.cbClsExtra = 0; - wcProgman.cbWndExtra = sizeof(IDesktopShellBrowserImpl *); - wcProgman.hInstance = hExplorerInstance; - wcProgman.hIcon = NULL; - wcProgman.hCursor = LoadCursor(NULL, - IDC_ARROW); - wcProgman.hbrBackground = (HBRUSH)(COLOR_BACKGROUND + 1); - wcProgman.lpszMenuName = NULL; - wcProgman.lpszClassName = szProgmanClassName; - - return RegisterClass(&wcProgman) != 0; -} - -static VOID -UnregisterProgmanWindowClass(VOID) -{ - UnregisterClass(szProgmanClassName, - hExplorerInstance); -} - -typedef struct _DESKCREATEINFO -{ - HANDLE hEvent; - HWND hWndDesktop; - IDesktopShellBrowserImpl *pDesktop; -} DESKCREATEINFO, *PDESKCREATEINFO; - -static DWORD CALLBACK -DesktopThreadProc(IN OUT LPVOID lpParameter) -{ - volatile DESKCREATEINFO *DeskCreateInfo = (volatile DESKCREATEINFO *)lpParameter; - HWND hwndDesktop; - IDesktopShellBrowserImpl *pDesktop; - MSG Msg; - BOOL Ret; - - OleInitialize(NULL); - hwndDesktop = CreateWindowEx(WS_EX_TOOLWINDOW, - szProgmanClassName, - szProgmanWindowName, - WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, - 0, - 0, - GetSystemMetrics(SM_CXVIRTUALSCREEN), - GetSystemMetrics(SM_CYVIRTUALSCREEN), - NULL, - NULL, - hExplorerInstance, - NULL); - - DeskCreateInfo->hWndDesktop = hwndDesktop; - if (hwndDesktop == NULL) - return 1; - - pDesktop = (IDesktopShellBrowserImpl*)GetWindowLongPtr(hwndDesktop, - 0); - (void)InterlockedExchangePointer(&DeskCreateInfo->pDesktop, - pDesktop); - - if (!SetEvent(DeskCreateInfo->hEvent)) - { - /* Failed to notify that we initialized successfully, kill ourselves - to make the main thread wake up! */ - return 1; - } - - while (1) - { - Ret = (GetMessage(&Msg, - NULL, - 0, - 0) != 0); - - if (Ret != -1) - { - if (!Ret) - break; - - TranslateMessage(&Msg); - DispatchMessage(&Msg); - } - } - - OleUninitialize(); - - /* FIXME: Properly rundown the main thread! */ - ExitProcess(0); - - return 0; -} - -HANDLE -DesktopCreateWindow(IN OUT ITrayWindow *Tray) -{ - HANDLE hThread; - HANDLE hEvent; - DWORD DesktopThreadId; - IDesktopShellBrowserImpl *pDesktop = NULL; - HANDLE Handles[2]; - DWORD WaitResult; - HWND hWndDesktop = NULL; - IShellDesktopTray *pSdt; - HRESULT hRet; - - if (!RegisterProgmanWindowClass()) - return NULL; - - if (!RegisterTrayWindowClass()) - { - UnregisterProgmanWindowClass(); - return NULL; - } - - if (!RegisterTaskSwitchWndClass()) - { - UnregisterProgmanWindowClass(); - UnregisterTrayWindowClass(); - return NULL; - } - - hEvent = CreateEvent(NULL, - FALSE, - FALSE, - NULL); - if (hEvent != NULL) - { - volatile DESKCREATEINFO DeskCreateInfo; - - DeskCreateInfo.hEvent = hEvent; - DeskCreateInfo.pDesktop = NULL; - - hThread = CreateThread(NULL, - 0, - DesktopThreadProc, - (PVOID)&DeskCreateInfo, - 0, - &DesktopThreadId); - if (hThread != NULL) - { - Handles[0] = hThread; - Handles[1] = hEvent; - - WaitResult = WaitForMultipleObjects(sizeof(Handles) / sizeof(Handles[0]), - Handles, - FALSE, - INFINITE); - if (WaitResult != WAIT_FAILED && WaitResult != WAIT_OBJECT_0) - { - pDesktop = DeskCreateInfo.pDesktop; - hWndDesktop = DeskCreateInfo.hWndDesktop; - } - - CloseHandle(hThread); - } - - CloseHandle(hEvent); - } - - if (pDesktop != NULL) - { - hRet = ITrayWindow_QueryInterface(Tray, - &IID_IShellDesktopTray, - (PVOID*)&pSdt); - if (SUCCEEDED(hRet)) - { - IShellDesktopTray_RegisterDesktopWindow(pSdt, - hWndDesktop); - IShellDesktopTray_Release(pSdt); - } - } - else - { - UnregisterProgmanWindowClass(); - UnregisterTrayWindowClass(); - UnregisterTaskSwitchWndClass(); - } - - return (HANDLE)pDesktop; -} - -VOID -DesktopDestroyShellWindow(IN HANDLE hDesktop) -{ - //IDesktopShellBrowserImpl *pDesktop = (IDesktopShellBrowserImpl *)hDesktop; - - /* FIXME - Destroy window (don't use DestroyWindow() as - the window belongs to another thread!) */ - - UnregisterProgmanWindowClass(); - UnregisterTrayWindowClass(); -} - -#endif /* USE_API_SHCREATEDESKTOP */ Modified: trunk/reactos/base/shell/explorer-new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/pr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] Mon Jan 12 18:34:32 2009 @@ -15,8 +15,6 @@ #include <tchar.h> #include <stdio.h> #include <stdlib.h> - -#define USE_API_SHCREATEDESKTOP 1 /* Use SHCreateDesktop() */ #include "resource.h" #include "comcsup.h" Modified: trunk/reactos/base/shell/explorer-new/undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/un… ============================================================================== --- trunk/reactos/base/shell/explorer-new/undoc.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/undoc.h [iso-8859-1] Mon Jan 12 18:34:32 2009 @@ -121,7 +121,6 @@ #define IShellDesktopTray_Unknown(T,a,b) (T)->lpVtbl->Unknown(T,a,b) #endif -#if USE_API_SHCREATEDESKTOP != 0 #if 0 HANDLE WINAPI SHCreateDesktop(IShellDesktopTray*); BOOL WINAPI SHDesktopMessageLoop(HANDLE); @@ -176,8 +175,6 @@ return FALSE; } #endif - -#endif /* USE_API_SHCREATEDESKTOP */ #define WM_GETISHELLBROWSER (WM_USER+7) BOOL WINAPI SetShellWindow(HWND);

15 years, 8 months

[jimtabor] 38741: - Un-implement NtUserDispatchMessage. - First of all, it is incorrect. I had a rant that I was going to send to the private mail list, but this will do. - No more "New Standards"! The Window object should already know it is ANSI or not. A pointer to MSG is the only thing passed.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Jan 12 17:36:10 2009 New Revision: 38741 URL: http://svn.reactos.org/svn/reactos?rev=38741&view=rev Log: - Un-implement NtUserDispatchMessage. - First of all, it is incorrect. I had a rant that I was going to send to the private mail list, but this will do. - No more "New Standards"! The Window object should already know it is ANSI or not. A pointer to MSG is the only thing passed. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/message.c 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] Mon Jan 12 17:36:10 2009 @@ -1207,17 +1207,9 @@ NtUserDisableThreadIme( DWORD dwUnknown1); -typedef struct tagNTUSERDISPATCHMESSAGEINFO -{ - BOOL HandledByKernel; - BOOL Ansi; - WNDPROC Proc; - MSG Msg; -} NTUSERDISPATCHMESSAGEINFO, *PNTUSERDISPATCHMESSAGEINFO; - LRESULT NTAPI -NtUserDispatchMessage(PNTUSERDISPATCHMESSAGEINFO MsgInfo); +NtUserDispatchMessage(PMSG pMsg); BOOL NTAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Mon Jan 12 17:36:10 2009 @@ -405,92 +405,10 @@ } LRESULT APIENTRY -NtUserDispatchMessage(PNTUSERDISPATCHMESSAGEINFO UnsafeMsgInfo) -{ - NTSTATUS Status; - NTUSERDISPATCHMESSAGEINFO MsgInfo; - LRESULT Result = TRUE; - DECLARE_RETURN(LRESULT); - - DPRINT("Enter NtUserDispatchMessage\n"); - UserEnterExclusive(); - - Status = MmCopyFromCaller(&MsgInfo, UnsafeMsgInfo, sizeof(NTUSERDISPATCHMESSAGEINFO)); - if (! NT_SUCCESS(Status)) - { - SetLastNtError(Status); - RETURN( 0); - } - - /* Process timer messages. */ - if (WM_TIMER == MsgInfo.Msg.message && 0 != MsgInfo.Msg.lParam) - { - LARGE_INTEGER LargeTickCount; - /* FIXME: Call hooks. */ - - /* FIXME: Check for continuing validity of timer. */ - - MsgInfo.HandledByKernel = FALSE; - KeQueryTickCount(&LargeTickCount); - MsgInfo.Proc = (WNDPROC) MsgInfo.Msg.lParam; - MsgInfo.Msg.lParam = (LPARAM)LargeTickCount.u.LowPart; - } - else if (NULL == MsgInfo.Msg.hwnd) - { - MsgInfo.HandledByKernel = TRUE; - Result = 0; - } - else - { - PWINDOW_OBJECT Window; - - /* Get the window object. */ - Window = UserGetWindowObject(MsgInfo.Msg.hwnd); - if (NULL == Window) - { - MsgInfo.HandledByKernel = TRUE; - Result = 0; - } - else - { - if (Window->OwnerThread != PsGetCurrentThread()) - { - DPRINT1("Window doesn't belong to the calling thread!\n"); - MsgInfo.HandledByKernel = TRUE; - Result = 0; - } - else - { - /* FIXME: Call hook procedures. */ - - MsgInfo.HandledByKernel = FALSE; - Result = 0; - - if (Window->Wnd->IsSystem) - { - MsgInfo.Proc = (!MsgInfo.Ansi ? Window->Wnd->WndProc : Window->Wnd->WndProcExtra); - } - else - { - MsgInfo.Ansi = !Window->Wnd->Unicode; - MsgInfo.Proc = Window->Wnd->WndProc; - } - } - } - } - Status = MmCopyToCaller(UnsafeMsgInfo, &MsgInfo, sizeof(NTUSERDISPATCHMESSAGEINFO)); - if (! NT_SUCCESS(Status)) - { - SetLastNtError(Status); - RETURN( 0); - } - - RETURN( Result); - -CLEANUP: - DPRINT("Leave NtUserDispatchMessage. ret=%i\n", _ret_); - UserLeave(); - END_CLEANUP; +NtUserDispatchMessage(PMSG UnsafeMsgInfo) +{ + UNIMPLEMENTED; + return 0; }

15 years, 8 months

← Newer
1
...
48
49
50
51
52
53
54
...
76
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2009