Ros-diffs July 2008

ros-diffs@reactos.org

25 participants
761 discussions

[jmorlan] 34288: - BITMAP_Cleanup: Fix leak of DIBSECTION structure; remove redundant ifs. - NtGdi(Get|Set)BitmapDimension: SEHify; set ERROR_INVALID_HANDLE on a bad non-NULL bitmap. - NtGdiGetDCforBitmap: Don't crash on bad bitmap.
by jmorlan＠svn.reactos.org 04 Jul '08

04 Jul '08

Author: jmorlan Date: Thu Jul 3 19:05:31 2008 New Revision: 34288 URL: http://svn.reactos.org/svn/reactos?rev=34288&view=rev Log: - BITMAP_Cleanup: Fix leak of DIBSECTION structure; remove redundant ifs. - NtGdi(Get|Set)BitmapDimension: SEHify; set ERROR_INVALID_HANDLE on a bad non-NULL bitmap. - NtGdiGetDCforBitmap: Don't crash on bad bitmap. Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Thu Jul 3 19:05:31 2008 @@ -133,13 +133,11 @@ { if (pBmp->dib == NULL) { - if (pBmp->SurfObj.pvBits != NULL) - ExFreePool(pBmp->SurfObj.pvBits); + ExFreePool(pBmp->SurfObj.pvBits); } else { - if (pBmp->SurfObj.pvBits != NULL) - EngFreeUserMem(pBmp->SurfObj.pvBits); + EngFreeUserMem(pBmp->SurfObj.pvBits); } if (pBmp->hDIBPalette != NULL) { @@ -152,6 +150,9 @@ ExFreePoolWithTag(pBmp->BitsLock, TAG_BITMAPOBJ); pBmp->BitsLock = NULL; } + + if (pBmp->dib) + ExFreePoolWithTag(pBmp->dib, TAG_DIB); return TRUE; } @@ -218,18 +219,32 @@ LPSIZE Dimension) { PBITMAPOBJ bmp; + BOOL Ret = TRUE; + + if (hBitmap == NULL) + return FALSE; bmp = BITMAPOBJ_LockBitmap(hBitmap); if (bmp == NULL) { + SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - *Dimension = bmp->dimension; + _SEH_TRY + { + ProbeForWrite(Dimension, sizeof(SIZE), 1); + *Dimension = bmp->dimension; + } + _SEH_HANDLE + { + Ret = FALSE; + } + _SEH_END BITMAPOBJ_UnlockBitmap(bmp); - return TRUE; + return Ret; } COLORREF STDCALL @@ -504,23 +519,39 @@ LPSIZE Size) { PBITMAPOBJ bmp; + BOOL Ret = TRUE; + + if (hBitmap == NULL) + return FALSE; bmp = BITMAPOBJ_LockBitmap(hBitmap); if (bmp == NULL) { + SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } if (Size) { - *Size = bmp->dimension; - } + _SEH_TRY + { + ProbeForWrite(Size, sizeof(SIZE), 1); + *Size = bmp->dimension; + } + _SEH_HANDLE + { + Ret = FALSE; + } + _SEH_END + } + + /* The dimension is changed even if writing the old value failed */ bmp->dimension.cx = Width; bmp->dimension.cy = Height; BITMAPOBJ_UnlockBitmap (bmp); - return TRUE; + return Ret; } BOOL STDCALL @@ -746,8 +777,11 @@ { HDC hDC = NULL; PBITMAPOBJ bmp = BITMAPOBJ_LockBitmap( hsurf ); - hDC = bmp->hDC; - BITMAPOBJ_UnlockBitmap( bmp ); + if (bmp) + { + hDC = bmp->hDC; + BITMAPOBJ_UnlockBitmap( bmp ); + } return hDC; }

1 0

[dreimer] 34287: Polish Translation Update for Calc by Olaf Siejka.
by dreimer＠svn.reactos.org 03 Jul '08

03 Jul '08

Author: dreimer Date: Thu Jul 3 14:41:46 2008 New Revision: 34287 URL: http://svn.reactos.org/svn/reactos?rev=34287&view=rev Log: Polish Translation Update for Calc by Olaf Siejka. Modified: trunk/reactos/base/applications/calc/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] Thu Jul 3 14:41:46 2008 @@ -1,5 +1,5 @@ /* - * translated by Caemyr - Olaf Siejka (Feb, 2008) + * translated by Caemyr - Olaf Siejka (Feb, Jun 2008) * Use ReactOS forum PM or IRC to contact me * http://www.reactos.org * IRC: irc.freenode.net #reactos-pl; @@ -242,16 +242,16 @@ MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Convert",IDC_BUTTON_CONVERT,35,105,76,17 + PUSHBUTTON "Konwersja",IDC_BUTTON_CONVERT,35,105,76,17 COMBOBOX IDC_COMBO_CATEGORY,4,31,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "Category:",IDC_STATIC,4,20,56,8 + LTEXT "Kategoria:",IDC_STATIC,4,20,56,8 COMBOBOX IDC_COMBO_FROM,4,60,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "Convert from:",IDC_STATIC,4,49,56,8 + LTEXT "Konwertuj z:",IDC_STATIC,4,49,56,8 COMBOBOX IDC_COMBO_TO,4,87,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "Convert to:",IDC_STATIC,4,76,56,8 + LTEXT "Konwertuj na:",IDC_STATIC,4,76,56,8 CONTROL "C",IDC_BUTTON_CANC,"Button",BS_OWNERDRAW | BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,276,24,40,17 CONTROL "CE",IDC_BUTTON_CE,"Button",BS_OWNERDRAW | BS_CENTER | @@ -293,7 +293,7 @@ BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,86,24,17 CONTROL "+",IDC_BUTTON_ADD,"Button",BS_OWNERDRAW | BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,105,24,17 - CONTROL "Sqrt",IDC_BUTTON_SQRT,"Button",BS_OWNERDRAW | BS_CENTER | + CONTROL "Pierw",IDC_BUTTON_SQRT,"Button",BS_OWNERDRAW | BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,48,24,17 CONTROL "%",IDC_BUTTON_PERCENT,"Button",BS_OWNERDRAW | BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,67,24,17 @@ -451,54 +451,54 @@ // types of conversion STRINGTABLE DISCARDABLE BEGIN - IDS_CONV_AREA "Area" - IDS_CONV_CONSUMPTION "Consumption (engines)" - IDS_CONV_CURRENCY "Currencies" - IDS_CONV_ENERGY "Energy" - IDS_CONV_LENGTH "Lenghts" - IDS_CONV_POWER "Power" - IDS_CONV_PRESSURE "Pressure" - IDS_CONV_TEMPERATURE "Temperature" - IDS_CONV_VELOCITY "Velocity" - IDS_CONV_VOLUME "Volume" - IDS_CONV_WEIGHT "Weights" + IDS_CONV_AREA "Powierzchnia" + IDS_CONV_CONSUMPTION "Zu¿ycie (silniki)" + IDS_CONV_CURRENCY "Waluty" + IDS_CONV_ENERGY "Energia" + IDS_CONV_LENGTH "D³ugoæ" + IDS_CONV_POWER "Moc" + IDS_CONV_PRESSURE "Cinienie" + IDS_CONV_TEMPERATURE "Temperatura" + IDS_CONV_VELOCITY "Prêdkoæ" + IDS_CONV_VOLUME "Objêtoæ" + IDS_CONV_WEIGHT "Waga" END // TYPES OF AREAS STRINGTABLE DISCARDABLE BEGIN - IDS_AREA_ACRES "Acres" - IDS_AREA_ACRES_BRAZIL "Acres (Brazil)" - IDS_AREA_ACRES_FRANCE "Acres (France)" - IDS_AREA_ACRES_SCOTS "Acres (Scots)" - IDS_AREA_ACRES_US "Acres (US)" - IDS_AREA_ARES "Ares" + IDS_AREA_ACRES "Akry" + IDS_AREA_ACRES_BRAZIL "Akry (Brazylia)" + IDS_AREA_ACRES_FRANCE "Akry (Francja)" + IDS_AREA_ACRES_SCOTS "Akry (Szkocja)" + IDS_AREA_ACRES_US "Akry (USA)" + IDS_AREA_ARES "Ary" IDS_AREA_CHOU "Chou" IDS_AREA_DANBO "Danbo" - IDS_AREA_HECTARES "Hectares" + IDS_AREA_HECTARES "Hektary" IDS_AREA_JEONGBO "Jeongbo" - IDS_AREA_MORGEN_HUNGARY "Morgen (Hungary)" + IDS_AREA_MORGEN_HUNGARY "Morgi (Wêgry)" IDS_AREA_MU "Mu" IDS_AREA_PING "Ping" IDS_AREA_PYEONG "Pyeong" IDS_AREA_PYEONGBANGJA "Pyeongbangja" IDS_AREA_RAI "Rai" IDS_AREA_SE "Se" - IDS_AREA_SQUARE_CENTIMETERS "Square centimeters" - IDS_AREA_SQUARE_CHR "Square chr" - IDS_AREA_SQUARE_FATHOMS "Square fathoms" - IDS_AREA_SQUARE_FATHOMS_HUNGARY "Square fathoms (Hungary)" - IDS_AREA_SQUARE_FEET "Square feet" - IDS_AREA_SQUARE_INCHES "Square inches" - IDS_AREA_SQUARE_KILOMETERS "Square kilometers" - IDS_AREA_SQUARE_LAR "Square lar" - IDS_AREA_SQUARE_METER "Square meter" - IDS_AREA_SQUARE_MILES "Square miles" - IDS_AREA_SQUARE_MILLIMETERS "Square millimeters" - IDS_AREA_SQUARE_SHAKU "Square shaku" - IDS_AREA_SQUARE_TSUEN "Square tsuen" - IDS_AREA_SQUARE_VA "Square va" - IDS_AREA_SQUARE_YARD "Square yard" + 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_TAN "Tan" IDS_AREA_TSUBO "Tsubo" END @@ -506,81 +506,81 @@ // TYPES OF COMSUMPTIONS STRINGTABLE DISCARDABLE BEGIN - IDS_CONSUMPTION_KM_PER_L "Kilometer/liter" - IDS_CONSUMPTION_L_PER_100_KM "Liters/100 kilometers" - IDS_CONSUMPTION_MILES_GALLON_UK "Miles/gallon (UK)" - IDS_CONSUMPTION_MILES_GALLON_US "Miles/gallon (US)" + 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)" END // TYPES OF CURRENCIES STRINGTABLE DISCARDABLE BEGIN - IDS_CURRENCY_AUSTRIAN_SCHILLING "Austrian schilling" - IDS_CURRENCY_BELGIAN_FRANC "Belgian franc" - IDS_CURRENCY_CYPRIOT_POUND "Cypriot pound" - IDS_CURRENCY_DEUTSCHE_MARK "Deutsche Mark" - IDS_CURRENCY_DUTCH_GUILDER "Dutch guilder" + IDS_CURRENCY_AUSTRIAN_SCHILLING "Austriacki szyling" + IDS_CURRENCY_BELGIAN_FRANC "Belgijski frank" + IDS_CURRENCY_CYPRIOT_POUND "Cypryjski funt" + IDS_CURRENCY_DEUTSCHE_MARK "Niemiecka marka" + IDS_CURRENCY_DUTCH_GUILDER "Holenderki gulden" IDS_CURRENCY_EURO "Euro" - IDS_CURRENCY_FINNISH_MARKKA "Finnish markka" - IDS_CURRENCY_FRENCH_FRANC "French franc" - IDS_CURRENCY_GREEK_DRACHMA "Greek Drachma" - IDS_CURRENCY_IRISH_POUND "Irish pound" - IDS_CURRENCY_ITALIAN_LIRA "Italian lira" - IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc" - IDS_CURRENCY_MALTESE_LIRA "Maltese lira" - IDS_CURRENCY_PORTOGUESE_ESCUDO "Portoguese escudo" - IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenian tolar" - IDS_CURRENCY_SPANISH_PESETA "Spanish peseta" + IDS_CURRENCY_FINNISH_MARKKA "Fiñska marka" + IDS_CURRENCY_FRENCH_FRANC "Francuski frank" + IDS_CURRENCY_GREEK_DRACHMA "Grecka drachma" + IDS_CURRENCY_IRISH_POUND "Irlandzki funt" + IDS_CURRENCY_ITALIAN_LIRA "W³oskie liry" + IDS_CURRENCY_LUXEMBOURG_FRANC "Luksemburski frank" + IDS_CURRENCY_MALTESE_LIRA "Maltañskie liry" + IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugalskie escudo" + IDS_CURRENCY_SLOVENIAN_TOLAR "S³oveñski tolar" + IDS_CURRENCY_SPANISH_PESETA "Hiszpañska peseta" END // TYPES OF ENERGIES STRINGTABLE DISCARDABLE BEGIN - IDS_ENERGY_15_C_CALORIES "15 ^C calories" - IDS_ENERGY_ERGS "Ergs" - IDS_ENERGY_IT_CALORIES "International Table calories" - IDS_ENERGY_JOULES "Joules" - IDS_ENERGY_KILOJOULES "Kilojoules" - IDS_ENERGY_KILOWATT_HOURS "Kilowatt hours" - IDS_ENERGY_NUTRITION_CALORIES "Nutrition calories" - IDS_ENERGY_TH_CALORIES "Thermochemical calorie" + IDS_ENERGY_15_C_CALORIES "15 ^C kalorii" + IDS_ENERGY_ERGS "Ergów" + IDS_ENERGY_IT_CALORIES "Miêdzynarodowa Tablica kalorii" + 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" END // TYPES OF LENGTHS STRINGTABLE DISCARDABLE BEGIN - IDS_LENGTH_ANGSTROMS "Angstroms" - IDS_LENGTH_ASTRONOMILA_UNITS "Astronomila units" - IDS_LENGTH_BARLEYCORNS "Barleycorns" - IDS_LENGTH_CENTIMETERS "Centimeters" + IDS_LENGTH_ANGSTROMS "Angsztremów" + IDS_LENGTH_ASTRONOMILA_UNITS "Jednostek Astronomicznych" + IDS_LENGTH_BARLEYCORNS "Palców" + IDS_LENGTH_CENTIMETERS "Centimetrów" 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 "Fathoms" - IDS_LENGTH_FATHOMS_HUNGARY "Fathoms (Hungary)" - IDS_LENGTH_FEET "Feet" + IDS_LENGTH_FATHOMS "S¹¿ni" + IDS_LENGTH_FATHOMS_HUNGARY "S¹¿ni (Wêgry)" + IDS_LENGTH_FEET "Stóp" IDS_LENGTH_FURLONGS "Furlongs" IDS_LENGTH_GAN "Gan" - IDS_LENGTH_HANDS "Hands" + IDS_LENGTH_HANDS "D³oni" IDS_LENGTH_HUNH "Hunh" - IDS_LENGTH_INCHES "Inches" + IDS_LENGTH_INCHES "Cali" IDS_LENGTH_JA "Ja" IDS_LENGTH_JEONG "Jeong" IDS_LENGTH_KABIET "Kabiet" IDS_LENGTH_KEN "Ken" IDS_LENGTH_KEUB "Keub" - IDS_LENGTH_KILOMETERS "Kilometers" + IDS_LENGTH_KILOMETERS "Kilometerów" IDS_LENGTH_LAR "Lar" - IDS_LENGTH_LIGHT_YEARS "Light years" + IDS_LENGTH_LIGHT_YEARS "Lat wietlnych" IDS_LENGTH_LINKS_UK "Links (UK)" - IDS_LENGTH_METERS "Meters" - IDS_LENGTH_MILES "Miles" - IDS_LENGTH_MILLIMETERS "Millimeters" - IDS_LENGTH_NAUTICAL_MILES "Nautical miles" + IDS_LENGTH_METERS "Metrów" + IDS_LENGTH_MILES "Mil" + IDS_LENGTH_MILLIMETERS "Millimetrów" + IDS_LENGTH_NAUTICAL_MILES "Mil morskich" IDS_LENGTH_NIEU "Nieu" - IDS_LENGTH_PARSECS "Parsecs" + IDS_LENGTH_PARSECS "Parseków" IDS_LENGTH_PICAS "Picas" IDS_LENGTH_RI_JAPAN "Ri (Japan)" IDS_LENGTH_RI_KOREA "Ri (Korea)" @@ -591,7 +591,7 @@ IDS_LENGTH_SUN "Sun" IDS_LENGTH_TSUEN "Tsuen" IDS_LENGTH_VA "Va" - IDS_LENGTH_YARDS "Yards" + IDS_LENGTH_YARDS "Jardów" IDS_LENGTH_YOTE "Yote" IDS_LENGTH_ZHANG "Zhang" END @@ -599,74 +599,74 @@ // TYPES OF POWERS STRINGTABLE DISCARDABLE BEGIN - IDS_POWER_HORSEPOWER "Horsepower" - IDS_POWER_KILOWATTS "Kilowatts" - IDS_POWER_MEGAWATTS "Megawatts" - IDS_POWER_WATTS "Watts" + IDS_POWER_HORSEPOWER "Koni mechanicznych" + IDS_POWER_KILOWATTS "Kilowatów" + IDS_POWER_MEGAWATTS "Megawatów" + IDS_POWER_WATTS "Watów" END // TYPE OF PRESSURES STRINGTABLE DISCARDABLE BEGIN - IDS_PRESSURE_ATMOSPHERES "Atmospheres" - IDS_PRESSURE_BARS "Bars" - IDS_PRESSURE_MM_OF_MERCURY "Millimeters of mercury" - IDS_PRESSURE_PASCALS "Pascals" - IDS_PRESSURE_PSI "Pounds-force per square inch" + IDS_PRESSURE_ATMOSPHERES "Atmosfer" + IDS_PRESSURE_BARS "Barów" + IDS_PRESSURE_MM_OF_MERCURY "Millimetrów s³upka rtêci" + IDS_PRESSURE_PASCALS "Paskali" + IDS_PRESSURE_PSI "Funtów na cal kwadratowy" END // TYPES OF TEMPERATURES STRINGTABLE DISCARDABLE BEGIN - IDS_TEMPERATURE_CELSIUS "Celsius" - IDS_TEMPERATURE_FAHRENHEIT "Fahrenheit" - IDS_TEMPERATURE_KELVIN "Kelvin" - IDS_TEMPERATURE_RANKINE "Rankine" + IDS_TEMPERATURE_CELSIUS "Celsiusza" + IDS_TEMPERATURE_FAHRENHEIT "Fahrenheita" + IDS_TEMPERATURE_KELVIN "Kelvina" + IDS_TEMPERATURE_RANKINE "Rankina" END // TYPES OF VELOCITIES STRINGTABLE DISCARDABLE BEGIN - IDS_VELOCITY_FEET_HOUR "Feet/hour" - IDS_VELOCITY_KILOMETERS_HOUR "Kilometers/hour" - IDS_VELOCITY_KNOTS "Knots" - IDS_VELOCITY_MACH "Mach" - IDS_VELOCITY_METERS_SECOND "Meters/second" - IDS_VELOCITY_MILES_HOUR "Miles/hour" + IDS_VELOCITY_FEET_HOUR "Stóp/godzinê" + 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ê" END // TYPES OF VOLUMES STRINGTABLE DISCARDABLE BEGIN - IDS_VOLUME_BARRELS_UK "Barrels (UK)" - IDS_VOLUME_BARRELS_OIL "Barrels oil" + IDS_VOLUME_BARRELS_UK "Bary³ek (UK)" + IDS_VOLUME_BARRELS_OIL "Bary³ek" IDS_VOLUME_BUN "Bun" - IDS_VOLUME_BUSHELS_UK "Bushels (UK)" - IDS_VOLUME_BUSHELS_US "Bushels (US)" - IDS_VOLUME_CUBIC_CENTIMETERS "Cubic centimeters" - IDS_VOLUME_CUBIC_FEET "Cubic feet" - IDS_VOLUME_CUBIC_INCHES "Cubic inches" - IDS_VOLUME_CUBIC_METERS "Cubic meters" - IDS_VOLUME_CUBIC_YARDS "Cubic yards" + 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_DOE "Doe" - IDS_VOLUME_FLUID_OUNCES_UK "Fluid ounces (UK)" - IDS_VOLUME_FLUID_OUNCES_US "Fluid ounces (US)" - IDS_VOLUME_GALLONS_UK "Gallons (UK)" - IDS_VOLUME_GALLONS_DRY_US "Gallons, dry (US)" - IDS_VOLUME_GALLONS_LIQUID_US "Gallons, liquid (US)" + 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_GOU "Gou" IDS_VOLUME_HOP "Hop" IDS_VOLUME_ICCE "Icce" IDS_VOLUME_KWIAN "Kwian" - IDS_VOLUME_LITERS "Liters" + IDS_VOLUME_LITERS "Litrów" IDS_VOLUME_MAL "Mal" IDS_VOLUME_MILLILITERS "Milliliters" - IDS_VOLUME_PINTS_UK "Pints (UK)" - IDS_VOLUME_PINTS_DRY_US "Pints, dry (US)" - IDS_VOLUME_PINTS_LIQUID_US "Pints, liquid (US)" - IDS_VOLUME_QUARTS_UK "Quarts (UK)" - IDS_VOLUME_QUARTS_DRY_US "Quarts, dry (US)" - IDS_VOLUME_QUARTS_LIQUID_US "Quarts, liquid (US)" + 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_SEKI "Seki" IDS_VOLUME_SYOU "Syou" IDS_VOLUME_TANANLOUNG "Tananloung" @@ -677,30 +677,30 @@ // TYPES OF WEIGHTS STRINGTABLE DISCARDABLE BEGIN - IDS_WEIGHT_BAHT "Baht" - IDS_WEIGHT_CARATS "Carats" + IDS_WEIGHT_BAHT "Bahtów" + IDS_WEIGHT_CARATS "Karatów" IDS_WEIGHT_CHUNG "Chung" IDS_WEIGHT_DON "Don" IDS_WEIGHT_GEUN "Geun" - IDS_WEIGHT_GRAMS "Grams" + IDS_WEIGHT_GRAMS "Gramów" 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 "Kilograms" + IDS_WEIGHT_KILOGRAMS "Kilogramów" IDS_WEIGHT_KIN "Kin" IDS_WEIGHT_LIANG_CHINA "Liang (China)" IDS_WEIGHT_LIANG_TAIWAN "Liang (Taiwan)" IDS_WEIGHT_MONME "Monme" - IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Ounces, avoirdupois" - IDS_WEIGHT_OUNCES_TROY "Ounces, troy" - IDS_WEIGHT_POUNDS "Pounds" - IDS_WEIGHT_QUINTAL_METRIC "Quintal (metric)" + IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Uncji, avoirdupois" + IDS_WEIGHT_OUNCES_TROY "Uncji, aptekarskie" + IDS_WEIGHT_POUNDS "Funtów" + IDS_WEIGHT_QUINTAL_METRIC "Kwintali" IDS_WEIGHT_SALOUNG "Saloung" - IDS_WEIGHT_STONES "Stones" + IDS_WEIGHT_STONES "Kamieni" IDS_WEIGHT_TAMLUNG "Tamlung" - IDS_WEIGHT_TONNES "Tonnes" - IDS_WEIGHT_TONS_UK "Tons (UK)" - IDS_WEIGHT_TONS_US "Tons (US)" -END + IDS_WEIGHT_TONNES "Ton" + IDS_WEIGHT_TONS_UK "Ton (UK)" + IDS_WEIGHT_TONS_US "Ton (US)" +END

1 0

[jimtabor] 34286: Add warning for GetLastActivePopup.
by jimtabor＠svn.reactos.org 03 Jul '08

03 Jul '08

Author: jimtabor Date: Thu Jul 3 13:19:16 2008 New Revision: 34286 URL: http://svn.reactos.org/svn/reactos?rev=34286&view=rev Log: Add warning for GetLastActivePopup. Modified: trunk/reactos/dll/win32/user32/windows/window.c Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Thu Jul 3 13:19:16 2008 @@ -923,7 +923,7 @@ { PWINDOW Wnd, WndParent; HWND Ret = NULL; - + WARN("Not fully implemented!"); Wnd = ValidateHwnd(hWnd); if (Wnd != NULL) {

1 0

[janderwald] 34285: - add an empty dialog resource - implement initializing the dialog - fixes bug 3443
by janderwald＠svn.reactos.org 03 Jul '08

03 Jul '08

Author: janderwald Date: Thu Jul 3 11:46:39 2008 New Revision: 34285 URL: http://svn.reactos.org/svn/reactos?rev=34285&view=rev Log: - add an empty dialog resource - implement initializing the dialog - fixes bug 3443 Modified: trunk/reactos/dll/cpl/telephon/lang/bg-BG.rc trunk/reactos/dll/cpl/telephon/lang/de-DE.rc trunk/reactos/dll/cpl/telephon/lang/el-GR.rc trunk/reactos/dll/cpl/telephon/lang/en-US.rc trunk/reactos/dll/cpl/telephon/lang/es-ES.rc trunk/reactos/dll/cpl/telephon/lang/fr-FR.rc trunk/reactos/dll/cpl/telephon/lang/it-IT.rc trunk/reactos/dll/cpl/telephon/lang/pl-PL.rc trunk/reactos/dll/cpl/telephon/lang/ru-RU.rc trunk/reactos/dll/cpl/telephon/lang/sk-SK.rc trunk/reactos/dll/cpl/telephon/lang/uk-UA.rc trunk/reactos/dll/cpl/telephon/resource.h trunk/reactos/dll/cpl/telephon/telephon.c Modified: trunk/reactos/dll/cpl/telephon/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/bg-B… ============================================================================== --- trunk/reactos/dll/cpl/telephon/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/telephon/lang/bg-BG.rc [iso-8859-1] Thu Jul 3 11:46:39 2008 @@ -1,4 +1,11 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT + +IDD_PROPPAGE DIALOGEX 0, 0, 246, 230 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN +END STRINGTABLE BEGIN Modified: trunk/reactos/dll/cpl/telephon/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/de-D… ============================================================================== --- trunk/reactos/dll/cpl/telephon/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/telephon/lang/de-DE.rc [iso-8859-1] Thu Jul 3 11:46:39 2008 @@ -1,4 +1,11 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDD_PROPPAGE DIALOGEX 0, 0, 246, 230 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN +END STRINGTABLE BEGIN Modified: trunk/reactos/dll/cpl/telephon/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/el-G… ============================================================================== --- trunk/reactos/dll/cpl/telephon/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/telephon/lang/el-GR.rc [iso-8859-1] Thu Jul 3 11:46:39 2008 @@ -1,4 +1,11 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +IDD_PROPPAGE DIALOGEX 0, 0, 246, 230 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN +END STRINGTABLE BEGIN Modified: trunk/reactos/dll/cpl/telephon/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/en-U… ============================================================================== --- trunk/reactos/dll/cpl/telephon/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/telephon/lang/en-US.rc [iso-8859-1] Thu Jul 3 11:46:39 2008 @@ -1,4 +1,11 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDD_PROPPAGE DIALOGEX 0, 0, 246, 230 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN +END STRINGTABLE BEGIN Modified: trunk/reactos/dll/cpl/telephon/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/es-E… ============================================================================== --- trunk/reactos/dll/cpl/telephon/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/telephon/lang/es-ES.rc [iso-8859-1] Thu Jul 3 11:46:39 2008 @@ -1,4 +1,11 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +IDD_PROPPAGE DIALOGEX 0, 0, 246, 230 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN +END STRINGTABLE BEGIN Modified: trunk/reactos/dll/cpl/telephon/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/fr-F… ============================================================================== --- trunk/reactos/dll/cpl/telephon/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/telephon/lang/fr-FR.rc [iso-8859-1] Thu Jul 3 11:46:39 2008 @@ -1,4 +1,11 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_PROPPAGE DIALOGEX 0, 0, 246, 230 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN +END STRINGTABLE BEGIN Modified: trunk/reactos/dll/cpl/telephon/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/it-I… ============================================================================== --- trunk/reactos/dll/cpl/telephon/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/telephon/lang/it-IT.rc [iso-8859-1] Thu Jul 3 11:46:39 2008 @@ -1,4 +1,11 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +IDD_PROPPAGE DIALOGEX 0, 0, 246, 230 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN +END STRINGTABLE BEGIN Modified: trunk/reactos/dll/cpl/telephon/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/pl-P… ============================================================================== --- trunk/reactos/dll/cpl/telephon/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/telephon/lang/pl-PL.rc [iso-8859-1] Thu Jul 3 11:46:39 2008 @@ -7,6 +7,13 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +IDD_PROPPAGE DIALOGEX 0, 0, 246, 230 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Opcje telefonu i modemu" Modified: trunk/reactos/dll/cpl/telephon/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/ru-R… ============================================================================== --- trunk/reactos/dll/cpl/telephon/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/telephon/lang/ru-RU.rc [iso-8859-1] Thu Jul 3 11:46:39 2008 @@ -1,4 +1,11 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_PROPPAGE DIALOGEX 0, 0, 246, 230 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN +END STRINGTABLE BEGIN Modified: trunk/reactos/dll/cpl/telephon/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/sk-S… ============================================================================== --- trunk/reactos/dll/cpl/telephon/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/telephon/lang/sk-SK.rc [iso-8859-1] Thu Jul 3 11:46:39 2008 @@ -1,4 +1,11 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +IDD_PROPPAGE DIALOGEX 0, 0, 246, 230 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN +END STRINGTABLE BEGIN Modified: trunk/reactos/dll/cpl/telephon/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/uk-U… ============================================================================== --- trunk/reactos/dll/cpl/telephon/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/telephon/lang/uk-UA.rc [iso-8859-1] Thu Jul 3 11:46:39 2008 @@ -8,6 +8,13 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +IDD_PROPPAGE DIALOGEX 0, 0, 246, 230 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN +END + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Òåëåôîí ³ ìîäåì" Modified: trunk/reactos/dll/cpl/telephon/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/resource.… ============================================================================== --- trunk/reactos/dll/cpl/telephon/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/telephon/resource.h [iso-8859-1] Thu Jul 3 11:46:39 2008 @@ -4,6 +4,8 @@ /* icons */ #define IDI_CPLSYSTEM 100 +/* dialogs */ +#define IDD_PROPPAGE 200 /* strings */ #define IDS_CPLSYSTEMNAME 1001 #define IDS_CPLSYSTEMDESCRIPTION 2001 Modified: trunk/reactos/dll/cpl/telephon/telephon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/telephon.… ============================================================================== --- trunk/reactos/dll/cpl/telephon/telephon.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/telephon/telephon.c [iso-8859-1] Thu Jul 3 11:46:39 2008 @@ -41,6 +41,39 @@ {IDI_CPLSYSTEM, IDS_CPLSYSTEMNAME, IDS_CPLSYSTEMDESCRIPTION, SystemApplet} }; +/* Property page dialog callback */ +INT_PTR CALLBACK +TelephonPageProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + + switch (uMsg) + { + case WM_INITDIALOG: + return TRUE; + } + + return FALSE; +} + + + +static VOID +InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc) +{ + ZeroMemory(psp, sizeof(PROPSHEETPAGE)); + psp->dwSize = sizeof(PROPSHEETPAGE); + psp->dwFlags = PSP_DEFAULT; + psp->hInstance = hApplet; + psp->pszTemplate = MAKEINTRESOURCE(idDlg); + psp->pfnDlgProc = DlgProc; +} + + /* First Applet */ LONG CALLBACK SystemApplet(VOID) @@ -63,7 +96,7 @@ psh.ppsp = psp; psh.pfnCallback = NULL; - //InitPropSheetPage(&psp[0], IDD_PROPPAGE, (DLGPROC)PageProc); + InitPropSheetPage(&psp[0], IDD_PROPPAGE, (DLGPROC)TelephonPageProc); return (LONG)(PropertySheet(&psh) != -1); }

1 0

[jmorlan] 34284: Fix menu leaks in explorer
by jmorlan＠svn.reactos.org 03 Jul '08

03 Jul '08

Author: jmorlan Date: Thu Jul 3 10:58:37 2008 New Revision: 34284 URL: http://svn.reactos.org/svn/reactos?rev=34284&view=rev Log: Fix menu leaks in explorer Modified: trunk/reactos/base/shell/explorer/desktop/desktop.cpp trunk/reactos/base/shell/explorer/explorer.cpp trunk/reactos/base/shell/explorer/utility/shellclasses.cpp trunk/reactos/base/shell/explorer/utility/utility.h Modified: trunk/reactos/base/shell/explorer/desktop/desktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/deskto… ============================================================================== --- trunk/reactos/base/shell/explorer/desktop/desktop.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/desktop/desktop.cpp [iso-8859-1] Thu Jul 3 10:58:37 2008 @@ -656,6 +656,7 @@ } } else _cm_ifs.reset(); + DestroyMenu(hmenu); } pcm->Release(); Modified: trunk/reactos/base/shell/explorer/explorer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] Thu Jul 3 10:58:37 2008 @@ -855,6 +855,8 @@ { HMENU hMenu = LoadMenu(g_Globals._hInstance, MAKEINTRESOURCE(nid)); _hmenu = GetSubMenu(hMenu, 0); + RemoveMenu(hMenu, 0, MF_BYPOSITION); + DestroyMenu(hMenu); } Modified: trunk/reactos/base/shell/explorer/utility/shellclasses.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/shellclasses.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/utility/shellclasses.cpp [iso-8859-1] Thu Jul 3 10:58:37 2008 @@ -566,6 +566,7 @@ } } else cm_ifs.reset(); + DestroyMenu(hmenu); } pcm->Release(); Modified: trunk/reactos/base/shell/explorer/utility/utility.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/utility.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/utility/utility.h [iso-8859-1] Thu Jul 3 10:58:37 2008 @@ -663,6 +663,11 @@ { } + ~PopupMenu() + { + DestroyMenu(_hmenu); + } + PopupMenu(UINT nid); operator HMENU() {return _hmenu;}

1 0

[jmorlan] 34283: Don't use msvcrt functions in kernel32; it will cause bug 3373 to reappear
by jmorlan＠svn.reactos.org 03 Jul '08

03 Jul '08

Author: jmorlan Date: Thu Jul 3 09:57:37 2008 New Revision: 34283 URL: http://svn.reactos.org/svn/reactos?rev=34283&view=rev Log: Don't use msvcrt functions in kernel32; it will cause bug 3373 to reappear 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] Thu Jul 3 09:57:37 2008 @@ -298,7 +298,7 @@ p = (PWCHAR)lpComputerName; while (*p != 0) { - if (!(iswalnum(*p) || *p == L'!' || *p == L'@' || *p == L'#' || + if (!(iswctype(*p, _ALPHA | _DIGIT) || *p == L'!' || *p == L'@' || *p == L'#' || *p == L'$' || *p == L'%' || *p == L'^' || *p == L'&' || *p == L'\'' || *p == L')' || *p == L'(' || *p == L'.' || *p == L'-' || *p == L'_' || *p == L'{' || *p == L'}' || *p == L'~'))

1 0

[fireball] 34282: - Fix double linking of snprintf (_snprintf should be used in CRT). - Add a #undef guard for snprintf in consistency with how it previously was implemented in CRT.
by fireball＠svn.reactos.org 03 Jul '08

03 Jul '08

Author: fireball Date: Thu Jul 3 07:07:12 2008 New Revision: 34282 URL: http://svn.reactos.org/svn/reactos?rev=34282&view=rev Log: - Fix double linking of snprintf (_snprintf should be used in CRT). - Add a #undef guard for snprintf in consistency with how it previously was implemented in CRT. Modified: trunk/reactos/lib/sdk/crt/locale/locale.c trunk/reactos/lib/sdk/crt/string/wcs.c Modified: trunk/reactos/lib/sdk/crt/locale/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/locale/locale.… ============================================================================== --- trunk/reactos/lib/sdk/crt/locale/locale.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/locale/locale.c [iso-8859-1] Thu Jul 3 07:07:12 2008 @@ -489,7 +489,7 @@ MSVCRT_current_lc_all_lcid = lcid; - snprintf(MSVCRT_current_lc_all,MAX_LOCALE_LENGTH,"%s_%s.%s", + _snprintf(MSVCRT_current_lc_all,MAX_LOCALE_LENGTH,"%s_%s.%s", lc.found_language,lc.found_country,lc.found_codepage); switch (category) { Modified: trunk/reactos/lib/sdk/crt/string/wcs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcs.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/wcs.c [iso-8859-1] Thu Jul 3 07:07:12 2008 @@ -48,6 +48,7 @@ #undef sprintf #undef wsprintf +#undef snprintf #undef vsnprintf #undef vprintf #undef vwprintf

1 0

[cwittich] 34281: fix a typo
by cwittich＠svn.reactos.org 03 Jul '08

03 Jul '08

Author: cwittich Date: Thu Jul 3 05:19:12 2008 New Revision: 34281 URL: http://svn.reactos.org/svn/reactos?rev=34281&view=rev Log: fix a typo Modified: trunk/reactos/base/applications/sndvol32/sndvol32.c Modified: trunk/reactos/base/applications/sndvol32/sndvol32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/sndvol32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/sndvol32.c [iso-8859-1] Thu Jul 3 05:19:12 2008 @@ -848,7 +848,7 @@ } else { - DPRINT("Failed to creat application window (LastError: %d)!\n", GetLastError()); + DPRINT("Failed to create application window (LastError: %d)!\n", GetLastError()); } UnregisterApplicationClasses();

1 0

[pschweitzer] 34280: Stubbed NtfsGetNetworkOpenInformation
by pschweitzer＠svn.reactos.org 03 Jul '08

03 Jul '08

Author: pschweitzer Date: Thu Jul 3 04:15:46 2008 New Revision: 34280 URL: http://svn.reactos.org/svn/reactos?rev=34280&view=rev Log: Stubbed NtfsGetNetworkOpenInformation Modified: branches/pierre-fsd/drivers/filesystems/ntfs/finfo.c Modified: branches/pierre-fsd/drivers/filesystems/ntfs/finfo.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/ntfs/finfo.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/ntfs/finfo.c [iso-8859-1] Thu Jul 3 04:15:46 2008 @@ -177,10 +177,19 @@ return(STATUS_SUCCESS); } +static NTSTATUS +NtfsGetNetworkOpenInformation(PNTFS_FCB Fcb, + PNTFS_VCB Vcb, + PFILE_NETWORK_OPEN_INFORMATION NetworkInfo, + PULONG BufferLength) +{ + UNIMPLEMENTED; + return STATUS_SUCCESS; +} NTSTATUS NTAPI NtfsFsdQueryInformation(PDEVICE_OBJECT DeviceObject, - PIRP Irp) + PIRP Irp) /* * FUNCTION: Retrieve the specified file information */ @@ -189,6 +198,7 @@ PIO_STACK_LOCATION Stack; PFILE_OBJECT FileObject; PNTFS_FCB Fcb; + PNTFS_VCB Vcb; PVOID SystemBuffer; ULONG BufferLength; @@ -200,6 +210,7 @@ FileInformationClass = Stack->Parameters.QueryFile.FileInformationClass; FileObject = Stack->FileObject; Fcb = FileObject->FsContext; + Vcb = DeviceObject->DeviceExtension; SystemBuffer = Irp->AssociatedIrp.SystemBuffer; BufferLength = Stack->Parameters.QueryFile.Length; @@ -240,6 +251,12 @@ SystemBuffer, &BufferLength); break; + case FileNetworkOpenInformation: + Status = NtfsGetNetworkOpenInformation(Fcb, + Vcb, + SystemBuffer, + &BufferLength); + break; case FileAlternateNameInformation: case FileAllInformation:

1 0

[cwittich] 34279: fix a typo
by cwittich＠svn.reactos.org 03 Jul '08

03 Jul '08

Author: cwittich Date: Thu Jul 3 03:16:34 2008 New Revision: 34279 URL: http://svn.reactos.org/svn/reactos?rev=34279&view=rev Log: fix a typo Modified: trunk/reactos/drivers/base/kdcom/kdbg.c Modified: trunk/reactos/drivers/base/kdcom/kdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdbg.c?… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdbg.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/kdbg.c [iso-8859-1] Thu Jul 3 03:16:34 2008 @@ -275,7 +275,7 @@ sprintf(buffer, "\nSerial port COM%ld found at 0x%lx\n", PortInformation->ComPort, - ComPortBase]; + ComPortBase); HalDisplayString(buffer); #endif /* NDEBUG */

1 0

← Newer
1
...
68
69
70
71
72
73
74
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2008