Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 31662: Add layout support for CreateCompatibleDC.
by jimtabor＠svn.reactos.org 08 Jan '08

08 Jan '08

Author: jimtabor Date: Tue Jan 8 08:29:13 2008 New Revision: 31662 URL: http://svn.reactos.org/svn/reactos?rev=31662&view=rev Log: Add layout support for CreateCompatibleDC. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Tue Jan 8 08:29:13 2008 @@ -62,6 +62,7 @@ HDC hNewDC, DisplayDC; HRGN hVisRgn; UNICODE_STRING DriverName; + DWORD Layout = 0; DisplayDC = NULL; if (hDC == NULL) @@ -142,6 +143,8 @@ nDc_Attr->crBackgroundClr = oDc_Attr->crBackgroundClr; nDc_Attr->jBkMode = oDc_Attr->jBkMode; nDc_Attr->jROP2 = oDc_Attr->jROP2; + nDc_Attr->dwLayout = oDc_Attr->dwLayout; + if (oDc_Attr->dwLayout & LAYOUT_ORIENTATIONMASK) Layout = oDc_Attr->dwLayout; DC_UnlockDc(NewDC); DC_UnlockDc(OrigDC); @@ -153,6 +156,7 @@ hVisRgn = NtGdiCreateRectRgn(0, 0, 1, 1); IntGdiSelectVisRgn(hNewDC, hVisRgn); NtGdiDeleteObject(hVisRgn); + if (Layout) NtGdiSetLayout( hNewDC, -1, Layout); DC_InitDC(hNewDC); return hNewDC;

1 0

[tkreuzer] 31661: change gdi object deleting mechanism to a windows compatible one.
by tkreuzer＠svn.reactos.org 08 Jan '08

08 Jan '08

Author: tkreuzer Date: Tue Jan 8 08:04:52 2008 New Revision: 31661 URL: http://svn.reactos.org/svn/reactos?rev=31661&view=rev Log: change gdi object deleting mechanism to a windows compatible one. Modified: trunk/reactos/subsystems/win32/win32k/include/gdiobj.h trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/include/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/gdiobj.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/gdiobj.h Tue Jan 8 08:04:52 2008 @@ -24,9 +24,9 @@ ////////////////////////////////////////////////////////////////////////////// PPAGED_LOOKASIDE_LIST LookasideLists; - SLIST_HEADER FreeEntriesHead; - SLIST_ENTRY FreeEntries[((GDI_HANDLE_COUNT * sizeof(GDI_TABLE_ENTRY)) << 3) / - (sizeof(SLIST_ENTRY) << 3)]; + ULONG FirstFree; + ULONG FirstUnused; + } GDI_HANDLE_TABLE, *PGDI_HANDLE_TABLE; extern PGDI_HANDLE_TABLE GdiHandleTable; Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Tue Jan 8 08:04:52 2008 @@ -124,9 +124,7 @@ PGDI_HANDLE_TABLE HandleTable = NULL; LARGE_INTEGER htSize; UINT ObjType; - UINT i; ULONG ViewSize = 0; - PGDI_TABLE_ENTRY Entry; NTSTATUS Status; ASSERT(SectionObject != NULL); @@ -157,16 +155,6 @@ RtlZeroMemory(HandleTable, sizeof(GDI_HANDLE_TABLE)); - /* - * initialize the free entry cache - */ - InitializeSListHead(&HandleTable->FreeEntriesHead); - Entry = &HandleTable->Entries[RESERVE_ENTRIES_COUNT]; - for(i = GDI_HANDLE_COUNT - 1; i >= RESERVE_ENTRIES_COUNT; i--) - { - InterlockedPushEntrySList(&HandleTable->FreeEntriesHead, &HandleTable->FreeEntries[i]); - } - HandleTable->LookasideLists = ExAllocatePoolWithTag(NonPagedPool, BASE_OBJTYPE_COUNT * sizeof(PAGED_LOOKASIDE_LIST), TAG_GDIHNDTBLE); @@ -188,6 +176,9 @@ } ShortDelay.QuadPart = -5000LL; /* FIXME - 0.5 ms? */ + + HandleTable->FirstFree = 0; + HandleTable->FirstUnused = RESERVE_ENTRIES_COUNT; return HandleTable; } @@ -329,6 +320,69 @@ KeRosDumpStackFrames(NULL, 20); } +ULONG +FASTCALL +InterlockedPopFreeEntry(PGDI_HANDLE_TABLE HandleTable) +{ + ULONG idxFirstFree, idxNextFree, idxPrev; + PGDI_TABLE_ENTRY pFreeEntry; + + DPRINT("Enter InterLockedPopFreeEntry\n"); + + do + { + idxFirstFree = HandleTable->FirstFree; + if (idxFirstFree) + { + pFreeEntry = HandleTable->Entries + idxFirstFree; + ASSERT(((ULONG)pFreeEntry->KernelData & ~GDI_HANDLE_INDEX_MASK) == 0); + idxNextFree = (ULONG)pFreeEntry->KernelData; + idxPrev = (ULONG)_InterlockedCompareExchange((LONG*)&HandleTable->FirstFree, idxNextFree, idxFirstFree); + } + else + { + idxFirstFree = HandleTable->FirstUnused; + idxNextFree = idxFirstFree + 1; + if (idxNextFree >= GDI_HANDLE_COUNT) + { + DPRINT1("No more gdi handles left!\n"); + return 0; + } + idxPrev = (ULONG)_InterlockedCompareExchange((LONG*)&HandleTable->FirstUnused, idxNextFree, idxFirstFree); + } + } + while (idxPrev != idxFirstFree); + + return idxFirstFree; +} + +/* Pushes an entry of the handle table to the free list, + The entry must be unlocked and the base type field must be 0 */ +VOID +FASTCALL +InterlockedPushFreeEntry(PGDI_HANDLE_TABLE HandleTable, ULONG idxToFree) +{ + ULONG idxFirstFree, idxPrev; + PGDI_TABLE_ENTRY pFreeEntry; + + DPRINT("Enter InterlockedPushFreeEntry\n"); + + pFreeEntry = HandleTable->Entries + idxToFree; + ASSERT((pFreeEntry->Type & GDI_ENTRY_BASETYPE_MASK) == 0); + ASSERT(pFreeEntry->ProcessId == 0); + pFreeEntry->UserData = NULL; + + do + { + idxFirstFree = HandleTable->FirstFree; + pFreeEntry->KernelData = (PVOID)idxFirstFree; + + idxPrev = (ULONG)_InterlockedCompareExchange((LONG*)&HandleTable->FirstFree, idxToFree, idxFirstFree); + } + while (idxPrev != idxFirstFree); +} + + /*! * Allocate memory for GDI object and return handle to it. * @@ -380,7 +434,7 @@ } if(newObject != NULL) { - PSLIST_ENTRY FreeEntry; + UINT Index; PGDI_TABLE_ENTRY Entry; PGDIOBJ ObjectBody; LONG TypeInfo; @@ -407,15 +461,11 @@ (type = BRSUH, PEN, EXTPEN, basetype = BRUSH) */ TypeInfo = (ObjectType & GDI_HANDLE_BASETYPE_MASK) | (ObjectType >> GDI_ENTRY_UPPER_SHIFT); - FreeEntry = InterlockedPopEntrySList(&HandleTable->FreeEntriesHead); - if(FreeEntry != NULL) + Index = InterlockedPopFreeEntry(HandleTable); + if (Index != 0) { HANDLE PrevProcId; - UINT Index; - - /* calculate the entry from the address of the entry in the free slot array */ - Index = ((ULONG_PTR)FreeEntry - (ULONG_PTR)&HandleTable->FreeEntries[0]) / - sizeof(HandleTable->FreeEntries[0]); + Entry = &HandleTable->Entries[Index]; LockHandle: @@ -423,8 +473,6 @@ if(PrevProcId == NULL) { HGDIOBJ Handle; - - ASSERT(Entry->KernelData == NULL); Entry->KernelData = ObjectBody; @@ -554,7 +602,8 @@ if(PrevProcId == ProcessId) { if( (Entry->KernelData != NULL) && - ((Entry->Type << GDI_ENTRY_UPPER_SHIFT) == HandleUpper) ) + ((Entry->Type << GDI_ENTRY_UPPER_SHIFT) == HandleUpper) && + ((Entry->Type & GDI_ENTRY_BASETYPE_MASK) == (HandleUpper & GDI_ENTRY_BASETYPE_MASK)) ) { PGDIOBJHDR GdiHdr; @@ -565,16 +614,14 @@ BOOL Ret; PW32PROCESS W32Process = PsGetCurrentProcessWin32Process(); - /* Clear the type field so when unlocking the handle it gets finally deleted and increment reuse counter */ - Entry->Type = (Entry->Type + GDI_ENTRY_REUSE_INC) & GDI_ENTRY_REUSE_MASK; - Entry->KernelData = NULL; + /* Clear the basetype field so when unlocking the handle it gets finally deleted and increment reuse counter */ + Entry->Type = (Entry->Type + GDI_ENTRY_REUSE_INC) & ~GDI_ENTRY_BASETYPE_MASK; /* unlock the handle slot */ (void)InterlockedExchangePointer(&Entry->ProcessId, NULL); /* push this entry to the free list */ - InterlockedPushEntrySList(&HandleTable->FreeEntriesHead, - &HandleTable->FreeEntries[GDI_ENTRY_TO_INDEX(HandleTable, Entry)]); + InterlockedPushFreeEntry(HandleTable, GDI_ENTRY_TO_INDEX(HandleTable, Entry)); if(W32Process != NULL) { @@ -646,7 +693,7 @@ else { DPRINT1("Attempted to free foreign handle: 0x%x Owner: 0x%x from Caller: 0x%x\n", hObj, (ULONG_PTR)PrevProcId & ~0x1, (ULONG_PTR)ProcessId & ~0x1); - KeRosDumpStackFrames(NULL, 20); + KeRosDumpStackFrames(NULL, 20); } #ifdef GDI_DEBUG DPRINT1("-> called from %s:%i\n", file, line);

1 0

[jimtabor] 31660: Remove unused flags and start using new dc type ids.
by jimtabor＠svn.reactos.org 08 Jan '08

08 Jan '08

Author: jimtabor Date: Tue Jan 8 06:48:08 2008 New Revision: 31660 URL: http://svn.reactos.org/svn/reactos?rev=31660&view=rev Log: Remove unused flags and start using new dc type ids. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/objects/arc.c trunk/reactos/subsystems/win32/win32k/objects/bitblt.c trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/color.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/objects/fillshap.c trunk/reactos/subsystems/win32/win32k/objects/line.c trunk/reactos/subsystems/win32/win32k/objects/print.c trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Tue Jan 8 06:48:08 2008 @@ -394,7 +394,6 @@ INT saveLevel; // DCLEVEL lSaveDepth HDC hSelf; // DCLEVEL hdcSave Used only for MemoryDC & SaveDC. - BOOL IsIC; // Use DC_Type HPALETTE PalIndexed; Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Tue Jan 8 06:48:08 2008 @@ -5,12 +5,8 @@ #include "driver.h" /* DC flags */ -#define DC_MEMORY 0x0001 /* It is a memory DC */ #define DC_SAVED 0x0002 /* It is a saved DC */ #define DC_DIRTY 0x0004 /* hVisRgn has to be updated */ -#define DC_THUNKHOOK 0x0008 /* DC hook is in the 16-bit code */ - -#define GDI_DC_TYPE (1) // GDIDEVICE flags #define PDEV_DISPLAY 0x00000001 // Display device Modified: trunk/reactos/subsystems/win32/win32k/objects/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/arc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/arc.c Tue Jan 8 06:48:08 2008 @@ -90,7 +90,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - if (dc->IsIC) + if (dc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(dc); /* Yes, Windows really returns TRUE in this case */ Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c Tue Jan 8 06:48:08 2008 @@ -58,7 +58,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - if (DCDest->IsIC) + if (DCDest->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(DCDest); /* Yes, Windows really returns TRUE in this case */ @@ -75,7 +75,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - if (DCSrc->IsIC) + if (DCSrc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(DCSrc); DC_UnlockDc(DCDest); @@ -204,7 +204,7 @@ DPRINT("Invalid destination dc handle (0x%08x) passed to NtGdiBitBlt\n", hDCDest); return FALSE; } - if (DCDest->IsIC) + if (DCDest->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(DCDest); /* Yes, Windows really returns TRUE in this case */ @@ -222,7 +222,7 @@ DPRINT("Invalid source dc handle (0x%08x) passed to NtGdiBitBlt\n", hDCSrc); return FALSE; } - if (DCSrc->IsIC) + if (DCSrc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(DCSrc); DC_UnlockDc(DCDest); @@ -424,7 +424,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - if (DCDest->IsIC) + if (DCDest->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(DCDest); /* Yes, Windows really returns TRUE in this case */ @@ -442,7 +442,7 @@ { DCSrc = DCDest; } - if (DCSrc->IsIC) + if (DCSrc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(DCSrc); if(hdcDst != hdcSrc) @@ -814,7 +814,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - if (DCDest->IsIC) + if (DCDest->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(DCDest); /* Yes, Windows really returns TRUE in this case */ @@ -833,7 +833,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - if (DCSrc->IsIC) + if (DCSrc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(DCSrc); DC_UnlockDc(DCDest); @@ -1103,7 +1103,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - if (dc->IsIC) + if (dc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(dc); /* Yes, Windows really returns TRUE in this case */ @@ -1155,7 +1155,7 @@ } Dc_Attr = dc->pDc_Attr; if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - if (dc->IsIC) + if (dc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(dc); /* Yes, Windows really returns TRUE in this case */ Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Tue Jan 8 06:48:08 2008 @@ -257,7 +257,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return Result; } - if (dc->IsIC) + if (dc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(dc); return Result; Modified: trunk/reactos/subsystems/win32/win32k/objects/color.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/color.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/color.c Tue Jan 8 06:48:08 2008 @@ -548,7 +548,7 @@ // The RealizePalette function modifies the palette for the device associated with the specified device context. If the // device context is a memory DC, the color table for the bitmap selected into the DC is modified. If the device // context is a display DC, the physical palette for that device is modified. - if(dc->w.flags == DC_MEMORY) + if(dc->DC_Type == DC_TYPE_MEMORY) { // Memory managed DC ASSERT(sysGDI->NumColors <= 256); @@ -571,7 +571,7 @@ PALETTE_UnlockPalette(palGDI); // Step 3: Create the XLATEOBJ for device managed DCs - if(dc->w.flags != DC_MEMORY) + if(dc->DC_Type != DC_TYPE_MEMORY) { // Device managed DC palGDI->logicalToSystem = IntEngCreateXlate(sysMode, palMode, systemPalette, dc->w.hPalette); Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Tue Jan 8 06:48:08 2008 @@ -62,7 +62,6 @@ HDC hNewDC, DisplayDC; HRGN hVisRgn; UNICODE_STRING DriverName; - INT DC_Type = DC_TYPE_DIRECT; DisplayDC = NULL; if (hDC == NULL) @@ -74,7 +73,6 @@ return NULL; } hDC = DisplayDC; - DC_Type = DC_TYPE_MEMORY; // Null hDC == Memory DC. } /* Allocate a new DC based on the original DC's device */ @@ -106,8 +104,6 @@ /* Copy information from original DC to new DC */ NewDC->hSelf = hNewDC; - NewDC->IsIC = FALSE; - NewDC->DC_Type = DC_Type; NewDC->PDev = OrigDC->PDev; @@ -131,7 +127,7 @@ } return NULL; } - NewDC->w.flags = DC_MEMORY; + NewDC->DC_Type = DC_TYPE_MEMORY; // Always! NewDC->w.hBitmap = hBitmap; NewDC->w.hFirstBitmap = hBitmap; NewDC->pPDev = OrigDC->pPDev; @@ -802,7 +798,6 @@ if(!nDc_Attr) nDc_Attr = &NewDC->Dc_Attr; NewDC->DC_Type = DC_TYPE_DIRECT; - NewDC->IsIC = CreateAsIC; NewDC->PDev = PrimarySurface.hPDev; if(pUMdhpdev) pUMdhpdev = NewDC->PDev; // set DHPDEV for device. @@ -974,7 +969,7 @@ NtGdiSelectBrush (DCHandle, STOCK_WHITE_BRUSH); NtGdiSelectFont (DCHandle, STOCK_SYSTEM_FONT); DC_LockDC (DCHandle); NtGdiSelectXxx does not recognize stock objects yet */ - if (DCToDelete->w.flags & DC_MEMORY) + if (DCToDelete->DC_Type == DC_TYPE_MEMORY) { NtGdiDeleteObject (DCToDelete->w.hFirstBitmap); } @@ -1256,7 +1251,7 @@ nDc_Attr->szlViewportExt = Dc_Attr->szlViewportExt; newdc->saveLevel = 0; - newdc->IsIC = dc->IsIC; + newdc->DC_Type = dc->DC_Type; #if 0 PATH_InitGdiPath( &newdc->w.path ); @@ -1330,7 +1325,7 @@ Dc_Attr->szlViewportExt = sDc_Attr->szlViewportExt; dc->PalIndexed = dcs->PalIndexed; - if (!(dc->w.flags & DC_MEMORY)) + if (dc->DC_Type != DC_TYPE_MEMORY) { dc->w.bitsPerPixel = dcs->w.bitsPerPixel; } @@ -1928,7 +1923,7 @@ if(!pDc_Attr) pDc_Attr = &pDC->Dc_Attr; /* must be memory dc to select bitmap */ - if (!(pDC->w.flags & DC_MEMORY)) + if (pDC->DC_Type != DC_TYPE_MEMORY) { DC_UnlockDc(pDC); return NULL; Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Tue Jan 8 06:48:08 2008 @@ -33,7 +33,7 @@ UINT Index; if (!(dc = DC_LockDc(hDC))) return 0; - if (dc->IsIC) + if (dc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(dc); return 0; @@ -91,7 +91,7 @@ UINT Index; if (!(dc = DC_LockDc(hDC))) return 0; - if (dc->IsIC) + if (dc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(dc); return 0; @@ -297,7 +297,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return 0; } - if (Dc->IsIC) + if (Dc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(Dc); return 0; @@ -351,7 +351,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return 0; } - if (pDC->IsIC) + if (pDC->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(pDC); return 0; @@ -466,7 +466,7 @@ /* Get handle for the palette in DC. */ Dc = DC_LockDc(hDC); if (Dc == NULL) return 0; - if (Dc->IsIC) + if (Dc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(Dc); return 0; Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c Tue Jan 8 06:48:08 2008 @@ -226,7 +226,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - if (dc->IsIC) + if (dc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(dc); /* Yes, Windows really returns TRUE in this case */ @@ -665,7 +665,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - if (dc->IsIC) + if (dc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(dc); /* Yes, Windows really returns TRUE in this case */ @@ -861,7 +861,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - if (dc->IsIC) + if (dc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(dc); /* Yes, Windows really returns TRUE in this case */ @@ -1155,7 +1155,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - if (dc->IsIC) + if (dc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(dc); /* Yes, Windows really returns TRUE in this case */ @@ -1461,7 +1461,7 @@ DPRINT1("NtGdiRoundRect() - hDC is invalid\n"); SetLastWin32Error(ERROR_INVALID_HANDLE); } - else if (dc->IsIC) + else if (dc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(dc); /* Yes, Windows really returns TRUE in this case */ @@ -1599,7 +1599,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - if (dc->IsIC) + if (dc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(dc); /* Yes, Windows really returns TRUE in this case */ Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/line.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/line.c Tue Jan 8 06:48:08 2008 @@ -393,7 +393,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - if (dc->IsIC) + if (dc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(dc); /* Yes, Windows really returns TRUE in this case */ Modified: trunk/reactos/subsystems/win32/win32k/objects/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/print.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/print.c Tue Jan 8 06:48:08 2008 @@ -173,7 +173,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return -1; } - if ( pDC->IsIC ) + if ( pDC->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(pDC); return 0; Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Tue Jan 8 06:48:08 2008 @@ -1567,7 +1567,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - if (dc->IsIC) + if (dc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(dc); /* Yes, Windows really returns TRUE in this case */

1 0

[tkreuzer] 31659: fix 2 names
by tkreuzer＠svn.reactos.org 08 Jan '08

08 Jan '08

Author: tkreuzer Date: Tue Jan 8 05:49:09 2008 New Revision: 31659 URL: http://svn.reactos.org/svn/reactos?rev=31659&view=rev Log: fix 2 names Modified: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.S trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.def Modified: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.S URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.S (original) +++ trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.S Tue Jan 8 05:49:09 2008 @@ -4649,15 +4649,15 @@ call *(%ecx) ret $0xc -.global _UMPDDrvQuerySpoolType@8 -_UMPDDrvQuerySpoolType@8: +.global _NtGdiMakeObjectXferable@8 +_NtGdiMakeObjectXferable@8: movl $0x1297, %eax movl $KUSER_SHARED_SYSCALL, %ecx call *(%ecx) ret $0x8 -.global _DefaultHTCallBack@4 -_DefaultHTCallBack@4: +.global _NtGdiMakeObjectUnXferable@4 +_NtGdiMakeObjectUnXferable@4: movl $0x1298, %eax movl $KUSER_SHARED_SYSCALL, %ecx call *(%ecx) Modified: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.def URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.def (original) +++ trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.def Tue Jan 8 05:49:09 2008 @@ -670,5 +670,5 @@ NtGdiBRUSHOBJ_DeleteRbrush@8 NtGdiUMPDEngFreeUserMem@4 NtGdiDrawStream@12 -UMPDDrvQuerySpoolType@8 -DefaultHTCallBack@4 +NtGdiMakeObjectXferable@8 +NtGdiMakeObjectUnXferable@4

1 0

[hpoussin] 31658: Fix build
by hpoussin＠svn.reactos.org 07 Jan '08

07 Jan '08

Author: hpoussin Date: Tue Jan 8 00:58:00 2008 New Revision: 31658 URL: http://svn.reactos.org/svn/reactos?rev=31658&view=rev Log: Fix build Modified: trunk/reactos/base/system/userinit/userinit.c Modified: trunk/reactos/base/system/userinit/userinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri… ============================================================================== --- trunk/reactos/base/system/userinit/userinit.c (original) +++ trunk/reactos/base/system/userinit/userinit.c Tue Jan 8 00:58:00 2008 @@ -575,10 +575,10 @@ #endif /* _MSC_VER */ int WINAPI -WinMain(IN HINSTANCE hInst, - IN HINSTANCE hPrevInstance, - IN LPSTR lpszCmdLine, - IN int nCmdShow) +wWinMain(IN HINSTANCE hInst, + IN HINSTANCE hPrevInstance, + IN LPWSTR lpszCmdLine, + IN int nCmdShow) { NotifyLogon(); SetUserSettings();

1 0

[hpoussin] 31657: Link to wine library, as we're using wine debug macros
by hpoussin＠svn.reactos.org 07 Jan '08

07 Jan '08

Author: hpoussin Date: Tue Jan 8 00:50:21 2008 New Revision: 31657 URL: http://svn.reactos.org/svn/reactos?rev=31657&view=rev Log: Link to wine library, as we're using wine debug macros Modified: trunk/reactos/base/system/userinit/userinit.rbuild Modified: trunk/reactos/base/system/userinit/userinit.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri… ============================================================================== --- trunk/reactos/base/system/userinit/userinit.rbuild (original) +++ trunk/reactos/base/system/userinit/userinit.rbuild Tue Jan 8 00:50:21 2008 @@ -2,6 +2,7 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="userinit" type="win32gui" installbase="system32" installname="userinit.exe" unicode="yes"> <include base="userinit">.</include> + <library>wine</library> <library>ntdll</library> <library>kernel32</library> <library>user32</library>

1 0

[hpoussin] 31656: Add traces
by hpoussin＠svn.reactos.org 07 Jan '08

07 Jan '08

Author: hpoussin Date: Tue Jan 8 00:42:59 2008 New Revision: 31656 URL: http://svn.reactos.org/svn/reactos?rev=31656&view=rev Log: Add traces Modified: trunk/reactos/base/system/userinit/userinit.c trunk/reactos/base/system/userinit/userinit.rbuild Modified: trunk/reactos/base/system/userinit/userinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri… ============================================================================== --- trunk/reactos/base/system/userinit/userinit.c (original) +++ trunk/reactos/base/system/userinit/userinit.c Tue Jan 8 00:42:59 2008 @@ -29,6 +29,9 @@ #include <shlobj.h> #include <shlwapi.h> #include "resource.h" +#include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(userinit); #define CMP_MAGIC 0x01234567 @@ -47,17 +50,29 @@ DWORD cbData = 0; LPWSTR Value; + TRACE("(%p, %s, %p)\n", hKey, debugstr_w(pszKey), pValue); + rc = RegQueryValueExW(hKey, pszKey, NULL, &dwType, NULL, &cbData); if (rc != ERROR_SUCCESS) + { + WARN("RegQueryValueEx(%s) failed with error %lu\n", debugstr_w(pszKey), rc); return rc; + } if (dwType != REG_SZ) + { + WARN("Wrong registry data type (%u vs %u)\n", dwType, REG_SZ); return ERROR_FILE_NOT_FOUND; + } Value = (WCHAR*) HeapAlloc(GetProcessHeap(), 0, cbData + sizeof(WCHAR)); if (!Value) + { + WARN("No memory\n"); return ERROR_NOT_ENOUGH_MEMORY; + } rc = RegQueryValueExW(hKey, pszKey, NULL, NULL, (LPBYTE)Value, &cbData); if (rc != ERROR_SUCCESS) { + WARN("RegQueryValueEx(%s) failed with error %lu\n", debugstr_w(pszKey), rc); HeapFree(GetProcessHeap(), 0, Value); return rc; } @@ -76,6 +91,8 @@ LPWSTR CurrentOption, NextOption; /* Pointers into SystemStartOptions */ LONG rc; BOOL ret = FALSE; + + TRACE("()\n"); rc = RegOpenKeyEx( HKEY_LOCAL_MACHINE, @@ -83,10 +100,18 @@ 0, KEY_QUERY_VALUE, &ControlKey); + if (rc != ERROR_SUCCESS) + { + WARN("RegOpenKeyEx() failed with error %lu\n", rc); + goto cleanup; + } rc = ReadRegSzKey(ControlKey, L"SystemStartOptions", &SystemStartOptions); if (rc != ERROR_SUCCESS) + { + WARN("ReadRegSzKey() failed with error %lu\n", rc); goto cleanup; + } /* Check for CONSOLE in SystemStartOptions */ CurrentOption = SystemStartOptions; @@ -97,6 +122,7 @@ *NextOption = L'\0'; if (wcsicmp(CurrentOption, L"CONSOLE") == 0) { + TRACE("Found 'CONSOLE' boot option\n"); ret = TRUE; goto cleanup; } @@ -120,26 +146,38 @@ WCHAR Shell[MAX_PATH]; BOOL Ret = FALSE; BOOL ConsoleShell = IsConsoleShell(); - - if (RegOpenKeyEx(hRootKey, REGSTR_PATH_WINLOGON, - 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + LONG rc; + + TRACE("(%p, %p)\n", CommandLine, hRootKey); + + rc = RegOpenKeyEx(hRootKey, REGSTR_PATH_WINLOGON, + 0, KEY_QUERY_VALUE, &hKey); + if (rc == ERROR_SUCCESS) { Size = MAX_PATH * sizeof(WCHAR); - if (RegQueryValueEx(hKey, - ConsoleShell ? L"ConsoleShell" : L"Shell", - NULL, - &Type, - (LPBYTE)Shell, - &Size) == ERROR_SUCCESS) + rc = RegQueryValueEx(hKey, + ConsoleShell ? L"ConsoleShell" : L"Shell", + NULL, + &Type, + (LPBYTE)Shell, + &Size); + if (rc == ERROR_SUCCESS) { if ((Type == REG_SZ) || (Type == REG_EXPAND_SZ)) { + TRACE("Found command line %s\n", debugstr_w(Shell)); wcscpy(CommandLine, Shell); Ret = TRUE; } + else + WARN("Wrong type %lu (expected %u or %u)\n", Type, REG_SZ, REG_EXPAND_SZ); } + else + WARN("RegQueryValueEx() failed with error %lu\n", rc); RegCloseKey(hKey); } + else + WARN("RegOpenKeyEx() failed with error %lu\n", rc); return Ret; } @@ -155,10 +193,13 @@ SHELLEXECUTEINFOW ExecInfo; size_t len; + TRACE("(%d)\n", clsid); + hResult = SHGetFolderPathW(NULL, clsid, NULL, SHGFP_TYPE_CURRENT, szPath); len = wcslen(szPath); if (!SUCCEEDED(hResult) || len == 0) { + WARN("SHGetFolderPath() failed with error %lu\n", GetLastError()); return; } @@ -166,6 +207,7 @@ hFind = FindFirstFileW(szPath, &findData); if (hFind == INVALID_HANDLE_VALUE) { + WARN("FindFirstFile(%s) failed with error %lu\n", debugstr_w(szPath), GetLastError()); return; } szPath[len] = L'\0'; @@ -179,6 +221,8 @@ ExecInfo.lpVerb = L"open"; ExecInfo.lpFile = findData.cFileName; ExecInfo.lpDirectory = szPath; + TRACE("Executing %s in directory %s\n", + debugstr_w(findData.cFileName), debugstr_w(szPath)); ShellExecuteExW(&ExecInfo); } } while (FindNextFileW(hFind, &findData)); @@ -192,6 +236,8 @@ STARTUPINFO si; PROCESS_INFORMATION pi; WCHAR ExpandedShell[MAX_PATH]; + + TRACE("(%s)\n", debugstr_w(Shell)); ZeroMemory(&si, sizeof(STARTUPINFO)); si.cb = sizeof(STARTUPINFO); @@ -210,6 +256,7 @@ &si, &pi)) { + WARN("CreateProcess() failed with error %lu\n", GetLastError()); return FALSE; } @@ -227,15 +274,19 @@ WCHAR Shell[MAX_PATH]; TCHAR szMsg[RC_STRING_MAX_SIZE]; + TRACE("()\n"); + /* Try to run shell in user key */ if (GetShell(Shell, HKEY_CURRENT_USER) && TryToStartShell(Shell)) { + TRACE("Failed to start a shell from HKEY_CURRENT_USER\n"); return; } /* Try to run shell in local machine key */ if (GetShell(Shell, HKEY_LOCAL_MACHINE) && TryToStartShell(Shell)) { + TRACE("Failed to start a shell from HKEY_LOCAL_MACHINE\n"); return; } @@ -256,12 +307,13 @@ } if (!TryToStartShell(Shell)) { + WARN("Failed to start default shell %s\n", debugstr_w(Shell)); LoadString( GetModuleHandle(NULL), STRING_USERINIT_FAIL, szMsg, sizeof(szMsg) / sizeof(szMsg[0])); MessageBox(0, szMsg, NULL, 0); } } -WCHAR g_RegColorNames[][32] = { +const WCHAR g_RegColorNames[][32] = { L"Scrollbar", /* 00 = COLOR_SCROLLBAR */ L"Background", /* 01 = COLOR_DESKTOP */ L"ActiveTitle", /* 02 = COLOR_ACTIVECAPTION */ @@ -302,6 +354,8 @@ { BYTE rgb[3]; + TRACE("(%s)\n", debugstr_w(lpszCol)); + rgb[0] = StrToIntW(lpszCol); lpszCol = StrChrW(lpszCol, L' ') + 1; rgb[1] = StrToIntW(lpszCol); @@ -318,25 +372,32 @@ WCHAR szColor[20]; DWORD Type, Size; COLORREF crColor; - - if (!RegOpenKeyEx(HKEY_CURRENT_USER, REGSTR_PATH_COLORS, - 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) - { + LONG rc; + + TRACE("()\n"); + + rc = RegOpenKeyEx(HKEY_CURRENT_USER, REGSTR_PATH_COLORS, + 0, KEY_QUERY_VALUE, &hKey); + if (rc != ERROR_SUCCESS) + { + WARN("RegOpenKeyEx() failed with error %lu\n", rc); return; } for(i = 0; i < NUM_SYSCOLORS; i++) { Size = sizeof(szColor); - if (RegQueryValueEx(hKey, g_RegColorNames[i], NULL, &Type, - (LPBYTE)szColor, &Size) == ERROR_SUCCESS && - Type == REG_SZ) + rc = RegQueryValueEx(hKey, g_RegColorNames[i], NULL, &Type, + (LPBYTE)szColor, &Size); + if (rc == ERROR_SUCCESS && Type == REG_SZ) { crColor = StrToColorref(szColor); SetSysColors(1, &i, &crColor); } + else + WARN("RegQueryValueEx(%s) failed with error %lu\n", + debugstr_w(g_RegColorNames[i]), rc); } RegCloseKey(hKey); - return; } static @@ -347,17 +408,22 @@ HKEY hKey; LOGFONTW lfTemp; DWORD Type, Size; - INT error; + LONG rc; + + TRACE("(%s, %p)\n", debugstr_w(lpValueName), pFont); Size = sizeof(LOGFONTW); - if (!RegOpenKeyEx(HKEY_CURRENT_USER, REGSTR_PATH_METRICS, - 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) - { - return; - } - error = RegQueryValueEx(hKey, lpValueName, NULL, &Type, (LPBYTE)&lfTemp, &Size); - if ((error != ERROR_SUCCESS) || (Type != REG_BINARY)) - { + rc = RegOpenKeyEx(HKEY_CURRENT_USER, REGSTR_PATH_METRICS, + 0, KEY_QUERY_VALUE, &hKey); + if (rc != ERROR_SUCCESS) + { + WARN("RegOpenKeyEx() failed with error %lu\n", rc); + return; + } + rc = RegQueryValueEx(hKey, lpValueName, NULL, &Type, (LPBYTE)&lfTemp, &Size); + if (rc != ERROR_SUCCESS || Type != REG_BINARY) + { + WARN("RegQueryValueEx() failed with error %lu\n", rc); return; } RegCloseKey(hKey); @@ -372,18 +438,23 @@ { HKEY hKey; DWORD Type, Size; - INT ret; WCHAR strValue[8]; + LONG rc; + + TRACE("(%s, %p)\n", debugstr_w(lpValueName), pValue); Size = sizeof(strValue); - if (!RegOpenKeyEx(HKEY_CURRENT_USER, REGSTR_PATH_METRICS, - 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) - { - return; - } - ret = RegQueryValueEx(hKey, lpValueName, NULL, &Type, (LPBYTE)&strValue, &Size); - if ((ret != ERROR_SUCCESS) || (Type != REG_SZ)) - { + rc = RegOpenKeyEx(HKEY_CURRENT_USER, REGSTR_PATH_METRICS, + 0, KEY_QUERY_VALUE, &hKey); + if (rc != ERROR_SUCCESS) + { + WARN("RegOpenKeyEx() failed with error %lu\n", rc); + return; + } + rc = RegQueryValueEx(hKey, lpValueName, NULL, &Type, (LPBYTE)&strValue, &Size); + if (rc != ERROR_SUCCESS || Type != REG_SZ) + { + WARN("RegQueryValueEx() failed with error %lu\n", rc); return; } RegCloseKey(hKey); @@ -395,6 +466,8 @@ { NONCLIENTMETRICSW ncmetrics; MINIMIZEDMETRICS mmmetrics; + + TRACE("()\n"); ncmetrics.cbSize = sizeof(NONCLIENTMETRICSW); mmmetrics.cbSize = sizeof(MINIMIZEDMETRICS); @@ -427,20 +500,25 @@ HKEY hKey; DWORD Type, Size; WCHAR szWallpaper[MAX_PATH + 1]; - - if (RegOpenKeyEx(HKEY_CURRENT_USER, REGSTR_PATH_DESKTOP, - 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + LONG rc; + + TRACE("()\n"); + + rc = RegOpenKeyEx(HKEY_CURRENT_USER, REGSTR_PATH_DESKTOP, + 0, KEY_QUERY_VALUE, &hKey); + if (rc == ERROR_SUCCESS) { Size = sizeof(szWallpaper); - if (RegQueryValueEx(hKey, - L"Wallpaper", - NULL, - &Type, - (LPBYTE)szWallpaper, - &Size) == ERROR_SUCCESS && - Type == REG_SZ) + rc = RegQueryValueEx(hKey, + L"Wallpaper", + NULL, + &Type, + (LPBYTE)szWallpaper, + &Size); + if (rc == ERROR_SUCCESS && Type == REG_SZ) { ExpandEnvironmentStrings(szWallpaper, szWallpaper, MAX_PATH); + TRACE("Using wallpaper %s\n", debugstr_w(szWallpaper)); /* Load and change the wallpaper */ SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, szWallpaper, SPIF_SENDCHANGE); @@ -448,15 +526,20 @@ else { /* remove the wallpaper */ + TRACE("No wallpaper set in registry (error %lu)\n", rc); SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, NULL, SPIF_SENDCHANGE); } RegCloseKey(hKey); } + else + WARN("RegOpenKeyEx() failed with error %lu\n", rc); } static VOID SetUserSettings(VOID) { + TRACE("()\n"); + SetUserSysColors(); SetUserMetrics(); SetUserWallpaper(); @@ -470,15 +553,21 @@ HINSTANCE hModule; PCMP_REPORT_LOGON CMP_Report_LogOn; + TRACE("()\n"); + hModule = LoadLibrary(L"setupapi.dll"); if (hModule) { CMP_Report_LogOn = (PCMP_REPORT_LOGON)GetProcAddress(hModule, "CMP_Report_LogOn"); if (CMP_Report_LogOn) CMP_Report_LogOn(CMP_MAGIC, GetCurrentProcessId()); + else + WARN("GetProcAddress() failed\n"); FreeLibrary(hModule); } + else + WARN("LoadLibrary() failed with error %lu\n", GetLastError()); } #ifdef _MSC_VER Modified: trunk/reactos/base/system/userinit/userinit.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri… ============================================================================== --- trunk/reactos/base/system/userinit/userinit.rbuild (original) +++ trunk/reactos/base/system/userinit/userinit.rbuild Tue Jan 8 00:42:59 2008 @@ -1,9 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="userinit" type="win32gui" installbase="system32" installname="userinit.exe"> +<module name="userinit" type="win32gui" installbase="system32" installname="userinit.exe" unicode="yes"> <include base="userinit">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <library>ntdll</library> <library>kernel32</library> <library>user32</library>

1 0

[cfinck] 31655: Win32k: - Read from HKCU\Keyboard Layout\Preload for getting the keyboard layout ID to use instead of using the default locale. This finally makes it possible to set the keyboard layout and system locale independently. - Change ReadRegistryValue from KEY_ALL_ACCESS to KEY_READ, we don't need more rights. usetup: - Rename "ProcessKeyboardLayoutRegistry" to "ProcessLocaleRegistry" as it doesn't set anything related to keyboard layouts. - Add a new function "ProcessKeyboardLayoutReg
by cfinck＠svn.reactos.org 07 Jan '08

07 Jan '08

Author: cfinck Date: Tue Jan 8 00:34:56 2008 New Revision: 31655 URL: http://svn.reactos.org/svn/reactos?rev=31655&view=rev Log: Win32k: - Read from HKCU\Keyboard Layout\Preload for getting the keyboard layout ID to use instead of using the default locale. This finally makes it possible to set the keyboard layout and system locale independently. - Change ReadRegistryValue from KEY_ALL_ACCESS to KEY_READ, we don't need more rights. usetup: - Rename "ProcessKeyboardLayoutRegistry" to "ProcessLocaleRegistry" as it doesn't set anything related to keyboard layouts. - Add a new function "ProcessKeyboardLayoutRegistry", which sets the keyboard layout ID in the correct registry key. - Add ERROR_UPDATE_LOCALE_SETTINGS - Fix the indentation of some parts of the language headers and update the german one. Known issues: - Before input.dll is finished, we can only set the keyboard layout in usetup or by manually editing the registry. - 1st stage and 2nd stage setup always use US English keyboard layout for now. See issue #2635 for more details. Modified: trunk/reactos/base/setup/usetup/errorcode.h trunk/reactos/base/setup/usetup/interface/usetup.c 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/pl-PL.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/setup/usetup/settings.c trunk/reactos/base/setup/usetup/settings.h trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c Modified: trunk/reactos/base/setup/usetup/errorcode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/errorcod… ============================================================================== --- trunk/reactos/base/setup/usetup/errorcode.h (original) +++ trunk/reactos/base/setup/usetup/errorcode.h Tue Jan 8 00:34:56 2008 @@ -63,6 +63,7 @@ ERROR_FIND_SETUPDATA, ERROR_WRITE_PTABLE, ERROR_ADDING_CODEPAGE, + ERROR_UPDATE_LOCALESETTINGS, ERROR_LAST_ERROR_CODE }ERROR_NUMBER; Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Tue Jan 8 00:34:56 2008 @@ -3139,9 +3139,17 @@ return QUIT_PAGE; } + /* Set the locale */ + CONSOLE_SetStatusText(" Updating locale settings..."); + if (!ProcessLocaleRegistry(LanguageList)) + { + MUIDisplayError(ERROR_UPDATE_LOCALESETTINGS, Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; + } + /* Update keyboard layout settings */ CONSOLE_SetStatusText(" Updating keyboard layout settings..."); - if (!ProcessKeyboardLayoutRegistry(LanguageList)) + if (!ProcessKeyboardLayoutRegistry(LayoutList)) { MUIDisplayError(ERROR_UPDATE_KBSETTINGS, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h Tue Jan 8 00:34:56 2008 @@ -1276,12 +1276,12 @@ { //ERROR_NOT_INSTALLED "ReactOS ist nicht vollstaendig auf Ihrem System installiert.\n" - "Wenn Sie das Setup jetzt beenden, muessen Sie das\n" - "Setup erneut starten, um ROS zu installieren.\n" - "\n" - " \x07 Druecken Sie ENTER um das Setup Fortzusetzen.\n" - " \x07 Druecken Sie F3 um das Setup zu beenden.", - "F3 = Beenden ENTER = Fortsetzen" + "Wenn Sie das Setup jetzt beenden, muessen Sie das\n" + "Setup erneut starten, um ROS zu installieren.\n" + "\n" + " \x07 Druecken Sie ENTER um das Setup Fortzusetzen.\n" + " \x07 Druecken Sie F3 um das Setup zu beenden.", + "F3 = Beenden ENTER = Fortsetzen" }, { //ERROR_NO_HDD @@ -1340,21 +1340,21 @@ }, { //ERROR_WARN_PARTITION, - "Setup hat mindestens eine Festplatte mit einer inkompatiblen Partitionstabelle\n" - "welche nicht richtig verwendet werden koennen!\n" - "\n" - "Partitionen zu erstellen/loeschen kann die Partitionstabelle zerstoeren.\n" - "\n" - " \x07 Druecken Sie F3, um das Setup zu beenden." - " \x07 Druecken Sie ENTER, um das Setup Fortzusetzen.", - "F3 = Beenden ENTER = Fortsetzen" + "Setup hat mindestens eine Festplatte mit einer inkompatiblen Partitionstabelle\n" + "welche nicht richtig verwendet werden koennen!\n" + "\n" + "Partitionen zu erstellen/loeschen kann die Partitionstabelle zerstoeren.\n" + "\n" + " \x07 Druecken Sie F3, um das Setup zu beenden." + " \x07 Druecken Sie ENTER, um das Setup Fortzusetzen.", + "F3 = Beenden ENTER = Fortsetzen" }, { //ERROR_NEW_PARTITION, "Sie koennen keine neue Partition in einer bereits\n" - "vohandenen Partition erstellen!\n" - "\n" - " * * Eine beliebige Taste zum Fortsetzen druecken.", + "vohandenen Partition erstellen!\n" + "\n" + " * * Eine beliebige Taste zum Fortsetzen druecken.", NULL }, { @@ -1449,8 +1449,8 @@ { //ERROR_FIND_SETUPDATA, "Setup konnte die 'SetupData' Sektion in\n" - "TXTSETUP.SIF nicht finden.\n", - "ENTER = Computer neustarten" + "TXTSETUP.SIF nicht finden.\n", + "ENTER = Computer neustarten" }, { //ERROR_WRITE_PTABLE, @@ -1459,8 +1459,13 @@ }, { //ERROR_ADDING_CODEPAGE, - "Setup failed to add codepage to registry.\n" - "ENTER = Reboot computer" + "Setup konnte den CodePage-Eintrag nicht hinzufuegen.\n" + "ENTER = Computer neustarten" + }, + { + //ERROR_UPDATE_LOCALESETTINGS, + "Setup konnte die Systemsprache nicht einstellen.\n" + "ENTER = Computer neustarten" }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h Tue Jan 8 00:34:56 2008 @@ -1270,12 +1270,12 @@ { //ERROR_NOT_INSTALLED "Ôï ReactOS äåí åãêáôáóôÜèçêå ðëÞñùò óôïí\n" - "õðïëïãéóôÞ óáò. Áí áðï÷ùñÞóåôå áðü ôçí ÅãêáôÜóôáóç ôþñá, èá ðñÝðåé íá\n" - "îáíáôñÝîåôå ôçí ÅãêáôÜóôáóç ãéá íá åãêáôáóôÞóåô ôï ReactOS.\n" - "\n" - " \x07 ÐáôÞóôå ENTER ãéá áí óõíå÷ßóåôå ôçí ÅãêáôÜóôáóç.\n" - " \x07 ÐáôÞóôå F3 ãéá íá áðï÷ùñÞóåôå áðü ôçí ÅãêáôÜóôáóç.", - "F3= Áðï÷þñçóç ENTER = ÓõíÝ÷åéá" + "õðïëïãéóôÞ óáò. Áí áðï÷ùñÞóåôå áðü ôçí ÅãêáôÜóôáóç ôþñá, èá ðñÝðåé íá\n" + "îáíáôñÝîåôå ôçí ÅãêáôÜóôáóç ãéá íá åãêáôáóôÞóåô ôï ReactOS.\n" + "\n" + " \x07 ÐáôÞóôå ENTER ãéá áí óõíå÷ßóåôå ôçí ÅãêáôÜóôáóç.\n" + " \x07 ÐáôÞóôå F3 ãéá íá áðï÷ùñÞóåôå áðü ôçí ÅãêáôÜóôáóç.", + "F3= Áðï÷þñçóç ENTER = ÓõíÝ÷åéá" }, { //ERROR_NO_HDD @@ -1335,20 +1335,20 @@ { //ERROR_WARN_PARTITION, "Ç ÅãêáôÜóôáóç âñÞêå üôé ôïõëÜ÷éóôïí Ýíáò óêëçñüò äßóêïò ðåñéÝ÷åé Ýíá ìç óõìâáôü\n" - "partition table ðïõ äå ìðïñåß íá åëåã÷èåß óùóôÜ!\n" - "\n" - "Ç äçìéïõñãßá Þ äéáãñáöÞ partitions ìðïñåß íá êáôáóôñÝøåé ôï partiton table.\n" - "\n" - " \x07 ÐáôÞóôå F3 ãéá íá áðï÷ùñÞóåôå áðü ôçí ÅãêáôÜóôáóç." - " \x07 ÐáôÞóôå ENTER ãéá íá óõíå÷ßóåôå.", + "partition table ðïõ äå ìðïñåß íá åëåã÷èåß óùóôÜ!\n" + "\n" + "Ç äçìéïõñãßá Þ äéáãñáöÞ partitions ìðïñåß íá êáôáóôñÝøåé ôï partiton table.\n" + "\n" + " \x07 ÐáôÞóôå F3 ãéá íá áðï÷ùñÞóåôå áðü ôçí ÅãêáôÜóôáóç." + " \x07 ÐáôÞóôå ENTER ãéá íá óõíå÷ßóåôå.", "F3= Áðï÷þñçóç ENTER = ÓõíÝ÷åéá" }, { //ERROR_NEW_PARTITION, "Äå ìðïñåßôå íá äçìéïõñãÞóåôå Ýíá Partition ìÝóá óå\n" - "Ýíá Üëëï õðÜñ÷ïí Partition!\n" - "\n" - " * ÐáôÞóôå ïðïéïäÞðïôå ðëÞêôñï ãéá íá óõíå÷ßóåôå.", + "Ýíá Üëëï õðÜñ÷ïí Partition!\n" + "\n" + " * ÐáôÞóôå ïðïéïäÞðïôå ðëÞêôñï ãéá íá óõíå÷ßóåôå.", NULL }, { @@ -1443,8 +1443,8 @@ { //ERROR_FIND_SETUPDATA, "Ç ÅãêáôÜóôáóç áðÝôõ÷å íá âñåé ôïí ôïìÝá 'SetupData'\n" - "óôï TXTSETUP.SIF.\n", - "ENTER = Åðáíåêêßíçóç õðïëïãéóôÞ" + "óôï TXTSETUP.SIF.\n", + "ENTER = Åðáíåêêßíçóç õðïëïãéóôÞ" }, { //ERROR_WRITE_PTABLE, @@ -1457,6 +1457,11 @@ "ENTER = Reboot computer" }, { + //ERROR_UPDATE_LOCALESETTINGS, + "Setup could not set the system locale.\n" + "ENTER = Reboot computer" + }, + { NULL, NULL } Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h Tue Jan 8 00:34:56 2008 @@ -1270,12 +1270,12 @@ { //ERROR_NOT_INSTALLED "ReactOS is not completely installed on your\n" - "computer. If you quit Setup now, you will need to\n" - "run Setup again to install ReactOS.\n" - "\n" - " \x07 Press ENTER to continue Setup.\n" - " \x07 Press F3 to quit Setup.", - "F3 = Quit ENTER = Continue" + "computer. If you quit Setup now, you will need to\n" + "run Setup again to install ReactOS.\n" + "\n" + " \x07 Press ENTER to continue Setup.\n" + " \x07 Press F3 to quit Setup.", + "F3 = Quit ENTER = Continue" }, { //ERROR_NO_HDD @@ -1335,20 +1335,20 @@ { //ERROR_WARN_PARTITION, "Setup found that at least one harddisk contains an incompatible\n" - "partition table that can not be handled properly!\n" - "\n" - "Creating or deleting partitions can destroy the partition table.\n" - "\n" - " \x07 Press F3 to quit Setup." - " \x07 Press ENTER to continue.", + "partition table that can not be handled properly!\n" + "\n" + "Creating or deleting partitions can destroy the partition table.\n" + "\n" + " \x07 Press F3 to quit Setup." + " \x07 Press ENTER to continue.", "F3= Quit ENTER = Continue" }, { //ERROR_NEW_PARTITION, "You can not create a new Partition inside\n" - "of an already existing Partition!\n" - "\n" - " * Press any key to continue.", + "of an already existing Partition!\n" + "\n" + " * Press any key to continue.", NULL }, { @@ -1443,8 +1443,8 @@ { //ERROR_FIND_SETUPDATA, "Setup failed to find the 'SetupData' section\n" - "in TXTSETUP.SIF.\n", - "ENTER = Reboot computer" + "in TXTSETUP.SIF.\n", + "ENTER = Reboot computer" }, { //ERROR_WRITE_PTABLE, @@ -1457,6 +1457,11 @@ "ENTER = Reboot computer" }, { + //ERROR_UPDATE_LOCALESETTINGS, + "Setup could not set the system locale.\n" + "ENTER = Reboot computer" + }, + { NULL, NULL } Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h Tue Jan 8 00:34:56 2008 @@ -1346,9 +1346,9 @@ { //ERROR_NEW_PARTITION, "You can not create a new Partition inside\n" - "of an already existing Partition!\n" - "\n" - " * Press any key to continue.", + "of an already existing Partition!\n" + "\n" + " * Press any key to continue.", NULL }, { @@ -1457,6 +1457,11 @@ "ENTER = Reboot computer" }, { + //ERROR_UPDATE_LOCALESETTINGS, + "Setup could not set the system locale.\n" + "ENTER = Reboot computer" + }, + { NULL, NULL } Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h Tue Jan 8 00:34:56 2008 @@ -1282,12 +1282,12 @@ { //ERROR_NOT_INSTALLED "ReactOS n'est pas completement installe sur votre\n" - "ordinateur. Si vous quittez Setup maintenant, vous devrez\n" - "lancer Setup de nouveau pour installer ReactOS.\n" - "\n" - " \x07 Appuyer sur ENTER pour continuer Setup.\n" - " \x07 Appuyer sur F3 pour quitter Setup.", - "F3= Quitter ENTER = Continuer" + "ordinateur. Si vous quittez Setup maintenant, vous devrez\n" + "lancer Setup de nouveau pour installer ReactOS.\n" + "\n" + " \x07 Appuyer sur ENTER pour continuer Setup.\n" + " \x07 Appuyer sur F3 pour quitter Setup.", + "F3= Quitter ENTER = Continuer" }, { //ERROR_NO_HDD @@ -1346,21 +1346,21 @@ }, { //ERROR_WARN_PARTITION, - "Setup a detecte qu'au moins un dique dur contient une table\n" - "de partition incompatible qui ne peut etre prise en compte!\n" - "\n" - "Creer ou effacer des partitions peut detruire la table de partition.\n" - "\n" - " \x07 Appuyer sur F3 pour quitter Setup." - " \x07 Appuyer sur ENTER pour continuer Setup.", - "F3= Quitter ENTER = Continuer" + "Setup a detecte qu'au moins un dique dur contient une table\n" + "de partition incompatible qui ne peut etre prise en compte!\n" + "\n" + "Creer ou effacer des partitions peut detruire la table de partition.\n" + "\n" + " \x07 Appuyer sur F3 pour quitter Setup." + " \x07 Appuyer sur ENTER pour continuer Setup.", + "F3= Quitter ENTER = Continuer" }, { //ERROR_NEW_PARTITION, "Vous ne pouvez creer une nouvelle Partition à l'interieur\n" - "d'une Partition deja existante!\n" - "\n" - " * Appuyez sur une touche pour continuer.", + "d'une Partition deja existante!\n" + "\n" + " * Appuyez sur une touche pour continuer.", NULL }, { @@ -1455,8 +1455,8 @@ { //ERROR_FIND_SETUPDATA, "Setup n'a pu trouver la section 'SetupData'\n" - "in TXTSETUP.SIF.\n", - "ENTER = Redemarrer l'ordinateur" + "in TXTSETUP.SIF.\n", + "ENTER = Redemarrer l'ordinateur" }, { //ERROR_WRITE_PTABLE, @@ -1469,6 +1469,11 @@ "ENTER = Reboot computer" }, { + //ERROR_UPDATE_LOCALESETTINGS, + "Setup could not set the system locale.\n" + "ENTER = Reboot computer" + }, + { NULL, NULL } Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h Tue Jan 8 00:34:56 2008 @@ -4,7 +4,7 @@ static MUI_ENTRY itITLanguagePageEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE @@ -1276,12 +1276,12 @@ { //ERROR_NOT_INSTALLED "ReactOS non è installato completamente nel vostro\n" - "computer. Se esce adesso, dovrà eseguire il Setup\n" - "nuovamente per installare ReactOS.\n" - "\n" - " \x07 Premere INVIO per continuare il setup.\n" - " \x07 Premere F3 per uscire.", - "F3= Uscire INVIO = Continuare" + "computer. Se esce adesso, dovrà eseguire il Setup\n" + "nuovamente per installare ReactOS.\n" + "\n" + " \x07 Premere INVIO per continuare il setup.\n" + " \x07 Premere F3 per uscire.", + "F3= Uscire INVIO = Continuare" }, { //ERROR_NO_HDD @@ -1340,21 +1340,21 @@ }, { //ERROR_WARN_PARTITION, - "Setup ha trovato che al meno un disco fisso contiene una tabella delle\n" - "partizioni incompatibile che non può essere gestita correttamente!\n" - "\n" - "Il creare o cancellare partizioni può distruggere la tabella delle partizioni.\n" - "\n" - " \x07 Premere F3 per uscire dal Setup." - " \x07 Premere INVIO per continuare.", - "F3= Uscire INVIO = Continuare" + "Setup ha trovato che al meno un disco fisso contiene una tabella delle\n" + "partizioni incompatibile che non può essere gestita correttamente!\n" + "\n" + "Il creare o cancellare partizioni può distruggere la tabella delle partizioni.\n" + "\n" + " \x07 Premere F3 per uscire dal Setup." + " \x07 Premere INVIO per continuare.", + "F3= Uscire INVIO = Continuare" }, { //ERROR_NEW_PARTITION, "Non si può creare una nuova partizione all'interno\n" - "di una partizione già esistente!\n" - "\n" - " * Premere un tasto qualsiasi per continuare.", + "di una partizione già esistente!\n" + "\n" + " * Premere un tasto qualsiasi per continuare.", NULL }, { @@ -1449,8 +1449,8 @@ { //ERROR_FIND_SETUPDATA, "Setup non ha trovato la sezione 'SetupData'\n" - "in TXTSETUP.SIF.\n", - "INVIO = Riavviare il computer" + "in TXTSETUP.SIF.\n", + "INVIO = Riavviare il computer" }, { //ERROR_WRITE_PTABLE, @@ -1463,6 +1463,11 @@ "ENTER = Reboot computer" }, { + //ERROR_UPDATE_LOCALESETTINGS, + "Setup could not set the system locale.\n" + "ENTER = Reboot computer" + }, + { NULL, NULL } Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h Tue Jan 8 00:34:56 2008 @@ -1278,12 +1278,12 @@ { //ERROR_NOT_INSTALLED "ReactOS nie zosta³ w pe³ni zainstalowany na twoim\n" - "komputerze. Jeli wyjdziesz teraz, trzeba bêdzie\n" - "ponownie uruchomiæ instalator by zainstalowaæ ReactOS.\n" - "\n" - " \x07 Nacinij ENTER aby kontynuowaæ instalacjê.\n" - " \x07 Nacinij F3 aby wyjæ z instalatora.", - "F3= Quit ENTER = Continue" + "komputerze. Jeli wyjdziesz teraz, trzeba bêdzie\n" + "ponownie uruchomiæ instalator by zainstalowaæ ReactOS.\n" + "\n" + " \x07 Nacinij ENTER aby kontynuowaæ instalacjê.\n" + " \x07 Nacinij F3 aby wyjæ z instalatora.", + "F3= Quit ENTER = Continue" }, { //ERROR_NO_HDD @@ -1342,21 +1342,21 @@ }, { //ERROR_WARN_PARTITION, - "Instalator wykry³, ¿e co najmniej jeden dysk twardy zawiera niekompatybiln¹ \n" - "tablicê partycji, która nie bêdzie poprawnie obs³ugiwana!\n" - "\n" - "Tworzenie lub kasowanie partycji mo¿e zniszczyæ ca³¹ tablicê partycji.\n" - "\n" - " \x07 Nacinij F3 aby wyjæ z instalatora." - " \x07 Nacinij ENTER aby kontynuowaæ.", - "F3= Wyjcie ENTER = Kontynuacja" + "Instalator wykry³, ¿e co najmniej jeden dysk twardy zawiera niekompatybiln¹ \n" + "tablicê partycji, która nie bêdzie poprawnie obs³ugiwana!\n" + "\n" + "Tworzenie lub kasowanie partycji mo¿e zniszczyæ ca³¹ tablicê partycji.\n" + "\n" + " \x07 Nacinij F3 aby wyjæ z instalatora." + " \x07 Nacinij ENTER aby kontynuowaæ.", + "F3= Wyjcie ENTER = Kontynuacja" }, { //ERROR_NEW_PARTITION, "Nie mo¿esz stworzyæ nowej partycji w miejscu ju¿\n" - "istniej¹cej!\n" - "\n" - " * Nacinij dowolny klawisz aby kontynuowaæ.", + "istniej¹cej!\n" + "\n" + " * Nacinij dowolny klawisz aby kontynuowaæ.", NULL }, { @@ -1451,8 +1451,8 @@ { //ERROR_FIND_SETUPDATA, "Instalator nie by³ w stanie znaleæ sekcji 'SetupData'\n" - "w pliku TXTSETUP.SIF.\n", - "ENTER = Restart komputera" + "w pliku TXTSETUP.SIF.\n", + "ENTER = Restart komputera" }, { //ERROR_WRITE_PTABLE, @@ -1465,6 +1465,11 @@ "ENTER = Reboot computer" }, { + //ERROR_UPDATE_LOCALESETTINGS, + "Setup could not set the system locale.\n" + "ENTER = Reboot computer" + }, + { NULL, NULL } Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h Tue Jan 8 00:34:56 2008 @@ -1270,12 +1270,12 @@ { //ERROR_NOT_INSTALLED "ReactOS íå áûë ïîëíîñòüþ óñòàíîâëåí íà âàø\n" - "êîìïüþòåð. Åñëè âû âûéäèòå èç óñòàíîâêè ñåé÷àñ,\n" - "òî âàì íóæíî çàïóñòèòü ïðîãðàììó óñòàíîâêè ñíîâà,\n" - "åñëè âû õîòèòå óñòàíîâèòü ReactOS\n" - " \x07 Íàæìèòå ENTER äëÿ ïðîäîëæåíèÿ óñòàíîâêè.\n" - " \x07 Íàæìèòå F3 âûõîäà èç óñòàíîâêè.", - "F3 = Âûõîä ENTER = Ïðîäîëæèòü" + "êîìïüþòåð. Åñëè âû âûéäèòå èç óñòàíîâêè ñåé÷àñ,\n" + "òî âàì íóæíî çàïóñòèòü ïðîãðàììó óñòàíîâêè ñíîâà,\n" + "åñëè âû õîòèòå óñòàíîâèòü ReactOS\n" + " \x07 Íàæìèòå ENTER äëÿ ïðîäîëæåíèÿ óñòàíîâêè.\n" + " \x07 Íàæìèòå F3 âûõîäà èç óñòàíîâêè.", + "F3 = Âûõîä ENTER = Ïðîäîëæèòü" }, { //ERROR_NO_HDD @@ -1334,21 +1334,21 @@ }, { //ERROR_WARN_PARTITION, - "Setup found that at least one harddisk contains an incompatible\n" - "partition table that can not be handled properly!\n" - "\n" - "Creating or deleting partitions can destroy the partiton table.\n" - "\n" - " \x07 Íàæìèòå F3 äëÿ âûõîäà èç óñòàíîâêè." - " \x07 Íàæìèòå ENTER äëÿ ïðîäîëæåíèÿ.", - "F3 = Âûõîä ENTER = Ïðîäîëæèòü" + "Setup found that at least one harddisk contains an incompatible\n" + "partition table that can not be handled properly!\n" + "\n" + "Creating or deleting partitions can destroy the partiton table.\n" + "\n" + " \x07 Íàæìèòå F3 äëÿ âûõîäà èç óñòàíîâêè." + " \x07 Íàæìèòå ENTER äëÿ ïðîäîëæåíèÿ.", + "F3 = Âûõîä ENTER = Ïðîäîëæèòü" }, { //ERROR_NEW_PARTITION, "You can not create a new Partition inside\n" - "of an already existing Partition!\n" - "\n" - " * Íàæìèòå ëþáóþ êëàâèøó äëÿ ïðîäîëæåíèÿ.", + "of an already existing Partition!\n" + "\n" + " * Íàæìèòå ëþáóþ êëàâèøó äëÿ ïðîäîëæåíèÿ.", NULL }, { @@ -1443,8 +1443,8 @@ { //ERROR_FIND_SETUPDATA, "Íå óäàëîñü íàéòè ñåêöèþ 'SetupData'\n" - "â ôàéëå TXTSETUP.SIF.\n", - "ENTER = Ïåðåçàãðóçêà" + "â ôàéëå TXTSETUP.SIF.\n", + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_WRITE_PTABLE, @@ -1457,6 +1457,11 @@ "ENTER = Reboot computer" }, { + //ERROR_UPDATE_LOCALESETTINGS, + "Setup could not set the system locale.\n" + "ENTER = Reboot computer" + }, + { NULL, NULL } Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h Tue Jan 8 00:34:56 2008 @@ -1270,12 +1270,12 @@ { //ERROR_NOT_INSTALLED "ReactOS is not completely installed on your\n" - "computer. If you quit Setup now, you will need to\n" - "run Setup again to install ReactOS.\n" - "\n" - " \x07 Press ENTER to continue Setup.\n" - " \x07 Press F3 to quit Setup.", - "F3= Quit ENTER = Continue" + "computer. If you quit Setup now, you will need to\n" + "run Setup again to install ReactOS.\n" + "\n" + " \x07 Press ENTER to continue Setup.\n" + " \x07 Press F3 to quit Setup.", + "F3= Quit ENTER = Continue" }, { //ERROR_NO_HDD @@ -1334,21 +1334,21 @@ }, { //ERROR_WARN_PARTITION, - "Setup found that at least one harddisk contains an incompatible\n" - "partition table that can not be handled properly!\n" - "\n" - "Creating or deleting partitions can destroy the partiton table.\n" - "\n" - " \x07 Press F3 to quit Setup." - " \x07 Press ENTER to continue.", - "F3= Quit ENTER = Continue" + "Setup found that at least one harddisk contains an incompatible\n" + "partition table that can not be handled properly!\n" + "\n" + "Creating or deleting partitions can destroy the partiton table.\n" + "\n" + " \x07 Press F3 to quit Setup." + " \x07 Press ENTER to continue.", + "F3= Quit ENTER = Continue" }, { //ERROR_NEW_PARTITION, "You can not create a new Partition inside\n" - "of an already existing Partition!\n" - "\n" - " * Press any key to continue.", + "of an already existing Partition!\n" + "\n" + " * Press any key to continue.", NULL }, { @@ -1443,8 +1443,8 @@ { //ERROR_FIND_SETUPDATA, "Setup failed to find the 'SetupData' section\n" - "in TXTSETUP.SIF.\n", - "ENTER = Reboot computer" + "in TXTSETUP.SIF.\n", + "ENTER = Reboot computer" }, { //ERROR_WRITE_PTABLE, @@ -1457,6 +1457,11 @@ "ENTER = Reboot computer" }, { + //ERROR_UPDATE_LOCALESETTINGS, + "Setup could not set the system locale.\n" + "ENTER = Reboot computer" + }, + { NULL, NULL } Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h Tue Jan 8 00:34:56 2008 @@ -1270,12 +1270,12 @@ { //ERROR_NOT_INSTALLED "ReactOS is not completely installed on your\n" - "computer. If you quit Setup now, you will need to\n" - "run Setup again to install ReactOS.\n" - "\n" - " \x07 Press ENTER to continue Setup.\n" - " \x07 Press F3 to quit Setup.", - "F3= Quit ENTER = Continue" + "computer. If you quit Setup now, you will need to\n" + "run Setup again to install ReactOS.\n" + "\n" + " \x07 Press ENTER to continue Setup.\n" + " \x07 Press F3 to quit Setup.", + "F3= Quit ENTER = Continue" }, { //ERROR_NO_HDD @@ -1334,21 +1334,21 @@ }, { //ERROR_WARN_PARTITION, - "Setup found that at least one harddisk contains an incompatible\n" - "partition table that can not be handled properly!\n" - "\n" - "Creating or deleting partitions can destroy the partiton table.\n" - "\n" - " \x07 Press F3 to quit Setup." - " \x07 Press ENTER to continue.", - "F3= Quit ENTER = Continue" + "Setup found that at least one harddisk contains an incompatible\n" + "partition table that can not be handled properly!\n" + "\n" + "Creating or deleting partitions can destroy the partiton table.\n" + "\n" + " \x07 Press F3 to quit Setup." + " \x07 Press ENTER to continue.", + "F3= Quit ENTER = Continue" }, { //ERROR_NEW_PARTITION, "You can not create a new Partition inside\n" - "of an already existing Partition!\n" - "\n" - " * Press any key to continue.", + "of an already existing Partition!\n" + "\n" + " * Press any key to continue.", NULL }, { @@ -1443,8 +1443,8 @@ { //ERROR_FIND_SETUPDATA, "Setup failed to find the 'SetupData' section\n" - "in TXTSETUP.SIF.\n", - "ENTER = Reboot computer" + "in TXTSETUP.SIF.\n", + "ENTER = Reboot computer" }, { //ERROR_WRITE_PTABLE, @@ -1457,6 +1457,11 @@ "ENTER = Reboot computer" }, { + //ERROR_UPDATE_LOCALESETTINGS, + "Setup could not set the system locale.\n" + "ENTER = Reboot computer" + }, + { NULL, NULL } Modified: trunk/reactos/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/settings… ============================================================================== --- trunk/reactos/base/setup/usetup/settings.c (original) +++ trunk/reactos/base/setup/usetup/settings.c Tue Jan 8 00:34:56 2008 @@ -20,7 +20,8 @@ * PROJECT: ReactOS text-mode setup * FILE: subsys/system/usetup/settings.c * PURPOSE: Device settings support functions - * PROGRAMMER: Eric Kohl + * PROGRAMMERS: Eric Kohl + * Colin Finck */ /* INCLUDES *****************************************************************/ @@ -616,181 +617,15 @@ } -PGENERIC_LIST -CreateKeyboardDriverList(HINF InfFile) -{ - CHAR Buffer[128]; - PGENERIC_LIST List; - INFCONTEXT Context; - PWCHAR KeyName; - PWCHAR KeyValue; - PWCHAR UserData; - - List = CreateGenericList(); - if (List == NULL) - return NULL; - - if (!SetupFindFirstLineW (InfFile, L"Keyboard", NULL, &Context)) - { - DestroyGenericList(List, FALSE); - return NULL; - } - - do - { - if (!INF_GetData (&Context, &KeyName, &KeyValue)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetData() failed\n"); - break; - } - - UserData = (WCHAR*) RtlAllocateHeap(ProcessHeap, - 0, - (wcslen(KeyName) + 1) * sizeof(WCHAR)); - if (UserData == NULL) - { - /* FIXME: Handle error! */ - } - - wcscpy(UserData, KeyName); - - sprintf(Buffer, "%S", KeyValue); - AppendGenericListEntry(List, Buffer, UserData, FALSE); - } while (SetupFindNextLine(&Context, &Context)); - - return List; -} - -PGENERIC_LIST -CreateLanguageList(HINF InfFile, WCHAR * DefaultLanguage) -{ - CHAR Buffer[128]; - PGENERIC_LIST List; - INFCONTEXT Context; - PWCHAR KeyName; - PWCHAR KeyValue; - PWCHAR UserData; - - /* Get default language id */ - if (!SetupFindFirstLineW (InfFile, L"NLS", L"DefaultLanguage", &Context)) - return NULL; - - if (!INF_GetData (&Context, NULL, &KeyValue)) - return NULL; - - wcscpy(DefaultLanguage, KeyValue); - - SelectedLanguageId = KeyValue; - - List = CreateGenericList(); - if (List == NULL) - return NULL; - - if (!SetupFindFirstLineW (InfFile, L"Language", NULL, &Context)) - { - DestroyGenericList(List, FALSE); - return NULL; - } - - do - { - if (!INF_GetData (&Context, &KeyName, &KeyValue)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetData() failed\n"); - break; - } - - UserData = (WCHAR*) RtlAllocateHeap(ProcessHeap, - 0, - (wcslen(KeyName) + 1) * sizeof(WCHAR)); - if (UserData == NULL) - { - /* FIXME: Handle error! */ - } - - wcscpy(UserData, KeyName); - - sprintf(Buffer, "%S", KeyValue); - AppendGenericListEntry(List, - Buffer, - UserData, - _wcsicmp(KeyName, DefaultLanguage) ? FALSE : TRUE); - } while (SetupFindNextLine(&Context, &Context)); - - return List; -} - -PGENERIC_LIST -CreateKeyboardLayoutList(HINF InfFile, WCHAR * DefaultKBLayout) -{ - CHAR Buffer[128]; - PGENERIC_LIST List; - INFCONTEXT Context; - PWCHAR KeyName; - PWCHAR KeyValue; - PWCHAR UserData; - - /* Get default layout id */ - if (!SetupFindFirstLineW (InfFile, L"NLS", L"DefaultLayout", &Context)) - return NULL; - - if (!INF_GetData (&Context, NULL, &KeyValue)) - return NULL; - - wcscpy(DefaultKBLayout, KeyValue); - - List = CreateGenericList(); - if (List == NULL) - return NULL; - - if (!SetupFindFirstLineW (InfFile, L"KeyboardLayout", NULL, &Context)) - { - DestroyGenericList(List, FALSE); - return NULL; - } - - do - { - if (!INF_GetData (&Context, &KeyName, &KeyValue)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetData() failed\n"); - DestroyGenericList(List, FALSE); - break; - } - - UserData = (WCHAR*) RtlAllocateHeap(ProcessHeap, - 0, - (wcslen(KeyName) + 1) * sizeof(WCHAR)); - - if (UserData == NULL) - { - /* FIXME: Handle error! */ - } - - wcscpy(UserData, KeyName); - - sprintf(Buffer, "%S", KeyValue); - AppendGenericListEntry(List, - Buffer, - UserData, - _wcsicmp(KeyName, DefaultKBLayout) ? FALSE : TRUE); - } while (SetupFindNextLine(&Context, &Context)); - - return List; -} - - BOOLEAN -ProcessKeyboardLayoutRegistry(PGENERIC_LIST List) +ProcessLocaleRegistry(PGENERIC_LIST List) { PGENERIC_LIST_ENTRY Entry; PWCHAR LanguageId; OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName; UNICODE_STRING ValueName; + HANDLE KeyHandle; NTSTATUS Status; @@ -802,7 +637,7 @@ if (LanguageId == NULL) return FALSE; - /* Open the nls language key */ + /* Open the NLS language key */ RtlInitUnicodeString(&KeyName, L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language"); @@ -861,6 +696,273 @@ } +PGENERIC_LIST +CreateKeyboardDriverList(HINF InfFile) +{ + CHAR Buffer[128]; + PGENERIC_LIST List; + INFCONTEXT Context; + PWCHAR KeyName; + PWCHAR KeyValue; + PWCHAR UserData; + + List = CreateGenericList(); + if (List == NULL) + return NULL; + + if (!SetupFindFirstLineW (InfFile, L"Keyboard", NULL, &Context)) + { + DestroyGenericList(List, FALSE); + return NULL; + } + + do + { + if (!INF_GetData (&Context, &KeyName, &KeyValue)) + { + /* FIXME: Handle error! */ + DPRINT("INF_GetData() failed\n"); + break; + } + + UserData = (WCHAR*) RtlAllocateHeap(ProcessHeap, + 0, + (wcslen(KeyName) + 1) * sizeof(WCHAR)); + if (UserData == NULL) + { + /* FIXME: Handle error! */ + } + + wcscpy(UserData, KeyName); + + sprintf(Buffer, "%S", KeyValue); + AppendGenericListEntry(List, Buffer, UserData, FALSE); + } while (SetupFindNextLine(&Context, &Context)); + + return List; +} + +PGENERIC_LIST +CreateLanguageList(HINF InfFile, WCHAR * DefaultLanguage) +{ + CHAR Buffer[128]; + PGENERIC_LIST List; + INFCONTEXT Context; + PWCHAR KeyName; + PWCHAR KeyValue; + PWCHAR UserData; + + /* Get default language id */ + if (!SetupFindFirstLineW (InfFile, L"NLS", L"DefaultLanguage", &Context)) + return NULL; + + if (!INF_GetData (&Context, NULL, &KeyValue)) + return NULL; + + wcscpy(DefaultLanguage, KeyValue); + + SelectedLanguageId = KeyValue; + + List = CreateGenericList(); + if (List == NULL) + return NULL; + + if (!SetupFindFirstLineW (InfFile, L"Language", NULL, &Context)) + { + DestroyGenericList(List, FALSE); + return NULL; + } + + do + { + if (!INF_GetData (&Context, &KeyName, &KeyValue)) + { + /* FIXME: Handle error! */ + DPRINT("INF_GetData() failed\n"); + break; + } + + UserData = (WCHAR*) RtlAllocateHeap(ProcessHeap, + 0, + (wcslen(KeyName) + 1) * sizeof(WCHAR)); + if (UserData == NULL) + { + /* FIXME: Handle error! */ + } + + wcscpy(UserData, KeyName); + + sprintf(Buffer, "%S", KeyValue); + AppendGenericListEntry(List, + Buffer, + UserData, + _wcsicmp(KeyName, DefaultLanguage) ? FALSE : TRUE); + } while (SetupFindNextLine(&Context, &Context)); + + return List; +} + +PGENERIC_LIST +CreateKeyboardLayoutList(HINF InfFile, WCHAR * DefaultKBLayout) +{ + CHAR Buffer[128]; + PGENERIC_LIST List; + INFCONTEXT Context; + PWCHAR KeyName; + PWCHAR KeyValue; + PWCHAR UserData; + + /* Get default layout id */ + if (!SetupFindFirstLineW (InfFile, L"NLS", L"DefaultLayout", &Context)) + return NULL; + + if (!INF_GetData (&Context, NULL, &KeyValue)) + return NULL; + + wcscpy(DefaultKBLayout, KeyValue); + + List = CreateGenericList(); + if (List == NULL) + return NULL; + + if (!SetupFindFirstLineW (InfFile, L"KeyboardLayout", NULL, &Context)) + { + DestroyGenericList(List, FALSE); + return NULL; + } + + do + { + if (!INF_GetData (&Context, &KeyName, &KeyValue)) + { + /* FIXME: Handle error! */ + DPRINT("INF_GetData() failed\n"); + DestroyGenericList(List, FALSE); + break; + } + + UserData = (WCHAR*) RtlAllocateHeap(ProcessHeap, + 0, + (wcslen(KeyName) + 1) * sizeof(WCHAR)); + + if (UserData == NULL) + { + /* FIXME: Handle error! */ + } + + wcscpy(UserData, KeyName); + + sprintf(Buffer, "%S", KeyValue); + AppendGenericListEntry(List, + Buffer, + UserData, + _wcsicmp(KeyName, DefaultKBLayout) ? FALSE : TRUE); + } while (SetupFindNextLine(&Context, &Context)); + + return List; +} + + +BOOLEAN +ProcessKeyboardLayoutRegistry(PGENERIC_LIST List) +{ + PGENERIC_LIST_ENTRY Entry; + PWCHAR LanguageId; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + UNICODE_STRING ValueName; + ULONG Disposition; + HANDLE KeyHandle; + NTSTATUS Status; + WCHAR szKeyName[48] = L"\\Registry\\User\\.DEFAULT\\Keyboard Layout"; // 48 = "\Registry\User\.DEFAULT\Keyboard Layout\Preload" + NULL char + + Entry = GetGenericListEntry(List); + if (Entry == NULL) + return FALSE; + + LanguageId = (PWCHAR)Entry->UserData; + if (LanguageId == NULL) + return FALSE; + + // First create the "Keyboard Layout" key + RtlInitUnicodeString(&KeyName, szKeyName); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtCreateKey(&KeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + 0, + &Disposition); + + if(NT_SUCCESS(Status)) + NtClose(KeyHandle); + else + { + DPRINT1("NtCreateKey() failed (Status %lx)\n", Status); + return FALSE; + } + + // Then create the "Preload" key + KeyName.MaximumLength = sizeof(szKeyName); + Status = RtlAppendUnicodeToString(&KeyName, L"\\Preload"); + + if(!NT_SUCCESS(Status)) + { + DPRINT1("RtlAppend failed! (%lx)\n", Status); + DPRINT1("String is %wZ\n", &KeyName); + return FALSE; + } + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtCreateKey(&KeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + 0, + &Disposition); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtCreateKey() failed (Status %lx)\n", Status); + return FALSE; + } + + /* Set default keyboard layout */ + RtlInitUnicodeString(&ValueName, + L"1"); + + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + (PVOID)LanguageId, + (8 + 1) * sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); + NtClose(KeyHandle); + return FALSE; + } + + NtClose(KeyHandle); + + return TRUE; +} + + #if 0 BOOLEAN ProcessKeyboardLayoutFiles(PGENERIC_LIST List) Modified: trunk/reactos/base/setup/usetup/settings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/settings… ============================================================================== --- trunk/reactos/base/setup/usetup/settings.h (original) +++ trunk/reactos/base/setup/usetup/settings.h Tue Jan 8 00:34:56 2008 @@ -52,6 +52,9 @@ CreateLanguageList(HINF InfFile, WCHAR * DefaultLanguage); BOOLEAN +ProcessLocaleRegistry(PGENERIC_LIST List); + +BOOLEAN ProcessKeyboardLayoutRegistry(PGENERIC_LIST List); BOOLEAN Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c Tue Jan 8 00:34:56 2008 @@ -5,6 +5,7 @@ * FILE: subsystems/win32/win32k/ntuser/kbdlayout.c * PURPOSE: Keyboard layout management * COPYRIGHT: Copyright 2007 Saveliy Tretiakov + * Copyright 2008 Colin Finck * */ @@ -53,7 +54,7 @@ InitializeObjectAttributes(&KeyAttributes, KeyName, OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = ZwOpenKey(&KeyHandle, KEY_ALL_ACCESS, &KeyAttributes); + Status = ZwOpenKey(&KeyHandle, KEY_READ, &KeyAttributes); if( !NT_SUCCESS(Status) ) { return Status; @@ -270,24 +271,77 @@ PKBL W32kGetDefaultKeyLayout(VOID) { - LCID LocaleId; + const WCHAR szKeyboardLayoutPath[] = L"\\Keyboard Layout\\Preload"; + + HANDLE KeyHandle; + LCID LayoutLocaleId = 0; NTSTATUS Status; + OBJECT_ATTRIBUTES KeyAttributes; PKBL pKbl; - - // This is probably wrong... - // I need to do more research. - Status = ZwQueryDefaultLocale(FALSE, &LocaleId); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Could not get default locale (%08lx).\n", Status); - DPRINT1("Assuming default locale = 0x409 (US).\n"); - LocaleId = 0x409; + UNICODE_STRING CurrentUserPath; + UNICODE_STRING FullKeyboardLayoutPath; + UNICODE_STRING LayoutValueName; + UNICODE_STRING LayoutLocaleIdString; + WCHAR wszBuffer[MAX_PATH]; + + // Get the path to HKEY_CURRENT_USER + Status = RtlFormatCurrentUserKeyPath(&CurrentUserPath); + + if( NT_SUCCESS(Status) ) + { + // FIXME: Is this 100% correct? + // We're called very early, so \\REGISTRY\\USER might not be available yet. Check this first. + InitializeObjectAttributes(&KeyAttributes, &CurrentUserPath, OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = ZwOpenKey(&KeyHandle, KEY_READ, &KeyAttributes); + + if(Status == STATUS_OBJECT_NAME_NOT_FOUND) + { + // Fall back to US English without any debug message + LayoutLocaleId = 0x409; + } + else + { + // The path is available, so build the full path to HKEY_CURRENT_USER\Keyboard Layout\Preload + ZwClose(KeyHandle); + + RtlCopyMemory(wszBuffer, CurrentUserPath.Buffer, CurrentUserPath.MaximumLength); + RtlInitUnicodeString(&FullKeyboardLayoutPath, wszBuffer); + FullKeyboardLayoutPath.MaximumLength = MAX_PATH; + + Status = RtlAppendUnicodeToString(&FullKeyboardLayoutPath, szKeyboardLayoutPath); + + if( NT_SUCCESS(Status) ) + { + // Return the first keyboard layout listed there + RtlInitUnicodeString(&LayoutValueName, L"1"); + + Status = ReadRegistryValue(&FullKeyboardLayoutPath, &LayoutValueName, &LayoutLocaleIdString); + + if( NT_SUCCESS(Status) ) + RtlUnicodeStringToInteger(&LayoutLocaleIdString, 16, &LayoutLocaleId); + else + DPRINT1("ReadRegistryValue failed! (%08lx).\n", Status); + } + else + DPRINT1("RtlAppendUnicodeToString failed! (%08lx)\n", Status); + } + + RtlFreeUnicodeString(&CurrentUserPath); + } + else + DPRINT1("RtlFormatCurrentUserKeyPath failed! (%08lx)\n", Status); + + if(!LayoutLocaleId) + { + // This block is only reached in case of a failure, so use DPRINT1 here + DPRINT1("Assuming default locale for the keyboard layout (0x409 - US)\n"); + LayoutLocaleId = 0x409; } pKbl = KBLList; do { - if(pKbl->klid == LocaleId) + if(pKbl->klid == LayoutLocaleId) { return pKbl; } @@ -296,11 +350,11 @@ } while(pKbl != KBLList); DPRINT("Loading new default keyboard layout.\n"); - pKbl = UserLoadDllAndCreateKbl(LocaleId); + pKbl = UserLoadDllAndCreateKbl(LayoutLocaleId); if(!pKbl) { - DPRINT("Failed to load %x!!! Returning any availableKL.\n", LocaleId); + DPRINT("Failed to load %x!!! Returning any availableKL.\n", LayoutLocaleId); return KBLList; }

1 0

[dchapyshev] 31654: - Apply patch from GedMurphy
by dchapyshev＠svn.reactos.org 07 Jan '08

07 Jan '08

Author: dchapyshev Date: Tue Jan 8 00:08:02 2008 New Revision: 31654 URL: http://svn.reactos.org/svn/reactos?rev=31654&view=rev Log: - Apply patch from GedMurphy Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c Tue Jan 8 00:08:02 2008 @@ -817,27 +817,19 @@ HKEY hKey; LCID lcid; TCHAR Locale[12]; - DWORD dwDisp; - LONG ret = ERROR_SUCCESS; lcid = GetSystemDefaultLCID(); - if (GetLocaleInfo(MAKELCID(lcid, SORT_DEFAULT), LOCALE_ILANGUAGE, (WORD*)Locale, sizeof(Locale)) != 0) + if (GetLocaleInfo(MAKELCID(lcid, SORT_DEFAULT), LOCALE_ILANGUAGE, Locale, sizeof(Locale) / sizeof(Locale[0])) != 0) { - if (RegOpenKey(HKEY_CURRENT_USER, L"Control Panel\\International", &hKey) != ERROR_SUCCESS) - { - ret = RegCreateKeyEx(HKEY_LOCAL_MACHINE, L"Control Panel\\International", - 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_WRITE, NULL, &hKey, &dwDisp); - } - - if (ret == ERROR_SUCCESS) - { - RegSetValueEx(hKey, L"Locale", 0, REG_SZ, (LPBYTE)Locale, (DWORD)(lstrlen(Locale)+1)); + if (RegCreateKeyEx(HKEY_CURRENT_USER, _T("Control Panel\\International"), + 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_WRITE, NULL, &hKey, NULL) == ERROR_SUCCESS) + { + RegSetValueEx(hKey, _T("Locale"), 0, REG_SZ, (LPBYTE)Locale, (_tcslen(Locale)+1) * sizeof(TCHAR)); + RegCloseKey(hKey); } } - - RegCloseKey(hKey); } static INT_PTR CALLBACK

1 0

[hpoussin] 31653: [FORMATTING] Fix indentation
by hpoussin＠svn.reactos.org 07 Jan '08

07 Jan '08

Author: hpoussin Date: Mon Jan 7 23:55:02 2008 New Revision: 31653 URL: http://svn.reactos.org/svn/reactos?rev=31653&view=rev Log: [FORMATTING] Fix indentation Modified: trunk/reactos/base/system/userinit/userinit.c Modified: trunk/reactos/base/system/userinit/userinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri… ============================================================================== --- trunk/reactos/base/system/userinit/userinit.c (original) +++ trunk/reactos/base/system/userinit/userinit.c Mon Jan 7 23:55:02 2008 @@ -38,113 +38,115 @@ static LONG ReadRegSzKey( - IN HKEY hKey, - IN LPCWSTR pszKey, - OUT LPWSTR* pValue) -{ - LONG rc; - DWORD dwType; - DWORD cbData = 0; - LPWSTR Value; - - rc = RegQueryValueExW(hKey, pszKey, NULL, &dwType, NULL, &cbData); - if (rc != ERROR_SUCCESS) - return rc; - if (dwType != REG_SZ) - return ERROR_FILE_NOT_FOUND; - Value = (WCHAR*) HeapAlloc(GetProcessHeap(), 0, cbData + sizeof(WCHAR)); - if (!Value) - return ERROR_NOT_ENOUGH_MEMORY; - rc = RegQueryValueExW(hKey, pszKey, NULL, NULL, (LPBYTE)Value, &cbData); - if (rc != ERROR_SUCCESS) - { - HeapFree(GetProcessHeap(), 0, Value); - return rc; - } - /* NULL-terminate the string */ - Value[cbData / sizeof(WCHAR)] = '\0'; - - *pValue = Value; - return ERROR_SUCCESS; -} - -static -BOOL IsConsoleShell(void) -{ - HKEY ControlKey = NULL; - LPWSTR SystemStartOptions = NULL; - LPWSTR CurrentOption, NextOption; /* Pointers into SystemStartOptions */ - LONG rc; - BOOL ret = FALSE; - - rc = RegOpenKeyEx( - HKEY_LOCAL_MACHINE, - REGSTR_PATH_CURRENT_CONTROL_SET, - 0, - KEY_QUERY_VALUE, - &ControlKey); - - rc = ReadRegSzKey(ControlKey, L"SystemStartOptions", &SystemStartOptions); - if (rc != ERROR_SUCCESS) - goto cleanup; - - /* Check for CONSOLE in SystemStartOptions */ - CurrentOption = SystemStartOptions; - while (CurrentOption) - { - NextOption = wcschr(CurrentOption, L' '); - if (NextOption) - *NextOption = L'\0'; - if (wcsicmp(CurrentOption, L"CONSOLE") == 0) - { - ret = TRUE; - goto cleanup; - } - CurrentOption = NextOption ? NextOption + 1 : NULL; - } + IN HKEY hKey, + IN LPCWSTR pszKey, + OUT LPWSTR* pValue) +{ + LONG rc; + DWORD dwType; + DWORD cbData = 0; + LPWSTR Value; + + rc = RegQueryValueExW(hKey, pszKey, NULL, &dwType, NULL, &cbData); + if (rc != ERROR_SUCCESS) + return rc; + if (dwType != REG_SZ) + return ERROR_FILE_NOT_FOUND; + Value = (WCHAR*) HeapAlloc(GetProcessHeap(), 0, cbData + sizeof(WCHAR)); + if (!Value) + return ERROR_NOT_ENOUGH_MEMORY; + rc = RegQueryValueExW(hKey, pszKey, NULL, NULL, (LPBYTE)Value, &cbData); + if (rc != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, Value); + return rc; + } + /* NULL-terminate the string */ + Value[cbData / sizeof(WCHAR)] = '\0'; + + *pValue = Value; + return ERROR_SUCCESS; +} + +static +BOOL IsConsoleShell(VOID) +{ + HKEY ControlKey = NULL; + LPWSTR SystemStartOptions = NULL; + LPWSTR CurrentOption, NextOption; /* Pointers into SystemStartOptions */ + LONG rc; + BOOL ret = FALSE; + + rc = RegOpenKeyEx( + HKEY_LOCAL_MACHINE, + REGSTR_PATH_CURRENT_CONTROL_SET, + 0, + KEY_QUERY_VALUE, + &ControlKey); + + rc = ReadRegSzKey(ControlKey, L"SystemStartOptions", &SystemStartOptions); + if (rc != ERROR_SUCCESS) + goto cleanup; + + /* Check for CONSOLE in SystemStartOptions */ + CurrentOption = SystemStartOptions; + while (CurrentOption) + { + NextOption = wcschr(CurrentOption, L' '); + if (NextOption) + *NextOption = L'\0'; + if (wcsicmp(CurrentOption, L"CONSOLE") == 0) + { + ret = TRUE; + goto cleanup; + } + CurrentOption = NextOption ? NextOption + 1 : NULL; + } cleanup: - if (ControlKey != NULL) - RegCloseKey(ControlKey); - HeapFree(GetProcessHeap(), 0, SystemStartOptions); - return ret; -} - -static -BOOL GetShell(WCHAR *CommandLine, HKEY hRootKey) -{ - HKEY hKey; - DWORD Type, Size; - WCHAR Shell[MAX_PATH]; - BOOL Ret = FALSE; - BOOL ConsoleShell = IsConsoleShell(); - - if(RegOpenKeyEx(hRootKey, - L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon", /* FIXME: should be REGSTR_PATH_WINLOGON */ - 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) - { - Size = MAX_PATH * sizeof(WCHAR); - if(RegQueryValueEx(hKey, - ConsoleShell ? L"ConsoleShell" : L"Shell", - NULL, - &Type, - (LPBYTE)Shell, - &Size) == ERROR_SUCCESS) - { - if((Type == REG_SZ) || (Type == REG_EXPAND_SZ)) - { - wcscpy(CommandLine, Shell); - Ret = TRUE; - } - } - RegCloseKey(hKey); - } - - return Ret; + if (ControlKey != NULL) + RegCloseKey(ControlKey); + HeapFree(GetProcessHeap(), 0, SystemStartOptions); + return ret; +} + +static +BOOL GetShell( + OUT WCHAR *CommandLine, /* must be at least MAX_PATH long */ + IN HKEY hRootKey) +{ + HKEY hKey; + DWORD Type, Size; + WCHAR Shell[MAX_PATH]; + BOOL Ret = FALSE; + BOOL ConsoleShell = IsConsoleShell(); + + if (RegOpenKeyEx(hRootKey, REGSTR_PATH_WINLOGON, + 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + { + Size = MAX_PATH * sizeof(WCHAR); + if (RegQueryValueEx(hKey, + ConsoleShell ? L"ConsoleShell" : L"Shell", + NULL, + &Type, + (LPBYTE)Shell, + &Size) == ERROR_SUCCESS) + { + if ((Type == REG_SZ) || (Type == REG_EXPAND_SZ)) + { + wcscpy(CommandLine, Shell); + Ret = TRUE; + } + } + RegCloseKey(hKey); + } + + return Ret; } static VOID -StartAutoApplications(int clsid) +StartAutoApplications( + IN INT clsid) { WCHAR szPath[MAX_PATH] = {0}; HRESULT hResult; @@ -157,303 +159,307 @@ len = wcslen(szPath); if (!SUCCEEDED(hResult) || len == 0) { - return; + return; } wcscat(szPath, L"\\*"); hFind = FindFirstFileW(szPath, &findData); if (hFind == INVALID_HANDLE_VALUE) { - return; + return; } szPath[len] = L'\0'; do { - if (!(findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && (findData.nFileSizeHigh || findData.nFileSizeLow)) - { - memset(&ExecInfo, 0x0, sizeof(SHELLEXECUTEINFOW)); - ExecInfo.cbSize = sizeof(ExecInfo); - ExecInfo.lpVerb = L"open"; - ExecInfo.lpFile = findData.cFileName; - ExecInfo.lpDirectory = szPath; - ShellExecuteExW(&ExecInfo); - } - }while(FindNextFileW(hFind, &findData)); + if (!(findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && (findData.nFileSizeHigh || findData.nFileSizeLow)) + { + memset(&ExecInfo, 0x0, sizeof(SHELLEXECUTEINFOW)); + ExecInfo.cbSize = sizeof(ExecInfo); + ExecInfo.lpVerb = L"open"; + ExecInfo.lpFile = findData.cFileName; + ExecInfo.lpDirectory = szPath; + ShellExecuteExW(&ExecInfo); + } + } while (FindNextFileW(hFind, &findData)); FindClose(hFind); } - static BOOL -TryToStartShell(LPCWSTR Shell) -{ - STARTUPINFO si; - PROCESS_INFORMATION pi; - WCHAR ExpandedShell[MAX_PATH]; - - ZeroMemory(&si, sizeof(STARTUPINFO)); - si.cb = sizeof(STARTUPINFO); - ZeroMemory(&pi, sizeof(PROCESS_INFORMATION)); - - ExpandEnvironmentStrings(Shell, ExpandedShell, MAX_PATH); - - if(!CreateProcess(NULL, - ExpandedShell, - NULL, - NULL, - FALSE, - NORMAL_PRIORITY_CLASS, - NULL, - NULL, - &si, - &pi)) - return FALSE; - - StartAutoApplications(CSIDL_STARTUP); - StartAutoApplications(CSIDL_COMMON_STARTUP); - WaitForSingleObject(pi.hProcess, INFINITE); - CloseHandle(pi.hProcess); - CloseHandle(pi.hThread); - return TRUE; -} - -static -void StartShell(void) -{ - WCHAR Shell[MAX_PATH]; - TCHAR szMsg[RC_STRING_MAX_SIZE]; - - /* Try to run shell in user key */ - if (GetShell(Shell, HKEY_CURRENT_USER) && TryToStartShell(Shell)) - return; - - /* Try to run shell in local machine key */ - if (GetShell(Shell, HKEY_LOCAL_MACHINE) && TryToStartShell(Shell)) - return; - - /* Try default shell */ - if (IsConsoleShell()) - { - if(GetSystemDirectory(Shell, MAX_PATH - 8)) - wcscat(Shell, L"\\cmd.exe"); - else - wcscpy(Shell, L"cmd.exe"); +TryToStartShell( + IN LPCWSTR Shell) +{ + STARTUPINFO si; + PROCESS_INFORMATION pi; + WCHAR ExpandedShell[MAX_PATH]; + + ZeroMemory(&si, sizeof(STARTUPINFO)); + si.cb = sizeof(STARTUPINFO); + ZeroMemory(&pi, sizeof(PROCESS_INFORMATION)); + + ExpandEnvironmentStrings(Shell, ExpandedShell, MAX_PATH); + + if (!CreateProcess(NULL, + ExpandedShell, + NULL, + NULL, + FALSE, + NORMAL_PRIORITY_CLASS, + NULL, + NULL, + &si, + &pi)) + { + return FALSE; + } + + StartAutoApplications(CSIDL_STARTUP); + StartAutoApplications(CSIDL_COMMON_STARTUP); + WaitForSingleObject(pi.hProcess, INFINITE); + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + return TRUE; +} + +static +VOID StartShell(VOID) +{ + WCHAR Shell[MAX_PATH]; + TCHAR szMsg[RC_STRING_MAX_SIZE]; + + /* Try to run shell in user key */ + if (GetShell(Shell, HKEY_CURRENT_USER) && TryToStartShell(Shell)) + { + return; + } + + /* Try to run shell in local machine key */ + if (GetShell(Shell, HKEY_LOCAL_MACHINE) && TryToStartShell(Shell)) + { + return; + } + + /* Try default shell */ + if (IsConsoleShell()) + { + if (GetSystemDirectory(Shell, MAX_PATH - 8)) + wcscat(Shell, L"\\cmd.exe"); + else + wcscpy(Shell, L"cmd.exe"); } else { - if(GetWindowsDirectory(Shell, MAX_PATH - 13)) - wcscat(Shell, L"\\explorer.exe"); - else - wcscpy(Shell, L"explorer.exe"); - } - if (!TryToStartShell(Shell)) - { - LoadString( GetModuleHandle(NULL), STRING_USERINIT_FAIL, szMsg, sizeof(szMsg) / sizeof(szMsg[0])); - MessageBox(0, szMsg, NULL, 0); - } -} - -WCHAR g_RegColorNames[][32] = - {L"Scrollbar", /* 00 = COLOR_SCROLLBAR */ - L"Background", /* 01 = COLOR_DESKTOP */ - L"ActiveTitle", /* 02 = COLOR_ACTIVECAPTION */ - L"InactiveTitle", /* 03 = COLOR_INACTIVECAPTION */ - L"Menu", /* 04 = COLOR_MENU */ - L"Window", /* 05 = COLOR_WINDOW */ - L"WindowFrame", /* 06 = COLOR_WINDOWFRAME */ - L"MenuText", /* 07 = COLOR_MENUTEXT */ - L"WindowText", /* 08 = COLOR_WINDOWTEXT */ - L"TitleText", /* 09 = COLOR_CAPTIONTEXT */ - L"ActiveBorder", /* 10 = COLOR_ACTIVEBORDER */ - L"InactiveBorder", /* 11 = COLOR_INACTIVEBORDER */ - L"AppWorkSpace", /* 12 = COLOR_APPWORKSPACE */ - L"Hilight", /* 13 = COLOR_HIGHLIGHT */ - L"HilightText", /* 14 = COLOR_HIGHLIGHTTEXT */ - L"ButtonFace", /* 15 = COLOR_BTNFACE */ - L"ButtonShadow", /* 16 = COLOR_BTNSHADOW */ - L"GrayText", /* 17 = COLOR_GRAYTEXT */ - L"ButtonText", /* 18 = COLOR_BTNTEXT */ - L"InactiveTitleText", /* 19 = COLOR_INACTIVECAPTIONTEXT */ - L"ButtonHilight", /* 20 = COLOR_BTNHIGHLIGHT */ - L"ButtonDkShadow", /* 21 = COLOR_3DDKSHADOW */ - L"ButtonLight", /* 22 = COLOR_3DLIGHT */ - L"InfoText", /* 23 = COLOR_INFOTEXT */ - L"InfoWindow", /* 24 = COLOR_INFOBK */ - L"ButtonAlternateFace", /* 25 = COLOR_ALTERNATEBTNFACE */ - L"HotTrackingColor", /* 26 = COLOR_HOTLIGHT */ - L"GradientActiveTitle", /* 27 = COLOR_GRADIENTACTIVECAPTION */ - L"GradientInactiveTitle", /* 28 = COLOR_GRADIENTINACTIVECAPTION */ - L"MenuHilight", /* 29 = COLOR_MENUHILIGHT */ - L"MenuBar" /* 30 = COLOR_MENUBAR */ + if (GetWindowsDirectory(Shell, MAX_PATH - 13)) + wcscat(Shell, L"\\explorer.exe"); + else + wcscpy(Shell, L"explorer.exe"); + } + if (!TryToStartShell(Shell)) + { + LoadString( GetModuleHandle(NULL), STRING_USERINIT_FAIL, szMsg, sizeof(szMsg) / sizeof(szMsg[0])); + MessageBox(0, szMsg, NULL, 0); + } +} + +WCHAR g_RegColorNames[][32] = { + L"Scrollbar", /* 00 = COLOR_SCROLLBAR */ + L"Background", /* 01 = COLOR_DESKTOP */ + L"ActiveTitle", /* 02 = COLOR_ACTIVECAPTION */ + L"InactiveTitle", /* 03 = COLOR_INACTIVECAPTION */ + L"Menu", /* 04 = COLOR_MENU */ + L"Window", /* 05 = COLOR_WINDOW */ + L"WindowFrame", /* 06 = COLOR_WINDOWFRAME */ + L"MenuText", /* 07 = COLOR_MENUTEXT */ + L"WindowText", /* 08 = COLOR_WINDOWTEXT */ + L"TitleText", /* 09 = COLOR_CAPTIONTEXT */ + L"ActiveBorder", /* 10 = COLOR_ACTIVEBORDER */ + L"InactiveBorder", /* 11 = COLOR_INACTIVEBORDER */ + L"AppWorkSpace", /* 12 = COLOR_APPWORKSPACE */ + L"Hilight", /* 13 = COLOR_HIGHLIGHT */ + L"HilightText", /* 14 = COLOR_HIGHLIGHTTEXT */ + L"ButtonFace", /* 15 = COLOR_BTNFACE */ + L"ButtonShadow", /* 16 = COLOR_BTNSHADOW */ + L"GrayText", /* 17 = COLOR_GRAYTEXT */ + L"ButtonText", /* 18 = COLOR_BTNTEXT */ + L"InactiveTitleText", /* 19 = COLOR_INACTIVECAPTIONTEXT */ + L"ButtonHilight", /* 20 = COLOR_BTNHIGHLIGHT */ + L"ButtonDkShadow", /* 21 = COLOR_3DDKSHADOW */ + L"ButtonLight", /* 22 = COLOR_3DLIGHT */ + L"InfoText", /* 23 = COLOR_INFOTEXT */ + L"InfoWindow", /* 24 = COLOR_INFOBK */ + L"ButtonAlternateFace", /* 25 = COLOR_ALTERNATEBTNFACE */ + L"HotTrackingColor", /* 26 = COLOR_HOTLIGHT */ + L"GradientActiveTitle", /* 27 = COLOR_GRADIENTACTIVECAPTION */ + L"GradientInactiveTitle", /* 28 = COLOR_GRADIENTINACTIVECAPTION */ + L"MenuHilight", /* 29 = COLOR_MENUHILIGHT */ + L"MenuBar" /* 30 = COLOR_MENUBAR */ }; #define NUM_SYSCOLORS (sizeof(g_RegColorNames) / sizeof(g_RegColorNames[0])) static -COLORREF StrToColorref(LPWSTR lpszCol) -{ - BYTE rgb[3]; - - rgb[0] = StrToIntW(lpszCol); - lpszCol = StrChrW(lpszCol, L' ') + 1; - rgb[1] = StrToIntW(lpszCol); - lpszCol = StrChrW(lpszCol, L' ') + 1; - rgb[2] = StrToIntW(lpszCol); - return RGB(rgb[0], rgb[1], rgb[2]); -} - -static -void SetUserSysColors(void) -{ - HKEY hKey; - INT i; - WCHAR szColor[20]; - DWORD Type, Size; - COLORREF crColor; - - if(!RegOpenKeyEx(HKEY_CURRENT_USER, - L"Control Panel\\Colors", - 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) - { +COLORREF StrToColorref( + IN LPWSTR lpszCol) +{ + BYTE rgb[3]; + + rgb[0] = StrToIntW(lpszCol); + lpszCol = StrChrW(lpszCol, L' ') + 1; + rgb[1] = StrToIntW(lpszCol); + lpszCol = StrChrW(lpszCol, L' ') + 1; + rgb[2] = StrToIntW(lpszCol); + return RGB(rgb[0], rgb[1], rgb[2]); +} + +static +VOID SetUserSysColors(VOID) +{ + HKEY hKey; + INT i; + WCHAR szColor[20]; + DWORD Type, Size; + COLORREF crColor; + + if (!RegOpenKeyEx(HKEY_CURRENT_USER, REGSTR_PATH_COLORS, + 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + { + return; + } + for(i = 0; i < NUM_SYSCOLORS; i++) + { + Size = sizeof(szColor); + if (RegQueryValueEx(hKey, g_RegColorNames[i], NULL, &Type, + (LPBYTE)szColor, &Size) == ERROR_SUCCESS && + Type == REG_SZ) + { + crColor = StrToColorref(szColor); + SetSysColors(1, &i, &crColor); + } + } + RegCloseKey(hKey); return; - } - for(i = 0; i < NUM_SYSCOLORS; i++) - { - Size = sizeof(szColor); - if(RegQueryValueEx(hKey, g_RegColorNames[i], NULL, &Type, - (LPBYTE)szColor, &Size) == ERROR_SUCCESS && Type == REG_SZ) - { - crColor = StrToColorref(szColor); - SetSysColors(1, &i, &crColor); - } - } - RegCloseKey(hKey); - return; -} - -static -void LoadUserFontSetting(LPWSTR lpValueName, PLOGFONTW pFont) -{ - HKEY hKey; - LOGFONTW lfTemp; - DWORD Type, Size; - INT error; - - Size = sizeof(LOGFONTW); - if(!RegOpenKeyEx(HKEY_CURRENT_USER, - L"Control Panel\\Desktop\\WindowMetrics", - 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) - { - return; - } - error = RegQueryValueEx(hKey, lpValueName, NULL, &Type, (LPBYTE)&lfTemp, &Size); - if ((error != ERROR_SUCCESS) || (Type != REG_BINARY)) - { - return; - } - RegCloseKey(hKey); - /* FIXME: Check if lfTemp is a valid font */ - *pFont = lfTemp; - return; -} - -static -void LoadUserMetricSetting(LPWSTR lpValueName, INT *pValue) -{ - HKEY hKey; - DWORD Type, Size; - INT ret; - WCHAR strValue[8]; - - Size = sizeof(strValue); - if(!RegOpenKeyEx(HKEY_CURRENT_USER, - L"Control Panel\\Desktop\\WindowMetrics", - 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) - { - return; - } - ret = RegQueryValueEx(hKey, lpValueName, NULL, &Type, (LPBYTE)&strValue, &Size); - if ((ret != ERROR_SUCCESS) || (Type != REG_SZ)) - { - return; - } - RegCloseKey(hKey); - *pValue = StrToInt(strValue); - return; -} - -static -void SetUserMetrics(void) -{ - NONCLIENTMETRICSW ncmetrics; - MINIMIZEDMETRICS mmmetrics; - - ncmetrics.cbSize = sizeof(NONCLIENTMETRICSW); - mmmetrics.cbSize = sizeof(MINIMIZEDMETRICS); - SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSW), &ncmetrics, 0); - SystemParametersInfoW(SPI_GETMINIMIZEDMETRICS, sizeof(MINIMIZEDMETRICS), &mmmetrics, 0); - - LoadUserFontSetting(L"CaptionFont", &ncmetrics.lfCaptionFont); - LoadUserFontSetting(L"SmCaptionFont", &ncmetrics.lfSmCaptionFont); - LoadUserFontSetting(L"MenuFont", &ncmetrics.lfMenuFont); - LoadUserFontSetting(L"StatusFont", &ncmetrics.lfStatusFont); - LoadUserFontSetting(L"MessageFont", &ncmetrics.lfMessageFont); - /* FIXME: load icon font ? */ - - LoadUserMetricSetting(L"BorderWidth", &ncmetrics.iBorderWidth); - LoadUserMetricSetting(L"ScrollWidth", &ncmetrics.iScrollWidth); - LoadUserMetricSetting(L"ScrollHeight", &ncmetrics.iScrollHeight); - LoadUserMetricSetting(L"CaptionWidth", &ncmetrics.iCaptionWidth); - LoadUserMetricSetting(L"CaptionHeight", &ncmetrics.iCaptionHeight); - LoadUserMetricSetting(L"SmCaptionWidth", &ncmetrics.iSmCaptionWidth); - LoadUserMetricSetting(L"SmCaptionHeight", &ncmetrics.iSmCaptionHeight); - LoadUserMetricSetting(L"Menuwidth", &ncmetrics.iMenuWidth); - LoadUserMetricSetting(L"MenuHeight", &ncmetrics.iMenuHeight); - - SystemParametersInfoW(SPI_SETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSW), &ncmetrics, 0); - - return; -} - -static -void SetUserWallpaper(void) -{ - HKEY hKey; - DWORD Type, Size; - WCHAR szWallpaper[MAX_PATH + 1]; - - if(RegOpenKeyEx(HKEY_CURRENT_USER, - REGSTR_PATH_DESKTOP, - 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) - { - Size = sizeof(szWallpaper); - if(RegQueryValueEx(hKey, - L"Wallpaper", - NULL, - &Type, - (LPBYTE)szWallpaper, - &Size) == ERROR_SUCCESS - && Type == REG_SZ) - { - ExpandEnvironmentStrings(szWallpaper, szWallpaper, MAX_PATH); - - /* Load and change the wallpaper */ - SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, szWallpaper, SPIF_SENDCHANGE); - } - else - { - /* remove the wallpaper */ - SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, NULL, SPIF_SENDCHANGE); +} + +static +VOID LoadUserFontSetting( + IN LPWSTR lpValueName, + OUT PLOGFONTW pFont) +{ + HKEY hKey; + LOGFONTW lfTemp; + DWORD Type, Size; + INT error; + + Size = sizeof(LOGFONTW); + if (!RegOpenKeyEx(HKEY_CURRENT_USER, REGSTR_PATH_METRICS, + 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + { + return; + } + error = RegQueryValueEx(hKey, lpValueName, NULL, &Type, (LPBYTE)&lfTemp, &Size); + if ((error != ERROR_SUCCESS) || (Type != REG_BINARY)) + { + return; } RegCloseKey(hKey); - } -} - -static -void SetUserSettings(void) -{ - SetUserSysColors(); - SetUserMetrics(); - SetUserWallpaper(); + /* FIXME: Check if lfTemp is a valid font */ + *pFont = lfTemp; +} + +static +VOID LoadUserMetricSetting( + IN LPWSTR lpValueName, + OUT INT *pValue) +{ + HKEY hKey; + DWORD Type, Size; + INT ret; + WCHAR strValue[8]; + + Size = sizeof(strValue); + if (!RegOpenKeyEx(HKEY_CURRENT_USER, REGSTR_PATH_METRICS, + 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + { + return; + } + ret = RegQueryValueEx(hKey, lpValueName, NULL, &Type, (LPBYTE)&strValue, &Size); + if ((ret != ERROR_SUCCESS) || (Type != REG_SZ)) + { + return; + } + RegCloseKey(hKey); + *pValue = StrToInt(strValue); +} + +static +VOID SetUserMetrics(VOID) +{ + NONCLIENTMETRICSW ncmetrics; + MINIMIZEDMETRICS mmmetrics; + + ncmetrics.cbSize = sizeof(NONCLIENTMETRICSW); + mmmetrics.cbSize = sizeof(MINIMIZEDMETRICS); + SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSW), &ncmetrics, 0); + SystemParametersInfoW(SPI_GETMINIMIZEDMETRICS, sizeof(MINIMIZEDMETRICS), &mmmetrics, 0); + + LoadUserFontSetting(L"CaptionFont", &ncmetrics.lfCaptionFont); + LoadUserFontSetting(L"SmCaptionFont", &ncmetrics.lfSmCaptionFont); + LoadUserFontSetting(L"MenuFont", &ncmetrics.lfMenuFont); + LoadUserFontSetting(L"StatusFont", &ncmetrics.lfStatusFont); + LoadUserFontSetting(L"MessageFont", &ncmetrics.lfMessageFont); + /* FIXME: load icon font ? */ + + LoadUserMetricSetting(L"BorderWidth", &ncmetrics.iBorderWidth); + LoadUserMetricSetting(L"ScrollWidth", &ncmetrics.iScrollWidth); + LoadUserMetricSetting(L"ScrollHeight", &ncmetrics.iScrollHeight); + LoadUserMetricSetting(L"CaptionWidth", &ncmetrics.iCaptionWidth); + LoadUserMetricSetting(L"CaptionHeight", &ncmetrics.iCaptionHeight); + LoadUserMetricSetting(L"SmCaptionWidth", &ncmetrics.iSmCaptionWidth); + LoadUserMetricSetting(L"SmCaptionHeight", &ncmetrics.iSmCaptionHeight); + LoadUserMetricSetting(L"Menuwidth", &ncmetrics.iMenuWidth); + LoadUserMetricSetting(L"MenuHeight", &ncmetrics.iMenuHeight); + + SystemParametersInfoW(SPI_SETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSW), &ncmetrics, 0); +} + +static +VOID SetUserWallpaper(VOID) +{ + HKEY hKey; + DWORD Type, Size; + WCHAR szWallpaper[MAX_PATH + 1]; + + if (RegOpenKeyEx(HKEY_CURRENT_USER, REGSTR_PATH_DESKTOP, + 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + { + Size = sizeof(szWallpaper); + if (RegQueryValueEx(hKey, + L"Wallpaper", + NULL, + &Type, + (LPBYTE)szWallpaper, + &Size) == ERROR_SUCCESS && + Type == REG_SZ) + { + ExpandEnvironmentStrings(szWallpaper, szWallpaper, MAX_PATH); + + /* Load and change the wallpaper */ + SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, szWallpaper, SPIF_SENDCHANGE); + } + else + { + /* remove the wallpaper */ + SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, NULL, SPIF_SENDCHANGE); + } + RegCloseKey(hKey); + } +} + +static +VOID SetUserSettings(VOID) +{ + SetUserSysColors(); + SetUserMetrics(); + SetUserWallpaper(); } typedef DWORD (WINAPI *PCMP_REPORT_LOGON)(DWORD, DWORD); @@ -475,22 +481,20 @@ } } - - #ifdef _MSC_VER #pragma warning(disable : 4100) #endif /* _MSC_VER */ int WINAPI -WinMain(HINSTANCE hInst, - HINSTANCE hPrevInstance, - LPSTR lpszCmdLine, - int nCmdShow) -{ - NotifyLogon(); - SetUserSettings(); - StartShell(); - return 0; +WinMain(IN HINSTANCE hInst, + IN HINSTANCE hPrevInstance, + IN LPSTR lpszCmdLine, + IN int nCmdShow) +{ + NotifyLogon(); + SetUserSettings(); + StartShell(); + return 0; } /* EOF */

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