Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gvg] 19976: Strings with different lengths are not equal
by gvg＠svn.reactos.com 08 Dec '05

08 Dec '05

Strings with different lengths are not equal Modified: trunk/reactos/lib/kernel32/misc/lang.c _____ Modified: trunk/reactos/lib/kernel32/misc/lang.c --- trunk/reactos/lib/kernel32/misc/lang.c 2005-12-08 19:39:23 UTC (rev 19975) +++ trunk/reactos/lib/kernel32/misc/lang.c 2005-12-08 21:32:21 UTC (rev 19976) @@ -1,10 +1,9 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT : ReactOS user mode libraries - * MODULE : kernel32.dll - * FILE : reactos/lib/kernel32/misc/lang.c - * AUTHOR : ??? +/* + * PROJECT: ReactOS user mode libraries + * LICENSE: GPL - See COPYING in the top level directory + * FILE: reactos/lib/kernel32/misc/lang.c + * PURPOSE: + * PROGRAMMERS: ??? */ #include <k32.h> @@ -932,6 +931,7 @@ return c1 - c2; } } + return (int) len1 - (int) len2; } return 0; }

1 0

[hpoussin] 19975: Move *PNP0F13 identifier to Standard mice section
by hpoussin＠svn.reactos.com 08 Dec '05

08 Dec '05

Move *PNP0F13 identifier to Standard mice section Modified: trunk/reactos/media/inf/mouse.inf _____ Modified: trunk/reactos/media/inf/mouse.inf --- trunk/reactos/media/inf/mouse.inf 2005-12-08 19:08:04 UTC (rev 19974) +++ trunk/reactos/media/inf/mouse.inf 2005-12-08 19:39:23 UTC (rev 19975) @@ -33,6 +33,7 @@ %SERIAL_MOUSE.DeviceDesc% = Serial_Inst,*PNP0F0C,SERENUM\PNP0F0C,*PNP0F17,SERENUM\PNP0F17,SERIAL_MOU SE %PS2_MOUSE.DeviceDesc% = PS2_Inst,*PNP0F0E,*PNP0F19,PS2_MOUSE %HID_MOUSE.DeviceDesc% = HID_Inst,HID_DEVICE_SYSTEM_MOUSE +%*PNP0F13.DeviceDesc% = PS2_Inst,*PNP0F13 [IbmMfg] *IBM3780.DeviceDesc = PS2_Inst,*IBM3780 @@ -44,7 +45,6 @@ [MSMfg] %*PNP0F01.DeviceDesc% = Serial_Inst,*PNP0F01,SERENUM\PNP0F01 %*PNP0F03.DeviceDesc% = PS2_Inst,*PNP0F03 -%*PNP0F13.DeviceDesc% = PS2_Inst,*PNP0F13 ;---------------------------- MOUCLASS DRIVER --------------------------- @@ -133,6 +133,7 @@ SERIAL_MOUSE.DeviceDesc = "Standard Serial Mouse" PS2_MOUSE.DeviceDesc = "Standard PS/2 Mouse" HID_MOUSE.DeviceDesc = "HID Mouse" +*PNP0F13.DeviceDesc = "PS/2 port for PS/2-style mice" IbmMfg = "IBM" *IBM3780.DeviceDesc = "IBM PS/2 Trackpoint" @@ -144,4 +145,3 @@ MSMfg = "Microsoft" *PNP0F01.DeviceDesc = "Microsoft Serial Mouse" *PNP0F03.DeviceDesc = "Microsoft PS/2-style Mouse" -*PNP0F13.DeviceDesc = "PS/2 port for PS/2-style mice"

1 0

[gvg] 19974: Merge from trunk:
by gvg＠svn.reactos.com 08 Dec '05

08 Dec '05

Merge from trunk: Don't do WM_INITDIALOG processing during window destruction... Fixes bug 1087. Modified: branches/ros-branch-0_2_9/reactos/subsys/system/taskmgr/perfpage.c _____ Modified: branches/ros-branch-0_2_9/reactos/subsys/system/taskmgr/perfpage.c --- branches/ros-branch-0_2_9/reactos/subsys/system/taskmgr/perfpage.c 2005-12-08 19:07:14 UTC (rev 19973) +++ branches/ros-branch-0_2_9/reactos/subsys/system/taskmgr/perfpage.c 2005-12-08 19:08:04 UTC (rev 19974) @@ -118,6 +118,7 @@ case WM_DESTROY: GraphCtrl_Dispose(&PerformancePageCpuUsageHistoryGraph); GraphCtrl_Dispose(&PerformancePageMemUsageHistoryGraph); + break; case WM_INITDIALOG:

1 0

[gvg] 19973: Don't do WM_INITDIALOG processing during window destruction...
by gvg＠svn.reactos.com 08 Dec '05

08 Dec '05

Don't do WM_INITDIALOG processing during window destruction... Fixes bug 1087. Modified: trunk/reactos/subsys/system/taskmgr/perfpage.c _____ Modified: trunk/reactos/subsys/system/taskmgr/perfpage.c --- trunk/reactos/subsys/system/taskmgr/perfpage.c 2005-12-08 18:33:57 UTC (rev 19972) +++ trunk/reactos/subsys/system/taskmgr/perfpage.c 2005-12-08 19:07:14 UTC (rev 19973) @@ -118,6 +118,7 @@ case WM_DESTROY: GraphCtrl_Dispose(&PerformancePageCpuUsageHistoryGraph); GraphCtrl_Dispose(&PerformancePageMemUsageHistoryGraph); + break; case WM_INITDIALOG:

1 0

[gvg] 19972: Merge from trunk:
by gvg＠svn.reactos.com 08 Dec '05

08 Dec '05

Merge from trunk: Self-registration of devenum.dll depends on quartz.dll, which we don't have yet. Modified: branches/ros-branch-0_2_9/reactos/lib/devenum/devenum.xml _____ Modified: branches/ros-branch-0_2_9/reactos/lib/devenum/devenum.xml --- branches/ros-branch-0_2_9/reactos/lib/devenum/devenum.xml 2005-12-08 18:26:21 UTC (rev 19971) +++ branches/ros-branch-0_2_9/reactos/lib/devenum/devenum.xml 2005-12-08 18:33:57 UTC (rev 19972) @@ -1,5 +1,5 @@ <module name="devenum" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}" installbase="system32" installname="devenum.dll" allowwarnings="true"> - <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> +  <importlibrary definition="devenum.spec.def" /> <include base="devenum">.</include> <include base="ReactOS">include/wine</include>

1 0

[gvg] 19971: Self-registration of devenum.dll depends on quartz.dll, which we don't have yet.
by gvg＠svn.reactos.com 08 Dec '05

08 Dec '05

Self-registration of devenum.dll depends on quartz.dll, which we don't have yet. I'll import quartz.dll on the next Wine sync Modified: trunk/reactos/lib/devenum/devenum.xml _____ Modified: trunk/reactos/lib/devenum/devenum.xml --- trunk/reactos/lib/devenum/devenum.xml 2005-12-08 17:53:48 UTC (rev 19970) +++ trunk/reactos/lib/devenum/devenum.xml 2005-12-08 18:26:21 UTC (rev 19971) @@ -1,5 +1,5 @@ <module name="devenum" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}" installbase="system32" installname="devenum.dll" allowwarnings="true"> - <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> +  <importlibrary definition="devenum.spec.def" /> <include base="devenum">.</include> <include base="ReactOS">include/wine</include>

1 0

[greatlrd] 19970: adding \n at end of DPRINT1 so the log are bit easy to reading again if some apps is calling on win32k dx api
by greatlrd＠svn.reactos.com 08 Dec '05

08 Dec '05

adding \n at end of DPRINT1 so the log are bit easy to reading again if some apps is calling on win32k dx api Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c _____ Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c --- trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-12-08 17:42:31 UTC (rev 19969) +++ trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-12-08 17:53:48 UTC (rev 19970) @@ -21,7 +21,7 @@ DD_Cleanup(PVOID ObjectBody) { PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(ObjectBody, GDI_OBJECT_TYPE_DIRECTDRAW); - DPRINT1("DD_Cleanup"); + DPRINT1("DD_Cleanup\n"); if (!pDirectDraw) return FALSE; @@ -39,7 +39,7 @@ DD_CALLBACKS callbacks; DD_SURFACECALLBACKS surface_callbacks; DD_PALETTECALLBACKS palette_callbacks; - DPRINT1("NtGdiDdCreateDirectDrawObject"); + DPRINT1("NtGdiDdCreateDirectDrawObject\n"); RtlZeroMemory(&callbacks, sizeof(DD_CALLBACKS)); callbacks.dwSize = sizeof(DD_CALLBACKS); @@ -112,7 +112,7 @@ HANDLE hDirectDrawLocal ) { - DPRINT1("NtGdiDdDeleteDirectDrawObject"); + DPRINT1("NtGdiDdDeleteDirectDrawObject\n"); return GDIOBJ_FreeObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); } @@ -131,7 +131,7 @@ ) { PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); - DPRINT1("NtGdiDdQueryDirectDrawObject"); + DPRINT1("NtGdiDdQueryDirectDrawObject\n"); if (!pDirectDraw) return FALSE; @@ -184,7 +184,7 @@ DWORD ddRVal; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); - DPRINT1("NtGdiDdGetDriverInfo"); + DPRINT1("NtGdiDdGetDriverInfo\n"); if (pDirectDraw == NULL) return DDHAL_DRIVER_NOTHANDLED; @@ -217,7 +217,7 @@ { DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; PDD_DIRECTDRAW_GLOBAL lgpl; - DPRINT1("NtGdiDdCreateSurface"); + DPRINT1("NtGdiDdCreateSurface\n"); PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); if (pDirectDraw == NULL) @@ -251,7 +251,7 @@ { DWORD ddRVal; PDD_DIRECTDRAW_GLOBAL lgpl; - DPRINT1("NtGdiDdWaitForVerticalBlank"); + DPRINT1("NtGdiDdWaitForVerticalBlank\n"); PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); @@ -286,7 +286,7 @@ PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); - DPRINT1("NtGdiDdCanCreateSurface"); + DPRINT1("NtGdiDdCanCreateSurface\n"); if (pDirectDraw == NULL) return DDHAL_DRIVER_NOTHANDLED; @@ -318,7 +318,7 @@ PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); - DPRINT1("NtGdiDdGetScanLine"); + DPRINT1("NtGdiDdGetScanLine\n"); if (pDirectDraw == NULL) return DDHAL_DRIVER_NOTHANDLED; @@ -357,7 +357,7 @@ DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurface, GDI_OBJECT_TYPE_DIRECTDRAW); - DPRINT1("NtGdiDdDestroySurface"); + DPRINT1("NtGdiDdDestroySurface\n"); if (pDirectDraw == NULL) return DDHAL_DRIVER_NOTHANDLED; @@ -396,7 +396,7 @@ PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurfaceTarget, GDI_OBJECT_TYPE_DIRECTDRAW); - DPRINT1("NtGdiDdFlip"); + DPRINT1("NtGdiDdFlip\n"); if (pDirectDraw == NULL) return DDHAL_DRIVER_NOTHANDLED; @@ -430,7 +430,7 @@ PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurface, GDI_OBJECT_TYPE_DIRECTDRAW); - DPRINT1("NtGdiDdLock"); + DPRINT1("NtGdiDdLock\n"); if (pDirectDraw == NULL) return DDHAL_DRIVER_NOTHANDLED; @@ -462,7 +462,7 @@ PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurface, GDI_OBJECT_TYPE_DIRECTDRAW); - DPRINT1("NtGdiDdUnlock"); + DPRINT1("NtGdiDdUnlock\n"); if (pDirectDraw == NULL) return DDHAL_DRIVER_NOTHANDLED; @@ -495,7 +495,7 @@ PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurfaceDest, GDI_OBJECT_TYPE_DIRECTDRAW); - DPRINT1("NtGdiDdBlt"); + DPRINT1("NtGdiDdBlt\n"); if (pDirectDraw == NULL) return DDHAL_DRIVER_NOTHANDLED; @@ -527,7 +527,7 @@ PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurface, GDI_OBJECT_TYPE_DIRECTDRAW); - DPRINT1("NtGdiDdSetColorKey"); + DPRINT1("NtGdiDdSetColorKey\n"); if (pDirectDraw == NULL) return DDHAL_DRIVER_NOTHANDLED; @@ -561,7 +561,7 @@ PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurfaceAttached, GDI_OBJECT_TYPE_DIRECTDRAW); - DPRINT1("NtGdiDdAddAttachedSurface"); + DPRINT1("NtGdiDdAddAttachedSurface\n"); if (pDirectDraw == NULL) return DDHAL_DRIVER_NOTHANDLED; @@ -593,7 +593,7 @@ PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurface, GDI_OBJECT_TYPE_DIRECTDRAW); - DPRINT1("NtGdiDdGetBltStatus"); + DPRINT1("NtGdiDdGetBltStatus\n"); if (pDirectDraw == NULL) return DDHAL_DRIVER_NOTHANDLED; @@ -625,7 +625,7 @@ PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurface, GDI_OBJECT_TYPE_DIRECTDRAW); - DPRINT1("NtGdiDdGetFlipStatus"); + DPRINT1("NtGdiDdGetFlipStatus\n"); if (pDirectDraw == NULL) return DDHAL_DRIVER_NOTHANDLED; @@ -658,7 +658,7 @@ PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurfaceDestination, GDI_OBJECT_TYPE_DIRECTDRAW); - DPRINT1("NtGdiDdUpdateOverlay"); + DPRINT1("NtGdiDdUpdateOverlay\n"); if (pDirectDraw == NULL) return DDHAL_DRIVER_NOTHANDLED; @@ -691,7 +691,7 @@ PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hSurfaceDestination, GDI_OBJECT_TYPE_DIRECTDRAW); - DPRINT1("NtGdiDdSetOverlayPosition"); + DPRINT1("NtGdiDdSetOverlayPosition\n"); if (pDirectDraw == NULL) return DDHAL_DRIVER_NOTHANDLED; @@ -725,7 +725,7 @@ /* FIXME: implement * PDD_SURFACE pDDSurf = PVOID pDDSurf */ - DPRINT1("DDSURF_Cleanup"); + DPRINT1("DDSURF_Cleanup\n"); return TRUE; } @@ -739,7 +739,7 @@ ) { PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); - DPRINT1("NtGdiDdCreateSurfaceObject"); + DPRINT1("NtGdiDdCreateSurfaceObject\n"); if (!pDirectDraw) return NULL; @@ -770,7 +770,7 @@ HANDLE hSurface ) { - DPRINT1("NtGdiDdDeleteSurfaceObject"); + DPRINT1("NtGdiDdDeleteSurfaceObject\n"); return GDIOBJ_FreeObj(hSurface, GDI_OBJECT_TYPE_DD_SURFACE); } @@ -817,7 +817,7 @@ PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); - DPRINT1("NtGdiDdGetAvailDriverMemory"); + DPRINT1("NtGdiDdGetAvailDriverMemory\n"); /* backup the orignal PDev and info */ lgpl = puGetAvailDriverMemoryData->lpDD; @@ -849,7 +849,7 @@ PDD_DIRECTDRAW_GLOBAL lgpl; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDraw, GDI_OBJECT_TYPE_DIRECTDRAW); - DPRINT1("NtGdiDdSetExclusiveMode"); + DPRINT1("NtGdiDdSetExclusiveMode\n"); /* backup the orignal PDev and info */ lgpl = puSetExclusiveModeData->lpDD;

1 0

[gvg] 19969: Merge from trunk:
by gvg＠svn.reactos.com 08 Dec '05

08 Dec '05

1 0

[gvg] 19968: Merge from trunk:
by gvg＠svn.reactos.com 08 Dec '05

08 Dec '05

Merge from trunk: It's possible to select an (indexed) palette into a bitfield (e.g. 16 bit deep) DC. This palette will be used when calling CreateDIBSection with DIB_PAL_COLORS usage. Fixes bug 1077. Modified: branches/ros-branch-0_2_9/reactos/subsys/win32k/objects/color.c Modified: branches/ros-branch-0_2_9/reactos/subsys/win32k/objects/dc.c Modified: branches/ros-branch-0_2_9/reactos/subsys/win32k/objects/dib.c _____ Modified: branches/ros-branch-0_2_9/reactos/subsys/win32k/objects/color.c --- branches/ros-branch-0_2_9/reactos/subsys/win32k/objects/color.c 2005-12-08 17:34:48 UTC (rev 19967) +++ branches/ros-branch-0_2_9/reactos/subsys/win32k/objects/color.c 2005-12-08 17:41:57 UTC (rev 19968) @@ -509,6 +509,12 @@ oldPal = dc->w.hPalette; dc->w.hPalette = hpal; } + else if (8 < dc->w.bitsPerPixel && PAL_INDEXED == PalGDI->Mode) + { + PALETTE_UnlockPalette(PalGDI); + oldPal = dc->PalIndexed; + dc->PalIndexed = hpal; + } else { PALETTE_UnlockPalette(PalGDI); _____ Modified: branches/ros-branch-0_2_9/reactos/subsys/win32k/objects/dc.c --- branches/ros-branch-0_2_9/reactos/subsys/win32k/objects/dc.c 2005-12-08 17:34:48 UTC (rev 19967) +++ branches/ros-branch-0_2_9/reactos/subsys/win32k/objects/dc.c 2005-12-08 17:41:57 UTC (rev 19968) @@ -222,6 +222,7 @@ NewDC->w.hFirstBitmap = hBitmap; NewDC->GDIDevice = OrigDC->GDIDevice; + NewDC->PalIndexed = OrigDC->PalIndexed; NewDC->w.hPalette = OrigDC->w.hPalette; NewDC->w.textColor = OrigDC->w.textColor; NewDC->w.textAlign = OrigDC->w.textAlign; @@ -905,6 +906,7 @@ if (! CreateAsIC) { + NewDC->PalIndexed = NtGdiGetStockObject(DEFAULT_PALETTE); NewDC->w.hPalette = NewDC->DevInfo->hpalDefault; NewDC->w.ROPmode = R2_COPYPEN; @@ -1315,6 +1317,7 @@ #if 0 newdc->w.hDevice = dc->w.hDevice; #endif + newdc->PalIndexed = dc->PalIndexed; newdc->w.hPalette = dc->w.hPalette; newdc->w.totalExtent = dc->w.totalExtent; newdc->w.bitsPerPixel = dc->w.bitsPerPixel; @@ -1440,6 +1443,7 @@ dc->vportOrgY = dcs->vportOrgY; dc->vportExtX = dcs->vportExtX; dc->vportExtY = dcs->vportExtY; + dc->PalIndexed = dcs->PalIndexed; if (!(dc->w.flags & DC_MEMORY)) { _____ Modified: branches/ros-branch-0_2_9/reactos/subsys/win32k/objects/dib.c --- branches/ros-branch-0_2_9/reactos/subsys/win32k/objects/dib.c 2005-12-08 17:34:48 UTC (rev 19967) +++ branches/ros-branch-0_2_9/reactos/subsys/win32k/objects/dib.c 2005-12-08 17:41:57 UTC (rev 19968) @@ -1108,7 +1108,11 @@ if (palGDI->Mode != PAL_INDEXED) { PALETTE_UnlockPalette(palGDI); - return NULL; + palGDI = PALETTE_LockPalette(dc->PalIndexed); + if (palGDI->Mode != PAL_INDEXED) + { + return NULL; + } } nNumColors = 1 << lpbmi->bmiHeader.biBitCount;

1 0

[gvg] 19967: It's possible to select an (indexed) palette into a bitfield (e.g. 16 bit
by gvg＠svn.reactos.com 08 Dec '05

08 Dec '05

It's possible to select an (indexed) palette into a bitfield (e.g. 16 bit deep) DC. This palette will be used when calling CreateDIBSection with DIB_PAL_COLORS usage. Fixes bug 1077. Modified: trunk/reactos/include/win32k/dc.h Modified: trunk/reactos/subsys/win32k/objects/color.c Modified: trunk/reactos/subsys/win32k/objects/dc.c Modified: trunk/reactos/subsys/win32k/objects/dib.c _____ Modified: trunk/reactos/include/win32k/dc.h --- trunk/reactos/include/win32k/dc.h 2005-12-08 17:09:47 UTC (rev 19966) +++ trunk/reactos/include/win32k/dc.h 2005-12-08 17:34:48 UTC (rev 19967) @@ -100,6 +100,8 @@ INT saveLevel; BOOL IsIC; + HPALETTE PalIndexed; + WIN_DC_INFO w; } DC, *PDC; _____ Modified: trunk/reactos/subsys/win32k/objects/color.c --- trunk/reactos/subsys/win32k/objects/color.c 2005-12-08 17:09:47 UTC (rev 19966) +++ trunk/reactos/subsys/win32k/objects/color.c 2005-12-08 17:34:48 UTC (rev 19967) @@ -509,6 +509,12 @@ oldPal = dc->w.hPalette; dc->w.hPalette = hpal; } + else if (8 < dc->w.bitsPerPixel && PAL_INDEXED == PalGDI->Mode) + { + PALETTE_UnlockPalette(PalGDI); + oldPal = dc->PalIndexed; + dc->PalIndexed = hpal; + } else { PALETTE_UnlockPalette(PalGDI); _____ Modified: trunk/reactos/subsys/win32k/objects/dc.c --- trunk/reactos/subsys/win32k/objects/dc.c 2005-12-08 17:09:47 UTC (rev 19966) +++ trunk/reactos/subsys/win32k/objects/dc.c 2005-12-08 17:34:48 UTC (rev 19967) @@ -222,6 +222,7 @@ NewDC->w.hFirstBitmap = hBitmap; NewDC->GDIDevice = OrigDC->GDIDevice; + NewDC->PalIndexed = OrigDC->PalIndexed; NewDC->w.hPalette = OrigDC->w.hPalette; NewDC->w.textColor = OrigDC->w.textColor; NewDC->w.textAlign = OrigDC->w.textAlign; @@ -905,6 +906,7 @@ if (! CreateAsIC) { + NewDC->PalIndexed = NtGdiGetStockObject(DEFAULT_PALETTE); NewDC->w.hPalette = NewDC->DevInfo->hpalDefault; NewDC->w.ROPmode = R2_COPYPEN; @@ -1315,6 +1317,7 @@ #if 0 newdc->w.hDevice = dc->w.hDevice; #endif + newdc->PalIndexed = dc->PalIndexed; newdc->w.hPalette = dc->w.hPalette; newdc->w.totalExtent = dc->w.totalExtent; newdc->w.bitsPerPixel = dc->w.bitsPerPixel; @@ -1440,6 +1443,7 @@ dc->vportOrgY = dcs->vportOrgY; dc->vportExtX = dcs->vportExtX; dc->vportExtY = dcs->vportExtY; + dc->PalIndexed = dcs->PalIndexed; if (!(dc->w.flags & DC_MEMORY)) { _____ Modified: trunk/reactos/subsys/win32k/objects/dib.c --- trunk/reactos/subsys/win32k/objects/dib.c 2005-12-08 17:09:47 UTC (rev 19966) +++ trunk/reactos/subsys/win32k/objects/dib.c 2005-12-08 17:34:48 UTC (rev 19967) @@ -1108,7 +1108,11 @@ if (palGDI->Mode != PAL_INDEXED) { PALETTE_UnlockPalette(palGDI); - return NULL; + palGDI = PALETTE_LockPalette(dc->PalIndexed); + if (palGDI->Mode != PAL_INDEXED) + { + return NULL; + } } nNumColors = 1 << lpbmi->bmiHeader.biBitCount;

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