Ros-diffs October 2008

ros-diffs@reactos.org

25 participants
517 discussions

[cgutman] 36631: - Implement NdisMIndicateStatus

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Oct 3 04:49:37 2008 New Revision: 36631 URL: http://svn.reactos.org/svn/reactos?rev=36631&view=rev Log: - Implement NdisMIndicateStatus Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Fri Oct 3 04:49:37 2008 @@ -1126,7 +1126,7 @@ } /* - * @unimplemented + * @implemented */ #undef NdisMIndicateStatus VOID @@ -1137,7 +1137,29 @@ IN PVOID StatusBuffer, IN UINT StatusBufferSize) { - UNIMPLEMENTED + PLOGICAL_ADAPTER Adapter = MiniportAdapterHandle; + PLIST_ENTRY CurrentEntry; + PADAPTER_BINDING AdapterBinding; + KIRQL OldIrql; + + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + + CurrentEntry = Adapter->ProtocolListHead.Flink; + + while (CurrentEntry != &Adapter->ProtocolListHead) + { + AdapterBinding = CONTAINING_RECORD(CurrentEntry, ADAPTER_BINDING, AdapterListEntry); + + (*AdapterBinding->ProtocolBinding->Chars.StatusHandler)( + AdapterBinding->NdisOpenBlock.ProtocolBindingContext, + GeneralStatus, + StatusBuffer, + StatusBufferSize); + + CurrentEntry = CurrentEntry->Flink; + } + + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); } /*

16 years, 2 months

[cfinck] 36630: - Add the other CPU_* codes (got them from a PDB) - Restructure the CPU vendor check in KiGetFeatureBits with a switch statement - Enable experimental support for Cyrix, Transmeta, Centaur and Rise CPUs (experimental = mostly untested) - Just add CMPXCHG8B support to the feature bits for Centaur CPUs like it's already done for Rise CPUs without touching any MSRs. The instruction already works properly by default according to two official Centaur datasheets. Also Geoz on IRC alrea

by cfinck＠svn.reactos.org

Author: cfinck Date: Thu Oct 2 16:57:36 2008 New Revision: 36630 URL: http://svn.reactos.org/svn/reactos?rev=36630&view=rev Log: - Add the other CPU_* codes (got them from a PDB) - Restructure the CPU vendor check in KiGetFeatureBits with a switch statement - Enable experimental support for Cyrix, Transmeta, Centaur and Rise CPUs (experimental = mostly untested) - Just add CMPXCHG8B support to the feature bits for Centaur CPUs like it's already done for Rise CPUs without touching any MSRs. The instruction already works properly by default according to two official Centaur datasheets. Also Geoz on IRC already reported that his C3 Nehemiah works with ReactOS after this patch. - Enable the 3DNow detection code through extended CPUID also for Centaur CPUs (all CPUs from IDT WinChip C6 to VIA C3 Ezra-T supported it) - Report the presence of AMD K6 MTRRs also for mobile AMD K6-2+/K6-III+ CPUs (model D) Modified: trunk/reactos/include/ndk/asm.h trunk/reactos/ntoskrnl/ke/i386/cpu.c Modified: trunk/reactos/include/ndk/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/asm.h?rev=3663… ============================================================================== --- trunk/reactos/include/ndk/asm.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/asm.h [iso-8859-1] Thu Oct 2 16:57:36 2008 @@ -40,8 +40,14 @@ // // CPU Types // +#define CPU_NONE 0x0 #define CPU_INTEL 0x1 #define CPU_AMD 0x2 +#define CPU_CYRIX 0x3 +#define CPU_TRANSMETA 0x4 +#define CPU_CENTAUR 0x5 +#define CPU_RISE 0x6 +#define CPU_UNKNOWN 0x7 // // Selector Names Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Thu Oct 2 16:57:36 2008 @@ -216,23 +216,23 @@ } else if (!strcmp(Prcb->VendorString, CmpCyrixID)) { - DPRINT1("Cyrix CPUs not fully supported\n"); - return 0; + DPRINT1("Cyrix CPU support not fully tested!\n"); + return CPU_CYRIX; } else if (!strcmp(Prcb->VendorString, CmpTransmetaID)) { - DPRINT1("Transmeta CPUs not fully supported\n"); - return 0; + DPRINT1("Transmeta CPU support not fully tested!\n"); + return CPU_TRANSMETA; } else if (!strcmp(Prcb->VendorString, CmpCentaurID)) { - DPRINT1("VIA CPUs not fully supported\n"); - return 0; + DPRINT1("Centaur CPU support not fully tested!\n"); + return CPU_CENTAUR; } else if (!strcmp(Prcb->VendorString, CmpRiseID)) { - DPRINT1("Rise CPUs not fully supported\n"); - return 0; + DPRINT1("Rise CPU support not fully tested!\n"); + return CPU_RISE; } /* Invalid CPU */ @@ -262,136 +262,121 @@ /* Set the initial APIC ID */ Prcb->InitialApicId = (UCHAR)(Reg[1] >> 24); - /* Check for AMD CPU */ - if (Vendor == CPU_AMD) - { - /* Check if this is a K5 or higher. */ - if ((Reg[0] & 0x0F00) >= 0x0500) - { - /* Check if this is a K5 specifically. */ + switch (Vendor) + { + /* Intel CPUs */ + case CPU_INTEL: + /* Check if it's a P6 */ + if (Prcb->CpuType == 6) + { + /* Perform the special sequence to get the MicroCode Signature */ + WRMSR(0x8B, 0); + CPUID(Reg, 1); + Prcb->UpdateSignature.QuadPart = RDMSR(0x8B); + } + else if (Prcb->CpuType == 5) + { + /* On P5, enable workaround for the LOCK errata. */ + KiI386PentiumLockErrataPresent = TRUE; + } + + /* Check for broken P6 with bad SMP PTE implementation */ + if (((Reg[0] & 0x0FF0) == 0x0610 && (Reg[0] & 0x000F) <= 0x9) || + ((Reg[0] & 0x0FF0) == 0x0630 && (Reg[0] & 0x000F) <= 0x4)) + { + /* Remove support for correct PTE support. */ + FeatureBits &= ~KF_WORKING_PTE; + } + + /* Check if the CPU is too old to support SYSENTER */ + if ((Prcb->CpuType < 6) || + ((Prcb->CpuType == 6) && (Prcb->CpuStep < 0x0303))) + { + /* Disable it */ + Reg[3] &= ~0x800; + } + + /* Set the current features */ + CpuFeatures = Reg[3]; + + break; + + /* AMD CPUs */ + case CPU_AMD: + + /* Check if this is a K5 or K6. (family 5) */ if ((Reg[0] & 0x0F00) == 0x0500) { /* Get the Model Number */ switch (Reg[0] & 0x00F0) { - /* Check if this is the Model 1 */ + /* Model 1: K5 - 5k86 (initial models) */ case 0x0010: /* Check if this is Step 0 or 1. They don't support PGE */ if ((Reg[0] & 0x000F) > 0x03) break; + /* Model 0: K5 - SSA5 */ case 0x0000: /* Model 0 doesn't support PGE at all. */ Reg[3] &= ~0x2000; break; + /* Model 8: K6-2 */ case 0x0080: /* K6-2, Step 8 and over have support for MTRR. */ if ((Reg[0] & 0x000F) >= 0x8) FeatureBits |= KF_AMDK6MTRR; break; + /* Model 9: K6-III + Model D: K6-2+, K6-III+ */ case 0x0090: - - /* As does the K6-3 */ + case 0x00D0: + FeatureBits |= KF_AMDK6MTRR; - break; - - default: break; } } - } - else - { - /* Families below 5 don't support PGE, PSE or CMOV at all */ - Reg[3] &= ~(0x08 | 0x2000 | 0x8000); - - /* They also don't support advanced CPUID functions. */ - ExtendedCPUID = FALSE; - } - - /* Set the current features */ - CpuFeatures = Reg[3]; - } - - /* Now check if this is Intel */ - if (Vendor == CPU_INTEL) - { - /* Check if it's a P6 */ - if (Prcb->CpuType == 6) - { - /* Perform the special sequence to get the MicroCode Signature */ - WRMSR(0x8B, 0); - CPUID(Reg, 1); - Prcb->UpdateSignature.QuadPart = RDMSR(0x8B); - } - else if (Prcb->CpuType == 5) - { - /* On P5, enable workaround for the LOCK errata. */ - KiI386PentiumLockErrataPresent = TRUE; - } - - /* Check for broken P6 with bad SMP PTE implementation */ - if (((Reg[0] & 0x0FF0) == 0x0610 && (Reg[0] & 0x000F) <= 0x9) || - ((Reg[0] & 0x0FF0) == 0x0630 && (Reg[0] & 0x000F) <= 0x4)) - { - /* Remove support for correct PTE support. */ - FeatureBits &= ~KF_WORKING_PTE; - } - - /* Check if the CPU is too old to support SYSENTER */ - if ((Prcb->CpuType < 6) || - ((Prcb->CpuType == 6) && (Prcb->CpuStep < 0x0303))) - { - /* Disable it */ - Reg[3] &= ~0x800; - } - - /* Set the current features */ - CpuFeatures = Reg[3]; - } - -#ifdef CPU_TRANSMETA - if (Vendor == CPU_TRANSMETA) - { - /* Enable CMPXCHG8B if the family (>= 5), model and stepping (>= 4.2) support it */ - if ((Reg[0] & 0x0F00) >= 0x0500 && (Reg[0] & 0x00FF) >= 0x0042) - { - WRMSR(0x80860004, RDMSR(0x80860004) | 0x0100); - FeatureBits |= KF_CMPXCHG8B; - } - } -#endif - -#ifdef CPU_CENTAUR - if (Vendor == CPU_CENTAUR) - { - /* If CMPXCHG8B is not detected, try to enable it */ - if (!(CpuFeatures & 0x00000100)) - { - if ((Reg[0] & 0x0F00) == 0x0500) + else if((Reg[0] & 0x0F00) < 0x0500) { - WRMSR(0x0107, RDMSR(0x0107) | 0x02); + /* Families below 5 don't support PGE, PSE or CMOV at all */ + Reg[3] &= ~(0x08 | 0x2000 | 0x8000); + + /* They also don't support advanced CPUID functions. */ + ExtendedCPUID = FALSE; + } + + /* Set the current features */ + CpuFeatures = Reg[3]; + + break; + + /* Cyrix CPUs */ + case CPU_CYRIX: + break; + + /* Transmeta CPUs */ + case CPU_TRANSMETA: + /* Enable CMPXCHG8B if the family (>= 5), model and stepping (>= 4.2) support it */ + if ((Reg[0] & 0x0FFF) >= 0x0542) + { + WRMSR(0x80860004, RDMSR(0x80860004) | 0x0100); FeatureBits |= KF_CMPXCHG8B; } - else if ((Reg[0] & 0x0F00) >= 0x0600) - { - WRMSR(0x1107, (RDMSR(0x1107) | 0x02) & ~((LONGLONG)0x01)); - FeatureBits |= KF_CMPXCHG8B; - } - } - } -#endif - -#ifdef CPU_RISE - if (Vendor == CPU_RISE) - { - /* Windows Vista assumes CMPXCHG8B is always supported on Rise */ - FeatureBits |= KF_CMPXCHG8B; - } -#endif + + break; + + /* Centaur, IDT, Rise and VIA CPUs */ + case CPU_CENTAUR: + case CPU_RISE: + /* These CPUs don't report the presence of CMPXCHG8B through CPUID. + However, this feature exists and operates properly without any additional steps. */ + FeatureBits |= KF_CMPXCHG8B; + + break; + } /* Convert all CPUID Feature bits into our format */ if (CpuFeatures & 0x00000002) FeatureBits |= KF_V86_VIS | KF_CR4; @@ -446,6 +431,7 @@ switch (Vendor) { case CPU_AMD: + case CPU_CENTAUR: if (Reg[3] & 0x80000000) FeatureBits |= KF_3DNOW; break; }

16 years, 2 months

[sginsberg] 36629: - Preliminary work on win32k's internal headers

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Thu Oct 2 14:39:28 2008 New Revision: 36629 URL: http://svn.reactos.org/svn/reactos?rev=36629&view=rev Log: - Preliminary work on win32k's internal headers Added: branches/nwin32/subsystems/win32/win32k/include/engobj.h (with props) branches/nwin32/subsystems/win32/win32k/include/gdiobj.h (with props) branches/nwin32/subsystems/win32/win32k/include/userobj.h (with props) branches/nwin32/subsystems/win32/win32k/include/win32kp.h (with props) Modified: branches/nwin32/subsystems/win32/win32k/include/win32k.h Added: branches/nwin32/subsystems/win32/win32k/include/engobj.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/include/engobj.h (added) +++ branches/nwin32/subsystems/win32/win32k/include/engobj.h [iso-8859-1] Thu Oct 2 14:39:28 2008 @@ -1,0 +1,55 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/include/engobj.h + * PURPOSE: Eng* Structures + * PROGRAMMERS: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ + +#ifndef _WIN32K_ENGOBJ_H +#define _WIN32K_ENGOBJ_H + +//#define PAL_INDEXED 0x000001 +//#define PAL_BITFIELDS 0x000002 +//#define PAL_RGB 0x000004 +//#define PAL_BGR 0x000008 +//#define PAL_CMYK 0x000010 +#define PAL_DC 0x000100 +#define PAL_FIXED 0x000200 +#define PAL_FREE 0x000400 +#define PAL_MANAGED 0x000800 +#define PAL_NOSTATIC 0x001000 +#define PAL_MONOCHROME 0x002000 +#define PAL_BRUSHHACK 0x004000 +#define PAL_DIBSECTION 0x008000 +#define PAL_HT 0x100000 +#define PAL_RGB16_555 0x200000 +#define PAL_RGB16_565 0x400000 +#define PAL_GAMMACORRECTION 0x800000 + +typedef unsigned long HDEVPPAL; + +typedef struct _EPALOBJ +{ + BASEOBJECT BaseObject; + FLONG flPal; + ULONG cEntries; + ULONG ulUnique; + HDC hdcHead; + HDEVPPAL hSelected; + ULONG cRefhpal; + ULONG cRefRegular; + PVOID ptransFore; // PTRANSLATE + PVOID ptransCurrent; // PTRANSLATE + PVOID ptransOld; // PTRANSLATE + ULONG unk_038; + PFN pfnGetNearest; + PFN pfnGetMatch; + ULONG ulRGBTime; + struct _PRGB555XL *pRGBXlate; + PALETTEENTRY *pFirstColor; // 0x4c, this->apalColors, attention!! Yuan is wrong here + struct _EPALOBJ *pPalette; // 0x50, this, attention!! Yuan is wrong here + PALETTEENTRY apalColors[1]; +} EPALOBJ, *PEPALOBJ; + +#endif // _WIN32K_ENGOBJ_H Propchange: branches/nwin32/subsystems/win32/win32k/include/engobj.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/nwin32/subsystems/win32/win32k/include/gdiobj.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/include/gdiobj.h (added) +++ branches/nwin32/subsystems/win32/win32k/include/gdiobj.h [iso-8859-1] Thu Oct 2 14:39:28 2008 @@ -1,0 +1,105 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/include/gdiobj.h + * PURPOSE: GDI Structures + * PROGRAMMERS: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ + +#ifndef _WIN32K_GDIOBJ_H +#define _WIN32K_GDIOBJ_H + +typedef struct _BASEOBJECT +{ + HGDIOBJ hHmgr; + ULONG ulShareCount; + USHORT cExclusiveLock; + USHORT BaseFlags; + struct _PW32THREAD *Tid; +} BASEOBJECT, *POBJ; + +typedef struct _GDIBRUSHOBJ +{ + BASEOBJECT BaseObject; + ULONG ulStyle; + HBITMAP hbmPattern; + HANDLE hbmClient; + FLONG flAttrs; + ULONG ulBrushUnique; + BRUSH_ATTR *pBrushAttr; + BRUSH_ATTR BrushAttr; + POINT ptOrigin; + ULONG bCacheGrabbed; + COLORREF crBack; + COLORREF crFore; + ULONG ulPalTime; + ULONG ulSurfTime; + PVOID ulRealization; + ULONG Unknown4C[3]; + POINT ptPenWidth; + ULONG ulPenStyle; + DWORD *pStyle; + DWORD dwStyleCount; + ULONG Unknown6C; +} GDIBRUSHOBJ, *PGDIBRUSHOBJ; + +// EXtended CLip and Window Region Object +// Multipurpose E/X/CLIPOBJ and E/WNDOBJ structure +typedef struct _XCLIPOBJ +{ + WNDOBJ exClipWnd; + PVOID pClipRgn; + RECTL rclClipRgn; + PVOID pscanClipRgn; + DWORD cScans; + DWORD Unknown1; + ULONG ulBSize; + LONG lscnSize; + ULONG ulObjSize; + ULONG iDirection; + ULONG ClipType; + DWORD Unknown2; + LONG lUpDown; + DWORD Unknown3; + BOOL ShouldDoAll; + DWORD nComplexity; + PVOID pUnknown; +} XCLIPOBJ, *PXCLIPOBJ; + +typedef struct _SCAN +{ + LONG scnPntCnt; + LONG scnPntTop; + LONG scnPntBottom; + LONG scnPntX[2]; +} SCAN, *PSCAN; + +typedef struct _SCAN1 +{ + LONG scnPntCnt; + struct _SCAN2 *scnPnt[3]; + LONG scnPntCntToo; +} SCAN1, *PSCAN1; + +typedef struct _SCAN2 +{ + LONG scnPntTop; + LONG scnPntBottom; + LONG scnPntX[2]; +} SCAN2, *PSCAN2; + +typedef struct _REGION +{ + BASEOBJECT BaseObject; + unsigned sizeObj; + ULONG iUniq; // from Clip object + DWORD nRefCount; // inc/dec Ref count if 0 deleteRGNOBJ + PSCAN pscnTail; + unsigned sizeRgn; + unsigned cScans; + RECTL rcl; + SCAN scnHead1[1]; + SCAN1 scnHead2[1]; +} REGION, *PREGION; + +#endif // _WIN32K_GDIOBJ_H Propchange: branches/nwin32/subsystems/win32/win32k/include/gdiobj.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/nwin32/subsystems/win32/win32k/include/userobj.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/include/userobj.h (added) +++ branches/nwin32/subsystems/win32/win32k/include/userobj.h [iso-8859-1] Thu Oct 2 14:39:28 2008 @@ -1,0 +1,69 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/include/userobj.h + * PURPOSE: User Structures + * PROGRAMMERS: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ + +#ifndef _WIN32K_USEROBJ_H +#define _WIN32K_USEROBJ_H + +// +// W32PROCESS Flags +// +#define W32PF_CONSOLEAPPLICATION 0x00000001 +#define W32PF_FORCEOFFFEEDBACK 0x00000002 +#define W32PF_STARTGLASS 0x00000004 +#define W32PF_WOW 0x00000008 +#define W32PF_READSCREENACCESSGRANTED 0x00000010 +#define W32PF_INITIALIZED 0x00000020 +#define W32PF_APPSTARTING 0x00000040 +#define W32PF_WOW64 0x00000080 +#define W32PF_ALLOWFOREGROUNDACTIVATE 0x00000100 +#define W32PF_OWNDCCLEANUP 0x00000200 +#define W32PF_SHOWSTARTGLASSCALLED 0x00000400 +#define W32PF_FORCEBACKGROUNDPRIORITY 0x00000800 +#define W32PF_TERMINATED 0x00001000 +#define W32PF_CLASSESREGISTERED 0x00002000 +#define W32PF_THREADCONNECTED 0x00004000 +#define W32PF_PROCESSCONNECTED 0x00008000 +#define W32PF_WAKEWOWEXEC 0x00010000 +#define W32PF_WAITFORINPUTIDLE 0x00020000 +#define W32PF_IOWINSTA 0x00040000 +#define W32PF_CONSOLEFOREGROUND 0x00080000 +#define W32PF_OLELOADED 0x00100000 +#define W32PF_SCREENSAVER 0x00200000 +#define W32PF_IDLESCREENSAVER 0x00400000 + +typedef struct _W32THREAD +{ + PETHREAD peThread; + ULONG RefCount; + PVOID ptlW32; //FIXME: PTL? + PVOID pgdiDcattr; + PVOID pgdiBrushAttr; + PVOID pUMPDObjs; + PVOID pUMPDHeap; + DWORD dwEngAcquireCount; + PVOID pSemTable; + PVOID pUMPDObj; +} W32THREAD, *PW32THREAD; + +typedef struct _W32PROCESS +{ + PEPROCESS peProcess; + ULONG RefCount; + FLONG W32PF_flags; + ULONG InputIdleEvent; + ULONG StartCursorHideTime; + ULONG NextStart; + PVOID pDCAttrList; + PVOID pBrushAttrList; + ULONG W32Pid; + ULONG GDIHandleCount; + ULONG UserHandleCount; + ULONG Unknown[19]; +} W32PROCESS, *PW32PROCESS; + +#endif // _WIN32K_USEROBJ_H Propchange: branches/nwin32/subsystems/win32/win32k/include/userobj.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/nwin32/subsystems/win32/win32k/include/win32k.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/include/win32k.h [iso-8859-1] (original) +++ branches/nwin32/subsystems/win32/win32k/include/win32k.h [iso-8859-1] Thu Oct 2 14:39:28 2008 @@ -70,5 +70,9 @@ #include <win32k/ntusrtyp.h> #include <win32k/ntuser.h> #include <win32k/ntgdityp.h> +#include <win32k/ntgdihdl.h> #define LANGPACK #include <psdk/ntgdi.h> + +/* Internal Win32K Header */ +#include <win32kp.h> Added: branches/nwin32/subsystems/win32/win32k/include/win32kp.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/include/win32kp.h (added) +++ branches/nwin32/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] Thu Oct 2 14:39:28 2008 @@ -1,0 +1,27 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Win32K + * FILE: subsystems/win32/win32k/include/win32kp.h + * PURPOSE: Internal Win32K Header + * PROGRAMMER: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ + +#ifndef _INCLUDE_INTERNAL_WIN32K_H +#define _INCLUDE_INTERNAL_WIN32K_H + +/* INCLUDES ******************************************************************/ + +/* Prototypes */ +NTSTATUS +APIENTRY +NtGdiFlushUserBatch( + VOID +); + +/* Internal Win32K Headers */ +#include <gdiobj.h> +#include <engobj.h> +#include <userobj.h> + + +#endif Propchange: branches/nwin32/subsystems/win32/win32k/include/win32kp.h ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 2 months

[sginsberg] 36628: - Clean up ntuser.h and review all NtUser* prototypes. Fixed parameters and return types where I could, and added VERIFY tags for stuff needing more research. Untagged routines should now be compatible, or properly mark unknown fields as unknown instead of having ros-specific stuff there - Move types into ntusrtyp.h - Disable user32 code which used incompatible types/routines - Remove PrivateCsrssManualGuiCheck and PrivateCsrssInitialized exports

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Thu Oct 2 12:55:06 2008 New Revision: 36628 URL: http://svn.reactos.org/svn/reactos?rev=36628&view=rev Log: - Clean up ntuser.h and review all NtUser* prototypes. Fixed parameters and return types where I could, and added VERIFY tags for stuff needing more research. Untagged routines should now be compatible, or properly mark unknown fields as unknown instead of having ros-specific stuff there - Move types into ntusrtyp.h - Disable user32 code which used incompatible types/routines - Remove PrivateCsrssManualGuiCheck and PrivateCsrssInitialized exports Modified: branches/nwin32/dll/win32/user32/controls/regcontrol.c branches/nwin32/dll/win32/user32/controls/scrollbar.c branches/nwin32/dll/win32/user32/include/user32.h branches/nwin32/dll/win32/user32/include/user32p.h branches/nwin32/dll/win32/user32/misc/dllmain.c branches/nwin32/dll/win32/user32/misc/misc.c branches/nwin32/dll/win32/user32/misc/winsta.c branches/nwin32/dll/win32/user32/user32.def branches/nwin32/dll/win32/user32/windows/cursor.c branches/nwin32/dll/win32/user32/windows/defwnd.c branches/nwin32/dll/win32/user32/windows/hook.c branches/nwin32/dll/win32/user32/windows/input.c branches/nwin32/dll/win32/user32/windows/menu.c branches/nwin32/dll/win32/user32/windows/message.c branches/nwin32/dll/win32/user32/windows/nonclient.c branches/nwin32/dll/win32/user32/windows/paint.c branches/nwin32/dll/win32/user32/windows/window.c branches/nwin32/include/reactos/win32k/ntuser.h branches/nwin32/include/reactos/win32k/ntusrtyp.h branches/nwin32/subsystems/win32/win32k/ntuser/accel.c branches/nwin32/subsystems/win32/win32k/ntuser/class.c branches/nwin32/subsystems/win32/win32k/ntuser/clipboard.c branches/nwin32/subsystems/win32/win32k/ntuser/colors.c branches/nwin32/subsystems/win32/win32k/ntuser/cursor.c branches/nwin32/subsystems/win32/win32k/ntuser/display.c branches/nwin32/subsystems/win32/win32k/ntuser/hooks.c branches/nwin32/subsystems/win32/win32k/ntuser/ime.c branches/nwin32/subsystems/win32/win32k/ntuser/input.c branches/nwin32/subsystems/win32/win32k/ntuser/keyboard.c branches/nwin32/subsystems/win32/win32k/ntuser/menu.c branches/nwin32/subsystems/win32/win32k/ntuser/message.c branches/nwin32/subsystems/win32/win32k/ntuser/misc.c branches/nwin32/subsystems/win32/win32k/ntuser/mouse.c branches/nwin32/subsystems/win32/win32k/ntuser/objects.c branches/nwin32/subsystems/win32/win32k/ntuser/painting.c branches/nwin32/subsystems/win32/win32k/ntuser/scroll.c branches/nwin32/subsystems/win32/win32k/ntuser/thread.c branches/nwin32/subsystems/win32/win32k/ntuser/window.c branches/nwin32/subsystems/win32/win32k/ntuser/winsta.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/nwin32/dll/win32/user32/controls/regcontrol.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/control… Modified: branches/nwin32/dll/win32/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/control… Modified: branches/nwin32/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/include… Modified: branches/nwin32/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/include… Modified: branches/nwin32/dll/win32/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/misc/dl… Modified: branches/nwin32/dll/win32/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/misc/mi… Modified: branches/nwin32/dll/win32/user32/misc/winsta.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/misc/wi… Modified: branches/nwin32/dll/win32/user32/user32.def URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/user32.… Modified: branches/nwin32/dll/win32/user32/windows/cursor.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/windows… Modified: branches/nwin32/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/windows… Modified: branches/nwin32/dll/win32/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/windows… Modified: branches/nwin32/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/windows… Modified: branches/nwin32/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/windows… Modified: branches/nwin32/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/windows… Modified: branches/nwin32/dll/win32/user32/windows/nonclient.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/windows… Modified: branches/nwin32/dll/win32/user32/windows/paint.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/windows… Modified: branches/nwin32/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/user32/windows… Modified: branches/nwin32/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/include/reactos/win32k/n… Modified: branches/nwin32/include/reactos/win32k/ntusrtyp.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/include/reactos/win32k/n… Modified: branches/nwin32/subsystems/win32/win32k/ntuser/accel.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Modified: branches/nwin32/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Modified: branches/nwin32/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Modified: branches/nwin32/subsystems/win32/win32k/ntuser/colors.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Modified: branches/nwin32/subsystems/win32/win32k/ntuser/cursor.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Modified: branches/nwin32/subsystems/win32/win32k/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Modified: branches/nwin32/subsystems/win32/win32k/ntuser/hooks.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Modified: branches/nwin32/subsystems/win32/win32k/ntuser/ime.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Modified: branches/nwin32/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Modified: branches/nwin32/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Modified: branches/nwin32/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Modified: branches/nwin32/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Modified: branches/nwin32/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Modified: branches/nwin32/subsystems/win32/win32k/ntuser/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Modified: branches/nwin32/subsystems/win32/win32k/ntuser/objects.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Modified: branches/nwin32/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Modified: branches/nwin32/subsystems/win32/win32k/ntuser/scroll.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Modified: branches/nwin32/subsystems/win32/win32k/ntuser/thread.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Modified: branches/nwin32/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Modified: branches/nwin32/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/…

16 years, 2 months

[janderwald] 36627: - Fix a bug in _ILCreateNetConnect - Add IQueryInfo interface

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Oct 2 12:32:51 2008 New Revision: 36627 URL: http://svn.reactos.org/svn/reactos?rev=36627&view=rev Log: - Fix a bug in _ILCreateNetConnect - Add IQueryInfo interface Modified: trunk/reactos/dll/win32/netshell/enumlist.c trunk/reactos/dll/win32/netshell/shfldr_netconnect.c Modified: trunk/reactos/dll/win32/netshell/enumlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/enumlis… ============================================================================== --- trunk/reactos/dll/win32/netshell/enumlist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/enumlist.c [iso-8859-1] Thu Oct 2 12:32:51 2008 @@ -287,16 +287,12 @@ { LPITEMIDLIST pidlOut; - pidlOut = _ILAlloc(PT_GUID, sizeof(GUIDStruct)); + pidlOut = _ILAlloc(PT_GUID, sizeof(PIDLDATA)); if (pidlOut) { LPPIDLDATA pData = _ILGetDataPointer(pidlOut); memcpy(&(pData->u.guid.guid), &CLSID_NetworkConnections, sizeof(GUID)); - } - else - { - pidlOut = NULL; } return pidlOut; } @@ -328,18 +324,9 @@ { LPITEMIDLIST pidl; LPPIDLDATA pdata; - int size = sizeof(PIDLDATA); - - pidl = (LPITEMIDLIST)SHAlloc(size + 2 * sizeof(SHITEMID)); - if (!pidl) - return pidl; - ZeroMemory(pidl, size + 2 * sizeof(SHITEMID)); - - pidl->mkid.cb = size + sizeof(SHITEMID); - + + pidl = _ILAlloc(0x99, sizeof(PIDLDATA)); pdata = _ILGetDataPointer(pidl); - pdata->type = 0x99; - pdata->u.value.dummy = 0xFF; pdata->u.value.pItem = (PVOID)pItem; return pidl; Modified: trunk/reactos/dll/win32/netshell/shfldr_netconnect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/shfldr_… ============================================================================== --- trunk/reactos/dll/win32/netshell/shfldr_netconnect.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/shfldr_netconnect.c [iso-8859-1] Thu Oct 2 12:32:51 2008 @@ -33,6 +33,7 @@ LONG ref; const IContextMenu2Vtbl *lpVtblContextMenu; const IPersistFolder2Vtbl *lpVtblPersistFolder2; + const IQueryInfoVtbl *lpVtblQueryInfo; /* both paths are parsible from the desktop */ LPITEMIDLIST pidlRoot; /* absolute pidl */ @@ -69,6 +70,10 @@ return (LPIGenericSFImpl)((char *)iface - FIELD_OFFSET(IGenericSFImpl, lpVtblPersistFolder2)); } +static LPIGenericSFImpl __inline impl_from_IQueryInfo(IQueryInfo *iface) +{ + return (LPIGenericSFImpl)((char *)iface - FIELD_OFFSET(IGenericSFImpl, lpVtblQueryInfo)); +} /************************************************************************** @@ -99,6 +104,14 @@ IUnknown_AddRef ((IUnknown *) (*ppvObj)); return S_OK; } + + /* TODO: + * IID_IPersistFreeThreadedObject + * IID_IBrowserFrameOptions + * IID_IShellIconOverlay + * IID_IPersistIDList + * IID_IPersist + */ return E_NOINTERFACE; } @@ -288,6 +301,8 @@ static const DWORD dwNetConnectAttributes = SFGAO_STORAGE | SFGAO_HASPROPSHEET | SFGAO_STORAGEANCESTOR | SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER | SFGAO_CANRENAME | SFGAO_CANDELETE; + static const DWORD dwNetConnectItemAttributes = SFGAO_HASPROPSHEET | SFGAO_STORAGEANCESTOR | + SFGAO_FILESYSANCESTOR | SFGAO_CANRENAME; if (!rgfInOut) return E_INVALIDARG; @@ -300,6 +315,8 @@ if(cidl == 0) *rgfInOut = dwNetConnectAttributes; + else + *rgfInOut = dwNetConnectItemAttributes; /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ *rgfInOut &= ~SFGAO_VALIDATE; @@ -333,18 +350,22 @@ *ppvOut = NULL; - if (IsEqualIID (riid, &IID_IContextMenu) && (cidl >= 1)) + if ((IsEqualIID (riid, &IID_IContextMenu) || IsEqualIID (riid, &IID_IContextMenu2)) && (cidl >= 1)) { pObj = (IUnknown*)(&This->lpVtblContextMenu); This->apidl = apidl[0]; IUnknown_AddRef(pObj); hr = S_OK; } + else if (IsEqualIID(riid, &IID_IQueryInfo) && (cidl >= 1)) + { + pObj = (IUnknown*)(&This->lpVtblQueryInfo); + This->apidl = apidl[0]; + IUnknown_AddRef(pObj); + hr = S_OK; + } else hr = E_NOINTERFACE; - - if (SUCCEEDED(hr) && !pObj) - hr = E_OUTOFMEMORY; *ppvOut = pObj; return hr; @@ -510,6 +531,9 @@ val = _ILGetValueStruct(pidl); if (!val) return E_FAIL; + + if (!val->pItem) + return E_FAIL; if (INetConnection_GetProperties((INetConnection*)val->pItem, &pProperties) != NOERROR) return E_FAIL; @@ -548,10 +572,13 @@ } break; case COLUMN_DEVNAME: - wcscpy(buffer, pProperties->pszwDeviceName); - buffer[MAX_PATH-1] = L'\0'; - psd->str.uType = STRRET_WSTR; - hr = SHStrDupW(buffer, &psd->str.u.pOleStr); + if (pProperties->pszwDeviceName) + { + wcscpy(buffer, pProperties->pszwDeviceName); + buffer[MAX_PATH-1] = L'\0'; + psd->str.uType = STRRET_WSTR; + hr = SHStrDupW(buffer, &psd->str.u.pOleStr); + } break; case COLUMN_PHONE: case COLUMN_OWNER: @@ -608,7 +635,13 @@ { IGenericSFImpl * This = impl_from_IContextMenu2(iface); - return IShellFolder2_QueryInterface((IShellFolder2*)This, iid, ppvObject); + if (IsEqualIID(iid, &IID_IContextMenu) || IsEqualIID(iid, &IID_IContextMenu2)) + { + *ppvObject = (IUnknown*) &This->lpVtblContextMenu; + return S_OK; + } + + return E_NOINTERFACE; } /************************************************************************ @@ -986,6 +1019,77 @@ ISF_NetConnect_PersistFolder2_GetCurFolder }; +/************************************************************************ + * ISF_NetConnect_PersistFolder2_QueryInterface + */ +static HRESULT WINAPI ISF_NetConnect_IQueryInfo_QueryInterface (IQueryInfo * iface, + REFIID iid, LPVOID * ppvObj) +{ + IGenericSFImpl * This = impl_from_IQueryInfo(iface); + + if (IsEqualIID(iid, &IID_IQueryInfo)) + { + *ppvObj = (IUnknown*)&This->lpVtblQueryInfo; + return S_OK; + } + + return E_NOINTERFACE; +} + +/************************************************************************ + * ISF_NetConnect_PersistFolder2_AddRef + */ +static ULONG WINAPI ISF_NetConnect_IQueryInfo_AddRef (IQueryInfo * iface) +{ + IGenericSFImpl * This = impl_from_IQueryInfo(iface); + + return IShellFolder2_AddRef((IShellFolder2*)This); +} + +/************************************************************************ + * ISF_NetConnect_PersistFolder2_Release + */ +static ULONG WINAPI ISF_NetConnect_IQueryInfo_Release (IQueryInfo * iface) +{ + IGenericSFImpl * This = impl_from_IQueryInfo(iface); + + return IShellFolder2_Release((IShellFolder2*)This); +} + +/************************************************************************ + * ISF_NetConnect_PersistFolder2_GetClassID + */ +static HRESULT WINAPI ISF_NetConnect_IQueryInfo_GetInfoFlags ( + IQueryInfo * iface, DWORD *pdwFlags) +{ + *pdwFlags = 0; + + return S_OK; +} + +/************************************************************************ + * ISF_NetConnect_PersistFolder2_Initialize + * + * NOTES: it makes no sense to change the pidl + */ +static HRESULT WINAPI ISF_NetConnect_IQueryInfo_GetInfoTip ( + IQueryInfo * iface, DWORD dwFlags, WCHAR **ppwszTip) +{ +// IGenericSFImpl * This = impl_from_IQueryInfo(iface); + + *ppwszTip = NULL; + return S_OK; +} + +static const IQueryInfoVtbl vt_QueryInfo = +{ + ISF_NetConnect_IQueryInfo_QueryInterface, + ISF_NetConnect_IQueryInfo_AddRef, + ISF_NetConnect_IQueryInfo_Release, + ISF_NetConnect_IQueryInfo_GetInfoTip, + ISF_NetConnect_IQueryInfo_GetInfoFlags +}; + /************************************************************************** * ISF_NetConnect_Constructor */ @@ -1007,6 +1111,7 @@ sf->lpVtbl = &vt_ShellFolder2; sf->lpVtblPersistFolder2 = &vt_PersistFolder2; sf->lpVtblContextMenu = &vt_ContextMenu2; + sf->lpVtblQueryInfo = &vt_QueryInfo; hr = CoCreateInstance(&CLSID_LanConnectStatusUI, NULL, CLSCTX_INPROC_SERVER, &IID_IOleCommandTarget, (LPVOID*)&sf->lpOleCmd); if (FAILED(hr)) @@ -1022,6 +1127,5 @@ IShellFolder2_Release((IShellFolder2*)sf); return E_NOINTERFACE; } - return S_OK; }

16 years, 2 months

[sginsberg] 36626: - Remove ntgdibad.h

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Thu Oct 2 08:42:49 2008 New Revision: 36626 URL: http://svn.reactos.org/svn/reactos?rev=36626&view=rev Log: - Remove ntgdibad.h Removed: branches/nwin32/include/reactos/win32k/ntgdibad.h Modified: branches/nwin32/dll/win32/gdi32/include/precomp.h Modified: branches/nwin32/dll/win32/gdi32/include/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/gdi32/include/… ============================================================================== --- branches/nwin32/dll/win32/gdi32/include/precomp.h [iso-8859-1] (original) +++ branches/nwin32/dll/win32/gdi32/include/precomp.h [iso-8859-1] Thu Oct 2 08:42:49 2008 @@ -27,8 +27,3 @@ /* Private GDI32 Header */ #include "gdi32p.h" - -/* Deprecated NTGDI calls which shouldn't exist */ -#include <win32k/ntgdibad.h> - -/* EOF */ Removed: branches/nwin32/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/include/reactos/win32k/n… ============================================================================== --- branches/nwin32/include/reactos/win32k/ntgdibad.h [iso-8859-1] (original) +++ branches/nwin32/include/reactos/win32k/ntgdibad.h (removed) @@ -1,165 +1,0 @@ -#ifndef WIN32K_NTGDI_BAD_INCLUDED -#define WIN32K_NTGDI_BAD_INCLUDED - -/* - * - * If you want to help, please read this: - * - * This file contains NtGdi APIs which are specific to ROS, including - * a short comment describing the solution on how to use the actual NtGdi - * call documented in ntgdi.h. Here are the main cases and information on - * how to remove them from this header. - * - * - Simple rename. This deals with an API simply having a different name, - * with absolutely no other changes needed. - * - Rename and new parameters. This deals with a case similar to the one - * above, except that new parameters have now - * been added. This is also usually extremly - * simple to fix. Either pass the right params - * or pass null/0 values that you ignore. - * - Rename and new structure. This is similar to the above, except that the - * information is now passed in a differently - * named and organized structure. Ask Alex for - * the structure you need and he will add it to - * ntgdityp.h - * - Rename and different semantics. Similar to the previous examples, except - * that parameters have usually been removed - * or need to be converted in user-mode in - * one form of another. - * - Does not exist: user-mode. This means that the API can be fully done in - * user mode. In 80% of cases, our API was already - * returning NOT_IMPLEMENTED in kernel-mode, so - * the work to be done is minimal. A good example - * are the ICM and Metafile APIs, which can simply - * be removed and added into gdi32. - * - Does not exist: GDI Shared Objects. This is by far the hardest case. This - * class cannot be fixed until ReactOS - * has a working Shared GDI Object table - * and a DC_ATTR structure in which the - * attributes, selection and deletion of - * objects can be quickly done from user- - * mode without requiring a kernel mode - * call. - */ -/* Should be using ENUMFONTDATAW */ -typedef struct tagFONTFAMILYINFO -{ - ENUMLOGFONTEXW EnumLogFontEx; - NEWTEXTMETRICEXW NewTextMetricEx; - DWORD FontType; -} FONTFAMILYINFO, *PFONTFAMILYINFO; - -/* Should be using NtGdiEnumFontChunk */ -INT -NTAPI -NtGdiGetFontFamilyInfo( - HDC Dc, - LPLOGFONTW LogFont, - PFONTFAMILYINFO Info, - DWORD Size -); - -/* Use NtGdiGetDCPoint with GdiGetViewPortExt */ -BOOL STDCALL NtGdiGetViewportExtEx(HDC hDC, LPSIZE viewportExt); - -/* Needs to be done in user-mode. */ -BOOL STDCALL NtGdiGetViewportOrgEx(HDC hDC, LPPOINT viewportOrg); - -/* Needs to be done in user-mode. */ -BOOL STDCALL NtGdiGetWindowExtEx(HDC hDC, LPSIZE windowExt); - -/* Needs to be done in user-mode. */ -BOOL STDCALL NtGdiGetWindowOrgEx(HDC hDC, LPPOINT windowOrg); - -/* Needs to be done in user-mode. */ -BOOL -STDCALL -NtGdiOffsetViewportOrgEx ( - HDC hDC, - int XOffset, - int YOffset, - LPPOINT Point - ); - -/* Needs to be done in user-mode. */ -BOOL -STDCALL -NtGdiOffsetWindowOrgEx ( - HDC hDC, - int XOffset, - int YOffset, - LPPOINT Point - ); - -/* Needs to be done in user-mode. */ -BOOL -STDCALL -NtGdiSetWindowExtEx ( - HDC hDC, - int XExtent, - int YExtent, - LPSIZE Size - ); - -/* Needs to be done in user-mode. */ -BOOL -STDCALL -NtGdiSetViewportOrgEx ( - HDC hDC, - int X, - int Y, - LPPOINT Point - ); - -/* Needs to be done in user-mode. */ -BOOL -STDCALL -NtGdiSetViewportExtEx ( - HDC hDC, - int XExtent, - int YExtent, - LPSIZE Size - ); - -/* Needs to be done in user-mode. */ -BOOL -STDCALL -NtGdiSetWindowOrgEx ( - HDC hDC, - int X, - int Y, - LPPOINT Point - ); - -/* Use SetDIBitsToDevice in gdi32. */ -INT -STDCALL -NtGdiSetDIBits ( - HDC hDC, - HBITMAP hBitmap, - UINT StartScan, - UINT ScanLines, - CONST VOID * Bits, - CONST BITMAPINFO * bmi, - UINT ColorUse - ); - -#endif /* WIN32K_NTGDI_BAD_INCLUDED */ - - -/* Follow thing need be rewriten - * - * Opengl icd are complete hacked in reactos and are using own way, this need be rewriten and be setup with the correct syscall - * and the opengl32 shall using correct syscall to optain then driver interface or using the correct version in gdi32. - * it mean whole icd are hacked in frist place and need be rewtiten from scrash. and it need enum the opengl correct way and - * export the driver correct - * - * DirectX aka ReactX alot api that have been implement in reactos win32k for ReactX shall move to a file call dxg.sys - * there from it will really doing the stuff. And we should setup loading of dxg.sys - * - * The Init of Gdi subsystem shall move into NtGdiInit() - * - * The Init of spooler are done in NtGdiInitSpool() - * - * The Init of the User subsystem shall move into NtUserInit() - */

16 years, 2 months

[sginsberg] 36625: - NtGdiInit is called from GdiDllInitialize but doesn't actually do anything -- reflect this in the stub

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Thu Oct 2 08:41:41 2008 New Revision: 36625 URL: http://svn.reactos.org/svn/reactos?rev=36625&view=rev Log: - NtGdiInit is called from GdiDllInitialize but doesn't actually do anything -- reflect this in the stub Modified: branches/nwin32/subsystems/win32/win32k/ntgdi/gdiinit.c Modified: branches/nwin32/subsystems/win32/win32k/ntgdi/gdiinit.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/ntgdi/gdiinit.c [iso-8859-1] (original) +++ branches/nwin32/subsystems/win32/win32k/ntgdi/gdiinit.c [iso-8859-1] Thu Oct 2 08:41:41 2008 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Win32K * LICENSE: GPL - See COPYING in the top level directory * FILE: subsystems/win32/win32k/ntgdi/gdiinit.c - * PURPOSE: GDI Inittialization Routine + * PURPOSE: GDI Initialization Routines * PROGRAMMERS: Stefan Ginsberg (stefan__100__(a)hotmail.com) */ @@ -18,7 +18,7 @@ APIENTRY NtGdiInit(VOID) { - DPRINT1("NtGdiInit() called\n"); + /* This is all we do */ return TRUE; }

16 years, 2 months

[sginsberg] 36624: - Add missing APIENTRY to ntgdi.h, syscalls are always stdcall. - Update gdi32 after NtGdiDoPalette change - Add parameters for NtGdiGetSpoolMessage

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Thu Oct 2 08:33:51 2008 New Revision: 36624 URL: http://svn.reactos.org/svn/reactos?rev=36624&view=rev Log: - Add missing APIENTRY to ntgdi.h, syscalls are always stdcall. - Update gdi32 after NtGdiDoPalette change - Add parameters for NtGdiGetSpoolMessage Modified: branches/nwin32/dll/win32/gdi32/objects/palette.c branches/nwin32/include/psdk/ntgdi.h branches/nwin32/include/reactos/win32k/ntgdityp.h branches/nwin32/subsystems/win32/win32k/ntgdi/gdibrush.c branches/nwin32/subsystems/win32/win32k/ntgdi/gdicoord.c branches/nwin32/subsystems/win32/win32k/ntgdi/gdiprint.c Modified: branches/nwin32/dll/win32/gdi32/objects/palette.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/dll/win32/gdi32/objects/… ============================================================================== --- branches/nwin32/dll/win32/gdi32/objects/palette.c [iso-8859-1] (original) +++ branches/nwin32/dll/win32/gdi32/objects/palette.c [iso-8859-1] Thu Oct 2 08:33:51 2008 @@ -50,7 +50,7 @@ UINT cEntries, LPPALETTEENTRY ppe) { - return NtGdiDoPalette(hDC, iStartIndex, cEntries, ppe, GdiPalGetSystemEntries, FALSE); + return NtGdiDoPalette((HPALETTE)hDC, iStartIndex, cEntries, ppe, GdiPalGetSystemEntries, FALSE); } UINT @@ -60,7 +60,7 @@ UINT cEntries, RGBQUAD *pColors) { - return NtGdiDoPalette(hDC, iStartIndex, cEntries, pColors, GdiPalGetColorTable, FALSE); + return NtGdiDoPalette((HPALETTE)hDC, iStartIndex, cEntries, (PALETTEENTRY*)pColors, GdiPalGetColorTable, FALSE); } /* @@ -116,7 +116,7 @@ if (cEntries) { - retValue = NtGdiDoPalette(hDC, iStartIndex, cEntries, (RGBQUAD*)pColors, GdiPalSetColorTable, TRUE); + retValue = NtGdiDoPalette((HPALETTE)hDC, iStartIndex, cEntries, (PALETTEENTRY*)pColors, GdiPalSetColorTable, TRUE); } return retValue; Modified: branches/nwin32/include/psdk/ntgdi.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/include/psdk/ntgdi.h?rev… ============================================================================== --- branches/nwin32/include/psdk/ntgdi.h [iso-8859-1] (original) +++ branches/nwin32/include/psdk/ntgdi.h [iso-8859-1] Thu Oct 2 08:33:51 2008 @@ -3539,6 +3539,7 @@ W32KAPI BOOL +APIENTRY NtGdiUpdateTransform( IN HDC hdc ); @@ -3568,6 +3569,7 @@ W32KAPI BOOL +APIENTRY NtGdiSetPUMPDOBJ( IN HUMPD humpd, IN BOOL bStoreID, @@ -3577,6 +3579,7 @@ W32KAPI BOOL +APIENTRY NtGdiBRUSHOBJ_DeleteRbrush( IN BRUSHOBJ *pbo, IN BRUSHOBJ *pboB @@ -3584,6 +3587,7 @@ W32KAPI BOOL +APIENTRY NtGdiUMPDEngFreeUserMem( IN KERNEL_PVOID *ppv ); Modified: branches/nwin32/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/include/reactos/win32k/n… ============================================================================== --- branches/nwin32/include/reactos/win32k/ntgdityp.h [iso-8859-1] (original) +++ branches/nwin32/include/reactos/win32k/ntgdityp.h [iso-8859-1] Thu Oct 2 08:33:51 2008 @@ -189,14 +189,15 @@ VOID ); -/* FIXME: prototypes */ W32KAPI INT APIENTRY -NtGdiGetSpoolMessage(DWORD u1, - DWORD u2, - DWORD u3, - DWORD u4); +NtGdiGetSpoolMessage( + IN PVOID InputBuffer, + IN ULONG InputBufferSize, + OUT PVOID OutputBuffer, + IN ULONG OutputBufferSize +); #define GDIBATCHBUFSIZE 0x136*4 #define GDI_BATCH_LIMIT 20 Modified: branches/nwin32/subsystems/win32/win32k/ntgdi/gdibrush.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/ntgdi/gdibrush.c [iso-8859-1] (original) +++ branches/nwin32/subsystems/win32/win32k/ntgdi/gdibrush.c [iso-8859-1] Thu Oct 2 08:33:51 2008 @@ -110,7 +110,7 @@ } BOOL -/* Missing APIENTRY! */ +APIENTRY NtGdiBRUSHOBJ_DeleteRbrush(IN BRUSHOBJ *pbo, IN BRUSHOBJ *pboB) { Modified: branches/nwin32/subsystems/win32/win32k/ntgdi/gdicoord.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/ntgdi/gdicoord.c [iso-8859-1] (original) +++ branches/nwin32/subsystems/win32/win32k/ntgdi/gdicoord.c [iso-8859-1] Thu Oct 2 08:33:51 2008 @@ -121,9 +121,8 @@ } - BOOL -/* Missing APIENTRY! */ +APIENTRY NtGdiUpdateTransform(IN HDC hdc) { UNIMPLEMENTED; Modified: branches/nwin32/subsystems/win32/win32k/ntgdi/gdiprint.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/ntgdi/gdiprint.c [iso-8859-1] (original) +++ branches/nwin32/subsystems/win32/win32k/ntgdi/gdiprint.c [iso-8859-1] Thu Oct 2 08:33:51 2008 @@ -101,20 +101,19 @@ return FALSE; } -/* FIXME: Parameters! */ INT APIENTRY -NtGdiGetSpoolMessage( DWORD u1, - DWORD u2, - DWORD u3, - DWORD u4) +NtGdiGetSpoolMessage(IN PVOID InputBuffer, + IN ULONG InputBufferSize, + OUT PVOID OutputBuffer, + IN ULONG OutputBufferSize) { UNIMPLEMENTED; return 0; } BOOL -/* Missing APIENTRY! */ +APIENTRY NtGdiSetPUMPDOBJ(IN HUMPD humpd, IN BOOL bStoreID, OUT HUMPD *phumpd, @@ -125,7 +124,7 @@ } BOOL -/* Missing APIENTRY! */ +APIENTRY NtGdiUMPDEngFreeUserMem(IN KERNEL_PVOID *ppv) { UNIMPLEMENTED;

16 years, 2 months

[fireball] 36623: - Sync RegGetValueA/W implementation (no functional changes though, mostly comments). - Port RegQueryValueExW from Wine (but leaving RegQueryValueExA as a wrapper, with a fix). - Implement RegSetValueA/W based on Wine's implementation, and removing old, different (A and W) versions of RegSetValue.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Oct 2 06:30:44 2008 New Revision: 36623 URL: http://svn.reactos.org/svn/reactos?rev=36623&view=rev Log: - Sync RegGetValueA/W implementation (no functional changes though, mostly comments). - Port RegQueryValueExW from Wine (but leaving RegQueryValueExA as a wrapper, with a fix). - Implement RegSetValueA/W based on Wine's implementation, and removing old, different (A and W) versions of RegSetValue. Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Thu Oct 2 06:30:44 2008 @@ -1809,8 +1809,8 @@ /****************************************************************************** * RegGetValueW [ADVAPI32.@] * - * Retrieves the type and data for a value name associated with a key - * optionally expanding it's content and restricting it's type. + * Retrieves the type and data for a value name associated with a key, + * optionally expanding its content and restricting its type. * * PARAMS * hKey [I] Handle to an open key. @@ -1819,23 +1819,25 @@ * dwFlags [I] Flags restricting the value type to retrieve. * pdwType [O] Destination for the values type, may be NULL. * pvData [O] Destination for the values content, may be NULL. - * pcbData [I/O] Size of pvData, updated with the size required to - * retrieve the whole content. + * pcbData [I/O] Size of pvData, updated with the size in bytes required to + * retrieve the whole content, including the trailing '\0' + * for strings. * * RETURNS * Success: ERROR_SUCCESS * Failure: nonzero error code from Winerror.h * * NOTES - * - Unless RRF_NOEXPAND is specified REG_EXPAND_SZ is automatically expanded - * and REG_SZ is retrieved instead. - * - Restrictions are applied after expanding, using RRF_RT_REG_EXPAND_SZ + * - Unless RRF_NOEXPAND is specified, REG_EXPAND_SZ values are automatically + * expanded and pdwType is set to REG_SZ instead. + * - Restrictions are applied after expanding, using RRF_RT_REG_EXPAND_SZ * without RRF_NOEXPAND is thus not allowed. - */ -LONG WINAPI -RegGetValueW( HKEY hKey, LPCWSTR pszSubKey, LPCWSTR pszValue, - DWORD dwFlags, LPDWORD pdwType, PVOID pvData, - LPDWORD pcbData ) + * An exception is the case where RRF_RT_ANY is specified, because then + * RRF_NOEXPAND is allowed. + */ +LSTATUS WINAPI RegGetValueW( HKEY hKey, LPCWSTR pszSubKey, LPCWSTR pszValue, + DWORD dwFlags, LPDWORD pdwType, PVOID pvData, + LPDWORD pcbData ) { DWORD dwType, cbData = pcbData ? *pcbData : 0; PVOID pvBuf = NULL; @@ -1847,7 +1849,6 @@ if (pvData && !pcbData) return ERROR_INVALID_PARAMETER; - if ((dwFlags & RRF_RT_REG_EXPAND_SZ) && !(dwFlags & RRF_NOEXPAND) && ((dwFlags & RRF_RT_ANY) != RRF_RT_ANY)) return ERROR_INVALID_PARAMETER; @@ -1864,7 +1865,7 @@ * if the passed buffer was too small as the expanded string might be * smaller than the unexpanded one and could fit into cbData bytes. */ if ((ret == ERROR_SUCCESS || ret == ERROR_MORE_DATA) && - (dwType == REG_EXPAND_SZ && !(dwFlags & RRF_NOEXPAND))) + dwType == REG_EXPAND_SZ && !(dwFlags & RRF_NOEXPAND)) { do { HeapFree(GetProcessHeap(), 0, pvBuf); @@ -1930,10 +1931,9 @@ * * See RegGetValueW. */ -LONG WINAPI -RegGetValueA( HKEY hKey, LPCSTR pszSubKey, LPCSTR pszValue, - DWORD dwFlags, LPDWORD pdwType, PVOID pvData, - LPDWORD pcbData ) +LSTATUS WINAPI RegGetValueA( HKEY hKey, LPCSTR pszSubKey, LPCSTR pszValue, + DWORD dwFlags, LPDWORD pdwType, PVOID pvData, + LPDWORD pcbData ) { DWORD dwType, cbData = pcbData ? *pcbData : 0; PVOID pvBuf = NULL; @@ -1945,7 +1945,6 @@ if (pvData && !pcbData) return ERROR_INVALID_PARAMETER; - if ((dwFlags & RRF_RT_REG_EXPAND_SZ) && !(dwFlags & RRF_NOEXPAND) && ((dwFlags & RRF_RT_ANY) != RRF_RT_ANY)) return ERROR_INVALID_PARAMETER; @@ -3793,120 +3792,84 @@ * * @implemented */ -LONG STDCALL -RegQueryValueExW (HKEY hKey, - LPCWSTR lpValueName, - LPDWORD lpReserved, - LPDWORD lpType, - LPBYTE lpData, - LPDWORD lpcbData) -{ - PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; - UNICODE_STRING ValueName; - NTSTATUS Status; - ULONG BufferSize; - ULONG ResultSize; - HANDLE KeyHandle; - LONG ErrorCode = ERROR_SUCCESS; - ULONG MaxCopy = lpcbData != NULL && lpData != NULL ? *lpcbData : 0; - - TRACE("hKey 0x%X lpValueName %S lpData 0x%X lpcbData %d\n", - hKey, lpValueName, lpData, lpcbData ? *lpcbData : 0); - - Status = MapDefaultKey (&KeyHandle, - hKey); - if (!NT_SUCCESS(Status)) - { - return RtlNtStatusToDosError (Status); - } - - if (lpData != NULL && lpcbData == NULL) - { - ErrorCode = ERROR_INVALID_PARAMETER; - goto Cleanup; - } - - RtlInitUnicodeString (&ValueName, - lpValueName); - BufferSize = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0]) + MaxCopy; - ValueInfo = RtlAllocateHeap (ProcessHeap, - 0, - BufferSize); - if (ValueInfo == NULL) - { - ErrorCode = ERROR_OUTOFMEMORY; - goto Cleanup; - } - - Status = NtQueryValueKey (KeyHandle, - &ValueName, - KeyValuePartialInformation, - ValueInfo, - BufferSize, - &ResultSize); - TRACE("Status 0x%X\n", Status); - if (Status == STATUS_BUFFER_OVERFLOW) - { - /* Return ERROR_SUCCESS and the buffer space needed for a successful call */ - MaxCopy = 0; - ErrorCode = lpData ? ERROR_MORE_DATA : ERROR_SUCCESS; - } - else if (!NT_SUCCESS(Status)) - { - ErrorCode = RtlNtStatusToDosError (Status); - MaxCopy = 0; - if (lpcbData != NULL) - { - ResultSize = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0]) + *lpcbData; - } - } - - if ((lpType != NULL) && (NT_SUCCESS(Status) || (Status == STATUS_BUFFER_OVERFLOW))) - { - *lpType = ValueInfo->Type; - } - - if (NT_SUCCESS(Status) && lpData != NULL) - { - RtlMoveMemory (lpData, - ValueInfo->Data, - min(ValueInfo->DataLength, MaxCopy)); - } - - if ((ValueInfo->Type == REG_SZ) || - (ValueInfo->Type == REG_MULTI_SZ) || - (ValueInfo->Type == REG_EXPAND_SZ)) - { - if (lpData != NULL && MaxCopy > ValueInfo->DataLength) - { - ((PWSTR)lpData)[ValueInfo->DataLength / sizeof(WCHAR)] = 0; - } - - if (lpcbData != NULL) - { - *lpcbData = (ResultSize - FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0])); - TRACE("(string) Returning Size: %lu\n", *lpcbData); - } - } - else - { - if (lpcbData != NULL) - { - *lpcbData = ResultSize - FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0]); - TRACE("(other) Returning Size: %lu\n", *lpcbData); - } - } - - TRACE("Type %d Size %d\n", ValueInfo->Type, ValueInfo->DataLength); - - RtlFreeHeap (ProcessHeap, - 0, - ValueInfo); - -Cleanup: - ClosePredefKey(KeyHandle); - - return ErrorCode; +LONG +WINAPI +RegQueryValueExW(HKEY hkeyorg, + LPCWSTR name, + LPDWORD reserved, + LPDWORD type, + LPBYTE data, + LPDWORD count) +{ + HANDLE hkey; + NTSTATUS status; + UNICODE_STRING name_str; + DWORD total_size; + char buffer[256], *buf_ptr = buffer; + KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; + static const int info_size = offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data ); + + TRACE("(%p,%s,%p,%p,%p,%p=%d)\n", + hkey, debugstr_w(name), reserved, type, data, count, + (count && data) ? *count : 0 ); + + if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER; + //if (!(hkey = get_special_root_hkey( hkey ))) return ERROR_INVALID_HANDLE; + + status = MapDefaultKey(&hkey, hkeyorg); + if (!NT_SUCCESS(status)) + { + return RtlNtStatusToDosError(status); + } + + RtlInitUnicodeString( &name_str, name ); + + if (data) total_size = min( sizeof(buffer), *count + info_size ); + else + { + total_size = info_size; + if (count) *count = 0; + } + + status = NtQueryValueKey( hkey, &name_str, KeyValuePartialInformation, + buffer, total_size, &total_size ); + if (status && status != STATUS_BUFFER_OVERFLOW) goto done; + + if (data) + { + /* retry with a dynamically allocated buffer */ + while (status == STATUS_BUFFER_OVERFLOW && total_size - info_size <= *count) + { + if (buf_ptr != buffer) HeapFree( GetProcessHeap(), 0, buf_ptr ); + if (!(buf_ptr = HeapAlloc( GetProcessHeap(), 0, total_size ))) + return ERROR_NOT_ENOUGH_MEMORY; + info = (KEY_VALUE_PARTIAL_INFORMATION *)buf_ptr; + status = NtQueryValueKey( hkey, &name_str, KeyValuePartialInformation, + buf_ptr, total_size, &total_size ); + } + + if (!status) + { + memcpy( data, buf_ptr + info_size, total_size - info_size ); + /* if the type is REG_SZ and data is not 0-terminated + * and there is enough space in the buffer NT appends a \0 */ + if (total_size - info_size <= *count-sizeof(WCHAR) && is_string(info->Type)) + { + WCHAR *ptr = (WCHAR *)(data + total_size - info_size); + if (ptr > (WCHAR *)data && ptr[-1]) *ptr = 0; + } + } + else if (status != STATUS_BUFFER_OVERFLOW) goto done; + } + else status = STATUS_SUCCESS; + + if (type) *type = info->Type; + if (count) *count = total_size - info_size; + + done: + if (buf_ptr != buffer) HeapFree( GetProcessHeap(), 0, buf_ptr ); + ClosePredefKey(hkey); + return RtlNtStatusToDosError(status); } @@ -3955,6 +3918,9 @@ ValueData.Buffer = NULL; ValueData.Length = 0; ValueData.MaximumLength = 0; + + if (lpcbData) + *lpcbData = 0; } RtlCreateUnicodeStringFromAsciiz (&ValueName, @@ -4754,47 +4720,39 @@ * @implemented */ LONG STDCALL -RegSetValueA (HKEY hKey, +RegSetValueA (HKEY hKeyOriginal, LPCSTR lpSubKey, DWORD dwType, LPCSTR lpData, DWORD cbData) { - LONG ret; - HKEY hSubKey; - - if (dwType != REG_SZ) - { - return ERROR_INVALID_PARAMETER; - } - - if (lpSubKey != NULL && lpSubKey[0] != '\0') - { - ret = RegCreateKeyA(hKey, - lpSubKey, - &hSubKey); - - if (ret != ERROR_SUCCESS) - { - return ret; - } - } - else - hSubKey = hKey; - - ret = RegSetValueExA(hSubKey, - NULL, - 0, - REG_SZ, - (CONST BYTE*)lpData, - strlen(lpData) + 1); - - if (hSubKey != hKey) - { - RegCloseKey(hSubKey); - } - - return ret; + HKEY subkey; + HANDLE hKey; + DWORD ret; + NTSTATUS Status; + + TRACE("(%p,%s,%d,%s,%d)\n", hKey, debugstr_a(lpSubKey), dwType, debugstr_a(lpData), cbData ); + + if (dwType != REG_SZ || !lpData) return ERROR_INVALID_PARAMETER; + + Status = MapDefaultKey(&hKey, hKeyOriginal); + if (!NT_SUCCESS(Status)) + { + return RtlNtStatusToDosError (Status); + } + subkey = hKey; + + if (lpSubKey && lpSubKey[0]) /* need to create the subkey */ + { + if ((ret = RegCreateKeyA( hKey, lpSubKey, &subkey )) != ERROR_SUCCESS) goto Cleanup; + } + ret = RegSetValueExA( subkey, NULL, 0, REG_SZ, (const BYTE*)lpData, strlen(lpData)+1 ); + if (subkey != hKey) RegCloseKey( subkey ); + +Cleanup: + ClosePredefKey(hKey); + + return ret; } @@ -4804,67 +4762,41 @@ * @implemented */ LONG STDCALL -RegSetValueW (HKEY hKey, +RegSetValueW (HKEY hKeyOriginal, LPCWSTR lpSubKey, DWORD dwType, LPCWSTR lpData, DWORD cbData) { - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING SubKeyString; - HANDLE KeyHandle; - HANDLE RealKey; - BOOL CloseRealKey; - NTSTATUS Status; - LONG ErrorCode; - - Status = MapDefaultKey (&KeyHandle, - hKey); - if (!NT_SUCCESS(Status)) - { - return RtlNtStatusToDosError (Status); - } - - if ((lpSubKey) && (wcslen(lpSubKey) != 0)) - { - RtlInitUnicodeString (&SubKeyString, - (LPWSTR)lpSubKey); - InitializeObjectAttributes (&ObjectAttributes, - &SubKeyString, - OBJ_CASE_INSENSITIVE, - KeyHandle, - NULL); - Status = NtOpenKey (&RealKey, - KEY_SET_VALUE, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - ErrorCode = RtlNtStatusToDosError (Status); - goto Cleanup; - } - CloseRealKey = TRUE; - } - else - { - RealKey = hKey; - CloseRealKey = FALSE; - } - - ErrorCode = RegSetValueExW (RealKey, - NULL, - 0, - dwType, - (LPBYTE)lpData, - cbData); - if (CloseRealKey == TRUE) - { - NtClose (RealKey); - } + HKEY subkey; + HANDLE hKey; + DWORD ret; + NTSTATUS Status; + + TRACE("(%p,%s,%d,%s,%d)\n", hKeyOriginal, debugstr_w(lpSubKey), dwType, debugstr_w(lpData), cbData ); + + if (dwType != REG_SZ || !lpData) return ERROR_INVALID_PARAMETER; + + Status = MapDefaultKey(&hKey, hKeyOriginal); + if (!NT_SUCCESS(Status)) + { + return RtlNtStatusToDosError (Status); + } + subkey = hKey; + + if (lpSubKey && lpSubKey[0]) /* need to create the subkey */ + { + if ((ret = RegCreateKeyW( hKey, lpSubKey, &subkey )) != ERROR_SUCCESS) goto Cleanup; + } + + ret = RegSetValueExW( subkey, NULL, 0, REG_SZ, (const BYTE*)lpData, + (wcslen( lpData ) + 1) * sizeof(WCHAR) ); + if (subkey != hKey) RegCloseKey( subkey ); Cleanup: - ClosePredefKey(KeyHandle); - - return ErrorCode; + ClosePredefKey(hKey); + + return ret; }

16 years, 2 months

[cgutman] 36622: - Merge aicom-network-fixes up to r36621

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu Oct 2 04:42:08 2008 New Revision: 36622 URL: http://svn.reactos.org/svn/reactos?rev=36622&view=rev Log: - Merge aicom-network-fixes up to r36621 Modified: trunk/reactos/drivers/network/ndis/ndis/hardware.c trunk/reactos/drivers/network/ndis/ndis/io.c Modified: trunk/reactos/drivers/network/ndis/ndis/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/hardware.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/hardware.c [iso-8859-1] Thu Oct 2 04:42:08 2008 @@ -57,20 +57,20 @@ NDIS_STATUS EXPORT NdisMPciAssignResources( - IN NDIS_HANDLE MiniportHandle, + IN NDIS_HANDLE MiniportAdapterHandle, IN ULONG SlotNumber, OUT PNDIS_RESOURCE_LIST *AssignedResources) { - PNDIS_MINIPORT_BLOCK MiniportBlock = (PNDIS_MINIPORT_BLOCK)MiniportHandle; - - if (MiniportBlock->BusType != PCIBus || - MiniportBlock->AllocatedResources == NULL) + PLOGICAL_ADAPTER Adapter = MiniportAdapterHandle; + + if (Adapter->NdisMiniportBlock.BusType != PCIBus || + Adapter->NdisMiniportBlock.AllocatedResources == NULL) { *AssignedResources = NULL; return NDIS_STATUS_FAILURE; } - *AssignedResources = &MiniportBlock->AllocatedResources->List[0].PartialResourceList; + *AssignedResources = &Adapter->NdisMiniportBlock.AllocatedResources->List[0].PartialResourceList; return NDIS_STATUS_SUCCESS; } @@ -99,7 +99,7 @@ */ { PNDIS_WRAPPER_CONTEXT WrapperContext = (PNDIS_WRAPPER_CONTEXT)WrapperConfigurationContext; - PNDIS_MINIPORT_BLOCK MiniportBlock = WrapperContext->DeviceObject->DeviceExtension; + PLOGICAL_ADAPTER Adapter = WrapperContext->DeviceObject->DeviceExtension; ULONG ResourceListSize; PAGED_CODE(); @@ -107,7 +107,7 @@ NDIS_DbgPrint(MAX_TRACE, ("Called\n")); - if (MiniportBlock->AllocatedResources == NULL) + if (Adapter->NdisMiniportBlock.AllocatedResources == NULL) { NDIS_DbgPrint(MIN_TRACE, ("No allocated resources!\n")); *Status = NDIS_STATUS_FAILURE; @@ -116,13 +116,13 @@ ResourceListSize = FIELD_OFFSET(CM_PARTIAL_RESOURCE_LIST, PartialDescriptors) + - MiniportBlock->AllocatedResources->List[0].PartialResourceList.Count * + Adapter->NdisMiniportBlock.AllocatedResources->List[0].PartialResourceList.Count * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); if (*BufferSize >= ResourceListSize) { RtlCopyMemory(ResourceList, - &MiniportBlock->AllocatedResources->List[0].PartialResourceList, + &Adapter->NdisMiniportBlock.AllocatedResources->List[0].PartialResourceList, ResourceListSize); *BufferSize = ResourceListSize; *Status = NDIS_STATUS_SUCCESS; @@ -196,10 +196,10 @@ IN PVOID Buffer, IN ULONG Length) { - PNDIS_MINIPORT_BLOCK Adapter = (PNDIS_MINIPORT_BLOCK)NdisAdapterHandle; + PLOGICAL_ADAPTER Adapter = NdisAdapterHandle; /* Slot number is ignored since W2K for all NDIS drivers. */ return HalGetBusDataByOffset(PCIConfiguration, - Adapter->BusNumber, Adapter->SlotNumber, + Adapter->NdisMiniportBlock.BusNumber, Adapter->NdisMiniportBlock.SlotNumber, Buffer, Offset, Length); } @@ -216,10 +216,10 @@ IN PVOID Buffer, IN ULONG Length) { - PNDIS_MINIPORT_BLOCK Adapter = (PNDIS_MINIPORT_BLOCK)NdisAdapterHandle; + PLOGICAL_ADAPTER Adapter = NdisAdapterHandle; /* Slot number is ignored since W2K for all NDIS drivers. */ return HalSetBusDataByOffset(PCIConfiguration, - Adapter->BusNumber, Adapter->SlotNumber, + Adapter->NdisMiniportBlock.BusNumber, Adapter->NdisMiniportBlock.SlotNumber, Buffer, Offset, Length); } Modified: trunk/reactos/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] Thu Oct 2 04:42:08 2008 @@ -60,22 +60,31 @@ * TRUE if a miniport controlled device generated the interrupt */ { - BOOLEAN InterruptRecognized; - BOOLEAN QueueMiniportHandleInterrupt; - PNDIS_MINIPORT_BLOCK Adapter = (PNDIS_MINIPORT_BLOCK)ServiceContext; + BOOLEAN InterruptRecognized = FALSE; + BOOLEAN QueueMiniportHandleInterrupt = FALSE; + PLOGICAL_ADAPTER Adapter = ServiceContext; NDIS_DbgPrint(MAX_TRACE, ("Called. Adapter (0x%X)\n", Adapter)); - (*Adapter->DriverHandle->MiniportCharacteristics.ISRHandler)( - &InterruptRecognized, - &QueueMiniportHandleInterrupt, - Adapter->MiniportAdapterContext); + if (Adapter->NdisMiniportBlock.Interrupt->IsrRequested) { + (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ISRHandler)( + &InterruptRecognized, + &QueueMiniportHandleInterrupt, + Adapter->NdisMiniportBlock.MiniportAdapterContext); + + } else if (Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.DisableInterruptHandler) { + (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.DisableInterruptHandler)( + Adapter->NdisMiniportBlock.MiniportAdapterContext); + QueueMiniportHandleInterrupt = TRUE; + InterruptRecognized = TRUE; + } + if (QueueMiniportHandleInterrupt) - { - NDIS_DbgPrint(MAX_TRACE, ("Queueing DPC.\n")); - KeInsertQueueDpc(&Adapter->Interrupt->InterruptDpc, NULL, NULL); - } + { + NDIS_DbgPrint(MAX_TRACE, ("Queuing DPC.\n")); + KeInsertQueueDpc(&Adapter->NdisMiniportBlock.Interrupt->InterruptDpc, NULL, NULL); + } NDIS_DbgPrint(MAX_TRACE, ("Leaving.\n")); @@ -207,15 +216,15 @@ * - Called at IRQL = DISPATCH_LEVEL */ { - PNDIS_MINIPORT_BLOCK Adapter = (PNDIS_MINIPORT_BLOCK)Context; - - NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - - Adapter->MapRegisters[Adapter->CurrentMapRegister].MapRegister = MapRegisterBase; + PLOGICAL_ADAPTER Adapter = Context; + + NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); + + Adapter->NdisMiniportBlock.MapRegisters[Adapter->NdisMiniportBlock.CurrentMapRegister].MapRegister = MapRegisterBase; NDIS_DbgPrint(MAX_TRACE, ("setting event and leaving.\n")); - KeSetEvent(Adapter->AllocationEvent, 0, FALSE); + KeSetEvent(Adapter->NdisMiniportBlock.AllocationEvent, 0, FALSE); /* this is only the thing to do for busmaster NICs */ return DeallocateObjectKeepRegisters; @@ -767,6 +776,7 @@ KeInitializeEvent(&Interrupt->DpcsCompletedEvent, NotificationEvent, FALSE); Interrupt->SharedInterrupt = SharedInterrupt; + Interrupt->IsrRequested = RequestIsr; Adapter->NdisMiniportBlock.Interrupt = Interrupt;

16 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2008