Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 35821: - Add SecureZeroMemory/RtlSecureZeroMemory - Add x86 versions of PreFetchCacheLine and MemoryBarrier (TODO for other architectures)
by sginsberg＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: sginsberg Date: Sat Aug 30 17:54:27 2008 New Revision: 35821 URL: http://svn.reactos.org/svn/reactos?rev=35821&view=rev Log: - Add SecureZeroMemory/RtlSecureZeroMemory - Add x86 versions of PreFetchCacheLine and MemoryBarrier (TODO for other architectures) Modified: trunk/reactos/include/psdk/winbase.h trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Sat Aug 30 17:54:27 2008 @@ -1208,6 +1208,7 @@ #define CopyMemory RtlCopyMemory #define FillMemory RtlFillMemory #define ZeroMemory RtlZeroMemory +#define SecureZeroMemory RtlSecureZeroMemory BOOL WINAPI CopySid(DWORD,PSID,PSID); #if (_WIN32_WINNT >= 0x0501) HANDLE WINAPI CreateActCtxA(PCACTCTXA); Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Aug 30 17:54:27 2008 @@ -4453,6 +4453,23 @@ #define RtlFillMemory(d,l,f) memset((d), (f), (l)) #define RtlZeroMemory(d,l) RtlFillMemory((d),(l),0) +FORCEINLINE +PVOID +RtlSecureZeroMemory(IN PVOID ptr, + IN SIZE_T cnt) +{ + volatile char *vptr = (volatile char *)ptr; + + while (cnt) + { + *vptr = 0; + vptr++; + cnt--; + } + + return ptr; +} + typedef struct _OBJECT_TYPE_LIST { WORD Level; WORD Sbz; @@ -4656,6 +4673,43 @@ #endif +/* TODO: Other architectures than X86 */ +#if defined(_M_IX86) +#define PF_TEMPORAL_LEVEL_1 +#define PF_NON_TEMPORAL_LEVEL_ALL +#define PreFetchCacheLine(l, a) +#elif defined (_M_AMD64) +#define PreFetchCacheLine(l, a) +#elif defined(_M_PPC) +#define PreFetchCacheLine(l, a) +#elif defined(_M_ARM) +#define PreFetchCacheLine(l, a) +#else +#error Unknown architecture +#endif + +/* TODO: Other architectures than X86 */ +#if defined(_M_IX86) +FORCEINLINE +VOID +MemoryBarrier(VOID) +{ + LONG Barrier; + __asm__ __volatile__ + { + xchg Barrier, eax + } +} +#elif defined (_M_AMD64) +#define MemoryBarrier() +#elif defined(_M_PPC) +#define MemoryBarrier() +#elif defined(_M_ARM) +#define MemoryBarrier() +#else +#error Unknown architecture +#endif + #if defined(_M_IX86) #define YieldProcessor() __asm__ __volatile__("pause"); #elif defined (_M_AMD64)

1 0

[spetreolle] 35820: fix typo
by spetreolle＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: spetreolle Date: Sat Aug 30 16:58:12 2008 New Revision: 35820 URL: http://svn.reactos.org/svn/reactos?rev=35820&view=rev Log: fix typo Modified: trunk/reactos/drivers/usb/directory.rbuild Modified: trunk/reactos/drivers/usb/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/directory.rbui… ============================================================================== --- trunk/reactos/drivers/usb/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/directory.rbuild [iso-8859-1] Sat Aug 30 16:58:12 2008 @@ -10,7 +10,7 @@ <directory name="usbhub"> <xi:include href="usbhub/usbhub.rbuild" /> </directory> - directory name="usbstor"> + <directory name="usbstor"> <xi:include href="usbstor/usbstor.rbuild" /> </directory--> </group>

1 0

[sginsberg] 35819: - CACHE_DESCRIPTOR and PROCESSOR_CACHE_TYPE are public and defined in winnt.h, so no need to define them in the NDK (the NDK includes winnt.h through windef.h, so this breaks build)
by sginsberg＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: sginsberg Date: Sat Aug 30 16:34:56 2008 New Revision: 35819 URL: http://svn.reactos.org/svn/reactos?rev=35819&view=rev Log: - CACHE_DESCRIPTOR and PROCESSOR_CACHE_TYPE are public and defined in winnt.h, so no need to define them in the NDK (the NDK includes winnt.h through windef.h, so this breaks build) Modified: trunk/reactos/include/ndk/ketypes.h Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ketypes.h [iso-8859-1] Sat Aug 30 16:34:56 2008 @@ -542,17 +542,6 @@ } KAPC_ENVIRONMENT; // -// CPU Cache Types -// -typedef enum _PROCESSOR_CACHE_TYPE -{ - CacheUnified, - CacheInstruction, - CacheData, - CacheTrace, -} PROCESSOR_CACHE_TYPE; - -// // PRCB DPC Data // typedef struct _KDPC_DATA @@ -571,18 +560,6 @@ struct _GENERAL_LOOKASIDE *P; struct _GENERAL_LOOKASIDE *L; } PP_LOOKASIDE_LIST, *PPP_LOOKASIDE_LIST; - -// -// CPU Cache Descriptor -// -typedef struct _CACHE_DESCRIPTOR -{ - UCHAR Level; - UCHAR Associativity; - USHORT LineSize; - ULONG Size; - PROCESSOR_CACHE_TYPE Type; -} CACHE_DESCRIPTOR, *PCACHE_DESCRIPTOR; // // Architectural Types

1 0

[pschweitzer] 35818: Removed useless defines
by pschweitzer＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: pschweitzer Date: Sat Aug 30 15:41:26 2008 New Revision: 35818 URL: http://svn.reactos.org/svn/reactos?rev=35818&view=rev Log: Removed useless defines Modified: trunk/reactos/dll/win32/sfc/sfc.spec trunk/reactos/dll/win32/sfc_os/sfc_os.spec Modified: trunk/reactos/dll/win32/sfc/sfc.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc/sfc.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/sfc/sfc.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sfc/sfc.spec [iso-8859-1] Sat Aug 30 15:41:26 2008 @@ -14,5 +14,4 @@ @ stdcall SfcIsFileProtected (ptr wstr) sfc_os.SfcIsFileProtected @ stub SfcWLEventLogoff @ stub SfcWLEventLogon -@ stdcall SfpVerifyFile (str str long) -@ stdcall start (long long ptr) DllMain +@ stdcall SfpVerifyFile (str str long) Modified: trunk/reactos/dll/win32/sfc_os/sfc_os.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc_os/sfc_os.sp… ============================================================================== --- trunk/reactos/dll/win32/sfc_os/sfc_os.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sfc_os/sfc_os.spec [iso-8859-1] Sat Aug 30 15:41:26 2008 @@ -8,5 +8,4 @@ @ stub SfcGetNextProtectedFile @ stub SfcIsFileProtected @ stub SfcWLEventLogoff -@ stub SfcWLEventLogon -@ stdcall start (long long ptr) DllMain +@ stub SfcWLEventLogon

1 0

[sginsberg] 35817: - Add APIs new to Windows 2003/SP1 (including XP SP1) - Add missing NtGetCurrentProcessorNumber to ntdll - Update headers with missing structures
by sginsberg＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: sginsberg Date: Sat Aug 30 15:29:57 2008 New Revision: 35817 URL: http://svn.reactos.org/svn/reactos?rev=35817&view=rev Log: - Add APIs new to Windows 2003/SP1 (including XP SP1) - Add missing NtGetCurrentProcessorNumber to ntdll - Update headers with missing structures Modified: trunk/reactos/dll/ntdll/def/ntdll_arm.def trunk/reactos/dll/ntdll/def/ntdll_i386.def trunk/reactos/dll/win32/advapi32/advapi32.def trunk/reactos/dll/win32/advapi32/token/token.c trunk/reactos/dll/win32/kernel32/kernel32.def trunk/reactos/dll/win32/kernel32/misc/stubs.c trunk/reactos/dll/win32/kernel32/misc/sysinfo.c trunk/reactos/dll/win32/psapi/psapi.c trunk/reactos/dll/win32/psapi/psapi.def trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/dll/ntdll/def/ntdll_arm.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll_arm.de… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll_arm.def [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll_arm.def [iso-8859-1] Sat Aug 30 15:29:57 2008 @@ -291,6 +291,7 @@ NtWriteRequestData NtWriteVirtualMemory NtYieldExecution +NtGetCurrentProcessorNumber ;PfxFindPrefix ;PfxInitialize ;PfxInsertPrefix Modified: trunk/reactos/dll/ntdll/def/ntdll_i386.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll_i386.d… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll_i386.def [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll_i386.def [iso-8859-1] Sat Aug 30 15:29:57 2008 @@ -291,6 +291,7 @@ NtWriteRequestData@24 NtWriteVirtualMemory@20 NtYieldExecution@0 +NtGetCurrentProcessorNumber@0 ;PfxFindPrefix ;PfxInitialize ;PfxInsertPrefix Modified: trunk/reactos/dll/win32/advapi32/advapi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.def [iso-8859-1] Sat Aug 30 15:29:57 2008 @@ -107,6 +107,7 @@ ;CreateProcessAsUserSecure CreateProcessAsUserW@44 ;CreateProcessWithLogonW +CreateProcessWithTokenW@36 CreateRestrictedToken@36 CreateServiceA@52 CreateServiceW@52 Modified: trunk/reactos/dll/win32/advapi32/token/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/token/t… ============================================================================== --- trunk/reactos/dll/win32/advapi32/token/token.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/token/token.c [iso-8859-1] Sat Aug 30 15:29:57 2008 @@ -670,4 +670,18 @@ return PSiteSid; } - +BOOL +WINAPI +CreateProcessWithTokenW(IN HANDLE hToken, + IN DWORD dwLogonFlags, + IN LPCWSTR lpApplicationName OPTIONAL, + IN OUT LPWSTR lpCommandLine OPTIONAL, + IN DWORD dwCreationFlags, + IN LPVOID lpEnvironment OPTIONAL, + IN LPCWSTR lpCurrentDirectory OPTIONAL, + IN LPSTARTUPINFOW lpStartupInfo, + OUT LPPROCESS_INFORMATION lpProcessInfo) +{ + UNIMPLEMENTED; + return FALSE; +} Modified: trunk/reactos/dll/win32/kernel32/kernel32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.def [iso-8859-1] Sat Aug 30 15:29:57 2008 @@ -97,6 +97,7 @@ ConvertDefaultLocale@4 ConvertFiberToThread@0 ConvertThreadToFiber@4 +ConvertThreadToFiberEx@8 CopyFileA@12 CopyFileExA@24 CopyFileExW@24 @@ -210,6 +211,7 @@ EnumResourceTypesW@12 EnumSystemCodePagesA@8 EnumSystemCodePagesW@8 +EnumSystemFirmwareTables@12 EnumSystemGeoID@12 EnumSystemLanguageGroupsA@12 EnumSystemLanguageGroupsW@12 @@ -272,10 +274,10 @@ FindResourceW@12 FindVolumeClose@4 FindVolumeMountPointClose@4 -;FlsAlloc@4 ;new for 2003 -;FlsFree@4 ;new for 2003 -;FlsGetValue@4 ;new for 2003 -;FlsSetValue@8 ;new for 2003 +FlsAlloc@4 +FlsFree@4 +FlsGetValue@4 +FlsSetValue@8 FlushConsoleInputBuffer@4 FlushFileBuffers@4 FlushInstructionCache@12 @@ -366,6 +368,7 @@ GetCurrentDirectoryW@8 GetCurrentProcess@0 GetCurrentProcessId@0 +GetCurrentProcessorNumber@0 GetCurrentThread@0 GetCurrentThreadId@0 GetDateFormatA@24 @@ -423,6 +426,7 @@ GetLogicalDriveStringsA@8 GetLogicalDriveStringsW@8 GetLogicalDrives@0 +GetLogicalProcessorInformation@8 GetLongPathNameA@12 GetLongPathNameW@12 GetMailslotInfo@20 @@ -438,6 +442,7 @@ GetNativeSystemInfo@4 GetNextVDMCommand@4 GetNlsSectionName@24 +GetNumaAvailableMemoryNode@8 GetNumaHighestNodeNumber@4 GetNumaNodeProcessorMask@8 ;GetNumaProcessorMap @@ -473,6 +478,7 @@ GetProcessTimes@20 GetProcessVersion@4 GetProcessWorkingSetSize@12 +GetProcessWorkingSetSizeEx@16 GetProfileIntA@12 GetProfileIntW@12 GetProfileSectionA@12 @@ -494,6 +500,8 @@ GetSystemDefaultUILanguage@0 GetSystemDirectoryA@8 GetSystemDirectoryW@8 +GetSystemFileCacheSize@12 +GetSystemFirmwareTable@16 GetSystemInfo@4 GetSystemPowerStatus@4 GetSystemRegistryQuota@8 @@ -763,6 +771,7 @@ ;RemoveLocalAlternateComputerNameA ;RemoveLocalAlternateComputerNameW RemoveVectoredExceptionHandler(a)4=NTDLL.RtlRemoveVectoredExceptionHandler +ReOpenFile@16 ReplaceFile=ReplaceFileW@24 ReplaceFileA@24 ReplaceFileW@24 @@ -874,7 +883,9 @@ SetProcessPriorityBoost@8 SetProcessShutdownParameters@8 SetProcessWorkingSetSize@12 +SetProcessWorkingSetSizeEx@16 SetStdHandle@8 +SetSystemFileCacheSize@12 SetSystemPowerState@8 SetSystemTime@4 SetSystemTimeAdjustment@8 @@ -888,6 +899,7 @@ SetThreadLocale@4 SetThreadPriority@8 SetThreadPriorityBoost@8 +SetThreadStackGuarantee@4 SetThreadUILanguage@4 SetTimerQueueTimer@24 SetTimeZoneInformation@4 Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] Sat Aug 30 15:29:57 2008 @@ -1402,3 +1402,104 @@ STUB; return FALSE; } + +UINT +WINAPI +EnumSystemFirmwareTables(IN DWORD FirmwareTableProviderSignature, + OUT PVOID pFirmwareTableBuffer, + IN DWORD BufferSize) +{ + STUB; + return 0; +} + +BOOL +WINAPI +GetSystemFileCacheSize(OUT PSIZE_T lpMinimumFileCacheSize, + OUT PSIZE_T lpMaximumFileCacheSize, + OUT PDWORD lpFlags) +{ + STUB; + return FALSE; +} + +UINT +WINAPI +GetSystemFirmwareTable(IN DWORD FirmwareTableProviderSignature, + IN DWORD FirmwareTableID, + OUT PVOID pFirmwareTableBuffer, + IN DWORD BufferSize) +{ + STUB; + return 0; +} + +BOOL +WINAPI +SetSystemFileCacheSize(IN SIZE_T MinimumFileCacheSize, + IN SIZE_T MaximumFileCacheSize, + IN DWORD Flags) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +SetThreadStackGuarantee(IN OUT PULONG StackSizeInBytes) +{ + STUB; + return FALSE; +} + +HANDLE +WINAPI +ReOpenFile(IN HANDLE hOriginalFile, + IN DWORD dwDesiredAccess, + IN DWORD dwShareMode, + IN DWORD dwFlags) +{ + STUB; + return INVALID_HANDLE_VALUE; +} + +BOOL +WINAPI +SetProcessWorkingSetSizeEx(IN HANDLE hProcess, + IN SIZE_T dwMinimumWorkingSetSize, + IN SIZE_T dwMaximumWorkingSetSize, + IN DWORD Flags) +{ + STUB; + return FALSE; +} + + +BOOL +WINAPI +GetProcessWorkingSetSizeEx(IN HANDLE hProcess, + OUT PSIZE_T lpMinimumWorkingSetSize, + OUT PSIZE_T lpMaximumWorkingSetSize, + OUT PDWORD Flags) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +GetLogicalProcessorInformation(OUT PSYSTEM_LOGICAL_PROCESSOR_INFORMATION Buffer, + IN OUT PDWORD ReturnLength) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +GetNumaAvailableMemoryNode(IN UCHAR Node, + OUT PULONGLONG AvailableBytes) +{ + STUB; + return FALSE; +} Modified: trunk/reactos/dll/win32/kernel32/misc/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/sy… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/sysinfo.c [iso-8859-1] Sat Aug 30 15:29:57 2008 @@ -233,4 +233,12 @@ GetSystemInfo(lpSystemInfo); } +DWORD +WINAPI +GetCurrentProcessorNumber(VOID) +{ + /* Forward to kernel */ + return NtGetCurrentProcessorNumber(); +} + /* EOF */ Modified: trunk/reactos/dll/win32/psapi/psapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/psapi/psapi.c?re… ============================================================================== --- trunk/reactos/dll/win32/psapi/psapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/psapi/psapi.c [iso-8859-1] Sat Aug 30 15:29:57 2008 @@ -1398,4 +1398,17 @@ return TRUE; } +/* + * @unimplemented + */ +BOOL +WINAPI +QueryWorkingSetEx(IN HANDLE hProcess, + IN OUT PVOID pv, + IN DWORD cb) +{ + UNIMPLEMENTED; + return FALSE; +} + /* EOF */ Modified: trunk/reactos/dll/win32/psapi/psapi.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/psapi/psapi.def?… ============================================================================== --- trunk/reactos/dll/win32/psapi/psapi.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/psapi/psapi.def [iso-8859-1] Sat Aug 30 15:29:57 2008 @@ -32,3 +32,4 @@ GetWsChanges@12 @22 InitializeProcessForWsWatch@4 @23 QueryWorkingSet@12 @24 +QueryWorkingSetEx@12 @25 Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Aug 30 15:29:57 2008 @@ -4400,6 +4400,45 @@ ULONGLONG WINAPI VerSetConditionMask(ULONGLONG,DWORD,BYTE); #endif +typedef enum _PROCESSOR_CACHE_TYPE { + CacheUnified, + CacheInstruction, + CacheData, + CacheTrace +} PROCESSOR_CACHE_TYPE; + +typedef enum _LOGICAL_PROCESSOR_RELATIONSHIP { + RelationProcessorCore, + RelationNumaNode, + RelationCache, + RelationProcessorPackage +} LOGICAL_PROCESSOR_RELATIONSHIP; + +#define CACHE_FULLY_ASSOCIATIVE 0xFF + +typedef struct _CACHE_DESCRIPTOR { + BYTE Level; + BYTE Associativity; + WORD LineSize; + DWORD Size; + PROCESSOR_CACHE_TYPE Type; +} CACHE_DESCRIPTOR, *PCACHE_DESCRIPTOR; + +typedef struct _SYSTEM_LOGICAL_PROCESSOR_INFORMATION { + ULONG_PTR ProcessorMask; + LOGICAL_PROCESSOR_RELATIONSHIP Relationship; + union { + struct { + BYTE Flags; + } ProcessorCore; + struct { + DWORD NodeNumber; + } NumaNode; + CACHE_DESCRIPTOR Cache; + ULONGLONG Reserved[2]; + }; +} SYSTEM_LOGICAL_PROCESSOR_INFORMATION, *PSYSTEM_LOGICAL_PROCESSOR_INFORMATION; + NTSYSAPI SIZE_T STDCALL

1 0

[pschweitzer] 35816: - Primary implementation of sfc_os.dll. - Linked some functions of sfc.dll to sfc_os.dll
by pschweitzer＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: pschweitzer Date: Sat Aug 30 15:22:35 2008 New Revision: 35816 URL: http://svn.reactos.org/svn/reactos?rev=35816&view=rev Log: - Primary implementation of sfc_os.dll. - Linked some functions of sfc.dll to sfc_os.dll Added: trunk/reactos/dll/win32/sfc_os/ (with props) trunk/reactos/dll/win32/sfc_os/precomp.h (with props) trunk/reactos/dll/win32/sfc_os/sfc_os.c (with props) trunk/reactos/dll/win32/sfc_os/sfc_os.rbuild (with props) trunk/reactos/dll/win32/sfc_os/sfc_os.spec (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/sfc/sfc.spec trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=358… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Sat Aug 30 15:22:35 2008 @@ -149,6 +149,7 @@ <property name="BASEADDRESS_GDIPLUS" value="0x76a00000" /> <property name="BASEADDRESS_ATL" value="0x76a80000" /> <property name="BASEADDRESS_SFC" value="0x76b50000" /> + <property name="BASEADDRESS_SFC_OS" value="0x76c10000" /> <property name="BASEADDRESS_WINTRUST" value="0x76c30000" /> <property name="BASEADDRESS_IMAGEHLP" value="0x76c90000" /> <property name="BASEADDRESS_CLUSAPI" value="0x76d10000" /> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat Aug 30 15:22:35 2008 @@ -321,6 +321,7 @@ dll\win32\serialui\serialui.dll 1 dll\win32\setupapi\setupapi.dll 1 dll\win32\sfc\sfc.dll 1 +dll\win32\sfc_os\sfc_os.dll 1 dll\win32\shdocvw\shdocvw.dll 1 dll\win32\shell32\shell32.dll 1 dll\win32\shfolder\shfolder.dll 1 Modified: trunk/reactos/dll/win32/sfc/sfc.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc/sfc.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/sfc/sfc.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sfc/sfc.spec [iso-8859-1] Sat Aug 30 15:22:35 2008 @@ -10,9 +10,9 @@ @ stdcall SRSetRestorePoint (ptr ptr) SRSetRestorePointA @ stdcall SRSetRestorePointA (ptr ptr) @ stdcall SRSetRestorePointW (ptr ptr) -@ stub SfcGetNextProtectedFile -@ stub SfcIsFileProtected +@ stdcall SfcGetNextProtectedFile (ptr ptr) sfc_os.SfcGetNextProtectedFile +@ stdcall SfcIsFileProtected (ptr wstr) sfc_os.SfcIsFileProtected @ stub SfcWLEventLogoff @ stub SfcWLEventLogon -@ stdcall SfpVerifyFile (ptr ptr long) +@ stdcall SfpVerifyFile (str str long) @ stdcall start (long long ptr) DllMain Propchange: trunk/reactos/dll/win32/sfc_os/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Aug 30 15:22:35 2008 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/sfc_os/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/sfc_os/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/sfc_os/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/sfc_os/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc_os/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/sfc_os/precomp.h (added) +++ trunk/reactos/dll/win32/sfc_os/precomp.h [iso-8859-1] Sat Aug 30 15:22:35 2008 @@ -1,0 +1,6 @@ +#ifndef _PRECOMP_H__ +#define _PRECOMP_H__ + +#include <windows.h> + +#endif Propchange: trunk/reactos/dll/win32/sfc_os/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/sfc_os/sfc_os.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc_os/sfc_os.c?… ============================================================================== --- trunk/reactos/dll/win32/sfc_os/sfc_os.c (added) +++ trunk/reactos/dll/win32/sfc_os/sfc_os.c [iso-8859-1] Sat Aug 30 15:22:35 2008 @@ -1,0 +1,42 @@ +/* + * System File Checker (Windows File Protection) + * + * Copyright 2008 Pierre Schweitzer + * + * 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 "precomp.h" + +HINSTANCE hLibModule; + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + { + DisableThreadLibraryCalls(hinstDLL); + hLibModule = hinstDLL; + break; + } + case DLL_PROCESS_DETACH: + { + break; + } + } + + return TRUE; +} Propchange: trunk/reactos/dll/win32/sfc_os/sfc_os.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/sfc_os/sfc_os.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc_os/sfc_os.rb… ============================================================================== --- trunk/reactos/dll/win32/sfc_os/sfc_os.rbuild (added) +++ trunk/reactos/dll/win32/sfc_os/sfc_os.rbuild [iso-8859-1] Sat Aug 30 15:22:35 2008 @@ -1,0 +1,8 @@ +<module name="sfc_os" type="win32dll" baseaddress="${BASEADDRESS_SFC_OS}" installbase="system32" installname="sfc_os.dll" allowwarnings="yes"> + <importlibrary definition="sfc_os.spec.def" /> + <include base="sfc_os">.</include> + <library>kernel32</library> + <file>sfc_os.c</file> + <file>sfc_os.spec</file> + <pch>precomp.h</pch> +</module> Propchange: trunk/reactos/dll/win32/sfc_os/sfc_os.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/sfc_os/sfc_os.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc_os/sfc_os.sp… ============================================================================== --- trunk/reactos/dll/win32/sfc_os/sfc_os.spec (added) +++ trunk/reactos/dll/win32/sfc_os/sfc_os.spec [iso-8859-1] Sat Aug 30 15:22:35 2008 @@ -1,0 +1,12 @@ +@ stub sfc_os_1 +@ stub sfc_os_2 +@ stub sfc_os_3 +@ stub sfc_os_4 +@ stub sfc_os_5 +@ stub sfc_os_6 +@ stub sfc_os_7 +@ stub SfcGetNextProtectedFile +@ stub SfcIsFileProtected +@ stub SfcWLEventLogoff +@ stub SfcWLEventLogon +@ stdcall start (long long ptr) DllMain Propchange: trunk/reactos/dll/win32/sfc_os/sfc_os.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Sat Aug 30 15:22:35 2008 @@ -298,6 +298,9 @@ <directory name="sfc"> <xi:include href="sfc/sfc.rbuild" /> </directory> +<directory name="sfc_os"> + <xi:include href="sfc_os/sfc_os.rbuild" /> +</directory> <directory name="shdocvw"> <xi:include href="shdocvw/shdocvw.rbuild" /> </directory>

1 0

[janderwald] 35815: - update russian translation by tower at reactos org
by janderwald＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: janderwald Date: Sat Aug 30 14:10:50 2008 New Revision: 35815 URL: http://svn.reactos.org/svn/reactos?rev=35815&view=rev Log: - update russian translation by tower at reactos org Modified: trunk/reactos/dll/win32/netshell/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/netshell/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/ru-RU.rc [iso-8859-1] Sat Aug 30 14:10:50 2008 @@ -1,4 +1,50 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_NETPROPERTIES DIALOGEX DISCARDABLE 0, 0, 246, 246 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "Îñíîâíûå" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_COMPONENTSLIST, "SysListView32", LVS_LIST | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 9, 71, 230, 55 + LTEXT "Ñîåäèíåíèå Èñïîëüçóåò:", -1, 9,9,217,8 + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_BORDER | WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Íàñòðîèòü", IDC_CONFIGURE, 189, 38, 50, 14 + LTEXT "Îòìå÷åíûå ýëåìåíòû èñïîëüçóþòñÿ ïðè ñîåäèíåíèè:", -1, 9, 59, 217, 8 + PUSHBUTTON "&Óñòàíîâèòü", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Óäàëèòü", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Ñâîéñòâà", IDC_PROPERTIES, 174, 130, 65, 14 + GROUPBOX "Îïèñàíèå", -1, 9, 153, 230, 46, BS_GROUPBOX + LTEXT "Ñâîéñòâà êîìïîíåíòà èçëîæåíû íèæå...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP + CHECKBOX "Îòîáðàæàòü çíà÷åê â òðåå ïðè óñòàíîâëåíîì ñîåäèíåíèè", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Îïîâåùàòü â ñëó÷àå ðàçðûâà ñîåäèíåíèÿ", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP +END + +IDD_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "Îñíîâíûå" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ñîåäèíåíèå", -1, 9, 8, 182, 58, BS_GROUPBOX + LTEXT "Ñòàòóñ:", -1, 19, 20, 60, 8 + LTEXT "Ïðîäîëæèòåëüíîñòü:", -1, 19, 34, 60, 8 + LTEXT "Ñêîðîñòü:", -1, 19, 48, 60, 8 + GROUPBOX "Àêòèâíîñòü", -1, 9, 74, 182, 70, BS_GROUPBOX + RTEXT "Îòïðàâëåíî", -1, 26, 90, 60, 8 + ICON IDI_HORIZONTAL, -1, 90, 85, 18, 20 + ICON IDI_NETSTAT, -1, 110, 85, 18, 20 + ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 + LTEXT "Ïðèíÿòî", -1, 149, 90, 37, 8 + LTEXT "Áàéò:", -1, 17, 115, 32, 8 + RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 + ICON IDI_VERTICAL, -1, 110, 108, 18, 20 + RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 + PUSHBUTTON "&Ñâîéñòâà", IDC_STATUS_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "&Îòêëþ÷èòü", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 +END + STRINGTABLE DISCARDABLE BEGIN

1 0

[janderwald] 35814: - Implement enumerating network components (Client/Service/Transport) using NetCfg COM api - Add a check box to for enabling/disabling notification for network problems - Implement IOleCommandTarget interface for the LAN status dialog - Register the LAN property and LAN status CLSIDs
by janderwald＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: janderwald Date: Sat Aug 30 14:05:19 2008 New Revision: 35814 URL: http://svn.reactos.org/svn/reactos?rev=35814&view=rev Log: - Implement enumerating network components (Client/Service/Transport) using NetCfg COM api - Add a check box to for enabling/disabling notification for network problems - Implement IOleCommandTarget interface for the LAN status dialog - Register the LAN property and LAN status CLSIDs Added: trunk/reactos/dll/win32/netshell/lanstatusui.c (with props) Modified: trunk/reactos/dll/win32/netshell/lanconnectui.c trunk/reactos/dll/win32/netshell/lang/de-DE.rc trunk/reactos/dll/win32/netshell/lang/en-US.rc trunk/reactos/dll/win32/netshell/netshell.c trunk/reactos/dll/win32/netshell/netshell.rbuild trunk/reactos/dll/win32/netshell/precomp.h trunk/reactos/dll/win32/netshell/shfldr_netconnect.c Modified: trunk/reactos/dll/win32/netshell/lanconnectui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanconn… ============================================================================== --- trunk/reactos/dll/win32/netshell/lanconnectui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lanconnectui.c [iso-8859-1] Sat Aug 30 14:05:19 2008 @@ -1,4 +1,8 @@ #include <precomp.h> + +/// CLASSID +/// {7007ACC5-3202-11D1-AAD2-00805FC1270E} +/// open network properties and wlan properties typedef enum { @@ -20,11 +24,6 @@ INetConnection * pCon; LONG ref; }INetConnectionPropertyUiImpl, *LPINetConnectionPropertyUiImpl; - - -/// CLASSID -/// {7007ACC5-3202-11D1-AAD2-00805FC1270E} -/// open network properties and wlan properties HPROPSHEETPAGE InitializePropertySheetPage(LPWSTR resname, DLGPROC dlgproc, LPARAM lParam, LPWSTR szTitle) @@ -46,56 +45,6 @@ return CreatePropertySheetPageW(&ppage); } -HRESULT -LaunchUIDlg(UINT * pResourceIDs, DLGPROC * pDlgs, UINT Count, NETCON_PROPERTIES * pProperties) -{ - HPROPSHEETPAGE * hpsp; - PROPSHEETHEADERW psh; - BOOL ret; - UINT Index, Offset; - - hpsp = CoTaskMemAlloc(Count * sizeof(HPROPSHEETPAGE)); - if (!hpsp) - return E_OUTOFMEMORY; - - ZeroMemory(hpsp, Count * sizeof(HPROPSHEETPAGE)); - - Index = 0; - Offset = 0; - do - { - hpsp[Offset] = InitializePropertySheetPage(MAKEINTRESOURCEW(pResourceIDs[Index]), pDlgs[Index], (LPARAM)pProperties, NULL); - if (hpsp[Offset]) - Offset++; - - }while(++Index < Count); - - if (!Offset) - { - CoTaskMemFree(hpsp); - return E_FAIL; - } - - - ZeroMemory(&psh, sizeof(PROPSHEETHEADERW)); - psh.dwSize = sizeof(PROPSHEETHEADERW); - psh.dwFlags = PSP_DEFAULT | PSH_PROPTITLE; - psh.pszCaption = pProperties->pszwName; - psh.hwndParent = NULL; - psh.u3.phpage = hpsp; - psh.nPages = Offset; - psh.hInstance = netshell_hInstance; - - - ret = PropertySheetW(&psh); - CoTaskMemFree(hpsp); - - if (ret < 0) - return E_FAIL; - else - return S_OK; -} - VOID AddItemToListView(HWND hDlgCtrl, PNET_ITEM pItem, LPWSTR szName) { @@ -106,8 +55,8 @@ lvItem.pszText = szName; lvItem.lParam = (LPARAM)pItem; lvItem.iItem = ListView_GetItemCount(hDlgCtrl); - - SendMessageW(hDlgCtrl, LVM_INSERTITEMW, 0, (LPARAM)&lvItem); + lvItem.iItem = SendMessageW(hDlgCtrl, LVM_INSERTITEMW, 0, (LPARAM)&lvItem); + ListView_SetCheckState(hDlgCtrl, lvItem.iItem, TRUE); } VOID @@ -117,8 +66,8 @@ DWORD dwSize; DWORD dwRetVal; DWORD dwCharacteristics; - WCHAR szName[60]; - WCHAR szText[40]; + WCHAR szName[100]; + WCHAR szText[100]; WCHAR szHelp[200]; HKEY hSubKey; static WCHAR szNDI[] = L"\\Ndi"; @@ -173,6 +122,10 @@ RegCloseKey(hSubKey); } + if (!wcslen(szText)) + continue; + + pItem = CoTaskMemAlloc(sizeof(NET_ITEM)); if (!pItem) continue; @@ -192,40 +145,96 @@ } +VOID +EnumComponents(HWND hDlgCtrl, INetCfg * pNCfg, const GUID * CompGuid, UINT Type) +{ + HRESULT hr; + IEnumNetCfgComponent * pENetCfg; + INetCfgComponent *pNCfgComp; + ULONG Num; + DWORD dwCharacteristics; + LPOLESTR pDisplayName, pHelpText; + PNET_ITEM pItem; + + + hr = INetCfg_EnumComponents(pNCfg, CompGuid, &pENetCfg); + if (FAILED(hr)) + { + INetCfg_Release(pNCfg); + return; + } + while(IEnumNetCfgComponent_Next(pENetCfg, 1, &pNCfgComp, &Num) == S_OK) + { + hr = INetCfgComponent_GetCharacteristics(pNCfgComp, &dwCharacteristics); + if (SUCCEEDED(hr) && (dwCharacteristics & NCF_HIDDEN)) + { + INetCfgComponent_Release(pNCfgComp); + continue; + } + pDisplayName = NULL; + pHelpText = NULL; + hr = INetCfgComponent_GetDisplayName(pNCfgComp, &pDisplayName); + hr = INetCfgComponent_GetHelpText(pNCfgComp, &pHelpText); + + pItem = CoTaskMemAlloc(sizeof(NET_ITEM)); + if (!pItem) + continue; + pItem->dwCharacteristics = dwCharacteristics; + pItem->szHelp = pHelpText; + pItem->Type = Type; + AddItemToListView(hDlgCtrl, pItem, pDisplayName); + CoTaskMemFree(pDisplayName); + + INetCfgComponent_Release(pNCfgComp); + } + IEnumNetCfgComponent_Release(pENetCfg); +} + VOID InitializeLANPropertiesUIDlg(HWND hwndDlg) { - static WCHAR szNetClient[] = L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4d36e973-e325-11ce-bfc1-08002be10318}"; - static WCHAR szNetService[] = L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4d36e974-e325-11ce-bfc1-08002be10318}"; - static WCHAR szNetProtocol[] =L"System\\CurrentControlSet\\Control\\Network\\{4D36E975-E325-11CE-BFC1-08002BE10318}"; - HKEY hKey; - HWND hDlgCtrl; - - hDlgCtrl = GetDlgItem(hwndDlg, IDC_COMPONENTSLIST); - /* Enumerate Clients */ - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szNetClient, 0, KEY_READ, &hKey) == ERROR_SUCCESS) - { - EnumClientServiceProtocol(hwndDlg, hKey, NET_TYPE_CLIENT); - RegCloseKey(hKey); - } - - /* Enumerate Service */ - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szNetService, 0, KEY_READ, &hKey) == ERROR_SUCCESS) - { - EnumClientServiceProtocol(hwndDlg, hKey, NET_TYPE_SERVICE); - RegCloseKey(hKey); - } - - /* Enumerate Protocol */ - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szNetProtocol, 0, KEY_READ, &hKey) == ERROR_SUCCESS) - { - EnumClientServiceProtocol(hwndDlg, hKey, NET_TYPE_PROTOCOL); - RegCloseKey(hKey); - } - - -} + HRESULT hr; + INetCfg * pNCfg; + HWND hDlgCtrl = GetDlgItem(hwndDlg, IDC_COMPONENTSLIST); + LVCOLUMNW lc; + RECT rc; + DWORD dwStyle; + + memset(&lc, 0, sizeof(LV_COLUMN)); + lc.mask = LVCF_TEXT | LVCF_SUBITEM | LVCF_FMT; + lc.fmt = LVCFMT_FIXED_WIDTH; + if (GetClientRect(hDlgCtrl, &rc)) + { + lc.mask |= LVCF_WIDTH; + lc.cx = rc.right - rc.left; + } + lc.pszText = L""; + (void)SendMessageW(hDlgCtrl, LVM_INSERTCOLUMNW, 0, (LPARAM)&lc); + dwStyle = (DWORD) SendMessage(hDlgCtrl, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + dwStyle = dwStyle | LVS_EX_FULLROWSELECT | LVS_EX_CHECKBOXES; + SendMessage(hDlgCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, dwStyle); + + + + hr = CoCreateInstance(&CLSID_CNetCfg, NULL, CLSCTX_INPROC_SERVER, &IID_INetCfg, (LPVOID*)&pNCfg); + if (FAILED(hr)) + return; + + hr = INetCfg_Initialize(pNCfg, NULL); + if (FAILED(hr)) + { + INetCfg_Release(pNCfg); + return; + } + + EnumComponents(hDlgCtrl, pNCfg, &GUID_DEVCLASS_NETCLIENT, NET_TYPE_CLIENT); + EnumComponents(hDlgCtrl, pNCfg, &GUID_DEVCLASS_NETSERVICE, NET_TYPE_SERVICE); + EnumComponents(hDlgCtrl, pNCfg, &GUID_DEVCLASS_NETTRANS, NET_TYPE_PROTOCOL); + + INetCfg_Release(pNCfg); +} + INT_PTR @@ -238,7 +247,11 @@ ) { PROPSHEETPAGE *page; - NETCON_PROPERTIES * pProperties = (NETCON_PROPERTIES*)GetWindowLongPtr(hwndDlg, DWLP_USER); + LPNMLISTVIEW lppl; + LVITEMW li; + PNET_ITEM pItem; + NETCON_PROPERTIES * pProperties; + switch(uMsg) { case WM_INITDIALOG: @@ -257,52 +270,39 @@ } InitializeLANPropertiesUIDlg(hwndDlg); return TRUE; + case WM_NOTIFY: + lppl = (LPNMLISTVIEW) lParam; + if (lppl->hdr.code == LVN_ITEMCHANGING) + { + ZeroMemory(&li, sizeof(li)); + li.mask = LVIF_PARAM; + li.iItem = lppl->iItem; + if (!SendMessageW(lppl->hdr.hwndFrom, LVM_GETITEMW, 0, (LPARAM)&li)) + return TRUE; + + pItem = (PNET_ITEM)li.lParam; + if (!pItem) + return TRUE; + + if (!(lppl->uOldState & LVIS_FOCUSED) && (lppl->uNewState & LVIS_FOCUSED)) + { + /* new focused item */ + if (pItem->dwCharacteristics & NCF_NOT_USER_REMOVABLE) + EnableWindow(GetDlgItem(hwndDlg, IDC_UNINSTALL), FALSE); + else + EnableWindow(GetDlgItem(hwndDlg, IDC_UNINSTALL), TRUE); + + if (pItem->dwCharacteristics & NCF_HAS_UI) + EnableWindow(GetDlgItem(hwndDlg, IDC_PROPERTIES), TRUE); + else + EnableWindow(GetDlgItem(hwndDlg, IDC_PROPERTIES), FALSE); + + SendDlgItemMessageW(hwndDlg, IDC_DESCRIPTION, WM_SETTEXT, 0, (LPARAM)pItem->szHelp); + } + } + break; } return FALSE; -} - - -HRESULT -ShowLANConnectionPropertyDialog(NETCON_PROPERTIES * pProperties) -{ - UINT ResourceId[1] = { IDD_NETPROPERTIES }; - DLGPROC Dlgs[1] = {LANPropertiesUIDlg}; - INITCOMMONCONTROLSEX ic; - - - ic.dwSize = sizeof(INITCOMMONCONTROLSEX); - ic.dwICC = ICC_LISTVIEW_CLASSES; - InitCommonControlsEx(&ic); - - return LaunchUIDlg(ResourceId, Dlgs, 1, pProperties); -} - -INT_PTR -CALLBACK -LANStatusUIDlg( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) -{ - NETCON_PROPERTIES * pProperties = (NETCON_PROPERTIES*)GetWindowLongPtr(hwndDlg, DWLP_USER); - switch(uMsg) - { - case WM_INITDIALOG: - pProperties = (NETCON_PROPERTIES*)lParam; - return TRUE; - } - return FALSE; -} - - -HRESULT -ShowLANConnectionStatusDialog(NETCON_PROPERTIES * pProperties) -{ - UINT ResourceId[1] = { IDD_NETSTATUS }; - DLGPROC Dlgs[1] = {LANStatusUIDlg}; - return LaunchUIDlg(ResourceId, Dlgs, 1, pProperties); } static Modified: trunk/reactos/dll/win32/netshell/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/de… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/de-DE.rc [iso-8859-1] Sat Aug 30 14:05:19 2008 @@ -5,11 +5,11 @@ CAPTION "Allgemein" FONT 8, "MS Shell Dlg" BEGIN + CONTROL "List3", IDC_COMPONENTSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP | LVS_EX_FULLROWSELECT, 9, 71, 230, 55 LTEXT "Verbindung herstellen über:", -1, 9,9,217,8 - EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_BORDER | WS_DISABLED | WS_TABSTOP + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_BORDER | WS_TABSTOP | ES_READONLY PUSHBUTTON "&Konfigurieren", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Diese &Verbindung verwendet folgende Elemente:", -1, 9, 59, 217, 8 - CONTROL "List3", IDC_COMPONENTSLIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 9, 71, 230, 55 PUSHBUTTON "&Installieren", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Deinstallieren", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Eigenschaften", IDC_PROPERTIES, 174, 130, 65, 14 Modified: trunk/reactos/dll/win32/netshell/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/en… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/en-US.rc [iso-8859-1] Sat Aug 30 14:05:19 2008 @@ -5,11 +5,11 @@ CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN + CONTROL "", IDC_COMPONENTSLIST, "SysListView32", LVS_LIST | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 9, 71, 230, 55 LTEXT "Connect Using:", -1, 9,9,217,8 EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_BORDER | WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Configure", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Components checked are used by this connection:", -1, 9, 59, 217, 8 - CONTROL "", IDC_COMPONENTSLIST, "SysListView32", LVS_LIST | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 9, 71, 230, 55 PUSHBUTTON "&Install", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Uninstall", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Properties", IDC_PROPERTIES, 174, 130, 65, 14 Added: trunk/reactos/dll/win32/netshell/lanstatusui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanstat… ============================================================================== --- trunk/reactos/dll/win32/netshell/lanstatusui.c (added) +++ trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] Sat Aug 30 14:05:19 2008 @@ -1,0 +1,170 @@ +#include <precomp.h> + + +/// CLSID +/// HKEY_LOCAL_MACHINE\SOFTWARE\Classes\CLSID\{7007ACCF-3202-11D1-AAD2-00805FC1270E} +// IID B722BCCB-4E68-101B-A2BC-00AA00404770 +typedef struct +{ + IOleCommandTarget * lpVtbl; + LONG ref; +}ILanStatusImpl, *LPILanStatusImpl; + + +INT_PTR +CALLBACK +LANStatusUIDlg( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam +) +{ + switch(uMsg) + { + case WM_INITDIALOG: + return TRUE; + } + return FALSE; +} + + + +static +HRESULT +WINAPI +IOleCommandTarget_fnQueryInterface( + IOleCommandTarget * iface, + REFIID iid, + LPVOID * ppvObj) +{ + ILanStatusImpl * This = (ILanStatusImpl*)iface; + *ppvObj = NULL; + + if (IsEqualIID (iid, &IID_IUnknown) || + IsEqualIID (iid, &IID_IOleCommandTarget)) + { + *ppvObj = This; + IUnknown_AddRef(iface); + return S_OK; + } + + return E_NOINTERFACE; +} + +static +ULONG +WINAPI +IOleCommandTarget_fnAddRef( + IOleCommandTarget * iface) +{ + ILanStatusImpl * This = (ILanStatusImpl*)iface; + ULONG refCount = InterlockedIncrement(&This->ref); + + return refCount; +} + +static +ULONG +WINAPI +IOleCommandTarget_fnRelease( + IOleCommandTarget * iface) +{ + ILanStatusImpl * This = (ILanStatusImpl*)iface; + ULONG refCount = InterlockedDecrement(&This->ref); + + if (!refCount) + { + CoTaskMemFree (This); + } + return refCount; +} + +static +HRESULT +WINAPI +IOleCommandTarget_fnQueryStatus( + IOleCommandTarget * iface, + const GUID *pguidCmdGroup, + ULONG cCmds, + OLECMD *prgCmds, + OLECMDTEXT *pCmdText) +{ + MessageBoxW(NULL, L"IOleCommandTarget_fnQueryStatus", NULL, MB_OK); + return E_NOTIMPL; +} + +static +HRESULT +WINAPI +IOleCommandTarget_fnExec( + IOleCommandTarget * iface, + const GUID *pguidCmdGroup, + DWORD nCmdID, + DWORD nCmdexecopt, + VARIANT *pvaIn, + VARIANT *pvaOut) +{ + NOTIFYICONDATA nid; + HWND hwndDlg; + //ILanStatusImpl * This = (ILanStatusImpl*)iface; + + hwndDlg = CreateDialogW(netshell_hInstance, MAKEINTRESOURCEW(IDD_NETSTATUS), NULL, LANStatusUIDlg); + if (pguidCmdGroup) + { + if (IsEqualIID(pguidCmdGroup, &CGID_ShellServiceObject)) + { + nid.cbSize = sizeof(nid); + nid.uID = 100; + nid.uFlags = NIF_ICON; + nid.u.uVersion = NOTIFYICON_VERSION; + nid.hWnd = hwndDlg; + nid.hIcon = LoadIcon(netshell_hInstance, MAKEINTRESOURCE(IDI_SHELL_NETWORK_FOLDER)); + + Shell_NotifyIcon(NIM_ADD, &nid); + return S_OK; + } + } + return S_OK; +} + + +static const IOleCommandTargetVtbl vt_OleCommandTarget = +{ + IOleCommandTarget_fnQueryInterface, + IOleCommandTarget_fnAddRef, + IOleCommandTarget_fnRelease, + IOleCommandTarget_fnQueryStatus, + IOleCommandTarget_fnExec, +}; + + +HRESULT WINAPI LanConnectStatusUI_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) +{ + ILanStatusImpl * This; + + if (!ppv) + return E_POINTER; + + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + This = (ILanStatusImpl *) CoTaskMemAlloc(sizeof (ILanStatusImpl)); + if (!This) + return E_OUTOFMEMORY; + + This->ref = 1; + This->lpVtbl = (IOleCommandTarget*)&vt_OleCommandTarget; + + if (!SUCCEEDED (IOleCommandTarget_fnQueryInterface ((IOleCommandTarget*)This, riid, ppv))) + { + IOleCommandTarget_Release((IUnknown*)This); + return E_NOINTERFACE; + } + + IOleCommandTarget_Release((IUnknown*)This); + return S_OK; +} + + + Propchange: trunk/reactos/dll/win32/netshell/lanstatusui.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/netshell/netshell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/netshel… ============================================================================== --- trunk/reactos/dll/win32/netshell/netshell.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/netshell.c [iso-8859-1] Sat Aug 30 14:05:19 2008 @@ -1,12 +1,15 @@ #include "precomp.h" +#include <initguid.h> +#include <devguid.h> HINSTANCE netshell_hInstance; const GUID CLSID_LANConnectUI = {0x7007ACC5, 0x3202, 0x11D1, {0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E}}; const GUID CLSID_NetworkConnections = {0x7007ACC7, 0x3202, 0x11D1, {0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E}}; -const GUID GUID_DEVCLASS_NET = {0x4d36e972, 0xe325, 0x11ce, {0xbf, 0xc1, 0x08, 0x00, 0x2b, 0xe1, 0x03, 0x18}}; - -static const WCHAR szNetConnectClass[] = L"CLSID\\{7007ACC7-3202-11D1-AAD2-00805FC1270E}"; -static const WCHAR szLanConnectUI[] = L"CLSID\\{7007ACC5-3202-11D1-AA-D200805FC1270E}"; +const GUID CLSID_LanConnectStatusUI = {0x7007ACCF, 0x3202, 0x11D1, {0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E}}; + +static const WCHAR szNetConnectClass[] = L"CLSID\\{7007ACC7-3202-11D1-AAD2-00805FC1270E}"; +static const WCHAR szLanConnectUI[] = L"CLSID\\{7007ACC5-3202-11D1-AA-D200805FC1270E}"; +static const WCHAR szLanConnectStatusUI[] = L"CLSID\\{7007ACCF-3202-11D1-AA-D200805FC1270E}"; static const WCHAR szNamespaceKey[] = L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\ControlPanel\\NameSpace\\{7007ACC7-3202-11D1-AAD2-00805FC1270E}"; static INTERFACE_TABLE InterfaceTable[] = @@ -22,6 +25,10 @@ { &CLSID_LANConnectUI, LanConnectUI_Constructor + }, + { + &CLSID_LanConnectStatusUI, + LanConnectStatusUI_Constructor }, { NULL, @@ -62,6 +69,7 @@ WCHAR szNet[20]; UINT Length, Offset; + if (RegCreateKeyExW(HKEY_CLASSES_ROOT, szNetConnectClass, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS) return SELFREG_E_CLASS; @@ -98,6 +106,7 @@ if (RegCreateKeyExW(hKey, L"InProcServer32", 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS) { RegSetValueW(hSubKey, NULL, REG_SZ, &szName[1], (Offset+1) * sizeof(WCHAR)); + RegSetValueExW(hSubKey, L"ThreadingModel", 0, REG_SZ, (LPBYTE)L"Both", 10); RegCloseKey(hSubKey); } @@ -108,6 +117,32 @@ } RegCloseKey(hKey); + + if (RegCreateKeyExW(HKEY_CLASSES_ROOT, szLanConnectUI, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS) + return SELFREG_E_CLASS; + + if (RegCreateKeyExW(hKey, L"InProcServer32", 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS) + { + RegSetValueW(hSubKey, NULL, REG_SZ, &szName[1], (Offset+1) * sizeof(WCHAR)); + RegSetValueExW(hSubKey, L"ThreadingModel", 0, REG_SZ, (LPBYTE)L"Both", 10); + RegCloseKey(hSubKey); + } + + RegCloseKey(hKey); + + if (RegCreateKeyExW(HKEY_CLASSES_ROOT, szLanConnectStatusUI, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS) + return SELFREG_E_CLASS; + + if (RegCreateKeyExW(hKey, L"InProcServer32", 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS) + { + RegSetValueW(hSubKey, NULL, REG_SZ, &szName[1], (Offset+1) * sizeof(WCHAR)); + RegSetValueExW(hSubKey, L"ThreadingModel", 0, REG_SZ, (LPBYTE)L"Both", 10); + RegCloseKey(hSubKey); + } + + RegCloseKey(hKey); + + return S_OK; } @@ -128,7 +163,7 @@ { UINT i; HRESULT hres = E_OUTOFMEMORY; - IClassFactory * pcf = NULL; + IClassFactory * pcf = NULL; if (!ppv) return E_INVALIDARG; Modified: trunk/reactos/dll/win32/netshell/netshell.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/netshel… ============================================================================== --- trunk/reactos/dll/win32/netshell/netshell.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/netshell.rbuild [iso-8859-1] Sat Aug 30 14:05:19 2008 @@ -27,4 +27,5 @@ <file>connectmanager.c</file> <file>netshell.spec</file> <file>lanconnectui.c</file> + <file>lanstatusui.c</file> </module> Modified: trunk/reactos/dll/win32/netshell/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/precomp… ============================================================================== --- trunk/reactos/dll/win32/netshell/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/precomp.h [iso-8859-1] Sat Aug 30 14:05:19 2008 @@ -33,6 +33,9 @@ #include <setupapi.h> #include <devguid.h> #include <netcon.h> +#include <docobj.h> +#include <netcfgx.h> + #include "wine/debug.h" #include "wine/unicode.h" @@ -94,7 +97,9 @@ /* lanconnectui.c */ HRESULT WINAPI LanConnectUI_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); -HRESULT ShowLANConnectionStatusDialog(NETCON_PROPERTIES * pProperties); + +/* lanstatusui.c */ +HRESULT WINAPI LanConnectStatusUI_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); #define NCCF_NOTIFY_DISCONNECTED 0x100000 Modified: trunk/reactos/dll/win32/netshell/shfldr_netconnect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/shfldr_… ============================================================================== --- trunk/reactos/dll/win32/netshell/shfldr_netconnect.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/shfldr_netconnect.c [iso-8859-1] Sat Aug 30 14:05:19 2008 @@ -773,11 +773,13 @@ if (lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_NET_STATUS)) { +#if 0 if (pProperties->MediaType == NCM_LAN) { hr = ShowLANConnectionStatusDialog(pProperties); NcFreeNetconProperties(pProperties); } +#endif return hr; } else if (lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_NET_PROPERTIES))

1 0

[pschweitzer] 35813: Primary implementation of sfc.dll. To have it "fully" working, sfc_os.dll is will be needed. It does nothing more. Don't shout, Fireball agreed for commit ; ).
by pschweitzer＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: pschweitzer Date: Sat Aug 30 13:53:27 2008 New Revision: 35813 URL: http://svn.reactos.org/svn/reactos?rev=35813&view=rev Log: Primary implementation of sfc.dll. To have it "fully" working, sfc_os.dll is will be needed. It does nothing more. Don't shout, Fireball agreed for commit ;). Added: trunk/reactos/dll/win32/sfc/ (with props) trunk/reactos/dll/win32/sfc/precomp.h (with props) trunk/reactos/dll/win32/sfc/sfc.c (with props) trunk/reactos/dll/win32/sfc/sfc.rbuild (with props) trunk/reactos/dll/win32/sfc/sfc.spec (with props) trunk/reactos/include/psdk/srrestoreptapi.h (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=358… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Sat Aug 30 13:53:27 2008 @@ -148,6 +148,7 @@ <property name="BASEADDRESS_RASDLG" value="0x768d0000" /> <property name="BASEADDRESS_GDIPLUS" value="0x76a00000" /> <property name="BASEADDRESS_ATL" value="0x76a80000" /> + <property name="BASEADDRESS_SFC" value="0x76b50000" /> <property name="BASEADDRESS_WINTRUST" value="0x76c30000" /> <property name="BASEADDRESS_IMAGEHLP" value="0x76c90000" /> <property name="BASEADDRESS_CLUSAPI" value="0x76d10000" /> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat Aug 30 13:53:27 2008 @@ -320,6 +320,7 @@ dll\win32\sensapi\sensapi.dll 1 dll\win32\serialui\serialui.dll 1 dll\win32\setupapi\setupapi.dll 1 +dll\win32\sfc\sfc.dll 1 dll\win32\shdocvw\shdocvw.dll 1 dll\win32\shell32\shell32.dll 1 dll\win32\shfolder\shfolder.dll 1 Propchange: trunk/reactos/dll/win32/sfc/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Aug 30 13:53:27 2008 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/sfc/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/sfc/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/sfc/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/sfc/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc/precomp.h?re… ============================================================================== --- trunk/reactos/dll/win32/sfc/precomp.h (added) +++ trunk/reactos/dll/win32/sfc/precomp.h [iso-8859-1] Sat Aug 30 13:53:27 2008 @@ -1,0 +1,14 @@ +#ifndef _PRECOMP_H__ +#define _PRECOMP_H__ + +#include <windows.h> +#include <sfc.h> +#include <srrestoreptapi.h> + +DWORD WINAPI sfc_8(); +DWORD WINAPI sfc_9(); + +typedef BOOL (WINAPI *PSRSRPA)(PRESTOREPOINTINFOA, PSTATEMGRSTATUS); +typedef BOOL (WINAPI *PSRSRPW)(PRESTOREPOINTINFOW, PSTATEMGRSTATUS); + +#endif Propchange: trunk/reactos/dll/win32/sfc/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/sfc/sfc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc/sfc.c?rev=35… ============================================================================== --- trunk/reactos/dll/win32/sfc/sfc.c (added) +++ trunk/reactos/dll/win32/sfc/sfc.c [iso-8859-1] Sat Aug 30 13:53:27 2008 @@ -1,0 +1,130 @@ +/* + * System File Checker (Windows File Protection) + * + * Copyright 2008 Pierre Schweitzer + * + * 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 "precomp.h" + +HINSTANCE hLibModule; + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + { + DisableThreadLibraryCalls(hinstDLL); + hLibModule = hinstDLL; + break; + } + case DLL_PROCESS_DETACH: + { + break; + } + } + + return TRUE; +} + +DWORD WINAPI sfc_8() +{ + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD WINAPI sfc_9() +{ + return ERROR_CALL_NOT_IMPLEMENTED; +} + +BOOL WINAPI SRSetRestorePointA(PRESTOREPOINTINFOA pRestorePtSpec, PSTATEMGRSTATUS pSMgrStatus) +{ + HMODULE hModule; + PSRSRPA pSRSRPA; + BOOL bStatus = FALSE; + LPCWSTR lpLibFileName = L"srclient.dll"; + LPCSTR lpProcName = "SRSetRestorePointA"; + + hModule = LoadLibraryW(lpLibFileName); + if (hModule) + { + pSRSRPA = (PSRSRPA)GetProcAddress(hModule, lpProcName); + if (pSRSRPA) + { + bStatus = pSRSRPA(pRestorePtSpec, pSMgrStatus); + } + else + { + if (pSMgrStatus) + { + pSMgrStatus->nStatus = ERROR_CALL_NOT_IMPLEMENTED; + } + } + FreeLibrary(hModule); + } + else + { + if (pSMgrStatus) + { + pSMgrStatus->nStatus = ERROR_CALL_NOT_IMPLEMENTED; + } + } + + return bStatus; +} + +BOOL WINAPI SRSetRestorePointW(PRESTOREPOINTINFOW pRestorePtSpec, PSTATEMGRSTATUS pSMgrStatus) +{ + HMODULE hModule; + PSRSRPW pSRSRPW; + BOOL bStatus = FALSE; + LPCWSTR lpLibFileName = L"srclient.dll"; + LPCSTR lpProcName = "SRSetRestorePointW"; + + hModule = LoadLibraryW(lpLibFileName); + if (hModule) + { + pSRSRPW = (PSRSRPW)GetProcAddress(hModule, lpProcName); + if (pSRSRPW) + { + bStatus = pSRSRPW(pRestorePtSpec, pSMgrStatus); + } + else + { + if (pSMgrStatus) + { + pSMgrStatus->nStatus = ERROR_CALL_NOT_IMPLEMENTED; + } + } + FreeLibrary(hModule); + } + else + { + if (pSMgrStatus) + { + pSMgrStatus->nStatus = ERROR_CALL_NOT_IMPLEMENTED; + } + } + + return bStatus; +} + +BOOL WINAPI SfpVerifyFile(LPCSTR pszFileName, LPSTR pszError, DWORD dwErrSize) +{ + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} Propchange: trunk/reactos/dll/win32/sfc/sfc.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/sfc/sfc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc/sfc.rbuild?r… ============================================================================== --- trunk/reactos/dll/win32/sfc/sfc.rbuild (added) +++ trunk/reactos/dll/win32/sfc/sfc.rbuild [iso-8859-1] Sat Aug 30 13:53:27 2008 @@ -1,0 +1,8 @@ +<module name="sfc" type="win32dll" baseaddress="${BASEADDRESS_SFC}" installbase="system32" installname="sfc.dll" allowwarnings="yes"> + <importlibrary definition="sfc.spec.def" /> + <include base="sfc">.</include> + <library>kernel32</library> + <file>sfc.c</file> + <file>sfc.spec</file> + <pch>precomp.h</pch> +</module> Propchange: trunk/reactos/dll/win32/sfc/sfc.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/sfc/sfc.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc/sfc.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/sfc/sfc.spec (added) +++ trunk/reactos/dll/win32/sfc/sfc.spec [iso-8859-1] Sat Aug 30 13:53:27 2008 @@ -1,0 +1,18 @@ +@ stub sfc_1 +@ stub sfc_2 +@ stub sfc_3 +@ stub sfc_4 +@ stub sfc_5 +@ stub sfc_6 +@ stub sfc_7 +@ stdcall sfc_8 () +@ stdcall sfc_9 () +@ stdcall SRSetRestorePoint (ptr ptr) SRSetRestorePointA +@ stdcall SRSetRestorePointA (ptr ptr) +@ stdcall SRSetRestorePointW (ptr ptr) +@ stub SfcGetNextProtectedFile +@ stub SfcIsFileProtected +@ stub SfcWLEventLogoff +@ stub SfcWLEventLogon +@ stdcall SfpVerifyFile (ptr ptr long) +@ stdcall start (long long ptr) DllMain Propchange: trunk/reactos/dll/win32/sfc/sfc.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Sat Aug 30 13:53:27 2008 @@ -295,6 +295,9 @@ <directory name="setupapi"> <xi:include href="setupapi/setupapi.rbuild" /> </directory> +<directory name="sfc"> + <xi:include href="sfc/sfc.rbuild" /> +</directory> <directory name="shdocvw"> <xi:include href="shdocvw/shdocvw.rbuild" /> </directory> Added: trunk/reactos/include/psdk/srrestoreptapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/srrestoreptap… ============================================================================== --- trunk/reactos/include/psdk/srrestoreptapi.h (added) +++ trunk/reactos/include/psdk/srrestoreptapi.h [iso-8859-1] Sat Aug 30 13:53:27 2008 @@ -1,0 +1,64 @@ +/* + * Definitions for the System File Checker (Windows File Protection) + * + * Copyright 2008 Pierre Schweitzer + * + * 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 + */ + +#ifndef _SRRESTOREPTAPI_H +#define _SRRESTOREPTAPI_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Defines */ + +#define MAX_DESC 64 +#define MAX_DESC_W 256 + +/* Types */ + +typedef struct _RESTOREPTINFOA { + DWORD dwEventType; + DWORD dwRestorePtType; + INT64 llSequenceNumber; + CHAR szDescription[MAX_DESC]; +} RESTOREPOINTINFOA, *PRESTOREPOINTINFOA; + +typedef struct _RESTOREPTINFOW { + DWORD dwEventType; + DWORD dwRestorePtType; + INT64 llSequenceNumber; + WCHAR szDescription[MAX_DESC_W]; +} RESTOREPOINTINFOW, *PRESTOREPOINTINFOW; + +typedef struct _SMGRSTATUS { + DWORD nStatus; + INT64 llSequenceNumber; +} STATEMGRSTATUS, *PSTATEMGRSTATUS; + +/* Functions */ + +BOOL WINAPI SRSetRestorePointA(PRESTOREPOINTINFOA, PSTATEMGRSTATUS); +BOOL WINAPI SRSetRestorePointW(PRESTOREPOINTINFOW, PSTATEMGRSTATUS); +DWORD WINAPI SRRemoveRestorePoint(DWORD); + +#ifdef __cplusplus +} +#endif + +#endif Propchange: trunk/reactos/include/psdk/srrestoreptapi.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[sginsberg] 35812: - Updates to our vectored exception handling: - KiUserExceptionDispatcher: RtlDispatchException directly - RtlDispatchException: Call vectored exception handlers before doing anything else - Rename RtlpExecuteVectoredExceptionHandlers to RtlCallVectoredExceptionHandlers as this is the real name - References: "New Vectored Exception Handling in Windows XP" by Matt Pietrek
by sginsberg＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: sginsberg Date: Sat Aug 30 13:40:00 2008 New Revision: 35812 URL: http://svn.reactos.org/svn/reactos?rev=35812&view=rev Log: - Updates to our vectored exception handling: - KiUserExceptionDispatcher: RtlDispatchException directly - RtlDispatchException: Call vectored exception handlers before doing anything else - Rename RtlpExecuteVectoredExceptionHandlers to RtlCallVectoredExceptionHandlers as this is the real name - References: "New Vectored Exception Handling in Windows XP" by Matt Pietrek Modified: trunk/reactos/dll/ntdll/dispatch/dispatch.c trunk/reactos/dll/ntdll/dispatch/i386/dispatch.S trunk/reactos/lib/rtl/i386/except.c trunk/reactos/lib/rtl/rtlp.h trunk/reactos/lib/rtl/vectoreh.c Modified: trunk/reactos/dll/ntdll/dispatch/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/dispatch/dispatc… ============================================================================== --- trunk/reactos/dll/ntdll/dispatch/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/dispatch/dispatch.c [iso-8859-1] Sat Aug 30 13:40:00 2008 @@ -15,10 +15,6 @@ typedef NTSTATUS (NTAPI *USER_CALL)(PVOID Argument, ULONG ArgumentLength); -EXCEPTION_DISPOSITION NTAPI -RtlpExecuteVectoredExceptionHandlers(IN PEXCEPTION_RECORD ExceptionRecord, - IN PCONTEXT Context); - /* FUNCTIONS ****************************************************************/ /* @@ -32,26 +28,16 @@ EXCEPTION_RECORD NestedExceptionRecord; NTSTATUS Status; - /* call the vectored exception handlers */ - if(RtlpExecuteVectoredExceptionHandlers(ExceptionRecord, - Context) != ExceptionContinueExecution) + /* Dispatch the exception and check the result */ + if (RtlDispatchException(ExceptionRecord, Context)) { - goto ContinueExecution; + /* Continue executing */ + Status = NtContinue(Context, FALSE); } else { - /* Dispatch the exception and check the result */ - if(RtlDispatchException(ExceptionRecord, Context)) - { -ContinueExecution: - /* Continue executing */ - Status = NtContinue(Context, FALSE); - } - else - { - /* Raise an exception */ - Status = NtRaiseException(ExceptionRecord, Context, FALSE); - } + /* Raise an exception */ + Status = NtRaiseException(ExceptionRecord, Context, FALSE); } /* Setup the Exception record */ Modified: trunk/reactos/dll/ntdll/dispatch/i386/dispatch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/dispatch/i386/di… ============================================================================== --- trunk/reactos/dll/ntdll/dispatch/i386/dispatch.S [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/dispatch/i386/dispatch.S [iso-8859-1] Sat Aug 30 13:40:00 2008 @@ -183,43 +183,13 @@ .globl _KiUserExceptionDispatcher@8 _KiUserExceptionDispatcher@8: - /* clear the direct flag - * text from bug 2279 - * if it not clear it means that if an exception occurs while - * the direction flag is set (typically inside memmove), the - * exception handlers will be called with the direction flag still - * set. The Windows x86-32 and x86-64 ABI requires that the - * direction flag be Calling memset() with a compile-time constant - * size on both GCC and MSVC will result in inlining a "rep stosd" - * instruction. Because of the ABI, they will assume that the - * direction flag is clear and not emit a "cld" instruction. - * Using memset() in an exception handler therefore will - * corrupt memory if the exception occurred during a reverse copy - * such as a forward overlapping memmove(). - * - * For reliability and ease of debugging, please add "cld" to the beginning of - * KiUserExceptionDispatcher. Note that the same will be true of x86-64 whenever - * that happens. This does not affect continuing execution; the CONTEXT of the - * exception has the direction flag set and will be restored upon NtContinue. - * KiUserApcDispatcher and KiUserCallbackDispatcher need to be evaluated for this - * issue. - */ - + /* Clear direction flag */ cld /* Save the Context and Exception Records */ mov ecx, [esp+4] mov ebx, [esp] - /* Call the vectored exception handler */ - push ecx - push ebx - call _RtlpExecuteVectoredExceptionHandlers@8 - - /* Check for success */ - or al, al - jnz ContinueExecution - /* Dispatch the exception */ sub esp, 8 call _RtlDispatchException@8 @@ -228,7 +198,6 @@ or al, al jz RaiseException -ContinueExecution: /* Pop off the records */ pop ebx pop ecx Modified: trunk/reactos/lib/rtl/i386/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/except.c?rev=… ============================================================================== --- trunk/reactos/lib/rtl/i386/except.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/i386/except.c [iso-8859-1] Sat Aug 30 13:40:00 2008 @@ -73,6 +73,13 @@ EXCEPTION_DISPOSITION Disposition; ULONG_PTR StackLow, StackHigh; ULONG_PTR RegistrationFrameEnd; + + /* Call any registered vectored handlers */ + if (RtlCallVectoredExceptionHandlers(ExceptionRecord, Context)) + { + /* Exception handled, continue execution */ + return TRUE; + } /* Get the current stack limits and registration frame */ RtlpGetStackLimits(&StackLow, &StackHigh); Modified: trunk/reactos/lib/rtl/rtlp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtlp.h?rev=35812&r… ============================================================================== --- trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] Sat Aug 30 13:40:00 2008 @@ -36,6 +36,13 @@ VOID NTAPI RtlpSetExceptionList(PEXCEPTION_REGISTRATION_RECORD NewExceptionList); + +BOOLEAN +NTAPI +RtlCallVectoredExceptionHandlers( + IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT Context +); typedef struct _DISPATCHER_CONTEXT { Modified: trunk/reactos/lib/rtl/vectoreh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/vectoreh.c?rev=358… ============================================================================== --- trunk/reactos/lib/rtl/vectoreh.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/vectoreh.c [iso-8859-1] Sat Aug 30 13:40:00 2008 @@ -28,9 +28,10 @@ /* FUNCTIONS ***************************************************************/ -EXCEPTION_DISPOSITION NTAPI -RtlpExecuteVectoredExceptionHandlers(IN PEXCEPTION_RECORD ExceptionRecord, - IN PCONTEXT Context) +BOOLEAN +NTAPI +RtlCallVectoredExceptionHandlers(IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT Context) { PLIST_ENTRY CurrentEntry; PRTL_VECTORED_EXCEPTION_HANDLER veh; @@ -55,7 +56,7 @@ if(VectoredHandler(&ExceptionInfo) == EXCEPTION_CONTINUE_EXECUTION) { - return ExceptionContinueSearch; + return TRUE; } RtlEnterCriticalSection(&RtlpVectoredExceptionLock); @@ -63,7 +64,7 @@ RtlLeaveCriticalSection(&RtlpVectoredExceptionLock); } - return ExceptionContinueExecution; + return FALSE; } VOID

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