Ros-diffs June 2008

ros-diffs@reactos.org

23 participants
435 discussions

[jimtabor] 33847: Implement IntGdiSetBrushOwner and IntGdiAllocObjAttr.
by jimtabor＠svn.reactos.org 04 Jun '08

04 Jun '08

Author: jimtabor Date: Wed Jun 4 00:43:11 2008 New Revision: 33847 URL: http://svn.reactos.org/svn/reactos?rev=33847&view=rev Log: Implement IntGdiSetBrushOwner and IntGdiAllocObjAttr. Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c 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 [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Wed Jun 4 00:43:11 2008 @@ -1422,11 +1422,107 @@ /** PUBLIC FUNCTIONS **********************************************************/ +/* + Since Brush/Pen and Region objects are sharable,,, we can just use + UserHeapAlloc to allocate the small attribute objects. + + Example Allocating: + + // Save Kernel Space Pointer + (PGDIBRUSHOBJ)->pBrushAttr = IntGdiAllocObjAttr(GDIObjType_BRUSH_TYPE); + + // Kernel Space to User Space Pointer + (PGDI_TABLE_ENTRY)->UserData = UserHeapAddressToUser(pBrushAttr); + + Example Freeing: + + (PGDI_TABLE_ENTRY)->UserData = NULL; // Zero the user ptr. + UserHeapFree((PGDIBRUSHOBJ)->pBrushAttr); // Free from kernel ptr. + (PGDIBRUSHOBJ)->pBrushAttr = NULL; + + Notes: + Testing with DC_ATTR works but has drawing difficulties. This could be due + to a bug in user share heap allocation and deallocation. The test did not + include additional deallocations until the DC was freed. So it was always + allocated to the DC. Space between allocations was not even and at less + than sizeof(DC_ATTR). + + */ +PVOID +FASTCALL +IntGdiAllocObjAttr(GDIOBJTYPE Type) +{ + PVOID pMemAttr = NULL; + + switch( Type ) + { + case GDIObjType_DC_TYPE: + pMemAttr = UserHeapAlloc(sizeof(DC_ATTR)); + if (pMemAttr) RtlZeroMemory(pMemAttr, sizeof(DC_ATTR)); + break; + case GDIObjType_RGN_TYPE: + pMemAttr = UserHeapAlloc(sizeof(RGN_ATTR)); + if (pMemAttr) RtlZeroMemory(pMemAttr, sizeof(RGN_ATTR)); + break; + case GDIObjType_BRUSH_TYPE: + pMemAttr = UserHeapAlloc(sizeof(BRUSH_ATTR)); + if (pMemAttr) RtlZeroMemory(pMemAttr, sizeof(BRUSH_ATTR)); + break; + default: + break; + } + return pMemAttr; +} + + BOOL FASTCALL IntGdiSetBrushOwner(PGDIBRUSHOBJ pbr, DWORD OwnerMask) { - // Inc/Dec share locks and process counts. + HBRUSH hBR; + PEPROCESS Owner = NULL; + PGDI_TABLE_ENTRY pEntry = NULL; + + if (!pbr) return FALSE; + + hBR = pbr->BaseObject.hHmgr; + + if (!hBR || (GDI_HANDLE_GET_TYPE(hBR) != GDI_OBJECT_TYPE_BRUSH)) + return FALSE; + else + { + INT Index = GDI_HANDLE_GET_INDEX((HGDIOBJ)hBR); + pEntry = &GdiHandleTable->Entries[Index]; + } + + if (pbr->flAttrs & GDIBRUSH_IS_GLOBAL) + { + GDIOBJ_ShareUnlockObjByPtr((POBJ)pbr); + return TRUE; + } + + if ((OwnerMask == GDI_OBJ_HMGR_PUBLIC) || OwnerMask == GDI_OBJ_HMGR_NONE) + { + // Set this Brush to inaccessible mode and to an Owner of NONE. +// if (OwnerMask == GDI_OBJ_HMGR_NONE) Owner = OwnerMask; + + // Deny user access to User Data. + pEntry->UserData = NULL; // This hBR is inaccessible! + if (!GDIOBJ_SetOwnership((HGDIOBJ) hBR, Owner)) + return FALSE; + + // Deny user access to User Data. + pEntry->UserData = NULL; // This hBR is inaccessible! + } + + if (OwnerMask == GDI_OBJ_HMGR_POWNED) + { + if (!GDIOBJ_SetOwnership((HGDIOBJ) hBR, PsGetCurrentProcess() )) + return FALSE; + + // Allow user access to User Data. + pEntry->UserData = pbr->pBrushAttr; + } return TRUE; }

1 0

[jimtabor] 33846: Separate SelectPalette function from User and move it to GDI.
by jimtabor＠svn.reactos.org 04 Jun '08

04 Jun '08

Author: jimtabor Date: Wed Jun 4 00:08:46 2008 New Revision: 33846 URL: http://svn.reactos.org/svn/reactos?rev=33846&view=rev Log: Separate SelectPalette function from User and move it to GDI. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Wed Jun 4 00:08:46 2008 @@ -909,45 +909,17 @@ * * \todo implement ForceBackground == TRUE */ -HPALETTE STDCALL NtUserSelectPalette(HDC hDC, - HPALETTE hpal, - BOOL ForceBackground) -{ - PDC dc; - HPALETTE oldPal = NULL; - PPALGDI PalGDI; - - // FIXME: mark the palette as a [fore\back]ground pal - dc = DC_LockDc(hDC); - if (!dc) - { - return NULL; - } - - /* Check if this is a valid palette handle */ - PalGDI = PALETTE_LockPalette(hpal); - if (!PalGDI) - { - DC_UnlockDc(dc); - return NULL; - } - - /* Is this a valid palette for this depth? */ - if ((dc->w.bitsPerPixel <= 8 && PalGDI->Mode == PAL_INDEXED) || - (dc->w.bitsPerPixel > 8 && PalGDI->Mode != PAL_INDEXED)) - { - oldPal = dc->DcLevel.hpal; - dc->DcLevel.hpal = hpal; - } - else if (8 < dc->w.bitsPerPixel && PAL_INDEXED == PalGDI->Mode) - { - oldPal = dc->DcLevel.hpal; - dc->DcLevel.hpal = hpal; - } - - PALETTE_UnlockPalette(PalGDI); - DC_UnlockDc(dc); - +HPALETTE +STDCALL +NtUserSelectPalette(HDC hDC, + HPALETTE hpal, + BOOL ForceBackground) +{ + HPALETTE oldPal; + UserEnterExclusive(); + // Implement window checks + oldPal = GdiSelectPalette( hDC, hpal, ForceBackground); + UserLeave(); return oldPal; } Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Wed Jun 4 00:08:46 2008 @@ -1454,7 +1454,7 @@ IntGdiSetBkColor( hDC, sDc_Attr->crBackgroundClr); IntGdiSetTextColor( hDC, sDc_Attr->crForegroundClr); - NtUserSelectPalette( hDC, dcs->DcLevel.hpal, FALSE ); + GdiSelectPalette( hDC, dcs->DcLevel.hpal, FALSE ); #if 0 GDISelectPalette16( hDC, dcs->DcLevel.hpal, FALSE ); @@ -2107,6 +2107,50 @@ return hOrgPen; } +HPALETTE +FASTCALL +GdiSelectPalette(HDC hDC, + HPALETTE hpal, + BOOL ForceBackground) +{ + PDC dc; + HPALETTE oldPal = NULL; + PPALGDI PalGDI; + + // FIXME: mark the palette as a [fore\back]ground pal + dc = DC_LockDc(hDC); + if (!dc) + { + return NULL; + } + + /* Check if this is a valid palette handle */ + PalGDI = PALETTE_LockPalette(hpal); + if (!PalGDI) + { + DC_UnlockDc(dc); + return NULL; + } + + /* Is this a valid palette for this depth? */ + if ((dc->w.bitsPerPixel <= 8 && PalGDI->Mode == PAL_INDEXED) || + (dc->w.bitsPerPixel > 8 && PalGDI->Mode != PAL_INDEXED)) + { + oldPal = dc->DcLevel.hpal; + dc->DcLevel.hpal = hpal; + } + else if (8 < dc->w.bitsPerPixel && PAL_INDEXED == PalGDI->Mode) + { + oldPal = dc->DcLevel.hpal; + dc->DcLevel.hpal = hpal; + } + + PALETTE_UnlockPalette(PalGDI); + DC_UnlockDc(dc); + + return oldPal; +} + WORD STDCALL IntGdiSetHookFlags(HDC hDC, WORD Flags) { Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Wed Jun 4 00:08:46 2008 @@ -794,7 +794,7 @@ if(Usage == DIB_PAL_COLORS) { hPal = NtGdiGetDCObject(hDC, GDI_OBJECT_TYPE_PALETTE); - hPal = NtUserSelectPalette(hdcMem, hPal, FALSE); + hPal = GdiSelectPalette(hdcMem, hPal, FALSE); } if (BitsInfo->bmiHeader.biCompression == BI_RLE4 || @@ -835,7 +835,7 @@ SrcWidth, SrcHeight, ROP, 0); if(hPal) - NtUserSelectPalette(hdcMem, hPal, FALSE); + GdiSelectPalette(hdcMem, hPal, FALSE); NtGdiSelectBitmap(hdcMem, hOldBitmap); NtGdiDeleteObjectApp(hdcMem);

1 0

[jimtabor] 33845: Check to see if the list is empty.
by jimtabor＠svn.reactos.org 04 Jun '08

04 Jun '08

Author: jimtabor Date: Tue Jun 3 20:52:13 2008 New Revision: 33845 URL: http://svn.reactos.org/svn/reactos?rev=33845&view=rev Log: Check to see if the list is empty. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Tue Jun 3 20:52:13 2008 @@ -575,7 +575,6 @@ { DCE *ret; BOOL Hit = FALSE; - NTSTATUS Status = STATUS_SUCCESS; if (NULL == pdce) return NULL; @@ -588,7 +587,7 @@ if (Force && !GDIOBJ_OwnedByCurrentProcess(pdce->hDC)) { DPRINT1("Change ownership for DCE!\n"); - + // Note: Windows sets W32PF_OWNDCCLEANUP and moves on. if (!IsObjectDead((HGDIOBJ) pdce->hDC)) DC_SetOwnership( pdce->hDC, PsGetCurrentProcess()); else @@ -604,21 +603,14 @@ { NtGdiDeleteObject(pdce->hClipRgn); } - // Temp fix until we know where the problem is, most likely in windc. - _SEH_TRY - { - RemoveEntryList(&pdce->List); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - DPRINT1("CRASHED DCE! -> %x\n" , pdce); - return 0; // Give it up and bail~! + + RemoveEntryList(&pdce->List); + + if (IsListEmpty(&pdce->List)) + { + DPRINT1("List is Empty! DCE! -> %x\n" , pdce); + FirstDce = NULL; + ret = NULL; } ExFreePoolWithTag(pdce, TAG_PDCE);

1 0

[tkreuzer] 33844: fix indentation
by tkreuzer＠svn.reactos.org 03 Jun '08

03 Jun '08

Author: tkreuzer Date: Tue Jun 3 18:59:26 2008 New Revision: 33844 URL: http://svn.reactos.org/svn/reactos?rev=33844&view=rev Log: fix indentation Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c [iso-8859-1] Tue Jun 3 18:59:26 2008 @@ -149,10 +149,10 @@ PCHAR pHdr = (PCHAR)&pTeb->GdiTebBatch.Buffer[0]; PDC pDC = NULL; - if (hDC && !IsObjectDead(hDC)) - { - pDC = DC_LockDc(hDC); - } + if (hDC && !IsObjectDead(hDC)) + { + pDC = DC_LockDc(hDC); + } // No need to init anything, just go! for (; GdiBatchCount > 0; GdiBatchCount--)

1 0

[tkreuzer] 33843: fix checks for deleted gdi objects and add GDI_DEBUG function to trace the deleter of an object.
by tkreuzer＠svn.reactos.org 03 Jun '08

03 Jun '08

Author: tkreuzer Date: Tue Jun 3 18:56:09 2008 New Revision: 33843 URL: http://svn.reactos.org/svn/reactos?rev=33843&view=rev Log: fix checks for deleted gdi objects and add GDI_DEBUG function to trace the deleter of an object. Modified: trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c [iso-8859-1] Tue Jun 3 18:56:09 2008 @@ -7,6 +7,7 @@ #define GDI_STACK_LEVELS 12 static ULONG GDIHandleAllocator[GDI_HANDLE_COUNT][GDI_STACK_LEVELS+1]; static ULONG GDIHandleLocker[GDI_HANDLE_COUNT][GDI_STACK_LEVELS+1]; +static ULONG GDIHandleDeleter[GDI_HANDLE_COUNT][GDI_STACK_LEVELS+1]; struct DbgOpenGDIHandle { ULONG idx; @@ -236,16 +237,21 @@ #define GDIDBG_TRACECALLER() \ DPRINT1("-> called from:\n"); \ KeRosDumpStackFrames(NULL, 20); -#define GDIDBG_TRACEALLOCATOR(index) \ +#define GDIDBG_TRACEALLOCATOR(handle) \ DPRINT1("-> allocated from:\n"); \ - KeRosDumpStackFrames(GDIHandleAllocator[index], GDI_STACK_LEVELS); -#define GDIDBG_TRACELOCKER(index) \ + KeRosDumpStackFrames(GDIHandleAllocator[GDI_HANDLE_GET_INDEX(handle)], GDI_STACK_LEVELS); +#define GDIDBG_TRACELOCKER(handle) \ DPRINT1("-> locked from:\n"); \ - KeRosDumpStackFrames(GDIHandleLocker[index], GDI_STACK_LEVELS); -#define GDIDBG_CAPTUREALLOCATOR(index) \ - CaptureStackBackTace((PVOID*)GDIHandleAllocator[index], GDI_STACK_LEVELS); -#define GDIDBG_CAPTURELOCKER(index) \ - CaptureStackBackTace((PVOID*)GDIHandleLocker[index], GDI_STACK_LEVELS); + KeRosDumpStackFrames(GDIHandleLocker[GDI_HANDLE_GET_INDEX(handle)], GDI_STACK_LEVELS); +#define GDIDBG_TRACEDELETER(handle) \ + DPRINT1("-> deleted from:\n"); \ + KeRosDumpStackFrames(GDIHandleDeleter[GDI_HANDLE_GET_INDEX(handle)], GDI_STACK_LEVELS); +#define GDIDBG_CAPTUREALLOCATOR(handle) \ + CaptureStackBackTace((PVOID*)GDIHandleAllocator[GDI_HANDLE_GET_INDEX(handle)], GDI_STACK_LEVELS); +#define GDIDBG_CAPTURELOCKER(handle) \ + CaptureStackBackTace((PVOID*)GDIHandleLocker[GDI_HANDLE_GET_INDEX(handle)], GDI_STACK_LEVELS); +#define GDIDBG_CAPTUREDELETER(handle) \ + CaptureStackBackTace((PVOID*)GDIHandleDeleter[GDI_HANDLE_GET_INDEX(handle)], GDI_STACK_LEVELS); #define GDIDBG_DUMPHANDLETABLE() \ IntDumpHandleTable(GdiHandleTable) #define GDIDBG_INITLOOPTRACE() \ @@ -263,9 +269,11 @@ #define GDIDBG_TRACELOCKER(index) #define GDIDBG_CAPTUREALLOCATOR(index) #define GDIDBG_CAPTURELOCKER(index) +#define GDIDBG_CAPTUREDELETER(handle) #define GDIDBG_DUMPHANDLETABLE() #define GDIDBG_INITLOOPTRACE() #define GDIDBG_TRACELOOP(Handle, PrevThread, Thread) +#define GDIDBG_TRACEDELETER(handle) #endif /* GDI_DEBUG */ 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 [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Tue Jun 3 18:56:09 2008 @@ -171,6 +171,7 @@ if ((Entry->Type & GDI_ENTRY_BASETYPE_MASK) == 0) { DPRINT1("%s: Attempted to lock object 0x%x that is deleted!\n", Function, hObj); + GDIDBG_TRACEDELETER(hObj); } else if (GDI_HANDLE_GET_REUSECNT(hObj) != GDI_ENTRY_GET_REUSECNT(Entry->Type)) { @@ -527,6 +528,7 @@ /* Now it's time to free the memory */ GDIOBJ_FreeObj(Object, TypeIndex); + GDIDBG_CAPTUREDELETER(hObj); return Ret; } else @@ -589,7 +591,7 @@ INT Index = GDI_HANDLE_GET_INDEX(hObject); PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; // We check to see if the objects are knocking on deaths door. - if ((Entry->Type & ~GDI_ENTRY_REUSE_MASK) != 0 && Entry->KernelData != NULL) + if ((Entry->Type & GDI_ENTRY_BASETYPE_MASK) != 0) return FALSE; else { @@ -747,7 +749,8 @@ DPRINT1("Attempted to lock object 0x%x of wrong type (Handle: 0x%x, requested: 0x%x)\n", hObj, HandleType, ExpectedType); GDIDBG_TRACECALLER(); - GDIDBG_TRACEALLOCATOR(GDI_HANDLE_GET_INDEX(hObj)); + GDIDBG_TRACEALLOCATOR(hObj); + GDIDBG_TRACEDELETER(hObj); return NULL; } @@ -1009,7 +1012,7 @@ Entry = GDI_HANDLE_GET_ENTRY(GdiHandleTable, ObjectHandle); Ret = Entry->KernelData != NULL && - (Entry->Type & ~GDI_ENTRY_REUSE_MASK) != 0 && + (Entry->Type & GDI_ENTRY_BASETYPE_MASK) != 0 && (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1) == ProcessId; return Ret; @@ -1179,7 +1182,7 @@ { PW32THREAD PrevThread; - if ((Entry->Type & ~GDI_ENTRY_REUSE_MASK) != 0 && Entry->KernelData != NULL) + if ((Entry->Type & GDI_ENTRY_BASETYPE_MASK) != 0) { POBJ Object = Entry->KernelData; @@ -1309,7 +1312,7 @@ PW32THREAD PrevThread; POBJ Object; - if ((FromEntry->Type & ~GDI_ENTRY_REUSE_MASK) != 0 && FromEntry->KernelData != NULL) + if ((FromEntry->Type & GDI_ENTRY_BASETYPE_MASK) != 0) { Object = FromEntry->KernelData;

1 0

[cfinck] 33842: Change the page title to "[title] - ReactOS Website" in the forum as well. Fixes bug #3123 finally.
by cfinck＠svn.reactos.org 03 Jun '08

03 Jun '08

Author: cfinck Date: Tue Jun 3 16:29:12 2008 New Revision: 33842 URL: http://svn.reactos.org/svn/reactos?rev=33842&view=rev Log: Change the page title to "[title] - ReactOS Website" in the forum as well. Fixes bug #3123 finally. Modified: trunk/web/reactos.org/htdocs/forum/styles/roscms/template/overall_header.ht… Modified: trunk/web/reactos.org/htdocs/forum/styles/roscms/template/overall_header.ht… URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/style… ============================================================================== --- trunk/web/reactos.org/htdocs/forum/styles/roscms/template/overall_header.ht… [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/forum/styles/roscms/template/overall_header.ht… [iso-8859-1] Tue Jun 3 16:29:12 2008 @@ -12,7 +12,7 @@ <meta name="keywords" content="" /> <meta name="description" content="" /> {META} -<title>{SITENAME} • {L_MCP} • {L_UCP} • {PAGE_TITLE}</title> +<title>{L_MCP} - {L_UCP} - {PAGE_TITLE} - {SITENAME}</title> <!-- phpBB style name: roscms

1 0

[jimtabor] 33841: Attempt to fix bugs 3050 and 3209. DCE list becomes corrupted during shutdown.
by jimtabor＠svn.reactos.org 03 Jun '08

03 Jun '08

Author: jimtabor Date: Tue Jun 3 16:13:10 2008 New Revision: 33841 URL: http://svn.reactos.org/svn/reactos?rev=33841&view=rev Log: Attempt to fix bugs 3050 and 3209. DCE list becomes corrupted during shutdown. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Tue Jun 3 16:13:10 2008 @@ -575,6 +575,7 @@ { DCE *ret; BOOL Hit = FALSE; + NTSTATUS Status = STATUS_SUCCESS; if (NULL == pdce) return NULL; @@ -603,8 +604,23 @@ { NtGdiDeleteObject(pdce->hClipRgn); } - - RemoveEntryList(&pdce->List); + // Temp fix until we know where the problem is, most likely in windc. + _SEH_TRY + { + RemoveEntryList(&pdce->List); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + DPRINT1("CRASHED DCE! -> %x\n" , pdce); + return 0; // Give it up and bail~! + } + ExFreePoolWithTag(pdce, TAG_PDCE); return ret; @@ -677,10 +693,16 @@ VOID FASTCALL DceEmptyCache() { - while (FirstDce != NULL) - { - FirstDce = DceFreeDCE(FirstDce, TRUE); - } + PDCE pDCE = FirstDce; + KeEnterCriticalRegion(); + do + { + if(!pDCE) break; + pDCE = DceFreeDCE(pDCE, TRUE); + if(!pDCE) break; + } while (pDCE != FirstDce); + KeLeaveCriticalRegion(); + FirstDce = NULL; } VOID FASTCALL

1 0

[dchapyshev] 33840: - Update English translation
by dchapyshev＠svn.reactos.org 03 Jun '08

03 Jun '08

Author: dchapyshev Date: Tue Jun 3 12:05:24 2008 New Revision: 33840 URL: http://svn.reactos.org/svn/reactos?rev=33840&view=rev Log: - Update English translation Modified: trunk/reactos/dll/cpl/desk/lang/en-US.rc Modified: trunk/reactos/dll/cpl/desk/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/en-US.rc [iso-8859-1] Tue Jun 3 12:05:24 2008 @@ -101,21 +101,21 @@ CAPTION "Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.",-1,3,3,240,10 - CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,16,240,82,WS_EX_CLIENTEDGE - LTEXT "&Display:",1820,3,100,30,8 - LTEXT "<none>",IDC_SETTINGS_DEVICE,9,109,224,8 - GROUPBOX "&Screen area",1818,3,120,115,43 + LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.",-1,3,3,240,20 + CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,23,240,82,WS_EX_CLIENTEDGE + LTEXT "&Display:",1820,3,107,30,8 + LTEXT "<none>",IDC_SETTINGS_DEVICE,9,116,224,8 + GROUPBOX "&Screen area",1818,3,127,115,43 CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", - TBS_AUTOTICKS | WS_TABSTOP, 30, 130, 58, 17 - LTEXT "Less",1815,9,130,15,8,NOT WS_GROUP - LTEXT "More",1816,93,130,21,8,NOT WS_GROUP - LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER - GROUPBOX "&Colors",1817,125,120,115,43 - COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 + LTEXT "Less",1815,9,137,15,8,NOT WS_GROUP + LTEXT "More",1816,93,137,21,8,NOT WS_GROUP + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,157,100,10,NOT WS_GROUP | SS_CENTER + GROUPBOX "&Colors",1817,125,127,115,43 + COMBOBOX IDC_SETTINGS_BPP,131,137,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9 - PUSHBUTTON "Ad&vanced...",IDC_SETTINGS_ADVANCED,170,165,70,14 + CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,155,103,9 + PUSHBUTTON "Ad&vanced...",IDC_SETTINGS_ADVANCED,170,174,70,14 END IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204

1 0

[dchapyshev] 33839: - Update all translations
by dchapyshev＠svn.reactos.org 03 Jun '08

03 Jun '08

Author: dchapyshev Date: Tue Jun 3 11:56:23 2008 New Revision: 33839 URL: http://svn.reactos.org/svn/reactos?rev=33839&view=rev Log: - Update all translations Modified: trunk/reactos/base/setup/vmwinst/lang/bg-BG.rc trunk/reactos/base/setup/vmwinst/lang/cs-CZ.rc trunk/reactos/base/setup/vmwinst/lang/da-DK.rc trunk/reactos/base/setup/vmwinst/lang/de-DE.rc trunk/reactos/base/setup/vmwinst/lang/el-GR.rc trunk/reactos/base/setup/vmwinst/lang/en-US.rc trunk/reactos/base/setup/vmwinst/lang/es-ES.rc trunk/reactos/base/setup/vmwinst/lang/fr-FR.rc trunk/reactos/base/setup/vmwinst/lang/hu-HU.rc trunk/reactos/base/setup/vmwinst/lang/id-ID.rc trunk/reactos/base/setup/vmwinst/lang/it-IT.rc trunk/reactos/base/setup/vmwinst/lang/ja-JP.rc trunk/reactos/base/setup/vmwinst/lang/lt-LT.rc trunk/reactos/base/setup/vmwinst/lang/nb-NO.rc trunk/reactos/base/setup/vmwinst/lang/pl-PL.rc trunk/reactos/base/setup/vmwinst/lang/ru-RU.rc trunk/reactos/base/setup/vmwinst/lang/sk-SK.rc trunk/reactos/base/setup/vmwinst/lang/uk-UA.rc trunk/reactos/base/setup/vmwinst/lang/zh-CN.rc trunk/reactos/base/setup/vmwinst/vmwinst.h Modified: trunk/reactos/base/setup/vmwinst/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/bg… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/lang/bg-BG.rc [iso-8859-1] Tue Jun 3 11:56:23 2008 @@ -5,8 +5,8 @@ CAPTION "Ñëàãàíå íà âèäåî âîäà÷" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "ÐåàêòÎÑ óñòàíîâè, ÷å ñòå ãî ïóñíàëè âúâ VMware(r).", -1, 100, 8, 160, 24 - LTEXT "Àêî èñêàòå äà ñëîæèòå SVGA âîäà÷à (driver) VMware(r), íàòèñíåòå Íàïðåä, â ïðîòèâåí ñëó÷àé íàòèñíåòå Îòêàç.", -1, 100, 140, 160, 24 + LTEXT "ÐåàêòÎÑ óñòàíîâè, ÷å ñòå ãî ïóñíàëè âúâ VMware(r).", -1, 117, 8, 140, 24 + LTEXT "Àêî èñêàòå äà ñëîæèòå SVGA âîäà÷à (driver) VMware(r), íàòèñíåòå Íàïðåä, â ïðîòèâåí ñëó÷àé íàòèñíåòå Îòêàç.", -1, 117, 140, 140, 24 END IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/base/setup/vmwinst/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/cs… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/lang/cs-CZ.rc [iso-8859-1] Tue Jun 3 11:56:23 2008 @@ -5,8 +5,8 @@ CAPTION "Instalace ovladaèe obrazovky" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "ReactOS zjistil, e bìí pod VMware(r).", -1, 100, 8, 160, 24 - LTEXT "Pokud chcete nainstalovat VMware(r) SVGA ovladaè klepnìte na 'Dalí', pokud ovladaè instalovat nechcete, klepnìte na 'Storno'.", -1, 100, 140, 160, 24 + LTEXT "ReactOS zjistil, e bìí pod VMware(r).", -1, 117, 8, 140, 24 + LTEXT "Pokud chcete nainstalovat VMware(r) SVGA ovladaè klepnìte na 'Dalí', pokud ovladaè instalovat nechcete, klepnìte na 'Storno'.", -1, 117, 140, 140, 24 END IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/base/setup/vmwinst/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/da… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/lang/da-DK.rc [iso-8859-1] Tue Jun 3 11:56:23 2008 @@ -5,8 +5,8 @@ CAPTION "Driver til Grafikkort Installation" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "ReactOS Installation har opdaget at du køre ReactOS under VMware(r).", -1, 100, 8, 160, 24 - LTEXT "Hvis du ønsker at installere VMware(r) SVGA driveren Klik 'Næste', Ellers klik på 'Fortryd' for at afbryde.", -1, 100, 140, 160, 24 + LTEXT "ReactOS Installation har opdaget at du køre ReactOS under VMware(r).", -1, 117, 8, 140, 24 + LTEXT "Hvis du ønsker at installere VMware(r) SVGA driveren Klik 'Næste', Ellers klik på 'Fortryd' for at afbryde.", -1, 117, 140, 140, 24 END IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/base/setup/vmwinst/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/de… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/lang/de-DE.rc [iso-8859-1] Tue Jun 3 11:56:23 2008 @@ -5,8 +5,8 @@ CAPTION "Grafiktreiberinstallation" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Das ReactOS Setup hat festgestellt, dass Sie ReactOS in VMware(r) installieren.", -1, 100, 8, 160, 24 - LTEXT "Wenn Sie den VMware(r) SVGA Treiber installieren möchten, klicken Sie auf 'Weiter', ansonsten auf 'Abbrechen'.", -1, 100, 140, 160, 24 + LTEXT "Das ReactOS Setup hat festgestellt, dass Sie ReactOS in VMware(r) installieren.", -1, 117, 8, 140, 24 + LTEXT "Wenn Sie den VMware(r) SVGA Treiber installieren möchten, klicken Sie auf 'Weiter', ansonsten auf 'Abbrechen'.", -1, 117, 140, 140, 24 END IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/base/setup/vmwinst/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/el… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/lang/el-GR.rc [iso-8859-1] Tue Jun 3 11:56:23 2008 @@ -5,8 +5,8 @@ CAPTION "ÅãêáôÜóôáóç Ïäçãïý Âßíôåï" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Ç åãêáôÜóôáóç ôïõ ReactOS áíß÷íåõóå üôé ôñÝ÷åôå ôï ReactOS ìÝóá áðü ôï VMware(r).", -1, 100, 8, 160, 24 - LTEXT "Áí èÝëåôå íá åãêáôáóôÞóåôå ôçí VMware(r) SVGA driver ðáôÞóôå 'Åðüìåíï', áëëéþò ðáôÞóôå 'Áêýñùóç'.", -1, 100, 140, 160, 24 + LTEXT "Ç åãêáôÜóôáóç ôïõ ReactOS áíß÷íåõóå üôé ôñÝ÷åôå ôï ReactOS ìÝóá áðü ôï VMware(r).", -1, 117, 8, 140, 24 + LTEXT "Áí èÝëåôå íá åãêáôáóôÞóåôå ôçí VMware(r) SVGA driver ðáôÞóôå 'Åðüìåíï', áëëéþò ðáôÞóôå 'Áêýñùóç'.", -1, 117, 140, 140, 24 END IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/base/setup/vmwinst/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/en… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/lang/en-US.rc [iso-8859-1] Tue Jun 3 11:56:23 2008 @@ -5,8 +5,8 @@ CAPTION "Video Driver Installation" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "The ReactOS setup detected that you run ReactOS inside of VMware(r).", -1, 100, 8, 160, 24 - LTEXT "If you like to install the VMware(r) SVGA driver click 'Next', otherwise click 'Cancel'.", -1, 100, 140, 160, 24 + LTEXT "The ReactOS setup detected that you run ReactOS inside of VMware(r).", -1, 117, 8, 140, 24 + LTEXT "If you like to install the VMware(r) SVGA driver click 'Next', otherwise click 'Cancel'.", -1, 117, 140, 140, 24 END IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/base/setup/vmwinst/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/es… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/lang/es-ES.rc [iso-8859-1] Tue Jun 3 11:56:23 2008 @@ -7,8 +7,8 @@ CAPTION "Instalación del Controlador de Video" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "El instalador de ReactOS ha detectado que usted está ejecutando ReactOS sobre el emulador VMware(r).", -1, 100, 8, 160, 24 - LTEXT "Si usted desea instalar el controlador SVGA VMware(r), haga clic en 'Siguiente', de lo contrario haga clic en 'Cancelar'.", -1, 100, 140, 160, 24 + LTEXT "El instalador de ReactOS ha detectado que usted está ejecutando ReactOS sobre el emulador VMware(r).", -1, 117, 8, 140, 24 + LTEXT "Si usted desea instalar el controlador SVGA VMware(r), haga clic en 'Siguiente', de lo contrario haga clic en 'Cancelar'.", -1, 117, 140, 140, 24 END IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/base/setup/vmwinst/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/fr… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/lang/fr-FR.rc [iso-8859-1] Tue Jun 3 11:56:23 2008 @@ -5,8 +5,8 @@ CAPTION "Installation du pilote vidéo" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "L'installateur de ReactOS a détecté que vous exécutez ReactOS sous VMware(r).", -1, 100, 8, 160, 24 - LTEXT "Si vous désirez installer le pilote SVGA de VMware(r) SVGA, cliquez sur 'Suivant', autrement cliquez sur 'Annuler'.", -1, 100, 140, 160, 24 + LTEXT "L'installateur de ReactOS a détecté que vous exécutez ReactOS sous VMware(r).", -1, 117, 8, 140, 24 + LTEXT "Si vous désirez installer le pilote SVGA de VMware(r) SVGA, cliquez sur 'Suivant', autrement cliquez sur 'Annuler'.", -1, 117, 140, 140, 24 END IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/base/setup/vmwinst/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/hu… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/lang/hu-HU.rc [iso-8859-1] Tue Jun 3 11:56:23 2008 @@ -6,8 +6,8 @@ CAPTION "Video meghajtó telepítése" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "A ReactOS telepítõ felismerte, hogy VMware(r) alól futtatod a ReactOS-t.", -1, 100, 8, 160, 34 - LTEXT "Ha szeretnéd feltelepíteni a VMware(r) SVGA meghajtót, kattints a 'Tovább' gombra, ha nem akkor a 'Mégse' gombra.", -1, 100, 120, 160, 32 + LTEXT "A ReactOS telepítõ felismerte, hogy VMware(r) alól futtatod a ReactOS-t.", -1, 117, 8, 140, 34 + LTEXT "Ha szeretnéd feltelepíteni a VMware(r) SVGA meghajtót, kattints a 'Tovább' gombra, ha nem akkor a 'Mégse' gombra.", -1, 117, 120, 140, 32 END IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/base/setup/vmwinst/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/id… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/lang/id-ID.rc [iso-8859-1] Tue Jun 3 11:56:23 2008 @@ -5,8 +5,8 @@ CAPTION "Instalasi Driver Video" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Setup ReactOS mendeteksi bahwa anda menjalankan ReactOS di dalam VMware(r).", -1, 100, 8, 160, 24 - LTEXT "Jika anda ingin menginstalasi VMware(r) SVGA driver klik 'Lanjut', sebaliknya klik 'Batal'.", -1, 100, 140, 160, 17 + LTEXT "Setup ReactOS mendeteksi bahwa anda menjalankan ReactOS di dalam VMware(r).", -1, 117, 8, 140, 24 + LTEXT "Jika anda ingin menginstalasi VMware(r) SVGA driver klik 'Lanjut', sebaliknya klik 'Batal'.", -1, 117, 140, 140, 17 END IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/base/setup/vmwinst/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/it… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/lang/it-IT.rc [iso-8859-1] Tue Jun 3 11:56:23 2008 @@ -5,8 +5,8 @@ CAPTION "Installazione Video Driver" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Il setup di ReactOS ha rilevato che state eseguendo ReactOS all'interno di VMware(r).", -1, 100, 8, 160, 24 - LTEXT "Se volete installare il driver SVGA di VMware(r) cliccate 'Avanti', Altrimenti 'Annulla'.", -1, 100, 140, 160, 17 + LTEXT "Il setup di ReactOS ha rilevato che state eseguendo ReactOS all'interno di VMware(r).", -1, 117, 8, 140, 24 + LTEXT "Se volete installare il driver SVGA di VMware(r) cliccate 'Avanti', Altrimenti 'Annulla'.", -1, 117, 140, 140, 17 END IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/base/setup/vmwinst/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/ja… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/lang/ja-JP.rc [iso-8859-1] Tue Jun 3 11:56:23 2008 @@ -5,8 +5,8 @@ CAPTION "rfI hCoÌCXg[" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN - LTEXT "ReactOS ZbgAbvÍ ReactOS ª VMware(R) àÅN®³êÄ¢é±ÆðoµÜµ½B", -1, 100, 8, 160, 24 - LTEXT "VMware(R) SVGA hCoðCXg[·éêÉÍ [Ö] ðACXg[µÈ¢êÉÍ [LZ] ðNbNµÄ¾³¢B", -1, 100, 140, 160, 17 + LTEXT "ReactOS ZbgAbvÍ ReactOS ª VMware(R) àÅN®³êÄ¢é±ÆðoµÜµ½B", -1, 117, 8, 140, 24 + LTEXT "VMware(R) SVGA hCoðCXg[·éêÉÍ [Ö] ðACXg[µÈ¢êÉÍ [LZ] ðNbNµÄ¾³¢B", -1, 117, 140, 140, 17 END IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/base/setup/vmwinst/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/lt… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/lang/lt-LT.rc [iso-8859-1] Tue Jun 3 11:56:23 2008 @@ -7,8 +7,8 @@ CAPTION "Vaizdo Tvarkyklës Ádiegimas" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "ReactOS nustatë, kad Jûs diegiate ReactOS virtualioje VMware(r) maðinoje.", -1, 100, 8, 160, 24 - LTEXT "Jei norite ádiegti VMware(r) SVGA vaizdo tvarkyklæ, spauskite 'Next', kitu atveju spauskite 'Cancel'.", -1, 100, 140, 160, 24 + LTEXT "ReactOS nustatë, kad Jûs diegiate ReactOS virtualioje VMware(r) maðinoje.", -1, 117, 8, 140, 24 + LTEXT "Jei norite ádiegti VMware(r) SVGA vaizdo tvarkyklæ, spauskite 'Next', kitu atveju spauskite 'Cancel'.", -1, 117, 140, 140, 24 END IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/base/setup/vmwinst/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/nb… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/nb-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/lang/nb-NO.rc [iso-8859-1] Tue Jun 3 11:56:23 2008 @@ -5,8 +5,8 @@ CAPTION "Video Driver Installasjon" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "ReactOS installering oppdager om du kjører ReactOS i VMware(r).", -1, 100, 8, 160, 24 - LTEXT "Hvis du vil installere VMware(r) SVGA driver trykk 'Neste', ellers trykk 'Avbryt'.", -1, 100, 140, 160, 17 + LTEXT "ReactOS installering oppdager om du kjører ReactOS i VMware(r).", -1, 117, 8, 140, 24 + LTEXT "Hvis du vil installere VMware(r) SVGA driver trykk 'Neste', ellers trykk 'Avbryt'.", -1, 117, 140, 140, 17 END IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/base/setup/vmwinst/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/pl… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/lang/pl-PL.rc [iso-8859-1] Tue Jun 3 11:56:23 2008 @@ -11,8 +11,8 @@ CAPTION "Instalacja sterownika grafiki" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Program konfiguracyjny ReactOS wykry³ emulator VMware(r).", -1, 100, 8, 160, 24 - LTEXT "Jeli chcesz zainstalowaæ sterownik SVGA dla VMware(r), nacinij 'Dalej', w przeciwnym razie - 'Anuluj'.", -1, 100, 140, 160, 17 + LTEXT "Program konfiguracyjny ReactOS wykry³ emulator VMware(r).", -1, 117, 8, 140, 24 + LTEXT "Jeli chcesz zainstalowaæ sterownik SVGA dla VMware(r), nacinij 'Dalej', w przeciwnym razie - 'Anuluj'.", -1, 117, 140, 140, 17 END IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/base/setup/vmwinst/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/ru… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/lang/ru-RU.rc [iso-8859-1] Tue Jun 3 11:56:23 2008 @@ -5,8 +5,8 @@ CAPTION "Óñòàíîâêà âèäåîäðàéâåðà" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Ïðîãðàììà óñòàíîâêè îáíàðóæèëà, ÷òî ReactOS ðàáîòàåò ïîä óïðàâëåíèåì âèðòóàëüíîé ìàøèíû VMware(r).", -1, 100, 8, 160, 24 - LTEXT "Äëÿ óñòàíîâêè SVGA-äðàéâåðà VMware(r) íàæìèòå êíîïêó ""Äàëåå"", èíà÷å íàæìèòå ""Îòìåíà"".", -1, 100, 125, 160, 22 + LTEXT "Ïðîãðàììà óñòàíîâêè îáíàðóæèëà, ÷òî ReactOS ðàáîòàåò ïîä óïðàâëåíèåì âèðòóàëüíîé ìàøèíû VMware(r).", -1, 117, 8, 140, 24 + LTEXT "Äëÿ óñòàíîâêè SVGA-äðàéâåðà VMware(r) íàæìèòå êíîïêó ""Äàëåå"", èíà÷å íàæìèòå ""Îòìåíà"".", -1, 117, 125, 140, 22 END IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/base/setup/vmwinst/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/sk… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/lang/sk-SK.rc [iso-8859-1] Tue Jun 3 11:56:23 2008 @@ -10,8 +10,8 @@ CAPTION "Intalácia ovladaèa obrazovky" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Systém ReactOS zistil, e je spustený v prostredí VMware(r).", -1, 100, 8, 160, 24 - LTEXT "Ak chcete naintalova ovládaè VMware(r) SVGA kliknite na 'Ïalej', inak kliknite na 'Zrui'.", -1, 100, 140, 160, 24 + LTEXT "Systém ReactOS zistil, e je spustený v prostredí VMware(r).", -1, 117, 8, 140, 24 + LTEXT "Ak chcete naintalova ovládaè VMware(r) SVGA kliknite na 'Ïalej', inak kliknite na 'Zrui'.", -1, 117, 140, 140, 24 END IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/base/setup/vmwinst/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/uk… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/lang/uk-UA.rc [iso-8859-1] Tue Jun 3 11:56:23 2008 @@ -13,8 +13,8 @@ CAPTION "Óñòàíîâêà â³äåîäðàéâåðà" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Ïðîãðàìà óñòàíîâêè ReactOS âèÿâèëà, ùî Âè çàïóñòèëè ReactOS âñåðåäåí³ VMware(r).", -1, 100, 8, 160, 24 - LTEXT "ßêùî Âè áàæàºòå âñòàíîâèòè SVGA äðàéâåð VMware(r), íàòèñí³òü ""Äàë³"", ³íàêøå íàòèñí³òü ""Ñêàñóâàòè"".", -1, 100, 140, 160, 17 + LTEXT "Ïðîãðàìà óñòàíîâêè ReactOS âèÿâèëà, ùî Âè çàïóñòèëè ReactOS âñåðåäåí³ VMware(r).", -1, 117, 8, 140, 24 + LTEXT "ßêùî Âè áàæàºòå âñòàíîâèòè SVGA äðàéâåð VMware(r), íàòèñí³òü ""Äàë³"", ³íàêøå íàòèñí³òü ""Ñêàñóâàòè"".", -1, 117, 140, 140, 17 END IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/base/setup/vmwinst/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/zh… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/lang/zh-CN.rc [iso-8859-1] Tue Jun 3 11:56:23 2008 @@ -26,8 +26,8 @@ CAPTION " ÊÓÆµÇý¶¯³ÌÐò°²×° " FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT " ReactOS °²×°³ÌÐò¼ì²âµ½ÄãµÄÏµÍ³ÔËÐÐÔÚ VMware(r) »·¾³ÖÐ¡£", -1, 100, 8, 160, 24 - LTEXT " Èç¹ûÄúÏ£Íû°²×° VMware(r) µÄ SVGA Çý¶¯³ÌÐòÇëµã»÷ ¡°ÏÂÒ»²½¡± ·ñÔòÇëµã»÷¡°È¡Ïû¡± ¡£", -1, 100, 140, 160, 17 + LTEXT " ReactOS °²×°³ÌÐò¼ì²âµ½ÄãµÄÏµÍ³ÔËÐÐÔÚ VMware(r) »·¾³ÖÐ¡£", -1, 117, 8, 140, 24 + LTEXT " Èç¹ûÄúÏ£Íû°²×° VMware(r) µÄ SVGA Çý¶¯³ÌÐòÇëµã»÷ ¡°ÏÂÒ»²½¡± ·ñÔòÇëµã»÷¡°È¡Ïû¡± ¡£", -1, 117, 140, 140, 17 END IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/base/setup/vmwinst/vmwinst.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/vmwinst… ============================================================================== --- trunk/reactos/base/setup/vmwinst/vmwinst.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/vmwinst.h [iso-8859-1] Tue Jun 3 11:56:23 2008 @@ -10,7 +10,7 @@ #endif /* metrics */ -#define PROPSHEETWIDTH 250 +#define PROPSHEETWIDTH 260 #define PROPSHEETHEIGHT 120 #define PROPSHEETPADDING 6 #define SYSTEM_COLUMN (18 * PROPSHEETPADDING)

1 0

[cfinck] 33838: Slovak keyboard layout update by Milan Margus (malin23 AT atlas DOT sk) See issue #1251 for more details.
by cfinck＠svn.reactos.org 03 Jun '08

03 Jun '08

Author: cfinck Date: Tue Jun 3 08:47:19 2008 New Revision: 33838 URL: http://svn.reactos.org/svn/reactos?rev=33838&view=rev Log: Slovak keyboard layout update by Milan Margus (malin23 AT atlas DOT sk) See issue #1251 for more details. Modified: trunk/reactos/dll/keyboard/kbdsk/kbdsk.c Modified: trunk/reactos/dll/keyboard/kbdsk/kbdsk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsk/kbdsk.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsk/kbdsk.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdsk/kbdsk.c [iso-8859-1] Tue Jun 3 08:47:19 2008 @@ -1,9 +1,9 @@ /* - * ReactOS Slovak ASCII Keyboard layout + * ReactOS Slovak Keyboard layout * Copyright (C) 2005 ReactOS * License: LGPL, see: LGPL.txt * - * Created by Malin (malin23(a)atlas.sk) + * Created by Milan Margus (malin23(a)atlas.sk) * Thanks to creators of others kbdxx.dll */ @@ -39,13 +39,13 @@ VK_EMPTY, VK_ESCAPE, '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', - VK_OEM_MINUS, VK_OEM_PLUS, VK_BACK, + VK_OEM_MINUS, VK_OEM_PLUS, VK_BACK, /* - 0f - */ /* First Letters Row */ VK_TAB, 'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O', 'P', - VK_OEM_4, VK_OEM_6, VK_RETURN, + VK_OEM_4, VK_OEM_6, VK_RETURN, /* - 1d - */ /* Second Letters Row */ VK_LCONTROL, @@ -107,11 +107,45 @@ }; ROSDATA VSC_VK extcode0_to_vk[] = { - {0x1c, VK_RETURN|KEXT}, //Keypad return - {0x1d, VK_RCONTROL|KEXT},//Right control key - {0x35, VK_DIVIDE|KEXT}, // Numpad div - {0x38, VK_RMENU|KEXT}, //AltGr? - {0, 0}, + { 0x10, VK_MEDIA_PREV_TRACK | KEXT }, + { 0x19, VK_MEDIA_NEXT_TRACK | KEXT }, + { 0x1D, VK_RCONTROL | KEXT }, + { 0x20, VK_VOLUME_MUTE | KEXT }, + { 0x21, VK_LAUNCH_APP2 | KEXT }, + { 0x22, VK_MEDIA_PLAY_PAUSE | KEXT }, + { 0x24, VK_MEDIA_STOP | KEXT }, + { 0x2E, VK_VOLUME_DOWN | KEXT }, + { 0x30, VK_VOLUME_UP | KEXT }, + { 0x32, VK_BROWSER_HOME | KEXT }, + { 0x35, VK_DIVIDE | KEXT }, + { 0x37, VK_SNAPSHOT | KEXT }, + { 0x38, VK_RMENU | KEXT }, + { 0x47, VK_HOME | KEXT }, + { 0x48, VK_UP | KEXT }, + { 0x49, VK_PRIOR | KEXT }, + { 0x4B, VK_LEFT | KEXT }, + { 0x4D, VK_RIGHT | KEXT }, + { 0x4F, VK_END | KEXT }, + { 0x50, VK_DOWN | KEXT }, + { 0x51, VK_NEXT | KEXT }, + { 0x52, VK_INSERT | KEXT }, + { 0x53, VK_DELETE | KEXT }, + { 0x5B, VK_LWIN | KEXT }, + { 0x5C, VK_RWIN | KEXT }, + { 0x5D, VK_APPS | KEXT }, + { 0x5F, VK_SLEEP | KEXT }, + { 0x65, VK_BROWSER_SEARCH | KEXT }, + { 0x66, VK_BROWSER_FAVORITES | KEXT }, + { 0x67, VK_BROWSER_REFRESH | KEXT }, + { 0x68, VK_BROWSER_STOP | KEXT }, + { 0x69, VK_BROWSER_FORWARD | KEXT }, + { 0x6A, VK_BROWSER_BACK | KEXT }, + { 0x6B, VK_LAUNCH_APP1 | KEXT }, + { 0x6C, VK_LAUNCH_MAIL | KEXT }, + { 0x6D, VK_LAUNCH_MEDIA_SELECT | KEXT }, + { 0x1C, VK_RETURN | KEXT }, + { 0x46, VK_CANCEL | KEXT }, + { 0, 0 }, }; ROSDATA VSC_VK extcode1_to_vk[] = { @@ -128,7 +162,7 @@ ROSDATA MODIFIERS modifier_bits = { modifier_keys, 7, - { 0, 1, 2, 3 ,0, 0,4,5} /* Modifier bit order, NONE, SHIFT, CTRL, SHIFT+CTRL,ALT(not used),SHIFT-ALT (not used), CTR+ALT, SHIFT-CTRL-ALT*/ + { 0, 1, 2, 0 ,0, 0,3,0} /* Modifier bit order, NONE, SHIFT, CTRL, SHIFT+CTRL,ALT(not used),SHIFT-ALT (not used), CTR+ALT, SHIFT-CTRL-ALT*/ }; #define NOCAPS 0 @@ -136,31 +170,8 @@ ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { /* Normal vs Shifted */ - /* The numbers */ - { '1', NOCAPS, {'+', '1'} }, - { '2', NOCAPS, {0x013e, '2'} }, // l with caron - { '3', NOCAPS, {0x0161, '3'} }, // s with caron - { '4', NOCAPS, {0x010d, '4'} }, // c with caron - { '5', NOCAPS, {0x0165, '5'} }, // t with caron - { '6', NOCAPS, {0x017e, '6'} }, // z with caron - { '7', NOCAPS, {0x00fd, '7'} }, // y with acute - { '8', NOCAPS, {0x00e1, '8'} }, // a with acute - { '9', NOCAPS, {0x00ed, '9'} }, // i with acute - { '0', NOCAPS, {0x00e9, '0'} }, // e with acute - { VK_OEM_PLUS, NOCAPS, {WCH_DEAD, WCH_DEAD} }, // dead letters - acute, caron - { VK_EMPTY, 0, {0x00b4, 0x02c7} }, // VK_OEM_PLUS death - { VK_OEM_MINUS, NOCAPS, {'=', '%'} }, - { VK_OEM_1, NOCAPS, {0x00f4, '\"'} }, // o with circumflex - { VK_OEM_2, NOCAPS, {'-', '_'} }, - { VK_OEM_3, NOCAPS, {0x00a7, '!'} }, // section sign - { VK_OEM_4, NOCAPS, {0x00fa, '/'} }, // u with acute - { VK_OEM_5, NOCAPS, {'&', '*'} }, - { VK_OEM_6, NOCAPS, {0x00E4, '('} }, // a with diaeresis - { VK_OEM_7, NOCAPS, {0x0148, ')'} }, // n with caron { VK_OEM_8, NOCAPS, {';', WCH_DEAD} }, // degree sign { VK_EMPTY, 0, {WCH_NONE, 0x00b0} }, // VK_OEM_8 death - { VK_OEM_COMMA, NOCAPS, {',', '?'} }, - { VK_OEM_PERIOD, NOCAPS, {'.', ':'} }, /* Keys that do not have shift states */ { VK_TAB, NOCAPS, {'\t','\t'} }, @@ -181,35 +192,69 @@ }; ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { - /* Normal, Shifted, Ctrl, C-Shift */ - + /* Normal, Shifted, Ctrl, Ctrl+Alt */ + + /* The numbers */ + { '1', NOCAPS, {'+', '1', WCH_NONE, '~'} }, + { '2', NOCAPS, {0x013e, '2', WCH_NONE, WCH_DEAD} }, // l with caron + { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x02c7} }, // 2 death + { '3', NOCAPS, {0x0161, '3', WCH_NONE, WCH_DEAD} }, // s with caron + { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x005e} }, // 3 death + { '4', NOCAPS, {0x010d, '4', WCH_NONE, WCH_DEAD} }, // c with caron + { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x02d8} }, // 4 death + { '5', NOCAPS, {0x0165, '5', WCH_NONE, WCH_DEAD} }, // t with caron + { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x00b0} }, // 5 death + { '6', NOCAPS, {0x017e, '6', WCH_NONE, WCH_DEAD} }, // z with caron + { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x02db} }, // 6 death + { '7', NOCAPS, {0x00fd, '7', WCH_NONE, '`'} }, // y with acute + { '8', NOCAPS, {0x00e1, '8', WCH_NONE, WCH_DEAD} }, // a with acute + { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x02d9} }, // 8 death + { '9', NOCAPS, {0x00ed, '9', WCH_NONE, WCH_DEAD} }, // i with acute + { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x00b4} }, // 9 death + { '0', NOCAPS, {0x00e9, '0', WCH_NONE, WCH_DEAD} }, // e with acute + { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x02dd} }, // 0 death + { VK_OEM_MINUS, NOCAPS, {'=', '%', WCH_NONE, WCH_DEAD} }, + { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x00a8} }, // = death + { VK_OEM_PLUS, NOCAPS, {WCH_DEAD, WCH_DEAD, WCH_NONE, WCH_DEAD} }, // dead letters - acute, caron + { VK_EMPTY, 0, {0x00b4, 0x02c7, WCH_NONE, 0x00b8} }, // dead letters death :) + + { VK_OEM_1, NOCAPS, {0x00f4, '\"', WCH_NONE, '$'} }, // o with circumflex + { VK_OEM_2, NOCAPS, {'-', '_', WCH_NONE, '*'} }, + { VK_OEM_3, NOCAPS, {0x00a7, '!', WCH_NONE, 0x00df} }, // section sign + { VK_OEM_4, NOCAPS, {0x00fa, '/', WCH_NONE, 0x00f7} }, // u with acute + { VK_OEM_5, NOCAPS, {'&', '*', WCH_NONE, '<'} }, + { VK_OEM_6, NOCAPS, {0x00E4, '(', WCH_NONE, 0x00d7} }, // a with diaeresis + { VK_OEM_7, NOCAPS, {0x0148, ')', WCH_NONE, 0x00a4} }, // n with caron + { VK_OEM_COMMA, NOCAPS, {',', '?', WCH_NONE, '<'} }, + { VK_OEM_PERIOD, NOCAPS, {'.', ':', WCH_NONE, '>'} }, + /* The alphabet */ - { 'A', CAPS, {'a', 'A', 0x01, 0x01} }, - { 'B', CAPS, {'b', 'B', 0x02, 0x02} }, - { 'C', CAPS, {'c', 'C', 0x03, 0x03} }, - { 'D', CAPS, {'d', 'D', 0x04, 0x04} }, - { 'E', CAPS, {'e', 'E', 0x05, 0x05} }, - { 'F', CAPS, {'f', 'F', 0x06, 0x06} }, - { 'G', CAPS, {'g', 'G', 0x07, 0x07} }, - { 'H', CAPS, {'h', 'H', 0x08, 0x08} }, - { 'I', CAPS, {'i', 'I', 0x09, 0x09} }, - { 'J', CAPS, {'j', 'J', 0x0a, 0x0a} }, - { 'K', CAPS, {'k', 'K', 0x0b, 0x0b} }, - { 'L', CAPS, {'l', 'L', 0x0c, 0x0c} }, - { 'M', CAPS, {'m', 'M', 0x0d, 0x0d} }, - { 'N', CAPS, {'n', 'N', 0x0e, 0x0e} }, - { 'O', CAPS, {'o', 'O', 0x0f, 0x0f} }, - { 'P', CAPS, {'p', 'P', 0x10, 0x10} }, - { 'Q', CAPS, {'q', 'Q', 0x11, 0x11} }, - { 'R', CAPS, {'r', 'R', 0x12, 0x12} }, - { 'S', CAPS, {'s', 'S', 0x13, 0x13} }, - { 'T', CAPS, {'t', 'T', 0x14, 0x14} }, - { 'U', CAPS, {'u', 'U', 0x15, 0x15} }, - { 'V', CAPS, {'v', 'V', 0x16, 0x16} }, - { 'W', CAPS, {'w', 'W', 0x17, 0x17} }, - { 'X', CAPS, {'x', 'X', 0x18, 0x18} }, - { 'Y', CAPS, {'z', 'Z', 0x1a, 0x1a} }, // qwertZ - { 'Z', CAPS, {'y', 'Y', 0x19, 0x19} }, + { 'A', CAPS, {'a', 'A', 0x01, WCH_NONE} }, + { 'B', CAPS, {'b', 'B', 0x02, '{'} }, + { 'C', CAPS, {'c', 'C', 0x03, '&'} }, + { 'D', CAPS, {'d', 'D', 0x04, 0x0110} }, + { 'E', CAPS, {'e', 'E', 0x05, 0x20ac} }, + { 'F', CAPS, {'f', 'F', 0x06, '['} }, + { 'G', CAPS, {'g', 'G', 0x07, ']'} }, + { 'H', CAPS, {'h', 'H', 0x08, WCH_NONE} }, + { 'I', CAPS, {'i', 'I', 0x09, WCH_NONE} }, + { 'J', CAPS, {'j', 'J', 0x0a, WCH_NONE} }, + { 'K', CAPS, {'k', 'K', 0x0b, 0x0142} }, + { 'L', CAPS, {'l', 'L', 0x0c, 0x0141} }, + { 'M', CAPS, {'m', 'M', 0x0d, WCH_NONE} }, + { 'N', CAPS, {'n', 'N', 0x0e, '}'} }, + { 'O', CAPS, {'o', 'O', 0x0f, WCH_NONE} }, + { 'P', CAPS, {'p', 'P', 0x10, '\''} }, + { 'Q', CAPS, {'q', 'Q', 0x11, '\\'} }, + { 'R', CAPS, {'r', 'R', 0x12, WCH_NONE} }, + { 'S', CAPS, {'s', 'S', 0x13, 0x0111} }, + { 'T', CAPS, {'t', 'T', 0x14, WCH_NONE} }, + { 'U', CAPS, {'u', 'U', 0x15, WCH_NONE} }, + { 'V', CAPS, {'v', 'V', 0x16, '@'} }, + { 'W', CAPS, {'w', 'W', 0x17, '|'} }, + { 'X', CAPS, {'x', 'X', 0x18, '#'} }, + { 'Y', CAPS, {'z', 'Z', 0x1a, WCH_NONE} }, // qwertZ + { 'Z', CAPS, {'y', 'Y', 0x19, '>'} }, { 0, 0 } }; @@ -358,20 +403,30 @@ { DEADTRANS(0x0079, 0x00b4, 0x00fd, 0x0000) }, // y with acute { DEADTRANS(0x0020, 0x00b4, 0x00b4, 0x0000) }, // space > acute - { DEADTRANS(0x004f, 0x02c6, 0x00d4, 0x0000) }, // O with circumflex - { DEADTRANS(0x006f, 0x02c6, 0x00f4, 0x0000) }, // o with circumflex - { DEADTRANS(0x0020, 0x02c6, 0x02c6, 0x0000) }, // space > circumflex - - { DEADTRANS(0x0055, 0x00b0, 0x016e, 0x0000) }, // U > - { DEADTRANS(0x0075, 0x00b0, 0x016f, 0x0000) }, // u > + { DEADTRANS(0x004f, 0x005e, 0x00d4, 0x0000) }, // O with circumflex + { DEADTRANS(0x006f, 0x005e, 0x00f4, 0x0000) }, // o with circumflex + { DEADTRANS(0x0020, 0x005e, 0x005e, 0x0000) }, // space > circumflex + + { DEADTRANS(0x0041, 0x00a8, 0x00c4, 0x0000) }, // A with diaeresis + { DEADTRANS(0x0061, 0x00a8, 0x00e4, 0x0000) }, // a with diaeresis + { DEADTRANS(0x0045, 0x00a8, 0x00cb, 0x0000) }, // E with diaeresis + { DEADTRANS(0x0065, 0x00a8, 0x00eb, 0x0000) }, // e with diaeresis + { DEADTRANS(0x004f, 0x00a8, 0x00d6, 0x0000) }, // O with diaeresis + { DEADTRANS(0x006f, 0x00a8, 0x00f6, 0x0000) }, // o with diaeresis + { DEADTRANS(0x0055, 0x00a8, 0x00dc, 0x0000) }, // U with diaeresis + { DEADTRANS(0x0075, 0x00a8, 0x00fc, 0x0000) }, // u with diaeresis + { DEADTRANS(0x0020, 0x00a8, 0x00a8, 0x0000) }, // space > diaeresis + + { DEADTRANS(0x0055, 0x00b0, 0x016e, 0x0000) }, // U with round + { DEADTRANS(0x0075, 0x00b0, 0x016f, 0x0000) }, // u with round { DEADTRANS(0x0020, 0x00b0, 0x00b0, 0x0000) }, // space > degree { 0, 0, 0 }, }; ROSDATA DEADKEY_LPWSTR dead_key_names[] = { - L"\x00a1" L"\x004D\x00E4\x006B\x010D\x0065\x0148", // caron - L"\x00b4" L"\x0044\x013A\x017E\x0065\x0148", // acute - L"\x005e" L"\x0056\x006F\x006B\x00E1\x0148", // circumflex + L"\x02c7" L"\x004D\x00E4\x006B\x010D\x0065\x0148", // mÃ¤kÄeÅ - caron + L"\x00b4" L"\x0044\x013A\x017E\x0065\x0148", // dÄºÅ¾eÅ - acute + L"\x005e" L"\x0056\x006F\x006B\x00E1\x0148", // vokÃ¡Å - circumflex NULL };

1 0

← Newer
1
...
36
37
38
39
40
41
42
43
44
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2008