Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gschneider] 42741: Allocate span memory for every clipping type, not only for one
by gschneider＠svn.reactos.org 16 Aug '09

16 Aug '09

Author: gschneider Date: Sun Aug 16 21:20:50 2009 New Revision: 42741 URL: http://svn.reactos.org/svn/reactos?rev=42741&view=rev Log: Allocate span memory for every clipping type, not only for one Modified: trunk/reactos/subsystems/win32/win32k/eng/clip.c Modified: trunk/reactos/subsystems/win32/win32k/eng/clip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/clip.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/clip.c [iso-8859-1] Sun Aug 16 21:20:50 2009 @@ -406,18 +406,21 @@ ASSERT(Boundary->top <= Boundary->bottom && Boundary->left <= Boundary->right); - *Spans = NULL; + *Count = Boundary->bottom - Boundary->top; + if (*Count > 0) + { + *Spans = ExAllocatePoolWithTag(PagedPool, *Count * sizeof(SPAN), TAG_CLIP); + if (NULL == *Spans) + { + *Count = 0; + return FALSE; + } + } + if (NULL == ClipRegion || DC_TRIVIAL == ClipRegion->iDComplexity) { - *Count = Boundary->bottom - Boundary->top; if (0 != *Count) { - *Spans = ExAllocatePoolWithTag(PagedPool, *Count * sizeof(SPAN), TAG_CLIP); - if (NULL == *Spans) - { - *Count = 0; - return FALSE; - } for (i = 0; i < Boundary->bottom - Boundary->top; i++) { (*Spans)[i].X = Boundary->left;

1 0

[gschneider] 42740: Add some useful information to the popen header
by gschneider＠svn.reactos.org 16 Aug '09

16 Aug '09

Author: gschneider Date: Sun Aug 16 20:58:25 2009 New Revision: 42740 URL: http://svn.reactos.org/svn/reactos?rev=42740&view=rev Log: Add some useful information to the popen header Modified: trunk/reactos/lib/sdk/crt/stdio/popen.c Modified: trunk/reactos/lib/sdk/crt/stdio/popen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/popen.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/popen.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/popen.c [iso-8859-1] Sun Aug 16 20:58:25 2009 @@ -1,11 +1,10 @@ /* * COPYRIGHT: See COPYING in the top level directory -* PROJECT: ReactOS system libraries -* FILE: lib/crt/?????? -* PURPOSE: Unknown -* PROGRAMER: Unknown -* UPDATE HISTORY: -* 25/11/05: Created +* PROJECT: ReactOS C runtime library +* FILE: lib/sdk/crt/stdio/popen.c +* PURPOSE: Pipe Functions +* PROGRAMERS: Eric Kohl + Hartmut Birr */ #include <precomp.h>

1 0

[gschneider] 42739: Only set the pattern function pointer if the pattern surface is valid, spotted by Amine Khaldi
by gschneider＠svn.reactos.org 16 Aug '09

16 Aug '09

Author: gschneider Date: Sun Aug 16 20:52:06 2009 New Revision: 42739 URL: http://svn.reactos.org/svn/reactos?rev=42739&view=rev Log: Only set the pattern function pointer if the pattern surface is valid, spotted by Amine Khaldi Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Sun Aug 16 20:52:06 2009 @@ -67,8 +67,8 @@ psoPattern = &psurfPattern->SurfObj; PatternWidth = psoPattern->sizlBitmap.cx; PatternHeight = psoPattern->sizlBitmap.cy; - } - fnPattern_GetPixel = DibFunctionsForBitmapFormat[psoPattern->iBitmapFormat].DIB_GetPixel; + fnPattern_GetPixel = DibFunctionsForBitmapFormat[psoPattern->iBitmapFormat].DIB_GetPixel; + } } else psurfPattern = NULL;

1 0

[hyperion] 42738: Tests to exercise support for calling stack-allocated trampolines. All three tests pass
by hyperion＠svn.reactos.org 16 Aug '09

16 Aug '09

Author: hyperion Date: Sun Aug 16 18:50:35 2009 New Revision: 42738 URL: http://svn.reactos.org/svn/reactos?rev=42738&view=rev Log: Tests to exercise support for calling stack-allocated trampolines. All three tests pass Modified: trunk/rostests/tests/pseh2/psehtest.c Modified: trunk/rostests/tests/pseh2/psehtest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/pseh2/psehtest.c?re… ============================================================================== --- trunk/rostests/tests/pseh2/psehtest.c [iso-8859-1] (original) +++ trunk/rostests/tests/pseh2/psehtest.c [iso-8859-1] Sun Aug 16 18:50:35 2009 @@ -2245,6 +2245,71 @@ _SEH2_END; return ret == return_positive() + return_one(); +} +//}}} + +/* Use of local variables from _SEH2_EXCEPT(...) and _SEH2_FINALLY { ... } *///{{{ +DEFINE_TEST(test_nested_locals_1) +{ + int var1 = return_one(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, 0); + } + _SEH2_EXCEPT((var1 = (var1 == return_one() ? return_positive() : var1)), EXCEPTION_EXECUTE_HANDLER) + { + if(var1 == return_positive()) + var1 = return_positive() + 1; + } + _SEH2_END; + + return var1 == return_positive() + 1; +} + +DEFINE_TEST(test_nested_locals_2) +{ + int var1 = return_positive(); + + _SEH2_TRY + { + } + _SEH2_FINALLY + { + if(var1 == return_positive()) + var1 = return_positive() + 1; + } + _SEH2_END; + + return var1 == return_positive() + 1; +} + +DEFINE_TEST(test_nested_locals_3) +{ + int var1 = return_zero(); + + _SEH2_TRY + { + _SEH2_TRY + { + var1 = return_one(); + RaiseException(0xE00DEAD0, 0, 0, 0); + } + _SEH2_FINALLY + { + if(var1 == return_one()) + var1 = return_positive(); + } + _SEH2_END; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + if(var1 == return_positive()) + var1 = return_positive() + 1; + } + _SEH2_END; + + return var1 == return_positive() + 1; } //}}} @@ -2567,6 +2632,10 @@ USE_TEST(test_abnorm_7), USE_TEST(test_abnorm_8), + USE_TEST(test_nested_locals_1), + USE_TEST(test_nested_locals_2), + USE_TEST(test_nested_locals_3), + USE_TEST(test_bug_4004), USE_TEST(test_bug_4663), };

1 0

[hyperion] 42737: modified include/reactos/libs/pseh/pseh2.h Trampoline-related definitions are no longer necessary in the public header modified lib/pseh/i386/framebased-gcchack.c Don't use byte arrays when you mean unaligned field, Arch: use __attribute__((packed)) instead, and gcc will thank you for not violating strong aliasing
by hyperion＠svn.reactos.org 16 Aug '09

16 Aug '09

Author: hyperion Date: Sun Aug 16 18:40:52 2009 New Revision: 42737 URL: http://svn.reactos.org/svn/reactos?rev=42737&view=rev Log: modified include/reactos/libs/pseh/pseh2.h Trampoline-related definitions are no longer necessary in the public header modified lib/pseh/i386/framebased-gcchack.c Don't use byte arrays when you mean unaligned field, Arch: use __attribute__((packed)) instead, and gcc will thank you for not violating strong aliasing Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h trunk/reactos/lib/pseh/i386/framebased-gcchack.c Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] Sun Aug 16 18:40:52 2009 @@ -85,43 +85,6 @@ #ifdef __cplusplus } -#endif - -#if defined(__i386__) -typedef struct __SEHTrampoline -{ - unsigned char STR_MovEcx; - unsigned char STR_Closure[4]; - unsigned char STR_Jmp; - unsigned char STR_Function[4]; -} -_SEHTrampoline_t; - -static -__inline__ -__attribute__((always_inline)) -int _SEHIsTrampoline(_SEHTrampoline_t * trampoline_) -{ - return trampoline_->STR_MovEcx == 0xb9 && trampoline_->STR_Jmp == 0xe9; -} - -static -__inline__ -__attribute__((always_inline)) -void * _SEHFunctionFromTrampoline(_SEHTrampoline_t * trampoline_) -{ - return (void *)(*(int *)(&trampoline_->STR_Function[0]) + (int)(trampoline_ + 1)); -} - -static -__inline__ -__attribute__((always_inline)) -void * _SEHClosureFromTrampoline(_SEHTrampoline_t * trampoline_) -{ - return (void *)*(int *)(&trampoline_->STR_Closure[0]); -} -#else -#error TODO #endif /* A no-op side effect that scares GCC */ Modified: trunk/reactos/lib/pseh/i386/framebased-gcchack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/i386/framebased-g… ============================================================================== --- trunk/reactos/lib/pseh/i386/framebased-gcchack.c [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/i386/framebased-gcchack.c [iso-8859-1] Sun Aug 16 18:40:52 2009 @@ -41,6 +41,34 @@ extern DECLSPEC_NORETURN int __SEH2Handle(void *, void *, void *, void *, void *, void *); extern int __cdecl __SEH2FrameHandler(struct _EXCEPTION_RECORD *, void *, struct _CONTEXT *, void *); extern int __cdecl __SEH2UnwindHandler(struct _EXCEPTION_RECORD *, void *, struct _CONTEXT *, void *); + +typedef struct __SEHTrampoline +{ + unsigned char STR_MovEcx; + unsigned char * STR_Closure; + unsigned char STR_Jmp; + unsigned char * STR_Function; +} +__attribute__((packed)) +_SEHTrampoline_t; + +FORCEINLINE +int _SEHIsTrampoline(_SEHTrampoline_t * trampoline_) +{ + return trampoline_->STR_MovEcx == 0xb9 && trampoline_->STR_Jmp == 0xe9; +} + +FORCEINLINE +void * _SEHFunctionFromTrampoline(_SEHTrampoline_t * trampoline_) +{ + return (int)(trampoline_ + 1) + trampoline_->STR_Function; +} + +FORCEINLINE +void * _SEHClosureFromTrampoline(_SEHTrampoline_t * trampoline_) +{ + return trampoline_->STR_Closure; +} FORCEINLINE _SEH2Registration_t * __cdecl _SEH2CurrentRegistration(void)

1 0

[sginsberg] 42736: - Remove incorrect #pragma pack/pop
by sginsberg＠svn.reactos.org 16 Aug '09

16 Aug '09

Author: sginsberg Date: Sun Aug 16 15:20:19 2009 New Revision: 42736 URL: http://svn.reactos.org/svn/reactos?rev=42736&view=rev Log: - Remove incorrect #pragma pack/pop Modified: trunk/reactos/include/ddk/ntddndis.h Modified: trunk/reactos/include/ddk/ntddndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddndis.h?rev… ============================================================================== --- trunk/reactos/include/ddk/ntddndis.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddndis.h [iso-8859-1] Sun Aug 16 15:20:19 2009 @@ -22,8 +22,6 @@ #ifndef __NTDDNDIS_H #define __NTDDNDIS_H - -#pragma pack(push,4) #ifdef __cplusplus extern "C" { @@ -300,8 +298,6 @@ METHOD_OUT_DIRECT, \ FILE_ANY_ACCESS) -#pragma pack(pop) - #ifdef __cplusplus } #endif

1 0

[tkreuzer] 42735: Update PDEVOBJ and GRAPHICS_DEVICE fields
by tkreuzer＠svn.reactos.org 16 Aug '09

16 Aug '09

Author: tkreuzer Date: Sun Aug 16 14:57:41 2009 New Revision: 42735 URL: http://svn.reactos.org/svn/reactos?rev=42735&view=rev Log: Update PDEVOBJ and GRAPHICS_DEVICE fields Modified: trunk/reactos/subsystems/win32/win32k/eng/driverobj.c trunk/reactos/subsystems/win32/win32k/eng/engbrush.c trunk/reactos/subsystems/win32/win32k/eng/mouse.c trunk/reactos/subsystems/win32/win32k/eng/surface.c trunk/reactos/subsystems/win32/win32k/eng/xlate.c trunk/reactos/subsystems/win32/win32k/include/pdevobj.h trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c trunk/reactos/subsystems/win32/win32k/ntuser/metric.c trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c trunk/reactos/subsystems/win32/win32k/objects/bitblt.c trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/coord.c trunk/reactos/subsystems/win32/win32k/objects/dclife.c trunk/reactos/subsystems/win32/win32k/objects/device.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/objects/fillshap.c trunk/reactos/subsystems/win32/win32k/objects/freetype.c trunk/reactos/subsystems/win32/win32k/objects/icm.c trunk/reactos/subsystems/win32/win32k/objects/palette.c trunk/reactos/subsystems/win32/win32k/objects/wingl.c Modified: trunk/reactos/subsystems/win32/win32k/eng/driverobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/driverobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/driverobj.c [iso-8859-1] Sun Aug 16 14:57:41 2009 @@ -59,7 +59,7 @@ pedo->drvobj.pvObj = pvObj; pedo->drvobj.pFreeProc = pFreeObjProc; pedo->drvobj.hdev = hdev; - pedo->drvobj.dhpdev = ppdev->hPDev; + pedo->drvobj.dhpdev = ppdev->dhpdev; /* Unlock the object */ DRIVEROBJ_UnlockObject(pedo); Modified: trunk/reactos/subsystems/win32/win32k/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] Sun Aug 16 14:57:41 2009 @@ -39,7 +39,7 @@ if (pebo->psurfTrg) hpal = pebo->psurfTrg->hDIBPalette; - if (!hpal) hpal = pPrimarySurface->DevInfo.hpalDefault; + if (!hpal) hpal = pPrimarySurface->devinfo.hpalDefault; pebo->ppalSurf = PALETTE_ShareLockPalette(hpal); if (!pebo->ppalSurf) pebo->ppalSurf = &gpalRGB; Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] Sun Aug 16 14:57:41 2009 @@ -428,7 +428,7 @@ if(pgp->psurfMask) { - ppal = PALETTE_LockPalette(ppdev->DevInfo.hpalDefault); + ppal = PALETTE_LockPalette(ppdev->devinfo.hpalDefault); EXLATEOBJ_vInitialize(&exlo, &gpalMono, ppal, Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] Sun Aug 16 14:57:41 2009 @@ -536,7 +536,7 @@ /* Associate the hdev */ pso->hdev = hdev; - pso->dhpdev = ppdev->hPDev; + pso->dhpdev = ppdev->dhpdev; /* Hook up specified functions */ psurf->flHooks = flHooks; @@ -578,7 +578,7 @@ /* Associate the hdev */ pso->hdev = hdev; - pso->dhpdev = ppdev->hPDev; + pso->dhpdev = ppdev->dhpdev; /* Hook up specified functions */ psurf->flHooks = flHooks; Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] Sun Aug 16 14:57:41 2009 @@ -621,14 +621,14 @@ hpalSrc = psurfSrc->hDIBPalette; if (!hpalSrc) - hpalSrc = pPrimarySurface->DevInfo.hpalDefault; + hpalSrc = pPrimarySurface->devinfo.hpalDefault; ppalSrc = PALETTE_ShareLockPalette(hpalSrc); if (!ppalSrc) return; hpalDst = psurfDst->hDIBPalette; - if (!hpalDst) hpalDst = pPrimarySurface->DevInfo.hpalDefault; + if (!hpalDst) hpalDst = pPrimarySurface->devinfo.hpalDefault; ppalDst = PALETTE_ShareLockPalette(hpalDst); if (!ppalDst) @@ -695,7 +695,7 @@ EXLATEOBJ_vInitTrivial(pexlo); hpalDst = psurfDst->hDIBPalette; - if (!hpalDst) hpalDst = pPrimarySurface->DevInfo.hpalDefault; + if (!hpalDst) hpalDst = pPrimarySurface->devinfo.hpalDefault; ppalDst = PALETTE_ShareLockPalette(hpalDst); if (!ppalDst) { Modified: trunk/reactos/subsystems/win32/win32k/include/pdevobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/pdevobj.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/pdevobj.h [iso-8859-1] Sun Aug 16 14:57:41 2009 @@ -39,10 +39,24 @@ typedef struct _GRAPHICS_DEVICE { - CHAR szNtDeviceName[CCHDEVICENAME]; /* Yes char AscII */ - CHAR szWinDeviceName[CCHDEVICENAME]; /* <- chk GetMonitorInfoW MxIxEX.szDevice */ - struct _GRAPHICS_DEVICE * pNextGraphicsDevice; - DWORD StateFlags; /* See DISPLAY_DEVICE_* */ + WCHAR szNtDeviceName[CCHDEVICENAME/2]; + WCHAR szWinDeviceName[CCHDEVICENAME/2]; + struct _GRAPHICS_DEVICE * pNextGraphicsDevice; + struct _GRAPHICS_DEVICE * pVgaDevice; + PDEVICE_OBJECT DeviceObject; + PVOID pDeviceHandle; + DWORD hkClassDriverConfig; + DWORD StateFlags; /* See DISPLAY_DEVICE_* */ + ULONG cbdevmodeInfo; + PVOID devmodeInfo; + DWORD cbdevmodeInfo1; + PVOID devmodeInfo1; + LPWSTR pwszDeviceNames; + LPWSTR pwszDescription; + DWORD dwUnknown; + PVOID pUnknown; + PFILE_OBJECT FileObject; + DWORD ProtocolType; } GRAPHICS_DEVICE, *PGRAPHICS_DEVICE; typedef struct _PDEVOBJ @@ -55,7 +69,7 @@ struct _PDEVOBJ * ppdevParent; FLONG flFlags; // flags // FLONG flAccelerated; - PERESOURCE hsemDevLock; /* Device lock. */ + HSEMAPHORE hsemDevLock; /* Device lock. */ // HSEMAPHORE hsemPointer; POINTL ptlPointer; // SIZEL szlPointer; @@ -63,7 +77,7 @@ // HFONT hlfntDefault; // HFONT hlfntAnsiVariable; // HFONT hlfntAnsiFixed; - HSURF FillPatterns[HS_DDI_MAX]; // ahsurf[HS_DDI_MAX]; + HSURF ahsurf[HS_DDI_MAX]; // PUNICODE_STRING pusPrtDataFileName; // PVOID pDevHTInfo; // RFONT * prfntActive; @@ -85,14 +99,14 @@ // PFN_DrvNotify pfnDrvNotify; // ULONG TagSig; // PLDEVOBJ pldev; - DHPDEV hPDev; /* dhpdev, DHPDEV for device. */ + DHPDEV dhpdev; /* DHPDEV for device. */ PVOID ppalSurf; /* PEPALOBJ/PPALETTE for this device. */ - DEVINFO DevInfo; // devinfo - GDIINFO GDIInfo; // gdiinfo + DEVINFO devinfo; + GDIINFO gdiinfo; HSURF pSurface; /* SURFACE for this device., FIXME: PSURFACE */ // HANDLE hSpooler; /* Handle to spooler, if spooler dev driver. */ // PVOID pDesktopId; - PGRAPHICS_DEVICE pGraphicsDev; /* pGraphicsDevice */ + PGRAPHICS_DEVICE pGraphicsDevice; // POINTL ptlOrigion; PVOID pdmwDev; /* Ptr->DEVMODEW.dmSize + dmDriverExtra == alloc size. */ // DWORD Unknown3; Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] Sun Aug 16 14:57:41 2009 @@ -265,7 +265,7 @@ * DxEGShDevData_OpenRefs Retrieve the pdevOpenRefs counter * DxEGShDevData_palette See if the device RC_PALETTE is set * DxEGShDevData_ldev ATM we do not support the Loader Device driver structure -* DxEGShDevData_GDev Retrieve the device pGraphicsDev +* DxEGShDevData_GDev Retrieve the device pGraphicsDevice * DxEGShDevData_clonedev Retrieve the device PDEV_CLONE_DEVICE flag is set or not * * @return @@ -302,15 +302,15 @@ break; case DxEGShDevData_DitherFmt: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_DitherFmt\n"); - retVal = (DWORD_PTR) PDev->DevInfo.iDitherFormat; + retVal = (DWORD_PTR) PDev->devinfo.iDitherFormat; break; case DxEGShDevData_FxCaps: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_FxCaps\n"); - retVal = (DWORD_PTR) PDev->DevInfo.flGraphicsCaps; + retVal = (DWORD_PTR) PDev->devinfo.flGraphicsCaps; break; case DxEGShDevData_FxCaps2: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_FxCaps2\n"); - retVal = (DWORD_PTR) PDev->DevInfo.flGraphicsCaps2; + retVal = (DWORD_PTR) PDev->devinfo.flGraphicsCaps2; break; case DxEGShDevData_DrvFuncs: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_DrvFuncs\n"); @@ -318,7 +318,7 @@ break; case DxEGShDevData_dhpdev: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_dhpdev\n"); - retVal = (DWORD_PTR) PDev->hPDev; // DHPDEV + retVal = (DWORD_PTR) PDev->dhpdev; // DHPDEV break; case DxEGShDevData_eddg: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_eddg\n"); @@ -354,7 +354,7 @@ break; case DxEGShDevData_palette: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_palette\n"); - retVal = (DWORD_PTR) PDev->GDIInfo.flRaster & RC_PALETTE; + retVal = (DWORD_PTR) PDev->gdiinfo.flRaster & RC_PALETTE; break; case DxEGShDevData_ldev: DPRINT1("DxEGShDevData_ldev not supported yet\n"); @@ -363,7 +363,7 @@ break; case DxEGShDevData_GDev: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_GDev\n"); - retVal = (DWORD_PTR) PDev->pGraphicsDev; // P"GRAPHICS_DEVICE" + retVal = (DWORD_PTR) PDev->pGraphicsDevice; // P"GRAPHICS_DEVICE" break; case DxEGShDevData_clonedev: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_clonedev\n"); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/metric.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/metric.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/metric.c [iso-8859-1] Sun Aug 16 14:57:41 2009 @@ -29,8 +29,8 @@ PSYSTEM_CURSORINFO CurInfo; INT *piSysMet; - Width = pPrimarySurface->GDIInfo.ulHorzRes; - Height = pPrimarySurface->GDIInfo.ulVertRes; + Width = pPrimarySurface->gdiinfo.ulHorzRes; + Height = pPrimarySurface->gdiinfo.ulVertRes; Status = IntValidateWindowStationHandle(PsGetCurrentProcess()->Win32WindowStation, KernelMode, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] Sun Aug 16 14:57:41 2009 @@ -334,8 +334,8 @@ ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&Monitor->Lock); MonitorRect.left = 0; /* FIXME: get origin */ MonitorRect.top = 0; /* FIXME: get origin */ - MonitorRect.right = MonitorRect.left + Monitor->GdiDevice->GDIInfo.ulHorzRes; - MonitorRect.bottom = MonitorRect.top + Monitor->GdiDevice->GDIInfo.ulVertRes; + MonitorRect.right = MonitorRect.left + Monitor->GdiDevice->gdiinfo.ulHorzRes; + MonitorRect.bottom = MonitorRect.top + Monitor->GdiDevice->gdiinfo.ulVertRes; ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&Monitor->Lock); DPRINT("MonitorRect: left = %d, top = %d, right = %d, bottom = %d\n", @@ -667,8 +667,8 @@ /* fill monitor info */ MonitorInfo.rcMonitor.left = 0; /* FIXME: get origin */ MonitorInfo.rcMonitor.top = 0; /* FIXME: get origin */ - MonitorInfo.rcMonitor.right = MonitorInfo.rcMonitor.left + Monitor->GdiDevice->GDIInfo.ulHorzRes; - MonitorInfo.rcMonitor.bottom = MonitorInfo.rcMonitor.top + Monitor->GdiDevice->GDIInfo.ulVertRes; + MonitorInfo.rcMonitor.right = MonitorInfo.rcMonitor.left + Monitor->GdiDevice->gdiinfo.ulHorzRes; + MonitorInfo.rcMonitor.bottom = MonitorInfo.rcMonitor.top + Monitor->GdiDevice->gdiinfo.ulVertRes; MonitorInfo.rcWork = MonitorInfo.rcMonitor; /* FIXME: use DEVMODE panning to calculate work area? */ MonitorInfo.dwFlags = 0; Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Sun Aug 16 14:57:41 2009 @@ -377,10 +377,10 @@ } DestPalette = BitmapDest->hDIBPalette; - if (!DestPalette) DestPalette = pPrimarySurface->DevInfo.hpalDefault; + if (!DestPalette) DestPalette = pPrimarySurface->devinfo.hpalDefault; SourcePalette = BitmapSrc->hDIBPalette; - if (!SourcePalette) SourcePalette = pPrimarySurface->DevInfo.hpalDefault; + if (!SourcePalette) SourcePalette = pPrimarySurface->devinfo.hpalDefault; if(!(PalSourceGDI = PALETTE_LockPalette(SourcePalette))) { Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Sun Aug 16 14:57:41 2009 @@ -278,7 +278,7 @@ Dc = DC_LockDc(hDC); DPRINT("NtGdiCreateCompatibleBitmap(%04x,%d,%d, bpp:%d) = \n", - hDC, Width, Height, Dc->ppdev->GDIInfo.cBitsPixel); + hDC, Width, Height, Dc->ppdev->gdiinfo.cBitsPixel); if (NULL == Dc) { @@ -364,7 +364,7 @@ { pso = &psurf->SurfObj; hpal = psurf->hDIBPalette; - if (!hpal) hpal = pPrimarySurface->DevInfo.hpalDefault; + if (!hpal) hpal = pPrimarySurface->devinfo.hpalDefault; ppal = PALETTE_ShareLockPalette(hpal); if (psurf->SurfObj.iBitmapFormat == BMF_1BPP && !psurf->hSecure) Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] Sun Aug 16 14:57:41 2009 @@ -674,38 +674,38 @@ /* Fall through */ case MM_LOMETRIC: - pdcattr->szlWindowExt.cx = dc->ppdev->GDIInfo.ulHorzSize * 10; - pdcattr->szlWindowExt.cy = dc->ppdev->GDIInfo.ulVertSize * 10; - pdcattr->szlViewportExt.cx = dc->ppdev->GDIInfo.ulHorzRes; - pdcattr->szlViewportExt.cy = -dc->ppdev->GDIInfo.ulVertRes; + pdcattr->szlWindowExt.cx = dc->ppdev->gdiinfo.ulHorzSize * 10; + pdcattr->szlWindowExt.cy = dc->ppdev->gdiinfo.ulVertSize * 10; + pdcattr->szlViewportExt.cx = dc->ppdev->gdiinfo.ulHorzRes; + pdcattr->szlViewportExt.cy = -dc->ppdev->gdiinfo.ulVertRes; break; case MM_HIMETRIC: - pdcattr->szlWindowExt.cx = dc->ppdev->GDIInfo.ulHorzSize * 100; - pdcattr->szlWindowExt.cy = dc->ppdev->GDIInfo.ulVertSize * 100; - pdcattr->szlViewportExt.cx = dc->ppdev->GDIInfo.ulHorzRes; - pdcattr->szlViewportExt.cy = -dc->ppdev->GDIInfo.ulVertRes; + pdcattr->szlWindowExt.cx = dc->ppdev->gdiinfo.ulHorzSize * 100; + pdcattr->szlWindowExt.cy = dc->ppdev->gdiinfo.ulVertSize * 100; + pdcattr->szlViewportExt.cx = dc->ppdev->gdiinfo.ulHorzRes; + pdcattr->szlViewportExt.cy = -dc->ppdev->gdiinfo.ulVertRes; break; case MM_LOENGLISH: - pdcattr->szlWindowExt.cx = MulDiv(1000, dc->ppdev->GDIInfo.ulHorzSize, 254); - pdcattr->szlWindowExt.cy = MulDiv(1000, dc->ppdev->GDIInfo.ulVertSize, 254); - pdcattr->szlViewportExt.cx = dc->ppdev->GDIInfo.ulHorzRes; - pdcattr->szlViewportExt.cy = -dc->ppdev->GDIInfo.ulVertRes; + pdcattr->szlWindowExt.cx = MulDiv(1000, dc->ppdev->gdiinfo.ulHorzSize, 254); + pdcattr->szlWindowExt.cy = MulDiv(1000, dc->ppdev->gdiinfo.ulVertSize, 254); + pdcattr->szlViewportExt.cx = dc->ppdev->gdiinfo.ulHorzRes; + pdcattr->szlViewportExt.cy = -dc->ppdev->gdiinfo.ulVertRes; break; case MM_HIENGLISH: - pdcattr->szlWindowExt.cx = MulDiv(10000, dc->ppdev->GDIInfo.ulHorzSize, 254); - pdcattr->szlWindowExt.cy = MulDiv(10000, dc->ppdev->GDIInfo.ulVertSize, 254); - pdcattr->szlViewportExt.cx = dc->ppdev->GDIInfo.ulHorzRes; - pdcattr->szlViewportExt.cy = -dc->ppdev->GDIInfo.ulVertRes; + pdcattr->szlWindowExt.cx = MulDiv(10000, dc->ppdev->gdiinfo.ulHorzSize, 254); + pdcattr->szlWindowExt.cy = MulDiv(10000, dc->ppdev->gdiinfo.ulVertSize, 254); + pdcattr->szlViewportExt.cx = dc->ppdev->gdiinfo.ulHorzRes; + pdcattr->szlViewportExt.cy = -dc->ppdev->gdiinfo.ulVertRes; break; case MM_TWIPS: - pdcattr->szlWindowExt.cx = MulDiv(14400, dc->ppdev->GDIInfo.ulHorzSize, 254); - pdcattr->szlWindowExt.cy = MulDiv(14400, dc->ppdev->GDIInfo.ulVertSize, 254); - pdcattr->szlViewportExt.cx = dc->ppdev->GDIInfo.ulHorzRes; - pdcattr->szlViewportExt.cy = -dc->ppdev->GDIInfo.ulVertRes; + pdcattr->szlWindowExt.cx = MulDiv(14400, dc->ppdev->gdiinfo.ulHorzSize, 254); + pdcattr->szlWindowExt.cy = MulDiv(14400, dc->ppdev->gdiinfo.ulVertSize, 254); + pdcattr->szlViewportExt.cx = dc->ppdev->gdiinfo.ulHorzRes; + pdcattr->szlViewportExt.cy = -dc->ppdev->gdiinfo.ulVertRes; break; case MM_ANISOTROPIC: @@ -1151,8 +1151,8 @@ { // "This specifies that Windows should only match fonts that have the // same aspect ratio as the display.", Programming Windows, Fifth Ed. - AspectRatio->cx = pDC->ppdev->GDIInfo.ulLogPixelsX; - AspectRatio->cy = pDC->ppdev->GDIInfo.ulLogPixelsY; + AspectRatio->cx = pDC->ppdev->gdiinfo.ulLogPixelsX; + AspectRatio->cy = pDC->ppdev->gdiinfo.ulLogPixelsY; } else { Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Sun Aug 16 14:57:41 2009 @@ -296,33 +296,33 @@ pdc->dctype = DC_TYPE_DIRECT; - pdc->dhpdev = PrimarySurface.hPDev; + pdc->dhpdev = PrimarySurface.dhpdev; if (pUMdhpdev) pUMdhpdev = pdc->dhpdev; // set DHPDEV for device. pdc->ppdev = (PVOID)&PrimarySurface; // ATM we only have one display. pdcattr->ulDirty_ |= DC_PRIMARY_DISPLAY; - pdc->rosdc.bitsPerPixel = pdc->ppdev->GDIInfo.cBitsPixel * - pdc->ppdev->GDIInfo.cPlanes; + pdc->rosdc.bitsPerPixel = pdc->ppdev->gdiinfo.cBitsPixel * + pdc->ppdev->gdiinfo.cPlanes; DPRINT("Bits per pel: %u\n", pdc->rosdc.bitsPerPixel); - pdc->flGraphicsCaps = PrimarySurface.DevInfo.flGraphicsCaps; - pdc->flGraphicsCaps2 = PrimarySurface.DevInfo.flGraphicsCaps2; + pdc->flGraphicsCaps = PrimarySurface.devinfo.flGraphicsCaps; + pdc->flGraphicsCaps2 = PrimarySurface.devinfo.flGraphicsCaps2; pdc->dclevel.hpal = NtGdiGetStockObject(DEFAULT_PALETTE); pdcattr->jROP2 = R2_COPYPEN; pdc->erclWindow.top = pdc->erclWindow.left = 0; - pdc->erclWindow.right = pdc->ppdev->GDIInfo.ulHorzRes; - pdc->erclWindow.bottom = pdc->ppdev->GDIInfo.ulVertRes; + pdc->erclWindow.right = pdc->ppdev->gdiinfo.ulHorzRes; + pdc->erclWindow.bottom = pdc->ppdev->gdiinfo.ulVertRes; pdc->dclevel.flPath &= ~DCPATH_CLOCKWISE; // Default is CCW. pdcattr->iCS_CP = ftGdiGetTextCharsetInfo(pdc,NULL,0); - hVisRgn = NtGdiCreateRectRgn(0, 0, pdc->ppdev->GDIInfo.ulHorzRes, - pdc->ppdev->GDIInfo.ulVertRes); + hVisRgn = NtGdiCreateRectRgn(0, 0, pdc->ppdev->gdiinfo.ulHorzRes, + pdc->ppdev->gdiinfo.ulVertRes); if (!CreateAsIC) { Modified: trunk/reactos/subsystems/win32/win32k/objects/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] Sun Aug 16 14:57:41 2009 @@ -320,19 +320,19 @@ PrimarySurface.DMW.dmSize = sizeof (PrimarySurface.DMW); if (SetupDevMode(&PrimarySurface.DMW, DisplayNumber)) { - PrimarySurface.hPDev = PrimarySurface.DriverFunctions.EnablePDEV( + PrimarySurface.dhpdev = PrimarySurface.DriverFunctions.EnablePDEV( &PrimarySurface.DMW, L"", HS_DDI_MAX, - PrimarySurface.FillPatterns, - sizeof(PrimarySurface.GDIInfo), - &PrimarySurface.GDIInfo, - sizeof(PrimarySurface.DevInfo), - &PrimarySurface.DevInfo, + PrimarySurface.ahsurf, + sizeof(PrimarySurface.gdiinfo), + &PrimarySurface.gdiinfo, + sizeof(PrimarySurface.devinfo), + &PrimarySurface.devinfo, NULL, L"", (HANDLE) (PrimarySurface.VideoFileObject->DeviceObject)); - DoDefault = (NULL == PrimarySurface.hPDev); + DoDefault = (NULL == PrimarySurface.dhpdev); if (DoDefault) { DPRINT1("DrvEnablePDev with registry parameters failed\n"); @@ -347,20 +347,20 @@ { RtlZeroMemory(&(PrimarySurface.DMW), sizeof(DEVMODEW)); PrimarySurface.DMW.dmSize = sizeof (PrimarySurface.DMW); - PrimarySurface.hPDev = PrimarySurface.DriverFunctions.EnablePDEV( + PrimarySurface.dhpdev = PrimarySurface.DriverFunctions.EnablePDEV( &PrimarySurface.DMW, L"", HS_DDI_MAX, - PrimarySurface.FillPatterns, - sizeof(PrimarySurface.GDIInfo), - &PrimarySurface.GDIInfo, - sizeof(PrimarySurface.DevInfo), - &PrimarySurface.DevInfo, + PrimarySurface.ahsurf, + sizeof(PrimarySurface.gdiinfo), + &PrimarySurface.gdiinfo, + sizeof(PrimarySurface.devinfo), + &PrimarySurface.devinfo, NULL, L"", (HANDLE) (PrimarySurface.VideoFileObject->DeviceObject)); - if (NULL == PrimarySurface.hPDev) + if (NULL == PrimarySurface.dhpdev) { ObDereferenceObject(PrimarySurface.VideoFileObject); DPRINT1("DrvEnablePDEV with default parameters failed\n"); @@ -369,10 +369,10 @@ } // Update the primary surface with what we really got - PrimarySurface.DMW.dmPelsWidth = PrimarySurface.GDIInfo.ulHorzRes; - PrimarySurface.DMW.dmPelsHeight = PrimarySurface.GDIInfo.ulVertRes; - PrimarySurface.DMW.dmBitsPerPel = PrimarySurface.GDIInfo.cBitsPixel; - PrimarySurface.DMW.dmDisplayFrequency = PrimarySurface.GDIInfo.ulVRefresh; + PrimarySurface.DMW.dmPelsWidth = PrimarySurface.gdiinfo.ulHorzRes; + PrimarySurface.DMW.dmPelsHeight = PrimarySurface.gdiinfo.ulVertRes; + PrimarySurface.DMW.dmBitsPerPel = PrimarySurface.gdiinfo.cBitsPixel; + PrimarySurface.DMW.dmDisplayFrequency = PrimarySurface.gdiinfo.ulVRefresh; } if (!PrimarySurface.DMW.dmDriverExtra) @@ -389,15 +389,15 @@ DPRINT1("**** DMW extra = %u bytes. Please report to ros-dev(a)reactos.org ****\n", PrimarySurface.DMW.dmDriverExtra); } - if (0 == PrimarySurface.GDIInfo.ulLogPixelsX) - { - DPRINT("Adjusting GDIInfo.ulLogPixelsX\n"); - PrimarySurface.GDIInfo.ulLogPixelsX = 96; - } - if (0 == PrimarySurface.GDIInfo.ulLogPixelsY) - { - DPRINT("Adjusting GDIInfo.ulLogPixelsY\n"); - PrimarySurface.GDIInfo.ulLogPixelsY = 96; + if (0 == PrimarySurface.gdiinfo.ulLogPixelsX) + { + DPRINT("Adjusting gdiinfo.ulLogPixelsX\n"); + PrimarySurface.gdiinfo.ulLogPixelsX = 96; + } + if (0 == PrimarySurface.gdiinfo.ulLogPixelsY) + { + DPRINT("Adjusting gdiinfo.ulLogPixelsY\n"); + PrimarySurface.gdiinfo.ulLogPixelsY = 96; } PrimarySurface.Pointer.Exclude.right = -1; @@ -406,7 +406,7 @@ /* Complete initialization of the physical device */ PrimarySurface.DriverFunctions.CompletePDEV( - PrimarySurface.hPDev, + PrimarySurface.dhpdev, (HDEV)&PrimarySurface); DPRINT("calling DRIVER_ReferenceDriver\n"); @@ -421,7 +421,7 @@ PrimarySurface.pvGammaRamp = NULL; PrimarySurface.ppdevNext = NULL; // Fixme! We need to support more than display drvs. PrimarySurface.ppdevParent = NULL; // Always NULL if primary. - PrimarySurface.pGraphicsDev = NULL; // Fixme! + PrimarySurface.pGraphicsDevice = NULL; // Fixme! PrimarySurface.pEDDgpl = ExAllocatePoolWithTag(PagedPool, sizeof(EDD_DIRECTDRAW_GLOBAL), TAG_EDDGBL); if (PrimarySurface.pEDDgpl) { @@ -519,17 +519,17 @@ DPRINT("calling EnableSurface\n"); /* Enable the drawing surface */ PrimarySurface.pSurface = - PrimarySurface.DriverFunctions.EnableSurface(PrimarySurface.hPDev); + PrimarySurface.DriverFunctions.EnableSurface(PrimarySurface.dhpdev); if (NULL == PrimarySurface.pSurface) { - /* PrimarySurface.DriverFunctions.AssertMode(PrimarySurface.hPDev, FALSE);*/ - PrimarySurface.DriverFunctions.DisablePDEV(PrimarySurface.hPDev); + /* PrimarySurface.DriverFunctions.AssertMode(PrimarySurface.dhpdev, FALSE);*/ + PrimarySurface.DriverFunctions.DisablePDEV(PrimarySurface.dhpdev); ObDereferenceObject(PrimarySurface.VideoFileObject); DPRINT1("DrvEnableSurface failed\n"); return FALSE; } - PrimarySurface.DriverFunctions.AssertMode(PrimarySurface.hPDev, TRUE); + PrimarySurface.DriverFunctions.AssertMode(PrimarySurface.dhpdev, TRUE); calledFromUser = UserIsEntered(); //fixme: possibly upgrade a shared lock if (!calledFromUser) @@ -541,7 +541,7 @@ IntAttachMonitor(&PrimarySurface, PrimarySurface.DisplayNumber); SurfObj = EngLockSurface(PrimarySurface.pSurface); - SurfObj->dhpdev = PrimarySurface.hPDev; + SurfObj->dhpdev = PrimarySurface.dhpdev; SurfSize = SurfObj->sizlBitmap; SurfaceRect.left = SurfaceRect.top = 0; SurfaceRect.right = SurfObj->sizlBitmap.cx; @@ -599,9 +599,9 @@ */ DPRINT("Reseting display\n" ); - PrimarySurface.DriverFunctions.AssertMode(PrimarySurface.hPDev, FALSE); - PrimarySurface.DriverFunctions.DisableSurface(PrimarySurface.hPDev); - PrimarySurface.DriverFunctions.DisablePDEV(PrimarySurface.hPDev); + PrimarySurface.DriverFunctions.AssertMode(PrimarySurface.dhpdev, FALSE); + PrimarySurface.DriverFunctions.DisableSurface(PrimarySurface.dhpdev); + PrimarySurface.DriverFunctions.DisablePDEV(PrimarySurface.dhpdev); PrimarySurface.PreparedDriver = FALSE; KeSetEvent(&VideoDriverNeedsPreparation, 1, FALSE); KeResetEvent(&VideoDriverPrepared); @@ -619,15 +619,15 @@ // Msdn DrvQueryFont: // If the number of fonts in DEVINFO is -1 and iFace is zero, the driver // should return the number of fonts it supports. - if ( pDevObj->DevInfo.cFonts == -1) + if ( pDevObj->devinfo.cFonts == -1) { if (pDevObj->DriverFunctions.QueryFont) - pDevObj->DevInfo.cFonts = - (ULONG)pDevObj->DriverFunctions.QueryFont(pDevObj->hPDev, 0, 0, &Junk); + pDevObj->devinfo.cFonts = + (ULONG)pDevObj->DriverFunctions.QueryFont(pDevObj->dhpdev, 0, 0, &Junk); else - pDevObj->DevInfo.cFonts = 0; - } - return pDevObj->DevInfo.cFonts; + pDevObj->devinfo.cFonts = 0; + } + return pDevObj->devinfo.cFonts; } // @@ -704,13 +704,13 @@ if ( pDevObj->flFlags & PDEV_DISPLAY) { - if (pDevObj->DevInfo.iDitherFormat == BMF_8BPP || - pDevObj->DevInfo.flGraphicsCaps2 & GCAPS2_CHANGEGAMMARAMP) + if (pDevObj->devinfo.iDitherFormat == BMF_8BPP || + pDevObj->devinfo.flGraphicsCaps2 & GCAPS2_CHANGEGAMMARAMP) ret = CM_GAMMA_RAMP; } - if (pDevObj->DevInfo.flGraphicsCaps & GCAPS_CMYKCOLOR) + if (pDevObj->devinfo.flGraphicsCaps & GCAPS_CMYKCOLOR) ret |= CM_CMYK_COLOR; - if (pDevObj->DevInfo.flGraphicsCaps & GCAPS_ICM) + if (pDevObj->devinfo.flGraphicsCaps & GCAPS_ICM) ret |= CM_DEVICE_ICM; return ret; } @@ -724,50 +724,50 @@ switch (Index) { case DRIVERVERSION: - ret = ppdev->GDIInfo.ulVersion; + ret = ppdev->gdiinfo.ulVersion; break; case TECHNOLOGY: - ret = ppdev->GDIInfo.ulTechnology; + ret = ppdev->gdiinfo.ulTechnology; break; case HORZSIZE: - ret = ppdev->GDIInfo.ulHorzSize; + ret = ppdev->gdiinfo.ulHorzSize; break; case VERTSIZE: - ret = ppdev->GDIInfo.ulVertSize; + ret = ppdev->gdiinfo.ulVertSize; break; case HORZRES: - ret = ppdev->GDIInfo.ulHorzRes; + ret = ppdev->gdiinfo.ulHorzRes; break; case VERTRES: - ret = ppdev->GDIInfo.ulVertRes; + ret = ppdev->gdiinfo.ulVertRes; break; case LOGPIXELSX: - ret = ppdev->GDIInfo.ulLogPixelsX; + ret = ppdev->gdiinfo.ulLogPixelsX; break; case LOGPIXELSY: - ret = ppdev->GDIInfo.ulLogPixelsY; + ret = ppdev->gdiinfo.ulLogPixelsY; break; case CAPS1: - if ( ppdev->pGraphicsDev && - (((PGRAPHICS_DEVICE)ppdev->pGraphicsDev)->StateFlags & + if ( ppdev->pGraphicsDevice && + (((PGRAPHICS_DEVICE)ppdev->pGraphicsDevice)->StateFlags & DISPLAY_DEVICE_MIRRORING_DRIVER)) ret = C1_MIRRORING; break; case BITSPIXEL: - ret = ppdev->GDIInfo.cBitsPixel; + ret = ppdev->gdiinfo.cBitsPixel; break; case PLANES: - ret = ppdev->GDIInfo.cPlanes; + ret = ppdev->gdiinfo.cPlanes; break; case NUMBRUSHES: @@ -775,7 +775,7 @@ break; case NUMPENS: - ret = ppdev->GDIInfo.ulNumColors; + ret = ppdev->gdiinfo.ulNumColors; if ( ret != -1 ) ret *= 5; break; @@ -784,19 +784,19 @@ break; case NUMCOLORS: - ret = ppdev->GDIInfo.ulNumColors; + ret = ppdev->gdiinfo.ulNumColors; break; case ASPECTX: - ret = ppdev->GDIInfo.ulAspectX; + ret = ppdev->gdiinfo.ulAspectX; break; case ASPECTY: - ret = ppdev->GDIInfo.ulAspectY; + ret = ppdev->gdiinfo.ulAspectY; break; case ASPECTXY: - ret = ppdev->GDIInfo.ulAspectXY; + ret = ppdev->gdiinfo.ulAspectXY; break; case CLIPCAPS: @@ -804,7 +804,7 @@ break; case SIZEPALETTE: - ret = ppdev->GDIInfo.ulNumPalReg; + ret = ppdev->gdiinfo.ulNumPalReg; break; case NUMRESERVED: @@ -812,25 +812,25 @@ break; case COLORRES: - ret = ppdev->GDIInfo.ulDACRed + - ppdev->GDIInfo.ulDACGreen + - ppdev->GDIInfo.ulDACBlue; + ret = ppdev->gdiinfo.ulDACRed + + ppdev->gdiinfo.ulDACGreen + + ppdev->gdiinfo.ulDACBlue; break; case DESKTOPVERTRES: - ret = ppdev->GDIInfo.ulVertRes; + ret = ppdev->gdiinfo.ulVertRes; break; case DESKTOPHORZRES: - ret = ppdev->GDIInfo.ulHorzRes; + ret = ppdev->gdiinfo.ulHorzRes; break; case BLTALIGNMENT: - ret = ppdev->GDIInfo.ulBltAlignment; + ret = ppdev->gdiinfo.ulBltAlignment; break; case SHADEBLENDCAPS: - ret = ppdev->GDIInfo.flShadeBlend; + ret = ppdev->gdiinfo.flShadeBlend; break; case COLORMGMTCAPS: @@ -838,27 +838,27 @@ break; case PHYSICALWIDTH: - ret = ppdev->GDIInfo.szlPhysSize.cx; + ret = ppdev->gdiinfo.szlPhysSize.cx; break; case PHYSICALHEIGHT: - ret = ppdev->GDIInfo.szlPhysSize.cy; + ret = ppdev->gdiinfo.szlPhysSize.cy; break; case PHYSICALOFFSETX: - ret = ppdev->GDIInfo.ptlPhysOffset.x; + ret = ppdev->gdiinfo.ptlPhysOffset.x; break; case PHYSICALOFFSETY: - ret = ppdev->GDIInfo.ptlPhysOffset.y; + ret = ppdev->gdiinfo.ptlPhysOffset.y; break; case VREFRESH: - ret = ppdev->GDIInfo.ulVRefresh; + ret = ppdev->gdiinfo.ulVRefresh; break; case RASTERCAPS: - ret = ppdev->GDIInfo.flRaster; + ret = ppdev->gdiinfo.flRaster; break; case CURVECAPS: @@ -877,8 +877,8 @@ break; case TEXTCAPS: - ret = ppdev->GDIInfo.flTextCaps; - if (ppdev->GDIInfo.ulTechnology) ret |= TC_VA_ABLE; + ret = ppdev->gdiinfo.flTextCaps; + if (ppdev->gdiinfo.ulTechnology) ret |= TC_VA_ABLE; ret |= (TC_SO_ABLE|TC_UA_ABLE); break; @@ -922,7 +922,7 @@ PDEVCAPS pDevCaps) { ULONG Tmp = 0; - PGDIINFO pGdiInfo = &pDevObj->GDIInfo; + PGDIINFO pGdiInfo = &pDevObj->gdiinfo; pDevCaps->ulVersion = pGdiInfo->ulVersion; pDevCaps->ulTechnology = pGdiInfo->ulTechnology; @@ -1056,7 +1056,7 @@ while (ppdev != NULL); IntGdiReleaseSemaphore(hsemDriverMgmt); if (!ppdev) return NULL; - return pGdiDevice->hPDev; + return pGdiDevice->dhpdev; } static NTSTATUS FASTCALL 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] Sun Aug 16 14:57:41 2009 @@ -287,7 +287,7 @@ else { // Destination palette obtained from the hDC - DDB_Palette = DC->ppdev->DevInfo.hpalDefault; + DDB_Palette = DC->ppdev->devinfo.hpalDefault; } ppalDDB = PALETTE_LockPalette(DDB_Palette); @@ -478,7 +478,7 @@ } /* Use destination palette obtained from the DC by default */ - DDBPalette = pDC->ppdev->DevInfo.hpalDefault; + DDBPalette = pDC->ppdev->devinfo.hpalDefault; /* Try to use hDIBPalette if it exists */ pSurf = pDC->dclevel.pSurface; @@ -654,7 +654,7 @@ hSourcePalette = psurf->hDIBPalette; if (!hSourcePalette) { - hSourcePalette = pPrimarySurface->DevInfo.hpalDefault; + hSourcePalette = pPrimarySurface->devinfo.hpalDefault; } ColorPtr = ((PBYTE)Info + Info->bmiHeader.biSize); Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Sun Aug 16 14:57:41 2009 @@ -918,7 +918,7 @@ ASSERT(psurf); hDestPalette = psurf->hDIBPalette; - if (!hDestPalette) hDestPalette = pPrimarySurface->DevInfo.hpalDefault; + if (!hDestPalette) hDestPalette = pPrimarySurface->devinfo.hpalDefault; PalDestGDI = PALETTE_LockPalette(hDestPalette); EXLATEOBJ_vInitialize(&exlo, &gpalRGB, PalDestGDI, 0, 0, 0); @@ -1113,7 +1113,7 @@ } hpal = dc->dclevel.pSurface->hDIBPalette; - if (!hpal) hpal = pPrimarySurface->DevInfo.hpalDefault; + if (!hpal) hpal = pPrimarySurface->devinfo.hpalDefault; ppal = PALETTE_ShareLockPalette(hpal); EXLATEOBJ_vInitialize(&exlo, &gpalRGB, ppal, 0, 0xffffff, 0); Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Sun Aug 16 14:57:41 2009 @@ -3386,7 +3386,7 @@ /* Create the xlateobj */ hDestPalette = psurf->hDIBPalette; - if (!hDestPalette) hDestPalette = pPrimarySurface->DevInfo.hpalDefault; + if (!hDestPalette) hDestPalette = pPrimarySurface->devinfo.hpalDefault; ppalDst = PALETTE_LockPalette(hDestPalette); EXLATEOBJ_vInitialize(&exloRGB2Dst, &gpalRGB, ppalDst, 0, 0, 0); EXLATEOBJ_vInitialize(&exloDst2RGB, ppalDst, &gpalRGB, 0, 0, 0); Modified: trunk/reactos/subsystems/win32/win32k/objects/icm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/icm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/icm.c [iso-8859-1] Sun Aug 16 14:57:41 2009 @@ -104,10 +104,10 @@ if (!(pGDev->flFlags & PDEV_DISPLAY )) return FALSE; - if ((pGDev->DevInfo.iDitherFormat == BMF_8BPP) || - (pGDev->DevInfo.iDitherFormat == BMF_16BPP) || - (pGDev->DevInfo.iDitherFormat == BMF_24BPP) || - (pGDev->DevInfo.iDitherFormat == BMF_32BPP)) + if ((pGDev->devinfo.iDitherFormat == BMF_8BPP) || + (pGDev->devinfo.iDitherFormat == BMF_16BPP) || + (pGDev->devinfo.iDitherFormat == BMF_24BPP) || + (pGDev->devinfo.iDitherFormat == BMF_32BPP)) { if (pGDev->flFlags & PDEV_GAMMARAMP_TABLE) RtlCopyMemory( Ramp, @@ -236,22 +236,22 @@ PALOBJ *palPtr; PPDEVOBJ pGDev = (PPDEVOBJ) hPDev; - if ((pGDev->DevInfo.iDitherFormat == BMF_8BPP) || - (pGDev->DevInfo.iDitherFormat == BMF_16BPP) || - (pGDev->DevInfo.iDitherFormat == BMF_24BPP) || - (pGDev->DevInfo.iDitherFormat == BMF_32BPP)) + if ((pGDev->devinfo.iDitherFormat == BMF_8BPP) || + (pGDev->devinfo.iDitherFormat == BMF_16BPP) || + (pGDev->devinfo.iDitherFormat == BMF_24BPP) || + (pGDev->devinfo.iDitherFormat == BMF_32BPP)) { if (pGDev->DriverFunctions.IcmSetDeviceGammaRamp) - return pGDev->DriverFunctions.IcmSetDeviceGammaRamp( pGDev->hPDev, + return pGDev->DriverFunctions.IcmSetDeviceGammaRamp( pGDev->dhpdev, IGRF_RGB_256WORDS, pGDev->pvGammaRamp); - if ( (pGDev->DevInfo.iDitherFormat != BMF_8BPP) || - !(pGDev->GDIInfo.flRaster & RC_PALETTE)) return FALSE; + if ( (pGDev->devinfo.iDitherFormat != BMF_8BPP) || + !(pGDev->gdiinfo.flRaster & RC_PALETTE)) return FALSE; if (!(pGDev->flFlags & PDEV_GAMMARAMP_TABLE)) return FALSE; - palGDI = PALETTE_LockPalette(pGDev->DevInfo.hpalDefault); + palGDI = PALETTE_LockPalette(pGDev->devinfo.hpalDefault); if(!palGDI) return FALSE; palPtr = (PALOBJ*) palGDI; @@ -266,7 +266,7 @@ // PALOBJ_cGetColors check mode flags and update Gamma Correction. // Set the HDEV to pal and go. palGDI->hPDev = hPDev; - Ret = pGDev->DriverFunctions.SetPalette(pGDev->hPDev, + Ret = pGDev->DriverFunctions.SetPalette(pGDev->dhpdev, palPtr, 0, 0, @@ -296,18 +296,18 @@ if (!(pGDev->flFlags & PDEV_DISPLAY )) return FALSE; - if ((pGDev->DevInfo.iDitherFormat == BMF_8BPP) || - (pGDev->DevInfo.iDitherFormat == BMF_16BPP) || - (pGDev->DevInfo.iDitherFormat == BMF_24BPP) || - (pGDev->DevInfo.iDitherFormat == BMF_32BPP)) + if ((pGDev->devinfo.iDitherFormat == BMF_8BPP) || + (pGDev->devinfo.iDitherFormat == BMF_16BPP) || + (pGDev->devinfo.iDitherFormat == BMF_24BPP) || + (pGDev->devinfo.iDitherFormat == BMF_32BPP)) { if (!pGDev->DriverFunctions.IcmSetDeviceGammaRamp) { // No driver support - if (!(pGDev->DevInfo.flGraphicsCaps2 & GCAPS2_CHANGEGAMMARAMP)) + if (!(pGDev->devinfo.flGraphicsCaps2 & GCAPS2_CHANGEGAMMARAMP)) { // Driver does not support Gamma Ramp, so test to see we // have BMF_8BPP only and palette operation support. - if ((pGDev->DevInfo.iDitherFormat != BMF_8BPP) || - !(pGDev->GDIInfo.flRaster & RC_PALETTE)) return FALSE; + if ((pGDev->devinfo.iDitherFormat != BMF_8BPP) || + !(pGDev->gdiinfo.flRaster & RC_PALETTE)) return FALSE; } } Modified: trunk/reactos/subsystems/win32/win32k/objects/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/palette.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/palette.c [iso-8859-1] Sun Aug 16 14:57:41 2009 @@ -916,7 +916,7 @@ } else { - Ret = dc->ppdev->GDIInfo.ulNumPalReg; + Ret = dc->ppdev->gdiinfo.ulNumPalReg; } } Modified: trunk/reactos/subsystems/win32/win32k/objects/wingl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/wingl.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/wingl.c [iso-8859-1] Sun Aug 16 14:57:41 2009 @@ -39,7 +39,7 @@ if (ppdev->DriverFunctions.DescribePixelFormat) { Ret = ppdev->DriverFunctions.DescribePixelFormat( - ppdev->hPDev, + ppdev->dhpdev, 1, 0, NULL); @@ -94,7 +94,7 @@ if (ppdev->DriverFunctions.DescribePixelFormat) { Ret = ppdev->DriverFunctions.DescribePixelFormat( - ppdev->hPDev, + ppdev->dhpdev, PixelFormat, sizeof(PIXELFORMATDESCRIPTOR), &pfdSafe);

1 0

[sginsberg] 42734: - Woops, NDIS_PHYSICAL_MEDIUM got lost somehow... and NDIS_MEDIUM belongs in ntddndis.h too
by sginsberg＠svn.reactos.org 16 Aug '09

16 Aug '09

Author: sginsberg Date: Sun Aug 16 14:53:31 2009 New Revision: 42734 URL: http://svn.reactos.org/svn/reactos?rev=42734&view=rev Log: - Woops, NDIS_PHYSICAL_MEDIUM got lost somehow... and NDIS_MEDIUM belongs in ntddndis.h too Modified: trunk/reactos/include/ddk/ndis.h trunk/reactos/include/ddk/ntddndis.h Modified: trunk/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=427… ============================================================================== --- trunk/reactos/include/ddk/ndis.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ndis.h [iso-8859-1] Sun Aug 16 14:53:31 2009 @@ -306,25 +306,6 @@ typedef struct _GEN_GET_NETCARD_TIME { ULONGLONG ReadTime; } GEN_GET_NETCARD_TIME, *PGEN_GET_NETCARD_TIME; - -/* NDIS driver medium (OID_GEN_MEDIA_SUPPORTED / OID_GEN_MEDIA_IN_USE) */ -typedef enum _NDIS_MEDIUM { - NdisMedium802_3, - NdisMedium802_5, - NdisMediumFddi, - NdisMediumWan, - NdisMediumLocalTalk, - NdisMediumDix, - NdisMediumArcnetRaw, - NdisMediumArcnet878_2, - NdisMediumAtm, - NdisMediumWirelessWan, - NdisMediumIrda, - NdisMediumBpc, - NdisMediumCoWan, - NdisMedium1394, - NdisMediumMax -} NDIS_MEDIUM, *PNDIS_MEDIUM; /* NDIS packet filter bits (OID_GEN_CURRENT_PACKET_FILTER) */ #define NDIS_PACKET_TYPE_DIRECTED 0x00000001 Modified: trunk/reactos/include/ddk/ntddndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddndis.h?rev… ============================================================================== --- trunk/reactos/include/ddk/ntddndis.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddndis.h [iso-8859-1] Sun Aug 16 14:53:31 2009 @@ -134,6 +134,50 @@ ULONG Flags; NDIS_PM_WAKE_UP_CAPABILITIES WakeUpCapabilities; } NDIS_PNP_CAPABILITIES, *PNDIS_PNP_CAPABILITIES; + +/* NDIS driver medium (OID_GEN_MEDIA_SUPPORTED / OID_GEN_MEDIA_IN_USE) */ +typedef enum _NDIS_MEDIUM { + NdisMedium802_3, + NdisMedium802_5, + NdisMediumFddi, + NdisMediumWan, + NdisMediumLocalTalk, + NdisMediumDix, + NdisMediumArcnetRaw, + NdisMediumArcnet878_2, + NdisMediumAtm, + NdisMediumWirelessWan, + NdisMediumIrda, + NdisMediumBpc, + NdisMediumCoWan, + NdisMedium1394, + NdisMediumMax +} NDIS_MEDIUM, *PNDIS_MEDIUM; + +typedef enum _NDIS_PHYSICAL_MEDIUM +{ + NdisPhysicalMediumUnspecified, + NdisPhysicalMediumWirelessLan, + NdisPhysicalMediumCableModem, + NdisPhysicalMediumPhoneLine, + NdisPhysicalMediumPowerLine, + NdisPhysicalMediumDSL, + NdisPhysicalMediumFibreChannel, + NdisPhysicalMedium1394, + NdisPhysicalMediumWirelessWan, + NdisPhysicalMediumNative802_11, + NdisPhysicalMediumBluetooth, + NdisPhysicalMediumInfiniband, + NdisPhysicalMediumWiMax, + NdisPhysicalMediumUWB, + NdisPhysicalMedium802_3, + NdisPhysicalMedium802_5, + NdisPhysicalMediumIrda, + NdisPhysicalMediumWiredWAN, + NdisPhysicalMediumWiredCoWan, + NdisPhysicalMediumOther, + NdisPhysicalMediumMax +} NDIS_PHYSICAL_MEDIUM, *PNDIS_PHYSICAL_MEDIUM; /* Required Object IDs (OIDs) */ #define OID_GEN_SUPPORTED_LIST 0x00010101

1 0

[sginsberg] 42733: - Fix ntstrsafe.h's dependency on debug.h
by sginsberg＠svn.reactos.org 16 Aug '09

16 Aug '09

Author: sginsberg Date: Sun Aug 16 14:42:18 2009 New Revision: 42733 URL: http://svn.reactos.org/svn/reactos?rev=42733&view=rev Log: - Fix ntstrsafe.h's dependency on debug.h Modified: trunk/reactos/include/ddk/ntstrsafe.h Modified: trunk/reactos/include/ddk/ntstrsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntstrsafe.h?re… ============================================================================== --- trunk/reactos/include/ddk/ntstrsafe.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntstrsafe.h [iso-8859-1] Sun Aug 16 14:42:18 2009 @@ -30,6 +30,10 @@ // Typedefs // typedef unsigned long DWORD; + +#ifndef UNIMPLEMENTED +#define UNIMPLEMENTED DbgPrint("WARNING: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__); +#endif /* PRIVATE FUNCTIONS *********************************************************/

1 0

[sginsberg] 42732: - Remove duplicate ntddndis.h in /psdk/ -- we already have it in /ddk/. Add the duplicated types to the DDK version. Also move NDIS_OBJECT_HEADER over to ntddndis.h from ndis.h as this is where it belongs. - Remove "ntdd1934.h" -- this header should be named ntdd1394.h. We already have a copy named so, but the old incompatible header wasn't removed.
by sginsberg＠svn.reactos.org 16 Aug '09

16 Aug '09

Author: sginsberg Date: Sun Aug 16 14:37:44 2009 New Revision: 42732 URL: http://svn.reactos.org/svn/reactos?rev=42732&view=rev Log: - Remove duplicate ntddndis.h in /psdk/ -- we already have it in /ddk/. Add the duplicated types to the DDK version. Also move NDIS_OBJECT_HEADER over to ntddndis.h from ndis.h as this is where it belongs. - Remove "ntdd1934.h" -- this header should be named ntdd1394.h. We already have a copy named so, but the old incompatible header wasn't removed. Removed: trunk/reactos/include/ddk/ntdd1934.h trunk/reactos/include/psdk/ntddndis.h Modified: trunk/reactos/include/ddk/ndis.h trunk/reactos/include/ddk/ntddndis.h Modified: trunk/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=427… ============================================================================== --- trunk/reactos/include/ddk/ndis.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ndis.h [iso-8859-1] Sun Aug 16 14:37:44 2009 @@ -849,12 +849,6 @@ typedef struct _NDIS_PACKET_EXTENSION { PVOID NdisPacketInfo[MaxPerPacketInfo]; } NDIS_PACKET_EXTENSION, *PNDIS_PACKET_EXTENSION; - -typedef struct _NDIS_OBJECT_HEADER { - UCHAR Type; - UCHAR Revision; - USHORT Size; -} NDIS_OBJECT_HEADER, *PNDIS_OBJECT_HEADER; typedef struct _NDIS_GENERIC_OBJECT { NDIS_OBJECT_HEADER Header; Removed: trunk/reactos/include/ddk/ntdd1934.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntdd1934.h?rev… ============================================================================== --- trunk/reactos/include/ddk/ntdd1934.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntdd1934.h (removed) @@ -1,47 +1,0 @@ - -#ifndef _NTDD1394_H_ -#define _NTDD1394_H_ - -#if (_MSC_VER >= 1020) -#pragma once -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct _IEEE1394_VDEV_PNP_REQUEST -{ - ULONG fulFlags; - ULONG Reserved; - ULARGE_INTEGER InstanceId; - UCHAR DeviceId; -} IEEE1394_VDEV_PNP_REQUEST,*PIEEE1394_VDEV_PNP_REQUEST; - - -typedef struct _IEEE1394_API_REQUEST -{ - ULONG RequestNumber; - ULONG Flags; - union - { - IEEE1394_VDEV_PNP_REQUEST AddVirtualDevice; - IEEE1394_VDEV_PNP_REQUEST RemoveVirtualDevice; - } u; -} IEEE1394_API_REQUEST, *PIEEE1394_API_REQUEST; - -#define IEEE1394_API_ADD_VIRTUAL_DEVICE 0x00000001 -#define IEEE1394_API_REMOVE_VIRTUAL_DEVICE 0x00000002 -#define IEEE1394_REQUEST_FLAG_UNICODE 0x00000001 -#define IEEE1394_REQUEST_FLAG_PERSISTENT 0x00000002 -#define IEEE1394_REQUEST_FLAG_USE_LOCAL_HOST_EUI 0x00000004 -#define BUS1394_VIRTUAL_DEVICE_LIST_KEY L"Virtual Device List" -#define BUS1394_LOCAL_HOST_INSTANCE_KEY L"LOCAL HOST EUI64" -#define IOCTL_IEEE1394_API_REQUEST CTL_CODE(FILE_DEVICE_UNKNOWN, 0x100, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#ifdef __cplusplus -} -#endif - -#endif - Modified: trunk/reactos/include/ddk/ntddndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddndis.h?rev… ============================================================================== --- trunk/reactos/include/ddk/ntddndis.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddndis.h [iso-8859-1] Sun Aug 16 14:37:44 2009 @@ -43,6 +43,81 @@ NdisDeviceStateD3, NdisDeviceStateMaximum } NDIS_DEVICE_POWER_STATE, *PNDIS_DEVICE_POWER_STATE; + +typedef enum _NDIS_802_11_NETWORK_INFRASTRUCTURE +{ + Ndis802_11IBSS, + Ndis802_11Infrastructure, + Ndis802_11AutoUnknown, + Ndis802_11InfrastructureMax +} NDIS_802_11_NETWORK_INFRASTRUCTURE, *PNDIS_802_11_NETWORK_INFRASTRUCTURE; + +typedef enum _NDIS_802_11_NETWORK_TYPE +{ + Ndis802_11FH, + Ndis802_11DS, + Ndis802_11OFDM5, + Ndis802_11OFDM24, + Ndis802_11Automode, + Ndis802_11NetworkTypeMax +} NDIS_802_11_NETWORK_TYPE, *PNDIS_802_11_NETWORK_TYPE; + +typedef struct _NDIS_OBJECT_HEADER +{ + UCHAR Type; + UCHAR Revision; + USHORT Size; +} NDIS_OBJECT_HEADER, *PNDIS_OBJECT_HEADER; + +#define NDIS_802_11_LENGTH_SSID 32 +#define NDIS_802_11_LENGTH_RATES 8 + +typedef UCHAR NDIS_802_11_MAC_ADDRESS[6]; +typedef LONG NDIS_802_11_RSSI; +typedef UCHAR NDIS_802_11_RATES[NDIS_802_11_LENGTH_RATES]; + +typedef struct _NDIS_802_11_SSID +{ + ULONG SsidLength; + UCHAR Ssid[NDIS_802_11_LENGTH_SSID]; +} NDIS_802_11_SSID, *PNDIS_802_11_SSID; + +typedef struct _NDIS_802_11_CONFIGURATION_FH +{ + ULONG Length; + ULONG HopPattern; + ULONG HopSet; + ULONG DwellTime; +} NDIS_802_11_CONFIGURATION_FH, *PNDIS_802_11_CONFIGURATION_FH; + +typedef struct _NDIS_802_11_CONFIGURATION +{ + ULONG Length; + ULONG BeaconPeriod; + ULONG ATIMWindow; + ULONG DSConfig; + NDIS_802_11_CONFIGURATION_FH FHConfig; +} NDIS_802_11_CONFIGURATION, *PNDIS_802_11_CONFIGURATION; + +typedef struct _NDIS_WLAN_BSSID +{ + ULONG Length; + NDIS_802_11_MAC_ADDRESS MacAddress; + UCHAR Reserved[2]; + NDIS_802_11_SSID Ssid; + ULONG Privacy; + NDIS_802_11_RSSI Rssi; + NDIS_802_11_NETWORK_TYPE NetworkTypeInUse; + NDIS_802_11_CONFIGURATION Configuration; + NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode; + NDIS_802_11_RATES SupportedRates; +} NDIS_WLAN_BSSID, *PNDIS_WLAN_BSSID; + +typedef struct _NDIS_802_11_BSSID_LIST +{ + ULONG NumberOfItems; + NDIS_WLAN_BSSID Bssid[1]; +} NDIS_802_11_BSSID_LIST, *PNDIS_802_11_BSSID_LIST; typedef struct _NDIS_PM_WAKE_UP_CAPABILITIES { NDIS_DEVICE_POWER_STATE MinMagicPacketWakeUp; @@ -146,6 +221,9 @@ #define OID_802_3_XMIT_TIMES_CRS_LOST 0x01020206 #define OID_802_3_XMIT_LATE_COLLISIONS 0x01020207 +#define OID_802_11_BSSID_LIST 0x0D010217 +#define OID_802_11_BSSID_LIST_SCAN 0x0D01011A + /* OID_GEN_MINIPORT_INFO constants */ #define NDIS_MINIPORT_BUS_MASTER 0x00000001 #define NDIS_MINIPORT_WDM_DRIVER 0x00000002 Removed: trunk/reactos/include/psdk/ntddndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntddndis.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntddndis.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntddndis.h (removed) @@ -1,129 +1,0 @@ -#ifndef _NTDDNDIS_ -#define _NTDDNDIS_ - -/* Defines */ -#define NDIS_802_11_LENGTH_SSID 32 -#define NDIS_802_11_LENGTH_RATES 8 - -#define OID_802_11_BSSID_LIST 0x0D010217 -#define OID_802_11_BSSID_LIST_SCAN 0x0D01011A - -/* Enumerations */ -typedef enum _NDIS_802_11_NETWORK_INFRASTRUCTURE -{ - Ndis802_11IBSS, - Ndis802_11Infrastructure, - Ndis802_11AutoUnknown, - Ndis802_11InfrastructureMax -} NDIS_802_11_NETWORK_INFRASTRUCTURE, *PNDIS_802_11_NETWORK_INFRASTRUCTURE; - -typedef enum _NDIS_802_11_NETWORK_TYPE -{ - Ndis802_11FH, - Ndis802_11DS, - Ndis802_11OFDM5, - Ndis802_11OFDM24, - Ndis802_11Automode, - Ndis802_11NetworkTypeMax -} NDIS_802_11_NETWORK_TYPE, *PNDIS_802_11_NETWORK_TYPE; - -/* Typedefs */ -typedef struct _NDIS_OBJECT_HEADER -{ - UCHAR Type; - UCHAR Revision; - USHORT Size; -} NDIS_OBJECT_HEADER, *PNDIS_OBJECT_HEADER; - -typedef UCHAR NDIS_802_11_MAC_ADDRESS[6]; -typedef LONG NDIS_802_11_RSSI; -typedef UCHAR NDIS_802_11_RATES[NDIS_802_11_LENGTH_RATES]; - -typedef struct _NDIS_802_11_SSID -{ - ULONG SsidLength; - UCHAR Ssid[NDIS_802_11_LENGTH_SSID]; -} NDIS_802_11_SSID, *PNDIS_802_11_SSID; - -typedef struct _NDIS_802_11_CONFIGURATION_FH -{ - ULONG Length; - ULONG HopPattern; - ULONG HopSet; - ULONG DwellTime; -} NDIS_802_11_CONFIGURATION_FH, *PNDIS_802_11_CONFIGURATION_FH; - -typedef struct _NDIS_802_11_CONFIGURATION -{ - ULONG Length; - ULONG BeaconPeriod; - ULONG ATIMWindow; - ULONG DSConfig; - NDIS_802_11_CONFIGURATION_FH FHConfig; -} NDIS_802_11_CONFIGURATION, *PNDIS_802_11_CONFIGURATION; - -typedef struct _NDIS_WLAN_BSSID -{ - ULONG Length; - NDIS_802_11_MAC_ADDRESS MacAddress; - UCHAR Reserved[2]; - NDIS_802_11_SSID Ssid; - ULONG Privacy; - NDIS_802_11_RSSI Rssi; - NDIS_802_11_NETWORK_TYPE NetworkTypeInUse; - NDIS_802_11_CONFIGURATION Configuration; - NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode; - NDIS_802_11_RATES SupportedRates; -} NDIS_WLAN_BSSID, *PNDIS_WLAN_BSSID; - -typedef struct _NDIS_802_11_BSSID_LIST -{ - ULONG NumberOfItems; - NDIS_WLAN_BSSID Bssid[1]; -} NDIS_802_11_BSSID_LIST, *PNDIS_802_11_BSSID_LIST; - -/* NDIS driver medium (OID_GEN_MEDIA_SUPPORTED / OID_GEN_MEDIA_IN_USE) */ -typedef enum _NDIS_MEDIUM { - NdisMedium802_3, - NdisMedium802_5, - NdisMediumFddi, - NdisMediumWan, - NdisMediumLocalTalk, - NdisMediumDix, - NdisMediumArcnetRaw, - NdisMediumArcnet878_2, - NdisMediumAtm, - NdisMediumWirelessWan, - NdisMediumIrda, - NdisMediumBpc, - NdisMediumCoWan, - NdisMedium1394, - NdisMediumMax -} NDIS_MEDIUM, *PNDIS_MEDIUM; - -typedef enum _NDIS_PHYSICAL_MEDIUM -{ - NdisPhysicalMediumUnspecified, - NdisPhysicalMediumWirelessLan, - NdisPhysicalMediumCableModem, - NdisPhysicalMediumPhoneLine, - NdisPhysicalMediumPowerLine, - NdisPhysicalMediumDSL, - NdisPhysicalMediumFibreChannel, - NdisPhysicalMedium1394, - NdisPhysicalMediumWirelessWan, - NdisPhysicalMediumNative802_11, - NdisPhysicalMediumBluetooth, - NdisPhysicalMediumInfiniband, - NdisPhysicalMediumWiMax, - NdisPhysicalMediumUWB, - NdisPhysicalMedium802_3, - NdisPhysicalMedium802_5, - NdisPhysicalMediumIrda, - NdisPhysicalMediumWiredWAN, - NdisPhysicalMediumWiredCoWan, - NdisPhysicalMediumOther, - NdisPhysicalMediumMax -} NDIS_PHYSICAL_MEDIUM, *PNDIS_PHYSICAL_MEDIUM; - -#endif

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