Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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

[tkreuzer] 38014: Update KTRAP_FRAME offsets
by tkreuzer＠svn.reactos.org 11 Dec '08

11 Dec '08

Author: tkreuzer Date: Thu Dec 11 05:38:57 2008 New Revision: 38014 URL: http://svn.reactos.org/svn/reactos?rev=38014&view=rev Log: Update KTRAP_FRAME offsets Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h [iso-8859-1] Thu Dec 11 05:38:57 2008 @@ -84,7 +84,7 @@ #define KTRAP_FRAME_R9 0x50 #define KTRAP_FRAME_R10 0x58 #define KTRAP_FRAME_R11 0x60 -#define KTRAP_FRAME_Spare0 0x68 +#define KTRAP_FRAME_GsBase 0x68 #define KTRAP_FRAME_Xmm0 0x70 #define KTRAP_FRAME_Xmm1 0x80 #define KTRAP_FRAME_Xmm2 0x90 @@ -115,9 +115,11 @@ #define KTRAP_FRAME_ErrorCode 0x160 #define KTRAP_FRAME_Rip 0x168 #define KTRAP_FRAME_SegCs 0x170 +#define KTRAP_FRAME_Logging 0x173 #define KTRAP_FRAME_EFlags 0x178 #define KTRAP_FRAME_Rsp 0x180 #define KTRAP_FRAME_SegSs 0x188 +#define KTRAP_FRAME_CodePatchCycle 0x18c #define SIZE_KTRAP_FRAME 0x190 #define KTRAP_FRAME_ALIGN 0x10 #define KTRAP_FRAME_LENGTH 0x190

1 0

[tkreuzer] 38013: fix KTRAP_FRAME
by tkreuzer＠svn.reactos.org 11 Dec '08

11 Dec '08

Author: tkreuzer Date: Thu Dec 11 05:38:17 2008 New Revision: 38013 URL: http://svn.reactos.org/svn/reactos?rev=38013&view=rev Log: fix KTRAP_FRAME Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] Thu Dec 11 05:38:17 2008 @@ -163,30 +163,45 @@ UINT64 R9; UINT64 R10; UINT64 R11; - UINT64 GsBase; - UINT64 GsSwap; + union + { + UINT64 GsBase; + UINT64 GsSwap; + }; M128A Xmm0; M128A Xmm1; M128A Xmm2; M128A Xmm3; M128A Xmm4; M128A Xmm5; - UINT64 FaultAddress; - UINT64 ContextRecord; - UINT64 TimeStampCKCL; + union + { + UINT64 FaultAddress; + UINT64 ContextRecord; + UINT64 TimeStampCKCL; + }; UINT64 Dr0; UINT64 Dr1; UINT64 Dr2; UINT64 Dr3; UINT64 Dr6; UINT64 Dr7; - UINT64 DebugControl; - UINT64 LastBranchToRip; - UINT64 LastBranchFromRip; - UINT64 LastExceptionToRip; - UINT64 LastExceptionFromRip; - UINT64 LastBranchControl; - ULONG LastBranchMSR; + union + { + struct + { + UINT64 DebugControl; + UINT64 LastBranchToRip; + UINT64 LastBranchFromRip; + UINT64 LastExceptionToRip; + UINT64 LastExceptionFromRip; + }; + struct + { + UINT64 LastBranchControl; + ULONG LastBranchMSR; + }; + }; USHORT SegDs; USHORT SegEs; USHORT SegFs; @@ -196,9 +211,12 @@ UINT64 Rdi; UINT64 Rsi; UINT64 Rbp; - UINT64 ErrorCode; - UINT64 ExceptionFrame; - UINT64 TimeStampKlog; + union + { + UINT64 ErrorCode; + UINT64 ExceptionFrame; + UINT64 TimeStampKlog; + }; UINT64 Rip; USHORT SegCs; UCHAR Fill0;

1 0

[cwittich] 38012: convert most of syssetup to unicode
by cwittich＠svn.reactos.org 11 Dec '08

11 Dec '08

Author: cwittich Date: Thu Dec 11 05:24:32 2008 New Revision: 38012 URL: http://svn.reactos.org/svn/reactos?rev=38012&view=rev Log: convert most of syssetup to unicode Modified: trunk/reactos/dll/win32/syssetup/globals.h trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/globals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/globals… ============================================================================== --- trunk/reactos/dll/win32/syssetup/globals.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/globals.h [iso-8859-1] Thu Dec 11 05:24:32 2008 @@ -30,9 +30,9 @@ { struct _TIMEZONE_ENTRY *Prev; struct _TIMEZONE_ENTRY *Next; - TCHAR Description[64]; /* 'Display' */ - TCHAR StandardName[32]; /* 'Std' */ - TCHAR DaylightName[32]; /* 'Dlt' */ + WCHAR Description[64]; /* 'Display' */ + WCHAR StandardName[32]; /* 'Std' */ + WCHAR DaylightName[32]; /* 'Dlt' */ TZ_INFO TimezoneInfo; /* 'TZI' */ ULONG Index; } TIMEZONE_ENTRY, *PTIMEZONE_ENTRY; @@ -41,10 +41,10 @@ { HFONT hTitleFont; - TCHAR OwnerName[51]; - TCHAR OwnerOrganization[51]; - TCHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1]; /* max. 63 characters */ - TCHAR AdminPassword[15]; /* max. 14 characters */ + WCHAR OwnerName[51]; + WCHAR OwnerOrganization[51]; + WCHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1]; /* max. 63 characters */ + WCHAR AdminPassword[15]; /* max. 14 characters */ BOOL UnattendSetup; BOOL DisableVmwInst; DWORD BootCDRegtestActive; Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Thu Dec 11 05:24:32 2008 @@ -304,13 +304,13 @@ CreateTempDir( IN LPCWSTR VarName) { - TCHAR szTempDir[MAX_PATH]; - TCHAR szBuffer[MAX_PATH]; + WCHAR szTempDir[MAX_PATH]; + WCHAR szBuffer[MAX_PATH]; DWORD dwLength; HKEY hKey; - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, - _T("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment"), + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment", 0, KEY_QUERY_VALUE, &hKey)) @@ -320,8 +320,8 @@ } /* Get temp dir */ - dwLength = MAX_PATH * sizeof(TCHAR); - if (RegQueryValueEx(hKey, + dwLength = MAX_PATH * sizeof(WCHAR); + if (RegQueryValueExW(hKey, VarName, NULL, NULL, @@ -334,7 +334,7 @@ } /* Expand it */ - if (!ExpandEnvironmentStrings(szBuffer, + if (!ExpandEnvironmentStringsW(szBuffer, szTempDir, MAX_PATH)) { @@ -344,7 +344,7 @@ } /* Create profiles directory */ - if (!CreateDirectory(szTempDir, NULL)) + if (!CreateDirectoryW(szTempDir, NULL)) { if (GetLastError() != ERROR_ALREADY_EXISTS) { @@ -362,11 +362,11 @@ InstallSysSetupInfDevices(VOID) { INFCONTEXT InfContext; - TCHAR LineBuffer[256]; + WCHAR LineBuffer[256]; DWORD LineLength; - if (!SetupFindFirstLine(hSysSetupInf, - _T("DeviceInfsToInstall"), + if (!SetupFindFirstLineW(hSysSetupInf, + L"DeviceInfsToInstall", NULL, &InfContext)) { @@ -375,7 +375,7 @@ do { - if (!SetupGetStringField(&InfContext, + if (!SetupGetStringFieldW(&InfContext, 0, LineBuffer, sizeof(LineBuffer)/sizeof(LineBuffer[0]), @@ -384,7 +384,7 @@ return FALSE; } - if (!SetupDiInstallClass(NULL, LineBuffer, DI_QUIETINSTALL, NULL)) + if (!SetupDiInstallClassW(NULL, LineBuffer, DI_QUIETINSTALL, NULL)) { return FALSE; } @@ -397,12 +397,12 @@ InstallSysSetupInfComponents(VOID) { INFCONTEXT InfContext; - TCHAR NameBuffer[256]; - TCHAR SectionBuffer[256]; + WCHAR NameBuffer[256]; + WCHAR SectionBuffer[256]; HINF hComponentInf = INVALID_HANDLE_VALUE; - if (!SetupFindFirstLine(hSysSetupInf, - _T("Infs.Always"), + if (!SetupFindFirstLineW(hSysSetupInf, + L"Infs.Always", NULL, &InfContext)) { @@ -412,7 +412,7 @@ { do { - if (!SetupGetStringField(&InfContext, + if (!SetupGetStringFieldW(&InfContext, 1, // Get the component name NameBuffer, sizeof(NameBuffer)/sizeof(NameBuffer[0]), @@ -422,7 +422,7 @@ return FALSE; } - if (!SetupGetStringField(&InfContext, + if (!SetupGetStringFieldW(&InfContext, 2, // Get the component install section SectionBuffer, sizeof(SectionBuffer)/sizeof(SectionBuffer[0]), @@ -445,7 +445,7 @@ return FALSE; } - if (!SetupInstallFromInfSection(NULL, + if (!SetupInstallFromInfSectionW(NULL, hComponentInf, SectionBuffer, SPINST_ALL, @@ -481,18 +481,18 @@ if (hSCManager == NULL) goto cleanup; - hService = OpenService(hSCManager, _T("PlugPlay"), SERVICE_CHANGE_CONFIG | SERVICE_START); + hService = OpenServiceW(hSCManager, L"PlugPlay", SERVICE_CHANGE_CONFIG | SERVICE_START); if (hService == NULL) goto cleanup; - ret = ChangeServiceConfig( + ret = ChangeServiceConfigW( hService, SERVICE_NO_CHANGE, SERVICE_AUTO_START, SERVICE_NO_CHANGE, NULL, NULL, NULL, NULL, NULL, NULL, NULL); if (!ret) goto cleanup; - ret = StartService(hService, 0, NULL); + ret = StartServiceW(hService, 0, NULL); if (!ret) goto cleanup; @@ -520,11 +520,11 @@ { case WM_INITDIALOG: { - TCHAR szMsg[256]; - - if (!LoadString(hDllInstance, IDS_STATUS_INSTALL_DEV, szMsg, sizeof(szMsg)/sizeof(szMsg[0]))) + WCHAR szMsg[256]; + + if (!LoadStringW(hDllInstance, IDS_STATUS_INSTALL_DEV, szMsg, sizeof(szMsg)/sizeof(szMsg[0]))) return FALSE; - SetDlgItemText(hwndDlg, IDC_STATUSLABEL, szMsg); + SetDlgItemTextW(hwndDlg, IDC_STATUSLABEL, szMsg); return TRUE; } } @@ -705,7 +705,7 @@ DWORD WINAPI InstallLiveCD(IN HINSTANCE hInstance) { - STARTUPINFO StartupInfo; + STARTUPINFOW StartupInfo; PROCESS_INFORMATION ProcessInformation; BOOL res; @@ -714,15 +714,15 @@ SetupCloseInfFile(hSysSetupInf); /* Run the shell */ - StartupInfo.cb = sizeof(StartupInfo); + StartupInfo.cb = sizeof(STARTUPINFOW); StartupInfo.lpReserved = NULL; StartupInfo.lpDesktop = NULL; StartupInfo.lpTitle = NULL; StartupInfo.dwFlags = 0; StartupInfo.cbReserved2 = 0; StartupInfo.lpReserved2 = 0; - res = CreateProcess( - _T("userinit.exe"), + res = CreateProcessW( + L"userinit.exe", NULL, NULL, NULL, @@ -738,10 +738,10 @@ return 0; cleanup: - MessageBoxA( + MessageBoxW( NULL, - "You can shutdown your computer, or press ENTER to reboot", - "ReactOS LiveCD", + L"You can shutdown your computer, or press ENTER to reboot", + L"ReactOS LiveCD", MB_OK); return 0; } Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Thu Dec 11 05:24:32 2008 @@ -14,7 +14,6 @@ #include <windows.h> #include <windowsx.h> #include <commctrl.h> -#include <tchar.h> #include <string.h> #include <setupapi.h> #include <pseh/pseh2.h> @@ -71,12 +70,12 @@ PROCESS_INFORMATION ProcInfo; MSG msg; DWORD ret; - STARTUPINFO si = {0}; + STARTUPINFOW si = {0}; WCHAR InstallName[] = L"vmwinst.exe"; si.cb = sizeof(STARTUPINFO); - if(CreateProcess(NULL, InstallName, NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS, + if(CreateProcessW(NULL, InstallName, NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS, NULL, NULL, &si, &ProcInfo)) { EnableWindow(hWnd, FALSE); @@ -132,13 +131,13 @@ static HFONT CreateTitleFont(VOID) { - NONCLIENTMETRICS ncm; + NONCLIENTMETRICSW ncm; LOGFONTW LogFont; HDC hdc; INT FontSize; HFONT hFont; - ncm.cbSize = sizeof(NONCLIENTMETRICS); + ncm.cbSize = sizeof(NONCLIENTMETRICSW); SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); LogFont = ncm.lfMessageFont; @@ -171,7 +170,7 @@ switch (uMsg) { case WM_INITDIALOG: - GplTextResource = FindResource(hDllInstance, MAKEINTRESOURCE(IDR_GPL), _T("RT_TEXT")); + GplTextResource = FindResourceW(hDllInstance, MAKEINTRESOURCE(IDR_GPL), L"RT_TEXT"); if (NULL == GplTextResource) { break; @@ -323,7 +322,7 @@ { return FALSE; } - ProjectsCount = LoadString(hDllInstance, IDS_ACKPROJECTS, Projects, ProjectsSize); + ProjectsCount = LoadStringW(hDllInstance, IDS_ACKPROJECTS, Projects, ProjectsSize); if (0 == ProjectsCount) { HeapFree(GetProcessHeap(), 0, Projects); @@ -401,16 +400,16 @@ static BOOL -WriteOwnerSettings(TCHAR * OwnerName, - TCHAR * OwnerOrganization) +WriteOwnerSettings(WCHAR * OwnerName, + WCHAR * OwnerOrganization) { HKEY hKey; LONG res; - res = RegOpenKeyEx(HKEY_LOCAL_MACHINE, - _T("Software\\Microsoft\\Windows NT\\CurrentVersion"), + res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"Software\\Microsoft\\Windows NT\\CurrentVersion", 0, KEY_ALL_ACCESS, &hKey); @@ -420,12 +419,12 @@ return FALSE; } - res = RegSetValueEx(hKey, - _T("RegisteredOwner"), + res = RegSetValueExW(hKey, + L"RegisteredOwner", 0, REG_SZ, (LPBYTE)OwnerName, - (_tcslen(OwnerName) + 1) * sizeof(TCHAR)); + (wcslen(OwnerName) + 1) * sizeof(WCHAR)); if (res != ERROR_SUCCESS) { @@ -433,12 +432,12 @@ return FALSE; } - res = RegSetValueEx(hKey, - _T("RegisteredOrganization"), + res = RegSetValueExW(hKey, + L"RegisteredOrganization", 0, REG_SZ, (LPBYTE)OwnerOrganization, - (_tcslen(OwnerOrganization) + 1) * sizeof(TCHAR)); + (wcslen(OwnerOrganization) + 1) * sizeof(WCHAR)); RegCloseKey(hKey); return (res == ERROR_SUCCESS); @@ -450,8 +449,8 @@ WPARAM wParam, LPARAM lParam) { - TCHAR OwnerName[51]; - TCHAR OwnerOrganization[51]; + WCHAR OwnerName[51]; + WCHAR OwnerOrganization[51]; WCHAR Title[64]; WCHAR ErrorName[256]; LPNMHDR lpnm; @@ -492,7 +491,7 @@ case PSN_WIZNEXT: OwnerName[0] = 0; - if (GetDlgItemText(hwndDlg, IDC_OWNERNAME, OwnerName, 50) == 0) + if (GetDlgItemTextW(hwndDlg, IDC_OWNERNAME, OwnerName, 50) == 0) { if (0 == LoadStringW(hDllInstance, IDS_REACTOS_SETUP, Title, sizeof(Title) / sizeof(Title[0]))) { @@ -502,7 +501,7 @@ { wcscpy(ErrorName, L"Setup cannot continue until you enter your name."); } - MessageBox(hwndDlg, ErrorName, Title, MB_ICONERROR | MB_OK); + MessageBoxW(hwndDlg, ErrorName, Title, MB_ICONERROR | MB_OK); SetFocus(GetDlgItem(hwndDlg, IDC_OWNERNAME)); SetWindowLong(hwndDlg, DWL_MSGRESULT, -1); @@ -538,11 +537,11 @@ } static BOOL -WriteComputerSettings(TCHAR * ComputerName, HWND hwndDlg) +WriteComputerSettings(WCHAR * ComputerName, HWND hwndDlg) { WCHAR Title[64]; WCHAR ErrorComputerName[256]; - if (!SetComputerName(ComputerName)) + if (!SetComputerNameW(ComputerName)) { if (0 == LoadStringW(hDllInstance, IDS_REACTOS_SETUP, Title, sizeof(Title) / sizeof(Title[0]))) { @@ -559,7 +558,7 @@ } /* Try to also set DNS hostname */ - SetComputerNameEx(ComputerNamePhysicalDnsHostname, ComputerName); + SetComputerNameExW(ComputerNamePhysicalDnsHostname, ComputerName); return TRUE; } @@ -570,9 +569,9 @@ WPARAM wParam, LPARAM lParam) { - TCHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1]; - TCHAR Password1[15]; - TCHAR Password2[15]; + WCHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1]; + WCHAR Password1[15]; + WCHAR Password2[15]; PWCHAR Password; WCHAR Title[64]; WCHAR EmptyComputerName[256], NotMatchPassword[256], WrongPassword[256]; @@ -590,10 +589,10 @@ { /* Retrieve current computer name */ Length = MAX_COMPUTERNAME_LENGTH + 1; - GetComputerName(ComputerName, &Length); + GetComputerNameW(ComputerName, &Length); /* Display current computer name */ - SetDlgItemText(hwndDlg, IDC_COMPUTERNAME, ComputerName); + SetDlgItemTextW(hwndDlg, IDC_COMPUTERNAME, ComputerName); /* Set text limits */ SendDlgItemMessage(hwndDlg, IDC_COMPUTERNAME, EM_LIMITTEXT, 64, 0); @@ -630,7 +629,7 @@ break; case PSN_WIZNEXT: - if (GetDlgItemText(hwndDlg, IDC_COMPUTERNAME, ComputerName, 64) == 0) + if (GetDlgItemTextW(hwndDlg, IDC_COMPUTERNAME, ComputerName, 64) == 0) { if (0 == LoadStringW(hDllInstance, IDS_WZD_COMPUTERNAME, EmptyComputerName, sizeof(EmptyComputerName) / sizeof(EmptyComputerName[0]))) @@ -668,11 +667,11 @@ return TRUE; } #else - GetDlgItemText(hwndDlg, IDC_ADMINPASSWORD1, Password1, 15); - GetDlgItemText(hwndDlg, IDC_ADMINPASSWORD2, Password2, 15); + GetDlgItemTextW(hwndDlg, IDC_ADMINPASSWORD1, Password1, 15); + GetDlgItemTextW(hwndDlg, IDC_ADMINPASSWORD2, Password2, 15); #endif /* Check if passwords match */ - if (_tcscmp(Password1, Password2)) + if (wcscmp(Password1, Password2)) { if (0 == LoadStringW(hDllInstance, IDS_WZD_PASSWORDMATCH, NotMatchPassword, sizeof(NotMatchPassword) / sizeof(NotMatchPassword[0]))) @@ -894,7 +893,7 @@ WCHAR szPath[MAX_PATH]; if (GetRosInstallCD(szPath, MAX_PATH)) { - wsprintf(szBuffer, L"rundll32.exe shell32.dll,Control_RunDLL intl.cpl,,/f:\"%s\\reactos\\unattend.inf\"", szPath); + swprintf(szBuffer, L"rundll32.exe shell32.dll,Control_RunDLL intl.cpl,,/f:\"%S\\reactos\\unattend.inf\"", szPath); } else { @@ -949,7 +948,7 @@ static VOID CreateTimeZoneList(PSETUPDATA SetupData) { - TCHAR szKeyName[256]; + WCHAR szKeyName[256]; DWORD dwIndex; DWORD dwNameSize; DWORD dwValueSize; @@ -960,8 +959,8 @@ PTIMEZONE_ENTRY Entry; PTIMEZONE_ENTRY Current; - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, - _T("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones"), + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones", 0, KEY_ALL_ACCESS, &hZonesKey)) @@ -970,8 +969,8 @@ dwIndex = 0; while (TRUE) { - dwNameSize = 256 * sizeof(TCHAR); - lError = RegEnumKeyEx(hZonesKey, + dwNameSize = 256 * sizeof(WCHAR); + lError = RegEnumKeyExW(hZonesKey, dwIndex, szKeyName, &dwNameSize, @@ -982,7 +981,7 @@ if (lError != ERROR_SUCCESS && lError != ERROR_MORE_DATA) break; - if (RegOpenKeyEx(hZonesKey, + if (RegOpenKeyExW(hZonesKey, szKeyName, 0, KEY_ALL_ACCESS, @@ -997,8 +996,8 @@ } dwValueSize = 64 * sizeof(TCHAR); - if (RegQueryValueEx(hZoneKey, - _T("Display"), + if (RegQueryValueExW(hZoneKey, + L"Display", NULL, NULL, (LPBYTE)&Entry->Description, @@ -1009,8 +1008,8 @@ } dwValueSize = 32 * sizeof(TCHAR); - if (RegQueryValueEx(hZoneKey, - _T("Std"), + if (RegQueryValueExW(hZoneKey, + L"Std", NULL, NULL, (LPBYTE)&Entry->StandardName, @@ -1021,8 +1020,8 @@ } dwValueSize = 32 * sizeof(WCHAR); - if (RegQueryValueEx(hZoneKey, - _T("Dlt"), + if (RegQueryValueExW(hZoneKey, + L"Dlt", NULL, NULL, (LPBYTE)&Entry->DaylightName, @@ -1033,8 +1032,8 @@ } dwValueSize = sizeof(DWORD); - if (RegQueryValueEx(hZoneKey, - _T("Index"), + if (RegQueryValueExW(hZoneKey, + L"Index", NULL, NULL, (LPBYTE)&Entry->Index, @@ -1045,8 +1044,8 @@ } dwValueSize = sizeof(TZ_INFO); - if (RegQueryValueEx(hZoneKey, - _T("TZI"), + if (RegQueryValueExW(hZoneKey, + L"TZI", NULL, NULL, (LPBYTE)&Entry->TimezoneInfo, @@ -1129,26 +1128,26 @@ static BOOL GetTimeZoneListIndex(LPDWORD lpIndex) { - TCHAR szLanguageIdString[9]; + WCHAR szLanguageIdString[9]; HKEY hKey; DWORD dwValueSize; DWORD Length; - LPTSTR Buffer; - LPTSTR Ptr; - LPTSTR End; + LPWSTR Buffer; + LPWSTR Ptr; + LPWSTR End; BOOL bFound = FALSE; unsigned long iLanguageID; - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, - _T("SYSTEM\\CurrentControlSet\\Control\\NLS\\Language"), + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Control\\NLS\\Language", 0, KEY_ALL_ACCESS, &hKey)) return FALSE; dwValueSize = 9 * sizeof(TCHAR); - if (RegQueryValueEx(hKey, - _T("Default"), + if (RegQueryValueExW(hKey, + L"Default", NULL, NULL, (LPBYTE)szLanguageIdString, @@ -1158,19 +1157,19 @@ return FALSE; } - iLanguageID = _tcstoul(szLanguageIdString, NULL, 16); + iLanguageID = wcstoul(szLanguageIdString, NULL, 16); RegCloseKey(hKey); - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, - _T("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones"), + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones", 0, KEY_ALL_ACCESS, &hKey)) return FALSE; dwValueSize = 0; - if (RegQueryValueEx(hKey, - _T("IndexMapping"), + if (RegQueryValueExW(hKey, + L"IndexMapping", NULL, NULL, NULL, @@ -1187,8 +1186,8 @@ return FALSE; } - if (RegQueryValueEx(hKey, - _T("IndexMapping"), + if (RegQueryValueExW(hKey, + L"IndexMapping", NULL, NULL, (LPBYTE)Buffer, @@ -1204,8 +1203,8 @@ Ptr = Buffer; while (*Ptr != 0) { - Length = _tcslen(Ptr); - if (_tcstoul(Ptr, NULL, 16) == iLanguageID) + Length = wcslen(Ptr); + if (wcstoul(Ptr, NULL, 16) == iLanguageID) bFound = TRUE; Ptr = Ptr + Length + 1; @@ -1214,12 +1213,12 @@ if (bFound) { - *lpIndex = _tcstoul(Ptr, &End, 10); + *lpIndex = wcstoul(Ptr, &End, 10); HeapFree(GetProcessHeap(), 0, Buffer); return TRUE; } - Length = _tcslen(Ptr); + Length = wcslen(Ptr); Ptr = Ptr + Length + 1; } @@ -1283,9 +1282,9 @@ Entry = Entry->Next; } - _tcscpy(TimeZoneInformation.StandardName, + wcscpy(TimeZoneInformation.StandardName, Entry->StandardName); - _tcscpy(TimeZoneInformation.DaylightName, + wcscpy(TimeZoneInformation.DaylightName, Entry->DaylightName); TimeZoneInformation.Bias = Entry->TimezoneInfo.Bias; @@ -2028,38 +2027,38 @@ ProcessUnattendInf(HINF hUnattendedInf) { INFCONTEXT InfContext; - TCHAR szName[256]; - TCHAR szValue[MAX_PATH]; + WCHAR szName[256]; + WCHAR szValue[MAX_PATH]; DWORD LineLength; HKEY hKey; - if (!SetupFindFirstLine(hUnattendedInf, - _T("Unattend"), - _T("UnattendSetupEnabled"), + if (!SetupFindFirstLineW(hUnattendedInf, + L"Unattend", + L"UnattendSetupEnabled", &InfContext)) { DPRINT1("Error: Cant find UnattendSetupEnabled Key! %d\n", GetLastError()); return FALSE; } - if (!SetupGetStringField(&InfContext, + if (!SetupGetStringFieldW(&InfContext, 1, szValue, - sizeof(szValue) / sizeof(TCHAR), + sizeof(szValue) / sizeof(WCHAR), &LineLength)) { DPRINT1("Error: SetupGetStringField failed with %d\n", GetLastError()); return FALSE; } - if (_tcscmp(szValue, _T("yes")) != 0) + if (wcscmp(szValue, L"yes") != 0) { DPRINT("Unattend setup was disabled by UnattendSetupEnabled key.\n"); return FALSE; } - if (!SetupFindFirstLine(hUnattendedInf, - _T("Unattend"), + if (!SetupFindFirstLineW(hUnattendedInf, + L"Unattend", NULL, &InfContext)) { @@ -2070,79 +2069,79 @@ do { - if (!SetupGetStringField(&InfContext, + if (!SetupGetStringFieldW(&InfContext, 0, szName, - sizeof(szName) / sizeof(TCHAR), + sizeof(szName) / sizeof(WCHAR), &LineLength)) { DPRINT1("Error: SetupGetStringField failed with %d\n", GetLastError()); return FALSE; } - if (!SetupGetStringField(&InfContext, + if (!SetupGetStringFieldW(&InfContext, 1, szValue, - sizeof(szValue) / sizeof(TCHAR), + sizeof(szValue) / sizeof(WCHAR), &LineLength)) { DPRINT1("Error: SetupGetStringField failed with %d\n", GetLastError()); return FALSE; } DPRINT1("Name %S Value %S\n",szName, szValue); - if (!_tcscmp(szName, _T("FullName"))) + if (!wcscmp(szName, L"FullName")) { if ((sizeof(SetupData.OwnerName) / sizeof(TCHAR)) > LineLength) { - _tcscpy(SetupData.OwnerName, szValue); + wcscpy(SetupData.OwnerName, szValue); } } - else if (!_tcscmp(szName, _T("OrgName"))) + else if (!wcscmp(szName, L"OrgName")) { - if ((sizeof(SetupData.OwnerOrganization) / sizeof(TCHAR)) > LineLength) + if ((sizeof(SetupData.OwnerOrganization) / sizeof(WCHAR)) > LineLength) { - _tcscpy(SetupData.OwnerOrganization, szValue); + wcscpy(SetupData.OwnerOrganization, szValue); } } - else if (!_tcscmp(szName, _T("ComputerName"))) + else if (!wcscmp(szName, L"ComputerName")) { - if ((sizeof(SetupData.ComputerName) / sizeof(TCHAR)) > LineLength) - { - _tcscpy(SetupData.ComputerName, szValue); - } - } - else if (!_tcscmp(szName, _T("AdminPassword"))) + if ((sizeof(SetupData.ComputerName) / sizeof(WCHAR)) > LineLength) + { + wcscpy(SetupData.ComputerName, szValue); + } + } + else if (!wcscmp(szName, L"AdminPassword")) { - if ((sizeof(SetupData.AdminPassword) / sizeof(TCHAR)) > LineLength) + if ((sizeof(SetupData.AdminPassword) / sizeof(WCHAR)) > LineLength) { - _tcscpy(SetupData.AdminPassword, szValue); + wcscpy(SetupData.AdminPassword, szValue); } } - else if (!_tcscmp(szName, _T("TimeZoneIndex"))) + else if (!wcscmp(szName, L"TimeZoneIndex")) { - SetupData.TimeZoneIndex = _ttoi(szValue); + SetupData.TimeZoneIndex = _wtoi(szValue); } - else if (!_tcscmp(szName, _T("DisableAutoDaylightTimeSet"))) + else if (!wcscmp(szName, L"DisableAutoDaylightTimeSet")) { - SetupData.DisableAutoDaylightTimeSet = _ttoi(szValue); + SetupData.DisableAutoDaylightTimeSet = _wtoi(szValue); } - else if (!_tcscmp(szName, _T("DisableVmwInst"))) + else if (!wcscmp(szName, L"DisableVmwInst")) { - if(!_tcscmp(szValue, _T("yes"))) + if(!wcscmp(szValue, L"yes")) SetupData.DisableVmwInst = 1; else SetupData.DisableVmwInst = 0; } - else if (!_tcscmp(szName, _T("BootCDRegTestActive"))) + else if (!wcscmp(szName, L"BootCDRegTestActive")) { - SetupData.BootCDRegtestActive = _ttoi(szValue); + SetupData.BootCDRegtestActive = _wtoi(szValue); } } while (SetupFindNextLine(&InfContext, &InfContext)); - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, - _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\RunOnce"), + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\RunOnce", 0, KEY_SET_VALUE, &hKey) != ERROR_SUCCESS) @@ -2152,8 +2151,8 @@ } - if (SetupFindFirstLine(hUnattendedInf, - _T("GuiRunOnce"), + if (SetupFindFirstLineW(hUnattendedInf, + L"GuiRunOnce", NULL, &InfContext)) { @@ -2161,25 +2160,25 @@ int i = 0; do { - if(SetupGetStringField(&InfContext, + if(SetupGetStringFieldW(&InfContext, 0, szValue, - sizeof(szValue) / sizeof(TCHAR), + sizeof(szValue) / sizeof(WCHAR), NULL)) { - TCHAR szPath[MAX_PATH]; - _stprintf(szName, _T("%d"), i); + WCHAR szPath[MAX_PATH]; + swprintf(szName, L"%d", i); DPRINT("szName %S szValue %S\n", szName, szValue); - if (ExpandEnvironmentStrings(szValue, szPath, MAX_PATH)) + if (ExpandEnvironmentStringsW(szValue, szPath, MAX_PATH)) { DPRINT("value %S\n", szPath); - if (RegSetValueEx(hKey, + if (RegSetValueExW(hKey, szName, 0, REG_SZ, (const BYTE*)szPath, - (_tcslen(szPath)+1) * sizeof(TCHAR)) == ERROR_SUCCESS) + (wcslen(szPath)+1) * sizeof(WCHAR)) == ERROR_SUCCESS) { i++; } @@ -2272,7 +2271,7 @@ for (dwIndex = 0; dwIndex < dwLength; dwIndex++) { szDrive[0] = pDrive[dwIndex]; - if (GetDriveType(szDrive) == DRIVE_CDROM) + if (GetDriveTypeW(szDrive) == DRIVE_CDROM) { WCHAR szBuffer[MAX_PATH]; wcscpy(szBuffer, szDrive);

1 0

[janderwald] 38011: - Use FILE_DEVICE_KS when creating new device object - Partly implement PcNewRegistryKey, PcRegisterSubdevice - DPC event is a Synchronization event- Implement PcRegisterAdapterPowerManagement
by janderwald＠svn.reactos.org 11 Dec '08

11 Dec '08

Author: janderwald Date: Thu Dec 11 05:23:14 2008 New Revision: 38011 URL: http://svn.reactos.org/svn/reactos?rev=38011&view=rev Log: - Use FILE_DEVICE_KS when creating new device object - Partly implement PcNewRegistryKey, PcRegisterSubdevice - DPC event is a Synchronization event- Implement PcRegisterAdapterPowerManagement Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/power.c (with props) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.c trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] Thu Dec 11 05:23:14 2008 @@ -144,7 +144,7 @@ status = IoCreateDevice(DriverObject, DeviceExtensionSize, NULL, - PhysicalDeviceObject->DeviceType, /* FILE_DEVICE_KS ? */ + FILE_DEVICE_KS, PhysicalDeviceObject->Characteristics, /* TODO: Check */ FALSE, &fdo); @@ -161,9 +161,56 @@ ASSERT(portcls_ext); /* Initialize */ + RtlZeroMemory(portcls_ext, sizeof(PCExtension)); portcls_ext->StartDevice = StartDevice; + status = KsAllocateDeviceHeader(&portcls_ext->KsDeviceHeader, 0, NULL); + if (!NT_SUCCESS(status)) + { + IoDeleteDevice(fdo); + return status; + } + DPRINT("PcAddAdapterDriver succeeded\n"); + return status; +} + +NTSTATUS +NTAPI +PciDriverDispatch( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT1("PortClsSysControl called\n"); + + /* TODO */ + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; } + +NTSTATUS NTAPI +PcRegisterSubdevice( + IN PDEVICE_OBJECT DeviceObject, + IN PWCHAR Name, + IN PUNKNOWN Unknown) +{ + PCExtension* DeviceExt; + NTSTATUS Status; + + if (!DeviceObject || !Name || !Unknown) + return STATUS_INVALID_PARAMETER; + + DeviceExt = (PCExtension*)DeviceObject->DeviceExtension; + if (!DeviceExt) + return STATUS_UNSUCCESSFUL; + + Status = KsAddObjectCreateItemToDeviceHeader(DeviceExt->KsDeviceHeader, PciDriverDispatch, (PVOID)Unknown, Name, NULL); + + + return STATUS_UNSUCCESSFUL; +} 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 05:23:14 2008 @@ -23,6 +23,7 @@ <file>registry.c</file> <file>service_group.c</file> <file>port.c</file> + <file>power.c</file> <file>port_dmus.c</file> <file>port_midi.c</file> <file>port_topology.c</file> Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/power.c (added) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/power.c [iso-8859-1] Thu Dec 11 05:23:14 2008 @@ -1,0 +1,38 @@ +#include "private.h" + +const GUID IID_IAdapterPowerManagement; + +/* + * @implemented + */ + +NTSTATUS +NTAPI +PcRegisterAdapterPowerManagement( + IN PUNKNOWN pUnknown, + IN PVOID pvContext) +{ + NTSTATUS Status; + PDEVICE_OBJECT pDeviceObject; + PCExtension* DeviceExt; + IAdapterPowerManagement * pPower; + + if (!pUnknown || !pvContext) + return STATUS_INVALID_PARAMETER; + + Status = pUnknown->lpVtbl->QueryInterface(pUnknown, &IID_IAdapterPowerManagement, (PVOID*)&pPower); + if (!NT_SUCCESS(Status)) + return Status; + + pDeviceObject = (PDEVICE_OBJECT)pvContext; + DeviceExt = (PCExtension*)pDeviceObject->DeviceExtension; + + if (DeviceExt->AdapterPowerManagement) + { + pPower->lpVtbl->Release(pPower); + return STATUS_UNSUCCESSFUL; + } + + DeviceExt->AdapterPowerManagement = pPower; + return STATUS_SUCCESS; +} Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/power.c ------------------------------------------------------------------------------ svn:eol-style = native 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 05:23:14 2008 @@ -69,9 +69,17 @@ NTSTATUS NewPortWavePci( OUT PPORT* OutPort); +NTSTATUS NewDmaChannelSlave( + IN PDEVICE_DESCRIPTION DeviceDesc, + IN PDMA_ADAPTER Adapter, + OUT PDMACHANNELSLAVE* DmaChannel); + + typedef struct { PCPFNSTARTDEVICE StartDevice; + KSDEVICE_HEADER KsDeviceHeader; + IAdapterPowerManagement * AdapterPowerManagement; IResourceList* resources; } PCExtension; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.c [iso-8859-1] Thu Dec 11 05:23:14 2008 @@ -198,6 +198,22 @@ return ZwSetValueKey(This->hKey, ValueName, 0, Type, Data, DataSize); } +static IRegistryKeyVtbl vt_IRegistryKey = +{ + /* IUnknown methods */ + IRegistryKey_fnQueryInterface, + IRegistryKey_fnAddRef, + IRegistryKey_fnRelease, + /* IRegistryKey methods */ + IRegistryKey_fnQueryKey, + IRegistryKey_fnEnumerateKey, + IRegistryKey_fnQueryValueKey, + IRegistryKey_fnEnumerateKeyValue, + IRegistryKey_fnSetValueKey, + IRegistryKey_fnQueryRegistryValues, + IRegistryKey_fnNewSubKey, + IRegistryKey_fnDeleteKey +}; /* * @unimplemented @@ -214,9 +230,47 @@ IN ULONG CreateOptions OPTIONAL, OUT PULONG Disposition OPTIONAL) { - UNIMPLEMENTED; - //IoGetDeviceProperty - - return STATUS_UNSUCCESSFUL; -} - + HANDLE hHandle; + NTSTATUS Status = STATUS_UNSUCCESSFUL; + IRegistryKeyImpl * This; + + if (!OutRegistryKey) + return STATUS_INVALID_PARAMETER; + + if (RegistryKeyType != GeneralRegistryKey && + RegistryKeyType != DeviceRegistryKey && + RegistryKeyType != DriverRegistryKey && + RegistryKeyType != HwProfileRegistryKey && + RegistryKeyType != DeviceInterfaceRegistryKey) + { + return STATUS_INVALID_PARAMETER; + } + + if (RegistryKeyType == GeneralRegistryKey) + { + if (!ObjectAttributes) + return STATUS_INVALID_PARAMETER; + + Status = ZwOpenKey(&hHandle, DesiredAccess, ObjectAttributes); + } + + if (!NT_SUCCESS(Status)) + { + return Status; + } + + This = ExAllocatePoolWithTag(NonPagedPool, sizeof(IRegistryKeyImpl), TAG_PORTCLASS); + if (!This) + { + ZwClose(hHandle); + return STATUS_INSUFFICIENT_RESOURCES; + } + + This->hKey = hHandle; + This->lpVtbl = &vt_IRegistryKey; + This->ref = 1; + + *OutRegistryKey = (PREGISTRYKEY)&This->lpVtbl; + return STATUS_SUCCESS; +} + Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c [iso-8859-1] Thu Dec 11 05:23:14 2008 @@ -191,7 +191,7 @@ if (!This->Initialized) { - KeInitializeEvent(&This->DpcEvent, NotificationEvent, FALSE); + KeInitializeEvent(&This->DpcEvent, SynchronizationEvent, FALSE); KeInitializeTimerEx(&This->Timer, NotificationTimer); KeInitializeDpc(&This->Dpc, IServiceGroupDpc, (PVOID)This); This->Initialized = TRUE; @@ -263,8 +263,5 @@ This->Initialized = FALSE; *OutServiceGroup = (PSERVICEGROUP)&This->lpVtbl; - return STATUS_UNSUCCESSFUL; -} - - - + return STATUS_SUCCESS; +} Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c [iso-8859-1] Thu Dec 11 05:23:14 2008 @@ -31,18 +31,6 @@ /* =============================================================== Power Management */ - -/* - * @unimplemented - */ -NTSTATUS NTAPI -PcRegisterAdapterPowerManagement( - IN PUNKNOWN pUnknown, - IN PVOID pvContext1) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} /* * @unimplemented @@ -130,17 +118,3 @@ /* * @unimplemented */ - - -/* - * @unimplemented - */ -NTSTATUS NTAPI -PcRegisterSubdevice( - IN PDEVICE_OBJECT DeviceObject, - IN PWCHAR Name, - IN PUNKNOWN Unknown) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -}

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