Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 37195: - Add and update Gdi entry flags.
by jimtabor＠svn.reactos.org 05 Nov '08

05 Nov '08

Author: jimtabor Date: Tue Nov 4 18:38:52 2008 New Revision: 37195 URL: http://svn.reactos.org/svn/reactos?rev=37195&view=rev Log: - Add and update Gdi entry flags. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] Tue Nov 4 18:38:52 2008 @@ -42,7 +42,9 @@ #define GDI_ENTRY_UPPER_SHIFT 16 /* GDI Entry Flags */ -#define GDI_ENTRY_FLAG_NEED_UPDATE 4 +#define GDI_ENTRY_UNDELETABLE 1 +#define GDI_ENTRY_DELETING 2 +#define GDI_ENTRY_VALIDATE_VIS 4 /*! \defgroup GDI object types * Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] Tue Nov 4 18:38:52 2008 @@ -2092,7 +2092,7 @@ INT Index = GDI_HANDLE_GET_INDEX(pDC->BaseObject.hHmgr); PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; pDC->DC_Flags |= DC_FLAG_DIRTY_RAO; - Entry->Flags |= GDI_ENTRY_FLAG_NEED_UPDATE; + Entry->Flags |= GDI_ENTRY_VALIDATE_VIS; IntGdiSetEmptyRect((PRECT)&pDC->erclClip); } @@ -2103,7 +2103,7 @@ INT Index = GDI_HANDLE_GET_INDEX(pDC->BaseObject.hHmgr); PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; pDC->DC_Flags |= DC_FLAG_DIRTY_RAO; - Entry->Flags |= GDI_ENTRY_FLAG_NEED_UPDATE; + Entry->Flags |= GDI_ENTRY_VALIDATE_VIS; IntGdiSetEmptyRect((PRECT)&pDC->erclClip); REGION_Delete(pDC->prgnVis); pDC->prgnVis = prgnDefault; @@ -2117,7 +2117,7 @@ PDC_ATTR pDc_Attr; RECTL rcl; - if (Entry->Flags & GDI_ENTRY_FLAG_NEED_UPDATE) + if (Entry->Flags & GDI_ENTRY_VALIDATE_VIS) { pDc_Attr = pDC->pDc_Attr; if ( !pDc_Attr ) pDc_Attr = &pDC->Dc_Attr; @@ -2141,7 +2141,7 @@ pDc_Attr->VisRectRegion.Rect = rcl; - Entry->Flags &= ~GDI_ENTRY_FLAG_NEED_UPDATE; + Entry->Flags &= ~GDI_ENTRY_VALIDATE_VIS; } }

1 0

[jimtabor] 37194: Patch by Daniel Zimmerman : Fix a lot of missing ExFreePoolWithTag. See bug 3848.
by jimtabor＠svn.reactos.org 04 Nov '08

04 Nov '08

Author: jimtabor Date: Tue Nov 4 17:49:07 2008 New Revision: 37194 URL: http://svn.reactos.org/svn/reactos?rev=37194&view=rev Log: Patch by Daniel Zimmerman : Fix a lot of missing ExFreePoolWithTag. See bug 3848. Modified: trunk/reactos/subsystems/win32/win32k/eng/clip.c trunk/reactos/subsystems/win32/win32k/misc/driver.c trunk/reactos/subsystems/win32/win32k/ntuser/event.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c trunk/reactos/subsystems/win32/win32k/ntuser/menu.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/objects/fillshap.c trunk/reactos/subsystems/win32/win32k/objects/freetype.c trunk/reactos/subsystems/win32/win32k/objects/line.c trunk/reactos/subsystems/win32/win32k/objects/palobj.c trunk/reactos/subsystems/win32/win32k/objects/path.c trunk/reactos/subsystems/win32/win32k/objects/print.c trunk/reactos/subsystems/win32/win32k/objects/region.c trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/eng/clip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/clip.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/clip.c [iso-8859-1] Tue Nov 4 17:49:07 2008 @@ -425,7 +425,6 @@ (*Spans)[i].Width = Boundary->right - Boundary->left; } } - return TRUE; } @@ -447,7 +446,7 @@ { if (NULL != *Spans) { - ExFreePool(*Spans); + ExFreePoolWithTag(*Spans, TAG_CLIP); *Spans = NULL; } *Count = 0; @@ -461,7 +460,7 @@ { *dest++ = *src++; } - ExFreePool(*Spans); + ExFreePoolWithTag(*Spans, TAG_CLIP); } *Spans = NewSpans; } Modified: trunk/reactos/subsystems/win32/win32k/misc/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/misc/driver.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/misc/driver.c [iso-8859-1] Tue Nov 4 17:49:07 2008 @@ -41,12 +41,19 @@ } GRAPHICS_DRIVER, *PGRAPHICS_DRIVER; static PGRAPHICS_DRIVER DriverList; -static PGRAPHICS_DRIVER GenericDriver = 0; +static PGRAPHICS_DRIVER GenericDriver = NULL; BOOL DRIVER_RegisterDriver(LPCWSTR Name, PGD_ENABLEDRIVER EnableDriver) { - PGRAPHICS_DRIVER Driver = ExAllocatePoolWithTag(PagedPool, sizeof(*Driver), TAG_DRIVER); + PGRAPHICS_DRIVER Driver; + DPRINT( "DRIVER_RegisterDriver( Name: %S )\n", Name ); + + if (GenericDriver != NULL) + { + return FALSE; + } + Driver = ExAllocatePoolWithTag(PagedPool, sizeof(*Driver), TAG_DRIVER); if (!Driver) return FALSE; Driver->ReferenceCount = 0; Driver->EnableDriver = EnableDriver; @@ -58,7 +65,7 @@ if (Driver->Name == NULL) { DPRINT1("Out of memory\n"); - ExFreePool(Driver); + ExFreePoolWithTag(Driver, TAG_DRIVER); return FALSE; } @@ -66,12 +73,6 @@ Driver->Next = DriverList; DriverList = Driver; return TRUE; - } - - if (GenericDriver != NULL) - { - ExFreePool(Driver); - return FALSE; } GenericDriver = Driver; @@ -156,7 +157,7 @@ ExistingDriver = DRIVER_FindExistingDDIDriver(FullName); if (ExistingDriver) { - ExFreePool(FullName); + ExFreePoolWithTag(FullName, TAG_DRIVER); return ExistingDriver; } @@ -172,7 +173,7 @@ DRIVER_RegisterDriver( L"DISPLAY", GdiDriverInfo.EntryPoint); DRIVER_RegisterDriver( FullName, GdiDriverInfo.EntryPoint); - ExFreePool(FullName); + ExFreePoolWithTag(FullName, TAG_DRIVER); return (PGD_ENABLEDRIVER)GdiDriverInfo.EntryPoint; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] Tue Nov 4 17:49:07 2008 @@ -263,6 +263,11 @@ if ( !GlobalEvents ) { GlobalEvents = ExAllocatePoolWithTag(PagedPool, sizeof(EVENTTABLE), TAG_HOOK); + if (GlobalEvents == NULL) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + goto SetEventExit; + } GlobalEvents->Counts = 0; InitializeListHead(&GlobalEvents->Events); } @@ -348,7 +353,7 @@ if (! NT_SUCCESS(Status)) { - ExFreePool(pEH->ModuleName.Buffer); + ExFreePoolWithTag(pEH->ModuleName.Buffer, TAG_HOOK); UserDereferenceObject(pEH); IntRemoveEvent(pEH); SetLastNtError(Status); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Tue Nov 4 17:49:07 2008 @@ -553,7 +553,7 @@ if (HooklParam) Debug.lParam = (LPARAM)HooklParam; lResult = co_HOOK_CallHookNext(Hook, Code, wParam, (LPARAM)&Debug); - if (HooklParam) ExFreePool(HooklParam); + if (HooklParam) ExFreePoolWithTag(HooklParam, TAG_HOOK); return lResult; } @@ -1131,7 +1131,7 @@ ModuleName.MaximumLength); if (! NT_SUCCESS(Status)) { - ExFreePool(Hook->ModuleName.Buffer); + ExFreePoolWithTag(Hook->ModuleName.Buffer, TAG_HOOK); UserDereferenceObject(Hook); IntRemoveHook(Hook, WinStaObj, FALSE); if (NULL != Thread) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Tue Nov 4 17:49:07 2008 @@ -366,7 +366,7 @@ if (Status != STATUS_BUFFER_TOO_SMALL) break; - ExFreePool(Ret); + ExFreePoolWithTag(Ret, TAG_KEYBOARD); Size += sizeof(KEYBOARD_INDICATOR_TRANSLATION); @@ -380,7 +380,7 @@ if (Status != STATUS_SUCCESS) { - ExFreePool(Ret); + ExFreePoolWithTag(Ret, TAG_KEYBOARD); return Status; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Tue Nov 4 17:49:07 2008 @@ -737,7 +737,7 @@ pti ? pti->KeyboardLayout->KBTables : 0 ); MmCopyToCaller(pwszBuff,OutPwszBuff,sizeof(WCHAR)*cchBuff); - ExFreePool(OutPwszBuff); + ExFreePoolWithTag(OutPwszBuff, TAG_STRING); } else ret = 0; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] Tue Nov 4 17:49:07 2008 @@ -387,7 +387,7 @@ NewMenuItem->Text.Buffer = (PWSTR)ExAllocatePoolWithTag(PagedPool, MenuItem->Text.MaximumLength, TAG_STRING); if(!NewMenuItem->Text.Buffer) { - ExFreePool(NewMenuItem); + ExFreePoolWithTag(NewMenuItem, TAG_MENUITEM); break; } RtlCopyUnicodeString(&NewMenuItem->Text, &MenuItem->Text); @@ -938,7 +938,7 @@ if(!IntSetMenuItemInfo(SubMenu, MenuItem, ItemInfo)) { - ExFreePool(MenuItem); + ExFreePoolWithTag(MenuItem, TAG_MENUITEM); return FALSE; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Tue Nov 4 17:49:07 2008 @@ -1235,7 +1235,7 @@ if (! NT_SUCCESS(Status)) { DPRINT1("Failed to copy message to kernel: invalid usermode buffer\n"); - ExFreePool(KernelMem); + ExFreePoolWithTag(KernelMem, TAG_MSG); return Status; } } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Tue Nov 4 17:49:07 2008 @@ -341,7 +341,7 @@ Status = MmCopyFromCaller(Dest->Buffer, Src, Dest->Length); if(!NT_SUCCESS(Status)) { - ExFreePool(Dest->Buffer); + ExFreePoolWithTag(Dest->Buffer, TAG_STRING); Dest->Buffer = NULL; return Status; } @@ -388,7 +388,7 @@ Status = MmCopyFromCaller(Dest->Buffer, Src, Dest->Length); if(!NT_SUCCESS(Status)) { - ExFreePool(Dest->Buffer); + ExFreePoolWithTag(Dest->Buffer, TAG_STRING); Dest->Buffer = NULL; return Status; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Tue Nov 4 17:49:07 2008 @@ -383,7 +383,7 @@ if(!NT_SUCCESS(Status) || (KeyValuePartialInfo->Type != REG_SZ)) { ZwClose(KeyHandle); - ExFreePool(KeyValuePartialInfo); + ExFreePoolWithTag(KeyValuePartialInfo, TAG_STRING); return FALSE; } @@ -396,7 +396,7 @@ { TileNum = 0; } - ExFreePool(KeyValuePartialInfo); + ExFreePoolWithTag(KeyValuePartialInfo, TAG_STRING); /* start over again and look for the style*/ ResLength = 0; @@ -418,7 +418,7 @@ if(!NT_SUCCESS(Status) || (KeyValuePartialInfo->Type != REG_SZ)) { ZwClose(KeyHandle); - ExFreePool(KeyValuePartialInfo); + ExFreePoolWithTag(KeyValuePartialInfo, TAG_STRING); return FALSE; } @@ -431,7 +431,7 @@ { StyleNum = 0; } - ExFreePool(KeyValuePartialInfo); + ExFreePoolWithTag(KeyValuePartialInfo, TAG_STRING); /* Check the values we found in the registry */ if(TileNum && !StyleNum) 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] Tue Nov 4 17:49:07 2008 @@ -704,7 +704,7 @@ } IntGetBitmapBits (Bitmap, bm.bmWidthBytes * abs(bm.bmHeight), buf); IntSetBitmapBits (resBitmap, bm.bmWidthBytes * abs(bm.bmHeight), buf); - ExFreePool (buf); + ExFreePoolWithTag (buf,TAG_BITMAP); resBitmap->flFlags = Bitmap->flFlags; GDIOBJ_UnlockObjByPtr((POBJ)resBitmap); } Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Tue Nov 4 17:49:07 2008 @@ -860,7 +860,6 @@ * if it negitve we getting to many scanline for scanline is UINT not * a INT, so we need make the negtive value to positve and that make the * count correct for negtive bitmap, TODO : we need testcase for this api */ - IntSetDIBits(pDC, hBitmap, 0, abs(BitsInfo->bmiHeader.biHeight), Bits, BitsInfo, Usage); @@ -1187,7 +1186,7 @@ { if (lpRGB != bmi->bmiColors) { - ExFreePool(lpRGB); + ExFreePoolWithTag(lpRGB, TAG_COLORMAP); } SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); return NULL; @@ -1197,7 +1196,7 @@ { if (lpRGB != bmi->bmiColors) { - ExFreePool(lpRGB); + ExFreePoolWithTag(lpRGB, TAG_COLORMAP); } SetLastWin32Error(ERROR_INVALID_HANDLE); NtGdiDeleteObject(bmp); @@ -1238,14 +1237,14 @@ VirtualFree(bm.bmBits, 0L, MEM_RELEASE), bm.bmBits = NULL; } */ - if (dib) { ExFreePool(dib); dib = NULL; } + if (dib) { ExFreePoolWithTag(dib, TAG_DIB); dib = NULL; } if (bmp) { bmp = NULL; } if (res) { BITMAPOBJ_FreeBitmapByHandle(res); res = 0; } } if (lpRGB != bmi->bmiColors) { - ExFreePool(lpRGB); + ExFreePoolWithTag(lpRGB, TAG_COLORMAP); } if (bmp) Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Tue Nov 4 17:49:07 2008 @@ -425,7 +425,7 @@ if (!NT_SUCCESS(Status)) { - ExFreePool(pTemp); + ExFreePoolWithTag(pTemp, TAG_SHAPE); return FALSE; } @@ -434,7 +434,7 @@ { HRGN hRgn; hRgn = IntCreatePolyPolygonRgn(SafePoints, SafeCounts, Count, (INT_PTR)hDC); - ExFreePool(pTemp); + ExFreePoolWithTag(pTemp, TAG_SHAPE); return (ULONG_PTR)hRgn; } @@ -1001,7 +1001,7 @@ if (!NT_SUCCESS(Status)) { DC_UnlockDc(dc); - ExFreePool(SafeVertex); + ExFreePoolWithTag(SafeVertex, TAG_SHAPE); SetLastNtError(Status); return FALSE; } Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Tue Nov 4 17:49:07 2008 @@ -371,7 +371,7 @@ { FT_Done_Face(Face); ObDereferenceObject(SectionObject); - ExFreePool(Entry); + ExFreePoolWithTag(Entry, TAG_FONT); SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return 0; } @@ -382,7 +382,7 @@ EngFreeMem(FontGDI); FT_Done_Face(Face); ObDereferenceObject(SectionObject); - ExFreePool(Entry); + ExFreePoolWithTag(Entry, TAG_FONT); SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return 0; } @@ -1011,7 +1011,7 @@ if (0 == (TM->tmPitchAndFamily & TMPF_VECTOR)) Info->FontType |= RASTER_FONTTYPE; - ExFreePool(Otm); + ExFreePoolWithTag(Otm, TAG_GDITEXT); wcsncpy(Info->EnumLogFontEx.elfLogFont.lfFaceName, FaceName, LF_FACESIZE); wcsncpy(Info->EnumLogFontEx.elfFullName, FaceName, LF_FULLFACESIZE); Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/line.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/line.c [iso-8859-1] Tue Nov 4 17:49:07 2008 @@ -198,7 +198,7 @@ if ( Pts ) { ret = IntGdiPolyline(dc, Pts, nOut); - ExFreePool(Pts); + ExFreePoolWithTag(Pts, TAG_BEZIER); } } @@ -228,7 +228,7 @@ npt[0].y = Dc_Attr->ptlCurrent.y; memcpy(npt + 1, pt, sizeof(POINT) * Count); ret = IntGdiPolyBezier(dc, npt, Count+1); - ExFreePool(npt); + ExFreePoolWithTag(npt, TAG_BEZIER); } } if ( ret ) @@ -331,7 +331,7 @@ pts[0].y = Dc_Attr->ptlCurrent.y; memcpy( pts + 1, pt, sizeof(POINT) * Count); ret = IntGdiPolyline(dc, pts, Count + 1); - ExFreePool(pts); + ExFreePoolWithTag(pts, TAG_SHAPE); } } if ( ret ) Modified: trunk/reactos/subsystems/win32/win32k/objects/palobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/palobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/palobj.c [iso-8859-1] Tue Nov 4 17:49:07 2008 @@ -170,7 +170,7 @@ } hpalette = NtGdiCreatePaletteInternal(palPtr,NB_RESERVED_COLORS); - ExFreePool(palPtr); + ExFreePoolWithTag(palPtr, TAG_PALETTE); #ifndef NO_MAPPING palObj = (PALOBJ*)PALETTE_LockPalette(hpalette); Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] Tue Nov 4 17:49:07 2008 @@ -181,8 +181,8 @@ { ASSERT(pPath!=NULL); - if (pPath->pPoints) ExFreePool(pPath->pPoints); - if (pPath->pFlags) ExFreePool(pPath->pFlags); + if (pPath->pPoints) ExFreePoolWithTag(pPath->pPoints, TAG_PATH); + if (pPath->pFlags) ExFreePoolWithTag(pPath->pFlags, TAG_PATH); } /* PATH_AssignGdiPath @@ -991,7 +991,7 @@ for(i = 1; i < no; i++) PATH_AddEntry(pPath, &pts[i], (i == no-1 && closed) ? PT_LINETO | PT_CLOSEFIGURE : PT_LINETO); - ExFreePool(pts); + ExFreePoolWithTag(pts, TAG_BEZIER); return TRUE; } @@ -1092,7 +1092,7 @@ } /* Free memory for number-of-points-in-stroke array */ - ExFreePool(pNumPointsInStroke); + ExFreePoolWithTag(pNumPointsInStroke, TAG_PATH); /* Success! */ *pHrgn=hrgn; @@ -1189,7 +1189,7 @@ pFlagsNew=(BYTE *)ExAllocatePoolWithTag(PagedPool, numEntriesToAllocate * sizeof(BYTE), TAG_PATH); if(!pFlagsNew) { - ExFreePool(pPointsNew); + ExFreePoolWithTag(pPointsNew, TAG_PATH); return FALSE; } @@ -1201,8 +1201,8 @@ memcpy(pPointsNew, pPath->pPoints, sizeof(POINT)*pPath->numEntriesUsed); memcpy(pFlagsNew, pPath->pFlags, sizeof(BYTE)*pPath->numEntriesUsed); - ExFreePool(pPath->pPoints); - ExFreePool(pPath->pFlags); + ExFreePoolWithTag(pPath->pPoints, TAG_PATH); + ExFreePoolWithTag(pPath->pFlags, TAG_PATH); } pPath->pPoints=pPointsNew; pPath->pFlags=pFlagsNew; @@ -1424,12 +1424,12 @@ } memcpy(Realloc, pLinePts, nLinePts*sizeof(POINT)); - ExFreePool(pLinePts); + ExFreePoolWithTag(pLinePts, TAG_PATH); pLinePts = Realloc; } memcpy(&pLinePts[nLinePts], &pBzrPts[1], (nBzrPts - 1) * sizeof(POINT)); nLinePts += nBzrPts - 1; - ExFreePool(pBzrPts); + ExFreePoolWithTag(pBzrPts, TAG_BEZIER); i += 2; } break; @@ -1449,7 +1449,7 @@ ret = TRUE; end: - if(pLinePts)ExFreePool(pLinePts); + if(pLinePts) ExFreePoolWithTag(pLinePts, TAG_PATH); /* Restore the old mapping mode */ Dc_Attr->iMapMode = mapMode; @@ -1534,13 +1534,13 @@ else { SetLastWin32Error(ERROR_CAN_NOT_COMPLETE); - ExFreePool(elp); + ExFreePoolWithTag(elp, TAG_PATH); PATH_UnlockPath( pPath ); return FALSE; } penWidth = elp->elpWidth; - ExFreePool(elp); + ExFreePoolWithTag(elp, TAG_PATH); endcap = (PS_ENDCAP_MASK & penStyle); joint = (PS_JOIN_MASK & penStyle); @@ -1588,7 +1588,7 @@ } numStrokes++; j = 0; - ExFreePool(pStrokes); + ExFreePoolWithTag(pStrokes, TAG_PATH); pStrokes = ExAllocatePoolWithTag(PagedPool, numStrokes * sizeof(PPATH), TAG_PATH); pStrokes[numStrokes - 1] = ExAllocatePoolWithTag(PagedPool, sizeof(PATH), TAG_PATH); @@ -1834,19 +1834,19 @@ } PATH_DestroyGdiPath(pStrokes[i]); - ExFreePool(pStrokes[i]); + ExFreePoolWithTag(pStrokes[i], TAG_PATH); PATH_DestroyGdiPath(pUpPath); - ExFreePool(pUpPath); + ExFreePoolWithTag(pUpPath, TAG_PATH); PATH_DestroyGdiPath(pDownPath); - ExFreePool(pDownPath); - } - ExFreePool(pStrokes); + ExFreePoolWithTag(pDownPath, TAG_PATH); + } + ExFreePoolWithTag(pStrokes, TAG_PATH); pNewPath->state = PATH_Closed; if (!(ret = PATH_AssignGdiPath(pPath, pNewPath))) DPRINT1("Assign path failed\n"); PATH_DestroyGdiPath(pNewPath); - ExFreePool(pNewPath); + ExFreePoolWithTag(pNewPath, TAG_PATH); return ret; } Modified: trunk/reactos/subsystems/win32/win32k/objects/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/print.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/print.c [iso-8859-1] Tue Nov 4 17:49:07 2008 @@ -223,7 +223,7 @@ if ( !NT_SUCCESS(Status) ) { - ExFreePool ( SafeInData ); + ExFreePoolWithTag ( SafeInData, TAG_PRINT ); DC_UnlockDc(pDC); SetLastNtError(Status); return -1; @@ -256,7 +256,7 @@ SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); freeout: if ( SafeInData ) - ExFreePool ( SafeInData ); + ExFreePoolWithTag ( SafeInData, TAG_PRINT ); DC_UnlockDc(pDC); return -1; } @@ -267,7 +267,7 @@ DC_UnlockDc(pDC); if ( SafeInData ) - ExFreePool ( SafeInData ); + ExFreePoolWithTag ( SafeInData ,TAG_PRINT ); if ( SafeOutData ) { @@ -284,7 +284,7 @@ } _SEH_END; - ExFreePool ( SafeOutData ); + ExFreePoolWithTag ( SafeOutData, TAG_PRINT ); if ( !NT_SUCCESS(Status) ) { SetLastNtError(Status); Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] Tue Nov 4 17:49:07 2008 @@ -420,7 +420,7 @@ } temp = ExAllocatePoolWithTag(PagedPool, NewSize, TAG_REGION); - if (temp == 0) + if (temp == NULL) { return 0; } @@ -431,7 +431,7 @@ reg->rdh.nRgnSize = NewSize; if (*firstrect != &reg->rdh.rcBound) { - ExFreePool(*firstrect); + ExFreePoolWithTag(*firstrect, TAG_REGION); } *firstrect = temp; *rect = (*firstrect)+reg->rdh.nCount; @@ -520,7 +520,7 @@ return FALSE; if (dst->Buffer && dst->Buffer != &dst->rdh.rcBound) - ExFreePool(dst->Buffer); //free the old buffer + ExFreePoolWithTag(dst->Buffer, TAG_REGION); //free the old buffer dst->Buffer = temp; dst->rdh.nRgnSize = src->rdh.nCount * sizeof(RECT); //size of region buffer } @@ -608,7 +608,7 @@ { xrect = ExAllocatePoolWithTag(PagedPool, rgnSrc->rdh.nCount * sizeof(RECT), TAG_REGION); if (rgnDst->Buffer && rgnDst->Buffer != &rgnDst->rdh.rcBound) - ExFreePool(rgnDst->Buffer); //free the old buffer. will be assigned to xrect below. + ExFreePoolWithTag(rgnDst->Buffer, TAG_REGION); //free the old buffer. will be assigned to xrect below. } if (xrect) @@ -676,7 +676,7 @@ return FALSE; if (rgnDst->Buffer && rgnDst->Buffer != &rgnDst->rdh.rcBound) - ExFreePool(rgnDst->Buffer); //free the old buffer + ExFreePoolWithTag(rgnDst->Buffer, TAG_REGION); //free the old buffer rgnDst->Buffer = temp; rgnDst->rdh.nCount = i; rgnDst->rdh.nRgnSize = i * sizeof(RECT); @@ -1169,7 +1169,7 @@ newReg->rdh.nRgnSize = newReg->rdh.nCount*sizeof(RECT); COPY_RECTS(newReg->Buffer, prev_rects, newReg->rdh.nCount); if (prev_rects != &newReg->rdh.rcBound) - ExFreePool(prev_rects); + ExFreePoolWithTag(prev_rects, TAG_REGION); } } else @@ -1180,7 +1180,7 @@ */ newReg->rdh.nRgnSize = sizeof(RECT); if (newReg->Buffer != &newReg->rdh.rcBound) - ExFreePool(newReg->Buffer); + ExFreePoolWithTag(newReg->Buffer, TAG_REGION); newReg->Buffer = ExAllocatePoolWithTag(PagedPool, sizeof(RECT), TAG_REGION); ASSERT(newReg->Buffer); } @@ -1188,7 +1188,7 @@ newReg->rdh.iType = RDH_RECTANGLES; if (oldRects != &newReg->rdh.rcBound) - ExFreePool(oldRects); + ExFreePoolWithTag(oldRects, TAG_REGION); return; } @@ -3475,7 +3475,7 @@ { COPY_RECTS(temp, reg->Buffer, reg->rdh.nCount); if (reg->Buffer != &reg->rdh.rcBound) - ExFreePool(reg->Buffer); + ExFreePoolWithTag(reg->Buffer, TAG_REGION); } reg->Buffer = temp; @@ -3754,7 +3754,7 @@ if (!tmpPtBlock) { DPRINT1("Can't alloc tPB\n"); - ExFreePool(pETEs); + ExFreePoolWithTag(pETEs, TAG_REGION); return 0; } curPtBlock->next = tmpPtBlock; @@ -3813,7 +3813,7 @@ if (!tmpPtBlock) { DPRINT1("Can't alloc tPB\n"); - ExFreePool(pETEs); + ExFreePoolWithTag(pETEs, TAG_REGION); NtGdiDeleteObject(hrgn); return 0; } @@ -3845,10 +3845,10 @@ for (curPtBlock = FirstPtBlock.next; --numFullPtBlocks >= 0;) { tmpPtBlock = curPtBlock->next; - ExFreePool(curPtBlock); + ExFreePoolWithTag(curPtBlock, TAG_REGION); curPtBlock = tmpPtBlock; } - ExFreePool(pETEs); + ExFreePoolWithTag(pETEs, TAG_REGION); REGION_UnlockRgn(region); return hrgn; } Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] Tue Nov 4 17:49:07 2008 @@ -178,7 +178,7 @@ Dx = ExAllocatePoolWithTag(PagedPool, Count * sizeof(INT), TAG_GDITEXT); if (NULL == Dx) { - ExFreePool(String); + ExFreePoolWithTag(String, TAG_GDITEXT); SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } @@ -193,9 +193,9 @@ { if (NULL != Dx) { - ExFreePool(Dx); - } - ExFreePool(String); + ExFreePoolWithTag(Dx, TAG_GDITEXT); + } + ExFreePoolWithTag(String, TAG_GDITEXT); SetLastNtError(Status); return FALSE; } @@ -205,9 +205,9 @@ { if (NULL != Dx) { - ExFreePool(Dx); - } - ExFreePool(String); + ExFreePoolWithTag(Dx, TAG_GDITEXT); + } + ExFreePoolWithTag(String, TAG_GDITEXT); SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } @@ -224,12 +224,12 @@ Result = FALSE; DC_UnlockDc(dc); - ExFreePool(String); + ExFreePoolWithTag(String, TAG_GDITEXT); if (! Result) { if (NULL != Dx) { - ExFreePool(Dx); + ExFreePoolWithTag(Dx, TAG_GDITEXT); } return FALSE; } @@ -241,7 +241,7 @@ { if (NULL != Dx) { - ExFreePool(Dx); + ExFreePoolWithTag(Dx, TAG_GDITEXT); } SetLastNtError(Status); return FALSE; @@ -255,7 +255,7 @@ { if (NULL != Dx) { - ExFreePool(Dx); + ExFreePoolWithTag(Dx, TAG_GDITEXT); } SetLastNtError(Status); return FALSE; @@ -263,7 +263,7 @@ } if (NULL != Dx) { - ExFreePool(Dx); + ExFreePoolWithTag(Dx,TAG_GDITEXT); } Status = MmCopyToCaller(UnsafeSize, &Size, sizeof(SIZE));

1 0

[jimtabor] 37193: - Patch by hto: Fix bugs in Gdi32.dll and User32.dll, see bug 3847.
by jimtabor＠svn.reactos.org 04 Nov '08

04 Nov '08

Author: jimtabor Date: Tue Nov 4 17:32:11 2008 New Revision: 37193 URL: http://svn.reactos.org/svn/reactos?rev=37193&view=rev Log: - Patch by hto: Fix bugs in Gdi32.dll and User32.dll, see bug 3847. Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h trunk/reactos/dll/win32/user32/controls/combo.c trunk/reactos/dll/win32/user32/misc/ddeclient.c Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/include/gd… ============================================================================== --- trunk/reactos/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] Tue Nov 4 17:32:11 2008 @@ -31,7 +31,8 @@ #define METAFILE_DISK 2 /* MACRO ********************************************************************/ -#define ROP_USES_SOURCE(Rop) ((Rop << 2) ^ Rop) & 0xCC0000 + +#define ROP_USES_SOURCE(Rop) (((Rop) << 2 ^ Rop) & 0xCC0000) /* TYPES *********************************************************************/ Modified: trunk/reactos/dll/win32/user32/controls/combo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/combo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/combo.c [iso-8859-1] Tue Nov 4 17:32:11 2008 @@ -783,7 +783,7 @@ clipRegion=NULL; } - if (!IsWindowEnabled(lphc->self) & WS_DISABLED) itemState |= ODS_DISABLED; + if (!(IsWindowEnabled(lphc->self) & WS_DISABLED)) itemState |= ODS_DISABLED; dis.CtlType = ODT_COMBOBOX; dis.CtlID = ctlid; Modified: trunk/reactos/dll/win32/user32/misc/ddeclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/ddec… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/ddeclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/ddeclient.c [iso-8859-1] Tue Nov 4 17:32:11 2008 @@ -811,7 +811,7 @@ FIXME("hmmm shouldn't happen\n"); return WDML_QS_PASS; } - if (!pConv->instance->CBFflags & CBF_SKIP_DISCONNECTS) + if (!(pConv->instance->CBFflags & CBF_SKIP_DISCONNECTS)) { WDML_InvokeCallback(pConv->instance, XTYP_DISCONNECT, 0, (HCONV)pConv, 0, 0, 0, 0, (pConv->wStatus & ST_ISSELF) ? 1 : 0); @@ -894,7 +894,7 @@ return WDML_QS_PASS; pConv->wStatus |= ST_TERMINATED; - if (!pConv->instance->CBFflags & CBF_SKIP_DISCONNECTS) + if (!(pConv->instance->CBFflags & CBF_SKIP_DISCONNECTS)) { WDML_InvokeCallback(pConv->instance, XTYP_DISCONNECT, 0, (HCONV)pConv, 0, 0, 0, 0, (pConv->wStatus & ST_ISSELF) ? 1 : 0);

1 0

[spetreolle] 37192: remove unusable vb3 and vb4 runtimes from Downloader, since their installers aren't in PE format.
by spetreolle＠svn.reactos.org 04 Nov '08

04 Nov '08

Author: spetreolle Date: Tue Nov 4 16:33:09 2008 New Revision: 37192 URL: http://svn.reactos.org/svn/reactos?rev=37192&view=rev Log: remove unusable vb3 and vb4 runtimes from Downloader, since their installers aren't in PE format. Modified: trunk/rosapps/applications/downloader/downloader.xml Modified: trunk/rosapps/applications/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/downloader/do… ============================================================================== --- trunk/rosapps/applications/downloader/downloader.xml [iso-8859-1] (original) +++ trunk/rosapps/applications/downloader/downloader.xml [iso-8859-1] Tue Nov 4 16:33:09 2008 @@ -128,20 +128,6 @@ <version>4.0</version> <description>MFC 4 is needed by some applications</description> <location>http://download.microsoft.com/download/ole/ole2v/3.5/w351/en-us/ole2v.exe</location> - </application> - - <application name="Visual Basic 3 Runtime"> - <regname>vb3run</regname> - <version>3.0</version> - <description>Visual Basic 3 Runtime</description> - <location>http://download.microsoft.com/download/vb30/utility/1/w9xnt4/en-us/vb3run.e…</location> - </application> - - <application name="Visual Basic 4 Runtime"> - <regname>vb4run</regname> - <version>4.0</version> - <description>Visual Basic 4 Runtime</description> - <location>http://download.microsoft.com/download/vb40ent/sample27/1/w9xnt4/en-us/vb4r…</location> </application> <application name="Visual Basic 5 Runtime">

1 0

[fireball] 37191: - Use ExInitializeSystemLookasideList instead of ExInitializeNPagedLookasideList for the internal I/O lookaside lists (just as it was done for the Ob lists a couple of months ago). - Optimize lookaside allocation by using one large contiguous buffer instead of fragmented buffers for each CPU. - Use NT structure names instead of ReactOS-only structures. - Fixes some memory corruption issues when doing I/O completion (found by Stefan and winetests).
by fireball＠svn.reactos.org 04 Nov '08

04 Nov '08

Author: fireball Date: Tue Nov 4 15:55:55 2008 New Revision: 37191 URL: http://svn.reactos.org/svn/reactos?rev=37191&view=rev Log: - Use ExInitializeSystemLookasideList instead of ExInitializeNPagedLookasideList for the internal I/O lookaside lists (just as it was done for the Ob lists a couple of months ago). - Optimize lookaside allocation by using one large contiguous buffer instead of fragmented buffers for each CPU. - Use NT structure names instead of ReactOS-only structures. - Fixes some memory corruption issues when doing I/O completion (found by Stefan and winetests). Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/iocomp.c trunk/reactos/ntoskrnl/io/iomgr/iomgr.c trunk/reactos/ntoskrnl/io/iomgr/irp.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] Tue Nov 4 15:55:55 2008 @@ -81,12 +81,6 @@ #define RD_SYMLINK_CREATE_FAILED 5 // -// Packet Types when piggybacking on the IRP Overlay -// -#define IrpCompletionPacket 0x1 -#define IrpMiniCompletionPacket 0x2 - -// // We can call the Ob Inlined API, it's the same thing // #define IopAllocateMdlFromLookaside \ @@ -249,10 +243,20 @@ } IOP_TRANSFER_TYPE, *PIOP_TRANSFER_TYPE; // +// Packet Types when piggybacking on the IRP Overlay +// +typedef enum _COMPLETION_PACKET_TYPE + { + IopCompletionPacketIrp, + IopCompletionPacketMini, + IopCompletionPacketQuota +} COMPLETION_PACKET_TYPE, *PCOMPLETION_PACKET_TYPE; + +// // Special version of the IRP Overlay used to optimize I/O completion // by not using up a separate structure. // -typedef struct _IO_COMPLETION_PACKET +typedef struct _IOP_MINI_COMPLETION_PACKET { struct { @@ -263,10 +267,11 @@ ULONG PacketType; }; }; - PVOID Key; - PVOID Context; - IO_STATUS_BLOCK IoStatus; -} IO_COMPLETION_PACKET, *PIO_COMPLETION_PACKET; + PVOID KeyContext; + PVOID ApcContext; + NTSTATUS IoStatus; + ULONG_PTR IoStatusInformation; +} IOP_MINI_COMPLETION_PACKET, *PIOP_MINI_COMPLETION_PACKET; // // I/O Completion Context for IoSetIoCompletionRoutineEx @@ -1036,7 +1041,7 @@ extern POBJECT_TYPE IoCompletionType; extern PDEVICE_NODE IopRootDeviceNode; extern ULONG IopTraceLevel; -extern NPAGED_LOOKASIDE_LIST IopMdlLookasideList; +extern GENERAL_LOOKASIDE IopMdlLookasideList; extern GENERIC_MAPPING IopCompletionMapping; extern GENERIC_MAPPING IopFileMapping; extern POBJECT_TYPE _IoFileObjectType; Modified: trunk/reactos/ntoskrnl/io/iomgr/iocomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iocomp.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iocomp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iocomp.c [iso-8859-1] Tue Nov 4 15:55:55 2008 @@ -15,7 +15,7 @@ POBJECT_TYPE IoCompletionType; -NPAGED_LOOKASIDE_LIST IoCompletionPacketLookaside; +GENERAL_LOOKASIDE IoCompletionPacketLookaside; GENERIC_MAPPING IopCompletionMapping = { @@ -40,8 +40,7 @@ IN PVOID Context) { NTSTATUS Status; - PIO_UNLOAD_SAFE_COMPLETION_CONTEXT UnsafeContext = - (PIO_UNLOAD_SAFE_COMPLETION_CONTEXT)Context; + PIO_UNLOAD_SAFE_COMPLETION_CONTEXT UnsafeContext = Context; /* Reference the device object */ ObReferenceObject(UnsafeContext->DeviceObject); @@ -61,7 +60,7 @@ VOID NTAPI -IopFreeIoCompletionPacket(PIO_COMPLETION_PACKET Packet) +IopFreeMiniPacket(PIOP_MINI_COMPLETION_PACKET Packet) { PKPRCB Prcb = KeGetCurrentPrcb(); PNPAGED_LOOKASIDE_LIST List; @@ -104,7 +103,7 @@ PLIST_ENTRY FirstEntry; PLIST_ENTRY CurrentEntry; PIRP Irp; - PIO_COMPLETION_PACKET Packet; + PIOP_MINI_COMPLETION_PACKET Packet; /* Rundown the Queue */ FirstEntry = KeRundownQueue(Queue); @@ -116,14 +115,14 @@ { /* Get the Packet */ Packet = CONTAINING_RECORD(CurrentEntry, - IO_COMPLETION_PACKET, + IOP_MINI_COMPLETION_PACKET, ListEntry); /* Go to next Entry */ CurrentEntry = CurrentEntry->Flink; /* Check if it's part of an IRP, or a separate packet */ - if (Packet->PacketType == IrpCompletionPacket) + if (Packet->PacketType == IopCompletionPacketIrp) { /* Get the IRP and free it */ Irp = CONTAINING_RECORD(Packet, IRP, Tail.Overlay.ListEntry); @@ -132,7 +131,7 @@ else { /* Use common routine */ - IopFreeIoCompletionPacket(Packet); + IopFreeMiniPacket(Packet); } } while (FirstEntry != CurrentEntry); } @@ -155,7 +154,7 @@ PKQUEUE Queue = (PKQUEUE)IoCompletion; PNPAGED_LOOKASIDE_LIST List; PKPRCB Prcb = KeGetCurrentPrcb(); - PIO_COMPLETION_PACKET Packet; + PIOP_MINI_COMPLETION_PACKET Packet; /* Get the P List */ List = (PNPAGED_LOOKASIDE_LIST)Prcb-> @@ -194,11 +193,11 @@ if (Packet) { /* Set up the Packet */ - Packet->PacketType = IrpMiniCompletionPacket; - Packet->Key = KeyContext; - Packet->Context = ApcContext; - Packet->IoStatus.Status = IoStatus; - Packet->IoStatus.Information = IoStatusInformation; + Packet->PacketType = IopCompletionPacketMini; + Packet->KeyContext = KeyContext; + Packet->ApcContext = ApcContext; + Packet->IoStatus = IoStatus; + Packet->IoStatusInformation = IoStatusInformation; /* Insert the Queue */ KeInsertQueue(Queue, &Packet->ListEntry); @@ -455,7 +454,7 @@ { LARGE_INTEGER SafeTimeout; PKQUEUE Queue; - PIO_COMPLETION_PACKET Packet; + PIOP_MINI_COMPLETION_PACKET Packet; PLIST_ENTRY ListEntry; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; @@ -517,11 +516,11 @@ { /* Get the Packet Data */ Packet = CONTAINING_RECORD(ListEntry, - IO_COMPLETION_PACKET, + IOP_MINI_COMPLETION_PACKET, ListEntry); /* Check if this is piggybacked on an IRP */ - if (Packet->PacketType == IrpCompletionPacket) + if (Packet->PacketType == IopCompletionPacketIrp) { /* Get the IRP */ Irp = CONTAINING_RECORD(ListEntry, @@ -539,12 +538,13 @@ else { /* Save values */ - Key = Packet->Key; - Apc = Packet->Context; - IoStatus = Packet->IoStatus; + Key = Packet->KeyContext; + Apc = Packet->ApcContext; + IoStatus.Status = Packet->IoStatus; + IoStatus.Information = Packet->IoStatusInformation; /* Free the packet */ - IopFreeIoCompletionPacket(Packet); + IopFreeMiniPacket(Packet); } /* Enter SEH to write back the values */ Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] Tue Nov 4 15:55:55 2008 @@ -49,7 +49,6 @@ extern LIST_ENTRY ShutdownListHead; extern LIST_ENTRY LastChanceShutdownListHead; extern KSPIN_LOCK ShutdownListLock; -extern NPAGED_LOOKASIDE_LIST IoCompletionPacketLookaside; extern POBJECT_TYPE IoAdapterObjectType; ERESOURCE IopDatabaseResource; extern ERESOURCE FileSystemListLock; @@ -76,9 +75,10 @@ extern PDEVICE_OBJECT IopErrorLogObject; -NPAGED_LOOKASIDE_LIST IoLargeIrpLookaside; -NPAGED_LOOKASIDE_LIST IoSmallIrpLookaside; -NPAGED_LOOKASIDE_LIST IopMdlLookasideList; +GENERAL_LOOKASIDE IoLargeIrpLookaside; +GENERAL_LOOKASIDE IoSmallIrpLookaside; +GENERAL_LOOKASIDE IopMdlLookasideList; +extern GENERAL_LOOKASIDE IoCompletionPacketLookaside; #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, IoInitSystem) @@ -94,143 +94,142 @@ ULONG LargeIrpSize, SmallIrpSize, MdlSize; LONG i; PKPRCB Prcb; - PNPAGED_LOOKASIDE_LIST CurrentList = NULL; + PGENERAL_LOOKASIDE CurrentList = NULL; /* Calculate the sizes */ LargeIrpSize = sizeof(IRP) + (8 * sizeof(IO_STACK_LOCATION)); SmallIrpSize = sizeof(IRP) + sizeof(IO_STACK_LOCATION); MdlSize = sizeof(MDL) + (23 * sizeof(PFN_NUMBER)); + /* Initialize the Lookaside List for I\O Completion */ + ExInitializeSystemLookasideList(&IoCompletionPacketLookaside, + NonPagedPool, + sizeof(IOP_MINI_COMPLETION_PACKET), + IOC_TAG1, + 32, + &ExSystemLookasideListHead); + /* Initialize the Lookaside List for Large IRPs */ - ExInitializeNPagedLookasideList(&IoLargeIrpLookaside, - NULL, - NULL, - 0, + ExInitializeSystemLookasideList(&IoLargeIrpLookaside, + NonPagedPool, LargeIrpSize, IO_LARGEIRP, - 64); + 64, + &ExSystemLookasideListHead); + /* Initialize the Lookaside List for Small IRPs */ - ExInitializeNPagedLookasideList(&IoSmallIrpLookaside, - NULL, - NULL, - 0, + ExInitializeSystemLookasideList(&IoSmallIrpLookaside, + NonPagedPool, SmallIrpSize, IO_SMALLIRP, - 32); - - /* Initialize the Lookaside List for I\O Completion */ - ExInitializeNPagedLookasideList(&IoCompletionPacketLookaside, - NULL, - NULL, - 0, - sizeof(IO_COMPLETION_PACKET), - IOC_TAG1, - 32); + 32, + &ExSystemLookasideListHead); /* Initialize the Lookaside List for MDLs */ - ExInitializeNPagedLookasideList(&IopMdlLookasideList, - NULL, - NULL, - 0, + ExInitializeSystemLookasideList(&IopMdlLookasideList, + NonPagedPool, MdlSize, TAG_MDL, - 128); - - /* Now allocate the per-processor lists */ + 128, + &ExSystemLookasideListHead); + + /* Allocate the global lookaside list buffer */ + CurrentList = ExAllocatePoolWithTag(NonPagedPool, + 4 * KeNumberProcessors * + sizeof(GENERAL_LOOKASIDE), + TAG_IO); + + /* Loop all processors */ for (i = 0; i < KeNumberProcessors; i++) { /* Get the PRCB for this CPU */ Prcb = KiProcessorBlock[i]; DPRINT("Setting up lookaside for CPU: %x, PRCB: %p\n", i, Prcb); + /* Write IRP credit limit */ + Prcb->LookasideIrpFloat = 512 / KeNumberProcessors; + + /* Set the I/O Completion List */ + Prcb->PPLookasideList[LookasideCompletionList].L = &IoCompletionPacketLookaside; + if (CurrentList) + { + /* Initialize the Lookaside List for mini-packets */ + ExInitializeSystemLookasideList(CurrentList, + NonPagedPool, + sizeof(IOP_MINI_COMPLETION_PACKET), + IO_SMALLIRP_CPU, + 32, + &ExSystemLookasideListHead); + Prcb->PPLookasideList[LookasideCompletionList].P = CurrentList; + CurrentList++; + + } + else + { + Prcb->PPLookasideList[LookasideCompletionList].P = &IoCompletionPacketLookaside; + } + /* Set the Large IRP List */ - Prcb->PPLookasideList[LookasideLargeIrpList].L = &IoLargeIrpLookaside.L; - CurrentList = ExAllocatePoolWithTag(NonPagedPool, - sizeof(NPAGED_LOOKASIDE_LIST), - IO_LARGEIRP_CPU); + Prcb->PPLookasideList[LookasideLargeIrpList].L = &IoLargeIrpLookaside; if (CurrentList) { /* Initialize the Lookaside List for Large IRPs */ - ExInitializeNPagedLookasideList(CurrentList, - NULL, - NULL, - 0, + ExInitializeSystemLookasideList(CurrentList, + NonPagedPool, LargeIrpSize, IO_LARGEIRP_CPU, - 64); + 64, + &ExSystemLookasideListHead); + Prcb->PPLookasideList[LookasideLargeIrpList].P = CurrentList; + CurrentList++; + } else { - CurrentList = &IoLargeIrpLookaside; - } - Prcb->PPLookasideList[LookasideLargeIrpList].P = &CurrentList->L; + Prcb->PPLookasideList[LookasideLargeIrpList].P = &IoLargeIrpLookaside; + } /* Set the Small IRP List */ - Prcb->PPLookasideList[LookasideSmallIrpList].L = &IoSmallIrpLookaside.L; - CurrentList = ExAllocatePoolWithTag(NonPagedPool, - sizeof(NPAGED_LOOKASIDE_LIST), - IO_SMALLIRP_CPU); + Prcb->PPLookasideList[LookasideSmallIrpList].L = &IoSmallIrpLookaside; if (CurrentList) { /* Initialize the Lookaside List for Small IRPs */ - ExInitializeNPagedLookasideList(CurrentList, - NULL, - NULL, - 0, + ExInitializeSystemLookasideList(CurrentList, + NonPagedPool, SmallIrpSize, IO_SMALLIRP_CPU, - 32); + 32, + &ExSystemLookasideListHead); + Prcb->PPLookasideList[LookasideSmallIrpList].P = CurrentList; + CurrentList++; + } else { - CurrentList = &IoSmallIrpLookaside; - } - Prcb->PPLookasideList[LookasideSmallIrpList].P = &CurrentList->L; - - /* Set the I/O Completion List */ - Prcb->PPLookasideList[LookasideCompletionList].L = &IoCompletionPacketLookaside.L; - CurrentList = ExAllocatePoolWithTag(NonPagedPool, - sizeof(NPAGED_LOOKASIDE_LIST), - IO_SMALLIRP_CPU); + Prcb->PPLookasideList[LookasideSmallIrpList].P = &IoSmallIrpLookaside; + } + + /* Set the MDL Completion List */ + Prcb->PPLookasideList[LookasideMdlList].L = &IopMdlLookasideList; if (CurrentList) { - /* Initialize the Lookaside List for Large IRPs */ - ExInitializeNPagedLookasideList(CurrentList, - NULL, - NULL, - 0, - sizeof(IO_COMPLETION_PACKET), - IO_SMALLIRP_CPU, - 32); - } - else - { - CurrentList = &IoCompletionPacketLookaside; - } - Prcb->PPLookasideList[LookasideCompletionList].P = &CurrentList->L; - - /* Set the MDL Completion List */ - Prcb->PPLookasideList[LookasideMdlList].L = &IopMdlLookasideList.L; - CurrentList = ExAllocatePoolWithTag(NonPagedPool, - sizeof(NPAGED_LOOKASIDE_LIST), - TAG_MDL); - if (CurrentList) - { /* Initialize the Lookaside List for MDLs */ - ExInitializeNPagedLookasideList(CurrentList, - NULL, - NULL, - 0, + ExInitializeSystemLookasideList(CurrentList, + NonPagedPool, SmallIrpSize, TAG_MDL, - 128); + 128, + &ExSystemLookasideListHead); + + Prcb->PPLookasideList[LookasideMdlList].P = CurrentList; + CurrentList++; + } else { - CurrentList = &IopMdlLookasideList; - } - Prcb->PPLookasideList[LookasideMdlList].P = &CurrentList->L; + Prcb->PPLookasideList[LookasideMdlList].P = &IopMdlLookasideList; + } } } Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Tue Nov 4 15:55:55 2008 @@ -419,7 +419,7 @@ { /* We have an I/O Completion setup... create the special Overlay */ Irp->Tail.CompletionKey = Key; - Irp->Tail.Overlay.PacketType = IrpCompletionPacket; + Irp->Tail.Overlay.PacketType = IopCompletionPacketIrp; KeInsertQueue(Port, &Irp->Tail.Overlay.ListEntry); } else

1 0

[dreimer] 37190: Bug 3830: Spanish netshell update and more by Javier Remacha Bug 3833: Ukrainian translation update by Artem Reznikov Bug 3834: another fix for slovak translationby Mario Kacmar
by dreimer＠svn.reactos.org 04 Nov '08

04 Nov '08

Author: dreimer Date: Tue Nov 4 15:28:06 2008 New Revision: 37190 URL: http://svn.reactos.org/svn/reactos?rev=37190&view=rev Log: Bug 3830: Spanish netshell update and more by Javier Remacha Bug 3833: Ukrainian translation update by Artem Reznikov Bug 3834: another fix for slovak translationby Mario Kacmar Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc trunk/reactos/base/applications/calc/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc trunk/reactos/base/applications/mstsc/lang/uk-UA.rc trunk/reactos/base/applications/notepad/lang/es-ES.rc trunk/reactos/base/applications/winhlp32/lang/uk-UA.rc trunk/reactos/base/applications/winhlp32/rsrc.rc trunk/reactos/base/shell/explorer/explorer-uk.rc trunk/reactos/dll/cpl/desk/lang/sk-SK.rc trunk/reactos/dll/cpl/input/lang/uk-UA.rc trunk/reactos/dll/cpl/main/lang/uk-UA.rc trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc trunk/reactos/dll/win32/netcfgx/lang/sk-SK.rc trunk/reactos/dll/win32/netshell/lang/es-ES.rc trunk/reactos/dll/win32/netshell/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/xml.cpp Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/ru-RU.rc [iso-8859-1] Tue Nov 4 15:28:06 2008 @@ -448,7 +448,7 @@ IDS_CONV_CONSUMPTION "Ðàñõîä òîïëèâà (äâèãàòåëè)" IDS_CONV_CURRENCY "Âàëþòà" IDS_CONV_ENERGY "Ýíåðãèÿ" - IDS_CONV_LENGTH "Äëèííà" + IDS_CONV_LENGTH "Äëèíà" IDS_CONV_POWER "Ìîùíîñòü" IDS_CONV_PRESSURE "Äàâëåíèå" IDS_CONV_TEMPERATURE "Òåìïåðàòóðà" Modified: trunk/reactos/base/applications/calc/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/uk-UA.rc [iso-8859-1] Tue Nov 4 15:28:06 2008 @@ -239,20 +239,20 @@ IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Calculator" +CAPTION "Êàëüêóëÿòîð ReactOS" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Convert",IDC_BUTTON_CONVERT,35,105,76,17 + PUSHBUTTON "Ïåðåâåñòè",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 "Êàòåãîð³ÿ:",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 "Âèõ³äíà âåëè÷èíà (""ç""):",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 "Ê³íöåâà âåëè÷èíà (""â""):",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 | @@ -452,17 +452,17 @@ // 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 "Ïëîùà" + IDS_CONV_CONSUMPTION "Âèòðàòà ïàëèâà (äâèãóíè)" + IDS_CONV_CURRENCY "Âàëþòà" + IDS_CONV_ENERGY "Åíåðã³ÿ" + IDS_CONV_LENGTH "Äîâæèíà" + IDS_CONV_POWER "Ïîòóæí³ñòü" + IDS_CONV_PRESSURE "Òèñê" + IDS_CONV_TEMPERATURE "Òåìïåðàòóðà" + IDS_CONV_VELOCITY "Øâèäê³ñòü" + IDS_CONV_VOLUME "Îá'ºì" + IDS_CONV_WEIGHT "Âàãà" END // TYPES OF AREAS Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc [iso-8859-1] Tue Nov 4 15:28:06 2008 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/mscutils/eventvwr/lang/ru-RU.rc * PURPOSE: Russian Language File for ReactOS Event Viewer - * TRANSLATORS: Dmitry Chapyshev + * TRANSLATORS: Dmitry Chapyshev, Artem Reznikov */ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT @@ -93,12 +93,12 @@ STRINGTABLE BEGIN IDS_APP_TITLE "Ïðîñìîòð ñîáûòèé" - IDC_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer." - IDC_EVENTLOG_ERROR_TYPE "Error" - IDC_EVENTLOG_WARNING_TYPE "Warning" - IDC_EVENTLOG_INFORMATION_TYPE "Information" - IDC_EVENTLOG_AUDIT_SUCCESS "Audit Success" - IDC_EVENTLOG_AUDIT_FAILURE "Audit Failure" - IDC_EVENTLOG_SUCCESS "Success" - IDC_EVENTLOG_UNKNOWN_TYPE "Unknown Event" + IDC_EVENTSTRINGIDNOTFOUND "Íå íàéäåíî îïèñàíèå äëÿ ñîáûòèÿ ñ êîäîì ( %lu ) â èñòî÷íèêå ( %s ). Âîçìîæíî, íà ëîêàëüíîì êîìïüþòåðå íåò íóæíûõ äàííûõ â ðååñòðå èëè ôàéëîâ DLL ñîîáùåíèé äëÿ îòîáðàæåíèÿ ñîîáùåíèé óäàëåííîãî êîìïüþòåðà." + IDC_EVENTLOG_ERROR_TYPE "Îøèáêà" + IDC_EVENTLOG_WARNING_TYPE "Ïðåäóïðåæäåíèå" + IDC_EVENTLOG_INFORMATION_TYPE "Óâåäîìëåíèå" + IDC_EVENTLOG_AUDIT_SUCCESS "Àóäèò óñïåõîâ" + IDC_EVENTLOG_AUDIT_FAILURE "Àóäèò îòêàçîâ" + IDC_EVENTLOG_SUCCESS "Óñïåõ" + IDC_EVENTLOG_UNKNOWN_TYPE "Íåèçâåñòíîå ñîáûòèå" END Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc [iso-8859-1] Tue Nov 4 15:28:06 2008 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/mscutils/eventvwr/lang/uk-UA.rc * PURPOSE: Ukraianian Language File for ReactOS Event Viewer - * TRANSLATORS: Rostislav Zabolotny + * TRANSLATORS: Rostislav Zabolotny, Artem Reznikov */ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT @@ -94,11 +94,11 @@ BEGIN IDS_APP_TITLE "Îãëÿäà÷ ïîä³é" IDC_EVENTSTRINGIDNOTFOUND "Îïèñ äëÿ ²äåíòèô³êàòîðà ïîä³¿( %lu ) çà äæåðåëîì( %s ) íå çíàéäåíî. Ëîêàëüíèé êîìï'þòåð ìîæå íå ìàòè íåîáõ³äíî¿ ³íôîðìàö³¿ â ðåºñòð³ ÷è DLL ôàéë³â ïîâ³äîìëåíü äëÿ â³äîáðàæåííÿ ïîâ³äîìëåíü, ùî íàäõîäÿòü â³ä â³ääàëåíîãî êîìï'þòåðà." - IDC_EVENTLOG_ERROR_TYPE "Error" - IDC_EVENTLOG_WARNING_TYPE "Warning" - IDC_EVENTLOG_INFORMATION_TYPE "Information" - IDC_EVENTLOG_AUDIT_SUCCESS "Audit Success" - IDC_EVENTLOG_AUDIT_FAILURE "Audit Failure" - IDC_EVENTLOG_SUCCESS "Success" - IDC_EVENTLOG_UNKNOWN_TYPE "Unknown Event" + IDC_EVENTLOG_ERROR_TYPE "Ïîìèëêà" + IDC_EVENTLOG_WARNING_TYPE "Ïîïåðåäæåííÿ" + IDC_EVENTLOG_INFORMATION_TYPE "Ïîâ³äîìëåííÿ" + IDC_EVENTLOG_AUDIT_SUCCESS "Àóäèò óñï³õ³â" + IDC_EVENTLOG_AUDIT_FAILURE "Àóäèò â³äìîâ" + IDC_EVENTLOG_SUCCESS "Óñï³õ" + IDC_EVENTLOG_UNKNOWN_TYPE "Íåâ³äîìà ïîä³ÿ" END Modified: trunk/reactos/base/applications/mstsc/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/uk-UA.rc [iso-8859-1] Tue Nov 4 15:28:06 2008 @@ -66,6 +66,6 @@ IDS_PIXEL "%lu íà %lu êðàïîê" IDS_FULLSCREEN "Íà âåñü åêðàí" IDS_BROWSESERVER "<Ïîøóê ³íøèõ...>" - IDS_HEADERTEXT1 "Remote Desktop" - IDS_HEADERTEXT2 "Connection" + IDS_HEADERTEXT1 "Â³ääàëåíå êåðóâàííÿ ðîáî÷èì ñòîëîì" + IDS_HEADERTEXT2 "Ï³äêëþ÷åííÿ" END Modified: trunk/reactos/base/applications/notepad/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/es-ES.rc [iso-8859-1] Tue Nov 4 15:28:06 2008 @@ -195,7 +195,7 @@ STRING_OUT_OF_MEMORY, "No hay suficiente memoria para terminar esta \ tarea. \nCierre una o más aplicaciones para \ aumentar la cantidad \nde memoria libre." -STRING_CANNOTFIND "No pudo encontrar '%s'" +STRING_CANNOTFIND "No se encontró '%s'" STRING_ANSI, "ANSI" STRING_UNICODE, "Unicode" STRING_UNICODE_BE, "Unicode (big endian)" @@ -203,6 +203,6 @@ STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" -STRING_LINE_COLUMN, "Line %d, column %d" - -END +STRING_LINE_COLUMN, "Línea %d, columna %d" + +END Modified: trunk/reactos/base/applications/winhlp32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/uk-UA.rc [iso-8859-1] Tue Nov 4 15:28:06 2008 @@ -1,63 +1,112 @@ /* * PROJECT: ReactOS Help Viewer * LICENSE: GPL - See COPYING in the top level directory - * FILE: applications/winhelp/lang/uk-UA.rc + * FILE: applications/winhlp32/lang/uk-UA.rc * PURPOSE: Ukraianian Language File for ReactOS Help Viewer - * PROGRAMMERS: Rostislav Zabolotny + * PROGRAMMERS: Rostislav Zabolotny, Artem Reznikov */ - -LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT /* Menu */ -MAIN_MENU MENU -BEGIN - POPUP "&Ôàéë" - BEGIN +MAIN_MENU MENU LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +{ + POPUP "&Ôàéë" { MENUITEM "&Â³äêðèòè", MNID_FILE_OPEN MENUITEM SEPARATOR MENUITEM "&Äðóê", MNID_FILE_PRINT - MENUITEM "Íàëàøòóâàííÿ &ïð³íòåðà...", MNID_FILE_SETUP + MENUITEM "Ïàðà&ìåòðè äðóêó...", MNID_FILE_SETUP MENUITEM SEPARATOR MENUITEM "Â&èõ³ä", MNID_FILE_EXIT - END - POPUP "&Ïðàâêà" - BEGIN + } + POPUP "&Ïðàâêà" { MENUITEM "&Êîï³þâàòè...", MNID_EDIT_COPYDLG MENUITEM SEPARATOR MENUITEM "&Îïèñ...", MNID_EDIT_ANNOTATE - END - POPUP "&Çàêëàäêà" - BEGIN + } + POPUP "&Çàêëàäêà" { MENUITEM "&Âèçíà÷èòè...", MNID_BKMK_DEFINE - END - POPUP "&Äîïîìîãà" - BEGIN - MENUITEM "Äîïîìîãà &ïî äîïîìîç³", MNID_HELP_HELPON - MENUITEM "&Íàä óñ³ìà â³êíàìè", MNID_HELP_HELPTOP + } + POPUP "Ï&àðàìåòðè" { + POPUP "Äîâ³äêó çàâæäè âèäíî" + BEGIN + MENUITEM "Çà ïðîìîâ÷àííÿì", MNID_OPTS_HELP_DEFAULT + MENUITEM "Âèäíî", MNID_OPTS_HELP_VISIBLE + MENUITEM "Íå âèäíî", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "²ñòîð³ÿ", MNID_OPTS_HISTORY + POPUP "Øðèôò" + BEGIN + MENUITEM "Äð³áíèé", MNID_OPTS_FONTS_SMALL + MENUITEM "Çâè÷àéíèé", MNID_OPTS_FONTS_NORMAL + MENUITEM "Âåëèêèé", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Âèêîðèñòîâóâàòè ñèñòåìí³ êîëüîðè", MNID_OPTS_SYSTEM_COLORS + } + POPUP "&Äîâ³äêà" { + MENUITEM "Äîâ³äêà &ïî äîâ³äêó", MNID_HELP_HELPON + MENUITEM "Íàä óñ³ìà â³êíàìè", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "&²íôîðìàö³ÿ...", MNID_HELP_ABOUT #ifdef WINELIB MENUITEM "&Ïðî WINE", MNID_HELP_WINE #endif - END -END + } +} + +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Ïðåäìåòíèé ïîêàæ÷èê" +{ + LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER +} + +IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Search" +{ + LTEXT "Ùå íå ðåàë³çîâàíî", -1, 10, 10, 180, 150 +} /* Strings */ - -STRINGTABLE DISCARDABLE -BEGIN -STID_WINE_HELP, "Äîïîìîãà WINE" +STRINGTABLE DISCARDABLE LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +{ +STID_WINE_HELP, "Äîâ³äêà WINE" STID_WHERROR, "ÏÎÌÈËÊÀ" STID_WARNING, "ÏÎÏÅÐÅÄÆÅÍÍß" -STID_INFO, "²íôîðìàö³ÿ" +STID_INFO, "Ïîâ³äîìëåííÿ" STID_NOT_IMPLEMENTED, "Íå ðåàë³çîâàíî" -STID_HLPFILE_ERROR_s, "Ïîìèëêà ï³ä ÷àñ ÷èòàííÿ ôàéëó äîïîìîãè `%s'" -STID_CONTENTS, "&Çì³ñò" -STID_SEARCH, "&Ïîøóê" +STID_HLPFILE_ERROR_s, "Ïîìèëêà ï³ä ÷àñ ÷èòàííÿ ôàéëó äîâ³äêè `%s'" +STID_INDEX, "&Ïðåäìåòíèé ïîêàæ÷èê" +STID_CONTENTS, "Çì³ñò" STID_BACK, "&Íàçàä" -STID_TOPICS, "&Ðîçä³ëè" -STID_ALL_FILES, "Âñ³ ôàéëè (*.*)" -STID_HELP_FILES_HLP, "Ôàéëè äîïîìîãè (*.hlp)" +STID_ALL_FILES, "Óñ³ ôàéëè (*.*)" +STID_HELP_FILES_HLP, "Ôàéëè äîâ³äêè (*.hlp)" STID_FILE_NOT_FOUND_s "Íå ìîæó çíàéòè '%s'. ×è íå áàæàºòå âêàçàòè ðîçòàøóâàííÿ ñàìîñò³éíî?" +STID_NO_RICHEDIT "Íå ìîæó çíàéòè richedit... Ïåðåðèâàþ ðîáîòó" +STID_PSH_INDEX, "Òåìè äîâ³äêè: " +} + +CONTEXT_MENU MENU LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +BEGIN + POPUP "" + BEGIN + MENUITEM "Íîòàòêè...", MNID_CTXT_ANNOTATE + MENUITEM "Êîï³þâàòè", MNID_CTXT_COPY + MENUITEM "Äðóê...", MNID_CTXT_PRINT + POPUP "Øðèôò" + BEGIN + MENUITEM "Äð³áíèé", MNID_CTXT_FONTS_SMALL + MENUITEM "Çâè÷àéíèé", MNID_CTXT_FONTS_NORMAL + MENUITEM "Âåëèêèé", MNID_CTXT_FONTS_LARGE + END + POPUP "Äîâ³äêó çàâæäè âèäíî" + BEGIN + MENUITEM "Çà ïðîìîâ÷àííÿì", MNID_CTXT_HELP_DEFAULT + MENUITEM "Âèäíî", MNID_CTXT_HELP_VISIBLE + MENUITEM "Íå âèäíî", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "Âèêîðèñòîâóâàòè ñèñòåìí³ êîëüîðè", MNID_CTXT_SYSTEM_COLORS + END END Modified: trunk/reactos/base/applications/winhlp32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/rsrc.rc [iso-8859-1] Tue Nov 4 15:28:06 2008 @@ -52,5 +52,5 @@ #include "lang/sk-SK.rc" #include "lang/sv-SE.rc" #include "lang/tr-TR.rc" -// #include "lang/uk-UA.rc" +#include "lang/uk-UA.rc" #include "lang/zh-CN.rc" Modified: trunk/reactos/base/shell/explorer/explorer-uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-uk.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-uk.rc [iso-8859-1] Tue Nov 4 15:28:06 2008 @@ -381,9 +381,9 @@ IDS_DESKTOPBAR_SETTINGS "Íàñòðîéêè ðîáî÷îãî ñòîëà" IDS_DESKTOP "Ðîáî÷èé Ñò³ë" IDS_TASKBAR "Ïàíåëü çàâäàíü" - IDS_NAMECOLUMN "Name" - IDS_PATHCOLUMN "Path" - IDS_MENUCOLUMN "Menu path" + IDS_NAMECOLUMN "²ì'ÿ" + IDS_PATHCOLUMN "Øëÿõ" + IDS_MENUCOLUMN "Øëÿõ â ìåíþ" END #endif // Ukrainian resources Modified: trunk/reactos/dll/cpl/desk/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sk-SK.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/sk-SK.rc [iso-8859-1] Tue Nov 4 15:28:06 2008 @@ -1,9 +1,9 @@ /* * FILE: dll/cpl/desk/lang/sk-SK.rc * PURPOSE: Slovak Language File for desk - * TRANSLATOR: Kario <kario(a)szm.sk> + * TRANSLATOR: Mário Kaèmár aka Kario <kario(a)szm.sk> * DATE OF TR.: 15-09-2007 - * LAST CHANGE: 11-07-2008 + * LAST CHANGE: 05-10-2008 */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -39,12 +39,12 @@ COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Nastavenie",IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP PUSHBUTTON "&Ukáka",IDC_SCREENS_TESTSC, 175, 103, 50, 13 - LTEXT "&Poèka",IDC_WAITTEXT, 14, 125, 16, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY, 34, 123, 32, 13, ES_RIGHT | WS_GROUP + LTEXT "&Poèka",IDC_WAITTEXT, 14, 125, 20, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY, 38, 123, 32, 13, ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_BORDER | WS_GROUP, 54, 123, 12, 13 - LTEXT "minút", IDC_MINTEXT, 70, 125, 26, 9 + WS_BORDER | WS_GROUP, 58, 123, 12, 13 + LTEXT "minút", IDC_MINTEXT, 74, 125, 26, 9 CONTROL "Pri obnovení chráni &heslom.",IDC_SCREENS_USEPASSCHK,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 104, 19 GROUPBOX "Napájani&e monitora", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 Modified: trunk/reactos/dll/cpl/input/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/uk-UA.rc [iso-8859-1] Tue Nov 4 15:28:06 2008 @@ -10,17 +10,17 @@ IDD_PROPPAGESETTINGS DIALOGEX 0, 0, 254, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Settings" +CAPTION "Ïàðàìåòðè" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Select the services that you want for each input language shown in the list.\nUse the Add and Remove buttons to modify this list.", -1, 9, 6, 238, 25 CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | LVS_SORTASCENDING | LVS_REPORT | 0x0000808D, 8, 36, 237, 101 - PUSHBUTTON "&Set Default", IDC_SET_DEFAULT, 101, 159, 144, 14 - PUSHBUTTON "A&dd...", IDC_ADD_BUTTON, 27, 142, 70, 14 - PUSHBUTTON "&Remove...", IDC_REMOVE_BUTTON, 101, 142, 70, 14 - PUSHBUTTON "&Properties...", IDC_PROP_BUTTON, 175, 142, 70, 14 - GROUPBOX "Preferences", -1, 7, 185, 240, 36 - PUSHBUTTON "&Key Settings...", IDC_KEY_SET_BTN, 14, 198, 110, 14 + PUSHBUTTON "Çàìîâ&÷óâàííÿ", IDC_SET_DEFAULT, 101, 159, 144, 14 + PUSHBUTTON "&Äîäàòè...", IDC_ADD_BUTTON, 27, 142, 70, 14 + PUSHBUTTON "Â&èäàëèòè...", IDC_REMOVE_BUTTON, 101, 142, 70, 14 + PUSHBUTTON "Â&ëàñòèâîñò³...", IDC_PROP_BUTTON, 175, 142, 70, 14 + GROUPBOX "Íàñòðîéêà", -1, 7, 185, 240, 36 + PUSHBUTTON "&Ïàðàìåòðè êëàâ³àòóðè...", IDC_KEY_SET_BTN, 14, 198, 110, 14 END IDD_KEYSETTINGS DIALOGEX 0, 0, 272, 163 @@ -55,22 +55,22 @@ IDD_CHANGE_KEY_SEQ DIALOGEX 5, 100, 230, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Change Key Sequence" +CAPTION "Çì³íà ñïîëó÷åííÿ êëàâ³ø" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "", -1, 9, 5, 155, 110 - AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CB, 15, 15, 105, 12 + AUTOCHECKBOX "&Ïåðåêëþ÷àòè ìîâè ââîä", IDC_SWITCH_INPUT_LANG_CB, 15, 15, 105, 12 LTEXT "Shift", -1, 73, 37, 27, 12 CTEXT "+", -1, 62, 37, 8, 9 AUTORADIOBUTTON "&Ctrl", IDC_CTRL_LANG, 29, 31, 30, 11 - AUTORADIOBUTTON "Left &ALT", IDC_LEFT_ALT_LANG, 29, 45, 46, 12 - AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KBLAYOUTS_CB, 16, 65, 141, 12 + AUTORADIOBUTTON "ALT ç&ë³âà", IDC_LEFT_ALT_LANG, 29, 45, 46, 12 + AUTOCHECKBOX "Ïåðå&êëþ÷àòè ðîçêëàäêè êëàâ³àòóðè", IDC_SWITCH_KBLAYOUTS_CB, 16, 65, 141, 12 LTEXT "Shift", -1, 74, 87, 27, 12 CTEXT "+", -1, 63, 87, 8, 9 AUTORADIOBUTTON "C&trl", IDC_CTRL_LAYOUT, 30, 81, 30, 11 - AUTORADIOBUTTON "Left A&LT", IDC_LEFT_ALT_LAYOUT, 30, 95, 44, 12 + AUTORADIOBUTTON "ALT &çë³âà", IDC_LEFT_ALT_LAYOUT, 30, 95, 44, 12 DEFPUSHBUTTON "OK", IDOK, 172, 9, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 172, 27, 50, 14 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 172, 27, 50, 14 END IDD_INPUT_LANG_PROP DIALOGEX 20, 20, 227, 75 @@ -96,15 +96,15 @@ IDS_UNKNOWN "(Íåìàº äàíèõ)" IDS_RESTART "Âè ä³éñíî áàæàºòå ïåðåçàâàíòàæèòè êîìï'þòåð çàðàç?" IDS_WHATS_THIS "Ùî öå?" - IDS_LANGUAGE "Language" - IDS_LAYOUT "Keyboard Layout" - IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" - IDS_CONFIRMATION "Confirmation" - IDS_LAYOUT_EXISTS "This layout already exists." - IDS_LAYOUT_EXISTS2 "This layout already exists and can not be added." + IDS_LANGUAGE "Ìîâà" + IDS_LAYOUT "Ðîçêëàäêà êëàâ³àòóðè" + IDS_REM_QUESTION "Âè ä³éñíî õî÷åòå âèäàëèòè âèáðàíó ðîçêëàäêó êëàâ³àòóðè?" + IDS_CONFIRMATION "Ï³äòâåðäæåííÿ" + IDS_LAYOUT_EXISTS "Öÿ ðîçêëàäêà âæå ³ñíóº." + IDS_LAYOUT_EXISTS2 "Öÿ ðîçêëàäêà âæå ³ñíóº ³ íå ìîæå áóòè äîäàíà." IDS_CTRL_SHIFT "Ctrl+Shift" - IDS_LEFT_ALT_SHIFT "Left Alt+Shift" - IDS_SWITCH_BET_INLANG "Switch between input languages" + IDS_LEFT_ALT_SHIFT "Alt çë³âà+Shift" + IDS_SWITCH_BET_INLANG "Ïåðåêëþ÷åííÿ ìîâ ââîäó" END STRINGTABLE @@ -241,10 +241,10 @@ IDS_DIVEHI_TYPEWRITER_LAYOUT, "Ìàëüä³âñüêà (äðóêàðñüêà ìàøèíêà)" IDS_BULGARIAN_PHONETIC_CLASSIC_LAYOUT, "Áîëãàðñüêà ôîíåòè÷íà (êëàñè÷íà)" IDS_BULGARIAN_PHONETIC_BDS_LAYOUT, "Áîëãàðñüêà ôîíåòè÷íà (BDS)" - IDS_BULGARIAN_BDS_LAYOUT, "Bulgarian BDS 5237-1978" - IDS_GERMAN_RISTOME_LAYOUT, "German (RISTOME)" - IDS_GERMAN_NEO_11_LAYOUT, "German (NEO-1.1)" - IDS_GERMAN_DE_ERGO_LAYOUT, "German (de_ergo)" - IDS_BURMESE_LAYOUT, "Burmese" - IDS_UKRAINIAN_STUDENT_LAYOUT, "Ukrainian (Student)" -END + IDS_BULGARIAN_BDS_LAYOUT, "Áîëãàðñüêà BDS 5237-1978" + IDS_GERMAN_RISTOME_LAYOUT, "Í³ìåöüêà (RISTOME)" + IDS_GERMAN_NEO_11_LAYOUT, "Í³ìåöüêà (NEO-1.1)" + IDS_GERMAN_DE_ERGO_LAYOUT, "Í³ìåöüêà (de_ergo)" + IDS_BURMESE_LAYOUT, "Á³ðìàíñüêà" + IDS_UKRAINIAN_STUDENT_LAYOUT, "Óêðà¿íñüêà (ñòóäåíòñüêà)" +END Modified: trunk/reactos/dll/cpl/main/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/lang/uk-UA.rc [iso-8859-1] Tue Nov 4 15:28:06 2008 @@ -176,5 +176,5 @@ IDS_REMOVE_TEXT "Âè ä³éñíî áàæàºòå âèäàëèòè ñõåìó '%s' ³ç ñèñòåìè?" IDS_OVERWRITE_TITLE "Ï³äòâåðäæåííÿ çàì³íè ñõåìè" IDS_OVERWRITE_TEXT "Âèáðàíà ñõåìà âêàç³âíèê³â óæå âèêîðèñòîâóºòüñÿ. Çàì³íèòè âèõ³äíó ñõåìó?" - IDS_ANIMATE_CURSOR "Animated Cursor" + IDS_ANIMATE_CURSOR "Àí³ìîâàíèé âêàç³âíèê" END 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] Tue Nov 4 15:28:06 2008 @@ -1,8 +1,9 @@ /* * FILE: dll/cpl/sysdm/lang/sk-SK.rc * PURPOSE: Slovak Language File for sysdm - * TRANSLATOR: Kario <kario(a)szm.sk> + * TRANSLATOR: Mário Kaèmár aka Kario <kario(a)szm.sk> * DATE OF TR.: 20-09-2007 + * LAST CHANGE: 16-10-2009 */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -125,7 +126,7 @@ BEGIN ICON IDI_USERPROF, IDC_STATIC, 6, 11, 16, 16, SS_ICON LTEXT "Pouívate¾ské profily obsahujú nastavenia pracovnej plochy a iné informácie týkajúce sa pouívate¾ského konta. Na kadom pouívanom poèítaèi je moné vytvori iný profil alebo je moné vybra zdie¾aný profil, ktorý je rovnaký na vetkých pouívaných poèítaèoch.", - IDC_STATIC, 40, 11, 204, 35 + IDC_STATIC, 40, 11, 204, 44 LTEXT "&Profily uloené na tomto poèítaèi:", IDC_STATIC, 16, 51, 204, 9 CONTROL "", IDC_USERPROFILE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 6, 66, 244, 85, WS_EX_CLIENTEDGE @@ -149,11 +150,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, ES_NUMBER + EDITTEXT IDC_STRRECLISTEDIT, 183, 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, ES_NUMBER + AUTOCHECKBOX "Ak sú &potrebné monosti obnovenia, zobrazi ich na:", IDC_STRRECREC, 14, 70, 167, 8 + EDITTEXT IDC_STRRECRECEDIT, 183, 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 @@ -180,29 +181,29 @@ CAPTION "Virtuálna pamä" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Jednotka [menovka zväzku]", IDC_STATIC, 12, 5, 96, 9 - LTEXT "Ve¾kos stránkovacieho súboru (v MB)", IDC_STATIC, 115, 5, 96, 9 + LTEXT "Jednotka [menovka zväzku]", IDC_STATIC, 10, 5, 96, 9 + LTEXT "Ve¾kos stránkovacieho súboru (v MB)", IDC_STATIC, 112, 5, 96, 9 LISTBOX IDC_PAGEFILELIST, 10, 16, 204, 52, LBS_NOTIFY | LBS_USETABSTOPS GROUPBOX "Ve¾kos stránkovacieho súboru pre vybranú jednotku", IDC_DRIVEGROUP, 10, 70, 204, 104 - LTEXT "Jednotka:", IDC_STATIC, 20, 80, 20, 8 + LTEXT "Jednotka:", IDC_STATIC, 20, 80, 30, 8 LTEXT "", IDC_DRIVE, 88, 81, 100, 9 LTEXT "Dostupné miesto:", IDC_STATIC, 20, 92, 56, 9 LTEXT "", IDC_SPACEAVAIL, 88, 92, 104, 9 - LTEXT "&Poèiatoèná ve¾kos (v MB):", -1, 22, 118, 54, 9 - LTEXT "Ma&ximálna ve¾kos (v MB):", -1, 22, 131, 64, 9 - AUTORADIOBUTTON "&Vlastná ve¾kos:", IDC_CUSTOM, 20, 105, 54, 9, WS_GROUP - AUTORADIOBUTTON "Ve¾kos urèovaná &systémom", IDC_SYSMANSIZE, 20, 145, 88, 9 - AUTORADIOBUTTON "N&epouíva stránkovací súbor", IDC_NOPAGEFILE, 20, 158, 78,9 + LTEXT "&Poèiatoèná ve¾kos (v MB):", -1, 22, 118, 74, 9 + LTEXT "Ma&ximálna ve¾kos (v MB):", -1, 22, 131, 74, 9 + AUTORADIOBUTTON "&Vlastná ve¾kos:", IDC_CUSTOM, 20, 105, 74, 9, WS_GROUP + AUTORADIOBUTTON "Ve¾kos urèovaná &systémom", IDC_SYSMANSIZE, 20, 145, 98, 9 + AUTORADIOBUTTON "N&epouíva stránkovací súbor", IDC_NOPAGEFILE, 20, 158, 108,9 EDITTEXT IDC_INITIALSIZE, 100, 114, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE EDITTEXT IDC_MAXSIZE, 100, 129, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE PUSHBUTTON "&Nastavi", IDC_SET, 158, 155, 50, 14 GROUPBOX "Celková ve¾kos stránkovacieho súboru pre vetky jednotky", IDC_TOTALGROUP, 10, 177, 204, 46 - LTEXT "Najmenia povolená:", IDC_STATIC, 18, 188, 58, 9 + LTEXT "Najmenia povolená:", IDC_STATIC, 18, 188, 78, 9 LTEXT "", IDC_MINIMUM, 88, 188, 100, 9 LTEXT "Odporúèaná:", IDC_STATIC, 18, 199, 52, 9 LTEXT "", IDC_RECOMMENDED, 88, 197, 100, 9 - LTEXT "Aktuálne vyhradená:", IDC_STATIC, 18, 210, 66, 9 + LTEXT "Aktuálne vyhradená:", IDC_STATIC, 18, 210, 76, 9 LTEXT "", IDC_CURRENT, 88, 208, 100, 9 DEFPUSHBUTTON "OK", IDOK, 114, 232, 48, 14 Modified: trunk/reactos/dll/win32/netcfgx/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/sk-SK.rc [iso-8859-1] Tue Nov 4 15:28:06 2008 @@ -34,7 +34,7 @@ CONTROL "Au&tomatic private IP address", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12 - LTEXT "&IP address:", -1, 14, 75, 135, 8 + LTEXT "Adresa &IP:", -1, 14, 75, 135, 8 CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 150, 75, 80, 12 LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8 CONTROL "",IDC_SUBNETMASK,"SysIPAddress32",WS_TABSTOP, 150, 95, 80, 12 @@ -53,16 +53,16 @@ BEGIN GROUPBOX "IP addressen", -1, 5, 5, 240, 90 CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 210, 55 - PUSHBUTTON "Add...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP - PUSHBUTTON "Edit...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP - PUSHBUTTON "Remove", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP + PUSHBUTTON "Prida...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP + PUSHBUTTON "Upravi...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP + PUSHBUTTON "Odstráni", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP GROUPBOX "Default gateways:", -1, 5, 100, 240, 90 CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 210, 55 - PUSHBUTTON "Add...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP - PUSHBUTTON "Edit...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP - PUSHBUTTON "Remove", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "Prida...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "Upravi...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "Odstráni", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP GROUPBOX "", -1, 5, 200, 240, 30 - CHECKBOX "Automatic metric", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Automatická metrika", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP LTEXT "Interface metric:", -1, 15, 215, 90, 12 EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER END @@ -98,41 +98,41 @@ IDD_TCPIP_ADVOPT_DLG DIALOGEX DISCARDABLE 0, 0, 247, 247 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION -CAPTION "Options" +CAPTION "Monosti" FONT 8, "MS Shell Dlg" BEGIN LISTBOX IDC_OPTLIST, 5, 30, 230, 70 - LTEXT "&Optional settings", -1, 5, 15, 130, 12 - PUSHBUTTON "&Properties", IDC_OPTPROP, 160, 100, 70, 14, WS_TABSTOP + LTEXT "&Optional settings", -1, 5, 15, 130, 12 //volitelné nastavenia + PUSHBUTTON "Vl&astnosti", IDC_OPTPROP, 160, 100, 70, 14, WS_TABSTOP GROUPBOX "Description:", -1, 5, 120, 240, 70 LTEXT "", IDC_OPTDESC, 15, 130, 220, 33 END IDD_TCPIPADDIP_DLG DIALOGEX DISCARDABLE 0, 0, 200, 70 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "TCP/IP Address" +CAPTION "Adresa TCP/IP" FONT 8, "MS Shell Dlg" BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 100, 15, 80, 12 - LTEXT "IP address:", -1, 5, 15, 70, 12 - LTEXT "Subnet mask:", -1, 5, 30, 70, 12 + LTEXT "Adresa IP:", -1, 5, 15, 70, 12 + LTEXT "Maska podsiete:", -1, 5, 30, 70, 12 CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "Zrui", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END IDD_TCPIPGW_DLG DIALOGEX DISCARDABLE 0, 0, 200, 80 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "TCP/IP Gateway Address" +CAPTION "TCP/IP adresa brány" //TCP/IP Gateway Address FONT 8, "MS Shell Dlg" BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 100, 15, 80, 12 - LTEXT "Gateway:", -1, 5, 15, 70, 12 - CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP - LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED + LTEXT "Brána:", -1, 5, 15, 70, 12 + CHECKBOX "Automatická metrika", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP + LTEXT "&Metrika:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP + PUSHBUTTON "Zrui", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP END IDD_TCPIPDNS_DLG DIALOGEX DISCARDABLE 0, 0, 200, 80 @@ -143,7 +143,7 @@ CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12 LTEXT "DNS server:", -1, 5, 10, 120, 12 PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "Zrui", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END IDD_TCPIPSUFFIX_DLG DIALOGEX DISCARDABLE 0, 0, 200, 80 @@ -154,7 +154,7 @@ EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP LTEXT "Domain suffix:", -1, 5, 10, 120, 12 PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "Zrui", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END IDD_TCPIP_FILTER_DLG DIALOGEX DISCARDABLE 0, 0, 305, 220 @@ -167,22 +167,22 @@ CONTROL "Permit All", IDC_TCP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 30, 70, 12 CONTROL "Permit Only", IDC_TCP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 44, 70, 12 CONTROL "", IDC_TCP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 11, 62, 72, 75 - PUSHBUTTON "Add", IDC_TCP_ADD, 15, 141, 50, 14, WS_TABSTOP - PUSHBUTTON "Remove", IDC_TCP_DEL, 15, 161, 50, 14, WS_TABSTOP + PUSHBUTTON "Prida", IDC_TCP_ADD, 15, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "Odstráni", IDC_TCP_DEL, 15, 161, 50, 14, WS_TABSTOP GROUPBOX "", -1, 105, 30, 90, 150 CONTROL "Permit All", IDC_UDP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 30, 70, 12 CONTROL "Permit Only", IDC_UDP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 44, 70, 12 CONTROL "", IDC_UDP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 111, 62, 72, 75 - PUSHBUTTON "Add", IDC_UDP_ADD, 115, 141, 50, 14, WS_TABSTOP - PUSHBUTTON "Remove", IDC_UDP_DEL, 115, 161, 50, 14, WS_TABSTOP + PUSHBUTTON "Prida", IDC_UDP_ADD, 115, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "Odstráni", IDC_UDP_DEL, 115, 161, 50, 14, WS_TABSTOP GROUPBOX "", -1, 205, 30, 90, 150 CONTROL "Permit All", IDC_IP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 30, 70, 12 CONTROL "Permit Only", IDC_IP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 44, 70, 12 CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62, 72, 75 - PUSHBUTTON "Add", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP - PUSHBUTTON "Remove", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP + PUSHBUTTON "Prida", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "Odstráni", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "Zrui", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP END IDD_TCPIP_PORT_DLG DIALOGEX DISCARDABLE 0, 0, 200, 60 @@ -193,7 +193,7 @@ EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12 PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP + PUSHBUTTON "Zrui", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END STRINGTABLE @@ -203,19 +203,19 @@ IDS_NO_SUBMASK_SET "You have entered an address that is missing its subnet mask. Please add a subnet mask." IDS_TCPFILTERDESC "TCP/IP filtering allows you to control the type of TCP/IP network traffic that reaches your computer." IDS_TCPFILTER "TCP/IP Filtering" - IDS_IPADDR "IP address" - IDS_SUBMASK "Subnet mask" - IDS_GATEWAY "Gateway" - IDS_METRIC "Metric" + IDS_IPADDR "Adresa IP" + IDS_SUBMASK "Maska podsiete" + IDS_GATEWAY "Brána" + IDS_METRIC "Metrika" IDS_DHCPACTIVE "DHCP Enabled" IDS_AUTOMATIC "Automatic" IDS_NOITEMSEL "You have not selected an item. Select one first." IDS_TCPIP "ReactOS-TCP/IP" - IDS_ADD "Add" + IDS_ADD "Prida" IDS_MOD "OK" - IDS_TCP_PORTS "TCP Ports" - IDS_UDP_PORTS "UDP Ports" - IDS_IP_PROTO "IP protocols" + IDS_TCP_PORTS "TCP porty" + IDS_UDP_PORTS "UDP porty" + IDS_IP_PROTO "IP protokoly" IDS_PORT_RANGE "Port numbers must be greater than 0 and less than 65536. Please enter a number within this range." IDS_PROT_RANGE "Protocol numbers must be greater than 0 and less than 256. Please enter a number within this range." IDS_DUP_NUMBER "The number you are trying to add is already in the list. Please enter a different number." Modified: trunk/reactos/dll/win32/netshell/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/es… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/es-ES.rc [iso-8859-1] Tue Nov 4 15:28:06 2008 @@ -64,27 +64,27 @@ IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION -CAPTION "Network Connection Details" +CAPTION "Detalles de la conexión de red" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12 + LTEXT "&Detalles de la conexión de red:", -1, 15, 9, 170, 12 CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130 - PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14 + PUSHBUTTON "&Cerrar", IDC_CLOSE, 125, 165, 62, 14 END STRINGTABLE DISCARDABLE BEGIN - IDS_PHYSICAL_ADDRESS "Physical Address" - IDS_IP_ADDRESS "IP Address" - IDS_SUBNET_MASK "Subnet Mask" - IDS_DEF_GATEWAY "Default Gateway" - IDS_DHCP_SERVER "DHCP Server" - IDS_LEASE_OBTAINED "Lease Obtained" - IDS_LEASE_EXPIRES "Lease Expires" - IDS_DNS_SERVERS "DNS Servers" - IDS_WINS_SERVERS "WINS Servers" - IDS_PROPERTY "Property" - IDS_VALUE "Value" + IDS_PHYSICAL_ADDRESS "Dirección física" + IDS_IP_ADDRESS "Dirección IP" + IDS_SUBNET_MASK "Máscara de subred" + IDS_DEF_GATEWAY "Puerta de enlace predeterminada" + IDS_DHCP_SERVER "Servidor DHCP" + IDS_LEASE_OBTAINED "Concesión obtenida" + IDS_LEASE_EXPIRES "La concesión caduca" + IDS_DNS_SERVERS "Servidor DNS" + IDS_WINS_SERVERS "Servidor WINS" + IDS_PROPERTY "Propiedad" + IDS_VALUE "Valor" IDS_NETWORKCONNECTION "Conexiones de red" IDS_SHV_COLUMN_NAME "Nombre" IDS_SHV_COLUMN_TYPE "Tipo" Modified: trunk/reactos/dll/win32/netshell/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/sk… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/sk-SK.rc [iso-8859-1] Tue Nov 4 15:28:06 2008 @@ -1,6 +1,6 @@ /* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR.: 31-08-2008 - * LAST CHANGE: 19-09-2008 + * LAST CHANGE: 23-10-2008 */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -75,48 +75,48 @@ IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION -CAPTION "Network Connection Details" +CAPTION "Podrobnosti sieového pripojenia" //Sieové pripojenie - podrobnosti FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12 + LTEXT "Po&drobnosti sieového pripojenia:", -1, 15, 9, 170, 12 CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130 - PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14 + PUSHBUTTON "&Zavrie", IDC_CLOSE, 125, 165, 62, 14 END STRINGTABLE DISCARDABLE BEGIN - IDS_PHYSICAL_ADDRESS "Physical Address" - IDS_IP_ADDRESS "IP Address" - IDS_SUBNET_MASK "Subnet Mask" - IDS_DEF_GATEWAY "Default Gateway" + IDS_PHYSICAL_ADDRESS "Fyzická adresa" + IDS_IP_ADDRESS "Adresa IP" + IDS_SUBNET_MASK "Maska podsiete" + IDS_DEF_GATEWAY "Predvolená brána" IDS_DHCP_SERVER "DHCP Server" IDS_LEASE_OBTAINED "Lease Obtained" IDS_LEASE_EXPIRES "Lease Expires" - IDS_DNS_SERVERS "DNS Servers" - IDS_WINS_SERVERS "WINS Servers" - IDS_PROPERTY "Property" - IDS_VALUE "Value" - IDS_NETWORKCONNECTION "Network Connection" + IDS_DNS_SERVERS "Servery DNS" + IDS_WINS_SERVERS "Servery WINS" + IDS_PROPERTY "Vlastnos" + IDS_VALUE "Hodnota" + IDS_NETWORKCONNECTION "Sieové pripojenie" IDS_SHV_COLUMN_NAME "Názov" IDS_SHV_COLUMN_TYPE "Typ" - IDS_SHV_COLUMN_STATE "Status" + IDS_SHV_COLUMN_STATE "Stav" IDS_SHV_COLUMN_DEVNAME "Názov zariadenia" - IDS_SHV_COLUMN_PHONE "Phone # or Host Address" - IDS_SHV_COLUMN_OWNER "Owner" - IDS_TYPE_ETHERNET "LAN or High-Speed Internet" - IDS_STATUS_NON_OPERATIONAL "Disabled" - IDS_STATUS_UNREACHABLE "Not Connected" - IDS_STATUS_DISCONNECTED "Network cable unplugged" - IDS_STATUS_CONNECTING "Acquiring network address" - IDS_STATUS_CONNECTED "Connected" - IDS_STATUS_OPERATIONAL "Connected" + IDS_SHV_COLUMN_PHONE "Telefónne èíslo alebo adresa hostite¾a" + IDS_SHV_COLUMN_OWNER "Vlastník" + IDS_TYPE_ETHERNET "Lokálna sie alebo vysokorýchlostný Internet" + IDS_STATUS_NON_OPERATIONAL "Vypnuté" + IDS_STATUS_UNREACHABLE "Nepripojené" + IDS_STATUS_DISCONNECTED "Sieový kábel je odpojený" + IDS_STATUS_CONNECTING "Získavanie sieovej adresy" + IDS_STATUS_CONNECTED "Pripojené" + IDS_STATUS_OPERATIONAL "Pripojené" - IDS_NET_ACTIVATE "Enable" - IDS_NET_DEACTIVATE "Disable" + IDS_NET_ACTIVATE "Zapnú" + IDS_NET_DEACTIVATE "Vypnú" IDS_NET_STATUS "Stav" IDS_NET_REPAIR "Opravi" IDS_NET_CREATELINK "Vytvori odkaz" - IDS_NET_DELETE "Delete" + IDS_NET_DELETE "Odstráni" IDS_NET_RENAME "Premenova" IDS_NET_PROPERTIES "Vlastnosti" Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Tue Nov 4 15:28:06 2008 @@ -1,7 +1,7 @@ /* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * NOTE : partially translated * TRANSLATED : 26-12-2007 - * LAST CHANGE: 18-09-2008 + * LAST CHANGE: 26-10-2008 */ /* @@ -421,15 +421,15 @@ CAPTION "Typy súborov" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN -LTEXT "Registered file &types:", -1, 7, 10, 70, 10 +LTEXT "Registrované &typy súborov:", -1, 7, 10, 70, 10 CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 -PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP -PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP -GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 +PUSHBUTTON "&Nový", 14001, 120, 110, 50, 14, WS_TABSTOP +PUSHBUTTON "O&dstráni", 14002, 180, 110, 50, 14, WS_TABSTOP +GROUPBOX "Podrobnosti o prípone '%s'", 14003, 7, 130, 249, 70 //Details for '%s' extension LTEXT "Opens with:", -1, 12, 140, 40, 10 //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 -PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP +PUSHBUTTON "&Zmeni...", 14006, 180, 140, 50, 14, WS_TABSTOP LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -646,7 +646,7 @@ IDS_RESTORE "&Obnovi" IDS_FORMATDRIVE "Formátova..." IDS_RENAME "Premenova" - IDS_INSERT "Insert" + IDS_INSERT "Vloi" IDS_CREATEFOLDER_DENIED "Nie je moné vytvori nový prieèinok: Prístup zamietnutý." IDS_CREATEFOLDER_CAPTION "Chyba poèas vytvárania nového prieèinka" @@ -725,12 +725,12 @@ IDS_OPEN_WITH_FILTER "Spustite¾né súbory\0*.exe\0" IDS_DIRECTORY "Prieèinok" IDS_VIRTUAL_DRIVER "Virtual Device Driver" - IDS_BAT_FILE "ReactOS Batch File" - IDS_CMD_FILE "ReactOS Command Script" + IDS_BAT_FILE "Dávkový súbor systému ReactOS" + IDS_CMD_FILE "Príkazový skript systému ReactOS" IDS_COM_FILE "DOS aplikácia" IDS_CPL_FILE "Poloka ovládacieho panela" IDS_CUR_FILE "Kurzor" - IDS_DLL_FILE "Application Extension" + IDS_DLL_FILE "Rozírenie aplikácie" IDS_DRV_FILE "Ovládaè zariadenia" IDS_EXE_FILE "Aplikácia" IDS_FON_FILE "Súbor písma" Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Tue Nov 4 15:28:06 2008 @@ -885,9 +885,6 @@ bool MingwBackend::IsSupportedCompilerVersion ( const string& compilerVersion ) { - if ( strcmp ( compilerVersion.c_str (), "3.4.2") < 0 ) - return false; - else return true; } Modified: trunk/reactos/tools/xml.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/xml.cpp?rev=37190&r1… ============================================================================== --- trunk/reactos/tools/xml.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/xml.cpp [iso-8859-1] Tue Nov 4 15:28:06 2008 @@ -38,7 +38,7 @@ #include <assert.h> #include <ctype.h> #include <string.h> - +#include <stdlib.h> #include "xml.h" #include "ssprintf.h"

1 0

[dreimer] 37189: Bug 3830: Spanish netshell update and more by Javier Remacha Bug 3833: Ukrainian translation update by Artem Reznikov Bug 3834: another fix for slovak translationby Mario Kacmar
by dreimer＠svn.reactos.org 04 Nov '08

04 Nov '08

Author: dreimer Date: Tue Nov 4 15:27:56 2008 New Revision: 37189 URL: http://svn.reactos.org/svn/reactos?rev=37189&view=rev Log: Bug 3830: Spanish netshell update and more by Javier Remacha Bug 3833: Ukrainian translation update by Artem Reznikov Bug 3834: another fix for slovak translationby Mario Kacmar Added: trunk/rosapps/applications/devutils/zoomin/lang/es-ES.rc (with props) trunk/rosapps/applications/fraginator/lang/es-ES.rc (with props) trunk/rosapps/applications/screensavers/circles/lang/uk-UA.rc (with props) Modified: trunk/rosapps/applications/devutils/zoomin/zoomin.rc trunk/rosapps/applications/fraginator/Fraginator.rc trunk/rosapps/applications/imagesoft/lang/es-ES.rc trunk/rosapps/applications/packmgr/gui/lang/es-ES.rc trunk/rosapps/applications/packmgr/lib/download.cpp trunk/rosapps/applications/screensavers/circles/circles.rc Added: trunk/rosapps/applications/devutils/zoomin/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/zoom… ============================================================================== --- trunk/rosapps/applications/devutils/zoomin/lang/es-ES.rc (added) +++ trunk/rosapps/applications/devutils/zoomin/lang/es-ES.rc [iso-8859-1] Tue Nov 4 15:27:56 2008 @@ -1,0 +1,85 @@ +/* $Id: zoomin.rc 31932 2008-01-21 21:29:59Z dreimer $ */ + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_ZOOMIN ICON DISCARDABLE "zoomin.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// Bitmap +// + + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDR_ZOOMIN_MENU MENU DISCARDABLE +BEGIN + POPUP "&Archivo" + BEGIN + MENUITEM "Sa&lir\tAlt-F4", ID_EDIT_EXIT + END + POPUP "&Edición" + BEGIN + MENUITEM "&Copiar\tCtrl+C", ID_EDIT_COPY, GRAYED + MENUITEM "&Actualizar\tF5", ID_EDIT_REFRESH + END + POPUP "&Opciones" + BEGIN + MENUITEM "&Velocidad de actualización...", ID_OPTIONS_REFRESH_RATE, GRAYED + END + POPUP "Ay&uda" + BEGIN + MENUITEM "&Acerca de ...", ID_HELP_ABOUT + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_ABOUTBOX DIALOGEX DISCARDABLE 22, 17, 230, 75 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Acerca de" +FONT 8, "System" +BEGIN + ICON IDI_ZOOMIN,IDI_ZOOMIN,14,9,16,16 + LTEXT "ReactOS zoomin Version 1.0",IDC_STATIC,49,10,119,8, + SS_NOPREFIX + LTEXT "Copyright (C) 2002 ReactOS Team",IDC_STATIC,49,20,119,8 + DEFPUSHBUTTON "Aceptar",IDOK,195,6,30,11,WS_GROUP +END + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "ReactOS Zoomin" +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Accelerator +// + +IDR_ZOOMIN ACCELERATORS DISCARDABLE +BEGIN + VK_F5, ID_REFRESH, VIRTKEY, NOINVERT +END Propchange: trunk/rosapps/applications/devutils/zoomin/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/devutils/zoomin/zoomin.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/zoom… ============================================================================== --- trunk/rosapps/applications/devutils/zoomin/zoomin.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/zoomin/zoomin.rc [iso-8859-1] Tue Nov 4 15:27:56 2008 @@ -9,5 +9,6 @@ #include <reactos/version.rc> #include "lang/en-US.rc" +#include "lang/es-ES.rc" #include "lang/no-NO.rc" #include "lang/sk-SK.rc" Modified: trunk/rosapps/applications/fraginator/Fraginator.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/fraginator/Fr… ============================================================================== --- trunk/rosapps/applications/fraginator/Fraginator.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/fraginator/Fraginator.rc [iso-8859-1] Tue Nov 4 15:27:56 2008 @@ -14,5 +14,6 @@ #include "lang/en-US.rc" +#include "lang/es-ES.rc" #include "lang/no-NO.rc" #include "lang/sk-SK.rc" Added: trunk/rosapps/applications/fraginator/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/fraginator/la… ============================================================================== --- trunk/rosapps/applications/fraginator/lang/es-ES.rc (added) +++ trunk/rosapps/applications/fraginator/lang/es-ES.rc [iso-8859-1] Tue Nov 4 15:27:56 2008 @@ -1,0 +1,229 @@ +// Microsoft Visual C++ generated resource script. +// + +///////////////////////////////////////////////////////////////////////////// + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_MAIN DIALOGEX 0, 0, 346, 103 +STYLE DS_SHELLFONT | DS_CENTERMOUSE | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | + WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + COMBOBOX IDC_DRIVES_LIST,78,52,29,111,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_METHODS_LIST,135,52,77,79,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRIORITY_LIST,223,52,59,91,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Comenzar",IDC_STARTSTOP,294,7,45,15 + PUSHBUTTON "Ayuda",ID_MAIN_HELP,294,28,45,15 + PUSHBUTTON "Salir",IDC_QUIT,294,49,45,15 + CONTROL 110,-1,"Static",SS_BITMAP | SS_SUNKEN | + WS_BORDER,7,7,63,58 + LTEXT "Seleccione una unidad:",-1,78,40,50,8 + LTEXT "Seleccione una acción:",-1,135,40,58,8 + CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER | + 0x1,7,71,299,10 + CONTROL "Static",IDC_STATUS,"Static",SS_LEFTNOWORDWRAP | + SS_SUNKEN | WS_GROUP,7,86,332,10 + LTEXT "I am a monkey, hear me eeK",IDC_WISECRACKS,78,15,91,8 + LTEXT "100.00%",IDC_PERCENT,311,71,28,8,0,WS_EX_RIGHT + LTEXT "Prioridad del proceso:",-1,223,40,51,8 +END + +IDD_REPORT DIALOGEX 0, 0, 391, 169 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION +CAPTION "Informe" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Bytes",IDC_BYTES,7,148,50,14 + DEFPUSHBUTTON "Kilobytes",IDC_KILOBYTES,61,148,50,14 + DEFPUSHBUTTON "Megabytes",IDC_MEGABYTES,115,148,50,14 + DEFPUSHBUTTON "Gigabytes",IDC_GIGABYTES,169,148,50,14 + DEFPUSHBUTTON "Aceptar",IDC_REPORTOK,334,148,50,14 + RTEXT "Volumen",-1,7,7,24,8 + LTEXT "Capacidad",-1,7,51,28,8 + RTEXT "(Letra de la unidad)",IDC_DRIVELETTER,63,7,117,10,SS_SUNKEN + RTEXT "(Tamaño del disco, Bytes)",IDC_DISKSIZEBYTES,63,51,117,10, + SS_SUNKEN + RTEXT "(Tamaño del disco, Clusters)",IDC_DISKSIZECLUSTERS,63,73,117, + 10,SS_SUNKEN + LTEXT "Clusters totales",-1,7,73,43,8 + RTEXT "(Tamaño del Cluster)",IDC_DISKCLUSTERSIZE,63,84,117,10, + SS_SUNKEN + LTEXT "Tamaño del Cluster",-1,7,84,36,8 + RTEXT "(Cantidad de archivos)",IDC_FILESCOUNT,267,18,117,10,SS_SUNKEN + RTEXT "(Tamaño de archivos, bytes)",IDC_FILESSIZEBYTES,267,29,117,10, + SS_SUNKEN + LTEXT "# de archivos",-1,194,18,28,8 + LTEXT "Tamaño total",-1,194,29,31,8 + LTEXT "Tamaño en disco",-1,194,40,39,8 + RTEXT "(Tamaño total, bytes)",IDC_FILESSIZEONDISK,267,40,117,10, + SS_SUNKEN + RTEXT "(Files slack bytes)",IDC_FILESSLACKBYTES,267,51,117,10, + SS_SUNKEN + LTEXT "Wasted slack",-1,194,51,44,8 + RTEXT "(Espacio libre, Bytes)",IDC_DISKFREEBYTES,63,62,117,10, + SS_SUNKEN + LTEXT "Espacio libre",-1,7,62,36,8 + RTEXT "(Archivos fragmentados, cantidad)",IDC_FILESFRAGGED,267,62,117, + 10,SS_SUNKEN + LTEXT "Archivos fragmentados",-1,194,62,52,8 + RTEXT "(Cantidad de directorios)",IDC_DIRSCOUNT,267,7,117,10,SS_SUNKEN + LTEXT "# de directorios",-1,194,7,48,8 + RTEXT "Sistema de archivos",-1,7,40,36,8 + RTEXT "(Nombre del sistema de archivos)",IDC_FILESYSTEM,63,40,117,10, + SS_SUNKEN + RTEXT "Etiqueta del volumen",-1,7,18,44,8 + RTEXT "(Etiqueta del volumen)",IDC_VOLUMELABEL,63,18,117,10,SS_SUNKEN + RTEXT "Serie",-1,7,29,18,8 + RTEXT "(Serie del volumen)",IDC_VOLUMESERIAL,63,29,117,10, + SS_SUNKEN + RTEXT "(Media de fragmentos por archivo)",IDC_AVERAGEFRAGS,267,73,117, + 10,SS_SUNKEN + LTEXT "Media de fragmentos por archivo",-1,194,73,60,20 + LTEXT "XX.X% de los archivos de esta unidad están fragmentados. Es recomendable que realice una SSSSSSS defragmentación.", + IDC_RECOMMEND,7,106,377,38,SS_SUNKEN + LTEXT "Recomendaciones:",-1,7,96,62,8 +END + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO +BEGIN + IDD_MAIN, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 339 + TOPMARGIN, 7 + BOTTOMMARGIN, 96 + END + + IDD_REPORT, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 384 + TOPMARGIN, 7 + BOTTOMMARGIN, 162 + END +END +#endif // APSTUDIO_INVOKED + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""windows.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,3,0,0 + PRODUCTVERSION 1,3,0,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Organización", " " + VALUE "FileDescription", "Fraginator" + VALUE "Versión del archivo", "1.03" + VALUE "Nombre interno", "Fraginator" + VALUE "Copyright", "Copyright © 2000-2002 Rick Brewster" + VALUE "Nombre original del archivo", "Fraginator.exe" + VALUE "Nombre del producto", "Fraginator" + VALUE "Versión del producto", "1.03" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Bitmap +// + +IDB_LOGO BITMAP "Fraginator Motif Icon.bmp" + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_ICON ICON "icon1.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// RT_MANIFEST +// + +1 RT_MANIFEST "default1.bin" +#endif // Spanish resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Propchange: trunk/rosapps/applications/fraginator/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/imagesoft/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/lan… ============================================================================== --- trunk/rosapps/applications/imagesoft/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/imagesoft/lang/es-ES.rc [iso-8859-1] Tue Nov 4 15:27:56 2008 @@ -210,7 +210,7 @@ IDS_HINT_CLOSEALL " Cerrar todas las ventanas." IDS_HINT_SAVE " Guardar el documento activo." IDS_HINT_SAVEAS " Guardar el documento activo con un nuevo nombre." - IDS_HINT_PRINTPRE " Previews the printed documento." + IDS_HINT_PRINTPRE " Previsualizar impresión." IDS_HINT_PRINT " Imprimir el documento activo." IDS_HINT_PROP " Mostrar las propiedades de la imagen activa." IDS_HINT_EXIT " Cerrar esta aplicación." Modified: trunk/rosapps/applications/packmgr/gui/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/packmgr/gui/l… ============================================================================== --- trunk/rosapps/applications/packmgr/gui/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/packmgr/gui/lang/es-ES.rc [iso-8859-1] Tue Nov 4 15:27:56 2008 @@ -22,7 +22,7 @@ CONTROL "", IDC_STATUS2, "msctls_progress32", PBS_SMOOTH, 20, 45, 140, 15 - PUSHBUTTON "Abort", IDC_CANCEL, 65, 70, 50, 14, WS_DISABLED + PUSHBUTTON "Cancelar", IDC_CANCEL, 65, 70, 50, 14, WS_DISABLED END IDR_POPUP MENU DISCARDABLE Modified: trunk/rosapps/applications/packmgr/lib/download.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/packmgr/lib/d… ============================================================================== --- trunk/rosapps/applications/packmgr/lib/download.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/packmgr/lib/download.cpp [iso-8859-1] Tue Nov 4 15:27:56 2008 @@ -13,6 +13,7 @@ #include "package.hpp" #include "expat.h" #include "log.h" +#include <string> #include <urlmon.h> HRESULT WINAPI URLDownloadToFileA( Modified: trunk/rosapps/applications/screensavers/circles/circles.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/circles/circles.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/circles/circles.rc [iso-8859-1] Tue Nov 4 15:27:56 2008 @@ -15,3 +15,4 @@ #include "lang/es-ES.rc" #include "lang/no-NO.rc" #include "lang/sk-SK.rc" +#include "lang/uk-UA.rc" Added: trunk/rosapps/applications/screensavers/circles/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/circles/lang/uk-UA.rc (added) +++ trunk/rosapps/applications/screensavers/circles/lang/uk-UA.rc [iso-8859-1] Tue Nov 4 15:27:56 2008 @@ -1,0 +1,15 @@ +/* + * PROJECT: Circles ScreenSaver + * LICENSE: GPL - See COPYING in the top level directory + * FILE: applications/screensavers/circles/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for Circles ScreenSaver + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Çàñòàâêà ""Êîëà""" + IDS_TEXT "Öÿ çàñòàâêà íå ìàº íàëàøòîâóâàíèõ ïàðàìåòð³â." +END Propchange: trunk/rosapps/applications/screensavers/circles/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hyperion] 37187: KJK::Hyperion is proud to present "dllimport purity", another landmark commit that you should really build only after a "clean" Disclaimer: in an uncharacteristic and daring move, I actually built, installed and booted this revision modified tools/rbuild/backend/mingw/mingw.cpp modified tools/rbuild/backend/mingw/modulehandler.cpp modified tools/rbuild/module.cpp modified tools/rbuild/project.dtd modified tools/rbuild/rbuild.h modified include/crt/_mingw.h New module attribute
by hyperion＠svn.reactos.org 04 Nov '08

04 Nov '08

Author: hyperion Date: Tue Nov 4 12:16:58 2008 New Revision: 37187 URL: http://svn.reactos.org/svn/reactos?rev=37187&view=rev Log: KJK::Hyperion is proud to present "dllimport purity", another landmark commit that you should really build only after a "clean" Disclaimer: in an uncharacteristic and daring move, I actually built, installed and booted this revision modified tools/rbuild/backend/mingw/mingw.cpp modified tools/rbuild/backend/mingw/modulehandler.cpp modified tools/rbuild/module.cpp modified tools/rbuild/project.dtd modified tools/rbuild/rbuild.h modified include/crt/_mingw.h New module attribute iscrt for marking modules that implement a C runtime library New module attribute crt for compiling and linking modules to a specific C runtime library. Can be "ntdll" (for ntdll.dll) "msvcrt" (msvcrt.dll), "crt" (statically-linked runtime), "libcntpr" (libcntpr.lib), "dll" (one of the <library> entries specifies a CRT DLL) or "static". Defaults to "msvcrt" for Win32 modules, to "static" for CRT modules themselves, and to "dll" for drivers Define _DLL for code that compiles against a dynamically-linked CRT Define __MINGW_IMPORT and _CRTIMP according to whether _DLL is defined. We finally use __declspec(dllimport) somewhere, anywhere (SDK headers still don't use it) Bonus fix: actually use compiler-specific command line flags when compiling files modified lib/3rdparty/adns/adns.rbuild modified lib/3rdparty/libxml2/libxml2.rbuild modified lib/3rdparty/mingw/mingw.rbuild And for the downside: static libraries that will be linked to a module that links to the CRT dynamically have to be compiled for a dynamically-linked CRT, as well. Say it out aloud. modified base/applications/wordpad/wordpad.rbuild modified base/setup/usetup/usetup.rbuild modified dll/3rdparty/dxtn/dxtn.rbuild modified dll/3rdparty/freetype/freetype.rbuild modified dll/3rdparty/mesa32/mesa32.rbuild modified dll/cpl/desk/desk.rbuild modified dll/cpl/input/input.rbuild modified dll/cpl/intl/intl.rbuild modified dll/cpl/joy/joy.rbuild modified dll/cpl/main/main.rbuild modified dll/cpl/mmsys/mmsys.rbuild modified dll/cpl/odbccp32/odbccp32.rbuild modified dll/cpl/powercfg/powercfg.rbuild modified dll/cpl/sysdm/sysdm.rbuild modified dll/cpl/telephon/telephon.rbuild modified dll/cpl/timedate/timedate.rbuild modified dll/cpl/usrmgr/usrmgr.rbuild modified dll/directx/ddraw/ddraw.rbuild modified dll/directx/dsound/dsound.rbuild modified dll/directx/wine/wined3d/wined3d.rbuild modified dll/nls/idndl_redist/idndl_redist.rbuild modified dll/nls/normaliz_redist/normaliz_redist.rbuild modified dll/shellext/deskadp/deskadp.rbuild modified dll/shellext/deskmon/deskmon.rbuild modified dll/shellext/fontext/fontext.rbuild modified dll/win32/dhcpcsvc/dhcpcsvc.rbuild modified dll/win32/dnsapi/dnsapi.rbuild modified dll/win32/glu32/glu32.rbuild modified dll/win32/icmp/icmp.rbuild modified dll/win32/winmm/midimap/midimap.rbuild modified drivers/video/displays/framebuf/framebuf.rbuild modified drivers/video/displays/framebufacc/framebufacc.rbuild modified drivers/video/displays/vga/vgaddi.rbuild modified subsystems/win32/csrss/csrss.rbuild modified subsystems/win32/csrss/win32csr/win32csr.rbuild modified subsystems/win32/win32k/win32k.rbuild Don't specify msvcrt explicitely as a <library> if it's going to be linked implicitely as the CRT <library>libcntpr</library> -> crt="libcntpr" Remove miscellaneous unused <library> entries modified dll/win32/crtdll/crtdll.rbuild modified dll/win32/msvcrt20/msvcrt20.rbuild modified dll/win32/msvcrt40/msvcrt40.rbuild modified dll/win32/msvcrt/msvcrt.rbuild Mark CRT DLLs as CRT modules modified dll/win32/user32/windows/font.c modified include/reactos/wine/unicode.h Don't redefine or redeclare CRT functions modified dll/win32/ws2_32/include/ws2_32.h Arch, you idiot, it's defined in <stdlib.h> modified include/crt/ctype.h modified include/crt/wctype.h Don't import ctype routines that were already defined as inlines modified include/crt/stdio.h modified include/reactos/wine/config.h Avoid linking to libmingwex.a if possible modified base/applications/taskmgr/taskmgr.rbuild modified tools/nci/nci.mak modified tools/nci/ncitool.c modified dll/ntdll/ntdll.rbuild Mark ntdll module as a CRT New "ntsys" module to import just Nt/Zw from ntdll.dll. Avoids accidentally linking to ntdll.dll's CRT when importing system calls modified include/psdk/winternl.h Nope, it doesn't. modified base/applications/network/net/help.c modified base/applications/network/net/main.c Replace printf with puts, or GCC will do it on its own and link to the dllimport thunk for puts modified base/applications/network/ping/ping.c Removed broken, unnecessary workaround modified base/shell/cmd/cmd.rbuild Simplify cmd module This commit dediHAPPY BIRTHDAY STEFAN GINSBERG <3 <3 <3 Modified: trunk/reactos/base/applications/network/net/help.c trunk/reactos/base/applications/network/net/main.c trunk/reactos/base/applications/network/ping/ping.c trunk/reactos/base/applications/taskmgr/taskmgr.rbuild trunk/reactos/base/applications/wordpad/wordpad.rbuild trunk/reactos/base/setup/usetup/usetup.rbuild trunk/reactos/base/shell/cmd/cmd.rbuild trunk/reactos/dll/3rdparty/dxtn/dxtn.rbuild trunk/reactos/dll/3rdparty/freetype/freetype.rbuild trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild trunk/reactos/dll/cpl/desk/desk.rbuild trunk/reactos/dll/cpl/input/input.rbuild trunk/reactos/dll/cpl/intl/intl.rbuild trunk/reactos/dll/cpl/joy/joy.rbuild trunk/reactos/dll/cpl/main/main.rbuild trunk/reactos/dll/cpl/mmsys/mmsys.rbuild trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild trunk/reactos/dll/cpl/powercfg/powercfg.rbuild trunk/reactos/dll/cpl/sysdm/sysdm.rbuild trunk/reactos/dll/cpl/telephon/telephon.rbuild trunk/reactos/dll/cpl/timedate/timedate.rbuild trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild trunk/reactos/dll/directx/ddraw/ddraw.rbuild trunk/reactos/dll/directx/dsound/dsound.rbuild trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild trunk/reactos/dll/nls/idndl_redist/idndl_redist.rbuild trunk/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild trunk/reactos/dll/ntdll/ntdll.rbuild trunk/reactos/dll/shellext/deskadp/deskadp.rbuild trunk/reactos/dll/shellext/deskmon/deskmon.rbuild trunk/reactos/dll/shellext/fontext/fontext.rbuild trunk/reactos/dll/win32/crtdll/crtdll.rbuild trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild trunk/reactos/dll/win32/dnsapi/dnsapi.rbuild trunk/reactos/dll/win32/glu32/glu32.rbuild trunk/reactos/dll/win32/icmp/icmp.rbuild trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild trunk/reactos/dll/win32/msvcrt20/msvcrt20.rbuild trunk/reactos/dll/win32/msvcrt40/msvcrt40.rbuild trunk/reactos/dll/win32/user32/windows/font.c trunk/reactos/dll/win32/winmm/midimap/midimap.rbuild trunk/reactos/dll/win32/ws2_32/include/ws2_32.h trunk/reactos/drivers/video/displays/framebuf/framebuf.rbuild trunk/reactos/drivers/video/displays/framebufacc/framebufacc.rbuild trunk/reactos/drivers/video/displays/vga/vgaddi.rbuild trunk/reactos/include/crt/_mingw.h trunk/reactos/include/crt/ctype.h trunk/reactos/include/crt/stdio.h trunk/reactos/include/crt/wctype.h trunk/reactos/include/psdk/winternl.h trunk/reactos/include/reactos/wine/config.h trunk/reactos/include/reactos/wine/unicode.h trunk/reactos/lib/3rdparty/adns/adns.rbuild trunk/reactos/lib/3rdparty/libxml2/libxml2.rbuild trunk/reactos/lib/3rdparty/mingw/mingw.rbuild trunk/reactos/subsystems/win32/csrss/csrss.rbuild trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild trunk/reactos/subsystems/win32/win32k/win32k.rbuild trunk/reactos/tools/nci/nci.mak trunk/reactos/tools/nci/ncitool.c trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/project.dtd trunk/reactos/tools/rbuild/rbuild.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/network/net/help.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/net/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/ping.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/taskmgr/taskmgr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/wordpad/wordpad.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/setup/usetup/usetup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.r… Modified: trunk/reactos/base/shell/cmd/cmd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.rbuild?… Modified: trunk/reactos/dll/3rdparty/dxtn/dxtn.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/dxtn.rbu… Modified: trunk/reactos/dll/3rdparty/freetype/freetype.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/freetype/free… Modified: trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/mesa32… Modified: trunk/reactos/dll/cpl/desk/desk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rbuild?r… Modified: trunk/reactos/dll/cpl/input/input.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.rbuild… Modified: trunk/reactos/dll/cpl/intl/intl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.rbuild?r… Modified: trunk/reactos/dll/cpl/joy/joy.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/joy.rbuild?rev… Modified: trunk/reactos/dll/cpl/main/main.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/main.rbuild?r… Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rbuild… Modified: trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/odbccp32.… Modified: trunk/reactos/dll/cpl/powercfg/powercfg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.… Modified: trunk/reactos/dll/cpl/sysdm/sysdm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.rbuild… Modified: trunk/reactos/dll/cpl/telephon/telephon.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/telephon.… Modified: trunk/reactos/dll/cpl/timedate/timedate.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.… Modified: trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/usrmgr.rbui… Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rb… Modified: trunk/reactos/dll/directx/dsound/dsound.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/dsound.… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/nls/idndl_redist/idndl_redist.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/nls/idndl_redist/idndl… Modified: trunk/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/nls/normaliz_redist/no… Modified: trunk/reactos/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ntdll.rbuild?rev… Modified: trunk/reactos/dll/shellext/deskadp/deskadp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/deska… Modified: trunk/reactos/dll/shellext/deskmon/deskmon.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/deskm… Modified: trunk/reactos/dll/shellext/fontext/fontext.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/fontext/fonte… Modified: trunk/reactos/dll/win32/crtdll/crtdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crtdll/crtdll.rb… Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcpcsv… Modified: trunk/reactos/dll/win32/dnsapi/dnsapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi.rb… Modified: trunk/reactos/dll/win32/glu32/glu32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/glu32.rbui… Modified: trunk/reactos/dll/win32/icmp/icmp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/icmp/icmp.rbuild… Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.rb… Modified: trunk/reactos/dll/win32/msvcrt20/msvcrt20.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt20/msvcrt2… Modified: trunk/reactos/dll/win32/msvcrt40/msvcrt40.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt40/msvcrt4… Modified: trunk/reactos/dll/win32/user32/windows/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/f… Modified: trunk/reactos/dll/win32/winmm/midimap/midimap.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/midimap/mi… Modified: trunk/reactos/dll/win32/ws2_32/include/ws2_32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/include/w… Modified: trunk/reactos/drivers/video/displays/framebuf/framebuf.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… Modified: trunk/reactos/drivers/video/displays/framebufacc/framebufacc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… Modified: trunk/reactos/drivers/video/displays/vga/vgaddi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… Modified: trunk/reactos/include/crt/_mingw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/_mingw.h?rev=3… Modified: trunk/reactos/include/crt/ctype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/ctype.h?rev=37… Modified: trunk/reactos/include/crt/stdio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdio.h?rev=37… Modified: trunk/reactos/include/crt/wctype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/wctype.h?rev=3… Modified: trunk/reactos/include/psdk/winternl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winternl.h?re… Modified: trunk/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/confi… Modified: trunk/reactos/include/reactos/wine/unicode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/unico… Modified: trunk/reactos/lib/3rdparty/adns/adns.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/adns/adns.rbu… Modified: trunk/reactos/lib/3rdparty/libxml2/libxml2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/libxm… Modified: trunk/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/mingw.r… Modified: trunk/reactos/subsystems/win32/csrss/csrss.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… Modified: trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… Modified: trunk/reactos/tools/nci/nci.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/nci.mak?rev=3718… Modified: trunk/reactos/tools/nci/ncitool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/ncitool.c?rev=37… Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… Modified: trunk/reactos/tools/rbuild/project.dtd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/project.dtd?r… Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=…

1 0

[jimtabor] 37186: - Fix RealizationInfo, it should use DC font not cFont if 0.
by jimtabor＠svn.reactos.org 04 Nov '08

04 Nov '08

Author: jimtabor Date: Tue Nov 4 07:05:47 2008 New Revision: 37186 URL: http://svn.reactos.org/svn/reactos?rev=37186&view=rev Log: - Fix RealizationInfo, it should use DC font not cFont if 0. Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] Tue Nov 4 07:05:47 2008 @@ -586,6 +586,7 @@ PDC pDc; PTEXTOBJ pTextObj; PFONTGDI pFontGdi; + PDC_ATTR Dc_Attr; BOOL Ret = FALSE; INT i = 0; REALIZATION_INFO ri; @@ -596,7 +597,9 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return 0; } - pTextObj = RealizeFontInit(hf); + Dc_Attr = pDc->pDc_Attr; + if(!Dc_Attr) Dc_Attr = &pDc->Dc_Attr; + pTextObj = RealizeFontInit(Dc_Attr->hlfntNew); pFontGdi = ObjToGDI(pTextObj->Font, FONT); TEXTOBJ_UnlockText(pTextObj); DC_UnlockDc(pDc);

1 0

[jimtabor] 37185: - Fix code page and charector set support. More miscellaneous changes and fixes.
by jimtabor＠svn.reactos.org 04 Nov '08

04 Nov '08

Author: jimtabor Date: Tue Nov 4 06:49:49 2008 New Revision: 37185 URL: http://svn.reactos.org/svn/reactos?rev=37185&view=rev Log: - Fix code page and charector set support. More miscellaneous changes and fixes. Modified: trunk/reactos/dll/win32/gdi32/objects/font.c trunk/reactos/include/psdk/wingdi.h trunk/reactos/include/reactos/win32k/ntgdityp.h trunk/reactos/subsystems/win32/win32k/include/text.h trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/font.c trunk/reactos/subsystems/win32/win32k/objects/freetype.c trunk/reactos/subsystems/win32/win32k/objects/text.c trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] Tue Nov 4 06:49:49 2008 @@ -16,46 +16,45 @@ /* * For TranslateCharsetInfo */ -#define FS(x) {{0,0,0,0},{0x1<<(x),0}} #define MAXTCIINDEX 32 static const CHARSETINFO FONT_tci[MAXTCIINDEX] = { /* ANSI */ - { ANSI_CHARSET, 1252, FS(0)}, - { EASTEUROPE_CHARSET, 1250, FS(1)}, - { RUSSIAN_CHARSET, 1251, FS(2)}, - { GREEK_CHARSET, 1253, FS(3)}, - { TURKISH_CHARSET, 1254, FS(4)}, - { HEBREW_CHARSET, 1255, FS(5)}, - { ARABIC_CHARSET, 1256, FS(6)}, - { BALTIC_CHARSET, 1257, FS(7)}, - { VIETNAMESE_CHARSET, 1258, FS(8)}, + { ANSI_CHARSET, 1252, {{0,0,0,0},{FS_LATIN1,0}} }, + { EASTEUROPE_CHARSET, 1250, {{0,0,0,0},{FS_LATIN2,0}} }, + { RUSSIAN_CHARSET, 1251, {{0,0,0,0},{FS_CYRILLIC,0}} }, + { GREEK_CHARSET, 1253, {{0,0,0,0},{FS_GREEK,0}} }, + { TURKISH_CHARSET, 1254, {{0,0,0,0},{FS_TURKISH,0}} }, + { HEBREW_CHARSET, 1255, {{0,0,0,0},{FS_HEBREW,0}} }, + { ARABIC_CHARSET, 1256, {{0,0,0,0},{FS_ARABIC,0}} }, + { BALTIC_CHARSET, 1257, {{0,0,0,0},{FS_BALTIC,0}} }, + { VIETNAMESE_CHARSET, 1258, {{0,0,0,0},{FS_VIETNAMESE,0}} }, /* reserved by ANSI */ - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, /* ANSI and OEM */ - { THAI_CHARSET, 874, FS(16)}, - { SHIFTJIS_CHARSET, 932, FS(17)}, - { GB2312_CHARSET, 936, FS(18)}, - { HANGEUL_CHARSET, 949, FS(19)}, - { CHINESEBIG5_CHARSET, 950, FS(20)}, - { JOHAB_CHARSET, 1361, FS(21)}, + { THAI_CHARSET, 874, {{0,0,0,0},{FS_THAI,0}} }, + { SHIFTJIS_CHARSET, 932, {{0,0,0,0},{FS_JISJAPAN,0}} }, + { GB2312_CHARSET, 936, {{0,0,0,0},{FS_CHINESESIMP,0}} }, + { HANGEUL_CHARSET, 949, {{0,0,0,0},{FS_WANSUNG,0}} }, + { CHINESEBIG5_CHARSET, 950, {{0,0,0,0},{FS_CHINESETRAD,0}} }, + { JOHAB_CHARSET, 1361, {{0,0,0,0},{FS_JOHAB,0}} }, /* reserved for alternate ANSI and OEM */ - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, /* reserved for system */ - { DEFAULT_CHARSET, 0, FS(0)}, - { SYMBOL_CHARSET, CP_SYMBOL, FS(31)}, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { SYMBOL_CHARSET, CP_SYMBOL, {{0,0,0,0},{FS_SYMBOL,0}} } }; #define INITIAL_FAMILY_COUNT 64 Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Tue Nov 4 06:49:49 2008 @@ -503,6 +503,7 @@ #define FS_HEBREW 32 #define FS_ARABIC 64 #define FS_BALTIC 128 +#define FS_VIETNAMESE 256 #define FS_THAI 0x10000 #define FS_JISJAPAN 0x20000 #define FS_CHINESESIMP 0x40000 Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] Tue Nov 4 06:49:49 2008 @@ -389,6 +389,8 @@ FLOAT f; ULONG l; } gxf_long; + +#define CFONT_REALIZATION 0x0080 typedef struct _CFONT { Modified: trunk/reactos/subsystems/win32/win32k/include/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/text.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/text.h [iso-8859-1] Tue Nov 4 06:49:49 2008 @@ -96,9 +96,8 @@ INT FASTCALL IntGetOutlineTextMetrics(PFONTGDI,UINT,OUTLINETEXTMETRICW *); BOOL FASTCALL ftGdiGetRasterizerCaps(LPRASTERIZER_STATUS); BOOL FASTCALL TextIntGetTextExtentPoint(PDC,PTEXTOBJ,LPCWSTR,int,int,LPINT,LPINT,LPSIZE); -DWORD FASTCALL IntGdiGetCharSet(HDC); BOOL FASTCALL ftGdiGetTextMetricsW(HDC,PTMW_INTERNAL); -DWORD FASTCALL ftGetFontLanguageInfo(PDC); +DWORD FASTCALL IntGetFontLanguageInfo(PDC); INT FASTCALL ftGdiGetTextCharsetInfo(PDC,PFONTSIGNATURE,DWORD); DWORD FASTCALL ftGetFontUnicodeRanges(PFONTGDI, PGLYPHSET); DWORD FASTCALL ftGdiGetFontData(PFONTGDI,DWORD,DWORD,PVOID,DWORD); Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Tue Nov 4 06:49:49 2008 @@ -849,6 +849,8 @@ NewDC->erclWindow.bottom = ((PGDIDEVICE)NewDC->pPDev)->GDIInfo.ulVertRes; NewDC->DcLevel.flPath &= ~DCPATH_CLOCKWISE; // Default is CCW. + nDc_Attr->iCS_CP = ftGdiGetTextCharsetInfo(NewDC,NULL,0); + DC_UnlockDc( NewDC ); hVisRgn = NtGdiCreateRectRgn(0, 0, ((PGDIDEVICE)NewDC->pPDev)->GDIInfo.ulHorzRes, @@ -877,7 +879,6 @@ NewDC->DC_Type = DC_TYPE_INFO; DC_UnlockDc( NewDC ); } - nDc_Attr->iCS_CP = IntGdiGetCharSet(hNewDC); return hNewDC; } @@ -2413,7 +2414,7 @@ case GdiGetEMFRestorDc: break; case GdiGetFontLanguageInfo: - SafeResult = ftGetFontLanguageInfo(dc); + SafeResult = IntGetFontLanguageInfo(dc); break; case GdiGetIsMemDc: SafeResult = dc->DC_Type; Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] Tue Nov 4 06:49:49 2008 @@ -23,7 +23,6 @@ switch (Count) { - case sizeof(ENUMLOGFONTEXDVW): RtlCopyMemory( (LPENUMLOGFONTEXDVW) Buffer, &TFont->logfont, @@ -55,6 +54,58 @@ return Count; } +DWORD +FASTCALL +IntGetFontLanguageInfo(PDC Dc) +{ + PDC_ATTR Dc_Attr; + FONTSIGNATURE fontsig; + static const DWORD GCP_DBCS_MASK=0x003F0000, + GCP_DIACRITIC_MASK=0x00000000, + FLI_GLYPHS_MASK=0x00000000, + GCP_GLYPHSHAPE_MASK=0x00000040, + GCP_KASHIDA_MASK=0x00000000, + GCP_LIGATE_MASK=0x00000000, + GCP_USEKERNING_MASK=0x00000000, + GCP_REORDER_MASK=0x00000060; + + DWORD result=0; + + ftGdiGetTextCharsetInfo( Dc, &fontsig, 0 ); + + /* We detect each flag we return using a bitmask on the Codepage Bitfields */ + if( (fontsig.fsCsb[0]&GCP_DBCS_MASK)!=0 ) + result|=GCP_DBCS; + + if( (fontsig.fsCsb[0]&GCP_DIACRITIC_MASK)!=0 ) + result|=GCP_DIACRITIC; + + if( (fontsig.fsCsb[0]&FLI_GLYPHS_MASK)!=0 ) + result|=FLI_GLYPHS; + + if( (fontsig.fsCsb[0]&GCP_GLYPHSHAPE_MASK)!=0 ) + result|=GCP_GLYPHSHAPE; + + if( (fontsig.fsCsb[0]&GCP_KASHIDA_MASK)!=0 ) + result|=GCP_KASHIDA; + + if( (fontsig.fsCsb[0]&GCP_LIGATE_MASK)!=0 ) + result|=GCP_LIGATE; + + if( (fontsig.fsCsb[0]&GCP_USEKERNING_MASK)!=0 ) + result|=GCP_USEKERNING; + + Dc_Attr = Dc->pDc_Attr; + if(!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; + + /* this might need a test for a HEBREW- or ARABIC_CHARSET as well */ + if ( Dc_Attr->lTextAlign & TA_RTLREADING ) + if( (fontsig.fsCsb[0]&GCP_REORDER_MASK)!=0 ) + result|=GCP_REORDER; + + return result; +} + PTEXTOBJ FASTCALL RealizeFontInit(HFONT hFont) @@ -114,14 +165,14 @@ Status = MmCopyFromCaller(SafeFileName.Buffer + 4, src, SafeFileName.MaximumLength - (4 * sizeof(WCHAR))); if(!NT_SUCCESS(Status)) { - ExFreePool(SafeFileName.Buffer); + ExFreePoolWithTag(SafeFileName.Buffer, TAG_STRING); SetLastNtError(Status); return 0; } Ret = IntGdiAddFontResource(&SafeFileName, (DWORD)fl); - ExFreePool(SafeFileName.Buffer); + ExFreePoolWithTag(SafeFileName.Buffer, TAG_STRING); return Ret; } @@ -223,8 +274,8 @@ } FontGdi = ObjToGDI(TextObj->Font, FONT); - Size = ftGetFontUnicodeRanges( FontGdi, NULL); + if (Size && pgs) { pgsSafe = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT); @@ -376,48 +427,48 @@ NTSTATUS Status; dc = DC_LockDc(hDC); - if (dc == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return 0; - } + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } Dc_Attr = dc->pDc_Attr; if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; hFont = Dc_Attr->hlfntNew; TextObj = RealizeFontInit(hFont); DC_UnlockDc(dc); - if (TextObj == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return 0; - } + if (!TextObj) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } FontGDI = ObjToGDI(TextObj->Font, FONT); TEXTOBJ_UnlockText(TextObj); Size = IntGetOutlineTextMetrics(FontGDI, 0, NULL); if (!otm) return Size; if (Size > Data) - { + { SetLastWin32Error(ERROR_INSUFFICIENT_BUFFER); return 0; - } + } potm = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT); - if (NULL == potm) - { + if (!potm) + { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return 0; - } + } IntGetOutlineTextMetrics(FontGDI, Size, potm); if (otm) - { - Status = MmCopyToCaller(otm, potm, Size); - if (! NT_SUCCESS(Status)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - ExFreePool(potm); - return 0; - } - } - ExFreePool(potm); + { + Status = MmCopyToCaller(otm, potm, Size); + if (! NT_SUCCESS(Status)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + ExFreePoolWithTag(potm,TAG_GDITEXT); + return 0; + } + } + ExFreePoolWithTag(potm,TAG_GDITEXT); return Size; } @@ -486,7 +537,7 @@ { SetLastNtError(Status); /* Free the string buffer for the safe filename */ - ExFreePool(SafeFileNames.Buffer); + ExFreePoolWithTag(SafeFileNames.Buffer,TAG('R','T','S','U')); return FALSE; } @@ -517,9 +568,77 @@ } /* Free the string for the safe filenames */ - ExFreePool(SafeFileNames.Buffer); + ExFreePoolWithTag(SafeFileNames.Buffer,TAG('R','T','S','U')); return bRet; +} + + /* + * @unimplemented + */ +BOOL +APIENTRY +NtGdiGetRealizationInfo( + IN HDC hdc, + OUT PREALIZATION_INFO pri, + IN HFONT hf) +{ + PDC pDc; + PTEXTOBJ pTextObj; + PFONTGDI pFontGdi; + BOOL Ret = FALSE; + INT i = 0; + REALIZATION_INFO ri; + + pDc = DC_LockDc(hdc); + if (!pDc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + pTextObj = RealizeFontInit(hf); + pFontGdi = ObjToGDI(pTextObj->Font, FONT); + TEXTOBJ_UnlockText(pTextObj); + DC_UnlockDc(pDc); + + Ret = ftGdiRealizationInfo(pFontGdi, &ri); + if (Ret) + { + if (pri) + { + NTSTATUS Status = STATUS_SUCCESS; + _SEH_TRY + { + ProbeForWrite(pri, sizeof(REALIZATION_INFO), 1); + RtlCopyMemory(pri, &ri, sizeof(REALIZATION_INFO)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return FALSE; + } + } + do + { + if (GdiHandleTable->cfPublic[i].hf == hf) + { + GdiHandleTable->cfPublic[i].iTechnology = ri.iTechnology; + GdiHandleTable->cfPublic[i].iUniq = ri.iUniq; + GdiHandleTable->cfPublic[i].dwUnknown = ri.dwUnknown; + GdiHandleTable->cfPublic[i].dwCFCount = GdiHandleTable->dwCFCount; + GdiHandleTable->cfPublic[i].fl |= CFONT_REALIZATION; + } + i++; + } + while ( i < GDI_CFONT_MAX ); + } + return Ret; } HFONT Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Tue Nov 4 06:49:49 2008 @@ -50,6 +50,12 @@ #define NDEBUG #include <debug.h> +#ifndef FT_MAKE_TAG +#define FT_MAKE_TAG( ch0, ch1, ch2, ch3 ) \ + ( ((DWORD)(BYTE)(ch0) << 24) | ((DWORD)(BYTE)(ch1) << 16) | \ + ((DWORD)(BYTE)(ch2) << 8) | (DWORD)(BYTE)(ch3) ) +#endif + FT_Library library; typedef struct _FONT_ENTRY { @@ -107,7 +113,6 @@ * For TranslateCharsetInfo */ #define CP_SYMBOL 42 -#define FS_VIETNAMESE 0x00000100L #define MAXTCIINDEX 32 static const CHARSETINFO FontTci[MAXTCIINDEX] = { /* ANSI */ @@ -381,7 +386,7 @@ SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return 0; } - memcpy(FontGDI->Filename, FileName->Buffer, FileName->Length); + RtlCopyMemory(FontGDI->Filename, FileName->Buffer, FileName->Length); FontGDI->Filename[FileName->Length / sizeof(WCHAR)] = L'\0'; FontGDI->face = Face; @@ -486,7 +491,7 @@ } *NewFont = TextObj->BaseObject.hHmgr; - memcpy(&TextObj->logfont.elfEnumLogfontEx.elfLogFont, lf, sizeof(LOGFONTW)); + RtlCopyMemory(&TextObj->logfont.elfEnumLogfontEx.elfLogFont, lf, sizeof(LOGFONTW)); if (lf->lfEscapement != lf->lfOrientation) { /* this should really depend on whether GM_ADVANCED is set */ @@ -547,10 +552,10 @@ return FALSE; } - if (MAXTCIINDEX <= Index || DEFAULT_CHARSET == FontTci[Index].ciCharset) - { - return FALSE; - } + if (Index >= MAXTCIINDEX || DEFAULT_CHARSET == FontTci[Index].ciCharset) + { + return FALSE; + } RtlCopyMemory(Cs, &FontTci[Index], sizeof(CHARSETINFO)); @@ -796,7 +801,7 @@ RtlCopyMemory(&Otm->otmTextMetrics, &FontGDI->TextMetric, sizeof(TEXTMETRICW)); Otm->otmFiller = 0; - memcpy(&Otm->otmPanoseNumber, pOS2->panose, PANOSE_COUNT); + RtlCopyMemory(&Otm->otmPanoseNumber, pOS2->panose, PANOSE_COUNT); Otm->otmfsSelection = pOS2->fsSelection; Otm->otmfsType = pOS2->fsType; Otm->otmsCharSlopeRise = pHori->caret_Slope_Rise; @@ -939,21 +944,21 @@ UNICODE_STRING StyleW; TT_OS2 *pOS2; FONTSIGNATURE fs; - DWORD fs_fsCsb0; CHARSETINFO CharSetInfo; unsigned i, Size; OUTLINETEXTMETRICW *Otm; LOGFONTW *Lf; TEXTMETRICW *TM; NEWTEXTMETRICW *Ntm; + DWORD fs0; RtlZeroMemory(Info, sizeof(FONTFAMILYINFO)); Size = IntGetOutlineTextMetrics(FontGDI, 0, NULL); Otm = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT); - if (NULL == Otm) - { - return; - } + if (!Otm) + { + return; + } IntGetOutlineTextMetrics(FontGDI, Size, Otm); Lf = &Info->EnumLogFontEx.elfLogFont; @@ -991,14 +996,10 @@ Ntm->tmPitchAndFamily = TM->tmPitchAndFamily; Ntm->tmCharSet = TM->tmCharSet; Ntm->ntmFlags = TM->tmItalic ? NTM_ITALIC : 0; - if (550 < TM->tmWeight) - { - Ntm->ntmFlags |= NTM_BOLD; - } - if (0 == Ntm->ntmFlags) - { - Ntm->ntmFlags = NTM_REGULAR; - } + + if (550 < TM->tmWeight) Ntm->ntmFlags |= NTM_BOLD; + + if (0 == Ntm->ntmFlags) Ntm->ntmFlags = NTM_REGULAR; Ntm->ntmSizeEM = Otm->otmEMSquare; Ntm->ntmCellHeight = 0; @@ -1006,10 +1007,9 @@ Info->FontType = (0 != (TM->tmPitchAndFamily & TMPF_TRUETYPE) ? TRUETYPE_FONTTYPE : 0); + if (0 == (TM->tmPitchAndFamily & TMPF_VECTOR)) - { - Info->FontType |= RASTER_FONTTYPE; - } + Info->FontType |= RASTER_FONTTYPE; ExFreePool(Otm); @@ -1026,76 +1026,64 @@ pOS2 = FT_Get_Sfnt_Table(FontGDI->face, ft_sfnt_os2); IntUnLockFreeType; if (NULL != pOS2) - { - Info->NewTextMetricEx.ntmFontSig.fsCsb[0] = pOS2->ulCodePageRange1; - Info->NewTextMetricEx.ntmFontSig.fsCsb[1] = pOS2->ulCodePageRange2; - Info->NewTextMetricEx.ntmFontSig.fsUsb[0] = pOS2->ulUnicodeRange1; - Info->NewTextMetricEx.ntmFontSig.fsUsb[1] = pOS2->ulUnicodeRange2; - Info->NewTextMetricEx.ntmFontSig.fsUsb[2] = pOS2->ulUnicodeRange3; - Info->NewTextMetricEx.ntmFontSig.fsUsb[3] = pOS2->ulUnicodeRange4; - - fs_fsCsb0 = pOS2->ulCodePageRange1; - if (0 == pOS2->version) + { + fs.fsCsb[0] = pOS2->ulCodePageRange1; + fs.fsCsb[1] = pOS2->ulCodePageRange2; + fs.fsUsb[0] = pOS2->ulUnicodeRange1; + fs.fsUsb[1] = pOS2->ulUnicodeRange2; + fs.fsUsb[2] = pOS2->ulUnicodeRange3; + fs.fsUsb[3] = pOS2->ulUnicodeRange4; + + if (0 == pOS2->version) + { + FT_UInt Dummy; + + if (FT_Get_First_Char(FontGDI->face, &Dummy) < 0x100) + fs.fsCsb[0] |= FS_LATIN1; + else + fs.fsCsb[0] |= FS_SYMBOL; + } + if (fs.fsCsb[0] == 0) + { /* let's see if we can find any interesting cmaps */ + for (i = 0; i < FontGDI->face->num_charmaps; i++) { - FT_UInt Dummy; - - if (FT_Get_First_Char(FontGDI->face, &Dummy) < 0x100) - { - fs_fsCsb0 |= 1; - } - else - { - fs_fsCsb0 |= 1L << 31; - } + switch (FontGDI->face->charmaps[i]->encoding) + { + case FT_ENCODING_UNICODE: + case FT_ENCODING_APPLE_ROMAN: + fs.fsCsb[0] |= FS_LATIN1; + break; + case FT_ENCODING_MS_SYMBOL: + fs.fsCsb[0] |= FS_SYMBOL; + break; + default: + break; + } } - if (0 == fs_fsCsb0) - { /* let's see if we can find any interesting cmaps */ - for (i = 0; i < FontGDI->face->num_charmaps; i++) - { - switch (FontGDI->face->charmaps[i]->encoding) - { - case ft_encoding_unicode: - case ft_encoding_apple_roman: - fs_fsCsb0 |= 1; - break; - case ft_encoding_symbol: - fs_fsCsb0 |= 1L << 31; - break; - default: - break; - } - } + } + for (i = 0; i < MAXTCIINDEX; i++) + { + fs0 = 1L << i; + if (fs.fsCsb[0] & fs0) + { + if (!IntTranslateCharsetInfo(&fs0, &CharSetInfo, TCI_SRCFONTSIG)) + { + CharSetInfo.ciCharset = DEFAULT_CHARSET; + } + if (DEFAULT_CHARSET != CharSetInfo.ciCharset) + { + Info->EnumLogFontEx.elfLogFont.lfCharSet = CharSetInfo.ciCharset; + if (NULL != ElfScripts[i]) + wcscpy(Info->EnumLogFontEx.elfScript, ElfScripts[i]); + else + { + DPRINT1("Unknown elfscript for bit %d\n", i); + } + } } - - for(i = 0; i < 32; i++) - { - if (0 != (fs_fsCsb0 & (1L << i))) - { - fs.fsCsb[0] = 1L << i; - fs.fsCsb[1] = 0; - if (! IntTranslateCharsetInfo(fs.fsCsb, &CharSetInfo, TCI_SRCFONTSIG)) - { - CharSetInfo.ciCharset = DEFAULT_CHARSET; - } - if (31 == i) - { - CharSetInfo.ciCharset = SYMBOL_CHARSET; - } - if (DEFAULT_CHARSET != CharSetInfo.ciCharset) - { - Info->EnumLogFontEx.elfLogFont.lfCharSet = CharSetInfo.ciCharset; - if (NULL != ElfScripts[i]) - { - wcscpy(Info->EnumLogFontEx.elfScript, ElfScripts[i]); - } - else - { - DPRINT1("Unknown elfscript for bit %d\n", i); - } - } - } - } - } + } + Info->NewTextMetricEx.ntmFontSig = fs; + } } static int FASTCALL @@ -2203,35 +2191,6 @@ return TRUE; } -DWORD -FASTCALL -IntGdiGetCharSet(HDC hDC) -{ - UINT cp = 0; - CHARSETINFO csi; - DWORD charset = NtGdiGetTextCharsetInfo(hDC,NULL,0); - if (IntTranslateCharsetInfo(&charset, &csi, TCI_SRCCHARSET)) - cp = csi.ciACP; - else - { - switch(charset) - { - case ANSI_CHARSET: - break; - case OEM_CHARSET: - cp = 1; - break; - case DEFAULT_CHARSET: - cp = 0; - break; - default: - DPRINT1("Can't find codepage for charset %d\n", charset); - break; - } - } - DPRINT("charset %d => cp %d\n", charset, LOWORD(cp)); - return (MAKELONG(cp, charset)); -} INT FASTCALL @@ -2249,19 +2208,20 @@ TT_OS2 *pOS2; FT_Face Face; CHARSETINFO csi; - DWORD charset; + DWORD cp; DWORD fs0; + USHORT usACP, usOEM; Dc_Attr = Dc->pDc_Attr; if(!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; hFont = Dc_Attr->hlfntNew; TextObj = RealizeFontInit(hFont); - if ( TextObj == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return Ret; - } + if (!TextObj) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return Ret; + } FontGdi = ObjToGDI(TextObj->Font, FONT); Face = FontGdi->face; TEXTOBJ_UnlockText(TextObj); @@ -2312,7 +2272,10 @@ RtlCopyMemory(lpSig, &fs, sizeof(FONTSIGNATURE)); } - if (IntTranslateCharsetInfo(&charset, &csi, TCI_SRCCODEPAGE)) + RtlGetDefaultCodePage(&usACP, &usOEM); + cp = usACP; + + if (IntTranslateCharsetInfo(&cp, &csi, TCI_SRCCODEPAGE)) if (csi.fs.fsCsb[0] & fs.fsCsb[0]) { DPRINT("Hit 1\n"); @@ -2333,12 +2296,12 @@ goto Exit; } else - DPRINT("TCI failing on %x\n", fs0); + DPRINT1("TCI failing on %x\n", fs0); } } Exit: - DPRINT("CharSet %d CodePage %d\n",Ret, csi.ciACP); - return Ret; + DPRINT("CharSet %d CodePage %d\n",csi.ciCharset, csi.ciACP); + return (MAKELONG(csi.ciACP, csi.ciCharset)); } @@ -2409,59 +2372,6 @@ } -DWORD -FASTCALL -ftGetFontLanguageInfo(PDC Dc) -{ - PDC_ATTR Dc_Attr; - FONTSIGNATURE fontsig; - static const DWORD GCP_DBCS_MASK=0x003F0000, - GCP_DIACRITIC_MASK=0x00000000, - FLI_GLYPHS_MASK=0x00000000, - GCP_GLYPHSHAPE_MASK=0x00000040, - GCP_KASHIDA_MASK=0x00000000, - GCP_LIGATE_MASK=0x00000000, - GCP_USEKERNING_MASK=0x00000000, - GCP_REORDER_MASK=0x00000060; - - DWORD result=0; - - ftGdiGetTextCharsetInfo( Dc, &fontsig, 0 ); - - /* We detect each flag we return using a bitmask on the Codepage Bitfields */ - if( (fontsig.fsCsb[0]&GCP_DBCS_MASK)!=0 ) - result|=GCP_DBCS; - - if( (fontsig.fsCsb[0]&GCP_DIACRITIC_MASK)!=0 ) - result|=GCP_DIACRITIC; - - if( (fontsig.fsCsb[0]&FLI_GLYPHS_MASK)!=0 ) - result|=FLI_GLYPHS; - - if( (fontsig.fsCsb[0]&GCP_GLYPHSHAPE_MASK)!=0 ) - result|=GCP_GLYPHSHAPE; - - if( (fontsig.fsCsb[0]&GCP_KASHIDA_MASK)!=0 ) - result|=GCP_KASHIDA; - - if( (fontsig.fsCsb[0]&GCP_LIGATE_MASK)!=0 ) - result|=GCP_LIGATE; - - if( (fontsig.fsCsb[0]&GCP_USEKERNING_MASK)!=0 ) - result|=GCP_USEKERNING; - - Dc_Attr = Dc->pDc_Attr; - if(!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; - - /* this might need a test for a HEBREW- or ARABIC_CHARSET as well */ - if ( Dc_Attr->lTextAlign & TA_RTLREADING ) - if( (fontsig.fsCsb[0]&GCP_REORDER_MASK)!=0 ) - result|=GCP_REORDER; - - return result; -} - - BOOL FASTCALL ftGdiGetTextMetricsW( @@ -2749,6 +2659,7 @@ IntFontType(PFONTGDI Font) { PS_FontInfoRec psfInfo; + FT_ULong tmp_size = 0; if (FT_HAS_MULTIPLE_MASTERS(Font->face)) Font->FontObj.flFontType |= FO_MULTIPLEMASTER; @@ -2765,6 +2676,11 @@ if (!FT_Get_PS_Font_Info(Font->face, &psfInfo )) { Font->FontObj.flFontType |= FO_POSTSCRIPT; + } + /* check for the presence of the 'CFF ' table to check if the font is Type1 */ + if (!FT_Load_Sfnt_Table(Font->face, FT_MAKE_TAG('C','F','F',' '), 0, NULL, &tmp_size)) + { + Font->FontObj.flFontType |= (FO_CFF|FO_POSTSCRIPT); } } @@ -2979,14 +2895,14 @@ case 1: /* Copy the full font name */ Size = wcslen(Info.EnumLogFontEx.elfFullName) + 1; Size = min(Size , LF_FULLFACESIZE) * sizeof(WCHAR); - memcpy(pBuffer, Info.EnumLogFontEx.elfFullName, Size); + RtlCopyMemory(pBuffer, Info.EnumLogFontEx.elfFullName, Size); // FIXME: Do we have to zeroterminate? *pdwBytes = Size; break; case 2: /* Copy a LOGFONTW structure */ Info.EnumLogFontEx.elfLogFont.lfWidth = 0; - memcpy(pBuffer, &Info.EnumLogFontEx.elfLogFont, sizeof(LOGFONTW)); + RtlCopyMemory(pBuffer, &Info.EnumLogFontEx.elfLogFont, sizeof(LOGFONTW)); *pdwBytes = sizeof(LOGFONTW); break; Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] Tue Nov 4 06:49:49 2008 @@ -21,7 +21,7 @@ { PDC Dc; PDC_ATTR Dc_Attr; - DWORD cscp = IntGdiGetCharSet(hDC); + DWORD cscp; // If here, update everything! Dc = DC_LockDc(hDC); if (!Dc) @@ -29,6 +29,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return 0; } + cscp = ftGdiGetTextCharsetInfo(Dc,NULL,0); Dc_Attr = Dc->pDc_Attr; if (!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; Dc_Attr->iCS_CP = cscp; @@ -96,10 +97,13 @@ if (!lpSig) pfsSafe = NULL; - Ret = ftGdiGetTextCharsetInfo( Dc, pfsSafe, dwFlags); + Ret = HIWORD(ftGdiGetTextCharsetInfo( Dc, pfsSafe, dwFlags)); if (lpSig) { + if (Ret == DEFAULT_CHARSET) + RtlZeroMemory(pfsSafe, sizeof(FONTSIGNATURE)); + _SEH_TRY { ProbeForWrite( lpSig, Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] Tue Nov 4 06:49:49 2008 @@ -2125,20 +2125,6 @@ */ BOOL APIENTRY -NtGdiGetRealizationInfo( - IN HDC hdc, - OUT PREALIZATION_INFO pri, - IN HFONT hf) -{ - UNIMPLEMENTED; - return FALSE; -} - - /* - * @unimplemented - */ -BOOL -APIENTRY NtGdiDrawStream( IN HDC hdcDst, IN ULONG cjIn,

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