Ros-diffs May 2010

ros-diffs@reactos.org

21 participants
438 discussions

[mjmartin] 47285: [win32k] - Move the initialization of MasterTimer into InitInputImp which is called from win32k DriverEntry routine instead of initializing it in the secondary thread RawInputThreadMain.
by mjmartin＠svn.reactos.org 20 May '10

20 May '10

Author: mjmartin Date: Thu May 20 23:45:15 2010 New Revision: 47285 URL: http://svn.reactos.org/svn/reactos?rev=47285&view=rev Log: [win32k] - Move the initialization of MasterTimer into InitInputImp which is called from win32k DriverEntry routine instead of initializing it in the secondary thread RawInputThreadMain. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Thu May 20 23:45:15 2010 @@ -868,14 +868,6 @@ NTSTATUS Status; LARGE_INTEGER DueTime; - MasterTimer = ExAllocatePoolWithTag(NonPagedPool, sizeof(KTIMER), TAG_INPUT); - if (!MasterTimer) - { - DPRINT1("Win32K: Failed making Raw Input thread a win32 thread.\n"); - return; - } - KeInitializeTimer(MasterTimer); - DueTime.QuadPart = (LONGLONG)(-10000000); do @@ -936,6 +928,15 @@ NTSTATUS Status; KeInitializeEvent(&InputThreadsStart, NotificationEvent, FALSE); + + MasterTimer = ExAllocatePoolWithTag(NonPagedPool, sizeof(KTIMER), TAG_INPUT); + if (!MasterTimer) + { + DPRINT1("Win32K: Failed making Raw Input thread a win32 thread.\n"); + ASSERT(FALSE); + return STATUS_UNSUCCESSFUL; + } + KeInitializeTimer(MasterTimer); /* Initialize the default keyboard layout */ if(!UserInitDefaultKeyboardLayout())

1 0

[mjmartin] 47284: [win32k] - Set MasterTimer initial value to NULL and Initialize MasterTimer at the beginning of RawInputThreadMain before doing anything else. - Add ASSERTs to catch if MasterTimer is NULL.
by mjmartin＠svn.reactos.org 20 May '10

20 May '10

Author: mjmartin Date: Thu May 20 23:07:53 2010 New Revision: 47284 URL: http://svn.reactos.org/svn/reactos?rev=47284&view=rev Log: [win32k] - Set MasterTimer initial value to NULL and Initialize MasterTimer at the beginning of RawInputThreadMain before doing anything else. - Add ASSERTs to catch if MasterTimer is NULL. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/timer.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Thu May 20 23:07:53 2010 @@ -22,7 +22,7 @@ /* GLOBALS *******************************************************************/ PTHREADINFO ptiRawInput; -PKTIMER MasterTimer; +PKTIMER MasterTimer = NULL; PATTACHINFO gpai = NULL; static HANDLE MouseDeviceHandle; @@ -868,18 +868,6 @@ NTSTATUS Status; LARGE_INTEGER DueTime; - DueTime.QuadPart = (LONGLONG)(-10000000); - - do - { - KEVENT Event; - KeInitializeEvent(&Event, NotificationEvent, FALSE); - Status = KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, &DueTime); - } while (!NT_SUCCESS(Status)); - - - Objects[0] = &InputThreadsStart; - MasterTimer = ExAllocatePoolWithTag(NonPagedPool, sizeof(KTIMER), TAG_INPUT); if (!MasterTimer) { @@ -887,6 +875,18 @@ return; } KeInitializeTimer(MasterTimer); + + DueTime.QuadPart = (LONGLONG)(-10000000); + + do + { + KEVENT Event; + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Status = KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, &DueTime); + } while (!NT_SUCCESS(Status)); + + + Objects[0] = &InputThreadsStart; Objects[1] = MasterTimer; // This thread requires win32k! Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Thu May 20 23:07:53 2010 @@ -245,6 +245,7 @@ pTmr->flags &= ~TMRF_DELETEPENDING; } + ASSERT(MasterTimer != NULL); // Start the timer thread! if (pTmr == FirstpTmr) KeSetTimer(MasterTimer, DueTime, NULL); @@ -419,6 +420,7 @@ } while (pTmr != FirstpTmr); // Restart the timer thread! + ASSERT(MasterTimer != NULL); KeSetTimer(MasterTimer, DueTime, NULL); TimeLast = Time;

1 0

[gadamopoulos] 47283: [win32k] -Remove an incorrect debug message and silence one
by gadamopoulos＠svn.reactos.org 20 May '10

20 May '10

Author: gadamopoulos Date: Thu May 20 14:25:50 2010 New Revision: 47283 URL: http://svn.reactos.org/svn/reactos?rev=47283&view=rev Log: [win32k] -Remove an incorrect debug message and silence one Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] Thu May 20 14:25:50 2010 @@ -110,7 +110,7 @@ HANDLE OldTID = IntGetWndThreadId(WindowPrev); HANDLE NewTID = IntGetWndThreadId(Window); - DPRINT1("SendActiveMessage Old -> %x, New -> %x\n", OldTID, NewTID); + DPRINT("SendActiveMessage Old -> %x, New -> %x\n", OldTID, NewTID); if (Window->Wnd->style & WS_MINIMIZE) { DPRINT("Widow was minimized\n"); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Thu May 20 14:25:50 2010 @@ -1340,10 +1340,7 @@ /* All messages have to contain the cursor point. */ pti = PsGetCurrentThreadWin32Thread(); Msg.pt = gpsi->ptCursor; - - DPRINT1("Kbd Hook msg %d wParam %d lParam 0x%08x dropped by WH_KEYBOARD_LL hook\n", - Msg.message, vk_hook, Msg.lParam); - + KbdHookData.vkCode = vk_hook; KbdHookData.scanCode = ki->wScan; KbdHookData.flags = flags >> 8;

1 0

[tkreuzer] 47282: [WIN32CSR] Silence a debugprint
by tkreuzer＠svn.reactos.org 19 May '10

19 May '10

Author: tkreuzer Date: Thu May 20 00:15:49 2010 New Revision: 47282 URL: http://svn.reactos.org/svn/reactos?rev=47282&view=rev Log: [WIN32CSR] Silence a debugprint Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] Thu May 20 00:15:49 2010 @@ -2321,7 +2321,7 @@ /* wait untill initialization has finished */ WaitForSingleObject(GuiData->hGuiInitEvent, INFINITE); - DPRINT1("received event Console %p GuiData %p X %d Y %d\n", Console, Console->PrivateData, Console->Size.X, Console->Size.Y); + DPRINT("received event Console %p GuiData %p X %d Y %d\n", Console, Console->PrivateData, Console->Size.X, Console->Size.Y); CloseHandle(GuiData->hGuiInitEvent); GuiData->hGuiInitEvent = NULL;

1 0

[gadamopoulos] 47281: [win32k] -Correctly adjust values returned from co_WinPosGetMinMaxInfo
by gadamopoulos＠svn.reactos.org 19 May '10

19 May '10

Author: gadamopoulos Date: Wed May 19 21:08:25 2010 New Revision: 47281 URL: http://svn.reactos.org/svn/reactos?rev=47281&view=rev Log: [win32k] -Correctly adjust values returned from co_WinPosGetMinMaxInfo Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Wed May 19 21:08:25 2010 @@ -2219,21 +2219,15 @@ POINT MaxSize, MaxPos, MinTrack, MaxTrack; /* WinPosGetMinMaxInfo sends the WM_GETMINMAXINFO message */ - co_WinPosGetMinMaxInfo(Window, &MaxSize, &MaxPos, &MinTrack, - &MaxTrack); - if (MaxSize.x < Size.cx) - Size.cx = MaxSize.x; - if (MaxSize.y < Size.cy) - Size.cy = MaxSize.y; - if (Size.cx < MinTrack.x ) - Size.cx = MinTrack.x; - if (Size.cy < MinTrack.y ) - Size.cy = MinTrack.y; - if (Size.cx < 0) - Size.cx = 0; - if (Size.cy < 0) - Size.cy = 0; - } + co_WinPosGetMinMaxInfo(Window, &MaxSize, &MaxPos, &MinTrack, &MaxTrack); + if (Size.cx > MaxTrack.x) Size.cx = MaxTrack.x; + if (Size.cy > MaxTrack.y) Size.cy = MaxTrack.y; + if (Size.cx < MinTrack.x) Size.cx = MinTrack.x; + if (Size.cy < MinTrack.y) Size.cy = MinTrack.y; + } + + if (Size.cx < 0) Size.cx = 0; + if (Size.cy < 0) Size.cy = 0; Wnd->rcWindow.left = Pos.x; Wnd->rcWindow.top = Pos.y;

1 0

[gadamopoulos] 47280: [win32k] -Sync co_WinPosGetMinMaxInfo with wine
by gadamopoulos＠svn.reactos.org 19 May '10

19 May '10

Author: gadamopoulos Date: Wed May 19 20:47:39 2010 New Revision: 47280 URL: http://svn.reactos.org/svn/reactos?rev=47280&view=rev Log: [win32k] -Sync co_WinPosGetMinMaxInfo with wine Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Wed May 19 20:47:39 2010 @@ -466,21 +466,25 @@ return TRUE; } -static -VOID FASTCALL -WinPosFillMinMaxInfoStruct(PWINDOW_OBJECT Window, MINMAXINFO *Info) -{ +UINT FASTCALL +co_WinPosGetMinMaxInfo(PWINDOW_OBJECT Window, POINT* MaxSize, POINT* MaxPos, + POINT* MinTrack, POINT* MaxTrack) +{ + MINMAXINFO MinMax; + PMONITOR monitor; INT xinc, yinc; LONG style = Window->Wnd->style; LONG adjustedStyle; LONG exstyle = Window->Wnd->ExStyle; RECT rc; + ASSERT_REFS_CO(Window); + /* Compute default values */ rc = Window->Wnd->rcWindow; - Info->ptReserved.x = rc.left; - Info->ptReserved.y = rc.top; + MinMax.ptReserved.x = rc.left; + MinMax.ptReserved.y = rc.top; if ((style & WS_CAPTION) == WS_CAPTION) adjustedStyle = style & ~WS_BORDER; /* WS_CAPTION = WS_DLGFRAME | WS_BORDER */ @@ -494,37 +498,53 @@ xinc = -rc.left; yinc = -rc.top; - Info->ptMaxSize.x = rc.right - rc.left; - Info->ptMaxSize.y = rc.bottom - rc.top; + MinMax.ptMaxSize.x = rc.right - rc.left; + MinMax.ptMaxSize.y = rc.bottom - rc.top; if (style & (WS_DLGFRAME | WS_BORDER)) { - Info->ptMinTrackSize.x = UserGetSystemMetrics(SM_CXMINTRACK); - Info->ptMinTrackSize.y = UserGetSystemMetrics(SM_CYMINTRACK); + MinMax.ptMinTrackSize.x = UserGetSystemMetrics(SM_CXMINTRACK); + MinMax.ptMinTrackSize.y = UserGetSystemMetrics(SM_CYMINTRACK); } else { - Info->ptMinTrackSize.x = 2 * xinc; - Info->ptMinTrackSize.y = 2 * yinc; + MinMax.ptMinTrackSize.x = 2 * xinc; + MinMax.ptMinTrackSize.y = 2 * yinc; } - Info->ptMaxTrackSize.x = UserGetSystemMetrics(SM_CXMAXTRACK); - Info->ptMaxTrackSize.y = UserGetSystemMetrics(SM_CYMAXTRACK); - Info->ptMaxPosition.x = -xinc; - Info->ptMaxPosition.y = -yinc; + MinMax.ptMaxTrackSize.x = UserGetSystemMetrics(SM_CXMAXTRACK); + MinMax.ptMaxTrackSize.y = UserGetSystemMetrics(SM_CYMAXTRACK); + MinMax.ptMaxPosition.x = -xinc; + MinMax.ptMaxPosition.y = -yinc; //if (!EMPTYPOINT(win->max_pos)) MinMax.ptMaxPosition = win->max_pos; -} - -UINT FASTCALL -co_WinPosGetMinMaxInfo(PWINDOW_OBJECT Window, POINT* MaxSize, POINT* MaxPos, - POINT* MinTrack, POINT* MaxTrack) -{ - MINMAXINFO MinMax; - - ASSERT_REFS_CO(Window); - - WinPosFillMinMaxInfoStruct(Window, &MinMax); co_IntSendMessage(Window->hSelf, WM_GETMINMAXINFO, 0, (LPARAM)&MinMax); + + /* if the app didn't change the values, adapt them for the current monitor */ + if ((monitor = IntGetPrimaryMonitor())) + { + RECT rc_work; + + rc_work = monitor->rcMonitor; + + if (style & WS_MAXIMIZEBOX) + { + if ((style & WS_CAPTION) == WS_CAPTION || !(style & (WS_CHILD | WS_POPUP))) + rc_work = monitor->rcWork; + } + + if (MinMax.ptMaxSize.x == UserGetSystemMetrics(SM_CXSCREEN) + 2 * xinc && + MinMax.ptMaxSize.y == UserGetSystemMetrics(SM_CYSCREEN) + 2 * yinc) + { + MinMax.ptMaxSize.x = (rc_work.right - rc_work.left) + 2 * xinc; + MinMax.ptMaxSize.y = (rc_work.bottom - rc_work.top) + 2 * yinc; + } + if (MinMax.ptMaxPosition.x == -xinc && MinMax.ptMaxPosition.y == -yinc) + { + MinMax.ptMaxPosition.x = rc_work.left - xinc; + MinMax.ptMaxPosition.y = rc_work.top - yinc; + } + } + MinMax.ptMaxTrackSize.x = max(MinMax.ptMaxTrackSize.x, MinMax.ptMinTrackSize.x); @@ -1827,15 +1847,9 @@ WinPosInitInternalPos(Window, &Size, &Wnd->rcWindow); - if(SendMessage) - { - co_WinPosGetMinMaxInfo(Window, &SafeMinMax.ptMaxSize, &SafeMinMax.ptMaxPosition, - &SafeMinMax.ptMinTrackSize, &SafeMinMax.ptMaxTrackSize); - } - else - { - WinPosFillMinMaxInfoStruct(Window, &SafeMinMax); - } + co_WinPosGetMinMaxInfo(Window, &SafeMinMax.ptMaxSize, &SafeMinMax.ptMaxPosition, + &SafeMinMax.ptMinTrackSize, &SafeMinMax.ptMaxTrackSize); + Status = MmCopyToCaller(MinMaxInfo, &SafeMinMax, sizeof(MINMAXINFO)); if(!NT_SUCCESS(Status)) {

1 0

[jgardou] 47279: [WIN32K] Some cleanup, no code change.
by jgardou＠svn.reactos.org 19 May '10

19 May '10

Author: jgardou Date: Wed May 19 19:41:56 2010 New Revision: 47279 URL: http://svn.reactos.org/svn/reactos?rev=47279&view=rev Log: [WIN32K] Some cleanup, no code change. Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/monitor.c branches/reactos-yarotows/subsystems/win32/win32k/ntuser/painting.c branches/reactos-yarotows/subsystems/win32/win32k/objects/cliprgn.c branches/reactos-yarotows/subsystems/win32/win32k/objects/region.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] Wed May 19 19:41:56 2010 @@ -506,7 +506,7 @@ /* FIXME: setlasterror? */ return -1; } - dcVisRgn = ((PROSRGNDATA)dc->prgnVis)->BaseObject.hHmgr; + dcVisRgn = dc->prgnVis->BaseObject.hHmgr; DC_UnlockDc(dc); regionType = NtGdiGetRgnBox(dcVisRgn, &dcRect); Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Wed May 19 19:41:56 2010 @@ -1206,7 +1206,7 @@ { return FALSE; } - hrgnVisible = ((PROSRGNDATA)pDC->prgnVis)->BaseObject.hHmgr; // pDC->prgnRao? + hrgnVisible = pDC->prgnVis->BaseObject.hHmgr; // pDC->prgnRao? DC_UnlockDc(pDC); /* Begin with the shifted and then clipped scroll rect */ Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/cliprgn.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] Wed May 19 19:41:56 2010 @@ -37,7 +37,7 @@ } else { - hRgnVis = ((PROSRGNDATA)Dc->prgnVis)->BaseObject.hHmgr ; + hRgnVis = Dc->prgnVis->BaseObject.hHmgr ; } @@ -94,13 +94,13 @@ if (dc->prgnVis == NULL) { dc->prgnVis = IntSysCreateRectpRgn(0, 0, 0, 0); - GDIOBJ_CopyOwnership(hdc, ((PROSRGNDATA)dc->prgnVis)->BaseObject.hHmgr); - } - - retval = NtGdiCombineRgn(((PROSRGNDATA)dc->prgnVis)->BaseObject.hHmgr, hrgn, 0, RGN_COPY); + GDIOBJ_CopyOwnership(hdc, dc->prgnVis->BaseObject.hHmgr); + } + + retval = NtGdiCombineRgn(dc->prgnVis->BaseObject.hHmgr, hrgn, 0, RGN_COPY); if ( retval != ERROR ) { - NtGdiOffsetRgn(((PROSRGNDATA)dc->prgnVis)->BaseObject.hHmgr, -dc->ptlDCOrig.x, -dc->ptlDCOrig.y); + IntGdiOffsetRgn(dc->prgnVis, -dc->ptlDCOrig.x, -dc->ptlDCOrig.y); CLIPPING_UpdateGCRegion(dc); } DC_UnlockDc(dc); Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/region.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/region.c [iso-8859-1] Wed May 19 19:41:56 2010 @@ -3691,7 +3691,7 @@ else if (pDC->dclevel.prgnMeta) hSrc = ((PROSRGNDATA)pDC->dclevel.prgnMeta)->BaseObject.hHmgr; break; case SYSRGN: - if (pDC->prgnVis) hSrc = ((PROSRGNDATA)pDC->prgnVis)->BaseObject.hHmgr; + if (pDC->prgnVis) hSrc = pDC->prgnVis->BaseObject.hHmgr; break; default: hSrc = 0;

1 0

[tkreuzer] 47278: [WIN32K] Simplify EXLATEOBJ_vInitXlateFromDCs and remove EXLATEOBJ_vInitBrushXlate. Less code, more fun.
by tkreuzer＠svn.reactos.org 19 May '10

19 May '10

Author: tkreuzer Date: Wed May 19 18:23:33 2010 New Revision: 47278 URL: http://svn.reactos.org/svn/reactos?rev=47278&view=rev Log: [WIN32K] Simplify EXLATEOBJ_vInitXlateFromDCs and remove EXLATEOBJ_vInitBrushXlate. Less code, more fun. Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/engbrush.c branches/reactos-yarotows/subsystems/win32/win32k/eng/xlate.c branches/reactos-yarotows/subsystems/win32/win32k/include/xlateobj.h Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] Wed May 19 18:23:33 2010 @@ -217,16 +217,18 @@ psurfPattern = SURFACE_ShareLockSurface(pebo->pbrush->hbmPattern); ASSERT(psurfPattern); + ASSERT(psurfPattern->ppal); /* FIXME: implement mask */ psurfMask = NULL; /* Initialize XLATEOBJ for the brush */ - EXLATEOBJ_vInitBrushXlate(&exlo, - pebo->pbrush, - pebo->psurfTrg, - pebo->crCurrentText, - pebo->crCurrentBack); + EXLATEOBJ_vInitialize(&exlo, + psurfPattern->ppal, + pebo->psurfTrg->ppal, + 0, + pebo->crCurrentBack, + pebo->crCurrentText); /* Create the realization */ bResult = pfnRealzizeBrush(&pebo->BrushObject, Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] Wed May 19 18:23:33 2010 @@ -603,88 +603,24 @@ PDC pdcDst) { PSURFACE psurfDst, psurfSrc; - PPALETTE ppalSrc, ppalDst, ppalDstDc; - - DPRINT("Enter EXLATEOBJ_vInitXlateFromDCs\n"); - - /* Do basic init */ - EXLATEOBJ_vInitTrivial(pexlo); psurfDst = pdcDst->dclevel.pSurface; psurfSrc = pdcSrc->dclevel.pSurface; + /* Check for trivial color translation */ if (psurfDst == psurfSrc) { + EXLATEOBJ_vInitTrivial(pexlo); return; } - ppalSrc = psurfSrc->ppal; - - if(!ppalSrc) - { - DPRINT1("No palette for src surface %p.\n", psurfSrc); - return; - } - - ppalDst = psurfDst->ppal; - - if (!ppalDst) - { - DPRINT1("No palette for dst surface %p.\n", psurfDst); - return; - } - - ppalDstDc = pdcDst->dclevel.ppal; - ASSERT(ppalDstDc); - + /* Normal initialisation. No surface means DEFAULT_BITMAP */ EXLATEOBJ_vInitialize(pexlo, - ppalSrc, - ppalDst, + psurfSrc ? psurfSrc->ppal : &gpalMono, + psurfDst ? psurfDst->ppal : &gpalMono, pdcSrc->pdcattr->crBackgroundClr, pdcDst->pdcattr->crBackgroundClr, pdcDst->pdcattr->crForegroundClr); -} - - -VOID -NTAPI -EXLATEOBJ_vInitBrushXlate( - PEXLATEOBJ pexlo, - BRUSH *pbrush, - SURFACE *psurfDst, - COLORREF crForegroundClr, - COLORREF crBackgroundClr) -{ - PPALETTE ppalDst; - SURFACE *psurfPattern; - - ASSERT(pexlo); - ASSERT(pbrush); - ASSERT(psurfDst); - ASSERT(!(pbrush->flAttrs & (GDIBRUSH_IS_SOLID | GDIBRUSH_IS_NULL))); - - EXLATEOBJ_vInitTrivial(pexlo); - - ppalDst = psurfDst->ppal; - - if (!ppalDst) - { - DPRINT1("No palette for dst surface %p.\n", psurfDst); - return; - } - - psurfPattern = SURFACE_ShareLockSurface(pbrush->hbmPattern); - if (!psurfPattern) - { - return; - } - - if (psurfPattern->ppal) - { - EXLATEOBJ_vInitialize(pexlo, psurfPattern->ppal, ppalDst, 0, crBackgroundClr, crForegroundClr); - } - - SURFACE_ShareUnlockSurface(psurfPattern); } VOID Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/xlateobj.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/xlateobj.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/xlateobj.h [iso-8859-1] Wed May 19 18:23:33 2010 @@ -45,7 +45,6 @@ VOID NTAPI EXLATEOBJ_vInitialize(PEXLATEOBJ pexlo, PALETTE *ppalSrc, PALETTE *ppalDst, ULONG, ULONG, ULONG); VOID NTAPI EXLATEOBJ_vInitXlateFromDCs(PEXLATEOBJ pexlo, PDC pdcSrc, PDC pdcDst); -VOID NTAPI EXLATEOBJ_vInitBrushXlate(PEXLATEOBJ pexlo, BRUSH *pbrush, SURFACE *psurf, COLORREF crForegroundClr, COLORREF crBackgroundClr); VOID NTAPI EXLATEOBJ_vInitSrcMonoXlate(PEXLATEOBJ pexlo, PPALETTE ppalDst, ULONG Color0, ULONG Color1); VOID NTAPI EXLATEOBJ_vCleanup(PEXLATEOBJ pexlo);

1 0

[ilardig] 47277: [userenv] german translation of sendto Patch by Egon Ashrafinia See issue #5411 for more details.
by ilardig＠svn.reactos.org 19 May '10

19 May '10

Author: ilardig Date: Wed May 19 14:53:03 2010 New Revision: 47277 URL: http://svn.reactos.org/svn/reactos?rev=47277&view=rev Log: [userenv] german translation of sendto Patch by Egon Ashrafinia See issue #5411 for more details. Modified: trunk/reactos/dll/win32/userenv/lang/de-DE.rc Modified: trunk/reactos/dll/win32/userenv/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/de-DE.rc [iso-8859-1] Wed May 19 14:53:03 2010 @@ -34,7 +34,7 @@ IDS_MYVIDEOS "Eigene Dateien\\Eigene Videos" IDS_TEMPLATES "Vorlagen" IDS_RECENT "Recent" - IDS_SENDTO "SendTo" + IDS_SENDTO "Senden an" IDS_PRINTHOOD "Druckumgebung" IDS_NETHOOD "Netzwerkumgebung" IDS_LOCALSETTINGS "Lokale Einstellungen"

1 0

[ilardig] 47276: [userenv] - Fix Italian commonfiles - Fix a typo and some Spanish environment variables
by ilardig＠svn.reactos.org 19 May '10

19 May '10

Author: ilardig Date: Wed May 19 14:03:41 2010 New Revision: 47276 URL: http://svn.reactos.org/svn/reactos?rev=47276&view=rev Log: [userenv] - Fix Italian commonfiles - Fix a typo and some Spanish environment variables Modified: trunk/reactos/dll/win32/userenv/lang/es-ES.rc trunk/reactos/dll/win32/userenv/lang/it-IT.rc Modified: trunk/reactos/dll/win32/userenv/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/es-ES.rc [iso-8859-1] Wed May 19 14:03:41 2010 @@ -37,10 +37,10 @@ IDS_MYDOCUMENTS "Mis Documentos" IDS_MYPICTURES "Mis Documentos\\Mis imágenes" IDS_MYMUSIC "Mis Documentos\\Mi música" - IDS_MYVIDEOS "Mis Documentos\\Mis vídeos" + IDS_MYVIDEOS "Mis Documentos\\Mis videos" IDS_TEMPLATES "Plantillas" - IDS_RECENT "Reciente" - IDS_SENDTO "SendTo" + IDS_RECENT "Documentos recientes" + IDS_SENDTO "Enviar a" IDS_PRINTHOOD "Impresoras" IDS_NETHOOD "Entorno de red" IDS_LOCALSETTINGS "Configuración local" Modified: trunk/reactos/dll/win32/userenv/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/it-IT.rc [iso-8859-1] Wed May 19 14:03:41 2010 @@ -38,5 +38,5 @@ IDS_HISTORY "Impostazioni locali\\Cronologia" IDS_COOKIES "Cookies" IDS_PROGRAMFILES "%SystemDrive%\\Programmi" - IDS_COMMONFILES "File condivisi" + IDS_COMMONFILES "File comuni" END

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
44
Older →

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 May 2010