Ros-diffs May 2010

ros-diffs@reactos.org

21 participants
438 discussions

[jgardou] 47205: [WIN32K] - clean up some unused code - use GDIOBJ_IncrementShareCount on Timo suggestion - use ppdev semaphore as sort criterion in DC_vPrepareDCsForBlit, spotted by Timo - Get ownership before freeing the object in GDIOBJ_ShareUnlockObjByPtr, as whoever set it ready to die had the right to

by jgardou＠svn.reactos.org

Author: jgardou Date: Fri May 14 22:19:46 2010 New Revision: 47205 URL: http://svn.reactos.org/svn/reactos?rev=47205&view=rev Log: [WIN32K] - clean up some unused code - use GDIOBJ_IncrementShareCount on Timo suggestion - use ppdev semaphore as sort criterion in DC_vPrepareDCsForBlit, spotted by Timo - Get ownership before freeing the object in GDIOBJ_ShareUnlockObjByPtr, as whoever set it ready to die had the right to Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/dc.h branches/reactos-yarotows/subsystems/win32/win32k/include/gdiobj.h branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/dc.h [iso-8859-1] Fri May 14 22:19:46 2010 @@ -152,52 +152,10 @@ /* Internal functions *********************************************************/ -#if 1 #define DC_LockDc(hDC) \ ((PDC) GDIOBJ_LockObj ((HGDIOBJ) hDC, GDI_OBJECT_TYPE_DC)) #define DC_UnlockDc(pDC) \ GDIOBJ_UnlockObjByPtr ((POBJ)pDC) -#else - -VOID NTAPI EngAcquireSemaphoreShared(IN HSEMAPHORE hsem); - -PDC -FORCEINLINE -DC_LockDc(HDC hdc) -{ - PDC pdc; - pdc = GDIOBJ_LockObj(hdc, GDILoObjType_LO_DC_TYPE); - - /* Direct DC's need PDEV locking */ - if(pdc && pdc->dctype == DCTYPE_DIRECT) - { - /* Acquire shared PDEV lock */ - EngAcquireSemaphoreShared(pdc->ppdev->hsemDevLock); - - /* Update Surface if needed */ - if(pdc->dclevel.pSurface != pdc->ppdev->pSurface) - { - if(pdc->dclevel.pSurface) SURFACE_ShareUnlockSurface(pdc->dclevel.pSurface); - pdc->dclevel.pSurface = PDEVOBJ_pSurface(pdc->ppdev); - } - } - return pdc; -} - -void -FORCEINLINE -DC_UnlockDc(PDC pdc) -{ - if(pdc->dctype == DCTYPE_DIRECT) - { - /* Release PDEV lock */ - EngReleaseSemaphore(pdc->ppdev->hsemDevLock); - } - - GDIOBJ_UnlockObjByPtr(&pdc->BaseObject); -} -#endif - extern PDC defaultDCstate; Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/gdiobj.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/gdiobj.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/gdiobj.h [iso-8859-1] Fri May 14 22:19:46 2010 @@ -113,6 +113,7 @@ ASSERT(cLocks >= 0); if ((flags & BASEFLAG_READY_TO_DIE) && (cLocks == 0)) { + GDIOBJ_SetOwnership(hobj, PsGetCurrentProcess()); GDIOBJ_FreeObjByHandle(hobj, GDI_OBJECT_TYPE_DONTCARE); } return cLocks; Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Fri May 14 22:19:46 2010 @@ -95,7 +95,7 @@ { case 1: psurfBmp->ppal = &gpalMono; - gpalMono.BaseObject.ulShareCount++; + GDIOBJ_IncrementShareCount((POBJ)&gpalMono); break; case 4: case 8: @@ -103,16 +103,15 @@ break; case 15: psurfBmp->ppal = &gpalRGB555; - gpalRGB555.BaseObject.ulShareCount++; + GDIOBJ_IncrementShareCount((POBJ)&gpalRGB555); break; case 16: psurfBmp->ppal = &gpalRGB565; - gpalRGB565.BaseObject.ulShareCount++; - break; + GDIOBJ_IncrementShareCount((POBJ)&gpalRGB565); case 24: case 32: psurfBmp->ppal = &gpalRGB; - gpalRGB.BaseObject.ulShareCount++; + GDIOBJ_IncrementShareCount((POBJ)&gpalRGB); break; default: DPRINT1("Could not determine palette for bit depth %u.\n", BitsPixel); Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Fri May 14 22:19:46 2010 @@ -115,14 +115,6 @@ DCTYPE dctype, PPDEVOBJ ppdev) { -#if 0 - if (dctype == DCTYPE_DIRECT) - { - /* Lock ppdev */ - EngAcquireSemaphoreShared(ppdev->hsemDevLock); - } -#endif - /* Setup some basic fields */ pdc->dctype = dctype; pdc->ppdev = ppdev; @@ -496,7 +488,7 @@ /* Lock them in good order */ if(pdc2) { - if((ULONG_PTR)pdc1->BaseObject.hHmgr >= (ULONG_PTR)pdc2->BaseObject.hHmgr) + if((ULONG_PTR)pdc1->ppdev->hsemDevLock >= (ULONG_PTR)pdc2->ppdev->hsemDevLock) { pdcFirst = pdc1; prcFirst = &rc1;

14 years, 4 months

[akhaldi] 47204: [ARMDDK] - We don't really need ExiTryToAcquireFastMutex declaration here. [HAL] - Fix export for ExTryToAcquireFastMutex. On x86 builds it should forward to ntoskrnl's ExiTryToAcquireFastMutex, arm has it's own implementation. Patch by Timo.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri May 14 22:15:25 2010 New Revision: 47204 URL: http://svn.reactos.org/svn/reactos?rev=47204&view=rev Log: [ARMDDK] - We don't really need ExiTryToAcquireFastMutex declaration here. [HAL] - Fix export for ExTryToAcquireFastMutex. On x86 builds it should forward to ntoskrnl's ExiTryToAcquireFastMutex, arm has it's own implementation. Patch by Timo. Modified: branches/header-work/hal/hal.pspec branches/header-work/include/reactos/arm/armddk.h Modified: branches/header-work/hal/hal.pspec URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/hal.pspec?rev=4… ============================================================================== --- branches/header-work/hal/hal.pspec [iso-8859-1] (original) +++ branches/header-work/hal/hal.pspec [iso-8859-1] Fri May 14 22:15:25 2010 @@ -8,7 +8,8 @@ @ fastcall -arch=i386 ExAcquireFastMutex(ptr) ExiAcquireFastMutex @ fastcall -arch=i386 ExReleaseFastMutex(ptr) ExiReleaseFastMutex #endif -@ fastcall -arch=i386,arm ExTryToAcquireFastMutex(ptr) ExiTryToAcquireFastMutex +@ fastcall -arch=i386 ExTryToAcquireFastMutex(ptr) ntoskrnl.ExiTryToAcquireFastMutex +@ fastcall -arch=arm ExTryToAcquireFastMutex(ptr) @ fastcall HalClearSoftwareInterrupt(long) @ fastcall HalRequestSoftwareInterrupt(long) @ fastcall HalSystemVectorDispatchEntry(long long long) Modified: branches/header-work/include/reactos/arm/armddk.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/reactos/arm… ============================================================================== --- branches/header-work/include/reactos/arm/armddk.h [iso-8859-1] (original) +++ branches/header-work/include/reactos/arm/armddk.h [iso-8859-1] Fri May 14 22:15:25 2010 @@ -207,12 +207,6 @@ #define RESULT_POSITIVE 2 DECLSPEC_IMPORT -BOOLEAN -__fastcall -ExiTryToAcquireFastMutex( - IN OUT PFAST_MUTEX FastMutex); - -DECLSPEC_IMPORT VOID __fastcall KfReleaseSpinLock(

14 years, 4 months

[jgardou] 47203: [WIN32K] - IntGdiCreateBitmap : assign a default palette to the bitmap created - Use IntCreateBitmap where we already have a bitmap to assign - delete all mono bitmaps related hacks in xlateobj implementation, as now all bitmaps should have a palette Fixes last immediately visible glitches when switching modes

by jgardou＠svn.reactos.org

Author: jgardou Date: Fri May 14 20:51:48 2010 New Revision: 47203 URL: http://svn.reactos.org/svn/reactos?rev=47203&view=rev Log: [WIN32K] - IntGdiCreateBitmap : assign a default palette to the bitmap created - Use IntCreateBitmap where we already have a bitmap to assign - delete all mono bitmaps related hacks in xlateobj implementation, as now all bitmaps should have a palette Fixes last immediately visible glitches when switching modes Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/xlate.c branches/reactos-yarotows/subsystems/win32/win32k/include/palette.h branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c branches/reactos-yarotows/subsystems/win32/win32k/objects/palette.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] Fri May 14 20:51:48 2010 @@ -618,65 +618,31 @@ return; } - if (psurfSrc->ppal) - { - ppalSrc = psurfSrc->ppal; - GDIOBJ_IncrementShareCount(&ppalSrc->BaseObject); - } - else - ppalSrc = PALETTE_ShareLockPalette(pdcSrc->ppdev->devinfo.hpalDefault); + ppalSrc = psurfSrc->ppal; if(!ppalSrc) + { + DPRINT1("No palette for src surface %p.\n", psurfSrc); return; - - if (psurfDst->ppal) - { - ppalDst = psurfDst->ppal; - GDIOBJ_IncrementShareCount(&ppalDst->BaseObject); - } - else - ppalDst = PALETTE_ShareLockPalette(pdcDst->ppdev->devinfo.hpalDefault); + } + + ppalDst = psurfDst->ppal; if (!ppalDst) { - PALETTE_ShareUnlockPalette(ppalSrc); + DPRINT1("No palette for dst surface %p.\n", psurfDst); return; } ppalDstDc = pdcDst->dclevel.ppal; ASSERT(ppalDstDc); - /* KB41464 details how to convert between mono and color */ - if (psurfDst->SurfObj.iBitmapFormat == BMF_1BPP) - { - if (psurfSrc->SurfObj.iBitmapFormat != BMF_1BPP) - { - // HACK!! FIXME: 1bpp DDBs should have gpalMono already! - EXLATEOBJ_vInitialize(pexlo, - ppalSrc, - &gpalMono, - pdcSrc->pdcattr->crBackgroundClr, - pdcDst->pdcattr->crBackgroundClr, - pdcDst->pdcattr->crForegroundClr); - } - } - else if (psurfSrc->SurfObj.iBitmapFormat == BMF_1BPP && !psurfSrc->hSecure) - { - // HACK!! FIXME: 1bpp DDBs should have gpalMono already! - EXLATEOBJ_vInitialize(pexlo, - &gpalMono, - ppalDst, - 0, - pdcDst->pdcattr->crBackgroundClr, - pdcDst->pdcattr->crForegroundClr); - } - else - { - EXLATEOBJ_vInitialize(pexlo, ppalSrc, ppalDst, 0, 0, 0); - } - - PALETTE_ShareUnlockPalette(ppalDst); - PALETTE_ShareUnlockPalette(ppalSrc); + EXLATEOBJ_vInitialize(pexlo, + ppalSrc, + ppalDst, + pdcSrc->pdcattr->crBackgroundClr, + pdcDst->pdcattr->crBackgroundClr, + pdcDst->pdcattr->crForegroundClr); } @@ -699,68 +665,25 @@ EXLATEOBJ_vInitTrivial(pexlo); - if (psurfDst->ppal) - { - ppalDst = psurfDst->ppal; - GDIOBJ_IncrementShareCount(&ppalDst->BaseObject); - } - else - ppalDst = PALETTE_ShareLockPalette(pPrimarySurface->devinfo.hpalDefault); + ppalDst = psurfDst->ppal; if (!ppalDst) { - DPRINT1("No ppalDst!\n"); + DPRINT1("No palette for dst surface %p.\n", psurfDst); return; } psurfPattern = SURFACE_ShareLockSurface(pbrush->hbmPattern); if (!psurfPattern) { - PALETTE_ShareUnlockPalette(ppalDst); return; } -#if 0 - if (psurfDst->SurfObj.iBitmapFormat == BMF_1BPP) - { - if (psurfSrc->SurfObj.iBitmapFormat != BMF_1BPP) - { - // HACK!! FIXME: 1bpp DDBs should have gpalMono already! - EXLATEOBJ_vInitialize(pexlo, - ppalSrc, - &gpalMono, - 0, - crBackgroundClr, - crForegroundClr); - } - } - else -#endif - if (psurfPattern->SurfObj.iBitmapFormat == BMF_1BPP && - !(pbrush->flAttrs & GDIBRUSH_IS_DIB)) - { - /* Special case: 1 bpp pattern, not a DIB brush. */ - if (psurfDst->SurfObj.iBitmapFormat != BMF_1BPP) - { - // HACK!! FIXME: 1bpp DDBs should have gpalMono already! - EXLATEOBJ_vInitialize(pexlo, - &gpalMono, - ppalDst, - 0, - crBackgroundClr, - crForegroundClr); - } - } - else - { - /* Default: use the patterns' palette */ - if (psurfPattern->ppal) - { - EXLATEOBJ_vInitialize(pexlo, psurfPattern->ppal, ppalDst, 0, 0, 0); - } - } - - PALETTE_ShareUnlockPalette(ppalDst); + if (psurfPattern->ppal) + { + EXLATEOBJ_vInitialize(pexlo, psurfPattern->ppal, ppalDst, 0, crBackgroundClr, crForegroundClr); + } + SURFACE_ShareUnlockSurface(psurfPattern); } Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/palette.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/palette.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/palette.h [iso-8859-1] Fri May 14 20:51:48 2010 @@ -54,7 +54,7 @@ HDEV hPDev; } PALETTE, *PPALETTE; -extern PALETTE gpalRGB, gpalBGR, gpalMono; +extern PALETTE gpalRGB, gpalBGR, gpalMono, gpalRGB555, gpalRGB565; HPALETTE FASTCALL PALETTE_AllocPalette(ULONG Mode, Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Fri May 14 20:51:48 2010 @@ -87,6 +87,38 @@ IntSetBitmapBits(psurfBmp, psurfBmp->SurfObj.cjBits, pBits); } + /* Find a suitable palette for this bitmap + * Increment internal objects share count + * so we can call PALETTE_ShareUnlockPalette + * or GDIOBJ_IncrementShareCount safely */ + switch(BitsPixel) + { + case 1: + psurfBmp->ppal = &gpalMono; + gpalMono.BaseObject.ulShareCount++; + break; + case 4: + case 8: + psurfBmp->ppal = PALETTE_ShareLockPalette(StockObjects[DEFAULT_PALETTE]); + break; + case 15: + psurfBmp->ppal = &gpalRGB555; + gpalRGB555.BaseObject.ulShareCount++; + break; + case 16: + psurfBmp->ppal = &gpalRGB565; + gpalRGB565.BaseObject.ulShareCount++; + break; + case 24: + case 32: + psurfBmp->ppal = &gpalRGB; + gpalRGB.BaseObject.ulShareCount++; + break; + default: + DPRINT1("Could not determine palette for bit depth %u.\n", BitsPixel); + break; + } + SURFACE_UnlockSurface(psurfBmp); DPRINT("IntGdiCreateBitmap : %dx%d, %d BPP colors, topdown %d, returning %08x\n", @@ -144,15 +176,24 @@ if (Dc->dctype != DC_TYPE_MEMORY) { PSURFACE psurf; - Bmp = IntGdiCreateBitmap(abs(Width), - abs(Height), - Dc->ppdev->gdiinfo.cPlanes, - Dc->ppdev->gdiinfo.cBitsPixel, - NULL); - /* Set palette */ + SIZEL size; + + size.cx = abs(Width); + size.cy = abs(Height); + + Bmp = IntCreateBitmap(size, + BITMAP_GetWidthBytes(Width, Dc->ppdev->gdiinfo.cBitsPixel), + Dc->ppdev->pSurface->SurfObj.iBitmapFormat, + 0, + NULL); + psurf = SURFACE_LockSurface(Bmp); ASSERT(psurf); + /* Set palette */ psurf->ppal = PALETTE_ShareLockPalette(Dc->ppdev->devinfo.hpalDefault); + /* Set flags */ + psurf->flFlags = BITMAPOBJ_IS_APIBITMAP; + psurf->hDC = NULL; // Fixme SURFACE_UnlockSurface(psurf); } else @@ -166,20 +207,24 @@ { if (Count == sizeof(BITMAP)) { - Bmp = IntGdiCreateBitmap(abs(Width), - abs(Height), - dibs.dsBm.bmPlanes, - dibs.dsBm.bmBitsPixel, - NULL); + SIZEL size; + PSURFACE psurfBmp; + size.cx = abs(Width); + size.cy = abs(Height); + Bmp = IntCreateBitmap(size, + BITMAP_GetWidthBytes(Width, dibs.dsBm.bmBitsPixel), + psurf->SurfObj.iBitmapFormat, + 0, + NULL); + psurfBmp = SURFACE_LockSurface(Bmp); + ASSERT(psurfBmp); /* Assign palette */ - if(Bmp && psurf->ppal) - { - PSURFACE psurfBmp = SURFACE_LockSurface(Bmp); - ASSERT(psurfBmp); - psurfBmp->ppal = psurf->ppal; - GDIOBJ_IncrementShareCount((POBJ)psurf->ppal); - SURFACE_UnlockSurface(psurfBmp); - } + psurfBmp->ppal = psurf->ppal; + GDIOBJ_IncrementShareCount((POBJ)psurf->ppal); + /* Set flags */ + psurfBmp->flFlags = BITMAPOBJ_IS_APIBITMAP; + psurfBmp->hDC = NULL; // Fixme + SURFACE_UnlockSurface(psurfBmp); } else { Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/palette.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/palette.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/palette.c [iso-8859-1] Fri May 14 20:51:48 2010 @@ -14,7 +14,7 @@ static UINT SystemPaletteUse = SYSPAL_NOSTATIC; /* the program need save the pallete and restore it */ -PALETTE gpalRGB, gpalBGR, gpalMono; +PALETTE gpalRGB, gpalBGR, gpalMono, gpalRGB555, gpalRGB565; const PALETTEENTRY g_sysPalTemplate[NB_RESERVED_COLORS] = { @@ -104,14 +104,34 @@ gpalRGB.RedMask = RGB(0xFF, 0x00, 0x00); gpalRGB.GreenMask = RGB(0x00, 0xFF, 0x00); gpalRGB.BlueMask = RGB(0x00, 0x00, 0xFF); + gpalRGB.BaseObject.ulShareCount = 0; + gpalRGB.BaseObject.BaseFlags = 0 ; gpalBGR.Mode = PAL_BGR; gpalBGR.RedMask = RGB(0x00, 0x00, 0xFF); gpalBGR.GreenMask = RGB(0x00, 0xFF, 0x00); gpalBGR.BlueMask = RGB(0xFF, 0x00, 0x00); + gpalBGR.BaseObject.ulShareCount = 0; + gpalBGR.BaseObject.BaseFlags = 0 ; + + gpalRGB555.Mode = PAL_RGB16_555 | PAL_BITFIELDS; + gpalRGB555.RedMask = 0x7C00; + gpalRGB555.GreenMask = 0x3E0; + gpalRGB555.BlueMask = 0x1F; + gpalRGB555.BaseObject.ulShareCount = 0; + gpalRGB555.BaseObject.BaseFlags = 0 ; + + gpalRGB565.Mode = PAL_RGB16_565 | PAL_BITFIELDS; + gpalRGB565.RedMask = 0xF800; + gpalRGB565.GreenMask = 0x7E0; + gpalRGB565.BlueMask = 0x1F; + gpalRGB565.BaseObject.ulShareCount = 0; + gpalRGB565.BaseObject.BaseFlags = 0 ; memset(&gpalMono, 0, sizeof(PALETTE)); gpalMono.Mode = PAL_MONOCHROME; + gpalMono.BaseObject.ulShareCount = 0; + gpalMono.BaseObject.BaseFlags = 0 ; return hpalette; } @@ -169,7 +189,7 @@ PalGDI->RedMask = Red; PalGDI->GreenMask = Green; PalGDI->BlueMask = Blue; - + if (Red == 0x7c00 && Green == 0x3E0 && Blue == 0x1F) PalGDI->Mode |= PAL_RGB16_555; else if (Red == 0xF800 && Green == 0x7E0 && Blue == 0x1F)

14 years, 4 months

[akhaldi] 47202: [FREELDR] - freeldr.rbuild : Apply a consistent formatting. - Add the missing AcpiPresent variable to macharm.c - Exclude a couple of code paths when building for ARM. [ARMDDK] - Add missing ExiTryToAcquireFastMutex declaration.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri May 14 20:49:42 2010 New Revision: 47202 URL: http://svn.reactos.org/svn/reactos?rev=47202&view=rev Log: [FREELDR] - freeldr.rbuild : Apply a consistent formatting. - Add the missing AcpiPresent variable to macharm.c - Exclude a couple of code paths when building for ARM. [ARMDDK] - Add missing ExiTryToAcquireFastMutex declaration. Modified: branches/header-work/boot/freeldr/freeldr.rbuild branches/header-work/boot/freeldr/freeldr/arch/arm/macharm.c branches/header-work/boot/freeldr/freeldr/bootmgr.c (contents, props changed) branches/header-work/boot/freeldr/freeldr/freeldr.c (contents, props changed) branches/header-work/include/reactos/arm/armddk.h Modified: branches/header-work/boot/freeldr/freeldr.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/boot/freeldr/freeld… ============================================================================== --- branches/header-work/boot/freeldr/freeldr.rbuild [iso-8859-1] (original) +++ branches/header-work/boot/freeldr/freeldr.rbuild [iso-8859-1] Fri May 14 20:49:42 2010 @@ -12,16 +12,16 @@ <xi:include href="freeldr/freeldr_main.rbuild" /> <xi:include href="freeldr/freeldr.rbuild" /> <if property="ARCH" value="i386"> - <xi:include href="freeldr/setupldr_main.rbuild" /> - <xi:include href="freeldr/setupldr.rbuild" /> + <xi:include href="freeldr/setupldr_main.rbuild" /> + <xi:include href="freeldr/setupldr.rbuild" /> </if> <if property="ARCH" value="ppc"> - <xi:include href="freeldr/setupldr_main.rbuild" /> - <xi:include href="freeldr/setupldr.rbuild" /> + <xi:include href="freeldr/setupldr_main.rbuild" /> + <xi:include href="freeldr/setupldr.rbuild" /> </if> <if property="ARCH" value="amd64"> - <xi:include href="freeldr/setupldr_main.rbuild" /> - <xi:include href="freeldr/setupldr.rbuild" /> + <xi:include href="freeldr/setupldr_main.rbuild" /> + <xi:include href="freeldr/setupldr.rbuild" /> </if> </directory> </group> Modified: branches/header-work/boot/freeldr/freeldr/arch/arm/macharm.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/boot/freeldr/freeld… ============================================================================== --- branches/header-work/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] (original) +++ branches/header-work/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] Fri May 14 20:49:42 2010 @@ -17,6 +17,8 @@ ULONG gDiskReadBuffer, gFileSysBuffer; BOOLEAN ArmHwDetectRan; PCONFIGURATION_COMPONENT_DATA RootNode; + +BOOLEAN AcpiPresent = FALSE; ULONG FirstLevelDcacheSize; ULONG FirstLevelDcacheFillSize; Modified: branches/header-work/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/boot/freeldr/freeld… ============================================================================== --- branches/header-work/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] (original) +++ branches/header-work/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] Fri May 14 20:49:42 2010 @@ -119,11 +119,13 @@ return; } +#ifdef _M_IX86 // Load additional SCSI driver (if any) if (LoadBootDeviceDriver() != ESUCCESS) { UiMessageBoxCritical("Unable to load additional boot device driver"); } +#endif if (!IniFileInitialize()) { Propchange: branches/header-work/boot/freeldr/freeldr/bootmgr.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: branches/header-work/boot/freeldr/freeldr/freeldr.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/boot/freeldr/freeld… ============================================================================== --- branches/header-work/boot/freeldr/freeldr/freeldr.c [iso-8859-1] (original) +++ branches/header-work/boot/freeldr/freeldr/freeldr.c [iso-8859-1] Fri May 14 20:49:42 2010 @@ -47,7 +47,9 @@ return; } +#ifdef _M_IX86 HalpInitializePciStubs(); HalpInitBusHandler(); +#endif RunLoader(); } Propchange: branches/header-work/boot/freeldr/freeldr/freeldr.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: branches/header-work/include/reactos/arm/armddk.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/reactos/arm… ============================================================================== --- branches/header-work/include/reactos/arm/armddk.h [iso-8859-1] (original) +++ branches/header-work/include/reactos/arm/armddk.h [iso-8859-1] Fri May 14 20:49:42 2010 @@ -207,6 +207,12 @@ #define RESULT_POSITIVE 2 DECLSPEC_IMPORT +BOOLEAN +__fastcall +ExiTryToAcquireFastMutex( + IN OUT PFAST_MUTEX FastMutex); + +DECLSPEC_IMPORT VOID __fastcall KfReleaseSpinLock(

14 years, 4 months

[akhaldi] 47201: [NTOSKRNL] - Fix ExInterlockedPopEntryList and ExInterlockedPushEntryList, they were not working at all. Brought to you by Timo ; )

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri May 14 20:40:23 2010 New Revision: 47201 URL: http://svn.reactos.org/svn/reactos?rev=47201&view=rev Log: [NTOSKRNL] - Fix ExInterlockedPopEntryList and ExInterlockedPushEntryList, they were not working at all. Brought to you by Timo ;) Modified: branches/header-work/ntoskrnl/ex/fastinterlck.c Modified: branches/header-work/ntoskrnl/ex/fastinterlck.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/ex/fastint… ============================================================================== --- branches/header-work/ntoskrnl/ex/fastinterlck.c [iso-8859-1] (original) +++ branches/header-work/ntoskrnl/ex/fastinterlck.c [iso-8859-1] Fri May 14 20:40:23 2010 @@ -255,7 +255,7 @@ KIRQL OldIrql; PSINGLE_LIST_ENTRY OldHead = NULL; KeAcquireSpinLock(Lock, &OldIrql); - if (!ListHead->Next) OldHead = PopEntryList(ListHead); + OldHead = PopEntryList(ListHead); KeReleaseSpinLock(Lock, OldIrql); return OldHead; } @@ -269,7 +269,8 @@ KIRQL OldIrql; PSINGLE_LIST_ENTRY OldHead = NULL; KeAcquireSpinLock(Lock, &OldIrql); - if (!ListHead->Next) OldHead = PushEntryList(ListHead, ListEntry); + OldHead = ListHead->Next; + PushEntryList(ListHead, ListEntry); KeReleaseSpinLock(Lock, OldIrql); return OldHead; }

14 years, 4 months

[gschneider] 47200: [MKHIVE] Check parameters before accessing them, update usage information

by gschneider＠svn.reactos.org

Author: gschneider Date: Fri May 14 19:46:14 2010 New Revision: 47200 URL: http://svn.reactos.org/svn/reactos?rev=47200&view=rev Log: [MKHIVE] Check parameters before accessing them, update usage information Modified: trunk/reactos/tools/mkhive/mkhive.c Modified: trunk/reactos/tools/mkhive/mkhive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.c?rev=… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/mkhive.c [iso-8859-1] Fri May 14 19:46:14 2010 @@ -49,9 +49,10 @@ void usage (void) { - printf ("Usage: mkhive <srcdir> <dstdir> [addinf]\n\n"); + printf ("Usage: mkhive <srcdir> <dstdir> <arch> [addinf]\n\n"); printf (" srcdir - inf files are read from this directory\n"); printf (" dstdir - binary hive files are created in this directory\n"); + printf (" arch - architecture\n"); printf (" addinf - additional inf files with full path\n"); } @@ -88,13 +89,13 @@ char FileName[PATH_MAX]; int Param; - printf ("Binary hive maker: %s\n", argv[3]); - if (argc < 4) { usage (); return 1; } + + printf ("Binary hive maker: %s\n", argv[3]); RegInitializeRegistry ();

14 years, 4 months

[ekohl] 47199: [MSGINA] - Fix the order of controls to match the expected tab order. This makes the focus stop jumping around like crazy when you press the Tab key.

by ekohl＠svn.reactos.org

Author: ekohl Date: Fri May 14 19:12:35 2010 New Revision: 47199 URL: http://svn.reactos.org/svn/reactos?rev=47199&view=rev Log: [MSGINA] - Fix the order of controls to match the expected tab order. This makes the focus stop jumping around like crazy when you press the Tab key. Modified: trunk/reactos/dll/win32/msgina/lang/bg-BG.rc trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc trunk/reactos/dll/win32/msgina/lang/de-DE.rc trunk/reactos/dll/win32/msgina/lang/en-US.rc trunk/reactos/dll/win32/msgina/lang/es-ES.rc trunk/reactos/dll/win32/msgina/lang/fr-FR.rc trunk/reactos/dll/win32/msgina/lang/id-ID.rc trunk/reactos/dll/win32/msgina/lang/it-IT.rc trunk/reactos/dll/win32/msgina/lang/ja-JP.rc trunk/reactos/dll/win32/msgina/lang/no-NO.rc trunk/reactos/dll/win32/msgina/lang/pl-PL.rc trunk/reactos/dll/win32/msgina/lang/ro-RO.rc trunk/reactos/dll/win32/msgina/lang/ru-RU.rc trunk/reactos/dll/win32/msgina/lang/sk-SK.rc trunk/reactos/dll/win32/msgina/lang/uk-UA.rc Modified: trunk/reactos/dll/win32/msgina/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/bg-B… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] Fri May 14 19:12:35 2010 @@ -22,14 +22,14 @@ CAPTION "Âõîä" FONT 8,"MS Shell Dlg",400,0,1 BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 + LTEXT "Ïîòðåáèòåë:",IDC_STATIC,36,75,45,8 + EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL + LTEXT "Ïàðîëà:",IDC_STATIC,36,93,42,8 + EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "Äîáðå",IDOK,51,122,50,14,BS_DEFPUSHBUTTON PUSHBUTTON "Îòêàç",IDCANCEL,115,122,50,14 PUSHBUTTON "Èçêëþ÷âàíå",IDC_SHUTDOWN,179,122,50,14 - LTEXT "Ïîòðåáèòåë:",IDC_STATIC,36,75,45,8 - LTEXT "Ïàðîëà:",IDC_STATIC,36,93,42,8 - EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL - EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 END IDD_LOGGEDON_DLG DIALOGEX 0,0,247,116 @@ -37,13 +37,13 @@ CAPTION "Ñèãóðíîñò" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - PUSHBUTTON "Îòêàç",IDCANCEL,130,95,99,14 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + LTEXT "Êàêâî æåëàåòå?",IDC_STATIC,86,60,87,8 + PUSHBUTTON "Çàêëþ÷âàíå íà êîìïþòúðà",IDC_LOCK,25,95,99,14 PUSHBUTTON "Èçõîä",IDC_LOGOFF,90,76,75,14 PUSHBUTTON "Èçêëþ÷âàíå",IDC_SHUTDOWN,170,76,75,14 - LTEXT "Êàêâî æåëàåòå?",IDC_STATIC,86,60,87,8 - PUSHBUTTON "Çàêëþ÷âàíå íà êîìïþòúðà",IDC_LOCK,25,95,99,14 PUSHBUTTON "Çàäà÷åí óïðàâèòåë",IDC_TASKMGR,10,76,75,14 - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + PUSHBUTTON "Îòêàç",IDCANCEL,130,95,99,14 END STRINGTABLE Modified: trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/cs-C… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] Fri May 14 19:12:35 2010 @@ -27,14 +27,14 @@ CAPTION "Pøihláení" FONT 8,"MS Shell Dlg",400,0,1 BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 + LTEXT "Jméno:",IDC_STATIC,36,75,40,8 + EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL + LTEXT "Heslo:",IDC_STATIC,36,93,42,8 + EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "OK",IDOK,51,122,50,14,BS_DEFPUSHBUTTON PUSHBUTTON "Storno",IDCANCEL,115,122,50,14 PUSHBUTTON "Vypnout",IDC_SHUTDOWN,179,122,50,14 - LTEXT "Jméno:",IDC_STATIC,36,75,40,8 - LTEXT "Heslo:",IDC_STATIC,36,93,42,8 - EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL - EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 END IDD_LOGGEDON_DLG DIALOGEX 0,0,247,116 @@ -42,13 +42,13 @@ CAPTION "Bezpeènost" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - PUSHBUTTON "Storno",IDCANCEL,170,95,70,14 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + LTEXT "Co chcete udìlat?",IDC_STATIC,86,60,87,8 + PUSHBUTTON "Uzamknout poèítaè",IDC_LOCK,10,76,70,14 PUSHBUTTON "Odhlásit",IDC_LOGOFF,90,76,70,14 PUSHBUTTON "Vypnout",IDC_SHUTDOWN,170,76,70,14 - LTEXT "Co chcete udìlat?",IDC_STATIC,86,60,87,8 - PUSHBUTTON "Uzamknout poèítaè",IDC_LOCK,10,76,70,14 PUSHBUTTON "Správce úloh",IDC_TASKMGR,90,95,70,14 - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + PUSHBUTTON "Storno",IDCANCEL,170,95,70,14 END STRINGTABLE Modified: trunk/reactos/dll/win32/msgina/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] Fri May 14 19:12:35 2010 @@ -22,14 +22,14 @@ CAPTION "Logon" FONT 8,"MS Shell Dlg",400,0,1 BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 + LTEXT "Benutzername:",IDC_STATIC,26, 75, 54, 8 + EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL + LTEXT "Passwort:",IDC_STATIC,43, 93, 38, 8 + EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "OK",IDOK,41, 122, 50, 14,BS_DEFPUSHBUTTON PUSHBUTTON "Abbrechen",IDCANCEL,103, 122, 50, 14 PUSHBUTTON "Herunterfahren",IDC_SHUTDOWN,165, 122, 64, 14 - LTEXT "Benutzername:",IDC_STATIC,26, 75, 54, 8 - LTEXT "Passwort:",IDC_STATIC,43, 93, 38, 8 - EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL - EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 END IDD_LOGGEDON_DLG DIALOGEX 0,0,247,116 @@ -37,13 +37,13 @@ CAPTION "Sicherheit" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - PUSHBUTTON "Abbrechen",IDCANCEL,170,95,70,14 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + LTEXT "Was wollen Sie tun?",IDC_STATIC,86,60,87,8 + PUSHBUTTON "Computer sperren",IDC_LOCK,10,76,70,14 PUSHBUTTON "Abmelden",IDC_LOGOFF,90,76,70,14 PUSHBUTTON "Herunterfahren",IDC_SHUTDOWN,170,76,70,14 - LTEXT "Was wollen Sie tun?",IDC_STATIC,86,60,87,8 - PUSHBUTTON "Computer sperren",IDC_LOCK,10,76,70,14 PUSHBUTTON "Taskmanager",IDC_TASKMGR,90,95,70,14 - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + PUSHBUTTON "Abbrechen",IDCANCEL,170,95,70,14 END STRINGTABLE Modified: trunk/reactos/dll/win32/msgina/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] Fri May 14 19:12:35 2010 @@ -22,14 +22,14 @@ CAPTION "Logon" FONT 8,"MS Shell Dlg",400,0,1 BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 + LTEXT "Username:",IDC_STATIC,36,75,40,8 + EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL + LTEXT "Password:",IDC_STATIC,36,93,42,8 + EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "OK",IDOK,51,122,50,14,BS_DEFPUSHBUTTON PUSHBUTTON "Cancel",IDCANCEL,115,122,50,14 PUSHBUTTON "Shutdown",IDC_SHUTDOWN,179,122,50,14 - LTEXT "Username:",IDC_STATIC,36,75,40,8 - LTEXT "Password:",IDC_STATIC,36,93,42,8 - EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL - EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 END IDD_LOGGEDON_DLG DIALOGEX 0,0,247,116 @@ -37,13 +37,13 @@ CAPTION "Security" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - PUSHBUTTON "Cancel",IDCANCEL,170,95,70,14 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + LTEXT "What do you want to do?",IDC_STATIC,86,60,87,8 + PUSHBUTTON "Lock computer",IDC_LOCK,10,76,70,14 PUSHBUTTON "Log off",IDC_LOGOFF,90,76,70,14 PUSHBUTTON "Shutdown",IDC_SHUTDOWN,170,76,70,14 - LTEXT "What do you want to do?",IDC_STATIC,86,60,87,8 - PUSHBUTTON "Lock computer",IDC_LOCK,10,76,70,14 PUSHBUTTON "Task manager",IDC_TASKMGR,90,95,70,14 - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + PUSHBUTTON "Cancel",IDCANCEL,170,95,70,14 END STRINGTABLE Modified: trunk/reactos/dll/win32/msgina/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/es-E… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] Fri May 14 19:12:35 2010 @@ -27,14 +27,14 @@ CAPTION "Acceder" FONT 8,"MS Shell Dlg",400,0,1 BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 + LTEXT "Usuario:",IDC_STATIC,36,75,40,8 + EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL + LTEXT "Contraseña:",IDC_STATIC,36,93,42,8 + EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "Aceptar",IDOK,51,122,50,14,BS_DEFPUSHBUTTON PUSHBUTTON "Cancelar",IDCANCEL,115,122,50,14 PUSHBUTTON "Cerrar",IDC_SHUTDOWN,179,122,50,14 - LTEXT "Usuario:",IDC_STATIC,36,75,40,8 - LTEXT "Contraseña:",IDC_STATIC,36,93,42,8 - EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL - EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 END IDD_LOGGEDON_DLG DIALOGEX 0, 0, 261, 116 @@ -42,13 +42,13 @@ CAPTION "Seguridad" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - PUSHBUTTON "Cancelar",IDCANCEL, 186, 95, 70, 14 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + LTEXT "¿Qué quieres hacer?",IDC_STATIC, 94, 60, 87, 8 + PUSHBUTTON "Bloquear computadora",IDC_LOCK, 4, 76, 83, 14 PUSHBUTTON "Salir",IDC_LOGOFF, 92, 76, 88, 14 PUSHBUTTON "Cerrar",IDC_SHUTDOWN, 186, 76, 70, 14 - LTEXT "¿Qué quieres hacer?",IDC_STATIC, 94, 60, 87, 8 - PUSHBUTTON "Bloquear computadora",IDC_LOCK, 4, 76, 83, 14 PUSHBUTTON "Administrador de tareas",IDC_TASKMGR, 92, 95, 88, 14 - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + PUSHBUTTON "Cancelar",IDCANCEL, 186, 95, 70, 14 END STRINGTABLE Modified: trunk/reactos/dll/win32/msgina/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/fr-F… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] Fri May 14 19:12:35 2010 @@ -22,14 +22,14 @@ CAPTION "Connexion" FONT 8,"MS Shell Dlg",400,0,1 BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 + LTEXT "Utilisateur:",IDC_STATIC,36,75,40,8 + EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL + LTEXT "Mot de passe:",IDC_STATIC,36,93,42,8 + EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "OK",IDOK,51,122,50,14,BS_DEFPUSHBUTTON PUSHBUTTON "Annuler",IDCANCEL,115,122,50,14 PUSHBUTTON "Éteindre",IDC_SHUTDOWN,179,122,50,14 - LTEXT "Utilisateur:",IDC_STATIC,36,75,40,8 - LTEXT "Mot de passe:",IDC_STATIC,36,93,42,8 - EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL - EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 END IDD_LOGGEDON_DLG DIALOGEX 0, 0, 258, 116 @@ -37,13 +37,13 @@ CAPTION "Sécurité" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - PUSHBUTTON "Annuler",IDCANCEL, 184, 95, 70, 14 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + LTEXT "Que voulez vous faire?",IDC_STATIC, 94, 60, 87, 8 + PUSHBUTTON "Verrouiller l'ordinateur",IDC_LOCK, 4, 76, 82, 14 PUSHBUTTON "Déconnecter",IDC_LOGOFF, 93, 76, 85, 14 PUSHBUTTON "Éteindre",IDC_SHUTDOWN, 184, 76, 70, 14 - LTEXT "Que voulez vous faire?",IDC_STATIC, 94, 60, 87, 8 - PUSHBUTTON "Verrouiller l'ordinateur",IDC_LOCK, 4, 76, 82, 14 PUSHBUTTON "Gestionnaire de tâches",IDC_TASKMGR, 93, 95, 85, 14 - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + PUSHBUTTON "Annuler",IDCANCEL, 184, 95, 70, 14 END STRINGTABLE Modified: trunk/reactos/dll/win32/msgina/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/id-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] Fri May 14 19:12:35 2010 @@ -22,14 +22,14 @@ CAPTION "Masuk" FONT 8,"MS Shell Dlg",400,0,1 BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 + LTEXT "Nama pengguna:",IDC_STATIC,22, 75, 61, 8 + EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL + LTEXT "Kata sandi:",IDC_STATIC, 40, 93, 42, 8 + EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "OK",IDOK,51,122,50,14,BS_DEFPUSHBUTTON PUSHBUTTON "Batal",IDCANCEL,115,122,50,14 PUSHBUTTON "Matikan",IDC_SHUTDOWN,179,122,50,14 - LTEXT "Nama pengguna:",IDC_STATIC,22, 75, 61, 8 - LTEXT "Kata sandi:",IDC_STATIC, 40, 93, 42, 8 - EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL - EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 END IDD_LOGGEDON_DLG DIALOGEX 0,0,247,116 @@ -37,13 +37,13 @@ CAPTION "Keamanan" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - PUSHBUTTON "Batal",IDCANCEL,170,95,70,14 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + LTEXT "Apa yang ingin anda lakukan?",IDC_STATIC,86,60,87,8 + PUSHBUTTON "Kunci komputer",IDC_LOCK,10,76,70,14 PUSHBUTTON "Keluar",IDC_LOGOFF,90,76,70,14 PUSHBUTTON "Matikan",IDC_SHUTDOWN,170,76,70,14 - LTEXT "Apa yang ingin anda lakukan?",IDC_STATIC,86,60,87,8 - PUSHBUTTON "Kunci komputer",IDC_LOCK,10,76,70,14 PUSHBUTTON "Manager Tugas",IDC_TASKMGR,90,95,70,14 - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + PUSHBUTTON "Batal",IDCANCEL,170,95,70,14 END STRINGTABLE Modified: trunk/reactos/dll/win32/msgina/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/it-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] Fri May 14 19:12:35 2010 @@ -30,14 +30,14 @@ CAPTION "Logon" FONT 8,"MS Shell Dlg",400,0,1 BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 + LTEXT "Utente:",IDC_STATIC,36,75,40,8 + EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL + LTEXT "Password:",IDC_STATIC,36,93,42,8 + EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "OK",IDOK,51,122,50,14,BS_DEFPUSHBUTTON PUSHBUTTON "Annulla",IDCANCEL,115,122,50,14 PUSHBUTTON "Spegnimento",IDC_SHUTDOWN,179,122,50,14 - LTEXT "Utente:",IDC_STATIC,36,75,40,8 - LTEXT "Password:",IDC_STATIC,36,93,42,8 - EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL - EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 END IDD_LOGGEDON_DLG DIALOGEX 0,0,247,116 @@ -45,13 +45,13 @@ CAPTION "Sicurezza" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - PUSHBUTTON "Annulla",IDCANCEL,170,95,70,14 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + LTEXT "Cosa volete fare?",IDC_STATIC,86,60,87,8 + PUSHBUTTON "Bloccare il computer",IDC_LOCK,10,76,70,14 PUSHBUTTON "Fine sessione",IDC_LOGOFF,90,76,70,14 PUSHBUTTON "Spegnimento",IDC_SHUTDOWN,170,76,70,14 - LTEXT "Cosa volete fare?",IDC_STATIC,86,60,87,8 - PUSHBUTTON "Bloccare il computer",IDC_LOCK,10,76,70,14 PUSHBUTTON "Task manager",IDC_TASKMGR,90,95,70,14 - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + PUSHBUTTON "Annulla",IDCANCEL,170,95,70,14 END STRINGTABLE Modified: trunk/reactos/dll/win32/msgina/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ja-J… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] Fri May 14 19:12:35 2010 @@ -22,14 +22,14 @@ CAPTION "OI" FONT 9, "MS UI Gothic",400,0,1 BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 + LTEXT "[U[¼:",IDC_STATIC,36,75,40,8 + EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL + LTEXT "pX[h:",IDC_STATIC,36,93,42,8 + EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "OK",IDOK,51,122,50,14,BS_DEFPUSHBUTTON PUSHBUTTON "LZ",IDCANCEL,115,122,50,14 PUSHBUTTON "Vbg_E",IDC_SHUTDOWN,179,122,50,14 - LTEXT "[U[¼:",IDC_STATIC,36,75,40,8 - LTEXT "pX[h:",IDC_STATIC,36,93,42,8 - EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL - EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 END IDD_LOGGEDON_DLG DIALOGEX 0,0,247,116 @@ -37,13 +37,13 @@ CAPTION "ZLeB" FONT 9, "MS UI Gothic",400,0,1 BEGIN - PUSHBUTTON "LZ",IDCANCEL,170,95,70,14 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + LTEXT "½ðµÜ·©?",IDC_STATIC,86,60,87,8 + PUSHBUTTON "Rs[^ÌbN",IDC_LOCK,10,76,70,14 PUSHBUTTON "OIt",IDC_LOGOFF,90,76,70,14 PUSHBUTTON "Vbg_E",IDC_SHUTDOWN,170,76,70,14 - LTEXT "½ðµÜ·©?",IDC_STATIC,86,60,87,8 - PUSHBUTTON "Rs[^ÌbN",IDC_LOCK,10,76,70,14 PUSHBUTTON "^XN }l[W",IDC_TASKMGR,90,95,70,14 - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + PUSHBUTTON "LZ",IDCANCEL,170,95,70,14 END STRINGTABLE Modified: trunk/reactos/dll/win32/msgina/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/no-N… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] Fri May 14 19:12:35 2010 @@ -22,14 +22,14 @@ CAPTION "Logg på ReactOS" FONT 8,"MS Shell Dlg",400,0,1 BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 + LTEXT "Brukernavn:",IDC_STATIC,36,75,40,8 + EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL + LTEXT "Passord:",IDC_STATIC,36,93,42,8 + EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "OK",IDOK,51,122,50,14,BS_DEFPUSHBUTTON PUSHBUTTON "Avbryt",IDCANCEL,115,122,50,14 PUSHBUTTON "Avslutt",IDC_SHUTDOWN,179,122,50,14 - LTEXT "Brukernavn:",IDC_STATIC,36,75,40,8 - LTEXT "Passord:",IDC_STATIC,36,93,42,8 - EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL - EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 END IDD_LOGGEDON_DLG DIALOGEX 0, 0, 247, 116 @@ -37,13 +37,13 @@ CAPTION "ReactOS-sikkerhet" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - PUSHBUTTON "Avbryt",IDCANCEL, 170, 95, 70, 14 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + LTEXT "Hva vil du gjøre?",IDC_STATIC, 92, 60, 87, 8 + PUSHBUTTON "Lås datamaskinen...",IDC_LOCK, 7, 76, 74, 14 PUSHBUTTON "Logg av...",IDC_LOGOFF, 86, 76, 78, 14 PUSHBUTTON "Avslutt...",IDC_SHUTDOWN, 170, 76, 70, 14 - LTEXT "Hva vil du gjøre?",IDC_STATIC, 92, 60, 87, 8 - PUSHBUTTON "Lås datamaskinen...",IDC_LOCK, 7, 76, 74, 14 PUSHBUTTON "Oppgavebehandling...",IDC_TASKMGR, 86, 95, 78, 14 - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + PUSHBUTTON "Avbryt",IDCANCEL, 170, 95, 70, 14 END STRINGTABLE Modified: trunk/reactos/dll/win32/msgina/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/pl-P… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] Fri May 14 19:12:35 2010 @@ -29,14 +29,14 @@ CAPTION "Logon" FONT 8,"MS Shell Dlg",400,0,1 BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 + LTEXT "Nazwa u¿ytkownika:",IDC_STATIC, 11, 75, 70, 8 + EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL + LTEXT "Has³o:",IDC_STATIC, 56, 93, 27, 8 + EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "OK",IDOK,51,122,50,14,BS_DEFPUSHBUTTON PUSHBUTTON "Anuluj",IDCANCEL,115,122,50,14 PUSHBUTTON "Wy³¹cz",IDC_SHUTDOWN,179,122,50,14 - LTEXT "Nazwa u¿ytkownika:",IDC_STATIC, 11, 75, 70, 8 - LTEXT "Has³o:",IDC_STATIC, 56, 93, 27, 8 - EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL - EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 END IDD_LOGGEDON_DLG DIALOGEX 0,0,247,116 @@ -44,13 +44,13 @@ CAPTION "Bezpieczeñstwo" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - PUSHBUTTON "Anuluj",IDCANCEL,170,95,70,14 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + LTEXT "Co chcesz teraz zrobiæ?",IDC_STATIC,86,60,87,8 + PUSHBUTTON "Blokada komputera",IDC_LOCK,10,76,70,14 PUSHBUTTON "Wyloguj",IDC_LOGOFF,90,76,70,14 PUSHBUTTON "Wy³¹cz",IDC_SHUTDOWN,170,76,70,14 - LTEXT "Co chcesz teraz zrobiæ?",IDC_STATIC,86,60,87,8 - PUSHBUTTON "Blokada komputera",IDC_LOCK,10,76,70,14 PUSHBUTTON "Mened¿er zadañ",IDC_TASKMGR,90,95,70,14 - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + PUSHBUTTON "Anuluj",IDCANCEL,170,95,70,14 END STRINGTABLE Modified: trunk/reactos/dll/win32/msgina/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ro-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] Fri May 14 19:12:35 2010 @@ -1,10 +1,10 @@ -LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL +ï»¿LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL #pragma code_page(65001) IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "VÄ rugÄm aÈteptaÈi..." +CAPTION "Va rugam a?tepta?i..." FONT 8,"MS Shell Dlg",400,0,1 BEGIN LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS @@ -16,7 +16,7 @@ FONT 8,"MS Shell Dlg",400,0,1 BEGIN ICON IDI_LOCKICON, -1, 7, 5, 32, 32 - LTEXT "ApÄsaÈi combinaÈia de taste Ctrl-Alt-Del",IDC_STATIC, 38, 10, 144, 14 + LTEXT "Apasa?i combina?ia de taste Ctrl-Alt-Del",IDC_STATIC, 38, 10, 144, 14 END IDD_LOGGEDOUT_DLG DIALOGEX 0,0,275,147 @@ -24,14 +24,14 @@ CAPTION "Autentificare" FONT 8,"MS Shell Dlg",400,0,1 BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 + LTEXT "Nume utilizator:",IDC_STATIC,36,75,40,8 + EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL + LTEXT "Parola:",IDC_STATIC,36,93,42,8 + EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "OK",IDOK,51,122,50,14,BS_DEFPUSHBUTTON PUSHBUTTON "Anulare",IDCANCEL,115,122,50,14 PUSHBUTTON "Ãnchidere",IDC_SHUTDOWN,179,122,50,14 - LTEXT "Nume utilizator:",IDC_STATIC,36,75,40,8 - LTEXT "ParolÄ:",IDC_STATIC,36,93,42,8 - EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL - EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 END IDD_LOGGEDON_DLG DIALOGEX 0,0,247,116 @@ -39,23 +39,23 @@ CAPTION "Securitate" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - PUSHBUTTON "Anulare",IDCANCEL,170,95,70,14 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + LTEXT "Ce vre?i sa face?i?",IDC_STATIC,86,60,87,8 + PUSHBUTTON "Blocare computer",IDC_LOCK,10,76,70,14 PUSHBUTTON "Deautentificare",IDC_LOGOFF,90,76,70,14 PUSHBUTTON "Ãnchidere",IDC_SHUTDOWN,170,76,70,14 - LTEXT "Ce vreÈi sÄ faceÈi?",IDC_STATIC,86,60,87,8 - PUSHBUTTON "Blocare computer",IDC_LOCK,10,76,70,14 - PUSHBUTTON "Gestionar activitÄÈi",IDC_TASKMGR,90,95,70,14 - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + PUSHBUTTON "Gestionar activita?i",IDC_TASKMGR,90,95,70,14 + PUSHBUTTON "Anulare",IDCANCEL,170,95,70,14 END STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Bun venit!" IDS_LOCKEDSAS "Computerul este acum blocat." - IDS_PRESSCTRLALTDELETE "ApÄsaÈi Control+Alt+Delete pentru a vÄ autentifica." + IDS_PRESSCTRLALTDELETE "Apasa?i Control+Alt+Delete pentru a va autentifica." IDS_ASKFORUSER "Nume utilizator: " - IDS_ASKFORPASSWORD "ParolÄ: " - IDS_FORCELOGOFF "AceastÄ acÈiune va Ã®nchide sesiunea utilizatorului curent Èi va pierde datele nesalvate de acesta. Sigur continuaÈi?" + IDS_ASKFORPASSWORD "Parola: " + IDS_FORCELOGOFF "Aceasta ac?iune va Ã®nchide sesiunea utilizatorului curent ?i va pierde datele nesalvate de acesta. Sigur continua?i?" END #pragma code_page(default) Modified: trunk/reactos/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] Fri May 14 19:12:35 2010 @@ -24,14 +24,14 @@ CAPTION "Âõîä" FONT 8,"MS Shell Dlg",400,0,1 BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 + RTEXT "Èìÿ ïîëüçîâàòåëÿ:", IDC_STATIC, 6, 75, 70, 8 + EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL + RTEXT "Ïàðîëü:", IDC_STATIC, 6, 93, 70, 8 + EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "OK", IDOK, 47, 122, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Îòìåíà", IDCANCEL, 109, 122, 50, 14 PUSHBUTTON "Âûêëþ÷åíèå", IDC_SHUTDOWN, 171, 122, 58, 14 - RTEXT "Èìÿ ïîëüçîâàòåëÿ:", IDC_STATIC, 6, 75, 70, 8 - RTEXT "Ïàðîëü:", IDC_STATIC, 6, 93, 70, 8 - EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL - EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 END IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 116 @@ -39,13 +39,13 @@ CAPTION "Áåçîïàñíîñòü" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - PUSHBUTTON "Îòìåíà", IDCANCEL, 198, 95, 70, 14 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + LTEXT "Âûáåðèòå íåîáõîäèìîå äåéñòâèå:", IDC_STATIC, 7, 60, 123, 8 + PUSHBUTTON "Çàáëîêèðîâàòü", IDC_LOCK, 7, 76, 86, 14 PUSHBUTTON "Çàâåðøåíèå ñåàíñà", IDC_LOGOFF, 102, 76, 86, 14 PUSHBUTTON "Âûêëþ÷åíèå",IDC_SHUTDOWN, 198, 76, 70, 14 - LTEXT "Âûáåðèòå íåîáõîäèìîå äåéñòâèå:", IDC_STATIC, 7, 60, 123, 8 - PUSHBUTTON "Çàáëîêèðîâàòü", IDC_LOCK, 7, 76, 86, 14 PUSHBUTTON "Äèñïåò÷åð çàäà÷",IDC_TASKMGR, 102, 95, 86, 14 - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + PUSHBUTTON "Îòìåíà", IDCANCEL, 198, 95, 70, 14 END STRINGTABLE Modified: trunk/reactos/dll/win32/msgina/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/sk-S… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] Fri May 14 19:12:35 2010 @@ -26,14 +26,14 @@ CAPTION "Prihlásenie" FONT 8,"MS Shell Dlg",400,0,1 BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 + LTEXT "Meno pouívate¾a:",IDC_STATIC,18, 75, 64, 8 + EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL + LTEXT "Heslo:",IDC_STATIC,56, 93, 24, 8 + EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "OK",IDOK,51,122,50,14,BS_DEFPUSHBUTTON PUSHBUTTON "Zrui",IDCANCEL,115,122,50,14 PUSHBUTTON "Vypnú",IDC_SHUTDOWN,179,122,50,14 - LTEXT "Meno pouívate¾a:",IDC_STATIC,18, 75, 64, 8 - LTEXT "Heslo:",IDC_STATIC,56, 93, 24, 8 - EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL - EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 END IDD_LOGGEDON_DLG DIALOGEX 0,0,247,116 @@ -41,13 +41,13 @@ CAPTION "Bezpeènos" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - PUSHBUTTON "Zrui",IDCANCEL,170,95,70,14 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + LTEXT "Èo chcete urobi?",IDC_STATIC,86,60,87,8 + PUSHBUTTON "Uzamknú poèítaè",IDC_LOCK,10,76,70,14 PUSHBUTTON "Odhlási",IDC_LOGOFF,90,76,70,14 PUSHBUTTON "Vypnú",IDC_SHUTDOWN,170,76,70,14 - LTEXT "Èo chcete urobi?",IDC_STATIC,86,60,87,8 - PUSHBUTTON "Uzamknú poèítaè",IDC_LOCK,10,76,70,14 PUSHBUTTON "Správca úloh",IDC_TASKMGR,90,95,70,14 - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + PUSHBUTTON "Zrui",IDCANCEL,170,95,70,14 END STRINGTABLE Modified: trunk/reactos/dll/win32/msgina/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/uk-U… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] Fri May 14 19:12:35 2010 @@ -30,14 +30,14 @@ CAPTION "Âõ³ä" FONT 8,"MS Shell Dlg",400,0,1 BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 + LTEXT "Êîðèñòóâà÷:",IDC_STATIC,33, 75, 48, 8 + EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL + LTEXT "Ïàðîëü:",IDC_STATIC,48, 93, 34, 8 + EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "OK",IDOK,37, 122, 50, 14,BS_DEFPUSHBUTTON PUSHBUTTON "Ñêàñóâàòè",IDCANCEL,93, 122, 50, 14 PUSHBUTTON "Çàâåðøåííÿ ðîáîòè...",IDC_SHUTDOWN,148, 122, 86, 14 - LTEXT "Êîðèñòóâà÷:",IDC_STATIC,33, 75, 48, 8 - LTEXT "Ïàðîëü:",IDC_STATIC,48, 93, 34, 8 - EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL - EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 END IDD_LOGGEDON_DLG DIALOGEX 0, 0, 257, 116 @@ -45,13 +45,13 @@ CAPTION "Áåçïåêà" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - PUSHBUTTON "Ñêàñóâàòè",IDCANCEL, 165, 95, 86, 14 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + LTEXT "Ùî Âè õî÷åòå çðîáèòè?",IDC_STATIC, 86, 60, 87, 8 + PUSHBUTTON "Áëîêóâàííÿ",IDC_LOCK, 6, 76, 70, 14 PUSHBUTTON "Âèõ³ä ³ç ñèñòåìè...",IDC_LOGOFF, 80, 76, 80, 14 PUSHBUTTON "Çàâåðøåííÿ ðîáîòè...",IDC_SHUTDOWN, 165, 76, 86, 14 - LTEXT "Ùî Âè õî÷åòå çðîáèòè?",IDC_STATIC, 86, 60, 87, 8 - PUSHBUTTON "Áëîêóâàííÿ",IDC_LOCK, 6, 76, 70, 14 PUSHBUTTON "Äèñïåò÷åð çàâäàíü",IDC_TASKMGR, 80, 95, 80, 14 - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + PUSHBUTTON "Ñêàñóâàòè",IDCANCEL, 165, 95, 86, 14 END STRINGTABLE

14 years, 4 months

[ekohl] 47198: [WINLOGON] - Store all environment variables that were passed from msgina.dll in the volatile environment key. - Add the APPDATA environment variable to the volatile environment. Unfortunately SHGetFolderPath does not seem to expand the appdata path. Bug or Feature?? - Create the environment block for the shell process after the volatile environment key has been filled, so its variables are included. - Yet another step to fixing bug #4102.

by ekohl＠svn.reactos.org

Author: ekohl Date: Fri May 14 19:08:20 2010 New Revision: 47198 URL: http://svn.reactos.org/svn/reactos?rev=47198&view=rev Log: [WINLOGON] - Store all environment variables that were passed from msgina.dll in the volatile environment key. - Add the APPDATA environment variable to the volatile environment. Unfortunately SHGetFolderPath does not seem to expand the appdata path. Bug or Feature?? - Create the environment block for the shell process after the volatile environment key has been filled, so its variables are included. - Yet another step to fixing bug #4102. Modified: trunk/reactos/base/system/winlogon/environment.c trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/winlogon.h Modified: trunk/reactos/base/system/winlogon/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/envir… ============================================================================== --- trunk/reactos/base/system/winlogon/environment.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/environment.c [iso-8859-1] Fri May 14 19:08:20 2010 @@ -11,6 +11,7 @@ /* INCLUDES *****************************************************************/ #include "winlogon.h" +#include <shlobj.h> #include <wine/debug.h> @@ -18,74 +19,104 @@ /* GLOBALS ******************************************************************/ +typedef HRESULT (WINAPI *PFSHGETFOLDERPATHW)(HWND, int, HANDLE, DWORD, LPWSTR); + /* FUNCTIONS ****************************************************************/ +static VOID +BuildVolatileEnvironment(IN PWLSESSION Session, + IN HKEY hKey) +{ + HINSTANCE hShell32 = NULL; + PFSHGETFOLDERPATHW pfSHGetFolderPathW = NULL; + WCHAR szPath[MAX_PATH + 1]; + LPCWSTR wstr; + SIZE_T size; + + WCHAR szEnvKey[MAX_PATH]; + WCHAR szEnvValue[1024]; + + SIZE_T length; + LPWSTR eqptr, endptr; + + if (Session->Profile->dwType == WLX_PROFILE_TYPE_V2_0 && + Session->Profile->pszEnvironment != NULL) + { + wstr = Session->Profile->pszEnvironment; + while (*wstr != UNICODE_NULL) + { + size = wcslen(wstr) + 1; + + eqptr = wcschr(wstr, L'='); + + if (eqptr != NULL) + { + endptr = eqptr; + + endptr--; + while (iswspace(*endptr)) + endptr--; + + length = (SIZE_T)(endptr - wstr + 1); + + wcsncpy(szEnvKey, wstr, length); + szEnvKey[length] = 0; + + eqptr++; + while (iswspace(*eqptr)) + eqptr++; + wcscpy(szEnvValue, eqptr); + + RegSetValueExW(hKey, + szEnvKey, + 0, + REG_SZ, + (LPBYTE)szEnvValue, + (wcslen(szEnvValue) + 1) * sizeof(WCHAR)); + } + + wstr += size; + } + } + + + hShell32 = LoadLibraryW(L"shell32.dll"); + if (hShell32 != NULL) + { + pfSHGetFolderPathW = (PFSHGETFOLDERPATHW)GetProcAddress(hShell32, + "SHGetFolderPathW"); + if (pfSHGetFolderPathW != NULL) + { + if (pfSHGetFolderPathW(NULL, + CSIDL_APPDATA | CSIDL_FLAG_DONT_VERIFY, + Session->UserToken, + 0, + szPath) == S_OK) + { + RegSetValueExW(hKey, + L"APPDATA", + 0, + REG_SZ, + (LPBYTE)szPath, + (wcslen(szPath) + 1) * sizeof(WCHAR)); + } + } + + FreeLibrary(hShell32); + } +} + + BOOL -CreateUserEnvironment(IN PWLSESSION Session, - IN LPVOID *lpEnvironment, - IN LPWSTR *lpFullEnv) +CreateUserEnvironment(IN PWLSESSION Session) { - LPCWSTR wstr; - SIZE_T EnvBlockSize = 0, ProfileSize = 0; - LPVOID lpEnviron = NULL; - LPWSTR lpFullEnviron = NULL; HKEY hKey; DWORD dwDisp; LONG lError; HKEY hKeyCurrentUser; TRACE("WL: CreateUserEnvironment called\n"); - - /* Create environment block for the user */ - if (!CreateEnvironmentBlock(&lpEnviron, - Session->UserToken, - TRUE)) - { - WARN("WL: CreateEnvironmentBlock() failed\n"); - return FALSE; - } - - if (Session->Profile->dwType == WLX_PROFILE_TYPE_V2_0 && Session->Profile->pszEnvironment) - { - /* Count required size for full environment */ - wstr = (LPCWSTR)lpEnviron; - while (*wstr != UNICODE_NULL) - { - SIZE_T size = wcslen(wstr) + 1; - wstr += size; - EnvBlockSize += size; - } - - wstr = Session->Profile->pszEnvironment; - while (*wstr != UNICODE_NULL) - { - SIZE_T size = wcslen(wstr) + 1; - wstr += size; - ProfileSize += size; - } - - /* Allocate enough memory */ - lpFullEnviron = HeapAlloc(GetProcessHeap(), 0, (EnvBlockSize + ProfileSize + 1) * sizeof(WCHAR)); - if (!lpFullEnviron) - { - TRACE("HeapAlloc() failed\n"); - return FALSE; - } - - /* Fill user environment block */ - CopyMemory(lpFullEnviron, - lpEnviron, - EnvBlockSize * sizeof(WCHAR)); - CopyMemory(&lpFullEnviron[EnvBlockSize], - Session->Profile->pszEnvironment, - ProfileSize * sizeof(WCHAR)); - lpFullEnviron[EnvBlockSize + ProfileSize] = UNICODE_NULL; - } - else - { - lpFullEnviron = (LPWSTR)lpEnviron; - } /* Impersonate the new user */ ImpersonateLoggedOnUser(Session->UserToken); @@ -107,6 +138,9 @@ &dwDisp); if (lError == ERROR_SUCCESS) { + BuildVolatileEnvironment(Session, + hKey); + RegCloseKey(hKey); } else @@ -120,9 +154,6 @@ /* Revert the impersonation */ RevertToSelf(); - *lpEnvironment = lpEnviron; - *lpFullEnv = lpFullEnviron; - TRACE("WL: CreateUserEnvironment done\n"); return TRUE; Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Fri May 14 19:08:20 2010 @@ -170,7 +170,6 @@ { PROFILEINFOW ProfileInfo; LPVOID lpEnvironment = NULL; - LPWSTR lpFullEnv = NULL; BOOLEAN Old; BOOL ret = FALSE; @@ -208,9 +207,16 @@ } /* Create environment block for the user */ - if (!CreateUserEnvironment(Session, &lpEnvironment, &lpFullEnv)) + if (!CreateUserEnvironment(Session)) { WARN("WL: SetUserEnvironment() failed\n"); + goto cleanup; + } + + /* Create environment block for the user */ + if (!CreateEnvironmentBlock(&lpEnvironment, Session->UserToken, TRUE)) + { + WARN("WL: CreateEnvironmentBlock() failed\n"); goto cleanup; } @@ -233,7 +239,7 @@ Session->Gina.Context, L"Default", NULL, /* FIXME */ - lpFullEnv)) + lpEnvironment)) { //WCHAR StatusMsg[256]; WARN("WL: WlxActivateUserShell() failed\n"); @@ -260,8 +266,6 @@ { UnloadUserProfile(WLSession->UserToken, ProfileInfo.hProfile); } - if (lpFullEnv != lpEnvironment) - HeapFree(GetProcessHeap(), 0, lpFullEnv); if (lpEnvironment) DestroyEnvironmentBlock(lpEnvironment); RemoveStatusMessage(Session); Modified: trunk/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] Fri May 14 19:08:20 2010 @@ -182,9 +182,7 @@ /* environment.c */ BOOL -CreateUserEnvironment(IN PWLSESSION Session, - IN LPVOID *lpEnvironment, - IN LPWSTR *lpFullEnv); +CreateUserEnvironment(IN PWLSESSION Session); /* sas.c */ BOOL

14 years, 4 months

[janderwald] 47197: [PORTCLS] - Don't request initializing delayed service request as this is the task of the miniport driver - Reimplement the service group object: - Use the initialized timer object when RequestService is called - Fix possible race conditions when adding / removing a service sink by protecting it with a lock - Acquire the service group list lock when executing the shared dpc routine

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri May 14 17:47:00 2010 New Revision: 47197 URL: http://svn.reactos.org/svn/reactos?rev=47197&view=rev Log: [PORTCLS] - Don't request initializing delayed service request as this is the task of the miniport driver - Reimplement the service group object: - Use the initialized timer object when RequestService is called - Fix possible race conditions when adding / removing a service sink by protecting it with a lock - Acquire the service group list lock when executing the shared dpc routine Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp [iso-8859-1] Fri May 14 17:47:00 2010 @@ -602,7 +602,6 @@ DPRINT("Failed to add pin to service group\n"); return Status; } - m_ServiceGroup->SupportDelayedService(); } Status = m_IrpQueue->Init(ConnectDetails, 0, 0, NULL); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] Fri May 14 17:47:00 2010 @@ -1213,7 +1213,6 @@ return Status; } - m_ServiceGroup->SupportDelayedService(); m_Stream->SetState(KSSTATE_STOP); m_State = KSSTATE_STOP; m_CommonBufferOffset = 0; @@ -1224,6 +1223,8 @@ m_Delay = Int32x32To64(10, -10000); Status = m_Stream->SetNotificationFreq(10, &m_FrameSize); + PC_ASSERT(NT_SUCCESS(Status)); + PC_ASSERT(m_FrameSize); SilenceBuffer = AllocateItem(NonPagedPool, m_FrameSize, TAG_PORTCLASS); if (!SilenceBuffer) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp [iso-8859-1] Fri May 14 17:47:00 2010 @@ -815,7 +815,6 @@ DPRINT("Failed to add pin to service group\n"); return Status; } - m_ServiceGroup->SupportDelayedService(); } // delay of 10 milisec Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.cpp [iso-8859-1] Fri May 14 17:47:00 2010 @@ -54,12 +54,10 @@ LIST_ENTRY m_ServiceSinkHead; - BOOL m_Initialized; - BOOL m_TimerActive; + BOOL m_TimerInitialized; KTIMER m_Timer; KDPC m_Dpc; - KEVENT m_Event; - LONG m_ThreadActive; + KSPIN_LOCK m_Lock; friend VOID NTAPI IServiceGroupDpc(IN struct _KDPC *Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, IN PVOID SystemArgument2); @@ -105,9 +103,16 @@ CServiceGroup::CServiceGroup(IUnknown * OuterUnknown) { + // initialize dpc KeInitializeDpc(&m_Dpc, IServiceGroupDpc, (PVOID)this); + + // set highest importance KeSetImportanceDpc(&m_Dpc, HighImportance); - KeInitializeEvent(&m_Event, NotificationEvent, FALSE); + + // initialize service group list lock + KeInitializeSpinLock(&m_Lock); + + // initialize service group list InitializeListHead(&m_ServiceSinkHead); } @@ -119,15 +124,34 @@ DPRINT("CServiceGroup::RequestService() Dpc at Level %u\n", KeGetCurrentIrql()); - if (KeGetCurrentIrql() > DISPATCH_LEVEL) - { - KeInsertQueueDpc(&m_Dpc, NULL, NULL); - return; - } - - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - KeInsertQueueDpc(&m_Dpc, NULL, NULL); - KeLowerIrql(OldIrql); + if (m_TimerInitialized) + { + LARGE_INTEGER DueTime; + + // no due time + DueTime.QuadPart = 0LL; + + // delayed service requested + KeSetTimer(&m_Timer, DueTime, &m_Dpc); + } + else + { + // check curent irql + if (KeGetCurrentIrql() > DISPATCH_LEVEL) + { + //insert dpc to queue + KeInsertQueueDpc(&m_Dpc, NULL, NULL); + } + else + { + // raise irql to dispatch level to make dpc fire immediately + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + // insert dpc to queue + KeInsertQueueDpc(&m_Dpc, NULL, NULL); + // lower irql to old level + KeLowerIrql(OldIrql); + } + } } //--------------------------------------------------------------- @@ -140,17 +164,32 @@ IN PSERVICESINK pServiceSink) { PGROUP_ENTRY Entry; - + KIRQL OldLevel; + + // sanity check PC_ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); + // allocate service sink entry Entry = (PGROUP_ENTRY)AllocateItem(NonPagedPool, sizeof(GROUP_ENTRY), TAG_PORTCLASS); if (!Entry) + { + // out of memory return STATUS_INSUFFICIENT_RESOURCES; - + } + + // initialize service sink entry Entry->pServiceSink = pServiceSink; + // increment reference count pServiceSink->AddRef(); + // acquire service group list lock + KeAcquireSpinLock(&m_Lock, &OldLevel); + + // insert into service sink list InsertTailList(&m_ServiceSinkHead, &Entry->Entry); + + // release service group list lock + KeReleaseSpinLock(&m_Lock, OldLevel); return STATUS_SUCCESS; } @@ -162,22 +201,44 @@ { PLIST_ENTRY CurEntry; PGROUP_ENTRY Entry; - + KIRQL OldLevel; + + // sanity check PC_ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); + // acquire service group list lock + KeAcquireSpinLock(&m_Lock, &OldLevel); + + // grab first entry CurEntry = m_ServiceSinkHead.Flink; + + // loop list until the passed entry is found while (CurEntry != &m_ServiceSinkHead) { + // grab entry Entry = CONTAINING_RECORD(CurEntry, GROUP_ENTRY, Entry); + + // check if it matches the passed entry if (Entry->pServiceSink == pServiceSink) { + // remove entry from list RemoveEntryList(&Entry->Entry); + + // release service sink reference pServiceSink->Release(); + + // free service sink entry FreeItem(Entry, TAG_PORTCLASS); - return; + + // leave loop + break; } + // move to next entry CurEntry = CurEntry->Flink; } + + // release service group list lock + KeReleaseSpinLock(&m_Lock, OldLevel); } @@ -194,73 +255,40 @@ PGROUP_ENTRY Entry; CServiceGroup * This = (CServiceGroup*)DeferredContext; + // acquire service group list lock + KeAcquireSpinLockAtDpcLevel(&This->m_Lock); + + // grab first entry CurEntry = This->m_ServiceSinkHead.Flink; + + // loop the list and call the attached service sink/group while (CurEntry != &This->m_ServiceSinkHead) { + //grab current entry Entry = (PGROUP_ENTRY)CONTAINING_RECORD(CurEntry, GROUP_ENTRY, Entry); + + // call service sink/group Entry->pServiceSink->RequestService(); + + // move to next entry CurEntry = CurEntry->Flink; } -} - - -#if 0 -VOID -NTAPI -ServiceGroupThread(IN PVOID StartContext) -{ - NTSTATUS Status; - KWAIT_BLOCK WaitBlockArray[2]; - PVOID WaitObjects[2]; - CServiceGroup * This = (CServiceGroup*)StartContext; - - // Set thread state - InterlockedIncrement(&This->m_ThreadActive); - - // Setup the wait objects - WaitObjects[0] = &m_Timer; - WaitObjects[1] = &m_Event; - - do - { - // Wait on our objects - Status = KeWaitForMultipleObjects(2, WaitObjects, WaitAny, Executive, KernelMode, FALSE, NULL, WaitBlockArray); - - switch(Status) - { - case STATUS_WAIT_0: - IServiceGroupDpc(&This->m_Dpc, (PVOID)This, NULL, NULL); - break; - case STATUS_WAIT_1: - PsTerminateSystemThread(STATUS_SUCCESS); - return; - } - }while(TRUE); -} - -#endif + + // release service group list lock + KeReleaseSpinLockFromDpcLevel(&This->m_Lock); +} + VOID NTAPI CServiceGroup::SupportDelayedService() { - //NTSTATUS Status; - //HANDLE ThreadHandle; - PC_ASSERT_IRQL(DISPATCH_LEVEL); - if (m_Initialized) - return; - - KeInitializeTimerEx(&m_Timer, NotificationTimer); - -#if 0 - Status = PsCreateSystemThread(&ThreadHandle, THREAD_ALL_ACCESS, NULL, 0, NULL, ServiceGroupThread, (PVOID)This); - if (NT_SUCCESS(Status)) - { - ZwClose(ThreadHandle); - m_Initialized = TRUE; - } -#endif + // initialize the timer + KeInitializeTimer(&m_Timer); + + // use the timer to perform service requests + m_TimerInitialized = TRUE; } VOID @@ -270,17 +298,14 @@ { LARGE_INTEGER DueTime; + // sanity check PC_ASSERT_IRQL(DISPATCH_LEVEL); + PC_ASSERT(m_TimerInitialized); DueTime.QuadPart = ullDelay; - if (m_Initialized) - { - if (KeGetCurrentIrql() <= DISPATCH_LEVEL) - KeSetTimer(&m_Timer, DueTime, &m_Dpc); - else - KeInsertQueueDpc(&m_Dpc, NULL, NULL); - } + // set the timer + KeSetTimer(&m_Timer, DueTime, &m_Dpc); } VOID @@ -288,11 +313,10 @@ CServiceGroup::CancelDelayedService() { PC_ASSERT_IRQL(DISPATCH_LEVEL); - - if (m_Initialized) - { - KeCancelTimer(&m_Timer); - } + PC_ASSERT(m_TimerInitialized); + + // cancel the timer + KeCancelTimer(&m_Timer); } NTSTATUS @@ -303,19 +327,31 @@ { CServiceGroup * This; NTSTATUS Status; + DPRINT("PcNewServiceGroup entered\n"); + //FIXME support aggregation + PC_ASSERT(OuterUnknown == NULL); + + // allocate a service group object This = new(NonPagedPool, TAG_PORTCLASS)CServiceGroup(OuterUnknown); + if (!This) + { + // out of memory return STATUS_INSUFFICIENT_RESOURCES; - + } + + // request IServiceSink interface Status = This->QueryInterface(IID_IServiceSink, (PVOID*)OutServiceGroup); if (!NT_SUCCESS(Status)) { + // failed to acquire service sink interface delete This; return Status; } + // done return Status; }

14 years, 4 months

[akhaldi] 47196: [INTRIN_ARM] - Implement __yield and __break arm intrinsics. [DDK] - Relax INTERLOCKED_RESULT conditional definition. [PSDK] - Fix some nasty structure misalignments. - Fix YieldProcessor definition for ARM. [ARMDDK] - Add several missing definitions.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri May 14 13:45:14 2010 New Revision: 47196 URL: http://svn.reactos.org/svn/reactos?rev=47196&view=rev Log: [INTRIN_ARM] - Implement __yield and __break arm intrinsics. [DDK] - Relax INTERLOCKED_RESULT conditional definition. [PSDK] - Fix some nasty structure misalignments. - Fix YieldProcessor definition for ARM. [ARMDDK] - Add several missing definitions. Modified: branches/header-work/include/crt/mingw32/intrin_arm.h branches/header-work/include/ddk/ntddk.h branches/header-work/include/psdk/winnt.h branches/header-work/include/reactos/arm/armddk.h Modified: branches/header-work/include/crt/mingw32/intrin_arm.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/crt/mingw32… ============================================================================== --- branches/header-work/include/crt/mingw32/intrin_arm.h [iso-8859-1] (original) +++ branches/header-work/include/crt/mingw32/intrin_arm.h [iso-8859-1] Fri May 14 13:45:14 2010 @@ -34,6 +34,10 @@ #define _ReturnAddress() (__builtin_return_address(0)) #define _ReadWriteBarrier() __sync_synchronize() + +__INTRIN_INLINE void __yield(void) { __asm__ __volatile__("yield"); } + +__INTRIN_INLINE void __break(unsigned int value) { __asm__ __volatile__("bkpt %0": : "M" (value)); } __INTRIN_INLINE unsigned short _byteswap_ushort(unsigned short value) { Modified: branches/header-work/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntddk.h… ============================================================================== --- branches/header-work/include/ddk/ntddk.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ntddk.h [iso-8859-1] Fri May 14 13:45:14 2010 @@ -3289,13 +3289,11 @@ #define RESULT_POSITIVE 2 #endif -#if defined(_X86_) || defined(_IA64_) || defined(_M_AMD64) && !defined(RC_INVOKED) && !defined(MIDL_PASS) typedef enum _INTERLOCKED_RESULT { ResultNegative = RESULT_NEGATIVE, ResultZero = RESULT_ZERO, ResultPositive = RESULT_POSITIVE } INTERLOCKED_RESULT; -#endif #ifdef _X86_ Modified: branches/header-work/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/winnt.… ============================================================================== --- branches/header-work/include/psdk/winnt.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/winnt.h [iso-8859-1] Fri May 14 13:45:14 2010 @@ -3760,6 +3760,7 @@ } IMAGE_SECTION_HEADER,*PIMAGE_SECTION_HEADER; #include <pshpack2.h> + typedef struct _IMAGE_SYMBOL { union { BYTE ShortName[8]; @@ -3818,6 +3819,17 @@ } Section; } IMAGE_AUX_SYMBOL,*PIMAGE_AUX_SYMBOL; +typedef struct _IMAGE_RELOCATION { + _ANONYMOUS_UNION union { + DWORD VirtualAddress; + DWORD RelocCount; + } DUMMYUNIONNAME; + DWORD SymbolTableIndex; + WORD Type; +} IMAGE_RELOCATION,*PIMAGE_RELOCATION; + +#include <poppack.h> + #ifndef __IMAGE_COR20_HEADER_DEFINED__ #define __IMAGE_COR20_HEADER_DEFINED__ @@ -3884,16 +3896,6 @@ DWORD RvaToFirstByteOfData; DWORD RvaToLastByteOfData; } IMAGE_COFF_SYMBOLS_HEADER,*PIMAGE_COFF_SYMBOLS_HEADER; - -typedef struct _IMAGE_RELOCATION { - _ANONYMOUS_UNION union { - DWORD VirtualAddress; - DWORD RelocCount; - } DUMMYUNIONNAME; - DWORD SymbolTableIndex; - WORD Type; -} IMAGE_RELOCATION,*PIMAGE_RELOCATION; -#include <poppack.h> typedef struct _IMAGE_BASE_RELOCATION { DWORD VirtualAddress; @@ -5081,7 +5083,7 @@ #elif defined(_M_MIPS) #define YieldProcessor() __asm__ __volatile__("nop"); #elif defined(_M_ARM) -#define YieldProcessor() +#define YieldProcessor __yield #else #error Unknown architecture #endif Modified: branches/header-work/include/reactos/arm/armddk.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/reactos/arm… ============================================================================== --- branches/header-work/include/reactos/arm/armddk.h [iso-8859-1] (original) +++ branches/header-work/include/reactos/arm/armddk.h [iso-8859-1] Fri May 14 13:45:14 2010 @@ -189,6 +189,36 @@ NTAPI KeGetCurrentThread(VOID); +extern volatile struct _KSYSTEM_TIME KeTickCount; + +#ifndef YieldProcessor +#define YieldProcessor __yield +#endif + +#define ASSERT_BREAKPOINT BREAKPOINT_COMMAND_STRING + 1 + +#define DbgRaiseAssertionFailure() __break(ASSERT_BREAKPOINT) + +#define PCR_MINOR_VERSION 1 +#define PCR_MAJOR_VERSION 1 + +#define RESULT_ZERO 0 +#define RESULT_NEGATIVE 1 +#define RESULT_POSITIVE 2 + +DECLSPEC_IMPORT +VOID +__fastcall +KfReleaseSpinLock( + IN OUT ULONG_PTR* SpinLock, + IN KIRQL NewIrql); + +DECLSPEC_IMPORT +KIRQL +__fastcall +KfAcquireSpinLock( + IN OUT ULONG_PTR* SpinLock); + #ifndef _WINNT_H // // IRQL Support on ARM is similar to MIPS/ALPHA

14 years, 4 months

← Newer
1
...
28
29
30
31
32
33
34
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2010