Ros-diffs June 2010

ros-diffs@reactos.org

24 participants
407 discussions

[gadamopoulos] 47522: [win32k[win32k] -Allow menus to be shown over the taskbar See issue #5415 for more details.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Jun 2 18:55:21 2010 New Revision: 47522 URL: http://svn.reactos.org/svn/reactos?rev=47522&view=rev Log: [win32k[win32k] -Allow menus to be shown over the taskbar See issue #5415 for more details. Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Wed Jun 2 18:55:21 2010 @@ -1605,25 +1605,25 @@ if( flags & TPM_BOTTOMALIGN ) y -= height; if( flags & TPM_VCENTERALIGN ) y -= height / 2; - if( x + width > info.rcWork.right) + if( x + width > info.rcMonitor.right) { if( xanchor && x >= width - xanchor ) x -= width - xanchor; - if( x + width > info.rcWork.right) - x = info.rcWork.right - width; - } - if( x < info.rcWork.left ) x = info.rcWork.left; - - if( y + height > info.rcWork.bottom) + if( x + width > info.rcMonitor.right) + x = info.rcMonitor.right - width; + } + if( x < info.rcMonitor.left ) x = info.rcMonitor.left; + + if( y + height > info.rcMonitor.bottom) { if( yanchor && y >= height + yanchor ) y -= height + yanchor; - if( y + height > info.rcWork.bottom) - y = info.rcWork.bottom - height; - } - if( y < info.rcWork.top ) y = info.rcWork.top; + if( y + height > info.rcMonitor.bottom) + y = info.rcMonitor.bottom - height; + } + if( y < info.rcMonitor.top ) y = info.rcMonitor.top; /* NOTE: In Windows, top menu popup is not owned. */ MenuInfo.Wnd = CreateWindowExW( 0, POPUPMENU_CLASS_ATOMW, NULL,

14 years, 6 months

[ilardig] 47521: [netshell] - Improve current network connection status icons.

by ilardig＠svn.reactos.org

Author: ilardig Date: Wed Jun 2 17:43:07 2010 New Revision: 47521 URL: http://svn.reactos.org/svn/reactos?rev=47521&view=rev Log: [netshell] - Improve current network connection status icons. Modified: trunk/reactos/dll/win32/netshell/res/neterror.ico trunk/reactos/dll/win32/netshell/res/netidle.ico trunk/reactos/dll/win32/netshell/res/netoff.ico trunk/reactos/dll/win32/netshell/res/netrec.ico trunk/reactos/dll/win32/netshell/res/nettrans.ico trunk/reactos/dll/win32/netshell/res/nettrrec.ico Modified: trunk/reactos/dll/win32/netshell/res/neterror.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/res/net… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/netshell/res/netidle.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/res/net… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/netshell/res/netoff.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/res/net… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/netshell/res/netrec.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/res/net… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/netshell/res/nettrans.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/res/net… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/netshell/res/nettrrec.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/res/net… ============================================================================== Binary files - no diff available.

14 years, 6 months

[ilardig] 47520: Several Italian translation updates by Paolo Devoti. See issue #5438 for more details.

by ilardig＠svn.reactos.org

Author: ilardig Date: Wed Jun 2 16:04:07 2010 New Revision: 47520 URL: http://svn.reactos.org/svn/reactos?rev=47520&view=rev Log: Several Italian translation updates by Paolo Devoti. See issue #5438 for more details. Modified: trunk/reactos/base/applications/calc/lang/it-IT.rc trunk/reactos/base/applications/rapps/lang/it-IT.rc trunk/reactos/base/applications/regedit/lang/it-IT.rc trunk/reactos/base/shell/explorer-new/lang/it-IT.rc trunk/reactos/dll/cpl/intl/lang/it-IT.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/it-IT.rc Modified: trunk/reactos/base/applications/calc/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/it-IT.rc [iso-8859-1] Wed Jun 2 16:04:07 2010 @@ -639,7 +639,7 @@ BEGIN IDS_TIME_DAYS "Giorni" IDS_TIME_HOURS "Ore" - IDS_TIME_NANOSECONDS "Nanoseconds" + IDS_TIME_NANOSECONDS "Nanosecondi" IDS_TIME_MICROSECONDS "Microsecondi" IDS_TIME_MILLISECONDS "Millisecondi" IDS_TIME_MINUTES "Minuti" Modified: trunk/reactos/base/applications/rapps/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/it-IT.rc [iso-8859-1] Wed Jun 2 16:04:07 2010 @@ -156,7 +156,7 @@ IDS_CAT_DEVEL "Sviluppo" IDS_CAT_DRIVERS "Drivers" IDS_CAT_EDU "Edutainment" - IDS_CAT_ENGINEER "Engineering" + IDS_CAT_ENGINEER "Scienze" IDS_CAT_FINANCE "Finanza" IDS_CAT_GAMES "Giochi e divertimento" IDS_CAT_GRAPHICS "Graphica" @@ -174,18 +174,18 @@ IDS_APPTITLE "ReactOS Applications Manager" IDS_SEARCH_TEXT "Cerca..." IDS_INSTALL "Installa" - IDS_UNINSTALL "Disinstall" + IDS_UNINSTALL "Disinstalla" IDS_MODIFY "Modifica" IDS_APPS_COUNT "Numero applicazioni: %d" IDS_WELCOME_TITLE "Benvenuto!\n\n" IDS_WELCOME_TEXT "Scegliere una categoria a sinistra, poi scegliere una applicazione da installare o disinstallare.\nReactOS Web Site: " IDS_WELCOME_URL "http://www.reactos.org" IDS_INSTALLED "Installato" - IDS_AVAILABLEFORINST "Disponibile" + IDS_AVAILABLEFORINST "Disponibile per l'installazione" IDS_UPDATES "Aggiornamenti" IDS_APPLICATIONS "Applicazioni" IDS_CHOOSE_FOLDER_TEXT "Scegliere una cartella dove scaricare le applicazioni:" - IDS_CHOOSE_FOLDER_ERROR "La cartella indicata non esiste." + IDS_CHOOSE_FOLDER_ERROR "La cartella indicata non esiste. Vuoi crearla?" IDS_USER_NOT_ADMIN "Dovete essere Amministratore per avviare ""ReactOS Applications Manager""!" IDS_APP_REG_REMOVE "Sicuro di voler cancellare dal registry i dati sui programmi installati?" IDS_INFORMATION "Informazioni" Modified: trunk/reactos/base/applications/regedit/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/it-IT.rc [iso-8859-1] Wed Jun 2 16:04:07 2010 @@ -192,7 +192,7 @@ CAPTION "Modifica Multi-Stringa" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Name:",IDC_STATIC,6,6,134,8 + LTEXT "&Nome:",IDC_STATIC,6,6,134,8 EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY LTEXT "&Dati:",IDC_STATIC,6,35,161,8 EDITTEXT IDC_VALUE_DATA,6,46,240,102,ES_MULTILINE | Modified: trunk/reactos/base/shell/explorer-new/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/it-IT.rc [iso-8859-1] Wed Jun 2 16:04:07 2010 @@ -78,11 +78,11 @@ LTEXT "This menu style gives you easy access to your folders, favorite programs, and search.", IDC_STATIC, 20,17,150,24, WS_DISABLED PUSHBUTTON "&Personalizzare...", IDC_TASKBARPROP_STARTMENUCUST, 192,4,53,14, WS_DISABLED AUTORADIOBUTTON "Menù avvio &classico", IDC_TASKBARPROP_STARTMENUCLASSIC, 7,47,105,10, WS_DISABLED - LTEXT "This menu style gives you the classic look and functionality",-1,20,57,150,24, WS_DISABLED - PUSHBUTTON "&Customize...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192,44,53,14, WS_DISABLED + LTEXT "Questo stile di menù ha funzionalità e aspetto classici",-1,20,57,150,24, WS_DISABLED + PUSHBUTTON "&Personalizza...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192,44,53,14, WS_DISABLED GROUPBOX "Privacy",IDC_STATIC, 7,100,238,42 - AUTOCHECKBOX "Store and display a list of recently opened &files", IDC_TASKBARPROP_RECENTFILES, 14,114,224,10, WS_DISABLED - AUTOCHECKBOX "Store and display a list of recently opened &programs",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED + AUTOCHECKBOX "Memorizza e mostra un elenco di &file aperti di recente", IDC_TASKBARPROP_RECENTFILES, 14,114,224,10, WS_DISABLED + AUTOCHECKBOX "Memorizza e mostra un elenco di &programmi aperti di recente",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED END IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218 @@ -120,7 +120,7 @@ IDS_PROPERTIES "&Proprietà" IDS_OPEN_ALL_USERS "&Apri tutti gli utenti" IDS_EXPLORE_ALL_USERS "&Esplora tutti gli utenti" - IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." + IDS_STARTUP_ERROR "Impossibile avviare explorer perché il registro è danneggiato o non disponibile." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/dll/cpl/intl/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/it-IT.rc [iso-8859-1] Wed Jun 2 16:04:07 2010 @@ -181,7 +181,7 @@ BEGIN GROUPBOX "Ordinamento", -1, 7, 7, 230, 74 LTEXT "Il metodo di ordinamento definisce come considerare l'ordine di caratteri, parole, file e cartelle.", -1, 14, 17, 220, 25 - LTEXT "Scegliere il metodo di orinamento per il vostro linguaggio:", -1, 14, 37, 220, 22 + LTEXT "Scegliere il metodo di ordinamento per il vostro linguaggio:", -1, 14, 37, 220, 22 COMBOBOX IDC_SORTLIST_COMBO, 14, 56, 217, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/it-IT.rc [iso-8859-1] Wed Jun 2 16:04:07 2010 @@ -11,10 +11,10 @@ IDD_END_NOW DIALOGEX DISCARDABLE 0, 0, 200, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Fine del programma - " +CAPTION "Arresto del programma - " FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Fine del programma... Attendere",IDC_STATIC,7,7,186,11 + LTEXT "Arresto del programma... Attendere",IDC_STATIC,7,7,186,11 CONTROL "Progresso",IDC_PROGRESS,"msctls_progress32",WS_BORDER, 7,20,186,13 LTEXT "Se si sceglie di terminare il programma immediatamente, si perderanno tutti i dati non salvati. Per terminare il programma ora, selezionare Termina ora.", @@ -24,7 +24,7 @@ IDD_NOT_RESPONDING DIALOGEX DISCARDABLE 0, 0, 192, 122 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "End Program - " +CAPTION "Arresto del programma - " FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Annulla",IDCANCEL,142,98,43,17

14 years, 6 months

[sginsberg] 47519: [HAL] Fix compiler preprocessor checks for the IRQL masks so other compilers than GCC get proper entries too. [HAL] Define the HalpHardwareInterrupt macro for MSVC too. [HAL] Replace IRQL_DEBUG with DBG so we always check for incorrect IRQL on debug. I believe incorrect IRQL raise/lower is a common and serious enough error to always be checked for on debug builds without defining some special debug option.

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Wed Jun 2 15:59:47 2010 New Revision: 47519 URL: http://svn.reactos.org/svn/reactos?rev=47519&view=rev Log: [HAL] Fix compiler preprocessor checks for the IRQL masks so other compilers than GCC get proper entries too. [HAL] Define the HalpHardwareInterrupt macro for MSVC too. [HAL] Replace IRQL_DEBUG with DBG so we always check for incorrect IRQL on debug. I believe incorrect IRQL raise/lower is a common and serious enough error to always be checked for on debug builds without defining some special debug option. Modified: trunk/reactos/hal/halx86/up/pic.c Modified: trunk/reactos/hal/halx86/up/pic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up/pic.c?rev=47… ============================================================================== --- trunk/reactos/hal/halx86/up/pic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/up/pic.c [iso-8859-1] Wed Jun 2 15:59:47 2010 @@ -94,8 +94,8 @@ /* This table contains the static x86 PIC mapping between IRQLs and IRQs */ ULONG KiI8259MaskTable[32] = { -#ifdef __GNUC__ -#if __GNUC__ * 100 + __GNUC_MINOR__ >= 404 +#if defined(__GNUC__) && \ + (__GNUC__ * 100 + __GNUC_MINOR__ >= 404) /* * It Device IRQLs only start at 4 or higher, so these are just software * IRQLs that don't really change anything on the hardware @@ -206,14 +206,13 @@ 0xFFFFFFFB, /* IRQL 30 */ 0xFFFFFFFB /* IRQL 31 */ #endif -#endif }; /* This table indicates which IRQs, if pending, can preempt a given IRQL level */ ULONG FindHigherIrqlMask[32] = { -#ifdef __GNUC__ -#if __GNUC__ * 100 + __GNUC_MINOR__ >= 404 +#if defined(__GNUC__) && \ + (__GNUC__ * 100 + __GNUC_MINOR__ >= 404) /* * Software IRQLs, at these levels all hardware interrupts can preempt. * Each higher IRQL simply enables which software IRQL can preempt the @@ -313,7 +312,6 @@ 0, /* IRQL 30 */ 0 /* IRQL 31 */ #endif -#endif }; /* Denotes minimum required IRQL before we can process pending SW interrupts */ @@ -329,6 +327,8 @@ DISPATCH_LEVEL /* IRR 7 */ }; +#if defined(__GNUC__) + #define HalpDelayedHardwareInterrupt(x) \ VOID HalpHardwareInterrupt##x(VOID); \ VOID \ @@ -336,6 +336,23 @@ { \ asm volatile ("int $%c0\n"::"i"(PRIMARY_VECTOR_BASE + x)); \ } + +#elif defined(_MSC_VER) + +#define HalpDelayedHardwareInterrupt(x) \ + VOID HalpHardwareInterrupt##x(VOID); \ + VOID \ + HalpHardwareInterrupt##x(VOID) \ + { \ + __asm \ + { \ + int PRIMARY_VECTOR_BASE + x \ + } \ + } + +#else +#error Unsupported compiler +#endif /* Pending/delayed hardware interrupt handlers */ HalpDelayedHardwareInterrupt(0); @@ -522,7 +539,7 @@ CurrentIrql = Pcr->Irql; Pcr->Irql = DISPATCH_LEVEL; -#ifdef IRQL_DEBUG +#if DBG /* Validate correct raise */ if (CurrentIrql > DISPATCH_LEVEL) KeBugCheck(IRQL_NOT_GREATER_OR_EQUAL); #endif @@ -545,7 +562,7 @@ CurrentIrql = Pcr->Irql; Pcr->Irql = SYNCH_LEVEL; -#ifdef IRQL_DEBUG +#if DBG /* Validate correct raise */ if (CurrentIrql > SYNCH_LEVEL) { @@ -575,7 +592,7 @@ /* Read current IRQL */ CurrentIrql = Pcr->Irql; -#ifdef IRQL_DEBUG +#if DBG /* Validate correct raise */ if (CurrentIrql > NewIrql) { @@ -605,7 +622,7 @@ PKPCR Pcr = KeGetPcr(); PIC_MASK Mask; -#ifdef IRQL_DEBUG +#if DBG /* Validate correct lower */ if (OldIrql > Pcr->Irql) {

14 years, 6 months

[dreimer] 47518: Polish Translation Updates by Maciej Bialas.

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Jun 2 13:34:56 2010 New Revision: 47518 URL: http://svn.reactos.org/svn/reactos?rev=47518&view=rev Log: Polish Translation Updates by Maciej Bialas. Modified: trunk/reactos/base/applications/calc/lang/pl-PL.rc trunk/reactos/base/applications/rapps/lang/pl-PL.rc trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc Modified: trunk/reactos/base/applications/calc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/pl-PL.rc [iso-8859-1] Wed Jun 2 13:34:56 2010 @@ -464,9 +464,9 @@ // TYPES OF ANGLES STRINGTABLE DISCARDABLE BEGIN - IDS_ANGLE_DEGREES "Stopni" - IDS_ANGLE_GRADIANS "Gradianów" - IDS_ANGLE_RADIANS "Radianów" + IDS_ANGLE_DEGREES "Stopnie" + IDS_ANGLE_GRADIANS "Gradiany" + IDS_ANGLE_RADIANS "Radiany" END // TYPES OF AREAS @@ -489,21 +489,21 @@ IDS_AREA_PYEONGBANGJA "Pyeongbangja" IDS_AREA_RAI "Rai" IDS_AREA_SE "Se" - IDS_AREA_SQUARE_CENTIMETERS "Centymetrów kwadratowych" - IDS_AREA_SQUARE_CHR "Chr kwadratowych" - IDS_AREA_SQUARE_FATHOMS "S¹¿ni kwadratowych" - IDS_AREA_SQUARE_FATHOMS_HUNGARY "S¹¿ni kwadratowych (Wêgry)" - IDS_AREA_SQUARE_FEET "Stóp kwadratowych" - IDS_AREA_SQUARE_INCHES "Cali kwadratowych" - IDS_AREA_SQUARE_KILOMETERS "Kilometrów kwadratowych" - IDS_AREA_SQUARE_LAR "Lar kwadratowych" - IDS_AREA_SQUARE_METER "Metrów kwadratowych" - IDS_AREA_SQUARE_MILES "Mil kwadratowych" - IDS_AREA_SQUARE_MILLIMETERS "Milimetrów kwadratowych" - IDS_AREA_SQUARE_SHAKU "Shaku kwadratowych" - IDS_AREA_SQUARE_TSUEN "Tsuen kwadratowych" - IDS_AREA_SQUARE_VA "Va kwadratowych" - IDS_AREA_SQUARE_YARD "Jardów kwadratowych" + IDS_AREA_SQUARE_CENTIMETERS "Centymetry kwadratowe" + IDS_AREA_SQUARE_CHR "Chr kwadratowe" + IDS_AREA_SQUARE_FATHOMS "S¹¿nie kwadratowe" + IDS_AREA_SQUARE_FATHOMS_HUNGARY "S¹¿nie kwadratowe (Wêgry)" + IDS_AREA_SQUARE_FEET "Stopy kwadratowe" + IDS_AREA_SQUARE_INCHES "Cale kwadratowe" + IDS_AREA_SQUARE_KILOMETERS "Kilometry kwadratowe" + IDS_AREA_SQUARE_LAR "Lar kwadratowe" + IDS_AREA_SQUARE_METER "Metry kwadratowe" + IDS_AREA_SQUARE_MILES "Mile kwadratowe" + IDS_AREA_SQUARE_MILLIMETERS "Milimetry kwadratowe" + IDS_AREA_SQUARE_SHAKU "Shaku kwadratowe" + IDS_AREA_SQUARE_TSUEN "Tsuen kwadratowe" + IDS_AREA_SQUARE_VA "Va kwadratowe" + IDS_AREA_SQUARE_YARD "Jardy kwadratowe" IDS_AREA_TAN "Tan" IDS_AREA_TSUBO "Tsubo" END @@ -511,10 +511,10 @@ // TYPES OF COMSUMPTIONS STRINGTABLE DISCARDABLE BEGIN - IDS_CONSUMPTION_KM_PER_L "Kilometrów/litr" - IDS_CONSUMPTION_L_PER_100_KM "Litrów/100 kilometróws" - IDS_CONSUMPTION_MILES_GALLON_UK "Mil/galon (UK)" - IDS_CONSUMPTION_MILES_GALLON_US "Mil/galon (USA)" + IDS_CONSUMPTION_KM_PER_L "Kilometry/litr" + IDS_CONSUMPTION_L_PER_100_KM "Litry/100 kilometrów" + IDS_CONSUMPTION_MILES_GALLON_UK "Mile/galon (UK)" + IDS_CONSUMPTION_MILES_GALLON_US "Mile/galon (USA)" END // TYPES OF CURRENCIES @@ -543,56 +543,56 @@ // TYPES OF ENERGIES STRINGTABLE DISCARDABLE BEGIN - IDS_ENERGY_15_C_CALORIES "15 °C kalorii" + IDS_ENERGY_15_C_CALORIES "15 °C kalorie" IDS_ENERGY_BTUS "British Thermal Unit" - IDS_ENERGY_ERGS "Ergów" - IDS_ENERGY_EVS "Elektronowolt" - IDS_ENERGY_FOOT_POUNDS "Foot-pound" + IDS_ENERGY_ERGS "Ergi" + IDS_ENERGY_EVS "Elektronowolty" + IDS_ENERGY_FOOT_POUNDS "Stopo-funty" IDS_ENERGY_IT_CALORIES "Miêdzynarodowa Tablica kalorii" IDS_ENERGY_IT_KILOCALORIES "Miêdzynarodowa Tablica kilokalorii" - IDS_ENERGY_JOULES "D¿uli" - IDS_ENERGY_KILOJOULES "Kilod¿uli" - IDS_ENERGY_KILOWATT_HOURS "Kilowatogodzin" - IDS_ENERGY_NUTRITION_CALORIES "Kalorii spo¿ywczych" - IDS_ENERGY_TH_CALORIES "Kalorii termochemicznych" + IDS_ENERGY_JOULES "D¿ule" + IDS_ENERGY_KILOJOULES "Kilod¿ule" + IDS_ENERGY_KILOWATT_HOURS "Kilowatogodziny" + IDS_ENERGY_NUTRITION_CALORIES "Kalorie spo¿ywcze" + IDS_ENERGY_TH_CALORIES "Kalorie termochemiczne" END // TYPES OF LENGTHS STRINGTABLE DISCARDABLE BEGIN - IDS_LENGTH_ANGSTROMS "Angsztremów" - IDS_LENGTH_ASTRONOMICAL_UNITS "Jednostek Astronomicznych" - IDS_LENGTH_BARLEYCORNS "Palców" - IDS_LENGTH_CENTIMETERS "Centimetrów" + IDS_LENGTH_ANGSTROMS "Angsztremy" + IDS_LENGTH_ASTRONOMICAL_UNITS "Jednostki Astronomiczne" + IDS_LENGTH_BARLEYCORNS "Palce" + IDS_LENGTH_CENTIMETERS "Centymetry" IDS_LENGTH_CHAINS_UK "Chains (UK)" IDS_LENGTH_CHI "Chi" IDS_LENGTH_CHOU "Chou" IDS_LENGTH_CHR "Chr" IDS_LENGTH_CUN "Cun" - IDS_LENGTH_FATHOMS "S¹¿ni" - IDS_LENGTH_FATHOMS_HUNGARY "S¹¿ni (Wêgry)" - IDS_LENGTH_FEET "Stóp" + IDS_LENGTH_FATHOMS "S¹¿nie" + IDS_LENGTH_FATHOMS_HUNGARY "S¹¿nie (Wêgry)" + IDS_LENGTH_FEET "Stopy" IDS_LENGTH_FURLONGS "Furlongs" IDS_LENGTH_GAN "Gan" - IDS_LENGTH_HANDS "D³oni" + IDS_LENGTH_HANDS "D³onie" IDS_LENGTH_HUNH "Hunh" - IDS_LENGTH_INCHES "Cali" + IDS_LENGTH_INCHES "Cale" IDS_LENGTH_JA "Ja" IDS_LENGTH_JEONG "Jeong" IDS_LENGTH_KABIET "Kabiet" IDS_LENGTH_KEN "Ken" IDS_LENGTH_KEUB "Keub" - IDS_LENGTH_KILOMETERS "Kilometerów" + IDS_LENGTH_KILOMETERS "Kilometry" IDS_LENGTH_LAR "Lar" - IDS_LENGTH_LIGHT_YEARS "Lat wietlnych" + IDS_LENGTH_LIGHT_YEARS "Lata wietlne" IDS_LENGTH_LINKS_UK "Links (UK)" - IDS_LENGTH_METERS "Metrów" - IDS_LENGTH_MICRONS "Mikrometrów" - IDS_LENGTH_MILES "Mil" - IDS_LENGTH_MILLIMETERS "Millimetrów" - IDS_LENGTH_NAUTICAL_MILES "Mil morskich" + IDS_LENGTH_METERS "Metry" + IDS_LENGTH_MICRONS "Mikrometry" + IDS_LENGTH_MILES "Mile" + IDS_LENGTH_MILLIMETERS "Milimetry" + IDS_LENGTH_NAUTICAL_MILES "Mile morskie" IDS_LENGTH_NIEU "Nieu" - IDS_LENGTH_PARSECS "Parseków" + IDS_LENGTH_PARSECS "Parseki" IDS_LENGTH_PICAS "Picas" IDS_LENGTH_RI_JAPAN "Ri (Japan)" IDS_LENGTH_RI_KOREA "Ri (Korea)" @@ -604,7 +604,7 @@ IDS_LENGTH_SUN "Sun" IDS_LENGTH_TSUEN "Tsuen" IDS_LENGTH_VA "Va" - IDS_LENGTH_YARDS "Jardów" + IDS_LENGTH_YARDS "Jardy" IDS_LENGTH_YOTE "Yote" IDS_LENGTH_ZHANG "Zhang" END @@ -613,23 +613,23 @@ STRINGTABLE DISCARDABLE BEGIN IDS_POWER_BTUS_PER_MINUTE "BTU na minutê" - IDS_POWER_FPS_PER_MINUTE "Foot-pound na minutê" - IDS_POWER_HORSEPOWER "Koni mechanicznych" - IDS_POWER_KILOWATTS "Kilowatów" - IDS_POWER_MEGAWATTS "Megawatów" - IDS_POWER_WATTS "Watów" + IDS_POWER_FPS_PER_MINUTE "Stopo-funty na minutê" + IDS_POWER_HORSEPOWER "Konie mechaniczne" + IDS_POWER_KILOWATTS "Kilowaty" + IDS_POWER_MEGAWATTS "Megawaty" + IDS_POWER_WATTS "Waty" END // TYPE OF PRESSURES STRINGTABLE DISCARDABLE BEGIN - IDS_PRESSURE_ATMOSPHERES "Atmosfer" - IDS_PRESSURE_BARS "Barów" - IDS_PRESSURE_HECTOPASCALS "Hektopaskali" - IDS_PRESSURE_KILOPASCALS "Kilopaskali" - IDS_PRESSURE_MM_OF_MERCURY "Millimetrów s³upka rtêci" - IDS_PRESSURE_PASCALS "Paskali" - IDS_PRESSURE_PSI "Funtów na cal kwadratowy" + IDS_PRESSURE_ATMOSPHERES "Atmosfery" + IDS_PRESSURE_BARS "Bary" + IDS_PRESSURE_HECTOPASCALS "Hektopaskale" + IDS_PRESSURE_KILOPASCALS "Kilopaskale" + IDS_PRESSURE_MM_OF_MERCURY "Milimetry s³upka rtêci" + IDS_PRESSURE_PASCALS "Paskale" + IDS_PRESSURE_PSI "Funty na cal kwadratowy" END // TYPES OF TEMPERATURES @@ -645,61 +645,61 @@ STRINGTABLE DISCARDABLE BEGIN IDS_TIME_DAYS "Dni" - IDS_TIME_HOURS "Godzin" - IDS_TIME_NANOSECONDS "Nanoseconds" - IDS_TIME_MICROSECONDS "Mikrosekund" - IDS_TIME_MILLISECONDS "Milisekund" - IDS_TIME_MINUTES "Minut" - IDS_TIME_SECONDS "Sekund" - IDS_TIME_WEEKS "Tygodni" - IDS_TIME_YEARS "Lat" + IDS_TIME_HOURS "Godziny" + IDS_TIME_NANOSECONDS "Nanosekundy" + IDS_TIME_MICROSECONDS "Mikrosekundy" + IDS_TIME_MILLISECONDS "Milisekundy" + IDS_TIME_MINUTES "Minuty" + IDS_TIME_SECONDS "Sekundy" + IDS_TIME_WEEKS "Tygodnie" + IDS_TIME_YEARS "Lata" END // TYPES OF VELOCITIES STRINGTABLE DISCARDABLE BEGIN - IDS_VELOCITY_CMS_SECOND "Centimetrów/sekundê" - IDS_VELOCITY_FEET_HOUR "Stóp/godzinê" - IDS_VELOCITY_FEET_SECOND "Stóp/sekundê" - IDS_VELOCITY_KILOMETERS_HOUR "Kilometrów/godzinê" - IDS_VELOCITY_KNOTS "Wêz³ów" - IDS_VELOCITY_MACH "Machów" - IDS_VELOCITY_METERS_SECOND "Metrów/sekundê" - IDS_VELOCITY_MILES_HOUR "Mil/godzinê" + IDS_VELOCITY_CMS_SECOND "Centymetry/sekundê" + IDS_VELOCITY_FEET_HOUR "Stopy/godzinê" + IDS_VELOCITY_FEET_SECOND "Stopy/sekundê" + IDS_VELOCITY_KILOMETERS_HOUR "Kilometry/godzinê" + IDS_VELOCITY_KNOTS "Wêz³y" + IDS_VELOCITY_MACH "Machy" + IDS_VELOCITY_METERS_SECOND "Metry/sekundê" + IDS_VELOCITY_MILES_HOUR "Mile/godzinê" END // TYPES OF VOLUMES STRINGTABLE DISCARDABLE BEGIN - IDS_VOLUME_BARRELS_UK "Bary³ek (UK)" - IDS_VOLUME_BARRELS_OIL "Bary³ek" + IDS_VOLUME_BARRELS_UK "Bary³ki (UK)" + IDS_VOLUME_BARRELS_OIL "Bary³ki" IDS_VOLUME_BUN "Bun" - IDS_VOLUME_BUSHELS_UK "Buszli (UK)" - IDS_VOLUME_BUSHELS_US "Buszli (US)" - IDS_VOLUME_CUBIC_CENTIMETERS "Centymetrów szeciennych" - IDS_VOLUME_CUBIC_FEET "Stóp szeciennych" - IDS_VOLUME_CUBIC_INCHES "Cali szeciennych" - IDS_VOLUME_CUBIC_METERS "Metrów szeciennych" - IDS_VOLUME_CUBIC_YARDS "Jardów szeciennych" + IDS_VOLUME_BUSHELS_UK "Buszle (UK)" + IDS_VOLUME_BUSHELS_US "Buszle (US)" + IDS_VOLUME_CUBIC_CENTIMETERS "Centymetry szecienne" + IDS_VOLUME_CUBIC_FEET "Stopy szecienne" + IDS_VOLUME_CUBIC_INCHES "Cale szecienne" + IDS_VOLUME_CUBIC_METERS "Metry szecienne" + IDS_VOLUME_CUBIC_YARDS "Jardy szecienne" IDS_VOLUME_DOE "Doe" - IDS_VOLUME_FLUID_OUNCES_UK "Uncji, p³yn (UK)" - IDS_VOLUME_FLUID_OUNCES_US "Uncji, p³yn (US)" - IDS_VOLUME_GALLONS_UK "Galonów (UK)" - IDS_VOLUME_GALLONS_DRY_US "Galonów, sypkie (US)" - IDS_VOLUME_GALLONS_LIQUID_US "Gallons, p³yn (US)" + IDS_VOLUME_FLUID_OUNCES_UK "Uncje, p³yn (UK)" + IDS_VOLUME_FLUID_OUNCES_US "Uncje, p³yn (US)" + IDS_VOLUME_GALLONS_UK "Galony (UK)" + IDS_VOLUME_GALLONS_DRY_US "Galony, sypkie (US)" + IDS_VOLUME_GALLONS_LIQUID_US "Galony, p³yn (US)" IDS_VOLUME_GOU "Gou" IDS_VOLUME_HOP "Hop" IDS_VOLUME_ICCE "Icce" IDS_VOLUME_KWIAN "Kwian" - IDS_VOLUME_LITERS "Litrów" + IDS_VOLUME_LITERS "Litry" IDS_VOLUME_MAL "Mal" - IDS_VOLUME_MILLILITERS "Milliliters" - IDS_VOLUME_PINTS_UK "Pint (UK)" - IDS_VOLUME_PINTS_DRY_US "Pint, sypkie (US)" - IDS_VOLUME_PINTS_LIQUID_US "Pint, p³yn (US)" - IDS_VOLUME_QUARTS_UK "Kwart (UK)" - IDS_VOLUME_QUARTS_DRY_US "Kwart, sypkie (US)" - IDS_VOLUME_QUARTS_LIQUID_US "Kwart, p³yn (US)" + IDS_VOLUME_MILLILITERS "Mililitry" + IDS_VOLUME_PINTS_UK "Pinty (UK)" + IDS_VOLUME_PINTS_DRY_US "Pinty, sypkie (US)" + IDS_VOLUME_PINTS_LIQUID_US "Pinty, p³yn (US)" + IDS_VOLUME_QUARTS_UK "Kwarty (UK)" + IDS_VOLUME_QUARTS_DRY_US "Kwarty, sypkie (US)" + IDS_VOLUME_QUARTS_LIQUID_US "Kwarty, p³yn (US)" IDS_VOLUME_SEKI "Seki" IDS_VOLUME_SYOU "Syou" IDS_VOLUME_TANANLOUNG "Tananloung" @@ -710,26 +710,26 @@ // TYPES OF WEIGHTS STRINGTABLE DISCARDABLE BEGIN - IDS_WEIGHT_BAHT "Bahtów" - IDS_WEIGHT_CARATS "Karatów" + IDS_WEIGHT_BAHT "Bahty" + IDS_WEIGHT_CARATS "Karaty" IDS_WEIGHT_CHUNG "Chung" IDS_WEIGHT_DON "Don" IDS_WEIGHT_GEUN "Geun" - IDS_WEIGHT_GRAMS "Gramów" + IDS_WEIGHT_GRAMS "Gramy" IDS_WEIGHT_GWAN "Gwan" IDS_WEIGHT_HARB "Harb" IDS_WEIGHT_JIN_CHINA "Jin (China)" IDS_WEIGHT_JIN_TAIWAN "Jin (Taiwan)" IDS_WEIGHT_KAN "Kan" - IDS_WEIGHT_KILOGRAMS "Kilogramów" + IDS_WEIGHT_KILOGRAMS "Kilogramy" IDS_WEIGHT_KIN "Kin" IDS_WEIGHT_LIANG_CHINA "Liang (China)" IDS_WEIGHT_LIANG_TAIWAN "Liang (Taiwan)" IDS_WEIGHT_MONME "Monme" - IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Uncji, avoirdupois" - IDS_WEIGHT_OUNCES_TROY "Uncji, aptekarskie" - IDS_WEIGHT_POUNDS "Funtów" - IDS_WEIGHT_QUINTAL_METRIC "Kwintali" + IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Uncje, avoirdupois" + IDS_WEIGHT_OUNCES_TROY "Uncje, aptekarskie" + IDS_WEIGHT_POUNDS "Funty" + IDS_WEIGHT_QUINTAL_METRIC "Kwintale" IDS_WEIGHT_SALOUNG "Saloung" IDS_WEIGHT_STONES "Kamieni" IDS_WEIGHT_TAMLUNG "Tamlung" Modified: trunk/reactos/base/applications/rapps/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/pl-PL.rc [iso-8859-1] Wed Jun 2 13:34:56 2010 @@ -187,7 +187,7 @@ IDS_UPDATES "Uaktualnienia" IDS_APPLICATIONS "Aplikacje" IDS_CHOOSE_FOLDER_TEXT "Wybierz katalog w którym bêda zapisywane pobrane programy:" - IDS_CHOOSE_FOLDER_ERROR "Wybra³e nieistniej¹cy katalog!" + IDS_CHOOSE_FOLDER_ERROR "Wybra³e nieistniej¹cy katalog! Czy chcesz utworzyæ nowy?" IDS_USER_NOT_ADMIN "Musisz mieæ uprawnienia administratora aby uruchomiæ ""ReactOS Applications Manager""!" IDS_APP_REG_REMOVE "Czy na pewno chcesz usun¹æ wpis tego programu z rejestru?" IDS_INFORMATION "Informacja" Modified: trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc [iso-8859-1] Wed Jun 2 13:34:56 2010 @@ -123,7 +123,7 @@ IDS_PROPERTIES "W³a&ciwoci" IDS_OPEN_ALL_USERS "&Otwórz - wszyscy u¿ytkownicy" IDS_EXPLORE_ALL_USERS "&Eksploruj - wszyscy u¿ytkownicy" - IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." + IDS_STARTUP_ERROR "System nie mo¿e uruchomiæ eksploratora poniewa¿ rejestr jest niedostêpny lub uszkodzony." END STRINGTABLE DISCARDABLE

14 years, 6 months

[fireball] 47517: [HAL] - Fix a typo.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Jun 2 13:26:19 2010 New Revision: 47517 URL: http://svn.reactos.org/svn/reactos?rev=47517&view=rev Log: [HAL] - Fix a typo. Modified: trunk/reactos/hal/halx86/generic/bus/pcibus.c Modified: trunk/reactos/hal/halx86/generic/bus/pcibus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bus/pci… ============================================================================== --- trunk/reactos/hal/halx86/generic/bus/pcibus.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/bus/pcibus.c [iso-8859-1] Wed Jun 2 13:26:19 2010 @@ -391,7 +391,6 @@ if (PciConfig->VendorID == PCI_INVALID_VENDORID) { /* It's invalid, but we want to return this much */ - PciConfig->VendorID = PCI_INVALID_VENDORID; Len = sizeof(USHORT); }

14 years, 6 months

[cgutman] 47516: [NTOSKRNL] - Revert the hack in r47514 - The ASSERT is there to make sure the PFN lock is held - Fix the issue properly by holding the PFN lock while initializing

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Jun 1 22:06:53 2010 New Revision: 47516 URL: http://svn.reactos.org/svn/reactos?rev=47516&view=rev Log: [NTOSKRNL] - Revert the hack in r47514 - The ASSERT is there to make sure the PFN lock is held - Fix the issue properly by holding the PFN lock while initializing Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Tue Jun 1 22:06:53 2010 @@ -59,7 +59,7 @@ { PFN_NUMBER OldBlink, EntryIndex = MiGetPfnEntryIndex(Entry); - ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); + ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); ASSERT_LIST_INVARIANT(ListHead); /* Get the back link */ Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Tue Jun 1 22:06:53 2010 @@ -457,11 +457,15 @@ PMEMORY_ALLOCATION_DESCRIPTOR Md; PLIST_ENTRY NextEntry; ULONG NrSystemPages = 0; + KIRQL OldIrql; /* This is what a used page looks like */ RtlZeroMemory(&UsedPage, sizeof(UsedPage)); UsedPage.u3.e1.PageLocation = ActiveAndValid; UsedPage.u3.e2.ReferenceCount = 1; + + /* Lock PFN database */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); /* Loop the memory descriptors */ for (NextEntry = KeLoaderBlock->MemoryDescriptorListHead.Flink; @@ -518,6 +522,9 @@ MmPfnDatabase[0][i] = UsedPage; NrSystemPages++; } + + /* Release the PFN database lock */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); KeInitializeEvent(&ZeroPageThreadEvent, NotificationEvent, TRUE); DPRINT("Pages: %x %x\n", MmAvailablePages, NrSystemPages);

14 years, 6 months

[gschneider] 47515: [FONTVIEW] Select the oldest font back into the DC, leftover from bug #5182

by gschneider＠svn.reactos.org

Author: gschneider Date: Tue Jun 1 21:36:43 2010 New Revision: 47515 URL: http://svn.reactos.org/svn/reactos?rev=47515&view=rev Log: [FONTVIEW] Select the oldest font back into the DC, leftover from bug #5182 Modified: trunk/reactos/base/applications/fontview/display.c Modified: trunk/reactos/base/applications/fontview/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/display.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/display.c [iso-8859-1] Tue Jun 1 21:36:43 2010 @@ -103,7 +103,7 @@ /* TODO: Output font info */ /* Output Character set */ - hOldFont = SelectObject(hDC, pData->hCharSetFont); + SelectObject(hDC, pData->hCharSetFont); GetTextMetrics(hDC, &tm); swprintf(szCaption, L"abcdefghijklmnopqrstuvwxyz"); TextOutW(hDC, 0, y, szCaption, wcslen(szCaption));

14 years, 6 months

[janderwald] 47514: [NTOS] - Fix assertion hit during install - Fix identation - Remove superflous spaces

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Jun 1 17:08:14 2010 New Revision: 47514 URL: http://svn.reactos.org/svn/reactos?rev=47514&view=rev Log: [NTOS] - Fix assertion hit during install - Fix identation - Remove superflous spaces Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Tue Jun 1 17:08:14 2010 @@ -59,8 +59,8 @@ { PFN_NUMBER OldBlink, EntryIndex = MiGetPfnEntryIndex(Entry); - ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); - ASSERT_LIST_INVARIANT(ListHead); + ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); + ASSERT_LIST_INVARIANT(ListHead); /* Get the back link */ OldBlink = ListHead->Blink; @@ -111,7 +111,7 @@ /* Use the zero list */ ListHead = &MmZeroedPageListHead; - ASSERT_LIST_INVARIANT(ListHead); + ASSERT_LIST_INVARIANT(ListHead); ListHead->Total++; /* Get the back link */ @@ -205,8 +205,8 @@ ListName = ListHead->ListName; ASSERT(ListHead != NULL); ASSERT(ListName <= FreePageList); - ASSERT_LIST_INVARIANT(ListHead); - + ASSERT_LIST_INVARIANT(ListHead); + /* Remove one count */ ASSERT(ListHead->Total != 0); ListHead->Total--; @@ -241,8 +241,8 @@ /* We are not on a list anymore */ Entry->u1.Flink = Entry->u2.Blink = 0; - ASSERT_LIST_INVARIANT(ListHead); - + ASSERT_LIST_INVARIANT(ListHead); + /* FIXME: Deal with color list */ /* See if we hit any thresholds */ @@ -292,7 +292,7 @@ /* Could be either on free or zero list */ ListHead = MmPageLocationList[Pfn1->u3.e1.PageLocation]; - ASSERT_LIST_INVARIANT(ListHead); + ASSERT_LIST_INVARIANT(ListHead); ListName = ListHead->ListName; ASSERT(ListName <= FreePageList); @@ -403,13 +403,13 @@ { #endif /* Check the free list */ - ASSERT_LIST_INVARIANT(&MmFreePageListHead); + ASSERT_LIST_INVARIANT(&MmFreePageListHead); PageIndex = MmFreePageListHead.Flink; Color = PageIndex & MmSecondaryColorMask; if (PageIndex == LIST_HEAD) { /* Check the zero list */ - ASSERT_LIST_INVARIANT(&MmZeroedPageListHead); + ASSERT_LIST_INVARIANT(&MmZeroedPageListHead); PageIndex = MmZeroedPageListHead.Flink; Color = PageIndex & MmSecondaryColorMask; ASSERT(PageIndex != LIST_HEAD); @@ -435,8 +435,8 @@ ASSERT(Pfn1->u2.ShareCount == 0); /* Return the page */ - ASSERT_LIST_INVARIANT(&MmFreePageListHead); - ASSERT_LIST_INVARIANT(&MmZeroedPageListHead); + ASSERT_LIST_INVARIANT(&MmFreePageListHead); + ASSERT_LIST_INVARIANT(&MmZeroedPageListHead); return PageIndex; } @@ -448,8 +448,8 @@ PFN_NUMBER Entry, Flink; PMMPFN Pfn1; - ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); - ASSERT_LIST_INVARIANT(ListHead); + ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + ASSERT_LIST_INVARIANT(ListHead); /* Get the entry that's currently first on the list */ Entry = ListHead->Flink; @@ -494,7 +494,7 @@ PMMCOLOR_TABLES ColorTable; #endif /* Make sure the page index is valid */ - ASSERT(KeGetCurrentIrql() >= DISPATCH_LEVEL); + ASSERT(KeGetCurrentIrql() >= DISPATCH_LEVEL); ASSERT((PageFrameIndex != 0) && (PageFrameIndex <= MmHighestPhysicalPage) && (PageFrameIndex >= MmLowestPhysicalPage)); @@ -511,7 +511,7 @@ /* Get the free page list and increment its count */ ListHead = &MmFreePageListHead; - ASSERT_LIST_INVARIANT(ListHead); + ASSERT_LIST_INVARIANT(ListHead); ListHead->Total++; /* Get the last page on the list */ @@ -529,7 +529,7 @@ /* Now make the list head point back to us (since we go at the end) */ ListHead->Blink = PageFrameIndex; - + /* And initialize our own list pointers */ Pfn1->u1.Flink = LIST_HEAD; Pfn1->u2.Blink = LastPage; @@ -537,7 +537,7 @@ /* Set the list name and default priority */ Pfn1->u3.e1.PageLocation = FreePageList; Pfn1->u4.Priority = 3; - + /* Clear some status fields */ Pfn1->u4.InPageError = 0; Pfn1->u4.AweAllocation = 0; @@ -557,7 +557,7 @@ KeSetEvent(MiHighMemoryEvent, 0, FALSE); } - ASSERT_LIST_INVARIANT(ListHead); + ASSERT_LIST_INVARIANT(ListHead); #if 0 // When using ARM3 PFN /* Get the page color */ @@ -678,10 +678,10 @@ } /* Grab a page */ - ASSERT_LIST_INVARIANT(&MmFreePageListHead); - ASSERT_LIST_INVARIANT(&MmZeroedPageListHead); + ASSERT_LIST_INVARIANT(&MmFreePageListHead); + ASSERT_LIST_INVARIANT(&MmZeroedPageListHead); PageFrameIndex = MiRemoveAnyPage(0); - + /* Write the software PTE */ ASSERT(PointerPte->u.Hard.Valid == 0); *PointerPte = TempPte; @@ -691,8 +691,8 @@ MiInitializePfn(PageFrameIndex, PointerPte, TRUE); /* Release the PFN lock and return the page */ - ASSERT_LIST_INVARIANT(&MmFreePageListHead); - ASSERT_LIST_INVARIANT(&MmZeroedPageListHead); + ASSERT_LIST_INVARIANT(&MmFreePageListHead); + ASSERT_LIST_INVARIANT(&MmZeroedPageListHead); KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); return PageFrameIndex; }

14 years, 6 months

[janderwald] 47513: [NPFS] - Fix 2 memory leaks when creating a pipe fails - Fix minor style issue

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Jun 1 12:57:26 2010 New Revision: 47513 URL: http://svn.reactos.org/svn/reactos?rev=47513&view=rev Log: [NPFS] - Fix 2 memory leaks when creating a pipe fails - Fix minor style issue Modified: trunk/reactos/drivers/filesystems/npfs/create.c trunk/reactos/drivers/filesystems/npfs/rw.c Modified: trunk/reactos/drivers/filesystems/npfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] Tue Jun 1 12:57:26 2010 @@ -255,8 +255,9 @@ if (ClientCcb->Data) { ExFreePool(ClientCcb->Data); - ClientCcb->Data = NULL; } + + ExFreePool(ClientCcb); KeUnlockMutex(&Fcb->CcbListLock); Irp->IoStatus.Status = STATUS_OBJECT_PATH_NOT_FOUND; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -273,6 +274,14 @@ else if (IsListEmpty(&Fcb->ServerCcbListHead)) { DPRINT("No server fcb found!\n"); + + if (ClientCcb->Data) + { + ExFreePool(ClientCcb->Data); + } + + ExFreePool(ClientCcb); + KeUnlockMutex(&Fcb->CcbListLock); Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; IoCompleteRequest(Irp, IO_NO_INCREMENT); Modified: trunk/reactos/drivers/filesystems/npfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] Tue Jun 1 12:57:26 2010 @@ -163,7 +163,7 @@ ASSERT(FALSE); } KeLockMutex(&ThreadContext->DeviceExt->PipeListLock); - Count = Status - STATUS_SUCCESS; + Count = Status - STATUS_WAIT_0; ASSERT (Count < CurrentCount); if (Count > 0) {

14 years, 6 months

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 June 2010