Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 29123: - make gdi object's type field more windows compatible, using only the basetype in the upper 16 bits - On windows deleted objects have a KernelData value != NULL, so don't check for that when validating a handle, instead check if the type field in the upper 16 bits is 0
by tkreuzer＠svn.reactos.org 20 Sep '07

20 Sep '07

Author: tkreuzer Date: Thu Sep 20 20:13:55 2007 New Revision: 29123 URL: http://svn.reactos.org/svn/reactos?rev=29123&view=rev Log: - make gdi object's type field more windows compatible, using only the basetype in the upper 16 bits - On windows deleted objects have a KernelData value != NULL, so don't check for that when validating a handle, instead check if the type field in the upper 16 bits is 0 Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c trunk/reactos/include/reactos/win32k/ntgdihdl.h trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/misc.… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/misc.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/misc.c Thu Sep 20 20:13:55 2007 @@ -94,9 +94,8 @@ BOOL GdiIsHandleValid(HGDIOBJ hGdiObj) { PGDI_TABLE_ENTRY Entry = GdiHandleTable + GDI_HANDLE_GET_INDEX(hGdiObj); - if(Entry->KernelData != NULL && - (Entry->Type & GDI_HANDLE_TYPE_MASK) == - (LONG)GDI_HANDLE_GET_TYPE(hGdiObj)) + if((Entry->Type & GDI_ENTRY_BASETYPE_MASK) != 0 && + (Entry->Type << GDI_ENTRY_UPPER_SHIFT) == GDI_HANDLE_GET_UPPER(hGdiObj)) { HANDLE pid = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1); if(pid == NULL || pid == CurrentProcessId) @@ -110,9 +109,8 @@ BOOL GdiGetHandleUserData(HGDIOBJ hGdiObj, PVOID *UserData) { PGDI_TABLE_ENTRY Entry = GdiHandleTable + GDI_HANDLE_GET_INDEX(hGdiObj); - if(Entry->KernelData != NULL && - (Entry->Type & GDI_HANDLE_TYPE_MASK) == - (LONG)GDI_HANDLE_GET_TYPE(hGdiObj)) + if((Entry->Type & GDI_ENTRY_BASETYPE_MASK) != 0 && + (Entry->Type << GDI_ENTRY_UPPER_SHIFT) == GDI_HANDLE_GET_UPPER(hGdiObj)) { HANDLE pid = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1); if(pid == NULL || pid == CurrentProcessId) Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Thu Sep 20 20:13:55 2007 @@ -33,6 +33,7 @@ #define GDI_ENTRY_STOCK_MASK 0x00000080 #define GDI_ENTRY_REUSE_MASK 0x0000ff00 #define GDI_ENTRY_REUSE_INC 0x00000100 +#define GDI_ENTRY_BASETYPE_MASK 0x001f0000 #define GDI_ENTRY_REUSECNT_SHIFT 8 #define GDI_ENTRY_UPPER_SHIFT 16 Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Thu Sep 20 20:13:55 2007 @@ -316,10 +316,10 @@ DPRINT1("%s: Attempted to lock object 0x%x, wrong reuse counter (Handle: 0x%x, Entry: 0x%x)\n", Function, hObj, GDI_HANDLE_GET_REUSECNT(hObj), GDI_ENTRY_GET_REUSECNT(Entry->Type)); } - else if (GDI_HANDLE_GET_TYPE(hObj) != GDI_HANDLE_GET_TYPE(Entry->Type)) + else if (GDI_HANDLE_GET_TYPE(hObj) != ((Entry->Type << GDI_ENTRY_UPPER_SHIFT) & GDI_HANDLE_TYPE_MASK)) { DPRINT1("%s: Attempted to lock object 0x%x, type mismatch (Handle: 0x%x, Entry: 0x%x)\n", - Function, hObj, GDI_HANDLE_GET_TYPE(hObj), GDI_HANDLE_GET_TYPE(Entry->Type)); + Function, hObj, GDI_HANDLE_GET_TYPE(hObj), (Entry->Type << GDI_ENTRY_UPPER_SHIFT) & GDI_HANDLE_TYPE_MASK); } else { @@ -403,10 +403,10 @@ RtlZeroMemory(ObjectBody, GetObjectSize(TypeIndex)); - /* FIXME: On Windows the higher 16 bit of the type field don't always match - the type from the handle, it is probably a storage type - (type = pen, storage = brush) */ - TypeInfo = (ObjectType & GDI_HANDLE_TYPE_MASK) | (ObjectType >> GDI_ENTRY_UPPER_SHIFT); + /* On Windows the higher 16 bit of the type field don't contain the + full type from the handle, but the base type. + (type = BRSUH, PEN, EXTPEN, basetype = BRUSH) */ + TypeInfo = (ObjectType & GDI_HANDLE_BASETYPE_MASK) | (ObjectType >> GDI_ENTRY_UPPER_SHIFT); FreeEntry = InterlockedPopEntrySList(&HandleTable->FreeEntriesHead); if(FreeEntry != NULL) @@ -705,7 +705,7 @@ Entry++, Index++) { /* ignore the lock bit */ - if((HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1) == ProcId && (Entry->Type & ~GDI_HANDLE_REUSE_MASK) != 0) + if((HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1) == ProcId && (Entry->Type & ~GDI_ENTRY_REUSE_MASK) != 0) { HGDIOBJ ObjectHandle; @@ -1050,7 +1050,7 @@ Entry = GDI_HANDLE_GET_ENTRY(HandleTable, ObjectHandle); Ret = Entry->KernelData != NULL && - (Entry->Type & ~GDI_HANDLE_REUSE_MASK) != 0 && + (Entry->Type & ~GDI_ENTRY_REUSE_MASK) != 0 && (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1) == ProcessId; return Ret; @@ -1060,7 +1060,7 @@ } BOOL INTERNAL_CALL -GDIOBJ_ConvertToStockObj(PGDI_HANDLE_TABLE HandleTable, HGDIOBJ *hObj) +GDIOBJ_ConvertToStockObj(PGDI_HANDLE_TABLE HandleTable, HGDIOBJ *phObj) { /* * FIXME !!!!! THIS FUNCTION NEEDS TO BE FIXED - IT IS NOT SAFE WHEN OTHER THREADS @@ -1069,22 +1069,24 @@ PGDI_TABLE_ENTRY Entry; HANDLE ProcessId, LockedProcessId, PrevProcId; PETHREAD Thread; + HGDIOBJ hObj; #ifdef GDI_DEBUG ULONG Attempts = 0; #endif - ASSERT(hObj); - - DPRINT("GDIOBJ_ConvertToStockObj: hObj: 0x%08x\n", *hObj); + ASSERT(phObj); + hObj = *phObj; + + DPRINT("GDIOBJ_ConvertToStockObj: hObj: 0x%08x\n", hObj); Thread = PsGetCurrentThread(); - if(!GDI_HANDLE_IS_STOCKOBJ(*hObj)) + if(!GDI_HANDLE_IS_STOCKOBJ(hObj)) { ProcessId = PsGetCurrentProcessId(); LockedProcessId = (HANDLE)((ULONG_PTR)ProcessId | 0x1); - Entry = GDI_HANDLE_GET_ENTRY(HandleTable, *hObj); + Entry = GDI_HANDLE_GET_ENTRY(HandleTable, hObj); LockHandle: /* lock the object, we must not convert stock objects, so don't check!!! */ @@ -1096,16 +1098,11 @@ /* we're locking an object that belongs to our process. First calculate the new object type including the stock object flag and then try to exchange it.*/ - /* FIXME: On Windows the higher 16 bit of the type field don't always match - the type from the handle, it is probably a storage type - (type = pen, storage = brush) */ - NewType = GDI_HANDLE_GET_TYPE(*hObj); - NewType |= GDI_HANDLE_GET_UPPER(*hObj) >> GDI_ENTRY_UPPER_SHIFT; - - /* This is the type that the object should have right now, save it */ - OldType = NewType; + OldType = ((ULONG)hObj & GDI_HANDLE_BASETYPE_MASK); + OldType |= GDI_HANDLE_GET_UPPER(hObj) >> GDI_ENTRY_UPPER_SHIFT; + /* As the object should be a stock object, set it's flag, but only in the lower 16 bits */ - NewType |= GDI_ENTRY_STOCK_MASK; + NewType = OldType | GDI_ENTRY_STOCK_MASK; /* Try to exchange the type field - but only if the old (previous type) matches! */ PrevType = InterlockedCompareExchange(&Entry->Type, NewType, OldType); @@ -1146,7 +1143,8 @@ /* remove the process id lock and make it global */ (void)InterlockedExchangePointer(&Entry->ProcessId, GDI_GLOBAL_PROCESS); - *hObj = (HGDIOBJ)((ULONG)(*hObj) | GDI_HANDLE_STOCK_MASK); + hObj = (HGDIOBJ)((ULONG)(hObj) | GDI_HANDLE_STOCK_MASK); + *phObj = hObj; /* we're done, successfully converted the object */ return TRUE;

1 0

[hpoussin] 29122: Do not forget to release the rundown protection. See issue #2348 for more details.
by hpoussin＠svn.reactos.org 20 Sep '07

20 Sep '07

Author: hpoussin Date: Thu Sep 20 18:54:43 2007 New Revision: 29122 URL: http://svn.reactos.org/svn/reactos?rev=29122&view=rev Log: Do not forget to release the rundown protection. See issue #2348 for more details. Modified: trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=29… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c (original) +++ trunk/reactos/ntoskrnl/ps/query.c Thu Sep 20 18:54:43 2007 @@ -916,6 +916,7 @@ /* Release the lock and rundown */ ExReleasePushLockShared(&Process->ProcessLock); KeLeaveCriticalRegion(); + ExReleaseRundownProtection(&Process->RundownProtect); } else {

1 0

[jimtabor] 29121: User32: - Implement ValidateHandle. - Copied handle_to_entry and header information from win32k. Yes I know, duplication etc. Just for now. - Add tested validation object types and as per revision 29105. Those object types now match. - In dllmain.c, the gHandleTable pointer is set from Win32k GetW32ProcessInfo. - Tested it, failed. The pointer does match with win32k gHandleTable.
by jimtabor＠svn.reactos.org 20 Sep '07

20 Sep '07

Author: jimtabor Date: Thu Sep 20 18:26:43 2007 New Revision: 29121 URL: http://svn.reactos.org/svn/reactos?rev=29121&view=rev Log: User32: - Implement ValidateHandle. - Copied handle_to_entry and header information from win32k. Yes I know, duplication etc. Just for now. - Add tested validation object types and as per revision 29105. Those object types now match. - In dllmain.c, the gHandleTable pointer is set from Win32k GetW32ProcessInfo. - Tested it, failed. The pointer does match with win32k gHandleTable. Modified: trunk/reactos/dll/win32/user32/include/user32p.h trunk/reactos/dll/win32/user32/misc/dllmain.c trunk/reactos/dll/win32/user32/misc/misc.c Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32p.h (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h Thu Sep 20 18:26:43 2007 @@ -130,12 +130,14 @@ /* Internal Thread Data */ extern HINSTANCE User32Instance; +/* Critical Section*/ +extern RTL_CRITICAL_SECTION User32Crit; + typedef struct _USER32_TRACKINGLIST { TRACKMOUSEEVENT tme; POINT pos; /* center of hover rectangle */ UINT_PTR timer; } USER32_TRACKINGLIST,*PUSER32_TRACKINGLIST; - typedef struct _USER32_THREAD_DATA { @@ -145,7 +147,7 @@ } USER32_THREAD_DATA, *PUSER32_THREAD_DATA; PUSER32_THREAD_DATA User32GetThreadData(); - + DEVMODEW * STDCALL GdiConvertToDevmodeW(DEVMODEA *dm); @@ -163,6 +165,7 @@ #define SPY_RESULT_OK 0x0001 #define SPY_RESULT_INVALIDHWND 0x0003 #define SPY_RESULT_DEFWND 0x0005 + extern const char *SPY_GetMsgName(UINT msg, HWND hWnd); extern const char *SPY_GetVKeyName(WPARAM wParam); @@ -172,5 +175,48 @@ extern int SPY_Init(void); +/* Validate window handle types */ +#define VALIDATE_TYPE_FREE 0 +#define VALIDATE_TYPE_WIN 1 +#define VALIDATE_TYPE_MENU 2 +#define VALIDATE_TYPE_CURSOR 3 +#define VALIDATE_TYPE_MWPOS 4 +#define VALIDATE_TYPE_HOOK 5 +#define VALIDATE_TYPE_CALLPROC 7 +#define VALIDATE_TYPE_ACCEL 8 +#define VALIDATE_TYPE_MONITOR 12 + +#define FIRST_USER_HANDLE 0x0020 /* first possible value for low word of user handle */ +#define LAST_USER_HANDLE 0xffef /* last possible value for low word of user handle */ +#define NB_USER_HANDLES ((LAST_USER_HANDLE - FIRST_USER_HANDLE + 1) >> 1) +#define USER_HANDLE_TO_INDEX(hwnd) ((LOWORD(hwnd) - FIRST_USER_HANDLE) >> 1) + +#define USER_HEADER_TO_BODY(ObjectHeader) \ + ((PVOID)(((PUSER_OBJECT_HEADER)ObjectHeader) + 1)) + +#define USER_BODY_TO_HEADER(ObjectBody) \ + ((PUSER_OBJECT_HEADER)(((PUSER_OBJECT_HEADER)ObjectBody) - 1)) + +typedef struct _USER_HANDLE_ENTRY +{ + void *ptr; /* pointer to object */ + PW32THREADINFO pti; // pointer to Win32ThreadInfo + unsigned short type; /* object type (0 if free) */ + unsigned short generation; /* generation counter */ +} USER_HANDLE_ENTRY, * PUSER_HANDLE_ENTRY; + +typedef struct _USER_HANDLE_TABLE +{ + PUSER_HANDLE_ENTRY handles; + PUSER_HANDLE_ENTRY freelist; + int nb_handles; + int allocated_handles; +} USER_HANDLE_TABLE, * PUSER_HANDLE_TABLE; + +extern PUSER_HANDLE_TABLE gHandleTable; + +PUSER_HANDLE_ENTRY FASTCALL GetUser32Handle(HANDLE); +PVOID FASTCALL ValidateHandle(HANDLE, UINT); + #endif /* EOF */ Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/dllmain.c (original) +++ trunk/reactos/dll/win32/user32/misc/dllmain.c Thu Sep 20 18:26:43 2007 @@ -4,6 +4,8 @@ static ULONG User32TlsIndex; HINSTANCE User32Instance; +PUSER_HANDLE_TABLE gHandleTable = NULL; + PUSER32_THREAD_DATA User32GetThreadData() @@ -49,7 +51,11 @@ (PVOID)User32SetupDefaultCursors; NtCurrentTeb()->ProcessEnvironmentBlock->KernelCallbackTable[USER32_CALLBACK_HOOKPROC] = (PVOID)User32CallHookProcFromKernel; - + { + PW32THREADINFO ti = (PW32THREADINFO)NtCurrentTeb()->Win32ThreadInfo; + PW32PROCESSINFO pi = ti->pi; + gHandleTable = (PUSER_HANDLE_TABLE) pi->UserHandleTable; + } /* Allocate an index for user32 thread local data. */ User32TlsIndex = TlsAlloc(); if (User32TlsIndex != TLS_OUT_OF_INDEXES) Modified: trunk/reactos/dll/win32/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/misc… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/misc.c (original) +++ trunk/reactos/dll/win32/user32/misc/misc.c Thu Sep 20 18:26:43 2007 @@ -268,3 +268,78 @@ return TRUE; } + +PUSER_HANDLE_ENTRY +FASTCALL +GetUser32Handle(HANDLE handle) +{ + PUSER_HANDLE_TABLE ht = gHandleTable; + USHORT generation; + + DPRINT1("Main Handle Table %x\n", ht); + + INT Index = (((UINT)handle & 0xffff) - FIRST_USER_HANDLE) >> 1; + + if (Index < 0 || Index >= ht->nb_handles) return NULL; + + if (!ht->handles[Index].type) return NULL; + + generation = (UINT)handle >> 16; + + if (generation == ht->handles[Index].generation || !generation || generation == 0xffff) + return &ht->handles[Index]; + + return NULL; +} + +// +// Validate Handle and return the pointer to the object. +// +PVOID +FASTCALL +ValidateHandle(HANDLE handle, UINT uType) +{ + PW32CLIENTINFO ClientInfo = GetWin32ClientInfo(); + + if (uType == VALIDATE_TYPE_WIN) + { + if (handle == ClientInfo->hWND) return ClientInfo->pvWND; + } + + PUSER_HANDLE_ENTRY pEntry = GetUser32Handle(handle); + +// Must have an entry and must be the same type! + if ( (!pEntry) || (pEntry->type != uType) ) + { + switch ( uType ) + { // Test (with wine too) confirms these results! + case VALIDATE_TYPE_WIN: + SetLastError(ERROR_INVALID_WINDOW_HANDLE); + break; + case VALIDATE_TYPE_MENU: + SetLastError(ERROR_INVALID_MENU_HANDLE); + break; + case VALIDATE_TYPE_CURSOR: + SetLastError(ERROR_INVALID_CURSOR_HANDLE); + break; + case VALIDATE_TYPE_MWPOS: + SetLastError(ERROR_INVALID_DWP_HANDLE); + break; + case VALIDATE_TYPE_HOOK: + SetLastError(ERROR_INVALID_HOOK_HANDLE); + break; + case VALIDATE_TYPE_ACCEL: + SetLastError(ERROR_INVALID_ACCEL_HANDLE); + break; + default: + SetLastError(ERROR_INVALID_HANDLE); + } + return NULL; + } + + if (!(NtUserValidateHandleSecure(handle, FALSE))) return NULL; + + return pEntry->ptr; +} + +

1 0

[hpoussin] 29120: [FORMATTING] Tabs vs space, { } placement, ... No code change
by hpoussin＠svn.reactos.org 20 Sep '07

20 Sep '07

Author: hpoussin Date: Thu Sep 20 17:53:38 2007 New Revision: 29120 URL: http://svn.reactos.org/svn/reactos?rev=29120&view=rev Log: [FORMATTING] Tabs vs space, { } placement, ... No code change Modified: trunk/reactos/base/applications/network/ping/ping.c Modified: trunk/reactos/base/applications/network/ping/ping.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/ping.c (original) +++ trunk/reactos/base/applications/network/ping/ping.c Thu Sep 20 17:53:38 2007 @@ -1,11 +1,9 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS ping utility - * FILE: apps/net/ping/ping.c + * FILE: base/applications/network/ping/ping.c * PURPOSE: Network test utility - * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * REVISIONS: - * CSH 01/09/2000 Created + * PROGRAMMERS: */ #include <winsock2.h> @@ -14,13 +12,9 @@ #include <string.h> #include <stdio.h> +#define NDEBUG + #ifndef _MSC_VER - -/* FIXME: Where should this be? */ -#ifdef CopyMemory -#undef CopyMemory -#endif -#define CopyMemory(Destination, Source, Length) memcpy(Destination, Source, Length); /* Should be in the header files somewhere (exported by ntdll.dll) */ long atol(const char *str); @@ -33,47 +27,46 @@ #endif /* _MSC_VER */ -#ifdef DBG -#undef DBG -#endif - /* General ICMP constants */ -#define ICMP_MINSIZE 8 /* Minimum ICMP packet size */ -#define ICMP_MAXSIZE 65535 /* Maximum ICMP packet size */ +#define ICMP_MINSIZE 8 /* Minimum ICMP packet size */ +#define ICMP_MAXSIZE 65535 /* Maximum ICMP packet size */ /* ICMP message types */ -#define ICMPMSG_ECHOREQUEST 8 /* ICMP ECHO request message */ -#define ICMPMSG_ECHOREPLY 0 /* ICMP ECHO reply message */ +#define ICMPMSG_ECHOREQUEST 8 /* ICMP ECHO request message */ +#define ICMPMSG_ECHOREPLY 0 /* ICMP ECHO reply message */ #pragma pack(4) /* IPv4 header structure */ -typedef struct _IPv4_HEADER { - unsigned char IHL:4; - unsigned char Version:4; - unsigned char TOS; - unsigned short Length; - unsigned short Id; - unsigned short FragFlags; - unsigned char TTL; - unsigned char Protocol; - unsigned short Checksum; - unsigned int SrcAddress; - unsigned int DstAddress; +typedef struct _IPv4_HEADER +{ + unsigned char IHL:4; + unsigned char Version:4; + unsigned char TOS; + unsigned short Length; + unsigned short Id; + unsigned short FragFlags; + unsigned char TTL; + unsigned char Protocol; + unsigned short Checksum; + unsigned int SrcAddress; + unsigned int DstAddress; } IPv4_HEADER, *PIPv4_HEADER; /* ICMP echo request/reply header structure */ -typedef struct _ICMP_HEADER { - unsigned char Type; - unsigned char Code; - unsigned short Checksum; - unsigned short Id; - unsigned short SeqNum; +typedef struct _ICMP_HEADER +{ + unsigned char Type; + unsigned char Code; + unsigned short Checksum; + unsigned short Id; + unsigned short SeqNum; } ICMP_HEADER, *PICMP_HEADER; -typedef struct _ICMP_ECHO_PACKET { - ICMP_HEADER Icmp; - LARGE_INTEGER Timestamp; +typedef struct _ICMP_ECHO_PACKET +{ + ICMP_HEADER Icmp; + LARGE_INTEGER Timestamp; } ICMP_ECHO_PACKET, *PICMP_ECHO_PACKET; #pragma pack(1) @@ -105,7 +98,7 @@ LARGE_INTEGER TicksPerUs; /* Ticks per microsecond */ BOOL UsePerformanceCounter; -#ifdef DBG +#ifndef NDEBUG /* Display the contents of a buffer */ static VOID DisplayBuffer( PVOID Buffer, @@ -117,25 +110,25 @@ printf("Buffer (0x%p) Size (0x%lX).\n", Buffer, Size); p = (PCHAR)Buffer; - for (i = 0; i < Size; i++) { - if (i % 16 == 0) { - printf("\n"); - } - printf("%02X ", (p[i]) & 0xFF); - } -} -#endif /* DBG */ + for (i = 0; i < Size; i++) + { + if (i % 16 == 0) + printf("\n"); + printf("%02X ", (p[i]) & 0xFF); + } +} +#endif /* !NDEBUG */ /* Display usage information on screen */ static VOID Usage(VOID) { - printf("\nUsage: ping [-t] [-n count] [-l size] [-w timeout] destination-host\n\n"); - printf("Options:\n"); - printf(" -t Ping the specified host until stopped.\n"); - printf(" To stop - type Control-C.\n"); - printf(" -n count Number of echo requests to send.\n"); - printf(" -l size Send buffer size.\n"); - printf(" -w timeout Timeout in milliseconds to wait for each reply.\n\n"); + printf("\nUsage: ping [-t] [-n count] [-l size] [-w timeout] destination-host\n\n"); + printf("Options:\n"); + printf(" -t Ping the specified host until stopped.\n"); + printf(" To stop - type Control-C.\n"); + printf(" -n count Number of echo requests to send.\n"); + printf(" -l size Send buffer size.\n"); + printf(" -w timeout Timeout in milliseconds to wait for each reply.\n\n"); } /* Reset configuration to default values */ @@ -153,20 +146,21 @@ Timeout = 1000; UsePerformanceCounter = QueryPerformanceFrequency(&PerformanceCounterFrequency); - if (UsePerformanceCounter) { + if (UsePerformanceCounter) + { /* Performance counters may return incorrect results on some multiprocessor platforms so we restrict execution on the first processor. This may fail on Windows NT so we fall back to GetCurrentTick() for timing */ - if (SetThreadAffinityMask (GetCurrentThread(), 1) == 0) { + if (SetThreadAffinityMask (GetCurrentThread(), 1) == 0) UsePerformanceCounter = FALSE; - } /* Convert frequency to ticks per millisecond */ TicksPerMs.QuadPart = PerformanceCounterFrequency.QuadPart / 1000; /* And to ticks per microsecond */ TicksPerUs.QuadPart = PerformanceCounterFrequency.QuadPart / 1000000; } - if (!UsePerformanceCounter) { + if (!UsePerformanceCounter) + { /* 1 tick per millisecond for GetCurrentTick() */ TicksPerMs.QuadPart = 1; /* GetCurrentTick() cannot handle microseconds */ @@ -183,7 +177,8 @@ i = 0; Length = (UINT)_tcslen(String); while ((i < Length) && ((String[i] < '0') || (String[i] > '9'))) i++; - if ((i >= Length) || ((String[i] < '0') || (String[i] > '9'))) { + if ((i >= Length) || ((String[i] < '0') || (String[i] > '9'))) + { InvalidOption = TRUE; return 0; } @@ -198,9 +193,11 @@ ULONG Value; Value = GetULONG(String1); - if (InvalidOption) { + if (InvalidOption) + { InvalidOption = FALSE; - if (String2[0] != '-') { + if (String2[0] != '-') + { Value = GetULONG(String2); if (!InvalidOption) *i += 1; @@ -216,63 +213,69 @@ INT i; BOOL ShowUsage; BOOL FoundTarget; -//#if 1 -// lstrcpy(TargetName, "127.0.0.1"); -// PingCount = 1; -// return TRUE; -//#endif - if (argc < 2) { + if (argc < 2) ShowUsage = TRUE; - } else { + else ShowUsage = FALSE; - } FoundTarget = FALSE; InvalidOption = FALSE; - for (i = 1; i < argc; i++) { - if (argv[i][0] == '-') { - switch (argv[i][1]) { - case 't': NeverStop = TRUE; break; - case 'a': ResolveAddresses = TRUE; break; - case 'n': PingCount = GetULONG2(&argv[i][2], argv[i + 1], &i); break; - case 'l': - DataSize = GetULONG2(&argv[i][2], argv[i + 1], &i); - if (DataSize > ICMP_MAXSIZE - sizeof(ICMP_ECHO_PACKET)) { - printf("Bad value for option -l, valid range is from 0 to %d.\n", - ICMP_MAXSIZE - sizeof(ICMP_ECHO_PACKET)); + for (i = 1; i < argc; i++) + { + if (argv[i][0] == '-') + { + switch (argv[i][1]) + { + case 't': NeverStop = TRUE; break; + case 'a': ResolveAddresses = TRUE; break; + case 'n': PingCount = GetULONG2(&argv[i][2], argv[i + 1], &i); break; + case 'l': + DataSize = GetULONG2(&argv[i][2], argv[i + 1], &i); + if (DataSize > ICMP_MAXSIZE - sizeof(ICMP_ECHO_PACKET)) + { + printf("Bad value for option -l, valid range is from 0 to %d.\n", + ICMP_MAXSIZE - sizeof(ICMP_ECHO_PACKET)); + return FALSE; + } + break; + case 'f': DontFragment = TRUE; break; + case 'i': TTLValue = GetULONG2(&argv[i][2], argv[i + 1], &i); break; + case 'v': TOSValue = GetULONG2(&argv[i][2], argv[i + 1], &i); break; + case 'w': Timeout = GetULONG2(&argv[i][2], argv[i + 1], &i); break; + default: + printf("Bad option %s.\n", argv[i]); + Usage(); return FALSE; - } - break; - case 'f': DontFragment = TRUE; break; - case 'i': TTLValue = GetULONG2(&argv[i][2], argv[i + 1], &i); break; - case 'v': TOSValue = GetULONG2(&argv[i][2], argv[i + 1], &i); break; - case 'w': Timeout = GetULONG2(&argv[i][2], argv[i + 1], &i); break; - default: - printf("Bad option %s.\n", argv[i]); - Usage(); - return FALSE; } - if (InvalidOption) { + if (InvalidOption) + { printf("Bad option format %s.\n", argv[i]); return FALSE; } - } else { - if (FoundTarget) { + } + else + { + if (FoundTarget) + { printf("Bad parameter %s.\n", argv[i]); return FALSE; - } else { - lstrcpy(TargetName, argv[i]); + } + else + { + lstrcpy(TargetName, argv[i]); FoundTarget = TRUE; } } } - if ((!ShowUsage) && (!FoundTarget)) { + if ((!ShowUsage) && (!FoundTarget)) + { printf("Name or IP address of destination host must be specified.\n"); return FALSE; } - if (ShowUsage) { + if (ShowUsage) + { Usage(); return FALSE; } @@ -284,7 +287,8 @@ { ULONG sum = 0; - while (size > 1) { + while (size > 1) + { sum += *data++; size -= sizeof(USHORT); } @@ -303,20 +307,22 @@ { WORD wVersionRequested; WSADATA WsaData; - INT Status; + INT Status; ULONG Addr; PHOSTENT phe; wVersionRequested = MAKEWORD(2, 2); Status = WSAStartup(wVersionRequested, &WsaData); - if (Status != 0) { + if (Status != 0) + { printf("Could not initialize winsock dll.\n"); return FALSE; } IcmpSock = WSASocket(AF_INET, SOCK_RAW, IPPROTO_ICMP, NULL, 0, 0); - if (IcmpSock == INVALID_SOCKET) { + if (IcmpSock == INVALID_SOCKET) + { printf("Could not create socket (#%d).\n", WSAGetLastError()); return FALSE; } @@ -324,30 +330,30 @@ ZeroMemory(&Target, sizeof(Target)); phe = NULL; Addr = inet_addr(TargetName); - if (Addr == INADDR_NONE) { + if (Addr == INADDR_NONE) + { phe = gethostbyname(TargetName); - if (phe == NULL) { + if (phe == NULL) + { printf("Unknown host %s.\n", TargetName); return FALSE; } } - if (phe != NULL) { + if (phe != NULL) CopyMemory(&Target.sin_addr, phe->h_addr, phe->h_length); - } else { + else Target.sin_addr.s_addr = Addr; - } - - if (phe != NULL) { - Target.sin_family = phe->h_addrtype; - } else { + + if (phe != NULL) + Target.sin_family = phe->h_addrtype; + else Target.sin_family = AF_INET; - } - - TargetIP = inet_ntoa(Target.sin_addr); - CurrentSeqNum = 0; - SentCount = 0; - LostCount = 0; + + TargetIP = inet_ntoa(Target.sin_addr); + CurrentSeqNum = 0; + SentCount = 0; + LostCount = 0; MinRTT.QuadPart = 0; MaxRTT.QuadPart = 0; SumRTT.QuadPart = 0; @@ -366,8 +372,10 @@ static VOID QueryTime(PLARGE_INTEGER Time) { - if (UsePerformanceCounter) { - if (QueryPerformanceCounter(Time) == 0) { + if (UsePerformanceCounter) + { + if (QueryPerformanceCounter(Time) == 0) + { /* This should not happen, but we fall back to GetCurrentTick() if it does */ Time->u.LowPart = (ULONG)GetTickCount(); @@ -380,7 +388,9 @@ UsePerformanceCounter = FALSE; } - } else { + } + else + { Time->u.LowPart = (ULONG)GetTickCount(); Time->u.HighPart = 0; } @@ -394,7 +404,7 @@ LargeTime.QuadPart = Time.QuadPart / TicksPerMs.QuadPart; _i64toa(LargeTime.QuadPart, Convstr, 10); - strcpy(String, Convstr); + strcpy(String, Convstr); strcat(String, "ms"); } @@ -404,7 +414,7 @@ { PIPv4_HEADER IpHeader; PICMP_ECHO_PACKET Icmp; - UINT IphLength; + UINT IphLength; CHAR Time[100]; LARGE_INTEGER RelativeTime; LARGE_INTEGER LargeTime; @@ -414,26 +424,29 @@ IphLength = IpHeader->IHL * 4; - if (size < IphLength + ICMP_MINSIZE) { -#ifdef DBG + if (size < IphLength + ICMP_MINSIZE) + { +#ifndef NDEBUG printf("Bad size (0x%X < 0x%X)\n", size, IphLength + ICMP_MINSIZE); -#endif /* DBG */ +#endif /* !NDEBUG */ return FALSE; } Icmp = (PICMP_ECHO_PACKET)(buffer + IphLength); - if (Icmp->Icmp.Type != ICMPMSG_ECHOREPLY) { -#ifdef DBG + if (Icmp->Icmp.Type != ICMPMSG_ECHOREPLY) + { +#ifndef NDEBUG printf("Bad ICMP type (0x%X should be 0x%X)\n", Icmp->Icmp.Type, ICMPMSG_ECHOREPLY); -#endif /* DBG */ - return FALSE; - } - - if (Icmp->Icmp.Id != (USHORT)GetCurrentProcessId()) { -#ifdef DBG +#endif /* !NDEBUG */ + return FALSE; + } + + if (Icmp->Icmp.Id != (USHORT)GetCurrentProcessId()) + { +#ifndef NDEBUG printf("Bad ICMP id (0x%X should be 0x%X)\n", Icmp->Icmp.Id, (USHORT)GetCurrentProcessId()); -#endif /* DBG */ +#endif /* !NDEBUG */ return FALSE; } @@ -441,10 +454,13 @@ RelativeTime.QuadPart = (LargeTime.QuadPart - Icmp->Timestamp.QuadPart); - if ((RelativeTime.QuadPart / TicksPerMs.QuadPart) < 1) { + if ((RelativeTime.QuadPart / TicksPerMs.QuadPart) < 1) + { strcpy(Sign, "<"); strcpy(Time, "1ms"); - } else { + } + else + { strcpy(Sign, "="); TimeToMsString(Time, RelativeTime); } @@ -452,16 +468,17 @@ printf("Reply from %s: bytes=%d time%s%s TTL=%d\n", inet_ntoa(from->sin_addr), size - IphLength - sizeof(ICMP_ECHO_PACKET), Sign, Time, IpHeader->TTL); - if (RelativeTime.QuadPart < MinRTT.QuadPart || !MinRTTSet) { - MinRTT.QuadPart = RelativeTime.QuadPart; + if (RelativeTime.QuadPart < MinRTT.QuadPart || !MinRTTSet) + { + MinRTT.QuadPart = RelativeTime.QuadPart; MinRTTSet = TRUE; } - if (RelativeTime.QuadPart > MaxRTT.QuadPart) - MaxRTT.QuadPart = RelativeTime.QuadPart; + if (RelativeTime.QuadPart > MaxRTT.QuadPart) + MaxRTT.QuadPart = RelativeTime.QuadPart; SumRTT.QuadPart += RelativeTime.QuadPart; - return TRUE; + return TRUE; } /* Send and receive one ping */ @@ -477,7 +494,8 @@ /* Account for extra space for IP header when packet is received */ Size = DataSize + 128; Buffer = GlobalAlloc(0, Size); - if (!Buffer) { + if (!Buffer) + { printf("Not enough free resources available.\n"); return FALSE; } @@ -488,7 +506,7 @@ /* Assemble ICMP echo request packet */ Packet->Icmp.Type = ICMPMSG_ECHOREQUEST; Packet->Icmp.Code = 0; - Packet->Icmp.Id = (USHORT)GetCurrentProcessId(); + Packet->Icmp.Id = (USHORT)GetCurrentProcessId(); Packet->Icmp.SeqNum = htons((USHORT)CurrentSeqNum); Packet->Icmp.Checksum = 0; @@ -501,31 +519,32 @@ CurrentSeqNum++; - /* Send ICMP echo request */ + /* Send ICMP echo request */ FD_ZERO(&Fds); FD_SET(IcmpSock, &Fds); Timeval.tv_sec = Timeout / 1000; Timeval.tv_usec = Timeout % 1000; Status = select(0, NULL, &Fds, NULL, &Timeval); - if ((Status != SOCKET_ERROR) && (Status != 0)) { - -#ifdef DBG + if ((Status != SOCKET_ERROR) && (Status != 0)) + { + +#ifndef NDEBUG printf("Sending packet\n"); DisplayBuffer(Buffer, sizeof(ICMP_ECHO_PACKET) + DataSize); printf("\n"); -#endif /* DBG */ +#endif /* !NDEBUG */ Status = sendto(IcmpSock, Buffer, sizeof(ICMP_ECHO_PACKET) + DataSize, 0, (SOCKADDR*)&Target, sizeof(Target)); SentCount++; } - if (Status == SOCKET_ERROR) { - if (WSAGetLastError() == WSAEHOSTUNREACH) { + if (Status == SOCKET_ERROR) + { + if (WSAGetLastError() == WSAEHOSTUNREACH) printf("Destination host unreachable.\n"); - } else { + else printf("Could not transmit data (%d).\n", WSAGetLastError()); - } GlobalFree(Buffer); return FALSE; } @@ -537,18 +556,21 @@ Timeval.tv_usec = Timeout % 1000; Status = select(0, &Fds, NULL, NULL, &Timeval); - if ((Status != SOCKET_ERROR) && (Status != 0)) { + if ((Status != SOCKET_ERROR) && (Status != 0)) + { Length = sizeof(From); Status = recvfrom(IcmpSock, Buffer, Size, 0, &From, &Length); -#ifdef DBG +#ifndef NDEBUG printf("Received packet\n"); DisplayBuffer(Buffer, Status); printf("\n"); -#endif /* DBG */ - } - if (Status == SOCKET_ERROR) { - if (WSAGetLastError() != WSAETIMEDOUT) { +#endif /* !NDEBUG */ + } + if (Status == SOCKET_ERROR) + { + if (WSAGetLastError() != WSAETIMEDOUT) + { printf("Could not receive data (%d).\n", WSAGetLastError()); GlobalFree(Buffer); return FALSE; @@ -556,14 +578,16 @@ Status = 0; } - if (Status == 0) { + if (Status == 0) + { printf("Request timed out.\n"); LostCount++; GlobalFree(Buffer); return TRUE; } - if (!DecodeResponse(Buffer, Status, (PSOCKADDR_IN)&From)) { + if (!DecodeResponse(Buffer, Status, (PSOCKADDR_IN)&From)) + { /* FIXME: Wait again as it could be another ICMP message type */ printf("Request timed out (incomplete datagram received).\n"); LostCount++; @@ -584,26 +608,27 @@ Reset(); - if ((ParseCmdline(argc, argv)) && (Setup())) { + if ((ParseCmdline(argc, argv)) && (Setup())) + { printf("\nPinging %s [%s] with %d bytes of data:\n\n", TargetName, TargetIP, DataSize); - Count = 0; - while ((NeverStop) || (Count < PingCount)) { - Ping(); - Sleep(Timeout); - Count++; - }; + Count = 0; + while ((NeverStop) || (Count < PingCount)) + { + Ping(); + Sleep(Timeout); + Count++; + }; Cleanup(); - /* Calculate avarage round trip time */ - if ((SentCount - LostCount) > 0) { + /* Calculate avarage round trip time */ + if ((SentCount - LostCount) > 0) AvgRTT.QuadPart = SumRTT.QuadPart / (SentCount - LostCount); - } else { + else AvgRTT.QuadPart = 0; - } /* Calculate loss percent */ Count = SentCount ? (LostCount * 100) / SentCount : 0; @@ -623,7 +648,7 @@ printf(" Minimum = %s, Maximum = %s, Average = %s\n", MinTime, MaxTime, AvgTime); } - return 0; + return 0; } /* EOF */

1 0

[gedmurphy] 29119: forgot to remove the lib I linked for testing
by gedmurphy＠svn.reactos.org 20 Sep '07

20 Sep '07

Author: gedmurphy Date: Thu Sep 20 17:32:58 2007 New Revision: 29119 URL: http://svn.reactos.org/svn/reactos?rev=29119&view=rev Log: forgot to remove the lib I linked for testing Modified: trunk/reactos/base/services/audiosrv/audiosrv.rbuild Modified: trunk/reactos/base/services/audiosrv/audiosrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/aud… ============================================================================== --- trunk/reactos/base/services/audiosrv/audiosrv.rbuild (original) +++ trunk/reactos/base/services/audiosrv/audiosrv.rbuild Thu Sep 20 17:32:58 2007 @@ -9,7 +9,6 @@ <library>kernel32</library> <library>advapi32</library> <library>user32</library> - <library>ntdll</library> <library>setupapi</library> <file>main.c</file> <file>pnp_list_manager.c</file>

1 0

[gedmurphy] 29118: add the correct key name to match the service name
by gedmurphy＠svn.reactos.org 20 Sep '07

20 Sep '07

Author: gedmurphy Date: Thu Sep 20 17:27:44 2007 New Revision: 29118 URL: http://svn.reactos.org/svn/reactos?rev=29118&view=rev Log: add the correct key name to match the service name Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Thu Sep 20 17:27:44 2007 @@ -481,13 +481,13 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","Tag",0x00010001,0x00000010 ; Audio Service -HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","DisplayName",0x00000000,"Audio Service" -HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","Description",0x00000000,"Provides audio facilities to applications" -HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","Group",0x00000000,"Audio" -HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","ImagePath",0x00020000,"%SystemRoot%\system32\audiosrv.exe" -HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","Start",0x00010001,0x00000003 -HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","Type",0x00010001,0x00000010 +HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","DisplayName",0x00000000,"Audio Service" +HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","Description",0x00000000,"Provides audio facilities to applications" +HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","Group",0x00000000,"Audio" +HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","ImagePath",0x00020000,"%SystemRoot%\system32\audiosrv.exe" +HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","Type",0x00010001,0x00000010 ; BusLogic 958 miniport driver HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","ErrorControl",0x00010001,0x00000000

1 0

[gedmurphy] 29117: - use correct name when registering. - use unicode apis exclusively when required. - fix rbuild file
by gedmurphy＠svn.reactos.org 20 Sep '07

20 Sep '07

Author: gedmurphy Date: Thu Sep 20 17:26:19 2007 New Revision: 29117 URL: http://svn.reactos.org/svn/reactos?rev=29117&view=rev Log: - use correct name when registering. - use unicode apis exclusively when required. - fix rbuild file Modified: trunk/reactos/base/services/audiosrv/audiosrv.h trunk/reactos/base/services/audiosrv/audiosrv.rbuild trunk/reactos/base/services/audiosrv/main.c trunk/reactos/base/services/audiosrv/pnp.c trunk/reactos/base/services/audiosrv/pnp_list_manager.c Modified: trunk/reactos/base/services/audiosrv/audiosrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/aud… ============================================================================== --- trunk/reactos/base/services/audiosrv/audiosrv.h (original) +++ trunk/reactos/base/services/audiosrv/audiosrv.h Thu Sep 20 17:26:19 2007 @@ -13,19 +13,6 @@ #define AUDIOSRV_PRIVATE_H extern SERVICE_STATUS_HANDLE service_status_handle; - - -/* main.c */ - -VOID CALLBACK -ServiceMain(DWORD argc, char** argv); - -DWORD WINAPI -ServiceControlHandler( - DWORD dwControl, - DWORD dwEventType, - LPVOID lpEventData, - LPVOID lpContext); /* List management (pnp_list_manager.c) */ Modified: trunk/reactos/base/services/audiosrv/audiosrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/aud… ============================================================================== --- trunk/reactos/base/services/audiosrv/audiosrv.rbuild (original) +++ trunk/reactos/base/services/audiosrv/audiosrv.rbuild Thu Sep 20 17:26:19 2007 @@ -1,7 +1,7 @@ -<module name="audiosrv" type="win32cui" installbase="system32" -installname="audiosrv.exe" allowwarnings="true"> +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="audiosrv" type="win32cui" installbase="system32" installname="audiosrv.exe" unicode="yes" allowwarnings="true"> <include base="audiosrv">.</include> - <define name="UNICODE" /> <define name="__USE_W32API" /> <define name="__REACTOS__" /> <define name="_WIN32_WINNT">0x0501</define> @@ -9,6 +9,7 @@ <library>kernel32</library> <library>advapi32</library> <library>user32</library> + <library>ntdll</library> <library>setupapi</library> <file>main.c</file> <file>pnp_list_manager.c</file> Modified: trunk/reactos/base/services/audiosrv/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/mai… ============================================================================== --- trunk/reactos/base/services/audiosrv/main.c (original) +++ trunk/reactos/base/services/audiosrv/main.c Thu Sep 20 17:26:19 2007 @@ -10,15 +10,6 @@ #include <audiosrv/audiosrv.h> #include "audiosrv.h" - - -/* Service table */ - -SERVICE_TABLE_ENTRY service_table[2] = -{ - { L"AudioSrv", (LPSERVICE_MAIN_FUNCTION) ServiceMain }, - { NULL, NULL } -}; SERVICE_STATUS_HANDLE service_status_handle; SERVICE_STATUS service_status; @@ -88,13 +79,13 @@ } VOID CALLBACK -ServiceMain(DWORD argc, char** argv) +ServiceMain(DWORD argc, LPWSTR argv) { logmsg("* Service starting\n"); logmsg("Registering service control handler...\n"); - service_status_handle = RegisterServiceCtrlHandlerEx(SERVICE_NAME, - ServiceControlHandler, - NULL); + service_status_handle = RegisterServiceCtrlHandlerExW(SERVICE_NAME, + ServiceControlHandler, + NULL); logmsg("Service status handle %d\n", service_status_handle); if ( ! service_status_handle ) @@ -165,9 +156,17 @@ SetServiceStatus(service_status_handle, &service_status); } -int main() +int wmain() { + SERVICE_TABLE_ENTRYW service_table[] = + { + { SERVICE_NAME, (LPSERVICE_MAIN_FUNCTIONW) ServiceMain }, + { NULL, NULL } + }; + logmsg("Audio Service main()\n"); - StartServiceCtrlDispatcher(service_table); + if (!StartServiceCtrlDispatcherW(service_table)) + logmsg("StartServiceCtrlDispatcher failed\n"); + return 0; } Modified: trunk/reactos/base/services/audiosrv/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/pnp… ============================================================================== --- trunk/reactos/base/services/audiosrv/pnp.c (original) +++ trunk/reactos/base/services/audiosrv/pnp.c Thu Sep 20 17:26:19 2007 @@ -30,20 +30,20 @@ { SP_DEVICE_INTERFACE_DATA interface_data; SP_DEVINFO_DATA device_data; - PSP_DEVICE_INTERFACE_DETAIL_DATA detail_data; + PSP_DEVICE_INTERFACE_DETAIL_DATA_W detail_data; HDEVINFO dev_info; DWORD length; int index = 0; const GUID category_guid = {STATIC_KSCATEGORY_AUDIO}; - dev_info = SetupDiGetClassDevsEx(&category_guid, - NULL, - NULL, - DIGCF_PRESENT | DIGCF_DEVICEINTERFACE, - NULL, - NULL, - NULL); + dev_info = SetupDiGetClassDevsExW(&category_guid, + NULL, + NULL, + DIGCF_PRESENT | DIGCF_DEVICEINTERFACE, + NULL, + NULL, + NULL); /* printf("%s:\n", ClassString); */ @@ -57,9 +57,9 @@ + (MAX_PATH * sizeof(WCHAR)); detail_data = - (PSP_DEVICE_INTERFACE_DETAIL_DATA)HeapAlloc(GetProcessHeap(), - 0, - length); + (PSP_DEVICE_INTERFACE_DETAIL_DATA_W)HeapAlloc(GetProcessHeap(), + 0, + length); while ( SetupDiEnumDeviceInterfaces(dev_info, @@ -73,15 +73,15 @@ ZeroMemory(detail_data, length); /* NOTE: We don't actually use device_data... */ - detail_data->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA); + detail_data->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W); device_data.cbSize = sizeof(device_data); device_data.Reserved = 0; - SetupDiGetDeviceInterfaceDetail(dev_info, - &interface_data, - detail_data, - length, - NULL, - &device_data); + SetupDiGetDeviceInterfaceDetailW(dev_info, + &interface_data, + detail_data, + length, + NULL, + &device_data); list_node = CreateDeviceDescriptor(detail_data->DevicePath, TRUE); AppendAudioDeviceToList(list_node); @@ -133,9 +133,9 @@ notification_filter.dbcc_classguid = wdmaud_guid; device_notification_handle = - RegisterDeviceNotification((HANDLE) service_status_handle, - &notification_filter, - DEVICE_NOTIFY_SERVICE_HANDLE + RegisterDeviceNotificationW((HANDLE) service_status_handle, + &notification_filter, + DEVICE_NOTIFY_SERVICE_HANDLE /* | DEVICE_NOTIFY_ALL_INTERFACE_CLASSES*/); Modified: trunk/reactos/base/services/audiosrv/pnp_list_manager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/pnp… ============================================================================== --- trunk/reactos/base/services/audiosrv/pnp_list_manager.c (original) +++ trunk/reactos/base/services/audiosrv/pnp_list_manager.c Thu Sep 20 17:26:19 2007 @@ -114,12 +114,12 @@ logmsg("Creating file mapping\n"); /* Expose our device list to the world */ - device_list_file = CreateFileMapping(INVALID_HANDLE_VALUE, - NULL, - PAGE_READWRITE, - 0, - max_size, - AUDIO_LIST_NAME); + device_list_file = CreateFileMappingW(INVALID_HANDLE_VALUE, + NULL, + PAGE_READWRITE, + 0, + max_size, + AUDIO_LIST_NAME); if ( ! device_list_file ) {

1 0

[hpoussin] 29116: Read Characteristics and BusType keys from .inf file, and write them in registry. This will probably help for installation of 3rd party drivers
by hpoussin＠svn.reactos.org 20 Sep '07

20 Sep '07

Author: hpoussin Date: Thu Sep 20 17:26:18 2007 New Revision: 29116 URL: http://svn.reactos.org/svn/reactos?rev=29116&view=rev Log: Read Characteristics and BusType keys from .inf file, and write them in registry. This will probably help for installation of 3rd party drivers Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.c trunk/reactos/media/inf/netamd.inf trunk/reactos/media/inf/netisa.inf trunk/reactos/media/inf/netrtpnt.inf Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfgx.… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/netcfgx.c (original) +++ trunk/reactos/dll/win32/netcfgx/netcfgx.c Thu Sep 20 17:26:18 2007 @@ -175,6 +175,15 @@ IN HDEVINFO DeviceInfoSet, IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) { + SP_DRVINFO_DATA_W DriverInfoData; + SP_DRVINFO_DETAIL_DATA_W DriverInfoDetail; + WCHAR SectionName[LINE_LEN]; + HINF hInf = INVALID_HANDLE_VALUE; + INFCONTEXT InfContext; + UINT ErrorLine; + INT CharacteristicsInt; + DWORD Characteristics; + LPWSTR BusType = NULL; RPC_STATUS RpcStatus; UUID Uuid; LPWSTR InstanceId = NULL; @@ -189,12 +198,42 @@ HKEY hNetworkKey = NULL; HKEY hConnectionKey = NULL; SP_DEVINSTALL_PARAMS_W installParams; - + if (InstallFunction != DIF_INSTALLDEVICE) return ERROR_DI_DO_DEFAULT; DPRINT("%lu %p %p\n", InstallFunction, DeviceInfoSet, DeviceInfoData); + /* Get driver info details */ + DriverInfoData.cbSize = sizeof(SP_DRVINFO_DATA_W); + if (!SetupDiGetSelectedDriverW(DeviceInfoSet, DeviceInfoData, &DriverInfoData)) + { + rc = GetLastError(); + DPRINT("SetupDiGetSelectedDriverW() failed with error 0x%lx\n", rc); + goto cleanup; + } + DriverInfoDetail.cbSize = sizeof(SP_DRVINFO_DETAIL_DATA_W); + if (!SetupDiGetDriverInfoDetailW(DeviceInfoSet, DeviceInfoData, &DriverInfoData, &DriverInfoDetail, sizeof(DriverInfoDetail), NULL) + && GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + rc = GetLastError(); + DPRINT("SetupDiGetDriverInfoDetailW() failed with error 0x%lx\n", rc); + goto cleanup; + } + hInf = SetupOpenInfFileW(DriverInfoDetail.InfFileName, NULL, INF_STYLE_WIN4, &ErrorLine); + if (hInf == INVALID_HANDLE_VALUE) + { + rc = GetLastError(); + DPRINT("SetupOpenInfFileW() failed with error 0x%lx\n", rc); + goto cleanup; + } + if (!SetupDiGetActualSectionToInstallW(hInf, DriverInfoDetail.SectionName, SectionName, LINE_LEN, NULL, NULL)) + { + rc = GetLastError(); + DPRINT("SetupDiGetActualSectionToInstallW() failed with error 0x%lx\n", rc); + goto cleanup; + } + /* Get Instance ID */ if (SetupDiGetDeviceInstanceIdW(DeviceInfoSet, DeviceInfoData, NULL, 0, &dwLength)) { @@ -202,7 +241,7 @@ rc = ERROR_GEN_FAILURE; goto cleanup; } - InstanceId = HeapAlloc(GetProcessHeap(), 0, dwLength); + InstanceId = HeapAlloc(GetProcessHeap(), 0, dwLength * sizeof(WCHAR)); if (!InstanceId) { DPRINT("HeapAlloc() failed\n"); @@ -215,6 +254,46 @@ DPRINT("SetupDiGetDeviceInstanceIdW() failed with error 0x%lx\n", rc); goto cleanup; } + + /* Get Characteristics and BusType (optional) from .inf file */ + if (!SetupFindFirstLineW(hInf, SectionName, L"Characteristics", &InfContext)) + { + rc = GetLastError(); + DPRINT("Unable to find key %S in section %S of file %S (error 0x%lx)\n", + L"Characteristics", SectionName, DriverInfoDetail.InfFileName, rc); + goto cleanup; + } + if (!SetupGetIntField(&InfContext, 1, &CharacteristicsInt)) + { + rc = GetLastError(); + DPRINT("SetupGetIntField() failed with error 0x%lx\n", rc); + goto cleanup; + } + Characteristics = (DWORD)CharacteristicsInt; + if (SetupFindFirstLineW(hInf, SectionName, L"BusType", &InfContext)) + { + if (!SetupGetStringFieldW(&InfContext, 1, NULL, 0, &dwLength)) + { + rc = GetLastError(); + DPRINT("SetupGetStringFieldW() failed with error 0x%lx\n", rc); + goto cleanup; + } + BusType = HeapAlloc(GetProcessHeap(), 0, dwLength * sizeof(WCHAR)); + if (!BusType) + { + DPRINT("HeapAlloc() failed\n"); + rc = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + if (!SetupGetStringFieldW(&InfContext, 1, BusType, dwLength, NULL)) + { + rc = GetLastError(); + DPRINT("SetupGetStringFieldW() failed with error 0x%lx\n", rc); + goto cleanup; + } + } + else + BusType = NULL; /* Create a new UUID */ RpcStatus = UuidCreate(&Uuid); @@ -254,7 +333,7 @@ } wcscpy(DeviceName, L"\\Device\\"); wcscat(DeviceName, UuidString); - + /* Create export name */ ExportName = HeapAlloc(GetProcessHeap(), 0, (wcslen(L"\\Device\\Tcpip_") + wcslen(UuidString)) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); if (!ExportName) @@ -331,6 +410,19 @@ DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); goto cleanup; } + rc = RegSetValueExW(hKey, L"Characteristics", 0, REG_DWORD, (const BYTE*)&Characteristics, sizeof(DWORD)); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + if (BusType) + rc = RegSetValueExW(hKey, L"BusType", 0, REG_SZ, (const BYTE*)BusType, (wcslen(BusType) + 1) * sizeof(WCHAR)); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); + goto cleanup; + } rc = RegCreateKeyExW(hKey, L"Linkage", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &hLinkageKey, NULL); if (rc != ERROR_SUCCESS) { @@ -462,8 +554,11 @@ rc = ERROR_SUCCESS; cleanup: + if (hInf != INVALID_HANDLE_VALUE) + SetupCloseInfFile(hInf); if (UuidRpcString != NULL) RpcStringFreeW(&UuidRpcString); + HeapFree(GetProcessHeap(), 0, BusType); HeapFree(GetProcessHeap(), 0, InstanceId); HeapFree(GetProcessHeap(), 0, UuidString); HeapFree(GetProcessHeap(), 0, DeviceName); Modified: trunk/reactos/media/inf/netamd.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netamd.inf?rev=2… ============================================================================== --- trunk/reactos/media/inf/netamd.inf (original) +++ trunk/reactos/media/inf/netamd.inf Thu Sep 20 17:26:18 2007 @@ -23,14 +23,14 @@ ;----------------------------- PCNET DRIVER ----------------------------- [PCNet_Inst.NT] +Characteristics = 0x4 ; NCF_PHYSICAL +BusType = 5 ; PCIBus AddReg = PCNet_AddReg.NT CopyFiles = PCNet_CopyFiles.NT [PCNet_AddReg.NT] -HKR,,Characteristics,0x00010001,0x00000004 ; NCF_PHYSICAL HKR,,BUS_TO_SCAN,,"ALL" HKR,,BUSTIMER,,"0" -HKR,,BUSTYPE,,"5" HKR,,EXTPHY,,"0" HKR,,FDUP,,"0" HKR,,LED0,,"10000" Modified: trunk/reactos/media/inf/netisa.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netisa.inf?rev=2… ============================================================================== --- trunk/reactos/media/inf/netisa.inf (original) +++ trunk/reactos/media/inf/netisa.inf Thu Sep 20 17:26:18 2007 @@ -23,11 +23,12 @@ ;---------------------------- NE2000 DRIVER ----------------------------- [NE2000_Inst.NT] +Characteristics = 0x4 ; NCF_PHYSICAL +BusType = 14 ; PNPIsaBus AddReg = NE2000_AddReg.NT CopyFiles = NE2000_CopyFiles.NT [NE2000_AddReg.NT] -HKR,,Characteristics,0x00010001,0x00000004 ; NCF_PHYSICAL HKR,,Port,0x00000000,"c100" HKR,,Irq,0x00000000,"B" HKR,,NetworkAddress,0x00000000,"001122334455" Modified: trunk/reactos/media/inf/netrtpnt.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netrtpnt.inf?rev… ============================================================================== --- trunk/reactos/media/inf/netrtpnt.inf (original) +++ trunk/reactos/media/inf/netrtpnt.inf Thu Sep 20 17:26:18 2007 @@ -23,12 +23,12 @@ ;---------------------------- NE2000 DRIVER ----------------------------- [NE2000_Inst.NT] +Characteristics = 0x4 ; NCF_PHYSICAL +BusType = 5 ; PCIBus AddReg = NE2000_AddReg.NT CopyFiles = NE2000_CopyFiles.NT [NE2000_AddReg.NT] -HKR,,Characteristics,0x00010001,0x00000004 ; NCF_PHYSICAL -HKR,,BusType,0x00000000,"5" HKR,,Port,0x00000000,"c100" HKR,,Irq,0x00000000,"B" HKR,,NetworkAddress,0x00000000,"001122334455"

1 0

[fireball] 29115: Timo Kreuzer: - The debug object created by NtCreateDebugObject() is restricted to DEBUG_OBJECT_WAIT_STATE_CHANGE, change to DEBUG_OBJECT_ALL_ACCESS. See issue #2310 for more details.
by fireball＠svn.reactos.org 20 Sep '07

20 Sep '07

Author: fireball Date: Thu Sep 20 16:46:58 2007 New Revision: 29115 URL: http://svn.reactos.org/svn/reactos?rev=29115&view=rev Log: Timo Kreuzer: - The debug object created by NtCreateDebugObject() is restricted to DEBUG_OBJECT_WAIT_STATE_CHANGE, change to DEBUG_OBJECT_ALL_ACCESS. See issue #2310 for more details. Modified: trunk/reactos/ntoskrnl/dbgk/dbgkobj.c Modified: trunk/reactos/ntoskrnl/dbgk/dbgkobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkobj.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/dbgkobj.c (original) +++ trunk/reactos/ntoskrnl/dbgk/dbgkobj.c Thu Sep 20 16:46:58 2007 @@ -1400,7 +1400,7 @@ ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(DEBUG_OBJECT); ObjectTypeInitializer.GenericMapping = DbgkDebugObjectMapping; ObjectTypeInitializer.PoolType = NonPagedPool; - ObjectTypeInitializer.ValidAccessMask = DEBUG_OBJECT_WAIT_STATE_CHANGE; + ObjectTypeInitializer.ValidAccessMask = DEBUG_OBJECT_ALL_ACCESS; ObjectTypeInitializer.UseDefaultObject = TRUE; ObjectTypeInitializer.CloseProcedure = DbgkpCloseObject; ObjectTypeInitializer.DeleteProcedure = DbgkpDeleteObject;

1 0

[fireball] 29114: - Implement a fast->slow leaf conversion (this assert was hit by OO.o setup)
by fireball＠svn.reactos.org 20 Sep '07

20 Sep '07

Author: fireball Date: Thu Sep 20 14:36:36 2007 New Revision: 29114 URL: http://svn.reactos.org/svn/reactos?rev=29114&view=rev Log: - Implement a fast->slow leaf conversion (this assert was hit by OO.o setup) Modified: trunk/reactos/ntoskrnl/config/cmindex.c Modified: trunk/reactos/ntoskrnl/config/cmindex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmindex.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmindex.c (original) +++ trunk/reactos/ntoskrnl/config/cmindex.c Thu Sep 20 14:36:36 2007 @@ -1125,10 +1125,11 @@ { PCM_KEY_NODE KeyNode; PCM_KEY_INDEX Index; + PCM_KEY_FAST_INDEX OldIndex; UNICODE_STRING Name; HCELL_INDEX IndexCell = HCELL_NIL, CellToRelease = HCELL_NIL, LeafCell; PHCELL_INDEX RootPointer = NULL; - ULONG Type; + ULONG Type, i; BOOLEAN IsCompressed; PAGED_CODE(); @@ -1245,9 +1246,21 @@ if ((Index->Signature == CM_KEY_FAST_LEAF) && (Index->Count >= CmpMaxFastIndexPerHblock)) { - /* Not handled yet */ - DPRINT1("Fast->Slow Leaf Conversion not yet implemented!\n"); - ASSERT(FALSE); + DPRINT("Doing Fast->Slow Leaf conversion\n"); + + /* Mark this cell as dirty */ + HvMarkCellDirty(Hive, CellToRelease); + + /* Convert */ + OldIndex = (PCM_KEY_FAST_INDEX)Index; + + for (i=0; i < OldIndex->Count; i++) + { + Index->List[i] = OldIndex->List[i].Cell; + } + + /* Set the new type value */ + Index->Signature = CM_KEY_INDEX_LEAF; } else if (((Index->Signature == CM_KEY_INDEX_LEAF) || (Index->Signature == CM_KEY_HASH_LEAF)) &&

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