Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 37619: - Fix heap corruption and memory leak - patch by Daniel Zimmermann - CID 707 - bug 3905
by janderwald＠svn.reactos.org 24 Nov '08

24 Nov '08

Author: janderwald Date: Mon Nov 24 12:05:51 2008 New Revision: 37619 URL: http://svn.reactos.org/svn/reactos?rev=37619&view=rev Log: - Fix heap corruption and memory leak - patch by Daniel Zimmermann - CID 707 - bug 3905 Modified: trunk/reactos/dll/cpl/sysdm/startrec.c Modified: trunk/reactos/dll/cpl/sysdm/startrec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/startrec.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/startrec.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/startrec.c [iso-8859-1] Mon Nov 24 12:05:51 2008 @@ -62,7 +62,7 @@ /* get Path to freeldr.ini or boot.ini */ *szSystemDrive = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); - if (szSystemDrive != NULL) + if (*szSystemDrive != NULL) { dwBufSize = GetEnvironmentVariableW(L"SystemDrive", *szSystemDrive, MAX_PATH); if (dwBufSize > MAX_PATH) @@ -83,15 +83,15 @@ else if (dwBufSize == 0) { FailGetSysDrive: - HeapFree(GetProcessHeap(), 0, szSystemDrive); + HeapFree(GetProcessHeap(), 0, *szSystemDrive); *szSystemDrive = NULL; - return FALSE; + return 0; } return dwBufSize; } - return FALSE; + return 0; } static PBOOTRECORD @@ -454,7 +454,7 @@ HINF hInf; dwBufSize = GetSystemDrive(&szSystemDrive); - if (!dwBufSize) + if (dwBufSize == 0) return FALSE; wcscpy(pStartInfo->szFreeldrIni, szSystemDrive); @@ -462,6 +462,8 @@ if (PathFileExistsW(pStartInfo->szFreeldrIni)) { + /* free resource previously allocated by GetSystemDrive() */ + HeapFree(GetProcessHeap(), 0, szSystemDrive); /* freeldr.ini exists */ hInf = SetupOpenInfFileW(pStartInfo->szFreeldrIni, NULL, @@ -481,6 +483,9 @@ /* try load boot.ini settings */ wcscpy(pStartInfo->szFreeldrIni, szSystemDrive); wcscat(pStartInfo->szFreeldrIni, L"\\boot.ini"); + + /* free resource previously allocated by GetSystemDrive() */ + HeapFree(GetProcessHeap(), 0, szSystemDrive); if (PathFileExistsW(pStartInfo->szFreeldrIni)) {

1 0

[janderwald] 37618: - Store settings of SPI_SETMOUSEBUTTONSWAP in registry - bug 2443
by janderwald＠svn.reactos.org 24 Nov '08

24 Nov '08

Author: janderwald Date: Mon Nov 24 11:57:17 2008 New Revision: 37618 URL: http://svn.reactos.org/svn/reactos?rev=37618&view=rev Log: - Store settings of SPI_SETMOUSEBUTTONSWAP in registry - bug 2443 Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Mon Nov 24 11:57:17 2008 @@ -44,6 +44,40 @@ RtlCopyMemory(font, &DefaultFont, sizeof(LOGFONTW)); } } + +VOID +IntWriteSystemParametersSettings(PUNICODE_STRING SubKeyName, PUNICODE_STRING KeyName, ULONG Type, PVOID Data, ULONG DataSize) +{ + UNICODE_STRING KeyPath; + NTSTATUS Status; + HANDLE CurrentUserKey, KeyHandle; + OBJECT_ATTRIBUTES KeyAttributes, ObjectAttributes; + + /* Get a handle to the current users settings */ + Status = RtlFormatCurrentUserKeyPath(&KeyPath); + if(!NT_SUCCESS(Status)) + return; + + InitializeObjectAttributes(&ObjectAttributes, &KeyPath, OBJ_CASE_INSENSITIVE, NULL, NULL); + /* Open the HKCU key */ + Status = ZwOpenKey(&CurrentUserKey, KEY_WRITE, &ObjectAttributes); + RtlFreeUnicodeString(&KeyPath); + if(!NT_SUCCESS(Status)) + return; + + + /* Open up the settings to read the values */ + InitializeObjectAttributes(&KeyAttributes, SubKeyName, OBJ_CASE_INSENSITIVE, CurrentUserKey, NULL); + Status = ZwOpenKey(&KeyHandle, KEY_WRITE, &KeyAttributes); + ZwClose(CurrentUserKey); + + if (NT_SUCCESS(Status)) + { + ZwSetValueKey(KeyHandle, KeyName, 0, Type, Data, DataSize); + ZwClose(KeyHandle); + } +} + ULONG FASTCALL @@ -260,9 +294,17 @@ CurInfo->MouseHoverHeight = uiParam; break; case SPI_SETMOUSEBUTTONSWAP: - CurInfo = IntGetSysCursorInfo(WinStaObject); - CurInfo->SwapButtons = uiParam; - break; + { + UNICODE_STRING SubKeyName = RTL_CONSTANT_STRING(L"Control Panel\\Mouse"); + UNICODE_STRING SwapMouseButtons = RTL_CONSTANT_STRING(L"SwapMouseButtons"); + WCHAR szBuffer[10]; + + swprintf(szBuffer, L"%u", uiParam); + CurInfo = IntGetSysCursorInfo(WinStaObject); + CurInfo->SwapButtons = uiParam; + IntWriteSystemParametersSettings(&SubKeyName, &SwapMouseButtons, REG_SZ, szBuffer, (wcslen(szBuffer)+1) * sizeof(WCHAR)); + break; + } case SPI_SETMOUSE: CurInfo = IntGetSysCursorInfo(WinStaObject); CurInfo->CursorAccelerationInfo = *(PCURSORACCELERATION_INFO)pvParam;

1 0

[dgoette] 37617: * implemented list of depencies * some minor bugfixes
by dgoette＠svn.reactos.org 24 Nov '08

24 Nov '08

Author: dgoette Date: Mon Nov 24 10:12:48 2008 New Revision: 37617 URL: http://svn.reactos.org/svn/reactos?rev=37617&view=rev Log: * implemented list of depencies * some minor bugfixes Modified: branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js 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_HTML.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/Log.class.php Modified: branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js [iso-8859-1] Mon Nov 24 10:12:48 2008 @@ -1061,6 +1061,10 @@ function bshowhistory(did, drid) { makeRequest('?page=data_out&d_f=text&d_u=mef&d_fl=showhistory&d_id='+did+'&d_r_id='+drid, 'mef', 'frmedittagsc2', 'html', 'GET', ''); + } + + function bshowdepencies(did, drid) { + makeRequest('?page=data_out&d_f=text&d_u=mef&d_fl=showdepencies&d_id='+did+'&d_r_id='+drid, 'mef', 'frmedittagsc2', 'html', 'GET', ''); } function balterfields(did, drid, dusr) { 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] Mon Nov 24 10:12:48 2008 @@ -504,7 +504,7 @@ $stmt->bindParam('id',$data_id,PDO::PARAM_INT); $stmt->execute(); - Log::writeMedium('data-name changed: '.$data['data_name'].' => '.$data_name.Log::prepareInfo($data_id, $rev_id).'{altersecurityfields}'); + Log::writeMedium('data-name changed: '.$data['data_name'].' => '.$data_name.Log::prepareInfo($data_id).'{altersecurityfields}'); if ($update_links == true) { if ($data_type == '') { @@ -558,7 +558,7 @@ } } // while - Log::writeMedium('data-interlinks updated due data-name change'.Log::prepareInfo($data_id, $rev_id).'{altersecurityfields}'); + Log::writeMedium('data-interlinks updated due data-name change'.Log::prepareInfo($data_id).'{altersecurityfields}'); } } // end data_name changes @@ -567,7 +567,7 @@ $stmt->bindParam('type_new',$data_type,PDO::PARAM_STR); $stmt->bindParam('data_id',$data_id,PDO::PARAM_INT); $stmt->execute(); - Log::writeMedium('data-type changed: '.$data['data_type'].' => '.$data_type.Log::prepareInfo($data_id, $rev_id).'{altersecurityfields}'); + Log::writeMedium('data-type changed: '.$data['data_type'].' => '.$data_type.Log::prepareInfo($data_id).'{altersecurityfields}'); } // end data_type changes if ($data_acl != '' && $data_acl != $data['data_acl']) { @@ -575,7 +575,7 @@ $stmt->bindParam('acl_new',$data_acl); $stmt->bindParam('data_id',$data_id); $stmt->execute(); - Log::writeMedium('data-acl changed: '.$data['data_acl'].' => '.$data_acl.Log::prepareInfo($data_id, $rev_id).'{altersecurityfields}'); + Log::writeMedium('data-acl changed: '.$data['data_acl'].' => '.$data_acl.Log::prepareInfo($data_id).'{altersecurityfields}'); } // end data_acl changes } // end of member function getCookieDomain 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] Mon Nov 24 10:12:48 2008 @@ -32,6 +32,7 @@ const HISTORY = 2; const SECURITY = 3; const ENTRY = 4; + const DEPENCIES= 5; // types of new entries const SINGLE = 0; @@ -104,6 +105,11 @@ $this->showEntryDetails(self::HISTORY); break; + // show Depencies + case 'showdepencies': + $this->showEntryDetails(self::DEPENCIES); + break; + // show Field details case 'alterfields': $this->showEntryDetails(self::FIELDS); @@ -616,7 +622,7 @@ else { echo '<span class="detailmenu" onclick="'."bshowtag(".$this->data_id.",".$this->rev_id.",'a','b', '".$thisuser->id()."')".'">Metadata</span>'; } - echo " | "; + echo ' | '; // History if ($mode == self::HISTORY) { @@ -625,10 +631,19 @@ else { echo '<span class="detailmenu" onclick="'."bshowhistory(".$this->data_id.",".$this->rev_id.",'a','b', '".$thisuser->id()."')".'">History</span>'; } + echo ' | '; + + // Depencies + if ($mode == self::DEPENCIES) { + echo '<strong>Depencies</strong>'; + } + else { + echo '<span class="detailmenu" onclick="'."bshowdepencies(".$this->data_id.",".$this->rev_id.", '".$thisuser->id()."')".'">Depencies</span>'; + } // allowed only for someone with "add" rights if (Security::hasRight($this->data_id, 'add')) { - echo " | "; + echo ' | '; // Fields if ($mode == self::FIELDS) { @@ -637,7 +652,7 @@ else { echo '<span class="detailmenu" onclick="'."balterfields(".$this->data_id.",".$this->rev_id.", '".$thisuser->id()."')".'">Fields</span>'; } - echo " | "; + echo ' | '; if ($mode == self::ENTRY) { echo '<strong>Entry</strong>'; @@ -649,8 +664,9 @@ // allowed only for related super administrators if ($thisuser->isMemberOfGroup('ros_sadmin') || (Security::hasRight($this->data_id, 'add') && $thisuser->isMemberOfGroup('ros_admin'))) { - echo " | "; - + echo ' | '; + + // Security if ($mode == self::SECURITY) { echo '<strong>Security</strong>'; } @@ -658,6 +674,7 @@ echo '<span class="detailmenu" onclick="'."bshowsecurity(".$this->data_id.",".$this->rev_id.", '".$thisuser->id()."')".'">Security</span>'; } } + echo_strip(' </div> </div>'); @@ -669,6 +686,9 @@ break; case self::HISTORY: $this->showEntryDetailsHistory(); + break; + case self::DEPENCIES: + $this->showEntryDepencies($this->data_id); break; case self::SECURITY: $this->showEntryDetailsSecurity(); @@ -814,6 +834,64 @@ echo '</ul>'; } + /** + * + * + * @access private + */ + private function showEntryDepencies( $data_id ) + { + $stmt=DBConnection::getInstance()->prepare("SELECT data_name,data_type FROM data_ WHERE data_id = :data_id LIMIT 1"); + $stmt->bindParam('data_id',$data_id,PDO::PARAM_INT); + $stmt->execute(); + $data = $stmt->fetchOnce(PDO::FETCH_ASSOC); + + // get Data type + switch ($data['data_type']) { + case 'template': + $type_short = 'templ'; + break; + case 'content': + $type_short = 'cont'; + break; + case 'script': + $type_short = 'inc'; + break; + default: + echo '----this should not happen.<br />'; + var_dump($data); + return; + break; + } + + echo_strip(' + <br /> + <div class="frmeditheadline">Data Depencies</div> + <br />'); + + // search for depencies + $stmt=DBConnection::getInstance()->prepare("SELECT d.data_name, d.data_type, r.data_id, r.rev_id, r.rev_language FROM data_ d JOIN data_revision r ON r.data_id = d.data_id JOIN data_text t ON r.rev_id = t.data_rev_id WHERE t.text_content LIKE :content_phrase AND r.rev_version > 0 ORDER BY r.rev_language, d.data_name, d.data_type"); + $stmt->bindValue('content_phrase','%[#'.$type_short.'_'.$data['data_name'].']%',PDO::PARAM_STR); + $stmt->execute(); + + $last_language = null; + + // handle Depencies + while ($depency = $stmt->fetch(PDO::FETCH_ASSOC)) { + if ($depency['rev_language'] != $last_language) { + if ($last_language !== null) { + echo '</ul>'; + } + + echo '<h3>'.$depency['rev_language'].'</h3><ul>'; + $last_language = $depency['rev_language']; + } + + echo '<li>'.$depency['data_name'].' ('.$depency['data_type'].')</li>'; + } + echo '</ul>'; + } + /** * @@ -863,7 +941,7 @@ <br /> <br /> <button type="button" id="beditsavefields" onclick="'."editsavesecuritychanges('".$this->data_id."','".$this->rev_id."')".'">Save Changes</button>   - <button type="button" id="beditclear" onclick="'."bshowsecurity(".$this->data_id.",".$this->rev_id.", '".$thisuser->id()."')".'">Clear</button>'); + <button type="button" id="beditclear" onclick="'."bshowsecurity(".$this->data_id.",".$this->rev_id.", '".ThisUser::getInstance()->id()."')".'">Clear</button>'); } @@ -931,7 +1009,7 @@ </span> <br /><br /><br /> <button type="button" id="beditsavefields" onclick="'."editsavefieldchanges('".$this->data_id."','".$this->rev_id."')".'">Save Changes</button>   - <button type="button" id="beditclear" onclick="'."balterfields(".$this->data_id.",".$this->rev_id.", '".$thisuser->id()."')".'">Clear</button>'); + <button type="button" id="beditclear" onclick="'."balterfields(".$this->data_id.",".$this->rev_id.", '".ThisUser::getInstance()->id()."')".'">Clear</button>'); } @@ -992,7 +1070,7 @@ <br /> <br /> <button type="button" id="beditsaveentry" onclick="editsaveentrychanges('.$this->data_id.','.$this->rev_id.')">Save Changes</button>   - <button type="button" id="beditclear" onclick="'."bshowentry(".$this->data_id.",".$this->rev_id.", '".$thisuser->id()."')".'">Clear</button>'); + <button type="button" id="beditclear" onclick="'."bshowentry(".$this->data_id.",".$this->rev_id.", '".ThisUser::getInstance()->id()."')".'">Clear</button>'); } Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Export_HTML.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_HTML.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Export_HTML.class.php [iso-8859-1] Mon Nov 24 10:12:48 2008 @@ -139,7 +139,7 @@ while ($lang = $stmt->fetch(PDO::FETCH_ASSOC)) { // display language - echo '<p><b><u>'.$lang['lang_name'].'</u></b></p>'; + echo '<h3 style="text-decoration:underlien;>'.$lang['lang_name'].'</h3>'; // switch sql statement by generation mode if ($mode == 'single') { @@ -193,11 +193,11 @@ $html_content = $this->processTextByName($page['data_name'], $lang['lang_id'], $content['dynamic_num'], 'output'); // write content to filename, if possible - $fh = @fopen($destination_folder.$file_name, "w"); - if ($fh!==false){ + $fh = @fopen($destination_folder.$file_name, 'w'); + if ($fh !== false){ flock($fh,2); fputs($fh,$html_content); - fputs($fh,"\n\n'); + fputs($fh,''); flock($fh,3); fclose($fh); @@ -317,7 +317,7 @@ $page = $results[1]; } - $this->processText($page['rev_id'], $output_type); + return $this->processText($page['rev_id'], $output_type); } @@ -399,7 +399,7 @@ $stmt->execute(); $user_name = $stmt->fetchColumn(); $content = str_replace('[#roscms_user]', $user_name, $content); // account that generate - $content = str_replace("[#roscms_inc_author]", $user_name, $content); // account that changed the include text + $content = str_replace('[#roscms_inc_author]', $user_name, $content); // account that changed the include text // page version $content = str_replace('[#roscms_page_version]', $page['rev_version'], $content); @@ -495,7 +495,7 @@ $page_link = $roscms_intern_webserver_roscms.'?page=data_out&d_f=page&d_u=show&d_val=index&d_val2='.$this->lang.'&d_val3='; } else { - $page_link = $roscms_intern_webserver_roscms."?page=data_out&d_f=page&d_u=show&d_val=".$page_name_with_num."&d_val2=".$this->lang."&d_val3=".$dynamic_num; + $page_link = $roscms_intern_webserver_roscms.'?page=data_out&d_f=page&d_u=show&d_val='.$page_name_with_num.'&d_val2='.$this->lang.'&d_val3='.$dynamic_num; } if ($mode == 'edit') { @@ -518,7 +518,7 @@ } // get page link - if ($g_link_page_name == '') { + if ($page_name == '') { $page_link = $roscms_intern_webserver_pages.$this->lang.'/404.html'; } else{ 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] Mon Nov 24 10:12:48 2008 @@ -42,7 +42,7 @@ * @return * @access public */ - public static function prepareInfo( $data_id, $rev_id ) + public static function prepareInfo( $data_id, $rev_id = 'unknown' ) { return ' [dataid: '.$data_id.'; revid: '.$rev_id.'; userid: '.ThisUser::getInstance()->id().'; security: '.Security::rightsOverview($data_id).'] '; } // end of member function prepare_info

1 0

[hyperion] 37616: modified ntoskrnl/ex/sysinfo.c MaxSystemInfoClass is now much larger than the size of the CallQS table: use the actual size of the table in range checks to prevent an overrun Fixes CID 527, CID 528
by hyperion＠svn.reactos.org 24 Nov '08

24 Nov '08

Author: hyperion Date: Mon Nov 24 07:47:44 2008 New Revision: 37616 URL: http://svn.reactos.org/svn/reactos?rev=37616&view=rev Log: modified ntoskrnl/ex/sysinfo.c MaxSystemInfoClass is now much larger than the size of the CallQS table: use the actual size of the table in range checks to prevent an overrun Fixes CID 527, CID 528 Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Mon Nov 24 07:47:44 2008 @@ -1794,6 +1794,9 @@ SI_QX(SystemSessionProcessesInformation) }; +C_ASSERT(SystemBasicInformation == 0); +#define MIN_SYSTEM_INFO_CLASS (SystemBasicInformation) +#define MAX_SYSTEM_INFO_CLASS (sizeof(CallQS) / sizeof(CallQS[0])) /* * @implemented @@ -1825,7 +1828,7 @@ /* * Check the request is valid. */ - if (SystemInformationClass >= MaxSystemInfoClass) + if (SystemInformationClass >= MAX_SYSTEM_INFO_CLASS) { _SEH2_YIELD(return STATUS_INVALID_INFO_CLASS); } @@ -1892,8 +1895,8 @@ /* * Check the request is valid. */ - if ( (SystemInformationClass >= SystemBasicInformation) - && (SystemInformationClass < MaxSystemInfoClass) + if ( (SystemInformationClass >= MIN_SYSTEM_INFO_CLASS) + && (SystemInformationClass < MAX_SYSTEM_INFO_CLASS) ) { if (NULL != CallQS [SystemInformationClass].Set)

1 0

[hyperion] 37615: Everything Migrate ntoskrnl to PSEH 2.0. The code should speak for itself modified ntoskrnl/ex/atom.c _SEH_LEAVE was used improperly in NtQueryInformationAtom. As a free bonus, the upgrade to PSEH 2.0 (and to _SEH2_LEAVE) fixes the potential bug modified ntoskrnl/fsrtl/fastio.c Corrected exception filter logic modified ntoskrnl/include/internal/ex.h Goodbye _SEH_ExSystemExceptionFilter, you won't be missed modified ntoskrnl/include/internal/ntoskrnl.h Don't FORCEINLINE function
by hyperion＠svn.reactos.org 24 Nov '08

24 Nov '08

Author: hyperion Date: Mon Nov 24 07:40:26 2008 New Revision: 37615 URL: http://svn.reactos.org/svn/reactos?rev=37615&view=rev Log: Everything Migrate ntoskrnl to PSEH 2.0. The code should speak for itself modified ntoskrnl/ex/atom.c _SEH_LEAVE was used improperly in NtQueryInformationAtom. As a free bonus, the upgrade to PSEH 2.0 (and to _SEH2_LEAVE) fixes the potential bug modified ntoskrnl/fsrtl/fastio.c Corrected exception filter logic modified ntoskrnl/include/internal/ex.h Goodbye _SEH_ExSystemExceptionFilter, you won't be missed modified ntoskrnl/include/internal/ntoskrnl.h Don't FORCEINLINE functions that use SEH, it's bad form and the compiler doesn't like modified ntoskrnl/ke/i386/usercall.c Dispatch the correct EXCEPTION_RECORD in case of exception inside KiInitializeUserApc modified ntoskrnl/ke/powerpc/exp.c Removed bogus, unused SEH code modified ntoskrnl/ntoskrnl-generic.rbuild Sources using PSEH 2.0 must be compiled with -fno-unit-at-a-time due to a GCC bug. See also http://gcc.gnu.org/bugzilla/show_bug.cgi?id=17982 and http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054 Apparently, -fno-unit-at-a-time makes GCC crash when using precompiled headers. Disable precompiled headers for ntoskrnl Modified: trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/config/ntapi.c trunk/reactos/ntoskrnl/dbgk/dbgkobj.c trunk/reactos/ntoskrnl/ex/atom.c trunk/reactos/ntoskrnl/ex/event.c trunk/reactos/ntoskrnl/ex/evtpair.c trunk/reactos/ntoskrnl/ex/harderr.c trunk/reactos/ntoskrnl/ex/locale.c trunk/reactos/ntoskrnl/ex/mutant.c trunk/reactos/ntoskrnl/ex/profile.c trunk/reactos/ntoskrnl/ex/sem.c trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/ex/time.c trunk/reactos/ntoskrnl/ex/timer.c trunk/reactos/ntoskrnl/ex/uuid.c trunk/reactos/ntoskrnl/fsrtl/fastio.c trunk/reactos/ntoskrnl/include/internal/ex.h trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h trunk/reactos/ntoskrnl/include/ntoskrnl.h trunk/reactos/ntoskrnl/io/iomgr/file.c trunk/reactos/ntoskrnl/io/iomgr/iocomp.c trunk/reactos/ntoskrnl/io/iomgr/iofunc.c trunk/reactos/ntoskrnl/io/iomgr/irp.c trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c trunk/reactos/ntoskrnl/ke/except.c trunk/reactos/ntoskrnl/ke/i386/exp.c trunk/reactos/ntoskrnl/ke/i386/usercall.c trunk/reactos/ntoskrnl/ke/powerpc/exp.c trunk/reactos/ntoskrnl/ke/thrdobj.c trunk/reactos/ntoskrnl/ke/wait.c trunk/reactos/ntoskrnl/lpc/reply.c trunk/reactos/ntoskrnl/lpc/send.c trunk/reactos/ntoskrnl/mm/anonmem.c trunk/reactos/ntoskrnl/mm/pagefile.c trunk/reactos/ntoskrnl/mm/pool.c trunk/reactos/ntoskrnl/mm/procsup.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/mm/sysldr.c trunk/reactos/ntoskrnl/mm/virtual.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild trunk/reactos/ntoskrnl/ob/obdir.c trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ob/oblink.c trunk/reactos/ntoskrnl/ob/obsecure.c trunk/reactos/ntoskrnl/ob/obwait.c trunk/reactos/ntoskrnl/ps/debug.c trunk/reactos/ntoskrnl/ps/job.c trunk/reactos/ntoskrnl/ps/process.c trunk/reactos/ntoskrnl/ps/query.c trunk/reactos/ntoskrnl/ps/security.c trunk/reactos/ntoskrnl/ps/state.c trunk/reactos/ntoskrnl/ps/thread.c trunk/reactos/ntoskrnl/ps/win32.c trunk/reactos/ntoskrnl/rtl/libsupp.c trunk/reactos/ntoskrnl/se/acl.c trunk/reactos/ntoskrnl/se/priv.c trunk/reactos/ntoskrnl/se/sd.c trunk/reactos/ntoskrnl/se/sid.c trunk/reactos/ntoskrnl/se/token.c trunk/reactos/ntoskrnl/vdm/vdmmain.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… Modified: trunk/reactos/ntoskrnl/dbgk/dbgkobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkobj.c?re… Modified: trunk/reactos/ntoskrnl/ex/atom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/atom.c?rev=376… Modified: trunk/reactos/ntoskrnl/ex/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/event.c?rev=37… Modified: trunk/reactos/ntoskrnl/ex/evtpair.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/evtpair.c?rev=… Modified: trunk/reactos/ntoskrnl/ex/harderr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/harderr.c?rev=… Modified: trunk/reactos/ntoskrnl/ex/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/locale.c?rev=3… Modified: trunk/reactos/ntoskrnl/ex/mutant.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/mutant.c?rev=3… Modified: trunk/reactos/ntoskrnl/ex/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/profile.c?rev=… Modified: trunk/reactos/ntoskrnl/ex/sem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sem.c?rev=3761… Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… Modified: trunk/reactos/ntoskrnl/ex/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/time.c?rev=376… Modified: trunk/reactos/ntoskrnl/ex/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/timer.c?rev=37… Modified: trunk/reactos/ntoskrnl/ex/uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/uuid.c?rev=376… Modified: trunk/reactos/ntoskrnl/fsrtl/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/fastio.c?re… Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/ntoskrnl.… Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… Modified: trunk/reactos/ntoskrnl/io/iomgr/iocomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iocomp.c… Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/plugpla… Modified: trunk/reactos/ntoskrnl/ke/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/except.c?rev=3… Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev… Modified: trunk/reactos/ntoskrnl/ke/i386/usercall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/usercall.… Modified: trunk/reactos/ntoskrnl/ke/powerpc/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/powerpc/exp.c?… Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdobj.c?rev=… Modified: trunk/reactos/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/wait.c?rev=376… Modified: trunk/reactos/ntoskrnl/lpc/reply.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/reply.c?rev=3… Modified: trunk/reactos/ntoskrnl/lpc/send.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/send.c?rev=37… Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… Modified: trunk/reactos/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pagefile.c?rev… Modified: trunk/reactos/ntoskrnl/mm/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pool.c?rev=376… Modified: trunk/reactos/ntoskrnl/mm/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/procsup.c?rev=… Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… Modified: trunk/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=3… Modified: trunk/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/virtual.c?rev=… Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… Modified: trunk/reactos/ntoskrnl/ob/obdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obdir.c?rev=37… Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=3… Modified: trunk/reactos/ntoskrnl/ob/oblink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblink.c?rev=3… Modified: trunk/reactos/ntoskrnl/ob/obsecure.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obsecure.c?rev… Modified: trunk/reactos/ntoskrnl/ob/obwait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obwait.c?rev=3… Modified: trunk/reactos/ntoskrnl/ps/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/debug.c?rev=37… Modified: trunk/reactos/ntoskrnl/ps/job.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/job.c?rev=3761… Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=37… Modified: trunk/reactos/ntoskrnl/ps/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/security.c?rev… Modified: trunk/reactos/ntoskrnl/ps/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/state.c?rev=37… Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=3… Modified: trunk/reactos/ntoskrnl/ps/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/win32.c?rev=37… Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… Modified: trunk/reactos/ntoskrnl/se/acl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/acl.c?rev=3761… Modified: trunk/reactos/ntoskrnl/se/priv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/priv.c?rev=376… Modified: trunk/reactos/ntoskrnl/se/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sd.c?rev=37615… Modified: trunk/reactos/ntoskrnl/se/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sid.c?rev=3761… Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=37… Modified: trunk/reactos/ntoskrnl/vdm/vdmmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/vdm/vdmmain.c?rev…

1 0

[hyperion] 37614: modified include/psdk/rpc.h Implemented RPC exception handling macros with PSEH 2.0 modified base/services/rpcss/rpcss.rbuild modified dll/win32/rpcrt4/rpcrt4.rbuild RPC proxy stubs now depend on pseh. We should really add pseh as a link dependency automatically in rbuild, but, eh modified tools/rbuild/backend/mingw/modulehandler.cpp Compile RPC proxy stubs with -fno-unit-at-a-time due to a GCC bug. See also http://gcc.gnu.org/bugzilla/show_bug.cgi?id=17982 and http://gcc.gnu.o
by hyperion＠svn.reactos.org 24 Nov '08

24 Nov '08

Author: hyperion Date: Mon Nov 24 07:05:40 2008 New Revision: 37614 URL: http://svn.reactos.org/svn/reactos?rev=37614&view=rev Log: modified include/psdk/rpc.h Implemented RPC exception handling macros with PSEH 2.0 modified base/services/rpcss/rpcss.rbuild modified dll/win32/rpcrt4/rpcrt4.rbuild RPC proxy stubs now depend on pseh. We should really add pseh as a link dependency automatically in rbuild, but, eh modified tools/rbuild/backend/mingw/modulehandler.cpp Compile RPC proxy stubs with -fno-unit-at-a-time due to a GCC bug. See also http://gcc.gnu.org/bugzilla/show_bug.cgi?id=17982 and http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054 Modified: trunk/reactos/base/services/rpcss/rpcss.rbuild trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild trunk/reactos/include/psdk/rpc.h trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/base/services/rpcss/rpcss.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/rpcss.… ============================================================================== --- trunk/reactos/base/services/rpcss/rpcss.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/rpcss.rbuild [iso-8859-1] Mon Nov 24 07:05:40 2008 @@ -9,6 +9,7 @@ <library>rpcrt4</library> <library>kernel32</library> <library>advapi32</library> + <library>pseh</library> <file>epmp.c</file> <file>irotp.c</file> <file>rpcss_main.c</file> Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.rb… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild [iso-8859-1] Mon Nov 24 07:05:40 2008 @@ -17,6 +17,7 @@ <library>iphlpapi</library> <library>ws2_32</library> <library>ntdll</library> + <library>pseh</library> <file>cproxy.c</file> <file>cpsf.c</file> <file>cstub.c</file> Modified: trunk/reactos/include/psdk/rpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpc.h?rev=376… ============================================================================== --- trunk/reactos/include/psdk/rpc.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/rpc.h [iso-8859-1] Mon Nov 24 07:05:40 2008 @@ -12,10 +12,7 @@ #endif #ifdef __GNUC__ - #ifndef _SEH_NO_NATIVE_NLG - /* FIXME ReactOS SEH support, we need remove this when gcc support native seh */ - #include <libs/pseh/pseh.h> - #endif +#include <pseh/pseh2.h> #endif #ifndef __RPC_H__ @@ -137,33 +134,14 @@ #define RpcExceptionCode() GetExceptionCode() #define RpcAbnormalTermination() AbnormalTermination() #else - /* FIXME ReactOS SEH support, we need remove this when gcc support native seh */ - - #ifdef _SEH_NO_NATIVE_NLG - /* hack for _SEH_NO_NATIVE_NLG */ - #define RpcTryExcept if (1) { - #define RpcExcept(expr) } else { - #define RpcEndExcept } - #define RpcTryFinally - #define RpcFinally - #define RpcEndFinally - #define RpcExceptionCode() 0 - #else - #define RpcTryExcept _SEH_TRY { - #define RpcExcept(expr) } _SEH_HANDLE { \ - if (expr) \ - { - #define RpcEndExcept } \ - } \ - _SEH_END; - - #define RpcTryFinally - #define RpcFinally - #define RpcEndFinally - #define RpcExceptionCode() _SEH_GetExceptionCode() - - /* #define RpcAbnormalTermination() abort() */ - #endif + #define RpcTryExcept _SEH2_TRY + #define RpcExcept(expr) _SEH2_EXCEPT((expr)) + #define RpcEndExcept _SEH2_END; + #define RpcTryFinally _SEH2_TRY + #define RpcFinally _SEH2_FINALLY + #define RpcEndFinally _SEH2_END; + #define RpcExceptionCode() _SEH2_GetExceptionCode() + #define RpcAbnormalTermination() (_SEH2_GetExceptionCode() != 0) #endif #endif Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Mon Nov 24 07:05:40 2008 @@ -1096,7 +1096,7 @@ "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h -s -S $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.c $(source)\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" - "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", + "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -fno-unit-at-a-time -c $<\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.o", @@ -1107,7 +1107,7 @@ "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h -c -C $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.c $(source)\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" - "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", + "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -fno-unit-at-a-time -c $<\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.o",

1 0

[fireball] 37613: - Fix most of the warnings in mkhive.
by fireball＠svn.reactos.org 24 Nov '08

24 Nov '08

Author: fireball Date: Mon Nov 24 07:01:56 2008 New Revision: 37613 URL: http://svn.reactos.org/svn/reactos?rev=37613&view=rev Log: - Fix most of the warnings in mkhive. Modified: trunk/reactos/tools/mkhive/cmi.c trunk/reactos/tools/mkhive/reginf.c trunk/reactos/tools/mkhive/registry.c Modified: trunk/reactos/tools/mkhive/cmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/cmi.c?rev=376… ============================================================================== --- trunk/reactos/tools/mkhive/cmi.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/cmi.c [iso-8859-1] Mon Nov 24 07:01:56 2008 @@ -622,7 +622,7 @@ NameLength = CmiGetPackedNameLength(ValueName, &Packable); - DPRINT("ValueName->Length %lu NameLength %lu\n", ValueName->Length, NameLength); + DPRINT("ValueName->Length %u NameLength %u\n", ValueName->Length, NameLength); *VBOffset = HvAllocateCell(&RegistryHive->Hive, sizeof(CM_KEY_VALUE) + NameLength, Storage, HCELL_NIL); if (*VBOffset == HCELL_NIL) Modified: trunk/reactos/tools/mkhive/reginf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/reginf.c?rev=… ============================================================================== --- trunk/reactos/tools/mkhive/reginf.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/reginf.c [iso-8859-1] Mon Nov 24 07:01:56 2008 @@ -158,7 +158,7 @@ ValueName, 0, REG_MULTI_SZ, - (PCHAR)Buffer, + (PUCHAR)Buffer, (ULONG)Total); } @@ -304,7 +304,7 @@ { ULONG dw = Str ? strtoul (Str, NULL, 0) : 0; - DPRINT("setting dword %s to %lx\n", ValueName, dw); + DPRINT("setting dword %s to %x\n", ValueName, dw); RegSetValueExA ( KeyHandle, @@ -343,7 +343,7 @@ } else /* get the binary data */ { - PCHAR Data = NULL; + PUCHAR Data = NULL; if (InfHostGetBinaryField (Context, 5, NULL, 0, &Size) != 0) Size = 0; @@ -354,8 +354,8 @@ if (Data == NULL) return FALSE; - DPRINT("setting binary data %s len %lu\n", ValueName, Size); - InfHostGetBinaryField (Context, 5, Data, (ULONG)Size, NULL); + DPRINT("setting binary data %s len %d\n", ValueName, Size); + InfHostGetBinaryField (Context, 5, Data, Size, NULL); } RegSetValueExA ( @@ -416,11 +416,11 @@ else { /* get flags */ - if (InfHostGetIntField (Context, 4, (PLONG)&Flags) != 0) + if (InfHostGetIntField (Context, 4, &Flags) != 0) Flags = 0; } - DPRINT("Flags: %lx\n", Flags); + DPRINT("Flags: 0x%x\n", Flags); if (Delete || (Flags & FLG_ADDREG_OVERWRITEONLY)) { Modified: trunk/reactos/tools/mkhive/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/registry.c?re… ============================================================================== --- trunk/reactos/tools/mkhive/registry.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/registry.c [iso-8859-1] Mon Nov 24 07:01:56 2008 @@ -384,7 +384,7 @@ if (cbData <= sizeof(HCELL_INDEX)) { /* If data size <= sizeof(HCELL_INDEX) then store data in the data offset */ - DPRINT("ValueCell->DataLength %lu\n", ValueCell->DataLength); + DPRINT("ValueCell->DataLength %u\n", ValueCell->DataLength); if (DataCell) HvFreeCell(&Key->RegistryHive->Hive, ValueCell->Data); @@ -401,12 +401,12 @@ * data block and allocate a new one. */ HCELL_INDEX NewOffset; - DPRINT("ValueCell->DataLength %lu\n", ValueCell->DataLength); + DPRINT("ValueCell->DataLength %u\n", ValueCell->DataLength); NewOffset = HvAllocateCell(&Key->RegistryHive->Hive, cbData, Stable, HCELL_NIL); if (NewOffset == HCELL_NIL) { - DPRINT("HvAllocateCell() failed with status 0x%08lx\n", Status); + DPRINT("HvAllocateCell() failed with status 0x%08x\n", Status); return ERROR_UNSUCCESSFUL; } @@ -427,7 +427,7 @@ HvMarkCellDirty(&Key->RegistryHive->Hive, Key->KeyCellOffset, FALSE); - DPRINT("Return status 0x%08lx\n", Status); + DPRINT("Return status 0x%08x\n", Status); return Status; } @@ -581,7 +581,7 @@ Status = CmiInitializeTempHive(HiveToConnect); if (!NT_SUCCESS(Status)) { - DPRINT1("CmiInitializeTempHive() failed with status 0x%08lx\n", Status); + DPRINT1("CmiInitializeTempHive() failed with status 0x%08x\n", Status); return FALSE; } @@ -599,29 +599,6 @@ return TRUE; } -static BOOL -MyExportBinaryHive (PCHAR FileName, - PCMHIVE RootHive) -{ - FILE *File; - BOOL ret; - - /* Create new hive file */ - File = fopen (FileName, "w+b"); - if (File == NULL) - { - printf(" Error creating/opening file\n"); - return FALSE; - } - - fseek (File, 0, SEEK_SET); - - RootHive->FileHandles[HFILE_TYPE_PRIMARY] = (HANDLE)File; - ret = HvWriteHive(&RootHive->Hive); - fclose (File); - return ret; -} - LIST_ENTRY CmiHiveListHead; VOID @@ -636,7 +613,7 @@ Status = CmiInitializeTempHive(&RootHive); if (!NT_SUCCESS(Status)) { - DPRINT1("CmiInitializeTempHive() failed with status 0x%08lx\n", Status); + DPRINT1("CmiInitializeTempHive() failed with status 0x%08x\n", Status); return; }

1 0

[hyperion] 37612: modified dll/directx/ddraw/rosdraw.h modified dll/win32/advapi32/advapi32.h modified dll/win32/gdi32/include/precomp.h modified dll/win32/setupapi/setupapi_private.h Explicitly include pseh/pseh.h, don't rely on <windows.h> including it through <rpc.h>
by hyperion＠svn.reactos.org 24 Nov '08

24 Nov '08

Author: hyperion Date: Mon Nov 24 07:00:20 2008 New Revision: 37612 URL: http://svn.reactos.org/svn/reactos?rev=37612&view=rev Log: modified dll/directx/ddraw/rosdraw.h modified dll/win32/advapi32/advapi32.h modified dll/win32/gdi32/include/precomp.h modified dll/win32/setupapi/setupapi_private.h Explicitly include pseh/pseh.h, don't rely on <windows.h> including it through <rpc.h> Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h trunk/reactos/dll/win32/advapi32/advapi32.h trunk/reactos/dll/win32/gdi32/include/precomp.h trunk/reactos/dll/win32/setupapi/setupapi_private.h Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h [iso-8859-1] Mon Nov 24 07:00:20 2008 @@ -8,6 +8,8 @@ #include <ddrawi.h> #include <d3dhal.h> #include <ddrawgdi.h> + +#include <pseh/pseh.h> #include "Ddraw/ddraw.h" #include "Surface/surface.h" Modified: trunk/reactos/dll/win32/advapi32/advapi32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.h [iso-8859-1] Mon Nov 24 07:00:20 2008 @@ -24,6 +24,8 @@ #include <sddl.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> + +#include <pseh/pseh.h> /* this has to go after the NDK when being used with the NDK */ #include <ntsecapi.h> Modified: trunk/reactos/dll/win32/gdi32/include/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/include/pr… ============================================================================== --- trunk/reactos/dll/win32/gdi32/include/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/include/precomp.h [iso-8859-1] Mon Nov 24 07:00:20 2008 @@ -20,6 +20,8 @@ #include <d3dnthal.h> #include <prntfont.h> +#include <pseh/pseh.h> + /* Public Win32K Headers */ #include <win32k/ntgdityp.h> #include <ntgdi.h> Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi_private.h [iso-8859-1] Mon Nov 24 07:00:20 2008 @@ -41,6 +41,8 @@ #include <wine/unicode.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> + +#include <pseh/pseh.h> #include <pnp_c.h> #include "rpc_private.h"

1 0

[sginsberg] 37611: - Fix build
by sginsberg＠svn.reactos.org 24 Nov '08

24 Nov '08

Author: sginsberg Date: Mon Nov 24 06:30:53 2008 New Revision: 37611 URL: http://svn.reactos.org/svn/reactos?rev=37611&view=rev Log: - Fix build Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.c Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] Mon Nov 24 06:30:53 2008 @@ -3192,7 +3192,9 @@ case IOCTL_CDROM_READ_Q_CHANNEL: { PSUB_Q_CHANNEL_DATA userChannelData = realIrp->AssociatedIrp.SystemBuffer; +#if DBG PCDROM_SUB_Q_DATA_FORMAT inputBuffer = realIrp->AssociatedIrp.SystemBuffer; +#endif PSUB_Q_CHANNEL_DATA subQPtr = srb->DataBuffer; #if DBG

1 0

[fireball] 37610: - Get rid of warnings.
by fireball＠svn.reactos.org 24 Nov '08

24 Nov '08

Author: fireball Date: Mon Nov 24 06:22:09 2008 New Revision: 37610 URL: http://svn.reactos.org/svn/reactos?rev=37610&view=rev Log: - Get rid of warnings. Modified: trunk/reactos/base/applications/network/ftp/cmds.c trunk/reactos/base/applications/network/ftp/ftp.c trunk/reactos/base/applications/network/ftp/ftp.rbuild trunk/reactos/base/applications/network/ftp/prototypes.h trunk/reactos/base/applications/network/ftp/ruserpass.c Modified: trunk/reactos/base/applications/network/ftp/cmds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/cmds.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/cmds.c [iso-8859-1] Mon Nov 24 06:22:09 2008 @@ -48,7 +48,6 @@ extern char *globerr; extern char home[]; extern char *remglob(); -extern char *getenv(); extern int allbinary; extern off_t restart_point; extern char reply_string[]; @@ -2195,7 +2194,6 @@ int argc; char *argv[]; { - extern long atol(); if (argc != 2) printf("restart: offset not specified\n"); else { Modified: trunk/reactos/base/applications/network/ftp/ftp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/ftp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/ftp.c [iso-8859-1] Mon Nov 24 06:22:09 2008 @@ -461,7 +461,7 @@ { FILE *fin; int dout = 0; - int (*closefunc)(), _pclose(), fclose(); + int (*closefunc)(); sig_t (*oldintr)(), (*oldintp)(); char buf[BUFSIZ], *bufp; long bytes = 0, hashbytes = HASHBYTES; @@ -735,7 +735,7 @@ { FILE *fout = stdout; int din = 0; - int (*closefunc)(), _pclose(), fclose(); + int (*closefunc)(); void (*oldintr)(int), (*oldintp)(int); int oldverbose = 0, oldtype = 0, is_retr, tcrflag, nfnd, bare_lfs = 0; char msg; @@ -748,7 +748,6 @@ register int c, d; struct timeval start, stop; // struct stat st; - extern void *malloc(); is_retr = strcmp(cmd, "RETR") == 0; if (is_retr && verbose && printnames) { Modified: trunk/reactos/base/applications/network/ftp/ftp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/ftp.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/ftp.rbuild [iso-8859-1] Mon Nov 24 06:22:09 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="ftp" type="win32cui" installbase="system32" installname="ftp.exe" allowwarnings="true"> +<module name="ftp" type="win32cui" installbase="system32" installname="ftp.exe"> <include base="ftp">.</include> <define name="lint" /> <library>kernel32</library> Modified: trunk/reactos/base/applications/network/ftp/prototypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/prototypes.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/prototypes.h [iso-8859-1] Mon Nov 24 06:22:09 2008 @@ -44,8 +44,6 @@ int sleep(int time); char *tail(); -int errno; -char *mktemp(); void setbell(), setdebug(); void setglob(), sethash(), setport(); void setprompt(); Modified: trunk/reactos/base/applications/network/ftp/ruserpass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/ruserpass.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/ruserpass.c [iso-8859-1] Mon Nov 24 06:22:09 2008 @@ -29,9 +29,6 @@ #include "prototypes.h" #include <winsock.h> -char *renvlook(), *index(), *getenv(), *getpass(), *getlogin(); -void *malloc(); -char *strcpy(); struct utmp *getutmp(); static FILE *cfile; @@ -73,7 +70,6 @@ char myname[MAXHOSTNAMELEN]; int t, i, c, usedefault = 0; struct stat stb; - extern int errno; hdir = getenv("HOME"); if (hdir == NULL)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs