Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 34155: - fix a buffer overflow leading to disapperance of file type text - introduced in rev 34133
by janderwald＠svn.reactos.org 28 Jun '08

28 Jun '08

Author: janderwald Date: Sat Jun 28 08:40:00 2008 New Revision: 34155 URL: http://svn.reactos.org/svn/reactos?rev=34155&view=rev Log: - fix a buffer overflow leading to disapperance of file type text - introduced in rev 34133 Modified: trunk/reactos/dll/win32/shell32/fprop.c Modified: trunk/reactos/dll/win32/shell32/fprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/fprop.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/fprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/fprop.c [iso-8859-1] Sat Jun 28 08:40:00 2008 @@ -164,15 +164,15 @@ LPVOID pResource = NULL; HGLOBAL hGlobal; HANDLE hLibrary; - Offset = wcsrchr(name, L','); if (Offset) { IconIndex = _wtoi(Offset + 2); *Offset = L'\0'; + name[MAX_PATH-1] = L'\0'; if (ExpandEnvironmentStringsW(name, szBuffer, MAX_PATH)) { - szBuffer[MAX_PATH] = L'\0'; + szBuffer[MAX_PATH-1] = L'\0'; hLibrary = LoadLibraryExW(szBuffer, NULL, LOAD_LIBRARY_AS_DATAFILE); if (hLibrary) {

1 0

[hpoussin] 34154: Set callbacks sooner, as they may be called during InitializeHandler Patch by Michael Martin, martinmnet at hotmail com See issue #3355 for more details.
by hpoussin＠svn.reactos.org 28 Jun '08

28 Jun '08

Author: hpoussin Date: Sat Jun 28 08:36:48 2008 New Revision: 34154 URL: http://svn.reactos.org/svn/reactos?rev=34154&view=rev Log: Set callbacks sooner, as they may be called during InitializeHandler Patch by Michael Martin, martinmnet at hotmail com See issue #3355 for more details. Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sat Jun 28 08:36:48 2008 @@ -1418,27 +1418,7 @@ } NdisCloseConfiguration(ConfigHandle); - /* - * Call MiniportInitialize. - */ - - NDIS_DbgPrint(MID_TRACE, ("calling MiniportInitialize\n")); - NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.InitializeHandler)( - &OpenErrorStatus, &SelectedMediumIndex, &MediaArray[0], - MEDIA_ARRAY_SIZE, Adapter, (NDIS_HANDLE)&WrapperContext); - - ZwClose(WrapperContext.RegistryHandle); - - if (NdisStatus != NDIS_STATUS_SUCCESS || - SelectedMediumIndex >= MEDIA_ARRAY_SIZE) - { - NDIS_DbgPrint(MIN_TRACE, ("MiniportInitialize() failed for an adapter.\n")); - ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); - return (NTSTATUS)NdisStatus; - } - /* Set handlers (some NDIS macros require these) */ - Adapter->NdisMiniportBlock.EthRxCompleteHandler = EthFilterDprIndicateReceiveComplete; Adapter->NdisMiniportBlock.EthRxIndicateHandler = EthFilterDprIndicateReceive; Adapter->NdisMiniportBlock.SendCompleteHandler = MiniSendComplete; @@ -1448,6 +1428,25 @@ Adapter->NdisMiniportBlock.PacketIndicateHandler= MiniIndicateReceivePacket; Adapter->NdisMiniportBlock.StatusHandler = MiniStatus; Adapter->NdisMiniportBlock.StatusCompleteHandler= MiniStatusComplete; + + /* + * Call MiniportInitialize. + */ + + NDIS_DbgPrint(MID_TRACE, ("calling MiniportInitialize\n")); + NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.InitializeHandler)( + &OpenErrorStatus, &SelectedMediumIndex, &MediaArray[0], + MEDIA_ARRAY_SIZE, Adapter, (NDIS_HANDLE)&WrapperContext); + + ZwClose(WrapperContext.RegistryHandle); + + if (NdisStatus != NDIS_STATUS_SUCCESS || + SelectedMediumIndex >= MEDIA_ARRAY_SIZE) + { + NDIS_DbgPrint(MIN_TRACE, ("MiniportInitialize() failed for an adapter.\n")); + ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); + return (NTSTATUS)NdisStatus; + } Adapter->NdisMiniportBlock.MediaType = MediaArray[SelectedMediumIndex];

1 0

[hpoussin] 34153: Allow '-' character in computer name See issue #3304 for more details.
by hpoussin＠svn.reactos.org 28 Jun '08

28 Jun '08

Author: hpoussin Date: Sat Jun 28 08:19:18 2008 New Revision: 34153 URL: http://svn.reactos.org/svn/reactos?rev=34153&view=rev Log: Allow '-' character in computer name See issue #3304 for more details. Modified: trunk/reactos/dll/win32/kernel32/misc/computername.c Modified: trunk/reactos/dll/win32/kernel32/misc/computername.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/computername.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/computername.c [iso-8859-1] Sat Jun 28 08:19:18 2008 @@ -310,7 +310,6 @@ *p == L')' || *p == L'(' || *p == L'.' || - *p == L'-' || *p == L'_' || *p == L'{' || *p == L'}' ||

1 0

[janderwald] 34152: - only display filename in the title for the file property dialog - pass the stripped filename to SH_FileVersionDlgProc - fix identation - fix bug 3401
by janderwald＠svn.reactos.org 28 Jun '08

28 Jun '08

Author: janderwald Date: Sat Jun 28 08:15:16 2008 New Revision: 34152 URL: http://svn.reactos.org/svn/reactos?rev=34152&view=rev Log: - only display filename in the title for the file property dialog - pass the stripped filename to SH_FileVersionDlgProc - fix identation - fix bug 3401 Modified: trunk/reactos/dll/win32/shell32/fprop.c Modified: trunk/reactos/dll/win32/shell32/fprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/fprop.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/fprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/fprop.c [iso-8859-1] Sat Jun 28 08:15:16 2008 @@ -667,8 +667,9 @@ HPROPSHEETPAGE hppages[MAX_PROPERTY_SHEET_PAGE]; HPROPSHEETPAGE hpage; WCHAR wFileName[MAX_PATH]; - UINT num_pages = 0; - DWORD dwHandle = 0; + UINT num_pages = 0; + DWORD dwHandle = 0; + WCHAR * pFileName; TRACE("SH_ShowPropertiesDialog entered filename %s\n", debugstr_w(lpf)); @@ -690,10 +691,10 @@ *dst = '\0'; } - else - { - strcpyW(wFileName, lpf); - } + else + { + strcpyW(wFileName, lpf); + } if (PathIsDirectoryW(wFileName) || strlenW(wFileName) == 3) { @@ -708,19 +709,27 @@ hppages[num_pages] = hpage; num_pages++; if ( GetFileVersionInfoSizeW(lpf, &dwHandle) ) - { - if ( (hpage = SH_CreatePropertySheetPage("SHELL_FILE_VERSION_DLG",SH_FileVersionDlgProc, (LPARAM)lpf, NULL))!= NULL) - { - hppages[num_pages] = hpage; - num_pages++; - } - } + { + if ( (hpage = SH_CreatePropertySheetPage("SHELL_FILE_VERSION_DLG",SH_FileVersionDlgProc, (LPARAM)wFileName, NULL))!= NULL) + { + hppages[num_pages] = hpage; + num_pages++; + } + } + + pFileName = wcsrchr(wFileName, '\\'); + if (!pFileName) + pFileName = wFileName; + else + pFileName++; + + memset(&pinfo, 0x0, sizeof(PROPSHEETHEADERW)); pinfo.dwSize = sizeof(PROPSHEETHEADERW); pinfo.dwFlags = PSH_NOCONTEXTHELP | PSH_PROPTITLE; pinfo.nPages = num_pages; pinfo.u3.phpage = hppages; - pinfo.pszCaption = wFileName; + pinfo.pszCaption = pFileName; return (PropertySheetW(&pinfo) != -1); } /*EOF */

1 0

[janderwald] 34151: - enable/disable edit field when checkbox is (de)-selected - initialize range control - use ES_NUMBER style for edit text - recovery options handling is not yet implemented - the resource for czech, denmark, hungary, japan, netherlands, sweden must be manually synced - fixes bug 3390
by janderwald＠svn.reactos.org 28 Jun '08

28 Jun '08

Author: janderwald Date: Sat Jun 28 07:48:06 2008 New Revision: 34151 URL: http://svn.reactos.org/svn/reactos?rev=34151&view=rev Log: - enable/disable edit field when checkbox is (de)-selected - initialize range control - use ES_NUMBER style for edit text - recovery options handling is not yet implemented - the resource for czech, denmark, hungary, japan, netherlands, sweden must be manually synced - fixes bug 3390 Modified: trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc trunk/reactos/dll/cpl/sysdm/lang/en-US.rc trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc trunk/reactos/dll/cpl/sysdm/startrec.c Modified: trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/bg-BG.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc [iso-8859-1] Sat Jun 28 07:48:06 2008 @@ -143,11 +143,11 @@ LTEXT "Ïîäðàçáèðàíà ðàáîòíà &ñèñòåìà", IDC_STATIC, 14, 26, 160, 8 COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST AUTOCHECKBOX "Ïîêàçâàíå íà ñïèñúêà ñ &ðàáîòíè ñèñòåìè:", IDC_STRECLIST, 14, 56, 165, 8 - EDITTEXT IDC_STRRECLISTEDIT, 179, 54, 30, 12 + EDITTEXT IDC_STRRECLISTEDIT, 179, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "ñåêóíäè", IDC_STATIC, 215, 56, 25, 8 AUTOCHECKBOX "Ïîêàçâàíå èçáîðíèê çà &âúçñòàíîâÿâàíå:", IDC_STRRECREC, 14, 70, 165, 8 - EDITTEXT IDC_STRRECRECEDIT, 179, 68, 30, 12 + EDITTEXT IDC_STRRECRECEDIT, 179, 68, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECRECUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "ñåêóíäè", IDC_STATIC, 215, 70, 25, 8 LTEXT "Çà äà îáðàáîòèòå ðú÷íî ôàéëà ñ ïóñêîâèòå íàñòðîéêè, íàòèñíåòå Îáðàáîòêà.", IDC_STATIC, 14, 87, 187, 16 Modified: trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] Sat Jun 28 07:48:06 2008 @@ -150,11 +150,11 @@ LTEXT "Standard Betriebs&system:", IDC_STATIC, 14, 26, 100, 8 COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST AUTOCHECKBOX "&Anzeigedauer der Betriebssystem-Liste:", IDC_STRECLIST, 14, 56, 150, 8 - EDITTEXT IDC_STRRECLISTEDIT, 185, 54, 30, 12 + EDITTEXT IDC_STRRECLISTEDIT, 185, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "Sek.", IDC_STATIC, 221, 56, 14, 8 AUTOCHECKBOX "Anze&igedauer der Wiederherstellungs-Optionen:", IDC_STRRECREC, 14, 70, 165, 8 - EDITTEXT IDC_STRRECRECEDIT, 185, 68, 30, 12 + EDITTEXT IDC_STRRECRECEDIT, 185, 68, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECRECUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "Sek.", IDC_STATIC, 221, 70, 14, 8 LTEXT "Um die Start-Optionen manuell zu bearbeiten, klicken Sie auf ""Bearbeiten"".", IDC_STATIC, 14, 84, 170, 18 Modified: trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/el-GR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc [iso-8859-1] Sat Jun 28 07:48:06 2008 @@ -145,11 +145,11 @@ COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST //CHECKBOX "&Time to display list of operating systems:", IDC_STRECLIST, 14, 56, 150, 8 CONTROL "ÄéÜñêåéá ðñïâï&ëÞò ëßóôáò :", IDC_STRECLIST, "button", BS_AUTOCHECKBOX, 14, 56, 150, 8 - EDITTEXT IDC_STRRECLISTEDIT, 179, 54, 30, 12 + EDITTEXT IDC_STRRECLISTEDIT, 179, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "äåõô.", IDC_STATIC, 215, 56, 25, 8 CONTROL "ÄéÜñêåéá ðñï&âïëÞò åðéëïãþí áðïêáôÜóôáóçò:", IDC_STRRECREC, "button", BS_AUTOCHECKBOX, 14, 70, 163, 8 - EDITTEXT IDC_STRRECRECEDIT, 179, 68, 30, 12 + EDITTEXT IDC_STRRECRECEDIT, 179, 68, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECRECUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "äåõô.", IDC_STATIC, 215, 70, 25, 8 LTEXT "Ãéá ìç áõôüìáôç åðåîåñãáóßá ôùí åðéëïãþí åêêßíçóçò, êÜíôå êëéê óôï êïõìðß Åðåîåñãáóßá.", IDC_STATIC, 14, 89, 187, 8 Modified: trunk/reactos/dll/cpl/sysdm/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] Sat Jun 28 07:48:06 2008 @@ -142,11 +142,11 @@ LTEXT "Default operating &system:", IDC_STATIC, 14, 26, 100, 8 COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST AUTOCHECKBOX "&Time to display list of operating systems:", IDC_STRECLIST, 14, 56, 160, 8 - EDITTEXT IDC_STRRECLISTEDIT, 185, 54, 30, 12 + EDITTEXT IDC_STRRECLISTEDIT, 185, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "sec.", IDC_STATIC, 223, 56, 18, 8 AUTOCHECKBOX "Time to &display recovery options when needed:", IDC_STRRECREC, 14, 70, 170, 8 - EDITTEXT IDC_STRRECRECEDIT, 185, 68, 30, 12 + EDITTEXT IDC_STRRECRECEDIT, 185, 68, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECRECUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "sec.", IDC_STATIC, 223, 70, 18, 8 LTEXT "To edit the startup options file manually, click Edit.", IDC_STATIC, 14, 89, 187, 8 Modified: trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/es-ES.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc [iso-8859-1] Sat Jun 28 07:48:06 2008 @@ -147,11 +147,11 @@ LTEXT "&Sistema operativo predeterminado:", IDC_STATIC, 14, 26, 100, 8 COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST AUTOCHECKBOX "&Mostrar la lista de sistemas operativos durante:", IDC_STRECLIST, 14, 56, 165, 8 - EDITTEXT IDC_STRRECLISTEDIT, 180, 54, 29, 12 + EDITTEXT IDC_STRRECLISTEDIT, 180, 54, 29, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "segundos", IDC_STATIC, 210, 56, 30, 8 AUTOCHECKBOX "&Tiempo para mostrar opciones de recuperación:", IDC_STRRECREC, 14, 70, 165, 8 - EDITTEXT IDC_STRRECRECEDIT, 180, 68, 29, 12 + EDITTEXT IDC_STRRECRECEDIT, 180, 68, 29, 12, ES_NUMBER CONTROL "", IDC_STRRECRECUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "segundos", IDC_STATIC, 210, 70, 30, 8 LTEXT "Para editar manualmente el archivo de opciones de inicio, haga clic en Editar.", IDC_STATIC, 14, 84, 187, 17 Modified: trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc [iso-8859-1] Sat Jun 28 07:48:06 2008 @@ -145,11 +145,11 @@ LTEXT "Système d'exploitation par défaut :", IDC_STATIC, 14, 26, 110, 8 COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST AUTOCHECKBOX "&Affiche la liste des systèmes pendant :", IDC_STRECLIST, 14, 56, 150, 8 - EDITTEXT IDC_STRRECLISTEDIT, 179, 54, 30, 12 + EDITTEXT IDC_STRRECLISTEDIT, 179, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "secondes", IDC_STATIC, 210, 56, 30, 8 AUTOCHECKBOX "Affiche les options de récupération pendant :", IDC_STRRECREC, 14, 70, 163, 8 - EDITTEXT IDC_STRRECRECEDIT, 179, 68, 30, 12 + EDITTEXT IDC_STRRECRECEDIT, 179, 68, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECRECUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "secondes", IDC_STATIC, 210, 70, 30, 8 LTEXT "Pour éditer le fichier d'options de démarrage manuellement, cliquer sur Éditer.", IDC_STATIC, 14, 85, 187, 18 Modified: trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/id-ID.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc [iso-8859-1] Sat Jun 28 07:48:06 2008 @@ -142,11 +142,11 @@ LTEXT "Default operating &system:", IDC_STATIC, 14, 26, 100, 8 COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST AUTOCHECKBOX "&Time to display list of operating systems:", IDC_STRECLIST, 14, 56, 150, 8 - EDITTEXT IDC_STRRECLISTEDIT, 179, 54, 30, 12 + EDITTEXT IDC_STRRECLISTEDIT, 179, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "seconds", IDC_STATIC, 215, 56, 25, 8 AUTOCHECKBOX "Time to &display recovery options when needed:", IDC_STRRECREC, 14, 70, 163, 8 - EDITTEXT IDC_STRRECRECEDIT, 179, 68, 30, 12 + EDITTEXT IDC_STRRECRECEDIT, 179, 68, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECRECUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "seconds", IDC_STATIC, 215, 70, 25, 8 LTEXT "To edit the startup options file manually, click Edit.", IDC_STATIC, 14, 89, 187, 8 Modified: trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] Sat Jun 28 07:48:06 2008 @@ -142,11 +142,11 @@ LTEXT "Sistema operativo predefinito:", IDC_STATIC, 14, 26, 100, 8 COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST AUTOCHECKBOX "&Tempo per la visualizzazione dell'elenco dei sistemi operativi:", IDC_STRECLIST, 14, 56, 150, 8 - EDITTEXT IDC_STRRECLISTEDIT, 179, 54, 30, 12 + EDITTEXT IDC_STRRECLISTEDIT, 179, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "secondi", IDC_STATIC, 215, 56, 25, 8 AUTOCHECKBOX "Tempo per la visualizzazione delle opzioni di recupero disponibili quando è necessario:", IDC_STRRECREC, 14, 70, 163, 8 - EDITTEXT IDC_STRRECRECEDIT, 179, 68, 30, 12 + EDITTEXT IDC_STRRECRECEDIT, 179, 68, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECRECUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "secondi", IDC_STATIC, 215, 70, 25, 8 LTEXT "Per modificare le opzioni di avvio manualmenta , clicca Modifica.", IDC_STATIC, 14, 89, 187, 8 Modified: trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/pl-PL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc [iso-8859-1] Sat Jun 28 07:48:06 2008 @@ -147,11 +147,11 @@ LTEXT "&Domylny system operacyjny:", IDC_STATIC, 14, 26, 100, 8 COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST AUTOCHECKBOX "&Czas wywietlania listy systemów operacyjnych:", IDC_STRECLIST, 14, 56, 150, 8 - EDITTEXT IDC_STRRECLISTEDIT, 179, 54, 30, 12 + EDITTEXT IDC_STRRECLISTEDIT, 179, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "s", IDC_STATIC, 215, 56, 25, 8 AUTOCHECKBOX "Czas wywietlania w razie potrzeby &opcji odzyskiwania:", IDC_STRRECREC, 14, 70, 163, 8 - EDITTEXT IDC_STRRECRECEDIT, 179, 68, 30, 12 + EDITTEXT IDC_STRRECRECEDIT, 179, 68, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECRECUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "s", IDC_STATIC, 215, 70, 25, 8 LTEXT "Aby rêcznie edytowaæ plik opcji autostartu, kliknij przycisk Edytuj.", IDC_STATIC, 14, 89, 187, 8 Modified: trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] Sat Jun 28 07:48:06 2008 @@ -142,11 +142,11 @@ LTEXT "Îïåðàöèîííàÿ ñèñòåìà ïî óìîë÷àíèþ:", IDC_STATIC, 14, 26, 145, 8 COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST AUTOCHECKBOX "Î&òîáðàæàòü ñïèñîê îïåðàöèîííûõ ñèñòåì:", IDC_STRECLIST, 14, 56, 161, 8 - EDITTEXT IDC_STRRECLISTEDIT, 179, 54, 30, 12 + EDITTEXT IDC_STRRECLISTEDIT, 179, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "ñåêóíä", IDC_STATIC, 213, 56, 25, 8 AUTOCHECKBOX "Îòîáðàæàòü &âàðèàíòû âîñòàíîâëåíèÿ:", IDC_STRRECREC, 14, 70, 163, 8 - EDITTEXT IDC_STRRECRECEDIT, 179, 68, 30, 12 + EDITTEXT IDC_STRRECRECEDIT, 179, 68, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECRECUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "ñåêóíä", IDC_STATIC, 213, 70, 25, 8 LTEXT "Äëÿ ðåäàêòèð. âðó÷íóþ íàæìèòå ""Èçìåíèòü""", IDC_STATIC, 14, 90, 187, 8 Modified: trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sk-SK.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc [iso-8859-1] Sat Jun 28 07:48:06 2008 @@ -149,11 +149,11 @@ LTEXT "Predvolený operaèný &systém:", IDC_STATIC, 14, 26, 100, 8 COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST AUTOCHECKBOX "&Zobrazi zoznam operaèných systémov na:", IDC_STRECLIST, 14, 56, 150, 8 - EDITTEXT IDC_STRRECLISTEDIT, 179, 54, 30, 12 + EDITTEXT IDC_STRRECLISTEDIT, 179, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "sekúnd", IDC_STATIC, 215, 56, 25, 8 AUTOCHECKBOX "Ak sú &potrebné monosti obnovenia, zobrazi ich na:", IDC_STRRECREC, 14, 70, 163, 8 - EDITTEXT IDC_STRRECRECEDIT, 179, 68, 30, 12 + EDITTEXT IDC_STRRECRECEDIT, 179, 68, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECRECUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "sekúnd", IDC_STATIC, 215, 70, 25, 8 LTEXT "Ak chcete manuálne upravi súbor s monosami spustenia systému, kliknite na tlaèidlo Upravi.", IDC_STATIC, 14, 89, 187, 8 Modified: trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc [iso-8859-1] Sat Jun 28 07:48:06 2008 @@ -150,11 +150,11 @@ LTEXT "&Îïåðàö³éíà ñèñòåìà çà çàìîâ÷óâàííÿì:", IDC_STATIC, 14, 26, 100, 8 COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST AUTOCHECKBOX "&Ïîêàçóâàòè ñïèñîê îïåðàö³éíèõ ñèñòåì:", IDC_STRECLIST, 14, 56, 150, 8 - EDITTEXT IDC_STRRECLISTEDIT, 179, 54, 30, 12 + EDITTEXT IDC_STRRECLISTEDIT, 179, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "ñåê", IDC_STATIC, 215, 56, 25, 8 AUTOCHECKBOX "Ïî&êàçóâàòè âàð³àíòè â³äíîâëåííÿ:", IDC_STRRECREC, 14, 70, 163, 8 - EDITTEXT IDC_STRRECRECEDIT, 179, 68, 30, 12 + EDITTEXT IDC_STRRECRECEDIT, 179, 68, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECRECUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "ñåê", IDC_STATIC, 215, 70, 25, 8 LTEXT "Â³äðåäàãóâàòè ñïèñîê çàâàíòàæåííÿ âðó÷íó.", IDC_STATIC, 14, 89, 187, 8 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] Sat Jun 28 07:48:06 2008 @@ -26,14 +26,34 @@ if (Timeout == 0) { EnableWindow(GetDlgItem(hwndDlg, IDC_STRRECLISTUPDWN), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_STRRECLISTEDIT), FALSE); } else { EnableWindow(GetDlgItem(hwndDlg, IDC_STRRECLISTUPDWN), TRUE); - } - + EnableWindow(GetDlgItem(hwndDlg, IDC_STRRECLISTEDIT), TRUE); + } + SendDlgItemMessage(hwndDlg, IDC_STRRECLISTUPDWN, UDM_SETRANGE, (WPARAM) 0, (LPARAM) MAKELONG((short) 999, 0)); SendDlgItemMessage(hwndDlg, IDC_STRRECLISTUPDWN, UDM_SETPOS, (WPARAM) 0, (LPARAM) MAKELONG((short) Timeout, 0)); } + +static VOID +SetRecoveryTimeout(HWND hwndDlg, INT Timeout) +{ + if (Timeout == 0) + { + EnableWindow(GetDlgItem(hwndDlg, IDC_STRRECRECUPDWN), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_STRRECRECEDIT), FALSE); + } + else + { + EnableWindow(GetDlgItem(hwndDlg, IDC_STRRECRECUPDWN), TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_STRRECRECEDIT), TRUE); + } + SendDlgItemMessage(hwndDlg, IDC_STRRECRECUPDWN, UDM_SETRANGE, (WPARAM) 0, (LPARAM) MAKELONG((short) 999, 0)); + SendDlgItemMessage(hwndDlg, IDC_STRRECRECUPDWN, UDM_SETPOS, (WPARAM) 0, (LPARAM) MAKELONG((short) Timeout, 0)); +} + static DWORD GetSystemDrive(TCHAR **szSystemDrive) @@ -685,6 +705,7 @@ SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pStartInfo); LoadRecoveryOptions(hwndDlg, pStartInfo); + SetRecoveryTimeout(hwndDlg, 0); return LoadOSList(hwndDlg, pStartInfo); case WM_DESTROY: @@ -769,6 +790,13 @@ SetTimeout(hwndDlg, 0); break; + case IDC_STRRECREC: + if (SendDlgItemMessage(hwndDlg, IDC_STRRECREC, BM_GETCHECK, (WPARAM)0, (LPARAM)0) == BST_CHECKED) + SetRecoveryTimeout(hwndDlg, 30); + else + SetRecoveryTimeout(hwndDlg, 0); + break; + case IDC_STRRECDEBUGCOMBO: if (HIWORD(wParam) == CBN_SELCHANGE) {

1 0

[mkupfer] 34150: - *.inf files converted to utf-16 (needed for i18n of entries) - some german translation added/fixed - bug of missing translation fixed (thanks to Pierre Schweitzer)
by mkupfer＠svn.reactos.org 28 Jun '08

28 Jun '08

Author: mkupfer Date: Sat Jun 28 07:31:34 2008 New Revision: 34150 URL: http://svn.reactos.org/svn/reactos?rev=34150&view=rev Log: - *.inf files converted to utf-16 (needed for i18n of entries) - some german translation added/fixed - bug of missing translation fixed (thanks to Pierre Schweitzer) Modified: branches/matthias-i18n/dll/win32/setupapi/parser.c branches/matthias-i18n/media/inf/NET_NIC.inf branches/matthias-i18n/media/inf/cdrom.inf branches/matthias-i18n/media/inf/cpu.inf branches/matthias-i18n/media/inf/display.inf branches/matthias-i18n/media/inf/fdc.inf branches/matthias-i18n/media/inf/hdc.inf branches/matthias-i18n/media/inf/keyboard.inf branches/matthias-i18n/media/inf/machine.inf branches/matthias-i18n/media/inf/msmouse.inf branches/matthias-i18n/media/inf/netisa.inf branches/matthias-i18n/media/inf/ports.inf branches/matthias-i18n/media/inf/scsi.inf branches/matthias-i18n/media/inf/usb.inf branches/matthias-i18n/media/inf/usbport.inf branches/matthias-i18n/media/inf/usbstor.inf [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/matthias-i18n/dll/win32/setupapi/parser.c URL: http://svn.reactos.org/svn/reactos/branches/matthias-i18n/dll/win32/setupap… Modified: branches/matthias-i18n/media/inf/NET_NIC.inf URL: http://svn.reactos.org/svn/reactos/branches/matthias-i18n/media/inf/NET_NIC… Modified: branches/matthias-i18n/media/inf/cdrom.inf URL: http://svn.reactos.org/svn/reactos/branches/matthias-i18n/media/inf/cdrom.i… Modified: branches/matthias-i18n/media/inf/cpu.inf URL: http://svn.reactos.org/svn/reactos/branches/matthias-i18n/media/inf/cpu.inf… Modified: branches/matthias-i18n/media/inf/display.inf URL: http://svn.reactos.org/svn/reactos/branches/matthias-i18n/media/inf/display… Modified: branches/matthias-i18n/media/inf/fdc.inf URL: http://svn.reactos.org/svn/reactos/branches/matthias-i18n/media/inf/fdc.inf… Modified: branches/matthias-i18n/media/inf/hdc.inf URL: http://svn.reactos.org/svn/reactos/branches/matthias-i18n/media/inf/hdc.inf… Modified: branches/matthias-i18n/media/inf/keyboard.inf URL: http://svn.reactos.org/svn/reactos/branches/matthias-i18n/media/inf/keyboar… Modified: branches/matthias-i18n/media/inf/machine.inf URL: http://svn.reactos.org/svn/reactos/branches/matthias-i18n/media/inf/machine… Modified: branches/matthias-i18n/media/inf/msmouse.inf URL: http://svn.reactos.org/svn/reactos/branches/matthias-i18n/media/inf/msmouse… Modified: branches/matthias-i18n/media/inf/netisa.inf URL: http://svn.reactos.org/svn/reactos/branches/matthias-i18n/media/inf/netisa.… Modified: branches/matthias-i18n/media/inf/ports.inf URL: http://svn.reactos.org/svn/reactos/branches/matthias-i18n/media/inf/ports.i… Modified: branches/matthias-i18n/media/inf/scsi.inf URL: http://svn.reactos.org/svn/reactos/branches/matthias-i18n/media/inf/scsi.in… Modified: branches/matthias-i18n/media/inf/usb.inf URL: http://svn.reactos.org/svn/reactos/branches/matthias-i18n/media/inf/usb.inf… Modified: branches/matthias-i18n/media/inf/usbport.inf URL: http://svn.reactos.org/svn/reactos/branches/matthias-i18n/media/inf/usbport… Modified: branches/matthias-i18n/media/inf/usbstor.inf URL: http://svn.reactos.org/svn/reactos/branches/matthias-i18n/media/inf/usbstor…

1 0

[fireball] 34149: - A hack to prevent PCNET+NDIS random bugcheck during startup. See issue #3355 for more details.
by fireball＠svn.reactos.org 28 Jun '08

28 Jun '08

Author: fireball Date: Sat Jun 28 05:26:07 2008 New Revision: 34149 URL: http://svn.reactos.org/svn/reactos?rev=34149&view=rev Log: - A hack to prevent PCNET+NDIS random bugcheck during startup. See issue #3355 for more details. Modified: branches/ros-branch-0_3_5/reactos/drivers/network/dd/pcnet/pcnet.c Modified: branches/ros-branch-0_3_5/reactos/drivers/network/dd/pcnet/pcnet.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_5/reactos/driver… ============================================================================== --- branches/ros-branch-0_3_5/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_5/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] Sat Jun 28 05:26:07 2008 @@ -706,7 +706,7 @@ /* load init block and start the card */ NdisRawWritePortUshort(Adapter->PortOffset + RAP, CSR0); - NdisRawWritePortUshort(Adapter->PortOffset + RDP, CSR0_STRT|CSR0_INIT|CSR0_IENA); + NdisRawWritePortUshort(Adapter->PortOffset + RDP, CSR0_STRT|CSR0_INIT); /* detect the media state */ NdisRawWritePortUshort(Adapter->PortOffset + RAP, BCR4);

1 0

[dchapyshev] 34148: - Revert calc icons
by dchapyshev＠svn.reactos.org 28 Jun '08

28 Jun '08

Author: dchapyshev Date: Sat Jun 28 04:51:19 2008 New Revision: 34148 URL: http://svn.reactos.org/svn/reactos?rev=34148&view=rev Log: - Revert calc icons Modified: trunk/reactos/base/applications/calc/res/calc.ico trunk/reactos/base/applications/calc/res/calc_sm.ico Modified: trunk/reactos/base/applications/calc/res/calc.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/calc/res/calc_sm.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res… ============================================================================== Binary files - no diff available.

1 0

[pschweitzer] 34147: Added define for PNTS_BCB to header. It will be used later to cache data.
by pschweitzer＠svn.reactos.org 28 Jun '08

28 Jun '08

Author: pschweitzer Date: Sat Jun 28 04:49:05 2008 New Revision: 34147 URL: http://svn.reactos.org/svn/reactos?rev=34147&view=rev Log: Added define for PNTS_BCB to header. It will be used later to cache data. Modified: branches/pierre-fsd/drivers/filesystems/ntfs/ntfs.h Modified: branches/pierre-fsd/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Sat Jun 28 04:49:05 2008 @@ -96,6 +96,8 @@ ULONG Size; } NTFSIDENTIFIER, *PNTFSIDENTIFIER; + +typedef PVOID PNTFS_BCB; typedef struct {

1 0

[fireball] 34146: - Merge 34111, 34127 (usermode GDB fixes), 34144 (fixing broken links in downloader).
by fireball＠svn.reactos.org 28 Jun '08

28 Jun '08

Author: fireball Date: Sat Jun 28 03:37:56 2008 New Revision: 34146 URL: http://svn.reactos.org/svn/reactos?rev=34146&view=rev Log: - Merge 34111, 34127 (usermode GDB fixes), 34144 (fixing broken links in downloader). Modified: branches/ros-branch-0_3_5/reactos/dll/ntdll/ldr/startup.c branches/ros-branch-0_3_5/reactos/ntoskrnl/dbgk/dbgkobj.c branches/ros-branch-0_3_5/rosapps/downloader/downloader.xml Modified: branches/ros-branch-0_3_5/reactos/dll/ntdll/ldr/startup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_5/reactos/dll/nt… ============================================================================== --- branches/ros-branch-0_3_5/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_5/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] Sat Jun 28 03:37:56 2008 @@ -484,6 +484,10 @@ ZwTerminateProcess(NtCurrentProcess(), STATUS_INVALID_IMAGE_FORMAT); } } + + /* Break into debugger */ + if (Peb->BeingDebugged) DbgBreakPoint(); + /* attach the thread */ RtlEnterCriticalSection(NtCurrentPeb()->LoaderLock); LdrpAttachThread(); Modified: branches/ros-branch-0_3_5/reactos/ntoskrnl/dbgk/dbgkobj.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_5/reactos/ntoskr… ============================================================================== --- branches/ros-branch-0_3_5/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_5/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] Sat Jun 28 03:37:56 2008 @@ -865,6 +865,9 @@ /* Copy the exception record */ WaitStateChange->StateInfo.Exception.ExceptionRecord = DebugEvent->ApiMsg.Exception.ExceptionRecord; + /* Copy FirstChance flag */ + WaitStateChange->StateInfo.Exception.FirstChance = + DebugEvent->ApiMsg.Exception.FirstChance; break; /* Process exited */ @@ -1598,7 +1601,7 @@ if (NeedsWake) { /* Set the continue status */ - DebugEvent->ApiMsg.ReturnedStatus = Status; + DebugEvent->ApiMsg.ReturnedStatus = ContinueStatus; DebugEvent->Status = STATUS_SUCCESS; /* Wake the target */ Modified: branches/ros-branch-0_3_5/rosapps/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_5/rosapps/downlo… ============================================================================== --- branches/ros-branch-0_3_5/rosapps/downloader/downloader.xml [iso-8859-1] (original) +++ branches/ros-branch-0_3_5/rosapps/downloader/downloader.xml [iso-8859-1] Sat Jun 28 03:37:56 2008 @@ -8,11 +8,11 @@ <location>http://svn.reactos.org/packages/Firefox%20Setup%201.5.0.12.exe</location> </application> <application name="Firefox 2.0"> - <regname>Mozilla Firefox (2.0.0.13)</regname> - <licence>MPL/GPL/LGPL</licence> - <version>2.0.0.13</version> + <regname>Mozilla Firefox (2.0.0.14)</regname> + <licence>MPL/GPL/LGPL</licence> + <version>2.0.0.14</version> <description>The most popular and one of the best free Web Browsers out there.</description> - <location>http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-2.0/win…</location> + <location>http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-2.0/win…</location> </application> <application name="Opera"> <regname>Opera</regname> @@ -29,11 +29,11 @@ <location>http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/latest-1.5…</location> </application> <application name="Thunderbird 2.0"> - <regname>Mozilla Thunderbird (2.0.0.12)</regname> - <licence>MPL/GPL/LGPL</licence> - <version>2.0.0.12</version> + <regname>Mozilla Thunderbird (2.0.0.14)</regname> + <licence>MPL/GPL/LGPL</licence> + <version>2.0.0.14</version> <description>The most popular and one of the best free Mail Clients out there.</description> - <location>http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/latest-2.0…</location> + <location>http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.14/w…</location> </application> <application name="SeaMonkey"> <regname>SeaMonkey (1.1.9)</regname> @@ -212,7 +212,7 @@ <regname>Audiograbber 1.83 SE</regname> <version>1.83 SE</version> <description>A very good CD Ripper/Audio File Converter.</description> - <location>http://www.audiograbber.de/files/342677432/agsetup183se.exe</location> + <location>http://www.audiograbber.de/files/4898276276/agsetup183se.exe</location> </application> </category> <category name="Others" icon="8">

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