Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 32723: [FORMATTING] Apply consistent indentation of 4 spaces
by tkreuzer＠svn.reactos.org 19 Mar '08

19 Mar '08

Author: tkreuzer Date: Wed Mar 19 09:53:15 2008 New Revision: 32723 URL: http://svn.reactos.org/svn/reactos?rev=3D32723&view=3Drev Log: [FORMATTING] Apply consistent indentation of 4 spaces Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/eng/surface.c?rev=3D32723&r1=3D32722&r2=3D32723&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/eng/surface.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/surface.c Wed Mar 19 09:53:15= 2008 @@ -38,74 +38,100 @@ = enum Rle_EscapeCodes { - RLE_EOL =3D 0, /* End of line */ - RLE_END =3D 1, /* End of bitmap */ - RLE_DELTA =3D 2 /* Delta */ + RLE_EOL =3D 0, /* End of line */ + RLE_END =3D 1, /* End of bitmap */ + RLE_DELTA =3D 2 /* Delta */ }; = INT FASTCALL BitsPerFormat(ULONG Format) { - switch(Format) - { - case BMF_1BPP: return 1; - case BMF_4BPP: - case BMF_4RLE: return 4; - case BMF_8BPP: - case BMF_8RLE: return 8; - case BMF_16BPP: return 16; - case BMF_24BPP: return 24; - case BMF_32BPP: return 32; - default: return 0; - } + switch (Format) + { + case BMF_1BPP: + return 1; + + case BMF_4BPP: + /* Fall through */ + case BMF_4RLE: + return 4; + + case BMF_8BPP: + /* Fall through */ + case BMF_8RLE: + return 8; + + case BMF_16BPP: + return 16; + + case BMF_24BPP: + return 24; + + case BMF_32BPP: + return 32; + + default: + return 0; + } } = ULONG FASTCALL BitmapFormat(WORD Bits, DWORD Compression) { - switch(Compression) - { - case BI_RGB: - case BI_BITFIELDS: - switch(Bits) - { - case 1: return BMF_1BPP; - case 4: return BMF_4BPP; - case 8: return BMF_8BPP; - case 16: return BMF_16BPP; - case 24: return BMF_24BPP; - case 32: return BMF_32BPP; - } - return 0; - - case BI_RLE4: return BMF_4RLE; - case BI_RLE8: return BMF_8RLE; - - default: return 0; - } + switch (Compression) + { + case BI_RGB: + /* Fall through */ + case BI_BITFIELDS: + switch (Bits) + { + case 1: + return BMF_1BPP; + case 4: + return BMF_4BPP; + case 8: + return BMF_8BPP; + case 16: + return BMF_16BPP; + case 24: + return BMF_24BPP; + case 32: + return BMF_32BPP; + } + return 0; + + case BI_RLE4: + return BMF_4RLE; + + case BI_RLE8: + return BMF_8RLE; + + default: + return 0; + } } = BOOL INTERNAL_CALL BITMAPOBJ_InitBitsLock(BITMAPOBJ *BitmapObj) { - BitmapObj->BitsLock =3D ExAllocatePoolWithTag(NonPagedPool, - sizeof(FAST_MUTEX), - TAG_BITMAPOBJ); - if (NULL =3D=3D BitmapObj->BitsLock) - { - return FALSE; - } - - ExInitializeFastMutex(BitmapObj->BitsLock); - - return TRUE; + BitmapObj->BitsLock =3D ExAllocatePoolWithTag(NonPagedPool, + sizeof(FAST_MUTEX), + TAG_BITMAPOBJ); + if (NULL =3D=3D BitmapObj->BitsLock) + { + return FALSE; + } + + ExInitializeFastMutex(BitmapObj->BitsLock); + + return TRUE; } = void INTERNAL_CALL BITMAPOBJ_CleanupBitsLock(BITMAPOBJ *BitmapObj) { - if (NULL !=3D BitmapObj->BitsLock) - { - ExFreePoolWithTag(BitmapObj->BitsLock, TAG_BITMAPOBJ); - BitmapObj->BitsLock =3D NULL; + if (NULL !=3D BitmapObj->BitsLock) + { + ExFreePoolWithTag(BitmapObj->BitsLock, TAG_BITMAPOBJ); + BitmapObj->BitsLock =3D NULL; } } = @@ -115,252 +141,260 @@ */ HBITMAP STDCALL EngCreateDeviceBitmap(IN DHSURF dhsurf, - IN SIZEL Size, - IN ULONG Format) -{ - HBITMAP NewBitmap; - SURFOBJ *SurfObj; - - NewBitmap =3D EngCreateBitmap(Size, DIB_GetDIBWidthBytes(Size.cx, BitsPe= rFormat(Format)), Format, 0, NULL); - if(!NewBitmap) - { - DPRINT1("EngCreateBitmap failed\n"); - return 0; - } - - SurfObj =3D EngLockSurface((HSURF)NewBitmap); - SurfObj->dhsurf =3D dhsurf; - EngUnlockSurface(SurfObj); - - return NewBitmap; + IN SIZEL Size, + IN ULONG Format) +{ + HBITMAP NewBitmap; + SURFOBJ *SurfObj; + + NewBitmap =3D EngCreateBitmap(Size, DIB_GetDIBWidthBytes(Size.cx, Bits= PerFormat(Format)), Format, 0, NULL); + if (!NewBitmap) + { + DPRINT1("EngCreateBitmap failed\n"); + return 0; + } + + SurfObj =3D EngLockSurface((HSURF)NewBitmap); + SurfObj->dhsurf =3D dhsurf; + EngUnlockSurface(SurfObj); + + return NewBitmap; } = VOID Decompress4bpp(SIZEL Size, BYTE *CompressedBits, BYTE *UncompressedBi= ts, LONG Delta) { - int x =3D 0; - int y =3D Size.cy - 1; - int c; - int length; - int width =3D ((Size.cx+1)/2); - int height =3D Size.cy - 1; - BYTE *begin =3D CompressedBits; - BYTE *bits =3D CompressedBits; - BYTE *temp; - while (y >=3D 0) - { - length =3D *bits++ / 2; - if (length) - { - c =3D *bits++; - while (length--) - { - if (x >=3D width) break; - temp =3D UncompressedBits + (((height - y) * Delta) + x); - x++; - *temp =3D c; - } - } else { - length =3D *bits++; - switch (length) - { - case RLE_EOL: - x =3D 0; - y--; - break; - case RLE_END: - return; - case RLE_DELTA: - x +=3D (*bits++)/2; - y -=3D (*bits++)/2; - break; - default: - length /=3D 2; - while (length--) - { - c =3D *bits++; - if (x < width) - { - temp =3D UncompressedBits + (((height - y) * Delta) + x); - x++; - *temp =3D c; - } - } - if ((bits - begin) & 1) - bits++; - } - } - } + int x =3D 0; + int y =3D Size.cy - 1; + int c; + int length; + int width =3D ((Size.cx+1)/2); + int height =3D Size.cy - 1; + BYTE *begin =3D CompressedBits; + BYTE *bits =3D CompressedBits; + BYTE *temp; + while (y >=3D 0) + { + length =3D *bits++ / 2; + if (length) + { + c =3D *bits++; + while (length--) + { + if (x >=3D width) break; + temp =3D UncompressedBits + (((height - y) * Delta) + x); + x++; + *temp =3D c; + } + } + else + { + length =3D *bits++; + switch (length) + { + case RLE_EOL: + x =3D 0; + y--; + break; + case RLE_END: + return; + case RLE_DELTA: + x +=3D (*bits++)/2; + y -=3D (*bits++)/2; + break; + default: + length /=3D 2; + while (length--) + { + c =3D *bits++; + if (x < width) + { + temp =3D UncompressedBits + (((height - y) * D= elta) + x); + x++; + *temp =3D c; + } + } + if ((bits - begin) & 1) + { + bits++; + } + } + } + } } = VOID Decompress8bpp(SIZEL Size, BYTE *CompressedBits, BYTE *UncompressedBi= ts, LONG Delta) { - int x =3D 0; - int y =3D Size.cy - 1; - int c; - int length; - int width =3D Size.cx; - int height =3D Size.cy - 1; - BYTE *begin =3D CompressedBits; - BYTE *bits =3D CompressedBits; - BYTE *temp; - while (y >=3D 0) - { - length =3D *bits++; - if (length) - { - c =3D *bits++; - while (length--) - { - if (x >=3D width) break; - temp =3D UncompressedBits + (((height - y) * Delta) + x); - x++; - *temp =3D c; - } - } else { - length =3D *bits++; - switch (length) - { - case RLE_EOL: - x =3D 0; - y--; - break; - case RLE_END: - return; - case RLE_DELTA: - x +=3D *bits++; - y -=3D *bits++; - break; - default: - while (length--) - { - c =3D *bits++; - if (x < width) - { - temp =3D UncompressedBits + (((height - y) * Delta) + x); - x++; - *temp =3D c; - } - } - if ((bits - begin) & 1) - bits++; - } - } - } + int x =3D 0; + int y =3D Size.cy - 1; + int c; + int length; + int width =3D Size.cx; + int height =3D Size.cy - 1; + BYTE *begin =3D CompressedBits; + BYTE *bits =3D CompressedBits; + BYTE *temp; + while (y >=3D 0) + { + length =3D *bits++; + if (length) + { + c =3D *bits++; + while (length--) + { + if (x >=3D width) break; + temp =3D UncompressedBits + (((height - y) * Delta) + x); + x++; + *temp =3D c; + } + } + else + { + length =3D *bits++; + switch (length) + { + case RLE_EOL: + x =3D 0; + y--; + break; + case RLE_END: + return; + case RLE_DELTA: + x +=3D *bits++; + y -=3D *bits++; + break; + default: + while (length--) + { + c =3D *bits++; + if (x < width) + { + temp =3D UncompressedBits + (((height - y) * D= elta) + x); + x++; + *temp =3D c; + } + } + if ((bits - begin) & 1) + { + bits++; + } + } + } + } } = HBITMAP FASTCALL IntCreateBitmap(IN SIZEL Size, - IN LONG Width, - IN ULONG Format, - IN ULONG Flags, - IN PVOID Bits) -{ - HBITMAP NewBitmap; - SURFOBJ *SurfObj; - BITMAPOBJ *BitmapObj; - PVOID UncompressedBits; - ULONG UncompressedFormat; - - if (Format =3D=3D 0) - return 0; - - NewBitmap =3D BITMAPOBJ_AllocBitmapDepricated(); - if (NewBitmap =3D=3D NULL) - return 0; - - BitmapObj =3D BITMAPOBJ_LockBitmap(NewBitmap); - if (! BITMAPOBJ_InitBitsLock(BitmapObj)) - { - BITMAPOBJ_UnlockBitmap(BitmapObj); - BITMAPOBJ_FreeBitmapByHandle(NewBitmap); - return 0; - } - SurfObj =3D &BitmapObj->SurfObj; - - if (Format =3D=3D BMF_4RLE) - { - SurfObj->lDelta =3D DIB_GetDIBWidthBytes(Size.cx, BitsPerFormat(BMF_= 4BPP)); - SurfObj->cjBits =3D SurfObj->lDelta * Size.cy; - UncompressedFormat =3D BMF_4BPP; - UncompressedBits =3D EngAllocMem(FL_ZERO_MEMORY, SurfObj->cjBits, 0); - Decompress4bpp(Size, (BYTE *)Bits, (BYTE *)UncompressedBits, SurfObj= ->lDelta); - } - else if (Format =3D=3D BMF_8RLE) - { - SurfObj->lDelta =3D DIB_GetDIBWidthBytes(Size.cx, BitsPerFormat(BMF_= 8BPP)); - SurfObj->cjBits =3D SurfObj->lDelta * Size.cy; - UncompressedFormat =3D BMF_8BPP; - UncompressedBits =3D EngAllocMem(FL_ZERO_MEMORY, SurfObj->cjBits, 0); - Decompress8bpp(Size, (BYTE *)Bits, (BYTE *)UncompressedBits, SurfObj= ->lDelta); - } - else - { - SurfObj->lDelta =3D abs(Width); - SurfObj->cjBits =3D SurfObj->lDelta * Size.cy; - UncompressedBits =3D Bits; - UncompressedFormat =3D Format; - } - - if (UncompressedBits !=3D NULL) - { - SurfObj->pvBits =3D UncompressedBits; - } - else - { - if (SurfObj->cjBits =3D=3D 0) + IN LONG Width, + IN ULONG Format, + IN ULONG Flags, + IN PVOID Bits) +{ + HBITMAP NewBitmap; + SURFOBJ *SurfObj; + BITMAPOBJ *BitmapObj; + PVOID UncompressedBits; + ULONG UncompressedFormat; + + if (Format =3D=3D 0) + return 0; + + NewBitmap =3D BITMAPOBJ_AllocBitmapDepricated(); + if (NewBitmap =3D=3D NULL) + return 0; + + BitmapObj =3D BITMAPOBJ_LockBitmap(NewBitmap); + if (! BITMAPOBJ_InitBitsLock(BitmapObj)) + { + BITMAPOBJ_UnlockBitmap(BitmapObj); + BITMAPOBJ_FreeBitmapByHandle(NewBitmap); + return 0; + } + SurfObj =3D &BitmapObj->SurfObj; + + if (Format =3D=3D BMF_4RLE) + { + SurfObj->lDelta =3D DIB_GetDIBWidthBytes(Size.cx, BitsPerFormat(BM= F_4BPP)); + SurfObj->cjBits =3D SurfObj->lDelta * Size.cy; + UncompressedFormat =3D BMF_4BPP; + UncompressedBits =3D EngAllocMem(FL_ZERO_MEMORY, SurfObj->cjBits, = 0); + Decompress4bpp(Size, (BYTE *)Bits, (BYTE *)UncompressedBits, SurfO= bj->lDelta); + } + else if (Format =3D=3D BMF_8RLE) + { + SurfObj->lDelta =3D DIB_GetDIBWidthBytes(Size.cx, BitsPerFormat(BM= F_8BPP)); + SurfObj->cjBits =3D SurfObj->lDelta * Size.cy; + UncompressedFormat =3D BMF_8BPP; + UncompressedBits =3D EngAllocMem(FL_ZERO_MEMORY, SurfObj->cjBits, = 0); + Decompress8bpp(Size, (BYTE *)Bits, (BYTE *)UncompressedBits, SurfO= bj->lDelta); + } + else + { + SurfObj->lDelta =3D abs(Width); + SurfObj->cjBits =3D SurfObj->lDelta * Size.cy; + UncompressedBits =3D Bits; + UncompressedFormat =3D Format; + } + + if (UncompressedBits !=3D NULL) + { + SurfObj->pvBits =3D UncompressedBits; + } + else + { + if (SurfObj->cjBits =3D=3D 0) { - SurfObj->pvBits =3D NULL; + SurfObj->pvBits =3D NULL; } - else + else { - if (0 !=3D (Flags & BMF_USERMEM)) - { - SurfObj->pvBits =3D EngAllocUserMem(SurfObj->cjBits, 0); - } - else - { - SurfObj->pvBits =3D EngAllocMem(0 !=3D (Flags & BMF_NOZEROIN= IT) ? 0 : FL_ZERO_MEMORY, - SurfObj->cjBits, 0); - } - if (SurfObj->pvBits =3D=3D NULL) - { - BITMAPOBJ_UnlockBitmap(BitmapObj); - BITMAPOBJ_FreeBitmapByHandle(NewBitmap); - return 0; + if (0 !=3D (Flags & BMF_USERMEM)) + { + SurfObj->pvBits =3D EngAllocUserMem(SurfObj->cjBits, 0); + } + else + { + SurfObj->pvBits =3D EngAllocMem(0 !=3D (Flags & BMF_NOZERO= INIT) ? + 0 : FL_ZERO_MEMORY, + SurfObj->cjBits, 0); + } + if (SurfObj->pvBits =3D=3D NULL) + { + BITMAPOBJ_UnlockBitmap(BitmapObj); + BITMAPOBJ_FreeBitmapByHandle(NewBitmap); + return 0; } } - } - - - if (0 =3D=3D (Flags & BMF_TOPDOWN)) - { - SurfObj->pvScan0 =3D (PVOID) ((ULONG_PTR) SurfObj->pvBits + SurfObj-= >cjBits - SurfObj->lDelta); - SurfObj->lDelta =3D - SurfObj->lDelta; - } - else - { - SurfObj->pvScan0 =3D SurfObj->pvBits; - } - - SurfObj->dhsurf =3D 0; /* device managed surface */ - SurfObj->hsurf =3D (HSURF)NewBitmap; - SurfObj->dhpdev =3D NULL; - SurfObj->hdev =3D NULL; - SurfObj->sizlBitmap =3D Size; - SurfObj->iBitmapFormat =3D UncompressedFormat; - SurfObj->iType =3D STYPE_BITMAP; - SurfObj->fjBitmap =3D Flags & (BMF_TOPDOWN | BMF_NOZEROINIT); - SurfObj->iUniq =3D 0; - - BitmapObj->flHooks =3D 0; - BitmapObj->flFlags =3D 0; - BitmapObj->dimension.cx =3D 0; - BitmapObj->dimension.cy =3D 0; - BitmapObj->dib =3D NULL; - - BITMAPOBJ_UnlockBitmap(BitmapObj); - - return NewBitmap; + } + + if (0 =3D=3D (Flags & BMF_TOPDOWN)) + { + SurfObj->pvScan0 =3D (PVOID) ((ULONG_PTR) SurfObj->pvBits + SurfOb= j->cjBits - SurfObj->lDelta); + SurfObj->lDelta =3D - SurfObj->lDelta; + } + else + { + SurfObj->pvScan0 =3D SurfObj->pvBits; + } + + SurfObj->dhsurf =3D 0; /* device managed surface */ + SurfObj->hsurf =3D (HSURF)NewBitmap; + SurfObj->dhpdev =3D NULL; + SurfObj->hdev =3D NULL; + SurfObj->sizlBitmap =3D Size; + SurfObj->iBitmapFormat =3D UncompressedFormat; + SurfObj->iType =3D STYPE_BITMAP; + SurfObj->fjBitmap =3D Flags & (BMF_TOPDOWN | BMF_NOZEROINIT); + SurfObj->iUniq =3D 0; + + BitmapObj->flHooks =3D 0; + BitmapObj->flFlags =3D 0; + BitmapObj->dimension.cx =3D 0; + BitmapObj->dimension.cy =3D 0; + BitmapObj->dib =3D NULL; + + BITMAPOBJ_UnlockBitmap(BitmapObj); + + return NewBitmap; } = /* @@ -368,20 +402,20 @@ */ HBITMAP STDCALL EngCreateBitmap(IN SIZEL Size, - IN LONG Width, - IN ULONG Format, - IN ULONG Flags, - IN PVOID Bits) -{ - HBITMAP NewBitmap; - - NewBitmap =3D IntCreateBitmap(Size, Width, Format, Flags, Bits); - if ( !NewBitmap ) - return 0; - - GDIOBJ_SetOwnership(NewBitmap, NULL); - - return NewBitmap; + IN LONG Width, + IN ULONG Format, + IN ULONG Flags, + IN PVOID Bits) +{ + HBITMAP NewBitmap; + + NewBitmap =3D IntCreateBitmap(Size, Width, Format, Flags, Bits); + if ( !NewBitmap ) + return 0; + + GDIOBJ_SetOwnership(NewBitmap, NULL); + + return NewBitmap; } = /* @@ -389,53 +423,55 @@ */ HSURF STDCALL EngCreateDeviceSurface(IN DHSURF dhsurf, - IN SIZEL Size, - IN ULONG Format) -{ - HSURF NewSurface; - SURFOBJ *SurfObj; - BITMAPOBJ *BitmapObj; - - NewSurface =3D (HSURF)BITMAPOBJ_AllocBitmapDepricated(); - if (NewSurface =3D=3D NULL) - return 0; - - GDIOBJ_SetOwnership(NewSurface, NULL); - - BitmapObj =3D BITMAPOBJ_LockBitmap(NewSurface); - if (! BITMAPOBJ_InitBitsLock(BitmapObj)) - { - BITMAPOBJ_UnlockBitmap(BitmapObj); - BITMAPOBJ_FreeBitmapByHandle(NewSurface); - return 0; - } - SurfObj =3D &BitmapObj->SurfObj; - - SurfObj->dhsurf =3D dhsurf; - SurfObj->hsurf =3D NewSurface; - SurfObj->sizlBitmap =3D Size; - SurfObj->iBitmapFormat =3D Format; - SurfObj->lDelta =3D DIB_GetDIBWidthBytes(Size.cx, BitsPerFormat(Format)); - SurfObj->iType =3D STYPE_DEVICE; - SurfObj->iUniq =3D 0; - - BitmapObj->flHooks =3D 0; - - BITMAPOBJ_UnlockBitmap(BitmapObj); - - return NewSurface; + IN SIZEL Size, + IN ULONG Format) +{ + HSURF NewSurface; + SURFOBJ *SurfObj; + BITMAPOBJ *BitmapObj; + + NewSurface =3D (HSURF)BITMAPOBJ_AllocBitmapDepricated(); + if (NewSurface =3D=3D NULL) + return 0; + + GDIOBJ_SetOwnership(NewSurface, NULL); + + BitmapObj =3D BITMAPOBJ_LockBitmap(NewSurface); + if (! BITMAPOBJ_InitBitsLock(BitmapObj)) + { + BITMAPOBJ_UnlockBitmap(BitmapObj); + BITMAPOBJ_FreeBitmapByHandle(NewSurface); + return 0; + } + SurfObj =3D &BitmapObj->SurfObj; + + SurfObj->dhsurf =3D dhsurf; + SurfObj->hsurf =3D NewSurface; + SurfObj->sizlBitmap =3D Size; + SurfObj->iBitmapFormat =3D Format; + SurfObj->lDelta =3D DIB_GetDIBWidthBytes(Size.cx, BitsPerFormat(Format= )); + SurfObj->iType =3D STYPE_DEVICE; + SurfObj->iUniq =3D 0; + + BitmapObj->flHooks =3D 0; + + BITMAPOBJ_UnlockBitmap(BitmapObj); + + return NewSurface; } = PFN FASTCALL DriverFunction(DRVENABLEDATA *DED, ULONG DriverFunc) { - ULONG i; - - for(i=3D0; i<DED->c; i++) - { - if(DED->pdrvfn[i].iFunc =3D=3D DriverFunc) - return DED->pdrvfn[i].pfn; - } - return NULL; + ULONG i; + + for (i=3D0; i<DED->c; i++) + { + if (DED->pdrvfn[i].iFunc =3D=3D DriverFunc) + { + return DED->pdrvfn[i].pfn; + } + } + return NULL; } = /* @@ -443,29 +479,29 @@ */ BOOL STDCALL EngAssociateSurface(IN HSURF Surface, - IN HDEV Dev, - IN ULONG Hooks) -{ - SURFOBJ *SurfObj; - BITMAPOBJ *BitmapObj; - GDIDEVICE* Device; - - Device =3D (GDIDEVICE*)Dev; - - BitmapObj =3D BITMAPOBJ_LockBitmap(Surface); - ASSERT(BitmapObj); - SurfObj =3D &BitmapObj->SurfObj; - - /* Associate the hdev */ - SurfObj->hdev =3D Dev; - SurfObj->dhpdev =3D Device->hPDev; - - /* Hook up specified functions */ - BitmapObj->flHooks =3D Hooks; - - BITMAPOBJ_UnlockBitmap(BitmapObj); - - return TRUE; + IN HDEV Dev, + IN ULONG Hooks) +{ + SURFOBJ *SurfObj; + BITMAPOBJ *BitmapObj; + GDIDEVICE* Device; + + Device =3D (GDIDEVICE*)Dev; + + BitmapObj =3D BITMAPOBJ_LockBitmap(Surface); + ASSERT(BitmapObj); + SurfObj =3D &BitmapObj->SurfObj; + + /* Associate the hdev */ + SurfObj->hdev =3D Dev; + SurfObj->dhpdev =3D Device->hPDev; + + /* Hook up specified functions */ + BitmapObj->flHooks =3D Hooks; + + BITMAPOBJ_UnlockBitmap(BitmapObj); + + return TRUE; } = /* @@ -473,37 +509,37 @@ */ BOOL STDCALL EngModifySurface( - IN HSURF hsurf, - IN HDEV hdev, - IN FLONG flHooks, - IN FLONG flSurface, - IN DHSURF dhsurf, - OUT VOID *pvScan0, - IN LONG lDelta, - IN VOID *pvReserved) -{ - SURFOBJ *pso; - - pso =3D EngLockSurface(hsurf); - if (pso =3D=3D NULL) - { - return FALSE; - } - - if (!EngAssociateSurface(hsurf, hdev, flHooks)) - { - EngUnlockSurface(pso); - - return FALSE; - } - - pso->dhsurf =3D dhsurf; - pso->lDelta =3D lDelta; - pso->pvScan0 =3D pvScan0; - - EngUnlockSurface(pso); - - return TRUE; + IN HSURF hsurf, + IN HDEV hdev, + IN FLONG flHooks, + IN FLONG flSurface, + IN DHSURF dhsurf, + OUT VOID *pvScan0, + IN LONG lDelta, + IN VOID *pvReserved) +{ + SURFOBJ *pso; + + pso =3D EngLockSurface(hsurf); + if (pso =3D=3D NULL) + { + return FALSE; + } + + if (!EngAssociateSurface(hsurf, hdev, flHooks)) + { + EngUnlockSurface(pso); + + return FALSE; + } + + pso->dhsurf =3D dhsurf; + pso->lDelta =3D lDelta; + pso->pvScan0 =3D pvScan0; + + EngUnlockSurface(pso); + + return TRUE; } = /* @@ -512,9 +548,9 @@ BOOL STDCALL EngDeleteSurface(IN HSURF Surface) { - GDIOBJ_SetOwnership(Surface, PsGetCurrentProcess()); - BITMAPOBJ_FreeBitmapByHandle(Surface); - return TRUE; + GDIOBJ_SetOwnership(Surface, PsGetCurrentProcess()); + BITMAPOBJ_FreeBitmapByHandle(Surface); + return TRUE; } = /* @@ -522,12 +558,12 @@ */ BOOL STDCALL EngEraseSurface(SURFOBJ *Surface, - RECTL *Rect, - ULONG iColor) -{ - ASSERT(Surface); - ASSERT(Rect); - return FillSolid(Surface, Rect, iColor); + RECTL *Rect, + ULONG iColor) +{ + ASSERT(Surface); + ASSERT(Rect); + return FillSolid(Surface, Rect, iColor); } = #define GDIBdyToHdr(body) = \ @@ -550,12 +586,12 @@ SURFOBJ * STDCALL EngLockSurface(IN HSURF Surface) { - BITMAPOBJ *bmp =3D GDIOBJ_ShareLockObj(Surface, GDI_OBJECT_TYPE_BITMAP); - - if (bmp !=3D NULL) - return &bmp->SurfObj; - - return NULL; + BITMAPOBJ *bmp =3D GDIOBJ_ShareLockObj(Surface, GDI_OBJECT_TYPE_BITMAP= ); + + if (bmp !=3D NULL) + return &bmp->SurfObj; + + return NULL; } = = @@ -574,11 +610,11 @@ VOID STDCALL EngUnlockSurface(IN SURFOBJ *Surface) { - if (Surface !=3D NULL) - { - BITMAPOBJ *bmp =3D CONTAINING_RECORD(Surface, BITMAPOBJ, SurfObj); - GDIOBJ_ShareUnlockObjByPtr((POBJ)bmp); - } + if (Surface !=3D NULL) + { + BITMAPOBJ *bmp =3D CONTAINING_RECORD(Surface, BITMAPOBJ, SurfObj); + GDIOBJ_ShareUnlockObjByPtr((POBJ)bmp); + } } = =

1 0

[mpiulachs] 32722: - Allow multiple combination of style flags for usetup translations - Added right & center text align , no more space counting :). All localization can now share X, Y cordinates Note: only the en-US localization currently takes advantage of it , other localizations should be updated
by mpiulachs＠svn.reactos.org 19 Mar '08

19 Mar '08

Author: mpiulachs Date: Tue Mar 18 23:43:40 2008 New Revision: 32722 URL: http://svn.reactos.org/svn/reactos?rev=3D32722&view=3Drev Log: - Allow multiple combination of style flags for usetup translations - Added right & center text align , no more space counting :). All localiza= tion can now share X,Y cordinates Note: only the en-US localization currently takes advantage of it , other l= ocalizations should be updated Modified: trunk/reactos/base/setup/usetup/interface/consup.c trunk/reactos/base/setup/usetup/interface/consup.h trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/cs-CZ.h trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/setup/usetup/mui.c trunk/reactos/base/setup/usetup/mui.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/setup/usetup/interface/consup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/int= erface/consup.c?rev=3D32722&r1=3D32721&r2=3D32722&view=3Ddiff Modified: trunk/reactos/base/setup/usetup/interface/consup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/int= erface/consup.h?rev=3D32722&r1=3D32721&r2=3D32722&view=3Ddiff Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/bg-BG.h?rev=3D32722&r1=3D32721&r2=3D32722&view=3Ddiff Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/cs-CZ.h?rev=3D32722&r1=3D32721&r2=3D32722&view=3Ddiff Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/de-DE.h?rev=3D32722&r1=3D32721&r2=3D32722&view=3Ddiff Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/el-GR.h?rev=3D32722&r1=3D32721&r2=3D32722&view=3Ddiff Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/en-US.h?rev=3D32722&r1=3D32721&r2=3D32722&view=3Ddiff Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/es-ES.h?rev=3D32722&r1=3D32721&r2=3D32722&view=3Ddiff Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/fr-FR.h?rev=3D32722&r1=3D32721&r2=3D32722&view=3Ddiff Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/it-IT.h?rev=3D32722&r1=3D32721&r2=3D32722&view=3Ddiff Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/lt-LT.h?rev=3D32722&r1=3D32721&r2=3D32722&view=3Ddiff Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/pl-PL.h?rev=3D32722&r1=3D32721&r2=3D32722&view=3Ddiff Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/ru-RU.h?rev=3D32722&r1=3D32721&r2=3D32722&view=3Ddiff Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/sk-SK.h?rev=3D32722&r1=3D32721&r2=3D32722&view=3Ddiff Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/sv-SE.h?rev=3D32722&r1=3D32721&r2=3D32722&view=3Ddiff Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/uk-UA.h?rev=3D32722&r1=3D32721&r2=3D32722&view=3Ddiff Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui= .c?rev=3D32722&r1=3D32721&r2=3D32722&view=3Ddiff Modified: trunk/reactos/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui= .h?rev=3D32722&r1=3D32721&r2=3D32722&view=3Ddiff

1 0

[tkreuzer] 32721: - Rename GDIOBJ_AllocObj to GDIOBJ_allocObjWithHandle and make it return a pointer to a locked object.c - Implement GDIOBJ_AllocObjDepricated as a wrapper for those functions that currently still need the old way of allocation. Will be gone soon - Implement GDIOBJ_AllocObj that only allocates a memory object without a handle - Rename GDIOBJ_FreeObject to GDIOBJ_FreeObjByHandle - Implement GDIOBJ_FreeObj that only frees the memory object - Rename all XXX_Alloc and XXX_Free funct
by tkreuzer＠svn.reactos.org 19 Mar '08

19 Mar '08

Author: tkreuzer Date: Tue Mar 18 19:56:40 2008 New Revision: 32721 URL: http://svn.reactos.org/svn/reactos?rev=3D32721&view=3Drev Log: - Rename GDIOBJ_AllocObj to GDIOBJ_allocObjWithHandle and make it return a = pointer to a locked object.c - Implement GDIOBJ_AllocObjDepricated as a wrapper for those functions that= currently still need the old way of allocation. Will be gone soon - Implement GDIOBJ_AllocObj that only allocates a memory object without a h= andle - Rename GDIOBJ_FreeObject to GDIOBJ_FreeObjByHandle - Implement GDIOBJ_FreeObj that only frees the memory object - Rename all XXX_Alloc and XXX_Free functions accordingly - Fix NtGdiCreateClientObject and NtGdiDeleteClientObject - Reformat TextIntCreateFontIndirect - NtGdiHfontCreate: reformat and MmCopyFromCaller -> SEH Modified: trunk/reactos/subsystems/win32/win32k/eng/palette.c trunk/reactos/subsystems/win32/win32k/eng/surface.c trunk/reactos/subsystems/win32/win32k/include/bitmaps.h trunk/reactos/subsystems/win32/win32k/include/brush.h trunk/reactos/subsystems/win32/win32k/include/gdiobj.h trunk/reactos/subsystems/win32/win32k/include/palette.h trunk/reactos/subsystems/win32/win32k/include/pen.h trunk/reactos/subsystems/win32/win32k/include/region.h trunk/reactos/subsystems/win32/win32k/include/text.h trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/objects/brush.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c trunk/reactos/subsystems/win32/win32k/objects/metafile.c trunk/reactos/subsystems/win32/win32k/objects/palobj.c trunk/reactos/subsystems/win32/win32k/objects/pen.c trunk/reactos/subsystems/win32/win32k/objects/region.c trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/eng/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/eng/palette.c?rev=3D32721&r1=3D32720&r2=3D32721&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/eng/palette.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/palette.c Tue Mar 18 19:56:40= 2008 @@ -82,7 +82,7 @@ { GDIOBJ_SetOwnership(Palette, PsGetCurrentProcess()); = - return PALETTE_FreePalette(Palette); + return PALETTE_FreePaletteByHandle(Palette); } = /* Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/eng/surface.c?rev=3D32721&r1=3D32720&r2=3D32721&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/eng/surface.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/surface.c Tue Mar 18 19:56:40= 2008 @@ -264,7 +264,7 @@ if (Format =3D=3D 0) return 0; = - NewBitmap =3D BITMAPOBJ_AllocBitmap(); + NewBitmap =3D BITMAPOBJ_AllocBitmapDepricated(); if (NewBitmap =3D=3D NULL) return 0; = @@ -272,7 +272,7 @@ if (! BITMAPOBJ_InitBitsLock(BitmapObj)) { BITMAPOBJ_UnlockBitmap(BitmapObj); - BITMAPOBJ_FreeBitmap(NewBitmap); + BITMAPOBJ_FreeBitmapByHandle(NewBitmap); return 0; } SurfObj =3D &BitmapObj->SurfObj; @@ -325,7 +325,7 @@ if (SurfObj->pvBits =3D=3D NULL) { BITMAPOBJ_UnlockBitmap(BitmapObj); - BITMAPOBJ_FreeBitmap(NewBitmap); + BITMAPOBJ_FreeBitmapByHandle(NewBitmap); return 0; } } @@ -396,7 +396,7 @@ SURFOBJ *SurfObj; BITMAPOBJ *BitmapObj; = - NewSurface =3D (HSURF)BITMAPOBJ_AllocBitmap(); + NewSurface =3D (HSURF)BITMAPOBJ_AllocBitmapDepricated(); if (NewSurface =3D=3D NULL) return 0; = @@ -406,7 +406,7 @@ if (! BITMAPOBJ_InitBitsLock(BitmapObj)) { BITMAPOBJ_UnlockBitmap(BitmapObj); - BITMAPOBJ_FreeBitmap(NewSurface); + BITMAPOBJ_FreeBitmapByHandle(NewSurface); return 0; } SurfObj =3D &BitmapObj->SurfObj; @@ -513,7 +513,7 @@ EngDeleteSurface(IN HSURF Surface) { GDIOBJ_SetOwnership(Surface, PsGetCurrentProcess()); - BITMAPOBJ_FreeBitmap(Surface); + BITMAPOBJ_FreeBitmapByHandle(Surface); return TRUE; } = Modified: trunk/reactos/subsystems/win32/win32k/include/bitmaps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/include/bitmaps.h?rev=3D32721&r1=3D32720&r2=3D32721&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/include/bitmaps.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/bitmaps.h Tue Mar 18 19:5= 6:40 2008 @@ -26,10 +26,12 @@ = /* Internal interface */ = -#define BITMAPOBJ_AllocBitmap() \ - ((HBITMAP) GDIOBJ_AllocObj (GDI_OBJECT_TYPE_BITMAP)) -#define BITMAPOBJ_FreeBitmap(hBMObj) \ - GDIOBJ_FreeObj((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_BITMAP) +#define BITMAPOBJ_AllocBitmap() ((PBITMAPOBJ) GDIOBJ_AllocObj(GDIObjTy= pe_SURF_TYPE)) +#define BITMAPOBJ_AllocBitmapWithHandle() ((PBITMAPOBJ) GDIOBJ_AllocOb= jWithHandle(GDI_OBJECT_TYPE_BITMAP)) +#define BITMAPOBJ_AllocBitmapDepricated() ((HBITMAP) GDIOBJ_AllocObjDe= pricated(GDI_OBJECT_TYPE_BITMAP)) +#define BITMAPOBJ_FreeBitmap(pBMObj) GDIOBJ_FreeObj((POBJ) pBMObj, GDIObj= Type_SURF_TYPE) +#define BITMAPOBJ_FreeBitmapByHandle(hBMObj) GDIOBJ_FreeObjByHandle((HGDI= OBJ) hBMObj, GDI_OBJECT_TYPE_BITMAP) + /* NOTE: Use shared locks! */ #define BITMAPOBJ_LockBitmap(hBMObj) \ ((PBITMAPOBJ) GDIOBJ_ShareLockObj ((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_BIT= MAP)) Modified: trunk/reactos/subsystems/win32/win32k/include/brush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/include/brush.h?rev=3D32721&r1=3D32720&r2=3D32721&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/include/brush.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/brush.h Tue Mar 18 19:56:= 40 2008 @@ -72,8 +72,11 @@ #define GDIBRUSH_IS_MASKING 0x8000 /* Pattern bitmap is used as transpare= nt mask (?) */ #define GDIBRUSH_CACHED_IS_SOLID 0x80000000 = -#define BRUSHOBJ_AllocBrush() ((HBRUSH) GDIOBJ_AllocObj (GDI_OBJECT_TYPE_= BRUSH)) -#define BRUSHOBJ_FreeBrush(hBrush) GDIOBJ_FreeObj((HGDIOBJ)hBrush, GDI_OB= JECT_TYPE_BRUSH) +#define BRUSHOBJ_AllocBrush() ((PGDIBRUSHOBJ) GDIOBJ_AllocObj(GDIObjType_= BRUSH_TYPE)) +#define BRUSHOBJ_AllocBrushWithHandle() ((PGDIBRUSHOBJ) GDIOBJ_AllocObjWi= thHandle (GDI_OBJECT_TYPE_BRUSH)) +#define BRUSHOBJ_AllocBrushDepricated() ((HBRUSH) GDIOBJ_AllocObjDepricat= ed (GDI_OBJECT_TYPE_BRUSH)) +#define BRUSHOBJ_FreeBrush(pBrush) GDIOBJ_FreeObj((POBJ)pBrush, GDIObjTyp= e_BRUSH_TYPE) +#define BRUSHOBJ_FreeBrushByHandle(hBrush) GDIOBJ_FreeObjByHandle((HGDIOB= J)hBrush, GDI_OBJECT_TYPE_BRUSH) #define BRUSHOBJ_LockBrush(hBrush) ((PGDIBRUSHOBJ)GDIOBJ_LockObj((HGDIOBJ= )hBrush, GDI_OBJECT_TYPE_BRUSH)) #define BRUSHOBJ_UnlockBrush(pBrush) GDIOBJ_UnlockObjByPtr((POBJ)pBrush) = Modified: trunk/reactos/subsystems/win32/win32k/include/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/include/gdiobj.h?rev=3D32721&r1=3D32720&r2=3D32721&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/include/gdiobj.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/gdiobj.h Tue Mar 18 19:56= :40 2008 @@ -46,6 +46,11 @@ PW32THREAD Tid; } BASEOBJECT, *POBJ; = +enum BASEFLAGS +{ + BASEFLAG_LOOKASIDE =3D 0x80 +}; + BOOL INTERNAL_CALL GDIOBJ_OwnedByCurrentProcess(HGDIOBJ ObjectHandle); VOID INTERNAL_CALL GDIOBJ_SetOwnership(HGDIOBJ ObjectHandle, PEPROCESS = Owner); VOID INTERNAL_CALL GDIOBJ_CopyOwnership(HGDIOBJ CopyFrom, HGDIOBJ CopyT= o); @@ -53,8 +58,11 @@ VOID INTERNAL_CALL GDIOBJ_UnlockObjByPtr(POBJ Object); VOID INTERNAL_CALL GDIOBJ_ShareUnlockObjByPtr(POBJ Object); BOOL INTERNAL_CALL GDIOBJ_ValidateHandle(HGDIOBJ hObj, ULONG ObjectType= ); -HGDIOBJ INTERNAL_CALL GDIOBJ_AllocObj(ULONG ObjectType); -BOOL INTERNAL_CALL GDIOBJ_FreeObj (HGDIOBJ hObj, DWORD ObjectType); +POBJ INTERNAL_CALL GDIOBJ_AllocObj(UCHAR ObjectType); +POBJ INTERNAL_CALL GDIOBJ_AllocObjWithHandle(ULONG ObjectType); +HGDIOBJ INTERNAL_CALL GDIOBJ_AllocObjDepricated(ULONG ObjectType); +VOID INTERNAL_CALL GDIOBJ_FreeObj (POBJ pObj, UCHAR ObjectType); +BOOL INTERNAL_CALL GDIOBJ_FreeObjByHandle (HGDIOBJ hObj, DWORD ObjectTy= pe); PGDIOBJ INTERNAL_CALL GDIOBJ_LockObj (HGDIOBJ hObj, DWORD ObjectType); PGDIOBJ INTERNAL_CALL GDIOBJ_ShareLockObj (HGDIOBJ hObj, DWORD ObjectType); = Modified: trunk/reactos/subsystems/win32/win32k/include/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/include/palette.h?rev=3D32721&r1=3D32720&r2=3D32721&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/include/palette.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/palette.h Tue Mar 18 19:5= 6:40 2008 @@ -64,7 +64,8 @@ ULONG Blue); HPALETTE FASTCALL PALETTE_AllocPaletteIndexedRGB(ULONG NumColors, CONST RGBQUAD *Colors); -#define PALETTE_FreePalette(hPalette) GDIOBJ_FreeObj((HGDIOBJ)hPalette, = GDI_OBJECT_TYPE_PALETTE) +#define PALETTE_FreePalette(pPalette) GDIOBJ_FreeObj((POBJ)pPalette, GDI= ObjType_PAL_TYPE) +#define PALETTE_FreePaletteByHandle(hPalette) GDIOBJ_FreeObjByHandle((HG= DIOBJ)hPalette, GDI_OBJECT_TYPE_PALETTE) #define PALETTE_LockPalette(hPalette) ((PPALGDI)GDIOBJ_LockObj((HGDIOBJ)h= Palette, GDI_OBJECT_TYPE_PALETTE)) #define PALETTE_UnlockPalette(pPalette) GDIOBJ_UnlockObjByPtr((POBJ)pPale= tte) BOOL INTERNAL_CALL PALETTE_Cleanup(PVOID ObjectBody); Modified: trunk/reactos/subsystems/win32/win32k/include/pen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/include/pen.h?rev=3D32721&r1=3D32720&r2=3D32721&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/include/pen.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/pen.h Tue Mar 18 19:56:40= 2008 @@ -6,11 +6,17 @@ = /* Internal interface */ = -#define PENOBJ_AllocPen() ((HPEN)GDIOBJ_AllocObj(GDI_OBJECT_TYPE_PEN)) -#define PENOBJ_FreePen(hBMObj) GDIOBJ_FreeObj((HGDIOBJ) hBMObj, GDI_OBJECT= _TYPE_PEN) +#define PENOBJ_AllocPen() ((HPEN)GDIOBJ_AllocObj(GDIObjType_BRUSH_TYPE)) +#define PENOBJ_AllocPenWithHandle() ((PGDIBRUSHOBJ)GDIOBJ_AllocObjWithHand= le(GDI_OBJECT_TYPE_PEN)) +#define PENOBJ_AllocPenDepricated() ((HPEN)GDIOBJ_AllocObjDepricated(GDI_O= BJECT_TYPE_PEN)) +#define PENOBJ_FreePen(pBMObj) GDIOBJ_FreeObj((POBJ) pBMObj, GDI_OBJECT_TY= PE_PEN) +#define PENOBJ_FreePenByHandle(hBMObj) GDIOBJ_FreeObjByHandle((HGDIOBJ) hB= MObj, GDI_OBJECT_TYPE_PEN) #define PENOBJ_LockPen(hBMObj) ((PGDIBRUSHOBJ)GDIOBJ_LockObj((HGDIOBJ) hBM= Obj, GDI_OBJECT_TYPE_PEN)) -#define PENOBJ_AllocExtPen() ((HPEN)GDIOBJ_AllocObj(GDI_OBJECT_TYPE_EXTPEN= )) -#define PENOBJ_FreeExtPen(hBMObj) GDIOBJ_FreeObj((HGDIOBJ) hBMObj, GDI_OBJ= ECT_TYPE_EXTPEN) +#define PENOBJ_AllocExtPen() ((PGDIBRUSHOBJ)GDIOBJ_AllocObj(GDIObjType_BRU= SH_TYPE)) +#define PENOBJ_AllocExtPenWithHandle() ((PGDIBRUSHOBJ)GDIOBJ_AllocObjWithH= andle(GDI_OBJECT_TYPE_EXTPEN)) +#define PENOBJ_AllocExtPenDepricated() ((HPEN)GDIOBJ_AllocObjDepricated(GD= I_OBJECT_TYPE_EXTPEN)) +#define PENOBJ_FreeExtPen(pBMObj) GDIOBJ_FreeObj((POBJ) pBMObj, GDI_OBJECT= _TYPE_EXTPEN) +#define PENOBJ_FreeExtPenByHandle(hBMObj) GDIOBJ_FreeObjByHandle((HGDIOBJ)= hBMObj, GDI_OBJECT_TYPE_EXTPEN) #define PENOBJ_LockExtPen(hBMObj) ((PGDIBRUSHOBJ)GDIOBJ_LockObj((HGDIOBJ) = hBMObj, GDI_OBJECT_TYPE_EXTPEN)) #define PENOBJ_UnlockPen(pPenObj) GDIOBJ_UnlockObjByPtr((POBJ)pPenObj) = Modified: trunk/reactos/subsystems/win32/win32k/include/region.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/include/region.h?rev=3D32721&r1=3D32720&r2=3D32721&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/include/region.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/region.h Tue Mar 18 19:56= :40 2008 @@ -21,7 +21,8 @@ = /* Functions *************************************************************= *****/ = -#define REGION_FreeRgn(hRgn) GDIOBJ_FreeObj((HGDIOBJ)hRgn, GDI_OBJECT_TY= PE_REGION) +#define REGION_FreeRgn(pRgn) GDIOBJ_FreeObj((POBJ)pRgn, GDIObjType_RGN_T= YPE) +#define REGION_FreeRgnByHandle(hRgn) GDIOBJ_FreeObjbyHandle((HGDIOBJ)hRg= n, GDI_OBJECT_TYPE_REGION) #define REGION_LockRgn(hRgn) ((PROSRGNDATA)GDIOBJ_LockObj((HGDIOBJ)hRgn, = GDI_OBJECT_TYPE_REGION)) #define REGION_UnlockRgn(pRgn) GDIOBJ_UnlockObjByPtr((POBJ)pRgn) = Modified: trunk/reactos/subsystems/win32/win32k/include/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/include/text.h?rev=3D32721&r1=3D32720&r2=3D32721&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/include/text.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/text.h Tue Mar 18 19:56:4= 0 2008 @@ -68,9 +68,11 @@ = /* Internal interface */ = -#define TEXTOBJ_AllocText() \ - ((HFONT) GDIOBJ_AllocObj (GDI_OBJECT_TYPE_FONT)) -#define TEXTOBJ_FreeText(hBMObj) GDIOBJ_FreeObj((HGDIOBJ) hBMObj, GDI_OB= JECT_TYPE_FONT) +#define TEXTOBJ_AllocText() ((PTEXTOBJ) GDIOBJ_AllocObj(GDIObjType_= LFONT_TYPE)) +#define TEXTOBJ_AllocTextWithHandle() ((PTEXTOBJ) GDIOBJ_AllocObjWithHand= le(GDI_OBJECT_TYPE_FONT)) +#define TEXTOBJ_AllocTextDepricated() ((HFONT) GDIOBJ_AllocObj(GDI_OBJECT= _TYPE_FONT)) +#define TEXTOBJ_FreeText(pBMObj) GDIOBJ_FreeObj((POBJ) pBMObj, GDILoObjT= ype_LO_FONT_TYPE) +#define TEXTOBJ_FreeTextByHandle(hBMObj) GDIOBJ_FreeObj((HGDIOBJ) hBMObj= , GDI_OBJECT_TYPE_FONT) #define TEXTOBJ_LockText(hBMObj) ((PTEXTOBJ) GDIOBJ_LockObj ((HGDIOBJ) hB= MObj, GDI_OBJECT_TYPE_FONT)) #define TEXTOBJ_UnlockText(pBMObj) GDIOBJ_UnlockObjByPtr ((POBJ)pBMObj) = Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/ntuser/painting.c?rev=3D32721&r1=3D32720&r2=3D32721&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Tue Mar 18 19:5= 6:40 2008 @@ -272,7 +272,7 @@ if ((HANDLE) 1 !=3D TempRegion && NULL !=3D TempRegion) { /* NOTE: The region can already be deleted! */ - GDIOBJ_FreeObj(TempRegion, GDI_OBJECT_TYPE_REGION | GDI_OBJ= ECT_TYPE_SILENT); + GDIOBJ_FreeObjByHandle(TempRegion, GDI_OBJECT_TYPE_REGION |= GDI_OBJECT_TYPE_SILENT); } } = @@ -801,7 +801,7 @@ if (hRgn !=3D (HANDLE)1 && hRgn !=3D NULL) { /* NOTE: The region can already by deleted! */ - GDIOBJ_FreeObj(hRgn, GDI_OBJECT_TYPE_REGION | GDI_OBJECT_TYPE_SIL= ENT); + GDIOBJ_FreeObjByHandle(hRgn, GDI_OBJECT_TYPE_REGION | GDI_OBJECT_= TYPE_SILENT); } } = Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/objects/brush.c?rev=3D32721&r1=3D32720&r2=3D32721&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/objects/brush.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/brush.c Tue Mar 18 19:56:= 40 2008 @@ -351,16 +351,14 @@ BitmapObject->hDIBPalette =3D BuildDIBPalette(BitmapInfo, &PaletteType); BITMAPOBJ_UnlockBitmap(BitmapObject); = - hBrush =3D BRUSHOBJ_AllocBrush(); - if (hBrush =3D=3D NULL) + BrushObject =3D BRUSHOBJ_AllocBrushWithHandle(); + if (BrushObject =3D=3D NULL) { NtGdiDeleteObject(hPattern); SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return NULL; } - - BrushObject =3D BRUSHOBJ_LockBrush(hBrush); - ASSERT(BrushObject !=3D NULL); + hBrush =3D BrushObject->BaseObject.hHmgr; = BrushObject->flAttrs |=3D GDIBRUSH_IS_BITMAP | GDIBRUSH_IS_DIB; BrushObject->hbmPattern =3D hPattern; @@ -394,16 +392,14 @@ return NULL; } = - hBrush =3D BRUSHOBJ_AllocBrush(); - if (hBrush =3D=3D NULL) + BrushObject =3D BRUSHOBJ_AllocBrushWithHandle(); + if (BrushObject =3D=3D NULL) { NtGdiDeleteObject(hPattern); SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return NULL; } - - BrushObject =3D BRUSHOBJ_LockBrush(hBrush); - ASSERT(BrushObject !=3D NULL); + hBrush =3D BrushObject->BaseObject.hHmgr; = BrushObject->flAttrs |=3D GDIBRUSH_IS_HATCH; BrushObject->hbmPattern =3D hPattern; @@ -431,16 +427,14 @@ return NULL; } = - hBrush =3D BRUSHOBJ_AllocBrush(); - if (hBrush =3D=3D NULL) + BrushObject =3D BRUSHOBJ_AllocBrushWithHandle(); + if (BrushObject =3D=3D NULL) { NtGdiDeleteObject(hPattern); SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return NULL; } - - BrushObject =3D BRUSHOBJ_LockBrush(hBrush); - ASSERT(BrushObject !=3D NULL); + hBrush =3D BrushObject->BaseObject.hHmgr; = BrushObject->flAttrs |=3D GDIBRUSH_IS_BITMAP; BrushObject->hbmPattern =3D hPattern; @@ -460,15 +454,13 @@ HBRUSH hBrush; PGDIBRUSHOBJ BrushObject; = - hBrush =3D BRUSHOBJ_AllocBrush(); - if (hBrush =3D=3D NULL) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - - BrushObject =3D BRUSHOBJ_LockBrush(hBrush); - ASSERT(BrushObject !=3D NULL); + BrushObject =3D BRUSHOBJ_AllocBrushWithHandle(); + if (BrushObject =3D=3D NULL) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + hBrush =3D BrushObject->BaseObject.hHmgr; = BrushObject->flAttrs |=3D GDIBRUSH_IS_SOLID; = @@ -486,15 +478,14 @@ HBRUSH hBrush; PGDIBRUSHOBJ BrushObject; = - hBrush =3D BRUSHOBJ_AllocBrush(); - if (hBrush =3D=3D NULL) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - - BrushObject =3D BRUSHOBJ_LockBrush(hBrush); - ASSERT(BrushObject !=3D NULL); + BrushObject =3D BRUSHOBJ_AllocBrushWithHandle(); + if (BrushObject =3D=3D NULL) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + hBrush =3D BrushObject->BaseObject.hHmgr; + BrushObject->flAttrs |=3D GDIBRUSH_IS_NULL; BRUSHOBJ_UnlockBrush(BrushObject); = Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/objects/dc.c?rev=3D32721&r1=3D32720&r2=3D32721&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Tue Mar 18 19:56:40 = 2008 @@ -2270,7 +2270,7 @@ RtlCopyMemory(Buf, Driver->Buffer, Driver->MaximumLength); } = - hDC =3D (HDC) GDIOBJ_AllocObj(GDI_OBJECT_TYPE_DC); + hDC =3D (HDC) GDIOBJ_AllocObjDepricated(GDI_OBJECT_TYPE_DC); if (hDC =3D=3D NULL) { if(Buf) @@ -2441,7 +2441,7 @@ DC_FreeDcAttr(DCToFree); if(!IsObjectDead( DCToFree )) { - if (!GDIOBJ_FreeObj(DCToFree, GDI_OBJECT_TYPE_DC)) + if (!GDIOBJ_FreeObjByHandle(DCToFree, GDI_OBJECT_TYPE_DC)) { DPRINT1("DC_FreeDC failed\n"); } Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/objects/dibobj.c?rev=3D32721&r1=3D32720&r2=3D32721&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Tue Mar 18 19:56= :40 2008 @@ -237,7 +237,7 @@ XlateObj =3D IntEngCreateXlate(DDB_Palette_Type, DIB_Palette_Type, DDB_P= alette, DIB_Palette); if (NULL =3D=3D XlateObj) { - PALETTE_FreePalette(DIB_Palette); + PALETTE_FreePaletteByHandle(DIB_Palette); EngUnlockSurface(SourceSurf); EngDeleteSurface((HSURF)SourceBitmap); BITMAPOBJ_UnlockBitmap(bitmap); @@ -265,7 +265,7 @@ = // Clean up EngDeleteXlate(XlateObj); - PALETTE_FreePalette(DIB_Palette); + PALETTE_FreePaletteByHandle(DIB_Palette); EngUnlockSurface(SourceSurf); EngDeleteSurface((HSURF)SourceBitmap); = @@ -713,7 +713,7 @@ EngDeleteSurface((HSURF)hDestBitmap); = if (hDestPalette !=3D NULL && bPaletteMatch =3D=3D FALSE) - PALETTE_FreePalette(hDestPalette); + PALETTE_FreePaletteByHandle(hDestPalette); = BITMAPOBJ_UnlockBitmap(BitmapObj); = @@ -1147,7 +1147,7 @@ = if (dib) { ExFreePool(dib); dib =3D NULL; } if (bmp) { bmp =3D NULL; } - if (res) { BITMAPOBJ_FreeBitmap(res); res =3D 0; } + if (res) { BITMAPOBJ_FreeBitmapByHandle(res); res =3D 0; } } = if (lpRGB !=3D bmi->bmiColors) Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/objects/gdiobj.c?rev=3D32721&r1=3D32720&r2=3D32721&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Tue Mar 18 19:56= :40 2008 @@ -72,7 +72,7 @@ {1, sizeof(DC), TAG_DC, DC_Cleanup}, /* 01 DC= */ {1, 0, 0, NULL}, /* 02 UN= USED1 */ {1, 0, 0, NULL}, /* 03 UN= USED2 */ - {1, sizeof(ROSRGNDATA), TAG_REGION, REGION_Cleanup}, /* 04 RGN= */ + {1, sizeof(ROSRGNDATA), TAG_REGION, REGION_Cleanup}, /* 04 RG= N */ {1, sizeof(BITMAPOBJ), TAG_SURFACE, BITMAP_Cleanup}, /* 05 SU= RFACE */ {0, sizeof(DC), TAG_CLIENTOBJ, GDI_CleanupDummy}, /* 06 CL= IENTOBJ: METADC,... FIXME: don't use DC struct */ {0, 0, TAG_PATH, NULL}, /* 07 PA= TH, unused */ @@ -444,24 +444,51 @@ return FALSE; } = +POBJ INTERNAL_CALL +GDIOBJ_AllocObj(UCHAR BaseType) +{ + POBJ pObject; + + ASSERT((BaseType & ~GDIObjTypeTotal) =3D=3D 0); +// BaseType &=3D GDI_HANDLE_BASETYPE_MASK; + + if (ObjTypeInfo[BaseType].bUseLookaside) + { + PPAGED_LOOKASIDE_LIST LookasideList; + + LookasideList =3D GdiHandleTable->LookasideLists + BaseType; + pObject =3D ExAllocateFromPagedLookasideList(LookasideList); + } + else + { + pObject =3D ExAllocatePoolWithTag(PagedPool, + ObjTypeInfo[BaseType].ulBodySize, + ObjTypeInfo[BaseType].Tag); + } + + if (pObject) + { + RtlZeroMemory(pObject, ObjTypeInfo[BaseType].ulBodySize); + } + + return pObject; +} + + /*! * Allocate memory for GDI object and return handle to it. * * \param ObjectType - type of object \ref GDI object types * - * \return Handle of the allocated object. - * - * \note Use GDIOBJ_Lock() to obtain pointer to the new object. - * \todo return the object pointer and lock it by default. + * \return Pointer to the allocated object, which is locked. */ -HGDIOBJ INTERNAL_CALL -GDIOBJ_AllocObj(ULONG ObjectType) +POBJ INTERNAL_CALL +GDIOBJ_AllocObjWithHandle(ULONG ObjectType) { PW32PROCESS W32Process; POBJ newObject =3D NULL; - PPAGED_LOOKASIDE_LIST LookasideList =3D NULL; HANDLE CurrentProcessId, LockedProcessId; - ULONG TypeIndex; + UCHAR TypeIndex; #ifdef GDI_DEBUG ULONG Attempts =3D 0; #endif @@ -475,106 +502,130 @@ ASSERT(ObjectType !=3D GDI_OBJECT_TYPE_DONTCARE); = TypeIndex =3D GDI_OBJECT_GET_TYPE_INDEX(ObjectType); - if (ObjTypeInfo[TypeIndex].bUseLookaside) - { - LookasideList =3D FindLookasideList(TypeIndex); - if (LookasideList !=3D NULL) - { - newObject =3D ExAllocateFromPagedLookasideList(LookasideList); - } + + newObject =3D GDIOBJ_AllocObj(TypeIndex); + if (!newObject) + { + DPRINT1("Not enough memory to allocate gdi object!\n"); + return NULL; + } + + UINT Index; + PGDI_TABLE_ENTRY Entry; + LONG TypeInfo; + + CurrentProcessId =3D PsGetCurrentProcessId(); + LockedProcessId =3D (HANDLE)((ULONG_PTR)CurrentProcessId | 0x1); + +// RtlZeroMemory(newObject, GetObjectSize(TypeIndex)); + + /* On Windows the higher 16 bit of the type field don't contain the + full type from the handle, but the base type. + (type =3D BRSUH, PEN, EXTPEN, basetype =3D BRUSH) */ + TypeInfo =3D (ObjectType & GDI_HANDLE_BASETYPE_MASK) | (ObjectType >> = GDI_ENTRY_UPPER_SHIFT); + + Index =3D InterlockedPopFreeEntry(); + if (Index !=3D 0) + { + HANDLE PrevProcId; + + Entry =3D &GdiHandleTable->Entries[Index]; + +LockHandle: + PrevProcId =3D _InterlockedCompareExchangePointer((PVOID*)&Entry->= ProcessId, LockedProcessId, 0); + if (PrevProcId =3D=3D NULL) + { + PW32THREAD Thread =3D PsGetCurrentThreadWin32Thread(); + HGDIOBJ Handle; + + Entry->KernelData =3D newObject; + + /* copy the reuse-counter */ + TypeInfo |=3D Entry->Type & GDI_ENTRY_REUSE_MASK; + + /* we found a free entry, no need to exchange this field atomi= cally + since we're holding the lock */ + Entry->Type =3D TypeInfo; + + /* Create a handle */ + Handle =3D (HGDIOBJ)((Index & 0xFFFF) | (TypeInfo << GDI_ENTRY= _UPPER_SHIFT)); + + /* Initialize BaseObject fields */ + newObject->hHmgr =3D Handle; + newObject->ulShareCount =3D 0; + newObject->cExclusiveLock =3D 1; + newObject->Tid =3D Thread; + + /* unlock the entry */ + (void)_InterlockedExchangePointer((PVOID*)&Entry->ProcessId, C= urrentProcessId); + + GDIDBG_CAPTUREALLOCATOR(Index); + + if (W32Process !=3D NULL) + { + _InterlockedIncrement(&W32Process->GDIObjects); + } + + DPRINT("GDIOBJ_AllocObj: 0x%x ob: 0x%x\n", Handle, newObject); + return newObject; + } + else + { +#ifdef GDI_DEBUG + if (++Attempts > 20) + { + DPRINT1("[%d]Waiting on handle in index 0x%x\n", Attempts,= Index); + } +#endif + /* damn, someone is trying to lock the object even though it d= oesn't + even exist anymore, wait a little and try again! + FIXME - we shouldn't loop forever! Give up after some time!= */ + DelayExecution(); + /* try again */ + goto LockHandle; + } + } + + GDIOBJ_FreeObj(newObject, TypeIndex); + + DPRINT1("Failed to insert gdi object into the handle table, no handles= left!\n"); + GDIDBG_DUMPHANDLETABLE(); + + return NULL; +} + +/* Wrapper for compatibility with old calls, will be removed later */ +HGDIOBJ INTERNAL_CALL +GDIOBJ_AllocObjDepricated(ULONG ObjectType) +{ + POBJ pObject; + HGDIOBJ hObject; + + pObject =3D GDIOBJ_AllocObjWithHandle(ObjectType); + hObject =3D pObject->hHmgr; + GDIOBJ_UnlockObjByPtr(pObject); + + return hObject; +} + + +VOID INTERNAL_CALL +GDIOBJ_FreeObj(POBJ pObject, UCHAR BaseType) +{ + /* Object must not have a handle! */ + ASSERT(pObject->hHmgr =3D=3D NULL); + + if (ObjTypeInfo[BaseType].bUseLookaside) + { + PPAGED_LOOKASIDE_LIST LookasideList; + + LookasideList =3D GdiHandleTable->LookasideLists + BaseType; + ExFreeToPagedLookasideList(LookasideList, pObject); } else { - newObject =3D ExAllocatePoolWithTag(PagedPool, - ObjTypeInfo[TypeIndex].ulBodySiz= e, - ObjTypeInfo[TypeIndex].Tag); - } - if (newObject !=3D NULL) - { - UINT Index; - PGDI_TABLE_ENTRY Entry; - LONG TypeInfo; - - CurrentProcessId =3D PsGetCurrentProcessId(); - LockedProcessId =3D (HANDLE)((ULONG_PTR)CurrentProcessId | 0x1); - - RtlZeroMemory(newObject, GetObjectSize(TypeIndex)); - - /* On Windows the higher 16 bit of the type field don't contain the - full type from the handle, but the base type. - (type =3D BRSUH, PEN, EXTPEN, basetype =3D BRUSH) */ - TypeInfo =3D (ObjectType & GDI_HANDLE_BASETYPE_MASK) | (ObjectType= >> GDI_ENTRY_UPPER_SHIFT); - - Index =3D InterlockedPopFreeEntry(); - if (Index !=3D 0) - { - HANDLE PrevProcId; - - Entry =3D &GdiHandleTable->Entries[Index]; - -LockHandle: - PrevProcId =3D _InterlockedCompareExchangePointer((PVOID*)&Ent= ry->ProcessId, LockedProcessId, 0); - if (PrevProcId =3D=3D NULL) - { - HGDIOBJ Handle; - - Entry->KernelData =3D newObject; - - /* copy the reuse-counter */ - TypeInfo |=3D Entry->Type & GDI_ENTRY_REUSE_MASK; - - /* we found a free entry, no need to exchange this field a= tomically - since we're holding the lock */ - Entry->Type =3D TypeInfo; - - /* unlock the entry */ - (void)_InterlockedExchangePointer((PVOID*)&Entry->ProcessI= d, CurrentProcessId); - - GDIDBG_CAPTUREALLOCATOR(Index); - - if (W32Process !=3D NULL) - { - _InterlockedIncrement(&W32Process->GDIObjects); - } - Handle =3D (HGDIOBJ)((Index & 0xFFFF) | (TypeInfo << GDI_E= NTRY_UPPER_SHIFT)); - newObject->hHmgr =3D Handle; - - DPRINT("GDIOBJ_AllocObj: 0x%x ob: 0x%x\n", Handle, newObje= ct); - return Handle; - } - else - { -#ifdef GDI_DEBUG - if (++Attempts > 20) - { - DPRINT1("[%d]Waiting on handle in index 0x%x\n", Attem= pts, Index); - } -#endif - /* damn, someone is trying to lock the object even though = it doesn't - eve nexist anymore, wait a little and try again! - FIXME - we shouldn't loop forever! Give up after some t= ime! */ - DelayExecution(); - /* try again */ - goto LockHandle; - } - } - - if (ObjTypeInfo[TypeIndex].bUseLookaside) - { - ExFreeToPagedLookasideList(LookasideList, newObject); - } - else - { - ExFreePool(newObject); - } - DPRINT1("Failed to insert gdi object into the handle table, no han= dles left!\n"); - GDIDBG_DUMPHANDLETABLE(); - } - else - { - DPRINT1("Not enough memory to allocate gdi object!\n"); - } - return NULL; + ExFreePool(pObject); + } } = /*! @@ -588,10 +639,9 @@ * to the calling process. */ BOOL INTERNAL_CALL -GDIOBJ_FreeObj(HGDIOBJ hObj, DWORD ExpectedType) +GDIOBJ_FreeObjByHandle(HGDIOBJ hObj, DWORD ExpectedType) { PGDI_TABLE_ENTRY Entry; - PPAGED_LOOKASIDE_LIST LookasideList; HANDLE ProcessId, LockedProcessId, PrevProcId; ULONG HandleType, HandleUpper, TypeIndex; BOOL Silent; @@ -658,6 +708,8 @@ /* push this entry to the free list */ InterlockedPushFreeEntry(GDI_ENTRY_TO_INDEX(GdiHandleTable= , Entry)); = + Object->hHmgr =3D NULL; + if (W32Process !=3D NULL) { _InterlockedDecrement(&W32Process->GDIObjects); @@ -668,18 +720,7 @@ Ret =3D RunCleanupCallback(Object, TypeIndex); = /* Now it's time to free the memory */ - if (ObjTypeInfo[TypeIndex].bUseLookaside) - { - LookasideList =3D FindLookasideList(TypeIndex); - if (LookasideList !=3D NULL) - { - ExFreeToPagedLookasideList(LookasideList, Object); - } - } - else - { - ExFreePool(Object); - } + GDIOBJ_FreeObj(Object, TypeIndex); = return Ret; } @@ -764,7 +805,7 @@ if (!IsObjectDead(hObject)) { return NULL !=3D hObject - ? GDIOBJ_FreeObj(hObject, GDI_OBJECT_TYPE_DONTCARE) : FALSE; + ? GDIOBJ_FreeObjByHandle(hObject, GDI_OBJECT_TYPE_DONTCARE)= : FALSE; } else { @@ -818,7 +859,7 @@ simply ignore this fact here. */ ObjectHandle =3D (HGDIOBJ)(Index | (Entry->Type << GDI_ENT= RY_UPPER_SHIFT)); = - if (GDIOBJ_FreeObj(ObjectHandle, GDI_OBJECT_TYPE_DONTCARE)= && + if (GDIOBJ_FreeObjByHandle(ObjectHandle, GDI_OBJECT_TYPE_D= ONTCARE) && W32Process->GDIObjects =3D=3D 0) { /* there are no more gdi handles for this process, bai= l */ @@ -1569,21 +1610,30 @@ IN ULONG ulType ) { -// ATM we use DC object for KernelData. I think it should be at a minimum = GDIOBJEMPTYHDR. +// ATM we use DC object for KernelData. This is wrong. +// The real type consists of BASEOBJECT and a pointer. // The UserData is set in user mode, so it is always NULL. +// HANDLE should be HGDIOBJ // - INT Index; - PGDI_TABLE_ENTRY Entry; - HANDLE handle =3D GDIOBJ_AllocObj(GDI_OBJECT_TYPE_CLIOBJ); -// Need to change handle type based on ulType. - Index =3D GDI_HANDLE_GET_INDEX((HGDIOBJ)handle); - Entry =3D &GdiHandleTable->Entries[Index]; -// mask out lower half and set the type by ulType. - Entry->Type &=3D GDI_HANDLE_UPPER_MASK; - Entry->Type |=3D ulType >> GDI_ENTRY_UPPER_SHIFT; -// mask out handle type than set it by ulType. - handle =3D (HANDLE)(((ULONG_PTR)(handle)) & (GDI_HANDLE_REUSE_MASK|GDI= _HANDLE_STOCK_MASK|0x0ffff)); - handle =3D (HANDLE)(((ULONG_PTR)(handle)) | ulType); + POBJ pObject; + HANDLE handle; + + /* Mask out everything that would change the type in a wrong manner */ + ulType &=3D (GDI_HANDLE_TYPE_MASK & ~GDI_HANDLE_BASETYPE_MASK); + + /* Allocate a new object */ + pObject =3D GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_CLIOBJ | ulType); + if (!pObject) + { + return NULL; + } + + /* get the handle */ + handle =3D pObject->hHmgr; + + /* Unlock it */ + GDIOBJ_UnlockObjByPtr(pObject); + return handle; } = @@ -1594,7 +1644,16 @@ IN HANDLE h ) { - return GDIOBJ_FreeObj(h, GDI_OBJECT_TYPE_CLIOBJ); + /* We first need to get the real type from the handle */ + ULONG type =3D GDI_HANDLE_GET_TYPE(h); + + /* Check if it's really a CLIENTOBJ */ + if ((type & GDI_HANDLE_BASETYPE_MASK) !=3D GDILoObjType_LO_CLIENTOBJ_T= YPE) + { + /* FIXME: SetLastError? */ + return FALSE; + } + return GDIOBJ_FreeObjByHandle(h, type); } = INT Modified: trunk/reactos/subsystems/win32/win32k/objects/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/objects/metafile.c?rev=3D32721&r1=3D32720&r2=3D32721&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/objects/metafile.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/metafile.c Tue Mar 18 19:= 56:40 2008 @@ -230,7 +230,7 @@ NtClose( Dc->hFile ); } = - hmf =3D GDIOBJ_AllocObj(GdiHandleTable, GDI_OBJECT_TYPE_ENHMETAFILE); + hmf =3D GDIOBJ_AllocObjDepricated(GdiHandleTable, GDI_OBJECT_TYPE_ENHMET= AFILE); if (hmf !=3D NULL) { phmf =3D GDIOBJ_LockObj(GdiHandleTable, hmf, GDI_OBJECT_TYPE_ENHMETAF= ILE); Modified: trunk/reactos/subsystems/win32/win32k/objects/palobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/objects/palobj.c?rev=3D32721&r1=3D32720&r2=3D32721&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/objects/palobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/palobj.c Tue Mar 18 19:56= :40 2008 @@ -63,7 +63,7 @@ HPALETTE NewPalette; PPALGDI PalGDI; = - NewPalette =3D (HPALETTE) GDIOBJ_AllocObj(GDI_OBJECT_TYPE_PALETTE); + NewPalette =3D (HPALETTE) GDIOBJ_AllocObjDepricated(GDI_OBJECT_TYPE_PALE= TTE); if (NULL =3D=3D NewPalette) { return NULL; @@ -82,7 +82,7 @@ if (NULL =3D=3D PalGDI->IndexedColors) { PALETTE_UnlockPalette(PalGDI); - PALETTE_FreePalette(NewPalette); + PALETTE_FreePaletteByHandle(NewPalette); return NULL; } RtlCopyMemory(PalGDI->IndexedColors, Colors, sizeof(PALETTEENTRY) * = NumColors); @@ -112,7 +112,7 @@ PPALGDI PalGDI; unsigned i; = - NewPalette =3D (HPALETTE) GDIOBJ_AllocObj(GDI_OBJECT_TYPE_PALETTE); + NewPalette =3D (HPALETTE) GDIOBJ_AllocObjDepricated(GDI_OBJECT_TYPE_PALE= TTE); if (NULL =3D=3D NewPalette) { return NULL; @@ -129,7 +129,7 @@ if (NULL =3D=3D PalGDI->IndexedColors) { PALETTE_UnlockPalette(PalGDI); - PALETTE_FreePalette(NewPalette); + PALETTE_FreePaletteByHandle(NewPalette); return NULL; } for (i =3D 0; i < NumColors; i++) Modified: trunk/reactos/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/objects/pen.c?rev=3D32721&r1=3D32720&r2=3D32721&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/objects/pen.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/pen.c Tue Mar 18 19:56:40= 2008 @@ -51,29 +51,20 @@ = if (bOldStylePen) { - hPen =3D PENOBJ_AllocPen(); + PenObject =3D PENOBJ_AllocPenWithHandle(); } else { - hPen =3D PENOBJ_AllocExtPen(); - } - - if (!hPen) + PenObject =3D PENOBJ_AllocExtPenWithHandle(); + } + + if (!PenObject) { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); DPRINT("Can't allocate pen\n"); return 0; } - - if (bOldStylePen) - { - PenObject =3D PENOBJ_LockPen(hPen); - } - else - { - PenObject =3D PENOBJ_LockExtPen(hPen); - } - /* FIXME - Handle PenObject =3D=3D NULL!!! */ + hPen =3D PenObject->BaseObject.hHmgr; = PenObject->ptPenWidth.x =3D dwWidth; PenObject->ptPenWidth.y =3D 0; Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/objects/region.c?rev=3D32721&r1=3D32720&r2=3D32721&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/objects/region.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c Tue Mar 18 19:56= :40 2008 @@ -2024,7 +2024,7 @@ HRGN hReg; PROSRGNDATA pReg; = - if ((hReg =3D (HRGN) GDIOBJ_AllocObj(GDI_OBJECT_TYPE_REGION))) + if ((hReg =3D (HRGN) GDIOBJ_AllocObjDepricated(GDI_OBJECT_TYPE_REGION)= )) { if (NULL !=3D (pReg =3D REGION_LockRgn(hReg))) { Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/objects/text.c?rev=3D32721&r1=3D32720&r2=3D32721&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Tue Mar 18 19:56:4= 0 2008 @@ -487,36 +487,24 @@ TextIntCreateFontIndirect(CONST LPLOGFONTW lf, HFONT *NewFont) { PTEXTOBJ TextObj; - NTSTATUS Status =3D STATUS_SUCCESS; - - *NewFont =3D TEXTOBJ_AllocText(); - if (NULL !=3D *NewFont) + + TextObj =3D TEXTOBJ_AllocTextWithHandle(); + if (!TextObj) { - TextObj =3D TEXTOBJ_LockText(*NewFont); - if (NULL !=3D TextObj) - { - memcpy(&TextObj->logfont.elfEnumLogfontEx.elfLogFont, lf, sizeof(LOG= FONTW)); - if (lf->lfEscapement !=3D lf->lfOrientation) - { - /* this should really depend on whether GM_ADVANCED is set */ - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfOrientation =3D - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfEscapement; - } - TEXTOBJ_UnlockText(TextObj); - } - else - { -/* FIXME */ -/* ASSERT(FALSE);*/ - Status =3D STATUS_INVALID_HANDLE; - } + return STATUS_NO_MEMORY; } - else + + *NewFont =3D TextObj->BaseObject.hHmgr; + memcpy(&TextObj->logfont.elfEnumLogfontEx.elfLogFont, lf, sizeof(LOGFONT= W)); + if (lf->lfEscapement !=3D lf->lfOrientation) { - Status =3D STATUS_NO_MEMORY; + /* this should really depend on whether GM_ADVANCED is set */ + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfOrientation =3D + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfEscapement; } - - return Status; + TEXTOBJ_UnlockText(TextObj); + + return STATUS_SUCCESS; } = HFONT @@ -528,51 +516,51 @@ IN FLONG fl, IN PVOID pvCliData ) { - ENUMLOGFONTEXDVW SafeLogfont; - HFONT NewFont; - PTEXTOBJ TextObj; - NTSTATUS Status =3D STATUS_SUCCESS; - - if (NULL !=3D pelfw) + ENUMLOGFONTEXDVW SafeLogfont; + HFONT hNewFont; + PTEXTOBJ TextObj; + NTSTATUS Status =3D STATUS_SUCCESS; + + if (!pelfw) { - Status =3D MmCopyFromCaller(&SafeLogfont, pelfw, sizeof(ENUMLOGFONTEXD= VW)); - if (NT_SUCCESS(Status)) - { - NewFont =3D TEXTOBJ_AllocText(); - if (NULL !=3D NewFont) - { - TextObj =3D TEXTOBJ_LockText(NewFont); - - if (NULL !=3D TextObj) - { - RtlCopyMemory ( &TextObj->logfont, - &SafeLogfont, - sizeof(ENUMLOGFONTEXDVW)); - - if (SafeLogfont.elfEnumLogfontEx.elfLogFont.lfEscapement !=3D - SafeLogfont.elfEnumLogfontEx.elfLogFont.lfOrientation) - { - /* this should really depend on whether GM_ADVANCED is set */ - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfOrientation= =3D - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfEscapement; - } - TEXTOBJ_UnlockText(TextObj); - } - else - { -/* FIXME */ -/* ASSERT(FALSE);*/ - Status =3D STATUS_INVALID_HANDLE; - } - } - } + return NULL; } - else + + _SEH_TRY { - Status =3D STATUS_INVALID_PARAMETER; + ProbeForRead(pelfw, sizeof(ENUMLOGFONTEXDVW), 1); + RtlCopyMemory(&SafeLogfont, pelfw, sizeof(ENUMLOGFONTEXDVW)); } - - return NT_SUCCESS(Status) ? NewFont : NULL; + _SEH_HANDLE + { + Status =3D _SEH_GetExceptionCode(); + } + _SEH_END + + if (!NT_SUCCESS(Status)) + { + return NULL; + } + + TextObj =3D TEXTOBJ_AllocTextWithHandle(); + if (!TextObj) + { + return NULL; + } + hNewFont =3D TextObj->BaseObject.hHmgr; + + RtlCopyMemory (&TextObj->logfont, &SafeLogfont, sizeof(ENUMLOGFONTEXDVW)= ); + + if (SafeLogfont.elfEnumLogfontEx.elfLogFont.lfEscapement !=3D + SafeLogfont.elfEnumLogfontEx.elfLogFont.lfOrientation) + { + /* this should really depend on whether GM_ADVANCED is set */ + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfOrientation =3D + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfEscapement; + } + TEXTOBJ_UnlockText(TextObj); + + return hNewFont; = } = @@ -1577,7 +1565,7 @@ = Dc_Attr =3D dc->pDc_Attr; if(!Dc_Attr) Dc_Attr =3D &dc->Dc_Attr; - = + /* Check if String is valid */ if ((Count > 0xFFFF) || (Count > 0 && UnsafeString =3D=3D NULL)) { @@ -2159,7 +2147,7 @@ SetLastWin32Error(Status); return FALSE; } - = + BufferSize =3D Count * sizeof(ABC); // Same size! SafeBuff =3D ExAllocatePoolWithTag(PagedPool, BufferSize, TAG_GDITEXT); if (!fl) SafeBuffF =3D (LPABCFLOAT) SafeBuff; @@ -2447,7 +2435,7 @@ WCHAR DefChar =3D 0; PWSTR Buffer =3D NULL; ULONG Size; - = + if ((!UnSafepwc) && (!UnSafepgi)) return cwc; = dc =3D DC_LockDc(hdc); @@ -2488,7 +2476,7 @@ goto ErrorRet; } IntGetOutlineTextMetrics(FontGDI, Size, potm); - DefChar =3D potm->otmTextMetrics.tmDefaultChar; // May need this. = + DefChar =3D potm->otmTextMetrics.tmDefaultChar; // May need this. ExFreePool(potm); } = @@ -2508,7 +2496,7 @@ = IntLockFreeType; face =3D FontGDI->face; - = + for (i =3D 0; i < cwc; i++) { Buffer[i] =3D FT_Get_Char_Index(face, UnSafepwc[i]); @@ -3340,7 +3328,7 @@ PDC Dc; PDC_ATTR Dc_Attr; DWORD cscp =3D IntGdiGetCharSet(hDC); - // If here, update everything! = + // If here, update everything! Dc =3D DC_LockDc(hDC); Dc_Attr =3D Dc->pDc_Attr; if (!Dc_Attr) Dc_Attr =3D &Dc->Dc_Attr;

1 0

[tkreuzer] 32720: Add GDILoObjType enum to ntgdityp.h
by tkreuzer＠svn.reactos.org 19 Mar '08

19 Mar '08

Author: tkreuzer Date: Tue Mar 18 19:33:11 2008 New Revision: 32720 URL: http://svn.reactos.org/svn/reactos?rev=3D32720&view=3Drev Log: Add GDILoObjType enum to ntgdityp.h Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32= k/ntgdityp.h?rev=3D32720&r1=3D32719&r2=3D32720&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/include/reactos/win32k/ntgdityp.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h Tue Mar 18 19:33:11 2008 @@ -97,42 +97,61 @@ GdiLpToDp, } TRANSFORMTYPE, *PTRANSFORMTYPE; = -typedef enum _GDIOBJTYPE -{ - GDIObjType_DEF_TYPE, - GDIObjType_DC_TYPE, - GDIObjType_UNUSED1_TYPE, - GDIObjType_UNUSED2_TYPE, - GDIObjType_RGN_TYPE, - GDIObjType_SURF_TYPE, - GDIObjType_CLIENTOBJ_TYPE, - GDIObjType_PATH_TYPE, - GDIObjType_PAL_TYPE, - GDIObjType_ICMLCS_TYPE, - GDIObjType_LFONT_TYPE, - GDIObjType_RFONT_TYPE, - GDIObjType_PFE_TYPE, - GDIObjType_PFT_TYPE, - GDIObjType_ICMCXF_TYPE, - GDIObjType_SPRITE_TYPE, - GDIObjType_BRUSH_TYPE, - GDIObjType_UMPD_TYPE, - GDIObjType_UNUSED4_TYPE, - GDIObjType_SPACE_TYPE, - GDIObjType_UNUSED5_TYPE, - GDIObjType_META_TYPE, - GDIObjType_EFSTATE_TYPE, - GDIObjType_BMFD_TYPE, - GDIObjType_VTFD_TYPE, - GDIObjType_TTFD_TYPE, - GDIObjType_RC_TYPE, - GDIObjType_TEMP_TYPE, - GDIObjType_DRVOBJ_TYPE, - GDIObjType_DCIOBJ_TYPE, - GDIObjType_SPOOL_TYPE, +typedef enum GDIObjType +{ + GDIObjType_DEF_TYPE =3D 0x00, + GDIObjType_DC_TYPE =3D 0x01, + GDIObjType_UNUSED1_TYPE =3D 0x02, + GDIObjType_UNUSED2_TYPE =3D 0x03, + GDIObjType_RGN_TYPE =3D 0x04, + GDIObjType_SURF_TYPE =3D 0x05, + GDIObjType_CLIENTOBJ_TYPE =3D 0x06, + GDIObjType_PATH_TYPE =3D 0x07, + GDIObjType_PAL_TYPE =3D 0x08, + GDIObjType_ICMLCS_TYPE =3D 0x09, + GDIObjType_LFONT_TYPE =3D 0x0a, + GDIObjType_RFONT_TYPE =3D 0x0b, + GDIObjType_PFE_TYPE =3D 0x0c, + GDIObjType_PFT_TYPE =3D 0x0d, + GDIObjType_ICMCXF_TYPE =3D 0x0e, + GDIObjType_SPRITE_TYPE =3D 0x0f, + GDIObjType_BRUSH_TYPE =3D 0x10, + GDIObjType_UMPD_TYPE =3D 0x11, + GDIObjType_UNUSED4_TYPE =3D 0x12, + GDIObjType_SPACE_TYPE =3D 0x13, + GDIObjType_UNUSED5_TYPE =3D 0x14, + GDIObjType_META_TYPE =3D 0x15, + GDIObjType_EFSTATE_TYPE =3D 0x16, + GDIObjType_BMFD_TYPE =3D 0x17, + GDIObjType_VTFD_TYPE =3D 0x18, + GDIObjType_TTFD_TYPE =3D 0x19, + GDIObjType_RC_TYPE =3D 0x1a, + GDIObjType_TEMP_TYPE =3D 0x1b, + GDIObjType_DRVOBJ_TYPE =3D 0x1c, + GDIObjType_DCIOBJ_TYPE =3D 0x1d, + GDIObjType_SPOOL_TYPE =3D 0x1e, + GDIObjType_MAX_TYPE =3D 0x1e, + GDIObjTypeTotal =3D 0x1f, } GDIOBJTYPE, *PGDIOBJTYPE; - -#define GDIObjType_MAX_TYPE GDIObjType_SPOOL_TYPE + +typedef enum GDILoObjType +{ + GDILoObjType_LO_BRUSH_TYPE =3D 0x100000, + GDILoObjType_LO_DC_TYPE =3D 0x10000, + GDILoObjType_LO_BITMAP_TYPE =3D 0x50000, + GDILoObjType_LO_PALETTE_TYPE =3D 0x80000, + GDILoObjType_LO_FONT_TYPE =3D 0xa0000, + GDILoObjType_LO_REGION_TYPE =3D 0x40000, + GDILoObjType_LO_ICMLCS_TYPE =3D 0x90000, + GDILoObjType_LO_CLIENTOBJ_TYPE =3D 0x60000, + GDILoObjType_LO_ALTDC_TYPE =3D 0x210000, + GDILoObjType_LO_PEN_TYPE =3D 0x300000, + GDILoObjType_LO_EXTPEN_TYPE =3D 0x500000, + GDILoObjType_LO_DIBSECTION_TYPE =3D 0x250000, + GDILoObjType_LO_METAFILE16_TYPE =3D 0x260000, + GDILoObjType_LO_METAFILE_TYPE =3D 0x460000, + GDILoObjType_LO_METADC16_TYPE =3D 0x660000 +} GDILOOBJTYPE, *PGDILOOBJTYPE; = #define GdiWorldSpaceToPageSpace 0x203 = @@ -182,7 +201,7 @@ LONG lMinWidthD; } CHWIDTHINFO, *PCHWIDTHINFO; = -typedef struct _UNIVERSAL_FONT_ID = +typedef struct _UNIVERSAL_FONT_ID { DWORD dwUfid[2]; } UNIVERSAL_FONT_ID, *PUNIVERSAL_FONT_ID; @@ -394,7 +413,7 @@ ULONG ulForegroundClr; ULONG ulBackgroundClr; int x; - int y; = + int y; UINT Options; RECT Rect; DWORD iCS_CP; @@ -429,7 +448,7 @@ LONG right; LONG bottom; LONG left; - LONG top; = + LONG top; } GDIBSEXTSELCLPRGN, *PGDIBSEXTSELCLPRGN; // // Use with GdiBCSelObj, GdiBCDelObj and GdiBCDelRgn. @@ -445,36 +464,36 @@ typedef BOOL (NTAPI *PGD_ENABLEDRIVER)(ULONG, ULONG, PDRVENABLEDATA); typedef DHPDEV (NTAPI *PGD_ENABLEPDEV)(DEVMODEW *, LPWSTR, ULONG, HSURF *= , ULONG, ULONG *, ULONG, DEVINFO *, LPWSTR, LPWSTR, HANDLE); typedef VOID (NTAPI *PGD_COMPLETEPDEV)(DHPDEV, HDEV); -typedef VOID (NTAPI *PGD_DISABLEPDEV)(DHPDEV); = +typedef VOID (NTAPI *PGD_DISABLEPDEV)(DHPDEV); typedef HSURF (NTAPI *PGD_ENABLESURFACE)(DHPDEV); typedef VOID (NTAPI *PGD_DISABLESURFACE)(DHPDEV); typedef BOOL (NTAPI *PGD_ASSERTMODE)(DHPDEV, BOOL); typedef BOOL (NTAPI *PGD_OFFSET)(SURFOBJ*, LONG, LONG, FLONG); typedef BOOL (NTAPI *PGD_RESETPDEV)(DHPDEV, DHPDEV); typedef VOID (NTAPI *PGD_DISABLEDRIVER)(VOID); -typedef HBITMAP (NTAPI *PGD_CREATEDEVICEBITMAP)(DHPDEV, SIZEL, ULONG); = -typedef VOID (NTAPI *PGD_DELETEDEVICEBITMAP)(DHSURF); = +typedef HBITMAP (NTAPI *PGD_CREATEDEVICEBITMAP)(DHPDEV, SIZEL, ULONG); +typedef VOID (NTAPI *PGD_DELETEDEVICEBITMAP)(DHSURF); typedef BOOL (NTAPI *PGD_ALPHABLEND)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOB= J*, RECTL*, RECTL*, BLENDOBJ*); -typedef BOOL (NTAPI *PGD_REALIZEBRUSH)(BRUSHOBJ*, SURFOBJ*, SURFOBJ*, SURF= OBJ*, XLATEOBJ*, ULONG); = -typedef ULONG (NTAPI *PGD_DITHERCOLOR)(DHPDEV, ULONG, ULONG, PULONG); = -typedef BOOL (NTAPI *PGD_STROKEPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, XFORMOB= J*, BRUSHOBJ*, POINTL*, PLINEATTRS, MIX); = -typedef BOOL (NTAPI *PGD_FILLPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, BRUSHOBJ*= , POINTL*, MIX, ULONG); = -typedef BOOL (NTAPI *PGD_STROKEANDFILLPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, = XFORMOBJ*, BRUSHOBJ*, PLINEATTRS, BRUSHOBJ*, POINTL*, MIX, ULONG); = -typedef BOOL (NTAPI *PGD_PAINT)(SURFOBJ*, CLIPOBJ*, BRUSHOBJ*, POINTL*, MI= X); = -typedef BOOL (NTAPI *PGD_BITBLT)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, X= LATEOBJ*, RECTL*, POINTL*, POINTL*, BRUSHOBJ*, POINTL*, ROP4); = +typedef BOOL (NTAPI *PGD_REALIZEBRUSH)(BRUSHOBJ*, SURFOBJ*, SURFOBJ*, SURF= OBJ*, XLATEOBJ*, ULONG); +typedef ULONG (NTAPI *PGD_DITHERCOLOR)(DHPDEV, ULONG, ULONG, PULONG); +typedef BOOL (NTAPI *PGD_STROKEPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, XFORMOB= J*, BRUSHOBJ*, POINTL*, PLINEATTRS, MIX); +typedef BOOL (NTAPI *PGD_FILLPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, BRUSHOBJ*= , POINTL*, MIX, ULONG); +typedef BOOL (NTAPI *PGD_STROKEANDFILLPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, = XFORMOBJ*, BRUSHOBJ*, PLINEATTRS, BRUSHOBJ*, POINTL*, MIX, ULONG); +typedef BOOL (NTAPI *PGD_PAINT)(SURFOBJ*, CLIPOBJ*, BRUSHOBJ*, POINTL*, MI= X); +typedef BOOL (NTAPI *PGD_BITBLT)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, X= LATEOBJ*, RECTL*, POINTL*, POINTL*, BRUSHOBJ*, POINTL*, ROP4); typedef BOOL (NTAPI *PGD_TRANSPARENTBLT)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLA= TEOBJ*, RECTL*, RECTL*, ULONG, ULONG); -typedef BOOL (NTAPI *PGD_COPYBITS)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*= , RECTL*, POINTL*); = +typedef BOOL (NTAPI *PGD_COPYBITS)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*= , RECTL*, POINTL*); typedef BOOL (NTAPI *PGD_STRETCHBLT)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ= *, XLATEOBJ*, COLORADJUSTMENT*, POINTL*, RECTL*, RECTL*, POINTL*, ULONG); typedef BOOL (NTAPI *PGD_STRETCHBLTROP)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIP= OBJ*, XLATEOBJ*, COLORADJUSTMENT*, POINTL*, RECTL*, RECTL*, POINTL*, ULONG,= BRUSHOBJ*, DWORD); -typedef BOOL (NTAPI *PGD_SETPALETTE)(DHPDEV, PALOBJ*, ULONG, ULONG, ULONG)= ; = -typedef BOOL (NTAPI *PGD_TEXTOUT)(SURFOBJ*, STROBJ*, FONTOBJ*, CLIPOBJ*, R= ECTL*, RECTL*, BRUSHOBJ*, BRUSHOBJ*, POINTL*, MIX); = -typedef ULONG (NTAPI *PGD_ESCAPE)(SURFOBJ*, ULONG, ULONG, PVOID *, ULONG, = PVOID *); = -typedef ULONG (NTAPI *PGD_DRAWESCAPE)(SURFOBJ*, ULONG, CLIPOBJ*, RECTL*, U= LONG, PVOID *); = -typedef PIFIMETRICS (NTAPI *PGD_QUERYFONT)(DHPDEV, ULONG, ULONG, PULONG); = -typedef PVOID (NTAPI *PGD_QUERYFONTTREE)(DHPDEV, ULONG, ULONG, ULONG, PULO= NG); = -typedef LONG (NTAPI *PGD_QUERYFONTDATA)(DHPDEV, FONTOBJ*, ULONG, HGLYPH, G= LYPHDATA*, PVOID, ULONG); = -typedef ULONG (NTAPI *PGD_SETPOINTERSHAPE)(SURFOBJ*, SURFOBJ*, SURFOBJ*, X= LATEOBJ*, LONG, LONG, LONG, LONG, RECTL*, ULONG); = -typedef VOID (NTAPI *PGD_MOVEPOINTER)(SURFOBJ*, LONG, LONG, RECTL*); = +typedef BOOL (NTAPI *PGD_SETPALETTE)(DHPDEV, PALOBJ*, ULONG, ULONG, ULONG); +typedef BOOL (NTAPI *PGD_TEXTOUT)(SURFOBJ*, STROBJ*, FONTOBJ*, CLIPOBJ*, R= ECTL*, RECTL*, BRUSHOBJ*, BRUSHOBJ*, POINTL*, MIX); +typedef ULONG (NTAPI *PGD_ESCAPE)(SURFOBJ*, ULONG, ULONG, PVOID *, ULONG, = PVOID *); +typedef ULONG (NTAPI *PGD_DRAWESCAPE)(SURFOBJ*, ULONG, CLIPOBJ*, RECTL*, U= LONG, PVOID *); +typedef PIFIMETRICS (NTAPI *PGD_QUERYFONT)(DHPDEV, ULONG, ULONG, PULONG); +typedef PVOID (NTAPI *PGD_QUERYFONTTREE)(DHPDEV, ULONG, ULONG, ULONG, PULO= NG); +typedef LONG (NTAPI *PGD_QUERYFONTDATA)(DHPDEV, FONTOBJ*, ULONG, HGLYPH, G= LYPHDATA*, PVOID, ULONG); +typedef ULONG (NTAPI *PGD_SETPOINTERSHAPE)(SURFOBJ*, SURFOBJ*, SURFOBJ*, X= LATEOBJ*, LONG, LONG, LONG, LONG, RECTL*, ULONG); +typedef VOID (NTAPI *PGD_MOVEPOINTER)(SURFOBJ*, LONG, LONG, RECTL*); typedef BOOL (NTAPI *PGD_LINETO)(SURFOBJ*, CLIPOBJ*, BRUSHOBJ*, LONG, LONG= , LONG, LONG, RECTL*, MIX); typedef BOOL (NTAPI *PGD_SENDPAGE)(SURFOBJ*); typedef BOOL (NTAPI *PGD_STARTPAGE)(SURFOBJ*); @@ -535,9 +554,9 @@ PGD_COPYBITS CopyBits; PGD_STRETCHBLT StretchBlt; PVOID Unknown1; - PGD_SETPALETTE SetPalette; = + PGD_SETPALETTE SetPalette; PGD_TEXTOUT TextOut; - PGD_ESCAPE Escape; = + PGD_ESCAPE Escape; PGD_DRAWESCAPE DrawEscape; PGD_QUERYFONT QueryFont; PGD_QUERYFONTTREE QueryFontTree; @@ -600,7 +619,7 @@ PVOID Reserved6; PVOID Reserved7; PVOID Reserved8; - PFN_DrvDeriveSurface DeriveSurface; = + PFN_DrvDeriveSurface DeriveSurface; PFN_DrvQueryGlyphAttrs QueryGlyphAttrs; PFN_DrvNotify Notify; PGD_SYNCHRONIZESURFACE SynchronizeSurface;

1 0

[hpoussin] 32719: Fix indentation
by hpoussin＠svn.reactos.org 18 Mar '08

18 Mar '08

Author: hpoussin Date: Tue Mar 18 07:28:33 2008 New Revision: 32719 URL: http://svn.reactos.org/svn/reactos?rev=3D32719&view=3Drev Log: Fix indentation Modified: trunk/reactos/drivers/input/i8042prt/pnp.c Modified: trunk/reactos/drivers/input/i8042prt/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042pr= t/pnp.c?rev=3D32719&r1=3D32718&r2=3D32719&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/input/i8042prt/pnp.c (original) +++ trunk/reactos/drivers/input/i8042prt/pnp.c Tue Mar 18 07:28:33 2008 @@ -338,8 +338,8 @@ static NTSTATUS EnableInterrupts( IN PPORT_DEVICE_EXTENSION DeviceExtension, - IN UCHAR FlagsToDisable, - IN UCHAR FlagsToEnable) + IN UCHAR FlagsToDisable, + IN UCHAR FlagsToEnable) { i8042Flush(DeviceExtension); = @@ -367,8 +367,8 @@ IN PPORT_DEVICE_EXTENSION DeviceExtension) { NTSTATUS Status; - UCHAR FlagsToDisable =3D 0; - UCHAR FlagsToEnable =3D 0; + UCHAR FlagsToDisable =3D 0; + UCHAR FlagsToEnable =3D 0; = if (DeviceExtension->DataPort =3D=3D 0) { @@ -399,8 +399,6 @@ } = /* Connect interrupts */ - Status =3D STATUS_SUCCESS; - if (DeviceExtension->Flags & KEYBOARD_PRESENT && DeviceExtension->Flags & KEYBOARD_CONNECTED && DeviceExtension->Flags & KEYBOARD_STARTED && @@ -411,8 +409,8 @@ if (NT_SUCCESS(Status)) { DeviceExtension->Flags |=3D KEYBOARD_INITIALIZED; - FlagsToDisable |=3D CCB_KBD_DISAB; - FlagsToEnable |=3D CCB_KBD_INT_ENAB; + FlagsToDisable |=3D CCB_KBD_DISAB; + FlagsToEnable |=3D CCB_KBD_INT_ENAB; } } = @@ -426,13 +424,15 @@ if (NT_SUCCESS(Status)) { DeviceExtension->Flags |=3D MOUSE_INITIALIZED; - FlagsToDisable |=3D CCB_MOUSE_DISAB; - FlagsToEnable |=3D CCB_MOUSE_INT_ENAB; - } - } - - if(FlagsToEnable) - Status =3D EnableInterrupts(DeviceExtension, FlagsToDisable, Flags= ToEnable); + FlagsToDisable |=3D CCB_MOUSE_DISAB; + FlagsToEnable |=3D CCB_MOUSE_INT_ENAB; + } + } + + if (FlagsToEnable) + Status =3D EnableInterrupts(DeviceExtension, FlagsToDisable, FlagsToEnab= le); + else + Status =3D STATUS_SUCCESS; = return Status; }

1 0

[cfinck] 32718: - Simplify the code for connecting the interrupts. Don't use three code pathes (keyboard; mouse; keyboard & mouse) anymore and don't check again in EnableInterrupts(), which devices are present. Instead prepare the flags for i8042ChangeMode() already in StartProcedure() and pass them later. - Constify the result of CTRL_SELF_TEST (0x55) as KBD_SELF_TEST_OK. - Add a bug number as a reference for the system flag setting.
by cfinck＠svn.reactos.org 18 Mar '08

18 Mar '08

Author: cfinck Date: Tue Mar 18 07:00:29 2008 New Revision: 32718 URL: http://svn.reactos.org/svn/reactos?rev=3D32718&view=3Drev Log: - Simplify the code for connecting the interrupts. Don't use three code pathes (keyboard; mouse; keyboard & mouse) anymore a= nd don't check again in EnableInterrupts(), which devices are present. Instead prepare the flags for i8042ChangeMode() already in StartProcedure= () and pass them later. - Constify the result of CTRL_SELF_TEST (0x55) as KBD_SELF_TEST_OK. - Add a bug number as a reference for the system flag setting. Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.h trunk/reactos/drivers/input/i8042prt/pnp.c Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042pr= t/i8042prt.h?rev=3D32718&r1=3D32717&r2=3D32718&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/input/i8042prt/i8042prt.h (original) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.h Tue Mar 18 07:00:29 2008 @@ -240,6 +240,7 @@ * Keyboard responses * --------------------------------------------------*/ = +#define KBD_SELF_TEST_OK 0x55 #define KBD_ACK 0xFA #define KBD_NACK 0xFC #define KBD_RESEND 0xFE Modified: trunk/reactos/drivers/input/i8042prt/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042pr= t/pnp.c?rev=3D32718&r1=3D32717&r2=3D32718&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/input/i8042prt/pnp.c (original) +++ trunk/reactos/drivers/input/i8042prt/pnp.c Tue Mar 18 07:00:29 2008 @@ -106,7 +106,7 @@ KeStallExecutionProcessor(50); continue; } - else if (Value !=3D 0x55) + else if (Value !=3D KBD_SELF_TEST_OK) { WARN_(I8042PRT, "Got 0x%02x instead of 0x55\n", Value); return STATUS_IO_DEVICE_ERROR; @@ -156,7 +156,7 @@ WARN_(I8042PRT, "Warning: can't write SET_LEDS (0x%08lx)\n", Status); } = - /* Turn on translation and SF (Some machines don't reboot if SF is not se= t) */ + /* Turn on translation and SF (Some machines don't reboot if SF is not se= t, see ReactOS bug #1842) */ if (!i8042ChangeMode(DeviceExtension, 0, CCB_TRANSLATE | CCB_SYSTEM_FLAG)) return FALSE; = @@ -337,24 +337,12 @@ = static NTSTATUS EnableInterrupts( - IN PPORT_DEVICE_EXTENSION DeviceExtension) -{ - UCHAR FlagsToDisable =3D 0; - UCHAR FlagsToEnable =3D 0; - + IN PPORT_DEVICE_EXTENSION DeviceExtension, + IN UCHAR FlagsToDisable, + IN UCHAR FlagsToEnable) +{ i8042Flush(DeviceExtension); = - /* Select the devices we have */ - if (DeviceExtension->Flags & KEYBOARD_PRESENT) - { - FlagsToDisable |=3D CCB_KBD_DISAB; - FlagsToEnable |=3D CCB_KBD_INT_ENAB; - } - if (DeviceExtension->Flags & MOUSE_PRESENT) - { - FlagsToDisable |=3D CCB_MOUSE_DISAB; - FlagsToEnable |=3D CCB_MOUSE_INT_ENAB; - } if (!i8042ChangeMode(DeviceExtension, FlagsToDisable, FlagsToEnable)) return STATUS_UNSUCCESSFUL; = @@ -379,6 +367,8 @@ IN PPORT_DEVICE_EXTENSION DeviceExtension) { NTSTATUS Status; + UCHAR FlagsToDisable =3D 0; + UCHAR FlagsToEnable =3D 0; = if (DeviceExtension->DataPort =3D=3D 0) { @@ -409,58 +399,40 @@ } = /* Connect interrupts */ + Status =3D STATUS_SUCCESS; + if (DeviceExtension->Flags & KEYBOARD_PRESENT && DeviceExtension->Flags & KEYBOARD_CONNECTED && DeviceExtension->Flags & KEYBOARD_STARTED && - !(DeviceExtension->Flags & (MOUSE_PRESENT | KEYBOARD_INITIALIZED))) - { - /* No mouse, and the keyboard is ready */ + !(DeviceExtension->Flags & KEYBOARD_INITIALIZED)) + { + /* Keyboard is ready to be initialized */ Status =3D i8042ConnectKeyboardInterrupt(DeviceExtension->KeyboardExtens= ion); if (NT_SUCCESS(Status)) { DeviceExtension->Flags |=3D KEYBOARD_INITIALIZED; - Status =3D EnableInterrupts(DeviceExtension); - } - } - else if (DeviceExtension->Flags & MOUSE_PRESENT && - DeviceExtension->Flags & MOUSE_CONNECTED && - DeviceExtension->Flags & MOUSE_STARTED && - !(DeviceExtension->Flags & (KEYBOARD_PRESENT | MOUSE_INITIALIZED= ))) - { - /* No keyboard, and the mouse is ready */ + FlagsToDisable |=3D CCB_KBD_DISAB; + FlagsToEnable |=3D CCB_KBD_INT_ENAB; + } + } + + if (DeviceExtension->Flags & MOUSE_PRESENT && + DeviceExtension->Flags & MOUSE_CONNECTED && + DeviceExtension->Flags & MOUSE_STARTED && + !(DeviceExtension->Flags & MOUSE_INITIALIZED)) + { + /* Mouse is ready to be initialized */ Status =3D i8042ConnectMouseInterrupt(DeviceExtension->MouseExtension); if (NT_SUCCESS(Status)) { DeviceExtension->Flags |=3D MOUSE_INITIALIZED; - Status =3D EnableInterrupts(DeviceExtension); - } - } - else if (DeviceExtension->Flags & KEYBOARD_PRESENT && - DeviceExtension->Flags & KEYBOARD_CONNECTED && - DeviceExtension->Flags & KEYBOARD_STARTED && - DeviceExtension->Flags & MOUSE_PRESENT && - DeviceExtension->Flags & MOUSE_CONNECTED && - DeviceExtension->Flags & MOUSE_STARTED && - !(DeviceExtension->Flags & (KEYBOARD_INITIALIZED | MOUSE_INITIAL= IZED))) - { - /* The keyboard and mouse are ready */ - Status =3D i8042ConnectKeyboardInterrupt(DeviceExtension->KeyboardExtens= ion); - if (NT_SUCCESS(Status)) - { - DeviceExtension->Flags |=3D KEYBOARD_INITIALIZED; - Status =3D i8042ConnectMouseInterrupt(DeviceExtension->MouseExtension); - if (NT_SUCCESS(Status)) - { - DeviceExtension->Flags |=3D MOUSE_INITIALIZED; - Status =3D EnableInterrupts(DeviceExtension); - } - } - } - else - { - /* Nothing to do */ - Status =3D STATUS_SUCCESS; - } + FlagsToDisable |=3D CCB_MOUSE_DISAB; + FlagsToEnable |=3D CCB_MOUSE_INT_ENAB; + } + } + + if(FlagsToEnable) + Status =3D EnableInterrupts(DeviceExtension, FlagsToDisable, Flags= ToEnable); = return Status; }

1 0

[dreimer] 32717: Bug 3136: Italian translation update by Paolo Devoti (devotip@tiscali.it)
by dreimer＠svn.reactos.org 18 Mar '08

18 Mar '08

Author: dreimer Date: Tue Mar 18 06:47:03 2008 New Revision: 32717 URL: http://svn.reactos.org/svn/reactos?rev=3D32717&view=3Drev Log: Bug 3136: Italian translation update by Paolo Devoti (devotip(a)tiscali.it) Added: trunk/reactos/dll/cpl/input/lang/it-IT.rc (with props) Modified: trunk/reactos/dll/cpl/input/rsrc.rc Added: trunk/reactos/dll/cpl/input/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/it= -IT.rc?rev=3D32717&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/cpl/input/lang/it-IT.rc (added) +++ trunk/reactos/dll/cpl/input/lang/it-IT.rc Tue Mar 18 06:47:03 2008 @@ -1,0 +1,224 @@ +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +IDD_PROPPAGESETTINGS DIALOGEX 0, 0, 254, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Impostazioni" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Scegliere i servizi desiderati per ognuna delle lingue nella li= sta.\nUsare Aggiungi e Rimuovi per modificare la lista.", -1, 9, 6, 238, 17 + CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VS= CROLL | WS_TABSTOP | LVS_SORTASCENDING | LVS_REPORT | 0x0000808D, 8, 28, 23= 7, 109 + PUSHBUTTON "&Predefinito", IDC_SET_DEFAULT, 101, 159, 144, 14 + PUSHBUTTON "&Aggiungi...", IDC_ADD_BUTTON, 27, 142, 70, 14 + PUSHBUTTON "&Remuovi...", IDC_REMOVE_BUTTON, 101, 142, 70, 14 + PUSHBUTTON "&Propriet=C3=A0...", IDC_PROP_BUTTON, 175, 142, 70, 14 + GROUPBOX "Preferenze", -1, 7, 185, 240, 36 + PUSHBUTTON "&Impostazioni tasti...", IDC_KEY_SET_BTN, 14, 198, 110, 14 +END + +IDD_KEYSETTINGS DIALOGEX 0, 0, 272, 163 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_PO= PUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Impostazioni avanzate" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Per disattivare Blocco Maiuscole", -1, 7, 7, 258, 26 + AUTORADIOBUTTON "Premere il tasto BlocMaiu", IDC_PRESS_CL_KEY_RB, 14, 17,= 120, 11, WS_GROUP + AUTORADIOBUTTON "Premere il tasto SHI&FT ", IDC_PRESS_SHIFT_KEY_RB, 144, = 17, 120, 11, NOT WS_TABSTOP + GROUPBOX "Hot keys for input languages", -1, 7, 37, 258, 95 + LTEXT "Action", -1, 14, 47, 60, 9 + RTEXT "&Key sequence", -1, 177, 47, 79, 9 + LISTBOX IDC_KEY_LISTBOX, 14, 57, 244, 52, LBS_OWNERDRAWFIXED | LBS_HASSTR= INGS | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Change Key Sequence...", IDC_CHANGE_KEY_SEQ_BTN, 152, 113, 1= 06, 14, WS_GROUP + DEFPUSHBUTTON "OK", IDOK, 66, 140, 70, 14 + PUSHBUTTON "Cancel", IDCANCEL, 146, 140, 70, 14 +END + +IDD_ADD DIALOGEX 20, 20, 227, 90 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_PO= PUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Aggiunta lingua" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Lingua:", -1, 7, 7, 61, 10 + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 110, CBS_DROPDOWNLIST | CBS_SO= RT | WS_VSCROLL + LTEXT "&Disposizione/IME tastiera:", -1, 7, 36, 110, 10 + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 110, CBS_DROPDOWNLIST | CBS_S= ORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 + PUSHBUTTON "Annulla", IDCANCEL, 169, 68, 50, 14 +END + +IDD_CHANGE_KEY_SEQ DIALOGEX 5, 100, 194, 89 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_PO= PUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Modifica sequenza tasti" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", 1240, 4, 5, 186, 10 + GROUPBOX "", -1, 7, 16, 179, 48 + AUTOCHECKBOX "&Commutazione tra disposizioni di tastiera", IDC_USE_SK,= 12, 17, 135, 8 + CTEXT "SHIFT", -1, 68, 37, 27, 12 + CTEXT "+", -1, 57, 37, 8, 9 + AUTORADIOBUTTON "&CTRL", -1, 24, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "A&LT sinistro", -1, 24, 45, 50, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 83, 70, 50, 14 + PUSHBUTTON "Annulla", IDCANCEL, 136, 70, 50, 14 +END + +IDD_INPUT_LANG_PROP DIALOGEX 20, 20, 227, 75 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_PO= PUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Propriet=C3=A0 della lingua" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Lingua:", -1, 7, 7, 61, 8 + LTEXT "", -1, 73, 7, 129, 8 + LTEXT "&Disposizione/IME tastiera:", -1, 7, 21, 110, 10 + COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 60, CBS_DROPDOWNLIST | CBS_= SORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14 + PUSHBUTTON "Annulla", IDCANCEL, 169, 53, 52, 14 +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Servizi per il testo e lingua di digitazione" + IDS_CPLSYSTEMDESCRIPTION "Personalizza le impostazioni per la lingua." + IDS_KEYBOARD "Tastiera" + IDS_NONE "(Nessuno)" + IDS_UNKNOWN "(Sconosciuto)" + IDS_RESTART "Volete riavviare il computer adesso?" + IDS_WHATS_THIS "Cosa =C3=A8 questo?" + IDS_LANGUAGE "Lingua" + IDS_LAYOUT "Disposizione tastiera" +END + +STRINGTABLE +BEGIN + IDS_US_LAYOUT, "US" + IDS_BELGIAN_LAYOUT, "Belgian (Period)" + IDS_BELGIAN_FRENCH_LAYOUT, "Belgian French" + IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT, "Portuguese (Brazilian AB= NT)" + IDS_CANADIAN_FRENCH_LAYOUT, "Canadian French" + IDS_CANADIAN_FRENCH_LEGACY_LAYOUT, "Canadian French (Legacy)" + IDS_DANISH_LAYOUT, "Danish" + IDS_DUTCH_LAYOUT, "Dutch" + IDS_FINNISH_LAYOUT, "Finnish" + IDS_FRENCH_LAYOUT, "French" + IDS_GERMAN_LAYOUT, "German" + IDS_GERMAN_IBM_LAYOUT, "German (IBM)" + IDS_ICELANDIC_LAYOUT, "Icelandic" + IDS_IRISH_LAYOUT, "Irish" + IDS_ITALIAN_LAYOUT, "Italian" + IDS_ITALIAN_142_LAYOUT, "Italian (142)" + IDS_LATIN_AMERICAN_LAYOUT, "Latin American" + IDS_NORWEGIAN_LAYOUT, "Norwegian" + IDS_PORTUGUESE_LAYOUT, "Portuguese" + IDS_SPANISH_LAYOUT, "Spanish" + IDS_SPANISH_VARIANTION_LAYOUT, "Spanish Variation" + IDS_SWEDISH_LAYOUT, "Swedish" + IDS_SWISS_FRENCH_LAYOUT, "Swiss French" + IDS_SWISS_GERMAN_LAYOUT, "Swiss German" + IDS_UNITED_KINGDOM_LAYOUT, "United Kingdom" + IDS_UNITED_STATES_INTERNATIONAL_LAYOUT, "United States-Internatio= nal" + IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT, "United States-Dvorak for= left hand" + IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT, "United States-Dvorak for= right hand" + IDS_ALBANIAN_LAYOUT, "Albanian" + IDS_CROATIAN_LAYOUT, "Croatian" + IDS_CZECH_LAYOUT, "Czech" + IDS_CZECH_QWERTY_LAYOUT, "Czech (QWERTY)" + IDS_HUNGARIAN_LAYOUT, "Hungarian" + IDS_HUNGARIAN_101_KEY_LAYOUT, "Hungarian 101-key" + IDS_POLISH_LAYOUT, "Polish (Programmers)" + IDS_POLISH_214_LAYOUT, "Polish (214)" + IDS_ROMANIAN_LAYOUT, "Romanian" + IDS_SERBIAN_LATIN_LAYOUT, "Serbian (Latin)" + IDS_SLOVAK_LAYOUT, "Slovak" + IDS_SLOVAK_QWERTY_LAYOUT, "Slovak (QWERTY)" + IDS_SLOVENIAN_LAYOUT, "Slovenian" + IDS_ESTONIAN_LAYOUT, "Estonian" + IDS_LATVIAN_LAYOUT, "Latvian" + IDS_LATVIAN_QWERTY_LAYOUT, "Latvian (QWERTY)" + IDS_LITHUANIAN_IBM_LAYOUT, "Lithuanian IBM" + IDS_GREEK_LAYOUT, "Greek" + IDS_GREEK_LATIN_LAYOUT, "Greek Latin" + IDS_GREEK_220_LAYOUT, "Greek (220)" + IDS_GREEK_319_LAYOUT, "Greek (319)" + IDS_GREEK_220_LATIN_LAYOUT, "Greek (220) Latin" + IDS_GREEK_319_LATIN_LAYOUT, "Greek (319) Latin" + IDS_BELARUSIAN_LAYOUT, "Belarusian" + IDS_BULGARIAN_LAYOUT, "Bulgarian" + IDS_BULGARIAN_LATIN_LAYOUT, "Bulgarian (Latin)" + IDS_RUSSIAN_LAYOUT, "Russian" + IDS_RUSSIAN_TYPEWRITER_LAYOUT, "Russian (Typewriter)" + IDS_SERBIAN_CYRILLIC_LAYOUT, "Serbian (Cyrillic)" + IDS_UKRAINIAN_LAYOUT, "Ukrainian" + IDS_TURKISH_F_LAYOUT, "Turkish F" + IDS_TURKISH_Q_LAYOUT, "Turkish Q" + IDS_JAPANESE_LAYOUT, "Japanese" + IDS_JAPANESE_INPUT_SYSTEM_MSIME2002_LAYOUT, "Japanese Input System (M= S-IME2002)" + IDS_KOREAN_LAYOUT, "Korean" + IDS_KOREAN_INPUT_SYSTEM_MSIME2002_LAYOUT, "Korean Input System (MS-= IME2002)" + IDS_CHINESE_TRADITIONAL_USKEYBOARD_LAYOUT, "Chinese (Traditional) - = US Keyboard" + IDS_CHINESE_TRADITIONAL_PHONETIC_LAYOUT, "Chinese (Traditional) - = Phonetic" + IDS_CHINESE_TRADITIONAL_CHANGJIE_LAYOUT, "Chinese (Traditional) - = ChangJie" + IDS_CHINESE_TRADITIONAL_BIG5CODE_LAYOUT, "Chinese (Traditional) - = Big5 Code" + IDS_CHINESE_TRADITIONAL_DAYI_LAYOUT, "Chinese (Traditional) - = DaYi" + IDS_CHINESE_TRADITIONAL_UNICODE_LAYOUT, "Chinese (Traditional) - = Unicode" + IDS_CHINESE_TRADITIONAL_ALPHANUMERIC_LAYOUT, "Chinese (Traditional) - = Alphanumeric" + IDS_CHINESE_SIMPLIFIED_USKEYBOARD_LAYOUT, "Chinese (Simplified) - U= S Keyboard" + IDS_CHINESE_SIMPLIFIED_QUANPIN_LAYOUT, "Chinese (Simplified) - Q= uanPin" + IDS_CHINESE_SIMPLIFIED_SHUANGPIN_LAYOUT, "Chinese (Simplified) - S= huangPin" + IDS_CHINESE_SIMPLIFIED_ZHENGMA_LAYOUT, "Chinese (Simplified) - Z= hengMa" + IDS_CHINESE_SIMPLIFIED_NEIMA_LAYOUT, "Chinese (Simplified) - N= eiMa" + IDS_THAI_KEDMANEE_LAYOUT, "Thai Kedmanee" + IDS_THAI_PATTACHOTE_LAYOUT, "Thai Pattachote" + IDS_THAI_KEDMANEE_NONSHIFTLOCK_LAYOUT, "Thai Kedmanee (non-Shift= Lock)" + IDS_THAI_PATTACHOTE_NONSHIFTLOCK_LAYOUT, "Thai Pattachote (non-Shi= ftLock)" + IDS_HEBREW_LAYOUT, "Hebrew" + IDS_ARABIC_101_LAYOUT, "Arabic (101)" + IDS_ARABIC_102_LAYOUT, "Arabic (102)" + IDS_ARABIC_102_AZERTY_LAYOUT, "Arabic (102) AZERTY" + IDS_CZECH_PROGRAMMERS_LAYOUT, "Czech Programmers" + IDS_LITHUANIAN_LAYOUT, "Lithuanian" + IDS_BELGIAN_COMMA_LAYOUT, "Belgian (Comma)" + IDS_CHINESE_TRADITIONAL_NEWPHONETIC_LAYOUT, "Chinese (Traditional) - = New Phonetic" + IDS_CHINESE_SIMPLIFIED_MSPINYINIME30_LAYOUT, "Chinese (Simplified) - M= icrosoft Pinyin IME 3.0" + IDS_UNITED_STATES_DVIRAK_LAYOUT, "United States-Dvorak" + IDS_CHINESE_TRADITIONAL_NEWCHANGJIE_LAYOUT, "Chinese (Traditional) - = New ChangJie" + IDS_ASSAMESE_LAYOUT, "Assamese" + IDS_BENGALI_LAYOUT, "Bengali" + IDS_DEVANAGARI_INSCRIPT_LAYOUT, "Devanagari - INSCRIPT" + IDS_GUJARATI_LAYOUT, "Gujarati" + IDS_KANNADA_LAYOUT, "Kannada" + IDS_MALAYALAM_LAYOUT, "Malayalam" + IDS_ORIYA_LAYOUT, "Oriya" + IDS_PUNJABI_LAYOUT, "Punjabi" + IDS_TAMIL_LAYOUT, "Tamil" + IDS_TELUGU_LAYOUT, "Telugu" + IDS_MARATHI_LAYOUT, "Marathi" + IDS_HINDI_TRADITIONAL_LAYOUT, "Hindi Traditional" + IDS_CANTONESE_PHONETIC_LAYOUT, "Cantonese Phonetic" + IDS_FAEROESE_LAYOUT, "Faeroese" + IDS_FYRO_MACEDONIAN_LAYOUT, "FYRO Macedonian" + IDS_CANADIAN_MULTILINGUAL_STD_LAYOUT, "Canadian Multilingual St= andard" + IDS_CHINESE_TRADITIONAL_QUICK_LAYOUT, "Chinese (Traditional) - = Quick" + IDS_CHINESE_TRADITIONAL_ARRAY_LAYOUT, "Chinese (Traditional) - = Array" + IDS_KAZAKH_LAYOUT, "Kazakh" + IDS_UZBEK_CYRILLIC_LAYOUT, "Uzbek Cyrillic" + IDS_AZERI_CYRILLIC_LAYOUT, "Azeri Cyrillic" + IDS_TATAR_LAYOUT, "Tatar" + IDS_AZERI_LATIN_LAYOUT, "Azeri Latin" + IDS_VIETNAMESE_LAYOUT, "Vietnamese" + IDS_GEORGIAN_LAYOUT, "Georgian" + IDS_ARMENIAN_EASTERN_LAYOUT, "Armenian Eastern" + IDS_ARMENIAN_WESTERN_LAYOUT, "Armenian Western" + IDS_GREEK_POLYTONIC_LAYOUT, "Greek Polytonic" + IDS_USENG_TABLE_IBM_ARABIC238L_LAYOUT, "US English Table for IBM= Arabic 238_L" + IDS_FARSI_LAYOUT, "Farsi" + IDS_GAELIC_LAYOUT, "Gaelic" + IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT, "Portuguese (Brazilian AB= NT2)" + IDS_MONGOLIAN_CYRILLIC_LAYOUT, "Mongolian Cyrillic" + IDS_KYRGYZ_CYRILLIC_LAYOUT, "Kyrgyz Cyrillic" + IDS_URDU_LAYOUT, "Urdu" + IDS_SYRIAC_LAYOUT, "Syriac" + IDS_SYRIAC_PHONETIC_LAYOUT, "Syriac Phonetic" + IDS_DIVEHI_PHONETIC_LAYOUT, "Divehi Phonetic" + IDS_DIVEHI_TYPEWRITER_LAYOUT, "Divehi Typewriter" + IDS_BULGARIAN_PHONETIC_CLASSIC_LAYOUT, "Bulgarian Phonetic (Clas= sic)" + IDS_BULGARIAN_PHONETIC_BDS_LAYOUT, "Bulgarian Phonetic (BDS)" +END Propchange: trunk/reactos/dll/cpl/input/lang/it-IT.rc ---------------------------------------------------------------------------= --- svn:eol-style =3D native Modified: trunk/reactos/dll/cpl/input/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/rsrc.rc= ?rev=3D32717&r1=3D32716&r2=3D32717&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/cpl/input/rsrc.rc (original) +++ trunk/reactos/dll/cpl/input/rsrc.rc Tue Mar 18 06:47:03 2008 @@ -6,6 +6,7 @@ #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/fr-FR.rc" +#include "lang/it-IT.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc"

1 0

[dreimer] 32716: Bug 3136: Italian translation update by Paolo Devoti (devotip@tiscali.it)
by dreimer＠svn.reactos.org 18 Mar '08

18 Mar '08

Author: dreimer Date: Tue Mar 18 06:46:03 2008 New Revision: 32716 URL: http://svn.reactos.org/svn/reactos?rev=3D32716&view=3Drev Log: Bug 3136: Italian translation update by Paolo Devoti (devotip(a)tiscali.it) Added: trunk/rosapps/devutils/vgafontedit/lang/it-IT.rc (with props) Modified: trunk/rosapps/devutils/vgafontedit/main.rc trunk/rosapps/downloader/lang/it-IT.rc Added: trunk/rosapps/devutils/vgafontedit/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/= lang/it-IT.rc?rev=3D32716&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/rosapps/devutils/vgafontedit/lang/it-IT.rc (added) +++ trunk/rosapps/devutils/vgafontedit/lang/it-IT.rc Tue Mar 18 06:46:03 20= 08 @@ -1,0 +1,94 @@ +/* + * PROJECT: ReactOS VGA Font Editor + * LICENSE: GNU General Public License Version 2.0 or any later version + * FILE: devutils/vgafontedit/lang/en-US.rc + * PURPOSE: English resource file + * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> + * TRANSLATOR: Paolo Devoti = + */ + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +IDD_ABOUT DIALOGEX 10, 10, 130, 62 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Informazioni su" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_MAIN, IDC_STATIC, 10, 10, 20, 20 + LTEXT "ReactOS VGA Font Editor", IDC_STATIC, 37, 10, 93, 10 + LTEXT "Copyright 2008 Colin Finck", IDC_STATIC, 37, 20, 93, 10 + DEFPUSHBUTTON "OK", IDCANCEL, 40, 44, 55, 15 +END + +IDD_EDITGLYPH DIALOGEX 32768, 32768, 246, 197 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Edit Glyph" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_EDIT_GLYPH_TOOLBOX, TOOLBARCLASSNAMEA, CCS_NO= DIVIDER | CCS_NORESIZE, 5, 5, 24, 82 + CONTROL "", IDC_EDIT_GLYPH_EDIT, EDIT_GLYPH_EDIT_CLASSW, 0, 39,= 5, 160, 160 + CONTROL "", IDC_EDIT_GLYPH_PREVIEW, EDIT_GLYPH_PREVIEW_CLASSW, 0, 209= , 5, 32, 32 + + DEFPUSHBUTTON "OK", IDOK, 48, 177, 70, 14 + PUSHBUTTON "Annulla", IDCANCEL, 125, 177, 70, 14 +END + +IDM_MAINMENU MENU +BEGIN + POPUP "&File" + BEGIN + MENUITEM "&Nuovo\tCtrl+N", ID_FILE_NEW + MENUITEM "&Apri...\tCtrl+O", ID_FILE_OPEN + MENUITEM "Chiudi", ID_FILE_CLOSE + MENUITEM SEPARATOR + MENUITEM "Salva\tCtrl+S", ID_FILE_SAVE + MENUITEM "Salva come...", ID_FILE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Esci\tAlt+F4", ID_FILE_EXIT + END + + POPUP "&Modifica" + BEGIN + MENUITEM "Copia\tCtrl+C", ID_EDIT_COPY + MENUITEM "Incolla\tCtrl+V", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "Edit Glyph...", ID_EDIT_GLYPH + END + + POPUP "&Finestre" + BEGIN + MENUITEM "&Sovrapponi", ID_WINDOW_CASCADE + MENUITEM "Affianca &Orizzontalmente", ID_WINDOW_TILE_HORZ + MENUITEM "Affianca &Verticalmente", ID_WINDOW_TILE_VERT + MENUITEM "&Disponi Icone", ID_WINDOW_ARRANGE + MENUITEM SEPARATOR + MENUITEM "Succ&essiva\tCtrl+F6", ID_WINDOW_NEXT + END + + POPUP "&Aiuto" + BEGIN + MENUITEM "&Informazioni su...", ID_HELP_ABOUT + END +END + +STRINGTABLE +BEGIN + IDS_OPENFILTER, "Tutti i formati supportati (*.bin,*.psf)|*.bin;*.psf|= Font binari (*.bin)|*.bin|Font per schermo PC Versione 1 (*.psf)|*.psf|" + IDS_SAVEFILTER, "Font binari (*.bin)|*.bin|" + IDS_OPENERROR, "Errore durante l'apertura del file! (Errore numero %1!= u!)" + IDS_READERROR, "Errore durante la lettura del file! (Errore numero %1!= u!)" + IDS_WRITEERROR, "Errore durante la scrittura del file! (Errore numero = %1!u!)" + IDS_UNSUPPORTEDFORMAT, "Formato non supportato!" + IDS_UNSUPPORTEDPSF, "Formato font PSF non supportato! L'editor support= a esclusivamente i font 8x8 senza modi speciali." + IDS_DOCNAME, "Font %1!u!" + IDS_SAVEPROMPT, "Il file ""%1"" =C3=A8 stato modificato, ma non salvat= o.\n\nVolete salvarlo ora?" + IDS_APPTITLE, "ReactOS VGA Font Editor" + IDS_CLOSEEDIT, "Prima chiudere tutte le finestre di Edit!" + + IDS_TOOLTIP_NEW, "Nuovo" + IDS_TOOLTIP_OPEN, "Apri" + IDS_TOOLTIP_SAVE, "Salva" + IDS_TOOLTIP_EDIT_GLYPH, "Edit Glyph" + IDS_TOOLTIP_COPY, "Copia" + IDS_TOOLTIP_PASTE, "Incolla" +END Propchange: trunk/rosapps/devutils/vgafontedit/lang/it-IT.rc ---------------------------------------------------------------------------= --- svn:eol-style =3D native Modified: trunk/rosapps/devutils/vgafontedit/main.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/= main.rc?rev=3D32716&r1=3D32715&r2=3D32716&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/rosapps/devutils/vgafontedit/main.rc (original) +++ trunk/rosapps/devutils/vgafontedit/main.rc Tue Mar 18 06:46:03 2008 @@ -38,3 +38,4 @@ #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" +#include "lang/it-IT.rc" Modified: trunk/rosapps/downloader/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/it-IT= .rc?rev=3D32716&r1=3D32715&r2=3D32716&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/rosapps/downloader/lang/it-IT.rc (original) +++ trunk/rosapps/downloader/lang/it-IT.rc Tue Mar 18 06:46:03 2008 @@ -2,36 +2,36 @@ = IDD_DOWNLOAD DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SY= SMENU | WS_VISIBLE -CAPTION "Download..." +CAPTION "Scarica..." FONT 8, "MS Shell Dlg" BEGIN CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMO= OTH,10,10,200,12 LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Cancel", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Annulla", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP END = IDD_PROF DIALOGEX 6, 6, 267, 110 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SY= SMENU | WS_VISIBLE -CAPTION "Proferences" +CAPTION "Preferenze" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Download folder:", -1, 6, 10, 140, 8 + LTEXT "Cartella dove scaricare:", -1, 6, 10, 140, 8 EDITTEXT IDC_DOWNLOAD_FOLDER_EDIT, 6, 20, 205, 14, WS_VISIBLE | WS_TAB= STOP - PUSHBUTTON "C&hoose...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14 - AUTOCHECKBOX "&Delete installation files after setup", IDC_DELINST_FIL= ES_CHECKBOX, 8, 40, 210, 10, WS_GROUP - LTEXT "Update server:", -1, 6, 55, 140, 8 + PUSHBUTTON "&Scegliere...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14 + AUTOCHECKBOX "&Cancellare i file di installazione dopo il setup", IDC_= DELINST_FILES_CHECKBOX, 8, 40, 210, 10, WS_GROUP + LTEXT "Server per gli aggiornamenti:", -1, 6, 55, 140, 8 EDITTEXT IDC_UPDATE_SERVER_EDIT, 6, 65, 255, 14, WS_VISIBLE | WS_TABST= OP DEFPUSHBUTTON "&OK", IDOK, 147, 90, 54, 15 - PUSHBUTTON "&Cancel", IDCANCEL, 207, 90, 54, 15 + PUSHBUTTON "&Annulla", IDCANCEL, 207, 90, 54, 15 END = STRINGTABLE DISCARDABLE BEGIN - IDS_WINDOW_TITLE "Download ! - ReactOS Downloader" + IDS_WINDOW_TITLE "Scarica ! - ReactOS Downloader" IDS_WELCOME_TITLE "Benvenuto al ReactOS Downloader" IDS_WELCOME "Scegli una categoria a sinistra. Questa =C3= =A8 la versione 1.1." IDS_NO_APP_TITLE "Nessuna applicazione selezionata" - IDS_NO_APP "Scegli una Applicazione prima di premere il = bottone di download, se serve assistenza clicca sul punto di domanda nell'a= ngolo in alto a destra." + IDS_NO_APP "Scegli una Applicazione prima di premere il = bottone Scarica, se serve assistenza clicca sul punto di domanda nell'angol= o in alto a destra." IDS_UPDATE_TITLE "Aggiorna" IDS_UPDATE "Funzione non ancora implementata." IDS_HELP_TITLE "Aiuto" @@ -43,19 +43,19 @@ IDS_CHOOSE_BOTH "Scegli una sottocategoria o una applicazione= ." IDS_XMLERROR_1 "File xml non trovato !" IDS_XMLERROR_2 "Impossibile trattare il contenuto del file x= ml !" - IDS_DOWNLOAD_ERROR "Download del file impossibile.\nVerifica la = connessione a Internet." + IDS_DOWNLOAD_ERROR "Scaricamento del file impossibile.\nVerifica= re la connessione a Internet." IDS_VERSION "Versione: " IDS_LICENCE "Licenza: " IDS_MAINTAINER "Manutentore: " - IDS_APPS_TITLE "Applications" - IDS_CATS_TITLE "Categories" - IDS_CHOOSE_FOLDER "Please, choose the folder..." - IDS_NOTCREATE_REGKEY "Could not create the registry key." - IDS_DOWNLOAD_FOLDER "Downloader" - IDS_UNABLECREATE_FOLDER "Unable to create a folder with this name!" + IDS_APPS_TITLE "Applicazioni" + IDS_CATS_TITLE "Categorie" + IDS_CHOOSE_FOLDER "Scegliere una cartella..." + IDS_NOTCREATE_REGKEY "Impossibile creare la chiave del registry." + IDS_DOWNLOAD_FOLDER "Scarica" + IDS_UNABLECREATE_FOLDER "Impossibile creare una cartella con questo n= ome!" IDS_UPDATE_URL "http://svn.reactos.org" - IDS_INSTALL_DEP "%s is required to run %s. Should %s be insta= lled now?" - TTT_HELPBUTTON "Get help about the downloader" - TTT_UPDATEBUTTON "Not yet available" - TTT_PROFBUTTON "Let you configure the downloader" + IDS_INSTALL_DEP "%s =C3=A8 necessario per la esecuzione di %s= . Si vuole procedere alla installazione di %s?" + TTT_HELPBUTTON "Informazioni su ReactOS Downloader" + TTT_UPDATEBUTTON "Non disponibile" + TTT_PROFBUTTON "Permette la configurazione del downloader" END

1 0

[cfinck] 32715: Revert r32706, unfortunately this wasn't the problem (according to reports from two users)
by cfinck＠svn.reactos.org 18 Mar '08

18 Mar '08

Author: cfinck Date: Tue Mar 18 04:14:38 2008 New Revision: 32715 URL: http://svn.reactos.org/svn/reactos?rev=3D32715&view=3Drev Log: Revert r32706, unfortunately this wasn't the problem (according to reports = from two users) Modified: trunk/reactos/drivers/input/i8042prt/pnp.c Modified: trunk/reactos/drivers/input/i8042prt/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042pr= t/pnp.c?rev=3D32715&r1=3D32714&r2=3D32715&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/input/i8042prt/pnp.c (original) +++ trunk/reactos/drivers/input/i8042prt/pnp.c Tue Mar 18 04:14:38 2008 @@ -156,13 +156,9 @@ WARN_(I8042PRT, "Warning: can't write SET_LEDS (0x%08lx)\n", Status); } = - /* Turn on translation */ - if (!i8042ChangeMode(DeviceExtension, 0, CCB_TRANSLATE)) + /* Turn on translation and SF (Some machines don't reboot if SF is not se= t) */ + if (!i8042ChangeMode(DeviceExtension, 0, CCB_TRANSLATE | CCB_SYSTEM_FLAG)) return FALSE; - - /* Turn on SF (Some machines don't reboot if SF is not set) ; - * we assume that if call fails, machine doesn't need it. */ - i8042ChangeMode(DeviceExtension, 0, CCB_SYSTEM_FLAG); = return TRUE; }

1 0

[dreimer] 32714: Make my update sound better
by dreimer＠svn.reactos.org 17 Mar '08

17 Mar '08

Author: dreimer Date: Mon Mar 17 17:51:09 2008 New Revision: 32714 URL: http://svn.reactos.org/svn/reactos?rev=3D32714&view=3Drev Log: Make my update sound better Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/de-DE.rc?rev=3D32714&r1=3D32713&r2=3D32714&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc Mon Mar 17 17:51:09 2008 @@ -644,6 +644,6 @@ FCIDM_SHVIEW_NEWLINK "Neuer Ver&weis" IDS_FOLDER_OPTIONS "Ordneroptionen" IDS_RECYCLEBIN_LOCATION "Papierkorbpfad" - IDS_RECYCLEBIN_DISKSPACE "Speicher frei" - -END + IDS_RECYCLEBIN_DISKSPACE "freier Speicher" + +END

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