Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 54892: remove leftover spotted by Amine
by tkreuzer＠svn.reactos.org 09 Jan '12

09 Jan '12

Author: tkreuzer Date: Mon Jan 9 22:06:04 2012 New Revision: 54892 URL: http://svn.reactos.org/svn/reactos?rev=54892&view=rev Log: remove leftover spotted by Amine Modified: trunk/reactos/include/ddk/ntstrsafe.h Modified: trunk/reactos/include/ddk/ntstrsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntstrsafe.h?re… ============================================================================== --- trunk/reactos/include/ddk/ntstrsafe.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntstrsafe.h [iso-8859-1] Mon Jan 9 22:06:04 2012 @@ -2069,9 +2069,6 @@ #ifdef _MSC_VER #pragma warning(pop) -#ifdef _PREFAST_ -#pragma prefast(pop) -#endif /* _PREFAST_ */ #endif /* _MSC_VER */ #endif /* _NTSTRSAFE_H_INCLUDED_ */

1 0

[tkreuzer] 54891: [PSDK/DDK] - Add MAX_NATURAL_ALIGNMENT, MEMORY_ALLOCATION_ALIGNMENT and PROBE_ALIGNMENT defintions to ntdef.h - disable prefast warnings about banned api usage, dpc access and seh...
by tkreuzer＠svn.reactos.org 09 Jan '12

09 Jan '12

Author: tkreuzer Date: Mon Jan 9 21:55:56 2012 New Revision: 54891 URL: http://svn.reactos.org/svn/reactos?rev=54891&view=rev Log: [PSDK/DDK] - Add MAX_NATURAL_ALIGNMENT, MEMORY_ALLOCATION_ALIGNMENT and PROBE_ALIGNMENT defintions to ntdef.h - disable prefast warnings about banned api usage, dpc access and seh filter expression - annotate string types (PSTR, etc) as _Null_terminated_ Modified: trunk/reactos/include/crt/stdio.h trunk/reactos/include/ddk/ntstrsafe.h trunk/reactos/include/ddk/wdm.h trunk/reactos/include/psdk/ntdef.h trunk/reactos/include/xdk/iofuncs.h Modified: trunk/reactos/include/crt/stdio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdio.h?rev=54… ============================================================================== --- trunk/reactos/include/crt/stdio.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stdio.h [iso-8859-1] Mon Jan 9 21:55:56 2012 @@ -300,7 +300,17 @@ _CRTIMP int __cdecl _vsnwprintf(wchar_t *_Dest,size_t _Count,const wchar_t *_Format,va_list _Args); #ifndef __NO_ISOCEXT /* externs in libmingwex.a */ _CRTIMP int __cdecl snwprintf (wchar_t* s, size_t n, const wchar_t* format, ...); - __CRT_INLINE int __cdecl vsnwprintf (wchar_t* s, size_t n, const wchar_t* format, va_list arg) { return _vsnwprintf(s,n,format,arg); } + __CRT_INLINE int __cdecl vsnwprintf (wchar_t* s, size_t n, const wchar_t* format, va_list arg) + { +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:28719) /* disable banned api usage warning */ +#endif /* _MSC_VER */ + return _vsnwprintf(s,n,format,arg); +#ifdef _MSC_VER +#pragma warning(pop) +#endif /* _MSC_VER */ + } _CRTIMP int __cdecl vwscanf (const wchar_t *, va_list); _CRTIMP int __cdecl vfwscanf (FILE *,const wchar_t *,va_list); _CRTIMP int __cdecl vswscanf (const wchar_t *,const wchar_t *,va_list); Modified: trunk/reactos/include/ddk/ntstrsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntstrsafe.h?re… ============================================================================== --- trunk/reactos/include/ddk/ntstrsafe.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntstrsafe.h [iso-8859-1] Mon Jan 9 21:55:56 2012 @@ -9,6 +9,11 @@ #include <stdio.h> #include <string.h> #include <stdarg.h> + +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:28719) /* disable banned api usage warning */ +#endif /* _MSC_VER */ #ifndef C_ASSERT #ifdef _MSC_VER @@ -2062,4 +2067,11 @@ #define RtlStringLengthWorkerA RtlStringLengthWorkerA_instead_use_StringCchLengthA_or_StringCbLengthA; #define RtlStringLengthWorkerW RtlStringLengthWorkerW_instead_use_StringCchLengthW_or_StringCbLengthW; -#endif +#ifdef _MSC_VER +#pragma warning(pop) +#ifdef _PREFAST_ +#pragma prefast(pop) +#endif /* _PREFAST_ */ +#endif /* _MSC_VER */ + +#endif /* _NTSTRSAFE_H_INCLUDED_ */ Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=5489… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Mon Jan 9 21:55:56 2012 @@ -13027,9 +13027,16 @@ IN PDEVICE_OBJECT DeviceObject, IN PIO_DPC_ROUTINE DpcRoutine) { +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:28128) +#endif KeInitializeThreadedDpc(&DeviceObject->Dpc, (PKDEFERRED_ROUTINE) DpcRoutine, DeviceObject ); +#ifdef _MSC_VER +#pragma warning(pop) +#endif } #endif Modified: trunk/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntdef.h [iso-8859-1] Mon Jan 9 21:55:56 2012 @@ -26,6 +26,7 @@ #include <basetsd.h> #include <excpt.h> #include <sdkddkver.h> +#include <specstrings.h> // FIXME: Shouldn't be included! #include <stdarg.h> @@ -167,12 +168,19 @@ #define UNALIGNED64 #endif +#if defined(_WIN64) || defined(_M_ALPHA) +#define MAX_NATURAL_ALIGNMENT sizeof(ULONGLONG) +#define MEMORY_ALLOCATION_ALIGNMENT 16 +#else +#define MAX_NATURAL_ALIGNMENT sizeof(ULONG) +#define MEMORY_ALLOCATION_ALIGNMENT 8 +#endif + #if defined(_M_MRX000) && !(defined(MIDL_PASS) || defined(RC_INVOKED)) && defined(ENABLE_RESTRICTED) #define RESTRICTED_POINTER __restrict #else #define RESTRICTED_POINTER #endif - #define ARGUMENT_PRESENT(ArgumentPointer) \ ((CHAR*)((ULONG_PTR)(ArgumentPointer)) != (CHAR*)NULL) @@ -195,6 +203,14 @@ #define TYPE_ALIGNMENT(t) __alignof(t) #else #define TYPE_ALIGNMENT(t) FIELD_OFFSET(struct { char x; t test; }, test) +#endif + +#if defined(_AMD64_) || defined(_X86_) +#define PROBE_ALIGNMENT(_s) TYPE_ALIGNMENT(ULONG) +#elif defined(_IA64_) || defined(_ARM_) +#define PROBE_ALIGNMENT(_s) max((TYPE_ALIGNMENT(_s), TYPE_ALIGNMENT(ULONG)) +#else +#error "unknown architecture" #endif /* Calling Conventions */ @@ -358,11 +374,11 @@ /* ANSI (Multi-byte Character) types */ typedef CHAR *PCHAR, *LPCH, *PCH; typedef CONST CHAR *LPCCH, *PCCH; -typedef CHAR *NPSTR, *LPSTR, *PSTR; -typedef PSTR *PZPSTR; -typedef CONST PSTR *PCZPSTR; -typedef CONST CHAR *LPCSTR, *PCSTR; -typedef PCSTR *PZPCSTR; +typedef _Null_terminated_ CHAR *NPSTR, *LPSTR, *PSTR; +typedef _Null_terminated_ PSTR *PZPSTR; +typedef _Null_terminated_ CONST PSTR *PCZPSTR; +typedef _Null_terminated_ CONST CHAR *LPCSTR, *PCSTR; +typedef _Null_terminated_ PCSTR *PZPCSTR; /* Pointer to an Asciiz string */ typedef CHAR *PSZ; @@ -372,13 +388,13 @@ typedef wchar_t WCHAR; typedef WCHAR *PWCHAR, *LPWCH, *PWCH; typedef CONST WCHAR *LPCWCH, *PCWCH; -typedef WCHAR *NWPSTR, *LPWSTR, *PWSTR; -typedef PWSTR *PZPWSTR; -typedef CONST PWSTR *PCZPWSTR; -typedef WCHAR UNALIGNED *LPUWSTR, *PUWSTR; -typedef CONST WCHAR *LPCWSTR, *PCWSTR; -typedef PCWSTR *PZPCWSTR; -typedef CONST WCHAR UNALIGNED *LPCUWSTR, *PCUWSTR; +typedef _Null_terminated_ WCHAR *NWPSTR, *LPWSTR, *PWSTR; +typedef _Null_terminated_ PWSTR *PZPWSTR; +typedef _Null_terminated_ CONST PWSTR *PCZPWSTR; +typedef _Null_terminated_ WCHAR UNALIGNED *LPUWSTR, *PUWSTR; +typedef _Null_terminated_ CONST WCHAR *LPCWSTR, *PCWSTR; +typedef _Null_terminated_ PCWSTR *PZPCWSTR; +typedef _Null_terminated_ CONST WCHAR UNALIGNED *LPCUWSTR, *PCUWSTR; /* Cardinal Data Types */ typedef char CCHAR, *PCCHAR; @@ -488,8 +504,8 @@ USHORT Length; USHORT MaximumLength; ULONG Buffer; -} STRING32, *PSTRING32, - UNICODE_STRING32, *PUNICODE_STRING32, +} STRING32, *PSTRING32, + UNICODE_STRING32, *PUNICODE_STRING32, ANSI_STRING32, *PANSI_STRING32; typedef struct _STRING64 { @@ -497,7 +513,7 @@ USHORT MaximumLength; ULONGLONG Buffer; } STRING64, *PSTRING64, - UNICODE_STRING64, *PUNICODE_STRING64, + UNICODE_STRING64, *PUNICODE_STRING64, ANSI_STRING64, *PANSI_STRING64; /* LangID and NLS */ Modified: trunk/reactos/include/xdk/iofuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/iofuncs.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/iofuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/iofuncs.h [iso-8859-1] Mon Jan 9 21:55:56 2012 @@ -2658,10 +2658,17 @@ IN PDEVICE_OBJECT DeviceObject, IN PIO_DPC_ROUTINE DpcRoutine) { +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:28128) +#endif KeInitializeThreadedDpc(&DeviceObject->Dpc, (PKDEFERRED_ROUTINE) DpcRoutine, DeviceObject ); -} +#ifdef _MSC_VER +#pragma warning(pop) #endif +} +#endif $endif (_WDMDDK_)

1 0

[cgutman] 54890: [WLANCONF] - Display fractional rates correctly (5.5 Mbps for example)
by cgutman＠svn.reactos.org 09 Jan '12

09 Jan '12

Author: cgutman Date: Mon Jan 9 20:19:33 2012 New Revision: 54890 URL: http://svn.reactos.org/svn/reactos?rev=54890&view=rev Log: [WLANCONF] - Display fractional rates correctly (5.5 Mbps for example) Modified: branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c Modified: branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/base/applications/… ============================================================================== --- branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] (original) +++ branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] Mon Jan 9 20:19:33 2012 @@ -514,9 +514,16 @@ Rate = Rate & 0x7F; /* SupportedRates are in units of .5 */ - Rate = Rate >> 1; - - _tprintf(_T("%u "), Rate); + if (Rate & 0x01) + { + /* Bit 0 is set so we need to add 0.5 */ + _tprintf(_T("%u.5 "), (Rate >> 1)); + } + else + { + /* Bit 0 is clear so just print the conversion */ + _tprintf(_T("%u "), (Rate >> 1)); + } } } _tprintf(_T("\n"));

1 0

[iut2011] 54889: [MMC] Add new library for MMC GUIDs.
by iut2011＠svn.reactos.org 09 Jan '12

09 Jan '12

Author: iut2011 Date: Mon Jan 9 07:19:41 2012 New Revision: 54889 URL: http://svn.reactos.org/svn/reactos?rev=54889&view=rev Log: [MMC] Add new library for MMC GUIDs. Added: branches/iut-mmc/lib/sdk/mmc/ (with props) branches/iut-mmc/lib/sdk/mmc/CMakeLists.txt (with props) branches/iut-mmc/lib/sdk/mmc/mmc.rbuild (with props) branches/iut-mmc/lib/sdk/mmc/mmciid.c (with props) Modified: branches/iut-mmc/lib/sdk/CMakeLists.txt branches/iut-mmc/lib/sdk/sdk.rbuild Modified: branches/iut-mmc/lib/sdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/iut-mmc/lib/sdk/CMakeLists.txt?… ============================================================================== --- branches/iut-mmc/lib/sdk/CMakeLists.txt [iso-8859-1] (original) +++ branches/iut-mmc/lib/sdk/CMakeLists.txt [iso-8859-1] Mon Jan 9 07:19:41 2012 @@ -3,6 +3,7 @@ add_subdirectory(delayimp) add_subdirectory(dxguid) add_subdirectory(ioevent) +add_subdirectory(mmc) add_subdirectory(nt) add_subdirectory(scrnsave) add_subdirectory(strmiids) Propchange: branches/iut-mmc/lib/sdk/mmc/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Jan 9 07:19:41 2012 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/iut-mmc/lib/sdk/mmc/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/iut-mmc/lib/sdk/mmc/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/iut-mmc/lib/sdk/mmc/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/iut-mmc/lib/sdk/mmc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/iut-mmc/lib/sdk/mmc/CMakeLists.… ============================================================================== --- branches/iut-mmc/lib/sdk/mmc/CMakeLists.txt (added) +++ branches/iut-mmc/lib/sdk/mmc/CMakeLists.txt [iso-8859-1] Mon Jan 9 07:19:41 2012 @@ -1,0 +1,2 @@ + +add_library(mmclib mmciid.c) Propchange: branches/iut-mmc/lib/sdk/mmc/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/iut-mmc/lib/sdk/mmc/mmc.rbuild URL: http://svn.reactos.org/svn/reactos/branches/iut-mmc/lib/sdk/mmc/mmc.rbuild?… ============================================================================== --- branches/iut-mmc/lib/sdk/mmc/mmc.rbuild (added) +++ branches/iut-mmc/lib/sdk/mmc/mmc.rbuild [iso-8859-1] Mon Jan 9 07:19:41 2012 @@ -1,0 +1,5 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="mmclib" type="staticlibrary"> + <file>mmciid.c</file> +</module> Propchange: branches/iut-mmc/lib/sdk/mmc/mmc.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/iut-mmc/lib/sdk/mmc/mmciid.c URL: http://svn.reactos.org/svn/reactos/branches/iut-mmc/lib/sdk/mmc/mmciid.c?re… ============================================================================== --- branches/iut-mmc/lib/sdk/mmc/mmciid.c (added) +++ branches/iut-mmc/lib/sdk/mmc/mmciid.c [iso-8859-1] Mon Jan 9 07:19:41 2012 @@ -1,0 +1,117 @@ +/* + * MMC GUID definitions + * + * Copyright 2011 Alexandre Denis (alec.pro2(a)gmail.com) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" +#include "initguid.h" + +DEFINE_GUID(CLSID_Application, 0x49b2791a, 0xb1ae, 0x4c90, 0x9b, 0x8e ,0xe8, 0x60, 0x60, 0xba, 0x7, 0xf8); +DEFINE_GUID(CLSID_ConsolePower, 0xf0285374, 0xdff1, 0x11d3, 0xb4, 0x33 ,00, 0xc0, 0xc0, 0x4f, 0x8e, 0xcd); +DEFINE_GUID(CLSID_ExecutivePlatform, 0xb3fd5602, 0xeb0f, 0x415e, 0x9f, 0x32 ,0x75, 0xda, 0xda, 0x39, 0x1d, 0x6b); +DEFINE_GUID(CLSID_FrameworkSnapInFactory, 0xd5ab5662, 0x131d, 0x453d, 0x88, 0xc8 ,0x9b, 0xba, 0xba, 0x87, 0x50, 0x2a); +DEFINE_GUID(CLSID_MMCVersionInfo, 0xd6fedb1d, 0xcf21, 0x4bd9, 0xaf, 0x3b ,0xc5, 0x46, 0x46, 0x8e, 0x9c, 0x66); +DEFINE_GUID(CLSID_SnapInFailureReporter, 0x4a65d267, 0x1539, 0x4bd1, 0x92, 0x1d ,0x1c, 0x49, 0x49, 0xb3, 0xe5, 0x8e); +DEFINE_GUID(CLSID_WaitDialog, 0x2d11cf10, 0x4fe0, 0x45b2, 0x88, 0xdf ,0x6f, 0xfb, 0xfb, 0xf9, 0x2b, 0xe9); +DEFINE_GUID(DIID_AppEvents, 0xfc7a4252, 0x78ac, 0x4532, 0x8c, 0x5a ,0x56, 0x3c, 0x3c, 0xfe, 0x13, 0x88); +DEFINE_GUID(IID_Column, 0xfd1c5f63, 0x2b16, 0x4d06, 0x9a, 0xb3 ,0xf4, 0x53, 0x53, 0x50, 0xb9, 0x40); +DEFINE_GUID(IID_Columns, 0x383d4d97, 0xfc44, 0x478b, 0xb1, 0x39 ,0x63, 0x23, 0x23, 0xdc, 0x48, 0x61); +DEFINE_GUID(IID_ContextMenu, 0xdab39ce0, 0x25e6, 0x4e07, 0x83, 0x62 ,0xba, 0x9c, 0x9c, 0x95, 0x70, 0x65); +DEFINE_GUID(IID_Document, 0x225120d6, 0x1e0f, 0x40a3, 0x93, 0xfe ,0x10, 0x79, 0x79, 0xe6, 0xa8, 0x1); +DEFINE_GUID(IID_Extension, 0xad4d6ca6, 0x912f, 0x409b, 0xa2, 0x6e ,0x7f, 0xd2, 0xd2, 0x34, 0xae, 0xf5); +DEFINE_GUID(IID_Extensions, 0x82dbea43, 0x8ca4, 0x44bc, 0xa2, 0xca ,0xd1, 0x87, 0x87, 0x41, 0x5, 0x9e); +DEFINE_GUID(IID_Frame, 0xe5e2d970, 0x5bb3, 0x4306, 0x88, 0x4 ,0xb0, 0x96, 0x96, 0x8a, 0x31, 0xc8); +DEFINE_GUID(IID_IActionsPane, 0xd55cd1d0, 0x1b5, 0x4842, 0xb3, 0x44 ,0xd6, 0x1, 0x1, 0x56, 0x4e, 0xa2); +DEFINE_GUID(IID_IColumnData, 0x547c1354, 0x24d, 0x11d3, 0xa7, 0x7 ,00, 0xc0, 0xc0, 0x4f, 0x8e, 0xf4); +DEFINE_GUID(IID_IComponent, 0x43136eb2, 0xd36c, 0x11cf, 0xad, 0xbc ,00, 0xaa, 0xaa, 00, 0xa8, 00); +DEFINE_GUID(IID_IComponent2, 0x79a2d615, 0x4a10, 0x4ed4, 0x8c, 0x65 ,0x86, 0x33, 0x33, 0xf9, 0x33, 0x50); +DEFINE_GUID(IID_IComponentData, 0x955ab28a, 0x5218, 0x11d0, 0xa9, 0x85 ,00, 0xc0, 0xc0, 0x4f, 0xd8, 0xd5); +DEFINE_GUID(IID_IComponentData2, 0xcca0f2d2, 0x82de, 0x41b5, 0xbf, 0x47 ,0x3b, 0x20, 0x20, 0x76, 0x27, 0x3d); +DEFINE_GUID(IID_IComponentPrivate, 0x734cf88d, 0x4250, 0x470e, 0xba, 0x34 ,0x93, 0xd9, 0xd9, 0x56, 0x12, 0x4f); +DEFINE_GUID(IID_IConsole, 0x43136eb1, 0xd36c, 0x11cf, 0xad, 0xbc ,00, 0xaa, 0xaa, 00, 0xa8, 00); +DEFINE_GUID(IID_IConsole2, 0x103d842a, 0xaa63, 0x11d1, 0xa7, 0xe1 ,00, 0xc0, 0xc0, 0x4f, 0xd8, 0xd5); +DEFINE_GUID(IID_IConsole3, 0x4f85efdb, 0xd0e1, 0x498c, 0x8d, 0x4a ,0xd0, 0x10, 0x10, 0xdf, 0xdd, 0x40); +DEFINE_GUID(IID_IConsole4, 0x25f01e57, 0x83c8, 0x4be0, 0xbe, 0x9c ,0xeb, 0x32, 0x32, 0x12, 0xe3, 0xac); +DEFINE_GUID(IID_IConsoleNameSpace, 0xbedeb620, 0xf24d, 0x11cf, 0x8a, 0xfc ,00, 0xaa, 0xaa, 00, 0x3c, 0xa9); +DEFINE_GUID(IID_IConsoleNameSpace2, 0x255f18cc, 0x65db, 0x11d1, 0xa7, 0xdc ,00, 0xc0, 0xc0, 0x4f, 0xd8, 0xd5); +DEFINE_GUID(IID_IConsolePower, 0x1cfbdd0e, 0x62ca, 0x49ce, 0xa3, 0xaf ,0xdb, 0xb2, 0xb2, 0xde, 0x61, 0xb0); +DEFINE_GUID(IID_IConsolePowerSink, 0x3333759f, 0xfe4f, 0x4975, 0xb1, 0x43 ,0xfe, 0xc0, 0xc0, 0xa5, 0xdd, 0x6d); +DEFINE_GUID(IID_IConsoleVerb, 0xe49f7a60, 0x74af, 0x11d0, 0xa2, 0x86 ,00, 0xc0, 0xc0, 0x4f, 0xd8, 0xfe); +DEFINE_GUID(IID_IContextMenuCallback, 0x43136eb7, 0xd36c, 0x11cf, 0xad, 0xbc ,00, 0xaa, 0xaa, 00, 0xa8, 00); +DEFINE_GUID(IID_IContextMenuCallback2, 0xe178bc0e, 0x2ed0, 0x4b5e, 0x80, 0x97 ,0x42, 0xc9, 0xc9, 0x8, 0x7e, 0x8b); +DEFINE_GUID(IID_IContextMenuProvider, 0x43136eb6, 0xd36c, 0x11cf, 0xad, 0xbc ,00, 0xaa, 0xaa, 00, 0xa8, 00); +DEFINE_GUID(IID_IControlbar, 0x69fb811e, 0x6c1c, 0x11d0, 0xa2, 0xcb ,00, 0xc0, 0xc0, 0x4f, 0xd9, 0x9); +DEFINE_GUID(IID_ICustomInitializationWizard, 0x15363ca4, 0xe235, 0x44f2, 0x87, 0x8c ,0xc5, 0xe6, 0xe6, 0x5b, 0xc3, 0x42); +DEFINE_GUID(IID_IDisplayHelp, 0xcc593830, 0xb926, 0x11d1, 0x80, 0x63 ,00, 00, 00, 0xf8, 0x75, 0xa9); +DEFINE_GUID(IID_IEnumTASK, 0x338698b1, 0x5a02, 0x11d1, 0x9f, 0xec ,00, 0x60, 0x60, 0x8, 0x32, 0xdb); +DEFINE_GUID(IID_IExecutivePlatform, 0x8d0203ce, 0xd4f9, 0x4641, 0x95, 0x58 ,0xd9, 0xb1, 0xb1, 0xc1, 0x8f, 0xa9); +DEFINE_GUID(IID_IExtendActionsPane, 0xc60ce72c, 0xe13b, 0x4775, 0xbc, 0x1d ,0xc8, 0x33, 0x33, 0xf6, 0xea, 0x1e); +DEFINE_GUID(IID_IExtendContextMenu, 0x4f3b7a4f, 0xcfac, 0x11cf, 0xb8, 0xe3 ,00, 0xc0, 0xc0, 0x4f, 0xd8, 0xd5); +DEFINE_GUID(IID_IExtendControlbar, 0x49506520, 0x6f40, 0x11d0, 0xa9, 0x8b ,00, 0xc0, 0xc0, 0x4f, 0xd8, 0xd5); +DEFINE_GUID(IID_IExtendPropertySheet, 0x85de64dc, 0xef21, 0x11cf, 0xa2, 0x85 ,00, 0xc0, 0xc0, 0x4f, 0xd8, 0xdb); +DEFINE_GUID(IID_IExtendPropertySheet2, 0xb7a87232, 0x4a51, 0x11d1, 0xa7, 0xea ,00, 0xc0, 0xc0, 0x4f, 0xd9, 0x9); +DEFINE_GUID(IID_IExtendPropertySheetPrivate, 0x27aea402, 0x2c17, 0x4a18, 0xb0, 0x17 ,0xe5, 0xa6, 0xa6, 0xea, 0x63, 0xc6); +DEFINE_GUID(IID_IExtendTaskPad, 0x8dee6511, 0x554d, 0x11d1, 0x9f, 0xea ,00, 0x60, 0x60, 0x8, 0x32, 0xdb); +DEFINE_GUID(IID_IExtendView, 0x89995cee, 0xd2ed, 0x4c0e, 0xae, 0x5e ,0xdf, 0x7e, 0x7e, 0x76, 0xf3, 0xfa); +DEFINE_GUID(IID_IFormHost, 0xb5f3b64d, 0xb22e, 0x4ea4, 0x9b, 0x98 ,0x53, 0x1, 0x1, 0x6f, 0x1a, 0x7a); +DEFINE_GUID(IID_IFormViewAccessibility, 0xe693927, 0xc23f, 0x41b0, 0x95, 0x19 ,0xd9, 0x30, 0x30, 0x57, 0x25, 0x47); +DEFINE_GUID(IID_IHeaderCtrl, 0x43136eb3, 0xd36c, 0x11cf, 0xad, 0xbc ,00, 0xaa, 0xaa, 00, 0xa8, 00); +DEFINE_GUID(IID_IHeaderCtrl2, 0x9757abb8, 0x1b32, 0x11d1, 0xa7, 0xce ,00, 0xc0, 0xc0, 0x4f, 0xd8, 0xd5); +DEFINE_GUID(IID_IImageList, 0x43136eb8, 0xd36c, 0x11cf, 0xad, 0xbc ,00, 0xaa, 0xaa, 00, 0xa8, 00); +DEFINE_GUID(IID_IMMCVersionInfo, 0xa8d2c5fe, 0xcdcb, 0x4b9d, 0xbd, 0xe5 ,0xa2, 0x73, 0x73, 0x43, 0xff, 0x54); +DEFINE_GUID(IID_IMenuButton, 0x951ed750, 0xd080, 0x11d0, 0xb1, 0x97 ,00, 00, 00, 00, 00, 00); +DEFINE_GUID(IID_IMessageView, 0x80f94174, 0xfccc, 0x11d2, 0xb9, 0x91 ,00, 0xc0, 0xc0, 0x4f, 0x8e, 0xcd); +DEFINE_GUID(IID_INodeProperties, 0x15bc4d24, 0xa522, 0x4406, 0xaa, 0x55 ,0x7, 0x49, 0x49, 0x53, 0x7a, 0x68); +DEFINE_GUID(IID_IPropertySheetCallback, 0x85de64dd, 0xef21, 0x11cf, 0xa2, 0x85 ,00, 0xc0, 0xc0, 0x4f, 0xd8, 0xdb); +DEFINE_GUID(IID_IPropertySheetProvider, 0x85de64de, 0xef21, 0x11cf, 0xa2, 0x85 ,00, 0xc0, 0xc0, 0x4f, 0xd8, 0xdb); +DEFINE_GUID(IID_IReportSnapInFailure, 0x1fed3df6, 0x2c3f, 0x461a, 0xba, 0x20 ,0x4b, 0x1d, 0x1d, 0xf6, 0x56, 0x9a); +DEFINE_GUID(IID_IRequiredExtensions, 0x72782d7a, 0xa4a0, 0x11d1, 0xaf, 0xf ,00, 0xc0, 0xc0, 0x4f, 0xb6, 0xdd); +DEFINE_GUID(IID_IResultData, 0x31da5fa0, 0xe0eb, 0x11cf, 0x9f, 0x21 ,00, 0xaa, 0xaa, 00, 0x3c, 0xa9); +DEFINE_GUID(IID_IResultData2, 0xf36e0eb, 0xa7f1, 0x4a81, 0xbe, 0x5a ,0x92, 0x47, 0x47, 0xf7, 0xde, 0x4b); +DEFINE_GUID(IID_IResultData3, 0xaef53ae7, 0x99ae, 0x48b4, 0xa7, 0x80 ,0x26, 0x81, 0x81, 0xcf, 0x40, 0x57); +DEFINE_GUID(IID_IResultDataCompare, 0xe8315a52, 0x7a1a, 0x11d0, 0xa2, 0xd2 ,00, 0xc0, 0xc0, 0x4f, 0xd9, 0x9); +DEFINE_GUID(IID_IResultDataCompareEx, 0x96933476, 0x251, 0x11d3, 0xae, 0xb0 ,00, 0xc0, 0xc0, 0x4f, 0x8e, 0xcd); +DEFINE_GUID(IID_IResultOwnerData, 0x9cb396d8, 0xea83, 0x11d0, 0xae, 0xf1 ,00, 0xc0, 0xc0, 0x4f, 0xb6, 0xdd); +DEFINE_GUID(IID_ISnapInConsoleStatus, 0xfb59d905, 0x555b, 0x4892, 0xac, 0xd1 ,0xbd, 0xb, 0xb, 0x3d, 0xea, 0x73); +DEFINE_GUID(IID_ISnapInFactory, 0x1546faac, 0x79a6, 0x4403, 0x9f, 0xe2 ,0x86, 0x1b, 0x1b, 0x9c, 0x88, 0x45); +DEFINE_GUID(IID_ISnapinAbout, 0x1245208c, 0xa151, 0x11d0, 0xa7, 0xd7 ,00, 0xc0, 0xc0, 0x4f, 0xd9, 0x9); +DEFINE_GUID(IID_ISnapinHelp, 0xa6b15ace, 0xdf59, 0x11d0, 0xa7, 0xdd ,00, 0xc0, 0xc0, 0x4f, 0xd9, 0x9); +DEFINE_GUID(IID_ISnapinHelp2, 0x4861a010, 0x20f9, 0x11d2, 0xa5, 0x10 ,00, 0xc0, 0xc0, 0x4f, 0xb6, 0xdd); +DEFINE_GUID(IID_ISnapinProperties, 0xf7889da9, 0x4a02, 0x4837, 0xbf, 0x89 ,0x1a, 0x6f, 0x6f, 0x2a, 0x2, 0x10); +DEFINE_GUID(IID_ISnapinPropertiesCallback, 0xa50fa2e5, 0x7e61, 0x45eb, 0xa8, 0xd4 ,0x9a, 0x7, 0x7, 0xb3, 0xe8, 0x51); +DEFINE_GUID(IID_IStringTable, 0xde40b7a4, 0xf65, 0x11d2, 0x8e, 0x25 ,00, 0xc0, 0xc0, 0x4f, 0x8e, 0xcd); +DEFINE_GUID(IID_IToolbar, 0x43136eb9, 0xd36c, 0x11cf, 0xad, 0xbc ,00, 0xaa, 0xaa, 00, 0xa8, 00); +DEFINE_GUID(IID_IViewExtensionCallback, 0x34dd928a, 0x7599, 0x41e5, 0x9f, 0x5e ,0xd6, 0xbc, 0xbc, 0x30, 0x62, 0xc2); +DEFINE_GUID(IID_IWaitCursor, 0x7dfcf9be, 0x9a2b, 0x4e32, 0x9e, 0x3e ,0x96, 0x20, 0x20, 0x66, 0x17, 0xb5); +DEFINE_GUID(IID_IWaitDialog, 0x92b4ff02, 0x8e4, 0x40e5, 0xa5, 0xa6 ,0x62, 0x4f, 0x4f, 0x89, 0x70, 0xc1); +DEFINE_GUID(IID_IWaitDialogCancelCallback, 0xbfd57ccb, 0x78f2, 0x4ab8, 0x91, 0x73 ,0x41, 0x54, 0x54, 0xf, 0x51, 0xa3); +DEFINE_GUID(IID_MenuItem, 0x178fad1, 0xb361, 0x4b27, 0x96, 0xad ,0x67, 0xc5, 0xc5, 0x7e, 0xbf, 0x2e); +DEFINE_GUID(IID_Node, 0xf81ed800, 0x7839, 0x4447, 0x94, 0x5d ,0x8e, 0x15, 0x15, 0xda, 0x59, 0xca); +DEFINE_GUID(IID_Nodes, 0x313b01df, 0xb22f, 0x4d42, 0xb1, 0xb8 ,0x48, 0x3c, 0x3c, 0xdc, 0xf5, 0x1d); +DEFINE_GUID(IID_Properties, 0x2886abc2, 0xa425, 0x42b2, 0x91, 0xc6 ,0xe2, 0x5c, 0x5c, 0xe, 0x4, 0x58); +DEFINE_GUID(IID_Property, 0x4600c3a5, 0xe301, 0x41d8, 0xb6, 0xd0 ,0xef, 0x2e, 0x2e, 0x42, 0x12, 0xe0); +DEFINE_GUID(IID_ScopeNamespace, 0xebbb48dc, 0x1a3b, 0x4d86, 0xb7, 0x86 ,0xc2, 0x1b, 0x1b, 0x28, 0x38, 0x90); +DEFINE_GUID(IID_SnapIn, 0x3be910f6, 0x3459, 0x49c6, 0xa1, 0xbb ,0x41, 0xe6, 0xe6, 0xbe, 0x9d, 0xf3); +DEFINE_GUID(IID_SnapIns, 0x2ef3de1d, 0xb12a, 0x49d1, 0x92, 0xc5 ,0xb, 00, 00, 0x79, 0x87, 0x68); +DEFINE_GUID(IID_View, 0x6efc2da2, 0xb38c, 0x457e, 0x9a, 0xbb ,0xed, 0x2d, 0x2d, 0x18, 0x9b, 0x8c); +DEFINE_GUID(IID_Views, 0xd6b8c29d, 0xa1ff, 0x4d72, 0xaa, 0xb0 ,0xe3, 0x81, 0x81, 0xe9, 0xb9, 0x33); +DEFINE_GUID(IID__AppEvents, 0xde46cbdd, 0x53f5, 0x4635, 0xaf, 0x54 ,0x4f, 0xe7, 0xe7, 0x1e, 0x92, 0x3d); +DEFINE_GUID(IID__Application, 0xa3afb9cc, 0xb653, 0x4741, 0x86, 0xab ,0xf0, 0x47, 0x47, 0xe, 0xc1, 0x38); +DEFINE_GUID(IID__EventConnector, 0xc0bccd30, 0xde44, 0x4528, 0x84, 0x3 ,0xa0, 0x5a, 0x5a, 0x6a, 0x1c, 0xc8); +DEFINE_GUID(LIBID_MMC20, 0x8e80422b, 0xcac4, 0x472b, 0xb2, 0x72 ,0x96, 0x35, 0x35, 0xf1, 0xdf, 0xef); +DEFINE_GUID(LIBID_MMCVersionLib, 0x9eecdd85, 0xb715, 0x4188, 0x8a, 0x72 ,0x61, 0x15, 0x15, 0x9a, 0xbd, 0xb8); Propchange: branches/iut-mmc/lib/sdk/mmc/mmciid.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/iut-mmc/lib/sdk/sdk.rbuild URL: http://svn.reactos.org/svn/reactos/branches/iut-mmc/lib/sdk/sdk.rbuild?rev=… ============================================================================== --- branches/iut-mmc/lib/sdk/sdk.rbuild [iso-8859-1] (original) +++ branches/iut-mmc/lib/sdk/sdk.rbuild [iso-8859-1] Mon Jan 9 07:19:41 2012 @@ -14,6 +14,9 @@ <directory name="ioevent"> <xi:include href="ioevent/ioevent.rbuild" /> </directory> + <directory name="mmc"> + <xi:include href="mmc/mmc.rbuild" /> + </directory> <directory name="nt"> <xi:include href="nt/nt.rbuild" /> </directory>

1 0

[cgutman] 54888: [WLANCONF] - Use a different method for determining if an adapter supports 802.11 networks so it works on drivers that don't implement OID_GEN_PHYSICAL_MEDIUM
by cgutman＠svn.reactos.org 09 Jan '12

09 Jan '12

Author: cgutman Date: Mon Jan 9 03:17:23 2012 New Revision: 54888 URL: http://svn.reactos.org/svn/reactos?rev=54888&view=rev Log: [WLANCONF] - Use a different method for determining if an adapter supports 802.11 networks so it works on drivers that don't implement OID_GEN_PHYSICAL_MEDIUM Modified: branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c Modified: branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/base/applications/… ============================================================================== --- branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] (original) +++ branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] Mon Jan 9 03:17:23 2012 @@ -91,23 +91,30 @@ { BOOL bSuccess; DWORD dwBytesReturned; - NDISUIO_QUERY_OID QueryOid; - - /* NDIS 5.1 WLAN drivers must support this OID */ - QueryOid.Oid = OID_GEN_PHYSICAL_MEDIUM; + PNDISUIO_QUERY_OID QueryOid; + DWORD QueryOidSize; + + QueryOidSize = sizeof(NDISUIO_QUERY_OID) + sizeof(NDIS_802_11_SSID); + QueryOid = HeapAlloc(GetProcessHeap(), 0, QueryOidSize); + if (!QueryOid) + return FALSE; + + /* We're just going to do a OID_802_11_SSID query. WLAN drivers should + * always succeed this query (returning SsidLength = 0 if not associated) */ + QueryOid->Oid = OID_802_11_SSID; bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_QUERY_OID_VALUE, - &QueryOid, - sizeof(QueryOid), - &QueryOid, - sizeof(QueryOid), - &dwBytesReturned, - NULL); - if (!bSuccess || *(PULONG)QueryOid.Data != NdisPhysicalMediumWirelessLan) - return FALSE; - - return TRUE; + QueryOid, + QueryOidSize, + QueryOid, + QueryOidSize, + &dwBytesReturned, + NULL); + + HeapFree(GetProcessHeap(), 0, QueryOid); + + return bSuccess; } HANDLE

1 0

[cgutman] 54887: [WLANCONF] - Fix supported rate calculation
by cgutman＠svn.reactos.org 09 Jan '12

09 Jan '12

Author: cgutman Date: Mon Jan 9 00:09:35 2012 New Revision: 54887 URL: http://svn.reactos.org/svn/reactos?rev=54887&view=rev Log: [WLANCONF] - Fix supported rate calculation Modified: branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c Modified: branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/base/applications/… ============================================================================== --- branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] (original) +++ branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] Mon Jan 9 00:09:35 2012 @@ -507,7 +507,7 @@ Rate = Rate & 0x7F; /* SupportedRates are in units of .5 */ - Rate = Rate << 1; + Rate = Rate >> 1; _tprintf(_T("%u "), Rate); }

1 0

[ekohl] 54886: [EVENTLOG] - Simplify ElfCreateEventLogHandle, ElfDeleteEventLogHandle and their callers. - Implement ElfrOpenBELA and ElfrOpenBELW. - Add ElfDeleteEventLogHandle stub.
by ekohl＠svn.reactos.org 08 Jan '12

08 Jan '12

Author: ekohl Date: Sun Jan 8 23:03:23 2012 New Revision: 54886 URL: http://svn.reactos.org/svn/reactos?rev=54886&view=rev Log: [EVENTLOG] - Simplify ElfCreateEventLogHandle, ElfDeleteEventLogHandle and their callers. - Implement ElfrOpenBELA and ElfrOpenBELW. - Add ElfDeleteEventLogHandle stub. Modified: trunk/reactos/base/services/eventlog/rpc.c Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Sun Jan 8 23:03:23 2012 @@ -44,12 +44,17 @@ return 0; } -PLOGHANDLE ElfCreateEventLogHandle(LPCWSTR Name, BOOL Create) + +static NTSTATUS +ElfCreateEventLogHandle(PLOGHANDLE *LogHandle, + LPCWSTR Name, + BOOL Create) { PLOGHANDLE lpLogHandle; PLOGFILE currentLogFile = NULL; INT i, LogsActive; PEVENTSOURCE pEventSource; + NTSTATUS Status; DPRINT("ElfCreateEventLogHandle(Name: %S)\n", Name); @@ -58,7 +63,7 @@ if (!lpLogHandle) { DPRINT1("Failed to allocate Heap!\n"); - return NULL; + return STATUS_NO_MEMORY; } wcscpy(lpLogHandle->szName, Name); @@ -68,7 +73,8 @@ if (LogsActive == 0) { DPRINT1("EventLog service reports no log files!\n"); - goto Cleanup; + Status = STATUS_UNSUCCESSFUL; + goto Done; } /* If Creating, default to the Application Log in case we fail, as documented on MSDN */ @@ -114,45 +120,60 @@ } if (!lpLogHandle->LogFile) - goto Cleanup; - - /* Append log handle */ - InsertTailList(&LogHandleListHead, &lpLogHandle->LogHandleListEntry); + Status = STATUS_UNSUCCESSFUL; + +Done: + if (NT_SUCCESS(Status)) + { + /* Append log handle */ + InsertTailList(&LogHandleListHead, &lpLogHandle->LogHandleListEntry); + *LogHandle = lpLogHandle; + } + else + { + HeapFree(GetProcessHeap(), 0, lpLogHandle); + } + + return Status; +} + + +static NTSTATUS +ElfCreateBackupLogHandle(PLOGHANDLE *LogHandle, + PUNICODE_STRING FileName) +{ + DPRINT("ElfCreateBackupLogHandle(FileName: %wZ)\n", FileName); + return STATUS_NOT_IMPLEMENTED; +} + + +PLOGHANDLE ElfGetLogHandleEntryByHandle(IELF_HANDLE EventLogHandle) +{ + PLOGHANDLE lpLogHandle; + + if (IsListEmpty(&LogHandleListHead)) + { + return NULL; + } + + lpLogHandle = CONTAINING_RECORD((PLOGHANDLE)EventLogHandle, LOGHANDLE, LogHandleListEntry); return lpLogHandle; - -Cleanup: - HeapFree(GetProcessHeap(), 0, lpLogHandle); - - return NULL; -} - -PLOGHANDLE ElfGetLogHandleEntryByHandle(IELF_HANDLE EventLogHandle) -{ - PLOGHANDLE lpLogHandle; - - if (IsListEmpty(&LogHandleListHead)) - { - return NULL; - } - - lpLogHandle = CONTAINING_RECORD((PLOGHANDLE)EventLogHandle, LOGHANDLE, LogHandleListEntry); - - return lpLogHandle; -} - -BOOL ElfDeleteEventLogHandle(IELF_HANDLE EventLogHandle) +} + + +static NTSTATUS +ElfDeleteEventLogHandle(IELF_HANDLE EventLogHandle) { PLOGHANDLE lpLogHandle = (PLOGHANDLE)EventLogHandle; + if (!ElfGetLogHandleEntryByHandle(lpLogHandle)) - { - return FALSE; - } + return STATUS_INVALID_HANDLE; RemoveEntryList(&lpLogHandle->LogHandleListEntry); HeapFree(GetProcessHeap(),0,lpLogHandle); - return TRUE; + return STATUS_SUCCESS; } /* Function 0 */ @@ -199,12 +220,7 @@ NTSTATUS ElfrCloseEL( IELF_HANDLE *LogHandle) { - if (!ElfDeleteEventLogHandle(*LogHandle)) - { - return STATUS_INVALID_HANDLE; - } - - return STATUS_SUCCESS; + return ElfDeleteEventLogHandle(*LogHandle); } @@ -212,12 +228,7 @@ NTSTATUS ElfrDeregisterEventSource( IELF_HANDLE *LogHandle) { - if (!ElfDeleteEventLogHandle(*LogHandle)) - { - return STATUS_INVALID_HANDLE; - } - - return STATUS_SUCCESS; + return ElfDeleteEventLogHandle(*LogHandle); } @@ -307,14 +318,9 @@ /*FIXME: Must verify that caller has read access */ - *LogHandle = ElfCreateEventLogHandle(ModuleName->Buffer, FALSE); - - if (*LogHandle == NULL) - { - return STATUS_INVALID_PARAMETER; - } - - return STATUS_SUCCESS; + return ElfCreateEventLogHandle((PLOGHANDLE *)LogHandle, + ModuleName->Buffer, + FALSE); } @@ -342,9 +348,9 @@ /*FIXME: Must verify that caller has write access */ - *LogHandle = ElfCreateEventLogHandle(ModuleName->Buffer, TRUE); - - return STATUS_SUCCESS; + return ElfCreateEventLogHandle((PLOGHANDLE *)LogHandle, + ModuleName->Buffer, + TRUE); } @@ -356,8 +362,17 @@ DWORD MinorVersion, IELF_HANDLE *LogHandle) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + DPRINT("ElfrOpenBELW(%wZ)\n", BackupFileName); + + if ((MajorVersion != 1) || (MinorVersion != 1)) + return STATUS_INVALID_PARAMETER; + + /*FIXME: UNCServerName must specify the server */ + + /*FIXME: Must verify that caller has read access */ + + return ElfCreateBackupLogHandle((PLOGHANDLE *)LogHandle, + (PUNICODE_STRING)BackupFileName); } @@ -605,16 +620,13 @@ /* FIXME: Must verify that caller has read access */ - *LogHandle = ElfCreateEventLogHandle(ModuleNameW.Buffer, FALSE); + Status = ElfCreateEventLogHandle((PLOGHANDLE *)LogHandle, + ModuleNameW.Buffer, + FALSE); RtlFreeUnicodeString(&ModuleNameW); - if (*LogHandle == NULL) - { - return STATUS_INVALID_PARAMETER; - } - - return STATUS_SUCCESS; + return Status; } @@ -654,12 +666,13 @@ /* FIXME: Must verify that caller has write access */ - *LogHandle = ElfCreateEventLogHandle(ModuleNameW.Buffer, - TRUE); + Status = ElfCreateEventLogHandle((PLOGHANDLE *)LogHandle, + ModuleNameW.Buffer, + TRUE); RtlFreeUnicodeString(&ModuleNameW); - return STATUS_SUCCESS; + return Status; } @@ -671,8 +684,36 @@ DWORD MinorVersion, IELF_HANDLE *LogHandle) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNICODE_STRING BackupFileNameW; + NTSTATUS Status; + + DPRINT("ElfrOpenBELA(%Z)\n", BackupFileName); + + Status = RtlAnsiStringToUnicodeString(&BackupFileNameW, + (PANSI_STRING)BackupFileName, + TRUE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("RtlAnsiStringToUnicodeString failed (Status 0x%08lx)\n", Status); + return Status; + } + + if ((MajorVersion != 1) || (MinorVersion != 1)) + { + RtlFreeUnicodeString(&BackupFileNameW); + return STATUS_INVALID_PARAMETER; + } + + /*FIXME: UNCServerName must specify the server */ + + /*FIXME: Must verify that caller has read access */ + + Status = ElfCreateBackupLogHandle((PLOGHANDLE *)LogHandle, + &BackupFileNameW); + + RtlFreeUnicodeString(&BackupFileNameW); + + return Status; }

1 0

[cgutman] 54885: [WLANCONF] - Fix my bit shifting fail
by cgutman＠svn.reactos.org 08 Jan '12

08 Jan '12

Author: cgutman Date: Sun Jan 8 22:48:08 2012 New Revision: 54885 URL: http://svn.reactos.org/svn/reactos?rev=54885&view=rev Log: [WLANCONF] - Fix my bit shifting fail Modified: branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c Modified: branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/base/applications/… ============================================================================== --- branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] (original) +++ branches/wlan-bringup/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] Sun Jan 8 22:48:08 2012 @@ -315,7 +315,7 @@ HeapFree(GetProcessHeap(), 0, SetOid); SetOidSize = sizeof(NDISUIO_SET_OID) + FIELD_OFFSET(NDIS_802_11_WEP, KeyMaterial) + - (strlen(sWepKey) >> 2); + (strlen(sWepKey) >> 1); SetOid = HeapAlloc(GetProcessHeap(), 0, SetOidSize); if (!SetOid) return FALSE; @@ -325,15 +325,15 @@ WepData = (PNDIS_802_11_WEP)SetOid->Data; WepData->KeyIndex = 0x80000000; - WepData->KeyLength = strlen(sWepKey) >> 2; + WepData->KeyLength = strlen(sWepKey) >> 1; WepData->Length = FIELD_OFFSET(NDIS_802_11_WEP, KeyMaterial) + WepData->KeyLength; /* Assemble the hex key */ i = 0; - while (sWepKey[i << 2] != '\0') - { - WepData->KeyMaterial[i] = CharToHex(sWepKey[i << 2]) << 4; - WepData->KeyMaterial[i] |= CharToHex(sWepKey[(i << 2) + 1]); + while (sWepKey[i << 1] != '\0') + { + WepData->KeyMaterial[i] = CharToHex(sWepKey[i << 1]) << 4; + WepData->KeyMaterial[i] |= CharToHex(sWepKey[(i << 1) + 1]); i++; } @@ -503,8 +503,11 @@ Rate = BssidInfo->SupportedRates[j]; if (Rate != 0) { + /* Bit 7 is the basic rates bit */ + Rate = Rate & 0x7F; + /* SupportedRates are in units of .5 */ - Rate = Rate << 2; + Rate = Rate << 1; _tprintf(_T("%u "), Rate); }

1 0

[sserapion] 54884: revert unintended local change
by sserapion＠svn.reactos.org 08 Jan '12

08 Jan '12

Author: sserapion Date: Sun Jan 8 22:29:37 2012 New Revision: 54884 URL: http://svn.reactos.org/svn/reactos?rev=54884&view=rev Log: revert unintended local change Modified: branches/sspi-bringup/reactos/dll/win32/mshtml/main.c Modified: branches/sspi-bringup/reactos/dll/win32/mshtml/main.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/mshtml/main.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/mshtml/main.c [iso-8859-1] Sun Jan 8 22:29:37 2012 @@ -423,8 +423,8 @@ HRESULT hres; hres = register_server(TRUE); - //if(SUCCEEDED(hres)) - // load_gecko(FALSE); + if(SUCCEEDED(hres)) + load_gecko(FALSE); return hres; }

1 0

[sserapion] 54883: Fix build. mark schannel as forked
by sserapion＠svn.reactos.org 08 Jan '12

08 Jan '12

Author: sserapion Date: Sun Jan 8 22:12:07 2012 New Revision: 54883 URL: http://svn.reactos.org/svn/reactos?rev=54883&view=rev Log: Fix build. mark schannel as forked Modified: branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_transport.c branches/sspi-bringup/reactos/dll/win32/schannel/lsamode.c branches/sspi-bringup/reactos/lib/rtl/unicode.c branches/sspi-bringup/reactos/media/doc/README.WINE Modified: branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_transport.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_transport.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_transport.c [iso-8859-1] Sun Jan 8 22:12:07 2012 @@ -36,6 +36,7 @@ #define WIN32_NO_STATUS #include <windows.h> #include <ndk/ntndk.h> +#include <wininet.h> #if defined(__MINGW32__) || defined (_MSC_VER) # include <ws2tcpip.h> @@ -1868,7 +1869,7 @@ { LONG refs; HANDLE completion_event; - INTERNET_BUFFERSA inet_buffers; + INTERNET_BUFFERS inet_buffers; void *destination_buffer; /* the address that inet_buffers.lpvBuffer will be * copied into when the call completes */ CRITICAL_SECTION cs; Modified: branches/sspi-bringup/reactos/dll/win32/schannel/lsamode.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/schannel/lsamode.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/schannel/lsamode.c [iso-8859-1] Sun Jan 8 22:12:07 2012 @@ -30,6 +30,10 @@ #include "ntsecpkg.h" #include "schannel.h" +#define SCHANNEL_COMMENT_A "Schannel Security Package\0" +#define SCHANNEL_COMMENT_W L"Schannel Security Package\0" +#define SCHANNEL_COMMENT __MINGW_NAME_UAW(SCHANNEL_COMMENT) + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(schannel); @@ -37,7 +41,7 @@ /*********************************************************************** * SpGetInfoUnified */ -static NTSTATUS WINAPI SpGetInfoUnified(PSecPkgInfoW PackageInfo) +static NTSTATUS NTAPI SpGetInfoUnified(PSecPkgInfo PackageInfo) { TRACE("(%p)\n", PackageInfo); @@ -49,19 +53,16 @@ PackageInfo->wVersion = 1; PackageInfo->wRPCID = UNISP_RPC_ID; PackageInfo->cbMaxToken = 0x4000; - PackageInfo->Name = (LPWSTR)UNISP_NAME_W; - PackageInfo->Comment = (LPWSTR)UNISP_NAME_W; + PackageInfo->Name = UNISP_NAME; + PackageInfo->Comment = UNISP_NAME; return STATUS_SUCCESS; } -static SEC_WCHAR schannelCommentW[] = { 'S','c','h','a','n','n','e','l', - ' ','S','e','c','u','r','i','t','y',' ','P','a','c','k','a','g','e',0 }; - /*********************************************************************** * SpGetInfoSChannel */ -static NTSTATUS WINAPI SpGetInfoSChannel(PSecPkgInfoW PackageInfo) +static NTSTATUS NTAPI SpGetInfoSChannel(PSecPkgInfo PackageInfo) { TRACE("(%p)\n", PackageInfo); @@ -73,8 +74,8 @@ PackageInfo->wVersion = 1; PackageInfo->wRPCID = UNISP_RPC_ID; PackageInfo->cbMaxToken = 0x4000; - PackageInfo->Name = (LPWSTR)SCHANNEL_NAME_W; - PackageInfo->Comment = schannelCommentW; + PackageInfo->Name = SCHANNEL_NAME; + PackageInfo->Comment = SCHANNEL_COMMENT; return STATUS_SUCCESS; } Modified: branches/sspi-bringup/reactos/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/lib/rtl/un… ============================================================================== --- branches/sspi-bringup/reactos/lib/rtl/unicode.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/lib/rtl/unicode.c [iso-8859-1] Sun Jan 8 22:12:07 2012 @@ -1664,7 +1664,7 @@ NTAPI RtlUnicodeStringToCountedOemString( IN OUT POEM_STRING OemDest, - IN PUNICODE_STRING UniSource, + IN PCUNICODE_STRING UniSource, IN BOOLEAN AllocateDestinationString) { NTSTATUS Status; Modified: branches/sspi-bringup/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/media/doc/… ============================================================================== --- branches/sspi-bringup/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/media/doc/README.WINE [iso-8859-1] Sun Jan 8 22:12:07 2012 @@ -144,7 +144,7 @@ reactos/dll/win32/rsabase # Autosync reactos/dll/win32/rsaenh # Autosync reactos/dll/win32/sccbase # Autosync -reactos/dll/win32/schannel # Autosync +reactos/dll/win32/schannel # Forked reactos/dll/win32/secur32 # Forked reactos/dll/win32/security # Forked (different .spec) reactos/dll/win32/sensapi # Autosync

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