Ros-diffs August 2009

ros-diffs@reactos.org

21 participants
654 discussions

[gschneider] 42886: Fix multiple threads listings 1/x: Reset receive variables when reaching the block end, continue with the loop as soon as ListEvents were created

by gschneider＠svn.reactos.org

Author: gschneider Date: Sun Aug 23 23:37:35 2009 New Revision: 42886 URL: http://svn.reactos.org/svn/reactos?rev=42886&view=rev Log: Fix multiple threads listings 1/x: Reset receive variables when reaching the block end, continue with the loop as soon as ListEvents were created Modified: trunk/tools/reactosdbg/DebugProtocol/KDBG.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs Modified: trunk/tools/reactosdbg/DebugProtocol/KDBG.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/DebugProtocol/KDB… ============================================================================== --- trunk/tools/reactosdbg/DebugProtocol/KDBG.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/DebugProtocol/KDBG.cs [iso-8859-1] Sun Aug 23 23:37:35 2009 @@ -257,12 +257,16 @@ if (ProcessListEvent != null) ProcessListEvent(this, new ProcessListEventArgs(ulong.Parse(pidEntryMatch.Groups["pid"].ToString(), NumberStyles.HexNumber), pidEntryMatch.Groups["cur"].Length > 0, pidEntryMatch.Groups["state"].ToString(), pidEntryMatch.Groups["name"].ToString())); + continue; } else { - /* TODO: this is called by far too often, results in several "thread list xx" commands */ if ((mReceivingProcs || cleanedLine.Contains("No processes")) && ProcessListEvent != null) + { ProcessListEvent(this, new ProcessListEventArgs(true)); + mReceivingProcs = false; + continue; + } } } @@ -282,11 +286,16 @@ { if (ThreadListEvent != null) ThreadListEvent(this, new ThreadListEventArgs(ulong.Parse(tidEntryMatch.Groups["tid"].ToString(), NumberStyles.HexNumber), tidEntryMatch.Groups["cur"].Length > 0, ulong.Parse(tidEntryMatch.Groups["eip"].ToString(), NumberStyles.HexNumber))); + continue; } else { if (mReceivingThreads && ThreadListEvent != null) + { ThreadListEvent(this, new ThreadListEventArgs(true)); + mReceivingThreads = false; + continue; + } } } } Modified: trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] Sun Aug 23 23:37:35 2009 @@ -39,5 +39,5 @@ // will be increased as well. MSI installers must not be generated with the same Build Number // otherwise they won't upgrade the old installation! -[assembly: AssemblyVersion("1.0.2.72")] -[assembly: AssemblyFileVersion("1.0.2.72")] +[assembly: AssemblyVersion("1.0.2.73")] +[assembly: AssemblyFileVersion("1.0.2.73")]

15 years

[janderwald] 42885: - Add SetupDiGetDeviceInterfaceAlias, SetupDiOpenDeviceInterfaceRegKey stubs

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Aug 23 20:14:39 2009 New Revision: 42885 URL: http://svn.reactos.org/svn/reactos?rev=42885&view=rev Log: - Add SetupDiGetDeviceInterfaceAlias, SetupDiOpenDeviceInterfaceRegKey stubs Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec trunk/reactos/dll/win32/setupapi/stubs.c Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Sun Aug 23 20:14:39 2009 @@ -325,7 +325,7 @@ @ stdcall SetupDiGetDeviceInstallParamsW(ptr ptr ptr) @ stdcall SetupDiGetDeviceInstanceIdA(ptr ptr str long ptr) @ stdcall SetupDiGetDeviceInstanceIdW(ptr ptr wstr long ptr) -@ stub SetupDiGetDeviceInterfaceAlias +@ stdcall SetupDiGetDeviceInterfaceAlias(ptr ptr ptr ptr) @ stdcall SetupDiGetDeviceInterfaceDetailA(long ptr ptr long ptr ptr) @ stdcall SetupDiGetDeviceInterfaceDetailW(long ptr ptr long ptr ptr) @ stdcall SetupDiGetDeviceRegistryPropertyA(long ptr long ptr ptr long ptr) @@ -363,7 +363,7 @@ @ stdcall SetupDiOpenDeviceInfoA(ptr str long long ptr) @ stdcall SetupDiOpenDeviceInfoW(ptr wstr long long ptr) @ stdcall SetupDiOpenDeviceInterfaceA(ptr str long ptr) -@ stub SetupDiOpenDeviceInterfaceRegKey +@ stdcall SetupDiOpenDeviceInterfaceRegKey(ptr ptr long long) @ stdcall SetupDiOpenDeviceInterfaceW(ptr wstr long ptr) @ stdcall SetupDiRegisterCoDeviceInstallers(ptr ptr) @ stdcall SetupDiRegisterDeviceInfo(ptr ptr long ptr ptr ptr) Modified: trunk/reactos/dll/win32/setupapi/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/stubs.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/stubs.c [iso-8859-1] Sun Aug 23 20:14:39 2009 @@ -233,3 +233,16 @@ FIXME("%p %p %s 0x%08x %p: stub\n", len, class, debugstr_w(id), flags, machine); return CR_FAILURE; } + +WINSETUPAPI BOOL WINAPI SetupDiGetDeviceInterfaceAlias(IN HDEVINFO DeviceInfoSet, IN PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData, IN CONST GUID *AliasInterfaceClassGuid, OUT PSP_DEVICE_INTERFACE_DATA AliasDeviceInterfaceData) +{ + FIXME("%p %p %p %p %p stub\n", DeviceInfoSet, DeviceInterfaceData, AliasInterfaceClassGuid, AliasDeviceInterfaceData); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; +} + +HKEY WINAPI SetupDiOpenDeviceInterfaceRegKey(IN HDEVINFO DeviceInfoSet, IN PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData, IN DWORD Reserved, IN REGSAM samDesired) +{ + FIXME("%p %p %p 0x%08x 0x%08x: stub\n", DeviceInfoSet, DeviceInterfaceData, Reserved, samDesired); + return INVALID_HANDLE_VALUE; +}

15 years

[sginsberg] 42884: - copy.c, view.c: malloc.h now properly implements alloca/_alloca, so remove #ifdef hacks - main.c: Change bogus #ifdef _MSC_VER to #if 0 -- it seems this is another instance of "MSVC = MS' headers". The code compiles fine with our headers now and should probably be enabled. - debug.h: Define non-NDEBUG DPRINT the same way for GCC and MSVC. The MSVC version was never inlined because the function has a variable argument list. The GCC version works fine under MSVC so use it inst

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Sun Aug 23 17:49:43 2009 New Revision: 42884 URL: http://svn.reactos.org/svn/reactos?rev=42884&view=rev Log: - copy.c, view.c: malloc.h now properly implements alloca/_alloca, so remove #ifdef hacks - main.c: Change bogus #ifdef _MSC_VER to #if 0 -- it seems this is another instance of "MSVC = MS' headers". The code compiles fine with our headers now and should probably be enabled. - debug.h: Define non-NDEBUG DPRINT the same way for GCC and MSVC. The MSVC version was never inlined because the function has a variable argument list. The GCC version works fine under MSVC so use it instead. Results in neater code in object files. Modified: trunk/reactos/drivers/network/tcpip/tcpip/main.c trunk/reactos/include/reactos/debug.h trunk/reactos/ntoskrnl/cc/copy.c trunk/reactos/ntoskrnl/cc/view.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Sun Aug 23 17:49:43 2009 @@ -48,7 +48,7 @@ * DumpData = Pointer to dump data for the log entry */ { -#ifdef _MSC_VER +#if 0 PIO_ERROR_LOG_PACKET LogEntry; UCHAR EntrySize; ULONG StringSize; @@ -481,7 +481,7 @@ Irp->IoStatus.Information = 0; -#ifdef _MSC_VER +#if 0 Status = TdiMapUserRequest(DeviceObject, Irp, IrpSp); if (NT_SUCCESS(Status)) { TiDispatchInternal(DeviceObject, Irp); Modified: trunk/reactos/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?re… ============================================================================== --- trunk/reactos/include/reactos/debug.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/debug.h [iso-8859-1] Sun Aug 23 17:49:43 2009 @@ -90,14 +90,9 @@ #define DPRINT DbgPrint("(%s:%d) ",__FILE__,__LINE__), DbgPrint #else - #ifdef _MSC_VER - static __inline void DPRINT ( const char* fmt, ... ) - { - UNREFERENCED_PARAMETER(fmt); - } - #else - #define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) - #endif + + #define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) + #endif #define UNIMPLEMENTED DbgPrint("WARNING: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__); Modified: trunk/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=428… ============================================================================== --- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Sun Aug 23 17:49:43 2009 @@ -19,15 +19,6 @@ #define MAX_ZERO_LENGTH (256 * 1024) #define MAX_RW_LENGTH (256 * 1024) - -#if defined(__GNUC__) -/* void * alloca(size_t size); */ -#elif defined(_MSC_VER) -void* _alloca(size_t size); -#define alloca _alloca -#else -#error Unknown compiler for alloca intrinsic stack allocation "function" -#endif ULONG CcFastMdlReadWait; ULONG CcFastMdlReadNotPossible; @@ -73,7 +64,7 @@ KEVENT Event; PMDL Mdl; - Mdl = alloca(MmSizeOfMdl(NULL, MAX_RW_LENGTH)); + Mdl = _alloca(MmSizeOfMdl(NULL, MAX_RW_LENGTH)); Status = CcRosGetCacheSegmentChain(Bcb, ReadOffset, Length, &head); if (!NT_SUCCESS(Status)) @@ -205,7 +196,7 @@ { Size = CacheSeg->Bcb->CacheSegmentSize; } - Mdl = alloca(MmSizeOfMdl(CacheSeg->BaseAddress, Size)); + Mdl = _alloca(MmSizeOfMdl(CacheSeg->BaseAddress, Size)); MmInitializeMdl(Mdl, CacheSeg->BaseAddress, Size); MmBuildMdlForNonPagedPool(Mdl); Mdl->MdlFlags |= MDL_IO_PAGE_READ; @@ -259,7 +250,7 @@ MmGetPfnForProcess(NULL, (PVOID)((ULONG_PTR)CacheSeg->BaseAddress + (i << PAGE_SHIFT))); } while (++i < (Size >> PAGE_SHIFT)); } - Mdl = alloca(MmSizeOfMdl(CacheSeg->BaseAddress, Size)); + Mdl = _alloca(MmSizeOfMdl(CacheSeg->BaseAddress, Size)); MmInitializeMdl(Mdl, CacheSeg->BaseAddress, Size); MmBuildMdlForNonPagedPool(Mdl); Mdl->MdlFlags |= MDL_IO_PAGE_READ; @@ -612,7 +603,7 @@ { /* File is not cached */ - Mdl = alloca(MmSizeOfMdl(NULL, MAX_ZERO_LENGTH)); + Mdl = _alloca(MmSizeOfMdl(NULL, MAX_ZERO_LENGTH)); while (Length > 0) { Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=428… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Sun Aug 23 17:49:43 2009 @@ -69,15 +69,6 @@ NPAGED_LOOKASIDE_LIST iBcbLookasideList; static NPAGED_LOOKASIDE_LIST BcbLookasideList; static NPAGED_LOOKASIDE_LIST CacheSegLookasideList; - - -#if defined(__GNUC__) -/* void * alloca(size_t size); */ -#elif defined(_MSC_VER) -void* _alloca(size_t size); -#else -#error Unknown compiler for alloca intrinsic stack allocation "function" -#endif #if DBG || defined(KDBG) static void CcRosCacheSegmentIncRefCount_ ( PCACHE_SEGMENT cs, const char* file, int line ) @@ -737,15 +728,8 @@ Length = ROUND_UP(Length, Bcb->CacheSegmentSize); -#if defined(__GNUC__) - CacheSegList = alloca(sizeof(PCACHE_SEGMENT) * - (Length / Bcb->CacheSegmentSize)); -#elif defined(_MSC_VER) CacheSegList = _alloca(sizeof(PCACHE_SEGMENT) * (Length / Bcb->CacheSegmentSize)); -#else -#error Unknown compiler for alloca intrinsic stack allocation "function" -#endif /* * Look for a cache segment already mapping the same data.

15 years

[sginsberg] 42883: - wdm.h: Define ALLOC_PRAGMA and ALLOC_DATA_PRAGMA for MSVC. - marea.c: MmInitMemoryAreas doesn't exist anymore so don't try to put it in .INIT.

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Sun Aug 23 17:14:13 2009 New Revision: 42883 URL: http://svn.reactos.org/svn/reactos?rev=42883&view=rev Log: - wdm.h: Define ALLOC_PRAGMA and ALLOC_DATA_PRAGMA for MSVC. - marea.c: MmInitMemoryAreas doesn't exist anymore so don't try to put it in .INIT. Modified: trunk/reactos/include/ddk/wdm.h trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=4288… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Sun Aug 23 17:14:13 2009 @@ -25,6 +25,25 @@ #define PORT_MAXIMUM_MESSAGE_LENGTH 512 #else #define PORT_MAXIMUM_MESSAGE_LENGTH 256 +#endif + + +#if defined(_MSC_VER) + +// +// Indicate if #pragma alloc_text() is supported +// +#if defined(_M_IX86) || defined(_M_AMD64) || defined(_M_IA64) +#define ALLOC_PRAGMA 1 +#endif + +// +// Indicate if #pragma data_seg() is supported +// +#if defined(_M_IX86) || defined(_M_AMD64) +#define ALLOC_DATA_PRAGMA 1 +#endif + #endif Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=42… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Sun Aug 23 17:14:13 2009 @@ -44,10 +44,6 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> - -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, MmInitMemoryAreas) -#endif MEMORY_AREA MiStaticMemoryAreas[MI_STATIC_MEMORY_AREAS]; ULONG MiStaticMemoryAreaCount;

15 years

[sginsberg] 42882: - Remove deprecated _NTDDK_ hacks from winnt.h -- these are no longer needed as ntddk.h no longer includes winnt.h. Also fix the way the PowerPC version of NtCurrentTeb was defined -- it was only defined if ntddk.h was included prior to winnt.h.

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Sun Aug 23 16:46:41 2009 New Revision: 42882 URL: http://svn.reactos.org/svn/reactos?rev=42882&view=rev Log: - Remove deprecated _NTDDK_ hacks from winnt.h -- these are no longer needed as ntddk.h no longer includes winnt.h. Also fix the way the PowerPC version of NtCurrentTeb was defined -- it was only defined if ntddk.h was included prior to winnt.h. Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sun Aug 23 16:46:41 2009 @@ -472,12 +472,9 @@ #define FILE_SUPPORTS_ENCRYPTION 0x00020000 #define FILE_NAMED_STREAMS 0x00040000 -/* FIXME: Oh how I wish, I wish the w32api DDK wouldn't include winnt.h... */ -#ifndef _NTDDK_ #define IO_COMPLETION_QUERY_STATE 0x0001 #define IO_COMPLETION_MODIFY_STATE 0x0002 #define IO_COMPLETION_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x3) -#endif /* end ntifs.h */ /* also in ddk/winddk.h */ @@ -487,8 +484,6 @@ #define MAILSLOT_NO_MESSAGE ((DWORD)-1) #define MAILSLOT_WAIT_FOREVER ((DWORD)-1) -/* FIXME: Oh how I wish, I wish the w32api DDK wouldn't include winnt.h... */ -#ifndef _NTDDK_ #define PROCESS_TERMINATE 1 #define PROCESS_CREATE_THREAD 2 #define PROCESS_SET_SESSIONID 4 @@ -502,23 +497,17 @@ #define PROCESS_SUSPEND_RESUME 2048 #define PROCESS_QUERY_LIMITED_INFORMATION 0x1000 #define PROCESS_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0xFFF) -#endif #define PROCESS_DUP_HANDLE 64 #define THREAD_TERMINATE 1 #define THREAD_SUSPEND_RESUME 2 #define THREAD_GET_CONTEXT 8 #define THREAD_SET_CONTEXT 16 #define THREAD_SET_INFORMATION 32 -/* FIXME: Oh how I wish, I wish the w32api DDK wouldn't include winnt.h... */ -#ifndef _NTDDK_ #define THREAD_QUERY_INFORMATION 64 #define THREAD_SET_THREAD_TOKEN 128 #define THREAD_IMPERSONATE 256 #define THREAD_DIRECT_IMPERSONATION 0x200 -#endif #define THREAD_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x3FF) -/* FIXME: Oh how I wish, I wish the w32api DDK wouldn't include winnt.h... */ -#ifndef _NTDDK_ #define MUTANT_QUERY_STATE 0x0001 #define MUTANT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|MUTANT_QUERY_STATE) #define TIMER_QUERY_STATE 0x0001 @@ -528,7 +517,6 @@ #define THREAD_BASE_PRIORITY_MAX 2 #define THREAD_BASE_PRIORITY_MIN (-2) #define THREAD_BASE_PRIORITY_IDLE (-15) -#endif /* * To prevent gcc compiler warnings, bracket these defines when initialising * a SID_IDENTIFIER_AUTHORITY, eg. @@ -746,8 +734,6 @@ #define SE_CHANGE_NOTIFY_NAME TEXT("SeChangeNotifyPrivilege") #define SE_REMOTE_SHUTDOWN_NAME TEXT("SeRemoteShutdownPrivilege") #define SE_CREATE_GLOBAL_NAME TEXT("SeCreateGlobalPrivilege") -/* FIXME: Oh how I wish, I wish the w32api DDK wouldn't include winnt.h... */ -#ifndef _NTDDK_ #define SE_GROUP_MANDATORY 1 #define SE_GROUP_ENABLED_BY_DEFAULT 2 #define SE_GROUP_ENABLED 4 @@ -755,7 +741,6 @@ #define SE_GROUP_USE_FOR_DENY_ONLY 16 #define SE_GROUP_LOGON_ID 3221225472U #define SE_GROUP_RESOURCE 536870912 -#endif #define LANG_NEUTRAL 0x00 #define LANG_INVARIANT 0x7f #define LANG_AFRIKAANS 0x36 @@ -1277,8 +1262,6 @@ #define MEM_WRITE_WATCH 0x200000 /* 98/Me */ #define MEM_PHYSICAL 0x400000 #define MEM_4MB_PAGES 0x80000000 -/* FIXME: Oh how I wish, I wish the w32api DDK wouldn't include winnt.h... */ -#ifndef _NTDDK_ #define MEM_IMAGE SEC_IMAGE #define SEC_NO_CHANGE 0x00400000 #define SEC_FILE 0x00800000 @@ -1287,7 +1270,6 @@ #define SEC_RESERVE 0x04000000 #define SEC_COMMIT 0x08000000 #define SEC_NOCACHE 0x10000000 -#endif #define SECTION_EXTEND_SIZE 16 #define SECTION_MAP_READ 4 #define SECTION_MAP_WRITE 2 @@ -1295,9 +1277,7 @@ #define SECTION_MAP_EXECUTE 8 #define SECTION_ALL_ACCESS 0xf001f #define WRITE_WATCH_FLAG_RESET 0x01 -#ifndef _NTDDK_ #define MESSAGE_RESOURCE_UNICODE 1 -#endif #define RTL_CRITSECT_TYPE 0 #define RTL_RESOURCE_TYPE 1 /* Also in winddk.h */ @@ -1927,8 +1907,6 @@ ACCESS_MASK GenericExecute; ACCESS_MASK GenericAll; } GENERIC_MAPPING, *PGENERIC_MAPPING; -/* Sigh..when will they learn... */ -#ifndef _NTDDK_ typedef struct _ACE_HEADER { BYTE AceType; BYTE AceFlags; @@ -2049,7 +2027,6 @@ GUID InheritedObjectType; DWORD SidStart; } SYSTEM_ALARM_CALLBACK_OBJECT_ACE, *PSYSTEM_ALARM_CALLBACK_OBJECT_ACE; -#endif typedef struct _ACL { BYTE AclRevision; BYTE Sbz1; @@ -3003,8 +2980,6 @@ BOOLEAN EffectiveOnly; SECURITY_IMPERSONATION_LEVEL Level; } SE_IMPERSONATION_STATE,*PSE_IMPERSONATION_STATE; -/* Steven you are my hero when you fix the w32api ddk! */ -#if !defined(_NTDDK_) typedef struct _SID_IDENTIFIER_AUTHORITY { BYTE Value[6]; } SID_IDENTIFIER_AUTHORITY,*PSID_IDENTIFIER_AUTHORITY,*LPSID_IDENTIFIER_AUTHORITY; @@ -3146,7 +3121,6 @@ MaxTokenInfoClass } TOKEN_INFORMATION_CLASS; -#endif typedef enum _SID_NAME_USE { SidTypeUser=1,SidTypeGroup,SidTypeDomain,SidTypeAlias, SidTypeWellKnownGroup,SidTypeDeletedAccount,SidTypeInvalid, @@ -3233,8 +3207,6 @@ DWORD Count; DWORD Size; } TAPE_CREATE_PARTITION,*PTAPE_CREATE_PARTITION; -/* Sigh..when will they learn... */ -#ifndef _NTDDK_ typedef struct _MEMORY_BASIC_INFORMATION { PVOID BaseAddress; PVOID AllocationBase; @@ -3258,7 +3230,6 @@ DWORD NumberOfBlocks; MESSAGE_RESOURCE_BLOCK Blocks[1]; } MESSAGE_RESOURCE_DATA,*PMESSAGE_RESOURCE_DATA; -#endif typedef struct _LIST_ENTRY { struct _LIST_ENTRY *Flink; struct _LIST_ENTRY *Blink; @@ -3325,8 +3296,6 @@ IN PSLIST_HEADER ListHead ); -/* FIXME: Please oh please stop including winnt.h from the DDK... */ -#ifndef _NTDDK_ typedef struct _RTL_CRITICAL_SECTION_DEBUG { WORD Type; WORD CreatorBackTraceIndex; @@ -3346,7 +3315,6 @@ HANDLE LockSemaphore; ULONG_PTR SpinCount; } RTL_CRITICAL_SECTION,*PRTL_CRITICAL_SECTION; -#endif NTSYSAPI WORD @@ -4217,8 +4185,6 @@ #define JOB_OBJECT_MSG_PROCESS_MEMORY_LIMIT 9 #define JOB_OBJECT_MSG_JOB_MEMORY_LIMIT 10 -/* FIXME: Oh how I wish, I wish the w32api DDK wouldn't include winnt.h... */ -#ifndef _NTDDK_ #define JOB_OBJECT_ASSIGN_PROCESS 1 #define JOB_OBJECT_SET_ATTRIBUTES 2 #define JOB_OBJECT_QUERY 4 @@ -4246,7 +4212,6 @@ DWORD MemberLevel; DWORD Flags; } JOB_SET_ARRAY, *PJOB_SET_ARRAY; -#endif typedef struct _JOBOBJECT_BASIC_ACCOUNTING_INFORMATION { LARGE_INTEGER TotalUserTime; @@ -4280,8 +4245,6 @@ DWORD UIRestrictionsClass; } JOBOBJECT_BASIC_UI_RESTRICTIONS,*PJOBOBJECT_BASIC_UI_RESTRICTIONS; -/* Steven you are my hero when you fix the w32api ddk! */ -#ifndef _NTDDK_ typedef struct _JOBOBJECT_SECURITY_LIMIT_INFORMATION { DWORD SecurityLimitFlags; HANDLE JobToken; @@ -4289,7 +4252,6 @@ PTOKEN_PRIVILEGES PrivilegesToDelete; PTOKEN_GROUPS RestrictedSids; } JOBOBJECT_SECURITY_LIMIT_INFORMATION,*PJOBOBJECT_SECURITY_LIMIT_INFORMATION; -#endif typedef struct _JOBOBJECT_END_OF_JOB_TIME_INFORMATION { DWORD EndOfJobTimeAction; @@ -4485,7 +4447,6 @@ ULONG DefaultAlert2; } SYSTEM_BATTERY_STATE, *PSYSTEM_BATTERY_STATE; -#ifndef _NTDDK_ /* HACK!!! ntddk.h shouldn't include winnt.h! */ typedef struct _PROCESSOR_POWER_INFORMATION { ULONG Number; ULONG MaxMhz; @@ -4494,7 +4455,6 @@ ULONG MaxIdleState; ULONG CurrentIdleState; } PROCESSOR_POWER_INFORMATION, *PPROCESSOR_POWER_INFORMATION; -#endif typedef DWORD EXECUTION_STATE; typedef enum _POWER_INFORMATION_LEVEL { @@ -4833,9 +4793,7 @@ } #endif -/* FIXME: Oh how I wish, I wish the w32api DDK wouldn't include winnt.h... */ -#ifndef _NTDDK_ -#ifdef _M_IX86 +#if defined(_M_IX86) static __inline__ struct _TEB * NtCurrentTeb(void) { struct _TEB *ret; @@ -4848,25 +4806,24 @@ return ret; } -#elif _M_ARM +#elif defined(_M_ARM) // // NT-ARM is not documented // #include <armddk.h> -#elif defined (_M_AMD64) +#elif defined(_M_AMD64) FORCEINLINE struct _TEB * NtCurrentTeb(VOID) { return (struct _TEB *)__readgsqword(FIELD_OFFSET(NT_TIB, Self)); } -#else +#elif defined(_M_PPC) static __inline__ struct _TEB * NtCurrentTeb(void) { return __readfsdword_winnt(0x18); } -#endif -#elif defined(_M_PPC) +#else static __inline__ struct _TEB * NtCurrentTeb(void) { return __readfsdword_winnt(0x18);

15 years

[mkupfer] 42881: - Remove tailing separator in explorer quicklaunch area. - Fix some values for rebarband. - See issue #3771 for details. - TODO: fix rebar (comctl32) itself, because it's not working properly.

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Sun Aug 23 15:39:47 2009 New Revision: 42881 URL: http://svn.reactos.org/svn/reactos?rev=42881&view=rev Log: - Remove tailing separator in explorer quicklaunch area. - Fix some values for rebarband. - See issue #3771 for details. - TODO: fix rebar (comctl32) itself, because it's not working properly. Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] Sun Aug 23 15:39:47 2009 @@ -147,13 +147,13 @@ rbBand.cyMaxChild = (ULONG)-1; rbBand.cyMinChild = REBARBAND_HEIGHT; rbBand.cyIntegral = REBARBAND_HEIGHT + 3; //@@ OK? - rbBand.cxMinChild = rbBand.cyIntegral * 3; rbBand.fStyle = RBBS_VARIABLEHEIGHT|RBBS_GRIPPERALWAYS|RBBS_HIDETITLE; TCHAR QuickLaunchBand[] = _T("Quicklaunch"); rbBand.lpText = QuickLaunchBand; rbBand.hwndChild = _hwndQuickLaunch; - rbBand.cx = 120; + rbBand.cx = 100; + rbBand.cxMinChild = 100; rbBand.wID = IDW_QUICKLAUNCHBAR; SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)-1, (LPARAM)&rbBand); @@ -161,6 +161,7 @@ rbBand.lpText = TaskbarBand; rbBand.hwndChild = _hwndTaskBar; rbBand.cx = 200; //pcs->cx-_taskbar_pos-quicklaunch_width-(notifyarea_width+1); + rbBand.cxMinChild = 50; rbBand.wID = IDW_TASKTOOLBAR; SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)-1, (LPARAM)&rbBand); #endif Modified: trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp [iso-8859-1] Sun Aug 23 15:39:47 2009 @@ -154,8 +154,6 @@ } DeleteDC(hdc); - SendMessage(_hwnd, TB_INSERTBUTTON, INT_MAX, (LPARAM)&sep); - for(Entry*entry=_dir->_down; entry; entry=entry->_next) { // hide files like "desktop.ini" if (entry->_data.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN)

15 years

[janderwald] 42880: - Code polishing

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Aug 23 15:08:28 2009 New Revision: 42880 URL: http://svn.reactos.org/svn/reactos?rev=42880&view=rev Log: - Code polishing Modified: trunk/reactos/drivers/ksfilter/ks/unknown.c Modified: trunk/reactos/drivers/ksfilter/ks/unknown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/unknow… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/unknown.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/unknown.c [iso-8859-1] Sun Aug 23 15:08:28 2009 @@ -29,7 +29,7 @@ CLSID m_ClassId; IUnknown* m_UnknownOuter; -}IBaseUnknownImpl; +}CBaseUnknownImpl; @@ -40,7 +40,7 @@ IN REFIID refiid, OUT PVOID* Output) { - IBaseUnknownImpl * This = (IBaseUnknownImpl*)CONTAINING_RECORD(iface, IBaseUnknownImpl, lpVtbl); + CBaseUnknownImpl * This = (CBaseUnknownImpl*)CONTAINING_RECORD(iface, CBaseUnknownImpl, lpVtbl); if (IsEqualGUIDAligned(refiid, &IID_IUnknown)) { @@ -56,7 +56,7 @@ INonDelegatedUnknown_fnAddRef( INonDelegatedUnknown * iface) { - IBaseUnknownImpl * This = (IBaseUnknownImpl*)CONTAINING_RECORD(iface, IBaseUnknownImpl, lpVtbl); + CBaseUnknownImpl * This = (CBaseUnknownImpl*)CONTAINING_RECORD(iface, CBaseUnknownImpl, lpVtbl); return InterlockedIncrement(&This->m_RefCount); } @@ -66,7 +66,7 @@ INonDelegatedUnknown_fnRelease( INonDelegatedUnknown * iface) { - IBaseUnknownImpl * This = (IBaseUnknownImpl*)CONTAINING_RECORD(iface, IBaseUnknownImpl, lpVtbl); + CBaseUnknownImpl * This = (CBaseUnknownImpl*)CONTAINING_RECORD(iface, CBaseUnknownImpl, lpVtbl); InterlockedDecrement(&This->m_RefCount); @@ -88,7 +88,7 @@ IN REFIID refiid, OUT PVOID* Output) { - IBaseUnknownImpl * This = (IBaseUnknownImpl*)CONTAINING_RECORD(iface, IBaseUnknownImpl, lpVtblIndirectedUnknown); + CBaseUnknownImpl * This = (CBaseUnknownImpl*)CONTAINING_RECORD(iface, CBaseUnknownImpl, lpVtblIndirectedUnknown); return This->m_UnknownOuter->lpVtbl->QueryInterface(This->m_UnknownOuter, refiid, Output); } @@ -98,7 +98,7 @@ IIndirectedUnknown_fnAddRef( IIndirectedUnknown * iface) { - IBaseUnknownImpl * This = (IBaseUnknownImpl*)CONTAINING_RECORD(iface, IBaseUnknownImpl, lpVtblIndirectedUnknown); + CBaseUnknownImpl * This = (CBaseUnknownImpl*)CONTAINING_RECORD(iface, CBaseUnknownImpl, lpVtblIndirectedUnknown); return This->m_UnknownOuter->lpVtbl->AddRef(This->m_UnknownOuter); } @@ -108,7 +108,7 @@ IIndirectedUnknown_fnRelease( IIndirectedUnknown * iface) { - IBaseUnknownImpl * This = (IBaseUnknownImpl*)CONTAINING_RECORD(iface, IBaseUnknownImpl, lpVtblIndirectedUnknown); + CBaseUnknownImpl * This = (CBaseUnknownImpl*)CONTAINING_RECORD(iface, CBaseUnknownImpl, lpVtblIndirectedUnknown); return This->m_UnknownOuter->lpVtbl->Release(This->m_UnknownOuter); } @@ -121,9 +121,7 @@ }; -// On x86, the function is named @__CBaseUnknown_ConstructorWithGUID@16 -// On non-x86, the function is named __CBaseUnknown_ConstructorWithGUID -KS_DECL_CXX(IBaseUnknownImpl *) CBaseUnknown_ConstructorWithGUID(KS_THIS(IBaseUnknownImpl), const GUID *lpGUID, IUnknown * OuterUnknown) +KS_DECL_CXX(CBaseUnknownImpl *) CBaseUnknown_ConstructorWithGUID(KS_THIS(CBaseUnknownImpl), const GUID *lpGUID, IUnknown * OuterUnknown) { This->lpVtbl = &vt_INonDelegatedUnknownVtbl; @@ -153,9 +151,7 @@ return This; } -// On x86, the function is named @__CBaseUnknown_Constructor@12 -// On non-x86, the function is named ___CBaseUnknown_Constructor -KS_DECL_CXX(IBaseUnknownImpl *) CBaseUnknown_Constructor(KS_THIS(IBaseUnknownImpl), IUnknown * OuterUnknown) +KS_DECL_CXX(CBaseUnknownImpl *) CBaseUnknown_Constructor(KS_THIS(CBaseUnknownImpl), IUnknown * OuterUnknown) { This->lpVtbl = &vt_INonDelegatedUnknownVtbl; @@ -182,9 +178,7 @@ return This; } -// On x86, the function is named @__CBaseUnknown_Destructor@12 -// On non-x86, the function is named __CBaseUnknown_Destructor -KS_DECL_CXX(IBaseUnknownImpl *) CBaseUnknown_Destructor(KS_THIS(IBaseUnknownImpl), IUnknown * OuterUnknown) +KS_DECL_CXX(VOID) CBaseUnknown_Destructor(KS_THIS(CBaseUnknownImpl), IUnknown * OuterUnknown) { /* restore vtbl's */ This->lpVtbl = &vt_INonDelegatedUnknownVtbl; @@ -201,19 +195,12 @@ /* use unknown from INonDelegatedUnknown */ This->m_UnknownOuter = (PUNKNOWN)&This->lpVtbl; } - - /* return result */ - return This; -} - -KS_DECL_CXX(IBaseUnknownImpl *) CBaseUnknown_DefaultDestructor(KS_THIS(IBaseUnknownImpl)) +} + +KS_DECL_CXX(VOID) CBaseUnknown_DefaultDestructor(KS_THIS(CBaseUnknownImpl)) { /* restore vtbl's */ This->lpVtbl = &vt_INonDelegatedUnknownVtbl; This->lpVtblIndirectedUnknown = &vt_IIndirectedUnknownVtbl; - - - /* return result */ - return This; -} - +} +

15 years

[janderwald] 42879: - Fix exporting of CBaseUnknown

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Aug 23 15:00:09 2009 New Revision: 42879 URL: http://svn.reactos.org/svn/reactos?rev=42879&view=rev Log: - Fix exporting of CBaseUnknown Modified: trunk/reactos/drivers/ksfilter/ks/ks.spec Modified: trunk/reactos/drivers/ksfilter/ks/ks.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ks.spe… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ks.spec [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/ks.spec [iso-8859-1] Sun Aug 23 15:00:09 2009 @@ -1,13 +1,13 @@ -;@ fastcall -i386 ??0CBaseUnknown@@QAE@ABU_GUID@@PAUIUnknown@@@Z(ptr ptr ptr ptr) ks.CBaseUnknown_ConstructorWithGUID(ptr ptr ptr ptr) -;@ fastcall -i386 ??0CBaseUnknown@@QAE@PAUIUnknown@@@Z(ptr ptr ptr) ks.CBaseUnknown_Constructor(ptr ptr ptr) -;@ fastcall -i386 ??1CBaseUnknown@@UAE@XZ(ptr) ks.__CBaseUnknown_DefaultDestructor(ptr) -;@ fastcall -i386 ??_FCBaseUnknown@@QAEXXZ(ptr) ks.CBaseUnknown_Destructor(ptr, ptr) -;@ stdcall -i386 ?IndirectedAddRef@CBaseUnknown@@UAGKXZ(ptr) ks.IIndirectedUnknown_fnAddRef(ptr) -;@ stdcall -i386 ?IndirectedQueryInterface@CBaseUnknown@@UAGJABU_GUID@@PAPAX@Z(ptr ptr ptr) ks.IIndirectedUnknown_fnQueryInterface(ptr ptr ptr) -;@ stdcall -i386 ?IndirectedRelease@CBaseUnknown@@UAGKXZ(ptr) ks.IIndirectedUnknown_fnRelease(ptr) -;@ stdcall -i386 ?NonDelegatedAddRef@CBaseUnknown@@UAGKXZ(ptr) ks.INonDelegatedUnknown_fnAddRef(ptr) -;@ stdcall -i386 ?NonDelegatedQueryInterface@CBaseUnknown@@UAGJABU_GUID@@PAPAX@Z ks.INonDelegatedUnknown_fnQueryInterface(ptr ptr ptr) -;@ stdcall -i386 ?NonDelegatedRelease@CBaseUnknown@@UAGKXZ(ptr) ks.IIndirectedUnknown_fnRelease(ptr) +@ fastcall -i386 ??0CBaseUnknown@@QAE@ABU_GUID@@PAUIUnknown@@@Z(ptr ptr ptr ptr) CBaseUnknown_ConstructorWithGUID +@ fastcall -i386 ??0CBaseUnknown@@QAE@PAUIUnknown@@@Z(ptr ptr ptr) CBaseUnknown_Constructor +@ fastcall -i386 ??1CBaseUnknown@@UAE@XZ(ptr ptr) CBaseUnknown_DefaultDestructor +@ fastcall -i386 ??_FCBaseUnknown@@QAEXXZ(ptr ptr ptr) CBaseUnknown_Destructor +@ stdcall -i386 ?IndirectedAddRef@CBaseUnknown@@UAGKXZ(ptr) IIndirectedUnknown_fnAddRef +@ stdcall -i386 ?IndirectedQueryInterface@CBaseUnknown@@UAGJABU_GUID@@PAPAX@Z(ptr ptr ptr) IIndirectedUnknown_fnQueryInterface +@ stdcall -i386 ?IndirectedRelease@CBaseUnknown@@UAGKXZ(ptr) IIndirectedUnknown_fnRelease +@ stdcall -i386 ?NonDelegatedAddRef@CBaseUnknown@@UAGKXZ(ptr) INonDelegatedUnknown_fnAddRef +@ stdcall -i386 ?NonDelegatedQueryInterface@CBaseUnknown@@UAGJABU_GUID@@PAPAX@Z(ptr ptr ptr) INonDelegatedUnknown_fnQueryInterface +@ stdcall ?NonDelegatedRelease@CBaseUnknown@@UAGKXZ(ptr) IIndirectedUnknown_fnRelease @ stdcall DllInitialize(ptr) @ stdcall KoCreateInstance(ptr ptr long ptr ptr)

15 years

[janderwald] 42878: - Implement CBaseUnknown class functions in C! - Thanks To KJK::Hyperion for helping - Function are not yet exported

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Aug 23 14:50:02 2009 New Revision: 42878 URL: http://svn.reactos.org/svn/reactos?rev=42878&view=rev Log: - Implement CBaseUnknown class functions in C! - Thanks To KJK::Hyperion for helping - Function are not yet exported Added: trunk/reactos/drivers/ksfilter/ks/unknown.c (with props) Modified: trunk/reactos/drivers/ksfilter/ks/ks.rbuild trunk/reactos/drivers/ksfilter/ks/ks.spec Modified: trunk/reactos/drivers/ksfilter/ks/ks.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ks.rbu… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ks.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/ks.rbuild [iso-8859-1] Sun Aug 23 14:50:02 2009 @@ -29,6 +29,7 @@ <file>pin.c</file> <file>property.c</file> <file>topology.c</file> + <file>unknown.c</file> <file>worker.c</file> <file>kcom.c</file> </module> Modified: trunk/reactos/drivers/ksfilter/ks/ks.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ks.spe… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ks.spec [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/ks.spec [iso-8859-1] Sun Aug 23 14:50:02 2009 @@ -1,3 +1,14 @@ +;@ fastcall -i386 ??0CBaseUnknown@@QAE@ABU_GUID@@PAUIUnknown@@@Z(ptr ptr ptr ptr) ks.CBaseUnknown_ConstructorWithGUID(ptr ptr ptr ptr) +;@ fastcall -i386 ??0CBaseUnknown@@QAE@PAUIUnknown@@@Z(ptr ptr ptr) ks.CBaseUnknown_Constructor(ptr ptr ptr) +;@ fastcall -i386 ??1CBaseUnknown@@UAE@XZ(ptr) ks.__CBaseUnknown_DefaultDestructor(ptr) +;@ fastcall -i386 ??_FCBaseUnknown@@QAEXXZ(ptr) ks.CBaseUnknown_Destructor(ptr, ptr) +;@ stdcall -i386 ?IndirectedAddRef@CBaseUnknown@@UAGKXZ(ptr) ks.IIndirectedUnknown_fnAddRef(ptr) +;@ stdcall -i386 ?IndirectedQueryInterface@CBaseUnknown@@UAGJABU_GUID@@PAPAX@Z(ptr ptr ptr) ks.IIndirectedUnknown_fnQueryInterface(ptr ptr ptr) +;@ stdcall -i386 ?IndirectedRelease@CBaseUnknown@@UAGKXZ(ptr) ks.IIndirectedUnknown_fnRelease(ptr) +;@ stdcall -i386 ?NonDelegatedAddRef@CBaseUnknown@@UAGKXZ(ptr) ks.INonDelegatedUnknown_fnAddRef(ptr) +;@ stdcall -i386 ?NonDelegatedQueryInterface@CBaseUnknown@@UAGJABU_GUID@@PAPAX@Z ks.INonDelegatedUnknown_fnQueryInterface(ptr ptr ptr) +;@ stdcall -i386 ?NonDelegatedRelease@CBaseUnknown@@UAGKXZ(ptr) ks.IIndirectedUnknown_fnRelease(ptr) + @ stdcall DllInitialize(ptr) @ stdcall KoCreateInstance(ptr ptr long ptr ptr) @ stdcall KoDeviceInitialize(ptr) Added: trunk/reactos/drivers/ksfilter/ks/unknown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/unknow… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/unknown.c (added) +++ trunk/reactos/drivers/ksfilter/ks/unknown.c [iso-8859-1] Sun Aug 23 14:50:02 2009 @@ -1,0 +1,219 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel Streaming + * FILE: drivers/ksfilter/ks/topoology.c + * PURPOSE: KS CBaseUnknown functions + * PROGRAMMER: Johannes Anderwald + * KJK::Hyperion + */ + + +#include "priv.h" + +#ifdef _X86_ +#define KS_DECL_CXX(RET_) extern RET_ __fastcall +#define KS_THIS(CLASS_) CLASS_ * This, void * dummy_ +#else +#define KS_DECL_CXX(RET_) extern RET_ __cdecl +#define KS_THIS(CLASS_) CLASS_ * This +#endif + +typedef struct +{ + INonDelegatedUnknownVtbl *lpVtbl; + IIndirectedUnknownVtbl *lpVtblIndirectedUnknown; + + LONG m_RefCount; + + BOOLEAN m_UsingClassId; + CLSID m_ClassId; + IUnknown* m_UnknownOuter; + +}IBaseUnknownImpl; + + + +NTSTATUS +NTAPI +INonDelegatedUnknown_fnQueryInterface( + INonDelegatedUnknown * iface, + IN REFIID refiid, + OUT PVOID* Output) +{ + IBaseUnknownImpl * This = (IBaseUnknownImpl*)CONTAINING_RECORD(iface, IBaseUnknownImpl, lpVtbl); + + if (IsEqualGUIDAligned(refiid, &IID_IUnknown)) + { + *Output = &This->lpVtbl; + _InterlockedIncrement(&This->m_RefCount); + return STATUS_SUCCESS; + } + return STATUS_NOINTERFACE; +} + +ULONG +NTAPI +INonDelegatedUnknown_fnAddRef( + INonDelegatedUnknown * iface) +{ + IBaseUnknownImpl * This = (IBaseUnknownImpl*)CONTAINING_RECORD(iface, IBaseUnknownImpl, lpVtbl); + + return InterlockedIncrement(&This->m_RefCount); +} + +ULONG +NTAPI +INonDelegatedUnknown_fnRelease( + INonDelegatedUnknown * iface) +{ + IBaseUnknownImpl * This = (IBaseUnknownImpl*)CONTAINING_RECORD(iface, IBaseUnknownImpl, lpVtbl); + + InterlockedDecrement(&This->m_RefCount); + + /* Return new reference count */ + return This->m_RefCount; +} + +static INonDelegatedUnknownVtbl vt_INonDelegatedUnknownVtbl = +{ + INonDelegatedUnknown_fnQueryInterface, + INonDelegatedUnknown_fnAddRef, + INonDelegatedUnknown_fnRelease +}; + +NTSTATUS +NTAPI +IIndirectedUnknown_fnQueryInterface( + IIndirectedUnknown * iface, + IN REFIID refiid, + OUT PVOID* Output) +{ + IBaseUnknownImpl * This = (IBaseUnknownImpl*)CONTAINING_RECORD(iface, IBaseUnknownImpl, lpVtblIndirectedUnknown); + + return This->m_UnknownOuter->lpVtbl->QueryInterface(This->m_UnknownOuter, refiid, Output); +} + +ULONG +NTAPI +IIndirectedUnknown_fnAddRef( + IIndirectedUnknown * iface) +{ + IBaseUnknownImpl * This = (IBaseUnknownImpl*)CONTAINING_RECORD(iface, IBaseUnknownImpl, lpVtblIndirectedUnknown); + + return This->m_UnknownOuter->lpVtbl->AddRef(This->m_UnknownOuter); +} + +ULONG +NTAPI +IIndirectedUnknown_fnRelease( + IIndirectedUnknown * iface) +{ + IBaseUnknownImpl * This = (IBaseUnknownImpl*)CONTAINING_RECORD(iface, IBaseUnknownImpl, lpVtblIndirectedUnknown); + + return This->m_UnknownOuter->lpVtbl->Release(This->m_UnknownOuter); +} + +static IIndirectedUnknownVtbl vt_IIndirectedUnknownVtbl = +{ + IIndirectedUnknown_fnQueryInterface, + IIndirectedUnknown_fnAddRef, + IIndirectedUnknown_fnRelease +}; + + +// On x86, the function is named @__CBaseUnknown_ConstructorWithGUID@16 +// On non-x86, the function is named __CBaseUnknown_ConstructorWithGUID +KS_DECL_CXX(IBaseUnknownImpl *) CBaseUnknown_ConstructorWithGUID(KS_THIS(IBaseUnknownImpl), const GUID *lpGUID, IUnknown * OuterUnknown) +{ + + This->lpVtbl = &vt_INonDelegatedUnknownVtbl; + This->lpVtblIndirectedUnknown = &vt_IIndirectedUnknownVtbl; + + /* class uses class id */ + This->m_UsingClassId = TRUE; + + /* copy guid */ + RtlMoveMemory(&This->m_ClassId, lpGUID, sizeof(GUID)); + + /* set refcount to zero */ + This->m_RefCount = 0; + + if (OuterUnknown) + { + /* use outer unknown */ + This->m_UnknownOuter = OuterUnknown; + } + else + { + /* use unknown from INonDelegatedUnknown */ + This->m_UnknownOuter = (PUNKNOWN)&This->lpVtbl; + } + + /* return result */ + return This; +} + +// On x86, the function is named @__CBaseUnknown_Constructor@12 +// On non-x86, the function is named ___CBaseUnknown_Constructor +KS_DECL_CXX(IBaseUnknownImpl *) CBaseUnknown_Constructor(KS_THIS(IBaseUnknownImpl), IUnknown * OuterUnknown) +{ + + This->lpVtbl = &vt_INonDelegatedUnknownVtbl; + This->lpVtblIndirectedUnknown = &vt_IIndirectedUnknownVtbl; + + /* class uses class id */ + This->m_UsingClassId = FALSE; + + /* set refcount to zero */ + This->m_RefCount = 0; + + if (OuterUnknown) + { + /* use outer unknown */ + This->m_UnknownOuter = OuterUnknown; + } + else + { + /* use unknown from INonDelegatedUnknown */ + This->m_UnknownOuter = (PUNKNOWN)&This->lpVtbl; + } + + /* return result */ + return This; +} + +// On x86, the function is named @__CBaseUnknown_Destructor@12 +// On non-x86, the function is named __CBaseUnknown_Destructor +KS_DECL_CXX(IBaseUnknownImpl *) CBaseUnknown_Destructor(KS_THIS(IBaseUnknownImpl), IUnknown * OuterUnknown) +{ + /* restore vtbl's */ + This->lpVtbl = &vt_INonDelegatedUnknownVtbl; + This->lpVtblIndirectedUnknown = &vt_IIndirectedUnknownVtbl; + + + if (OuterUnknown) + { + /* use outer unknown */ + This->m_UnknownOuter = OuterUnknown; + } + else + { + /* use unknown from INonDelegatedUnknown */ + This->m_UnknownOuter = (PUNKNOWN)&This->lpVtbl; + } + + /* return result */ + return This; +} + +KS_DECL_CXX(IBaseUnknownImpl *) CBaseUnknown_DefaultDestructor(KS_THIS(IBaseUnknownImpl)) +{ + /* restore vtbl's */ + This->lpVtbl = &vt_INonDelegatedUnknownVtbl; + This->lpVtblIndirectedUnknown = &vt_IIndirectedUnknownVtbl; + + + /* return result */ + return This; +} + Propchange: trunk/reactos/drivers/ksfilter/ks/unknown.c ------------------------------------------------------------------------------ svn:eol-style = native

15 years

[fireball] 42877: - Pass a direct bitmap bits pointer. It's yet unknown why bitmap object's bmBits pointer contains NULL (a corresponding FIXME comment is added). - Issue 20 from Arwinss wiki is fixed.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Aug 23 11:58:17 2009 New Revision: 42877 URL: http://svn.reactos.org/svn/reactos?rev=42877&view=rev Log: - Pass a direct bitmap bits pointer. It's yet unknown why bitmap object's bmBits pointer contains NULL (a corresponding FIXME comment is added). - Issue 20 from Arwinss wiki is fixed. Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Sun Aug 23 11:58:17 2009 @@ -241,7 +241,10 @@ iconinfo->hbmMask = CreateBitmap ( ciconinfo->nWidth, height, 1, 1, ciconinfo + 1); if( GetObjectW(iconinfo->hbmMask, sizeof(bitmap), &bitmap)) - RosGdiCreateBitmap(NULL, iconinfo->hbmMask, &bitmap, bitmap.bmBits); + { + // FIXME: Why bitmap.bmBits is NULL when it's supposed to be a valid pointer from above ?! + RosGdiCreateBitmap(NULL, iconinfo->hbmMask, &bitmap, /*bitmap.bmBits*/ ciconinfo + 1); + } } void CDECL RosDrv_SetCursor( CURSORICONINFO *lpCursor )

15 years

← Newer
1
...
7
8
9
10
11
12
13
...
66
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2009