Ros-diffs December 2008

ros-diffs@reactos.org

31 participants
710 discussions

[fireball] 38024: Cary Xiao" <xiaowave@gmail.com> - Add some code to complete breakpoint of gdbstub. See issue #1817 for more details.
by fireball＠svn.reactos.org 11 Dec '08

11 Dec '08

Author: fireball Date: Thu Dec 11 13:44:56 2008 New Revision: 38024 URL: http://svn.reactos.org/svn/reactos?rev=38024&view=rev Log: Cary Xiao" <xiaowave(a)gmail.com> - Add some code to complete breakpoint of gdbstub. See issue #1817 for more details. Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/wrappers/gdbst… ============================================================================== --- trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c [iso-8859-1] Thu Dec 11 13:44:56 2008 @@ -1011,6 +1011,7 @@ #define MAX_SW_BREAKPOINTS 64 static unsigned GspSwBreakpointCount = 0; static GSPSWBREAKPOINT GspSwBreakpoints[MAX_SW_BREAKPOINTS]; +static CHAR GspSwBreakpointsInstructions[MAX_SW_BREAKPOINTS]; static void GspSetHwBreakpoint(ULONG Type, ULONG_PTR Address, ULONG Length) @@ -1096,9 +1097,23 @@ } else { + unsigned Index; + + for (Index = 0; Index < GspSwBreakpointCount; Index++) + { + if (GspSwBreakpoints[Index].Address == Address) + { + strcpy(GspOutBuffer, "E22"); + return; + } + } + DPRINT("Stored at index %u\n", GspSwBreakpointCount); GspSwBreakpoints[GspSwBreakpointCount].Address = Address; GspSwBreakpoints[GspSwBreakpointCount].Active = FALSE; + GspSwBreakpointsInstructions[GspSwBreakpointCount] = + GspReadMemSafe((PCHAR )Address); + GspWriteMemSafe((PCHAR )Address, 0xCC); GspSwBreakpointCount++; strcpy(GspOutBuffer, "OK"); } @@ -1116,12 +1131,19 @@ { DPRINT("Found match at index %u\n", Index); ASSERT(! GspSwBreakpoints[Index].Active); + + GspWriteMemSafe((PCHAR )Address, + GspSwBreakpointsInstructions[Index]); + if (Index + 1 < GspSwBreakpointCount) { memmove(GspSwBreakpoints + Index, GspSwBreakpoints + (Index + 1), (GspSwBreakpointCount - Index - 1) * sizeof(GSPSWBREAKPOINT)); + memmove(GspSwBreakpointsInstructions + Index, + GspSwBreakpointsInstructions + (Index + 1), + (GspSwBreakpointCount - Index - 1) * sizeof(CHAR)); } GspSwBreakpointCount--; strcpy(GspOutBuffer, "OK"); @@ -1360,6 +1382,7 @@ *ptr = '\0'; GspPutPacket(&GspOutBuffer[0]); + /* DPRINT("------- replied status: (%s) -------\n", GspOutBuffer); */ } else { @@ -1373,6 +1396,7 @@ /* Zero the buffer now so we don't have to worry about the terminating zero character */ memset(GspOutBuffer, 0, sizeof(GspInBuffer)); ptr = GspGetPacket(); + /* DPRINT("------- Get (%s) command -------\n", ptr); */ switch(*ptr++) { @@ -1643,6 +1667,7 @@ /* reply to the request */ GspPutPacket(GspOutBuffer); + /* DPRINT("------- reply command (%s) -------\n", GspOutBuffer); */ } /* not reached */

1 0

[fireball] 38023: - Add a commented out entry for green.sys driver. See issue #3689 for more details.
by fireball＠svn.reactos.org 11 Dec '08

11 Dec '08

Author: fireball Date: Thu Dec 11 12:52:18 2008 New Revision: 38023 URL: http://svn.reactos.org/svn/reactos?rev=38023&view=rev Log: - Add a commented out entry for green.sys driver. See issue #3689 for more details. Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Thu Dec 11 12:52:18 2008 @@ -890,6 +890,14 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Type",0x00010001,0x00000008 +; Green driver +;HKLM,"SYSTEM\CurrentControlSet\Services\green","ErrorControl",0x00010001,0x00000000 +;HKLM,"SYSTEM\CurrentControlSet\Services\green","Group",0x00000000,"Extended base" +;HKLM,"SYSTEM\CurrentControlSet\Services\green","ImagePath",0x00020000,"system32\drivers\green.sys" +;HKLM,"SYSTEM\CurrentControlSet\Services\green","Start",0x00010001,0x00000001 +;HKLM,"SYSTEM\CurrentControlSet\Services\green","Type",0x00010001,0x00000001 +;HKLM,"SYSTEM\CurrentControlSet\Services\green\Parameters","AttachedDevice",0x00000000,"\Device\Serial0" + ; i8042 port driver HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Group",0x00000000,"Keyboard Port"

1 0

[fireball] 38022: - Fix incorrect drivers installation directories. See issue #3689 for more details.
by fireball＠svn.reactos.org 11 Dec '08

11 Dec '08

Author: fireball Date: Thu Dec 11 12:49:20 2008 New Revision: 38022 URL: http://svn.reactos.org/svn/reactos?rev=38022&view=rev Log: - Fix incorrect drivers installation directories. See issue #3689 for more details. Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Thu Dec 11 12:49:20 2008 @@ -611,9 +611,9 @@ modules\rosapps\demos\ddraw\ddraw_demo.exe 1 optional modules\rosapps\demos\maze\maze.exe 1 optional modules\rosapps\dflat32\edit.exe 1 optional -modules\rosapps\drivers\avtest\avtest.sys 1 optional -modules\rosapps\drivers\green\green.sys 1 optional -modules\rosapps\templates\dialog\dialog.exe 1 optional +modules\rosapps\drivers\avtest\avtest.sys 2 optional +modules\rosapps\drivers\green\green.sys 2 optional +modules\rosapps\templates\dialog\dialog.exe 1 optional modules\rostests\winetests\advapi32\advapi32_winetest.exe 7 optional modules\rostests\winetests\advpack\advpack_winetest.exe 7 optional modules\rostests\winetests\browseui\browseui_winetest.exe 7 optional

1 0

[dgoette] 38021: * start implementing the new generator - uses a depency tree to recognize, when he has to generate other entries - uses caching -> reduces time to generate contents more than once - is able to generate nested contents * some bugfixes
by dgoette＠svn.reactos.org 11 Dec '08

11 Dec '08

1 0

[fireball] 38020: Daniel Zimmerman <netzimme@aim.com> - Fix the "OVERRUN STATIC error" in CID 557-574 in explorer (use a byte array instead of a shortfilename-sized array). See issue #3914 for more details.
by fireball＠svn.reactos.org 11 Dec '08

11 Dec '08

Author: fireball Date: Thu Dec 11 11:16:11 2008 New Revision: 38020 URL: http://svn.reactos.org/svn/reactos?rev=38020&view=rev Log: Daniel Zimmerman <netzimme(a)aim.com> - Fix the "OVERRUN STATIC error" in CID 557-574 in explorer (use a byte array instead of a shortfilename-sized array). See issue #3914 for more details. Modified: trunk/reactos/base/shell/explorer/shell/fatfs.cpp Modified: trunk/reactos/base/shell/explorer/shell/fatfs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/fatfs.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/fatfs.cpp [iso-8859-1] Thu Dec 11 11:16:11 2008 @@ -138,6 +138,7 @@ *d = '\0'; } else { // read long file name + s = (const char*)p->Ent->B; TCHAR lname[] = {s[1], s[3], s[5], s[7], s[9], s[14], s[16], s[18], s[20], s[22], s[24], s[28], s[30]}; long_name = String(lname, 13) + long_name;

1 0

[fireball] 38019: - An "almost working" kbhit implementation by Russel. The code is rather crappy, feel free to improve it. Some notes: 1) Forgive my sloppy coding skills (all those LeaveCriticalSections, use of malloc/free), a lot of it was written in a rush to get something going. 2) For some reason, the first char entered isn't detected (on windows and reactos) 3) The thread safety code is questionable, I haven't tested this, but windows does use critical sections for it. 4) Compared to the w
by fireball＠svn.reactos.org 11 Dec '08

11 Dec '08

Author: fireball Date: Thu Dec 11 10:44:07 2008 New Revision: 38019 URL: http://svn.reactos.org/svn/reactos?rev=38019&view=rev Log: - An "almost working" kbhit implementation by Russel. The code is rather crappy, feel free to improve it. Some notes: 1) Forgive my sloppy coding skills (all those LeaveCriticalSections, use of malloc/free), a lot of it was written in a rush to get something going. 2) For some reason, the first char entered isn't detected (on windows and reactos) 3) The thread safety code is questionable, I haven't tested this, but windows does use critical sections for it. 4) Compared to the windows way of doing it, it is probably wrong. 5) Maybe other things as well. But it does work (at least when I tested it on windows and reactos) compared to the previous implementation of it which did not at all. See issue #3747 for more details. Modified: trunk/reactos/lib/sdk/crt/conio/kbhit.c Modified: trunk/reactos/lib/sdk/crt/conio/kbhit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/conio/kbhit.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/conio/kbhit.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/conio/kbhit.c [iso-8859-1] Thu Dec 11 10:44:07 2008 @@ -3,28 +3,99 @@ * PROJECT: ReactOS system libraries * FILE: lib/msvcrt/conio/kbhit.c * PURPOSE: Checks for keyboard hits - * PROGRAMER: Ariadne + * PROGRAMERS: Ariadne, Russell * UPDATE HISTORY: * 28/12/98: Created + * 27/9/08: An almost 100% working version of _kbhit() */ #include <precomp.h> +static CRITICAL_SECTION CriticalSection; +volatile BOOL CriticalSectionInitialized=FALSE; + /* - * FIXME PeekConsoleInput returns more than keyboard hits + * FIXME Initial keyboard char not detected on first punch * - * @unimplemented + * @implemented */ + int _kbhit(void) { - //INPUT_RECORD InputRecord; - DWORD NumberRead=0; - if (char_avail) - return(1); - else { - //FIXME PeekConsoleInput might do DeviceIo - //PeekConsoleInput((HANDLE)stdin->_file,&InputRecord,1,&NumberRead); - return NumberRead; + PINPUT_RECORD InputRecord = NULL; + DWORD NumberRead = 0; + DWORD EventsRead = 0; + DWORD RecordIndex = 0; + DWORD BufferIndex = 0; + HANDLE StdInputHandle = 0; + DWORD ConsoleInputMode = 0; + + /* Attempt some thread safety */ + if (!CriticalSectionInitialized) + { + InitializeCriticalSectionAndSpinCount(&CriticalSection, 0x80000400); + CriticalSectionInitialized = TRUE; } - return 0; + + EnterCriticalSection(&CriticalSection); + + if (char_avail) + { + LeaveCriticalSection(&CriticalSection); + return 1; + } + + StdInputHandle = GetStdHandle(STD_INPUT_HANDLE); + + /* Turn off processed input so we get key modifiers as well */ + GetConsoleMode(StdInputHandle, &ConsoleInputMode); + + SetConsoleMode(StdInputHandle, ConsoleInputMode & ~ENABLE_PROCESSED_INPUT); + + /* Start the process */ + if (!GetNumberOfConsoleInputEvents(StdInputHandle, &EventsRead)) + { + LeaveCriticalSection(&CriticalSection); + return 0; + } + + if (!EventsRead) + { + LeaveCriticalSection(&CriticalSection); + return 0; + } + + if (!(InputRecord = (PINPUT_RECORD)malloc(EventsRead * sizeof(INPUT_RECORD)))) + { + LeaveCriticalSection(&CriticalSection); + return 0; + } + + if (!ReadConsoleInput(StdInputHandle, InputRecord, EventsRead, &NumberRead)) + { + free(InputRecord); + LeaveCriticalSection(&CriticalSection); + return 0; + } + + for (RecordIndex = 0; RecordIndex < NumberRead; RecordIndex++) + { + if (InputRecord[RecordIndex].EventType == KEY_EVENT && + InputRecord[RecordIndex].Event.KeyEvent.bKeyDown) + { + BufferIndex = 1; + break; + } + } + + free(InputRecord); + + /* Restore console input mode */ + SetConsoleMode(StdInputHandle, ConsoleInputMode); + + LeaveCriticalSection(&CriticalSection); + + return BufferIndex; } + +

1 0

[janderwald] 38018: - Implement IDrmPort, IDrmPort2 interface
by janderwald＠svn.reactos.org 11 Dec '08

11 Dec '08

Author: janderwald Date: Thu Dec 11 08:51:57 2008 New Revision: 38018 URL: http://svn.reactos.org/svn/reactos?rev=38018&view=rev Log: - Implement IDrmPort, IDrmPort2 interface Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/drm_port.c (with props) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/drm_port.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/drm_port.c (added) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/drm_port.c [iso-8859-1] Thu Dec 11 08:51:57 2008 @@ -1,0 +1,166 @@ +#include "private.h" + + +const GUID IID_IDrmPort; +const GUID IID_IDrmPort2; + +typedef struct +{ + IDrmPort2Vtbl *lpVtbl; + LONG ref; +}IDrmPort2Impl; + +ULONG +NTAPI +IDrmPort2_fnAddRef( + IN IDrmPort2* iface) +{ + IDrmPort2Impl * This = (IDrmPort2Impl*)iface; + + DPRINT("IDrmPort2_AddRef: This %p\n", This); + + return _InterlockedIncrement(&This->ref); +} + +ULONG +NTAPI +IDrmPort2_fnRelease( + IN IDrmPort2* iface) +{ + IDrmPort2Impl * This = (IDrmPort2Impl*)iface; + + _InterlockedDecrement(&This->ref); + + if (This->ref == 0) + { + ExFreePoolWithTag(This, TAG_PORTCLASS); + return 0; + } + /* Return new reference count */ + return This->ref; +} + +NTSTATUS +NTAPI +IDrmPort2_fnQueryInterface( + IN IDrmPort2* iface, + IN REFIID refiid, + OUT PVOID* Output) +{ + IDrmPort2Impl * This = (IDrmPort2Impl*)iface; + + if (IsEqualGUIDAligned(refiid, &IID_IDrmPort) || + IsEqualGUIDAligned(refiid, &IID_IDrmPort2) || + IsEqualGUIDAligned(refiid, &IID_IUnknown)) + { + *Output = (PVOID)&This->lpVtbl; + _InterlockedIncrement(&This->ref); + return STATUS_SUCCESS; + } + + DPRINT("IDrmPort2_QueryInterface: This %p unknown iid\n", This, This->ref); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +IDrmPort2_fnCreateContentMixed( + IN IDrmPort2 * iface, + IN PULONG paContentId, + IN ULONG cContentId, + OUT PULONG pMixedContentId) +{ + return DrmCreateContentMixed(paContentId, cContentId, pMixedContentId); +} + +NTSTATUS +NTAPI +IDrmPort2_fnDestroyContent( + IN IDrmPort2 * iface, + IN ULONG ContentId) +{ + return DrmDestroyContent(ContentId); +} + +NTSTATUS +NTAPI +IDrmPort2_fnForwardContentToFileObject( + IN IDrmPort2 * iface, + IN ULONG ContentId, + IN PFILE_OBJECT FileObject) +{ + return DrmForwardContentToFileObject(ContentId, FileObject); +} + +NTSTATUS +NTAPI +IDrmPort2_fnForwardContentToInterface( + IN IDrmPort2 * iface, + IN ULONG ContentId, + IN PUNKNOWN pUnknown, + IN ULONG NumMethods) +{ + return DrmForwardContentToInterface(ContentId, pUnknown, NumMethods); +} + +NTSTATUS +NTAPI +IDrmPort2_fnGetContentRights( + IN IDrmPort2 * iface, + IN ULONG ContentId, + OUT PDRMRIGHTS DrmRights) +{ + return DrmGetContentRights(ContentId, DrmRights); +} + +NTSTATUS +NTAPI +IDrmPort2_fnAddContentHandlers( + IN IDrmPort2 * iface, + IN ULONG ContentId, + IN PVOID * paHandlers, + IN ULONG NumHandlers) +{ + return DrmAddContentHandlers(ContentId, paHandlers, NumHandlers); +} + +NTSTATUS +NTAPI +IDrmPort2_fnForwardContentToDeviceObject( + IN IDrmPort2 * iface, + IN ULONG ContentId, + IN PVOID Reserved, + IN PCDRMFORWARD DrmForward) +{ + return DrmForwardContentToDeviceObject(ContentId, Reserved, DrmForward); +} + +static IDrmPort2Vtbl vt_IDrmPort2 = +{ + /* IUnknown methods */ + IDrmPort2_fnQueryInterface, + IDrmPort2_fnAddRef, + IDrmPort2_fnRelease, + IDrmPort2_fnCreateContentMixed, + IDrmPort2_fnDestroyContent, + IDrmPort2_fnForwardContentToFileObject, + IDrmPort2_fnForwardContentToInterface, + IDrmPort2_fnGetContentRights, + IDrmPort2_fnAddContentHandlers, + IDrmPort2_fnForwardContentToDeviceObject +}; + +NTSTATUS +NewIDrmPort( + OUT PDRMPORT2 *OutPort) +{ + IDrmPort2Impl * This = ExAllocatePoolWithTag(NonPagedPool, sizeof(IDrmPort2Impl), TAG_PORTCLASS); + if (!This) + return STATUS_INSUFFICIENT_RESOURCES; + + This->lpVtbl = &vt_IDrmPort2; + This->ref = 1; + + *OutPort = (PDRMPORT2)&This->lpVtbl; + return STATUS_SUCCESS; +} Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/drm_port.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] Thu Dec 11 08:51:57 2008 @@ -13,6 +13,7 @@ <file>dll.c</file> <file>dma_master.c</file> <file>dma_slave.c</file> + <file>drm_port.c</file> <file>adapter.c</file> <file>irp.c</file> <file>interrupt.c</file> Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] Thu Dec 11 08:51:57 2008 @@ -74,6 +74,8 @@ IN PDMA_ADAPTER Adapter, OUT PDMACHANNELSLAVE* DmaChannel); +NTSTATUS NewIDrmPort( + OUT PDRMPORT2 *OutPort); typedef struct {

1 0

[janderwald] 38017: - Add IDrmPort, IDrmPort2 interfaces
by janderwald＠svn.reactos.org 11 Dec '08

11 Dec '08

Author: janderwald Date: Thu Dec 11 08:51:27 2008 New Revision: 38017 URL: http://svn.reactos.org/svn/reactos?rev=38017&view=rev Log: - Add IDrmPort, IDrmPort2 interfaces Modified: trunk/reactos/include/ddk/portcls.h Modified: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/portcls.h [iso-8859-1] Thu Dec 11 08:51:27 2008 @@ -1409,8 +1409,34 @@ These are almost identical, except for the addition of two extra methods. */ -#define DEFINE_ABSTRACT_DRMPORT() -/* TODO */ +#undef INTERFACE +#define INTERFACE IDrmPort + +#if (NTDDI_VERSION >= NTDDI_WINXP) +DEFINE_GUID(IID_IDrmPort, 0x286D3DF8L, 0xCA22, 0x4E2E, 0xB9, 0xBC, 0x20, 0xB4, 0xF0, 0xE2, 0x01, 0xCE); +#endif + +#define DEFINE_ABSTRACT_DRMPORT() \ + STDMETHOD_(NTSTATUS,CreateContentMixed)(THIS_ \ + IN PULONG paContentId, \ + IN ULONG cContentId, \ + OUT PULONG pMixedContentId)PURE; \ + \ + STDMETHOD_(NTSTATUS,DestroyContent)(THIS_ \ + IN ULONG ContentId)PURE; \ + \ + STDMETHOD_(NTSTATUS,ForwardContentToFileObject)(THIS_ \ + IN ULONG ContentId, \ + IN PFILE_OBJECT FileObject)PURE; \ + \ + STDMETHOD_(NTSTATUS,ForwardContentToInterface)(THIS_ \ + IN ULONG ContentId, \ + IN PUNKNOWN pUnknown, \ + IN ULONG NumMethods)PURE; \ + \ + STDMETHOD_(NTSTATUS,GetContentRights)(THIS_ \ + IN ULONG ContentId, \ + OUT PDRMRIGHTS DrmRights)PURE; DECLARE_INTERFACE_(IDrmPort, IUnknown) { @@ -1420,15 +1446,45 @@ typedef IDrmPort *PDRMPORT; -/* TODO */ - +/* =============================================================== + IDrmPort2 Interface +*/ + +#undef INTERFACE +#define INTERFACE IDrmPort2 + +#if (NTDDI_VERSION >= NTDDI_WINXP) +DEFINE_GUID(IID_IDrmPort2, 0x1ACCE59CL, 0x7311, 0x4B6B, 0x9F, 0xBA, 0xCC, 0x3B, 0xA5, 0x9A, 0xCD, 0xCE); +#endif + +DECLARE_INTERFACE_(IDrmPort2, IDrmPort) +{ + DEFINE_ABSTRACT_UNKNOWN() + DEFINE_ABSTRACT_DRMPORT() + + STDMETHOD_(NTSTATUS,AddContentHandlers)(THIS_ + IN ULONG ContentId, + IN PVOID * paHandlers, + IN ULONG NumHandlers)PURE; + + STDMETHOD_(NTSTATUS,ForwardContentToDeviceObject)(THIS_ + IN ULONG ContentId, + IN PVOID Reserved, + IN PCDRMFORWARD DrmForward)PURE; +}; + +typedef IDrmPort2 *PDRMPORT2; /* =============================================================== IPortClsVersion Interface */ +#undef INTERFACE +#define INTERFACE IPortClsVersion DECLARE_INTERFACE_(IPortClsVersion, IUnknown) { + DEFINE_ABSTRACT_UNKNOWN() + STDMETHOD_(DWORD, GetVersion)(THIS) PURE; };

1 0

[fireball] 38016: - Add Dll Characteristics defines.
by fireball＠svn.reactos.org 11 Dec '08

11 Dec '08

Author: fireball Date: Thu Dec 11 06:50:37 2008 New Revision: 38016 URL: http://svn.reactos.org/svn/reactos?rev=38016&view=rev Log: - Add Dll Characteristics defines. Modified: trunk/reactos/include/ddk/ntimage.h Modified: trunk/reactos/include/ddk/ntimage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntimage.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/ntimage.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntimage.h [iso-8859-1] Thu Dec 11 06:50:37 2008 @@ -419,7 +419,17 @@ ((NtHeader))->FileHeader.SizeOfOptionalHeader \ )) - +// +// Dll Characteristics +// +#define IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE 0x0040 +#define IMAGE_DLLCHARACTERISTICS_FORCE_INTEGRITY 0x0080 +#define IMAGE_DLLCHARACTERISTICS_NX_COMPAT 0x0100 +#define IMAGE_DLLCHARACTERISTICS_NO_ISOLATION 0x0200 +#define IMAGE_DLLCHARACTERISTICS_NO_SEH 0x0400 +#define IMAGE_DLLCHARACTERISTICS_NO_BIND 0x0800 +#define IMAGE_DLLCHARACTERISTICS_WDM_DRIVER 0x2000 +#define IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE 0x8000 // // Directory Entry Specifiers

1 0

[tkreuzer] 38015: fix declaration of FrLdrDbgPrint
by tkreuzer＠svn.reactos.org 11 Dec '08

11 Dec '08

Author: tkreuzer Date: Thu Dec 11 05:40:04 2008 New Revision: 38015 URL: http://svn.reactos.org/svn/reactos?rev=38015&view=rev Log: fix declaration of FrLdrDbgPrint Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ntoskrnl.h Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] Thu Dec 11 05:40:04 2008 @@ -70,7 +70,7 @@ #include "hal.h" #include "arch/intrin_i.h" -ULONG (*FrLdrDbgPrint)(const char *Format, ...); +extern ULONG (*FrLdrDbgPrint)(const char *Format, ...); #include <pshpack1.h> /*

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2008