Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 15459: Remove some debug messages at boot (DPRINT1 changed to DPRINT)
by hpoussin＠svn.reactos.com 21 May '05

21 May '05

Remove some debug messages at boot (DPRINT1 changed to DPRINT) SVN maintenance in ntoskrnl/ex/: set svn:eol-style and svn:keywords properties Modified: trunk/reactos/ntoskrnl/cm/registry.c Modified: trunk/reactos/ntoskrnl/ex/event.c Modified: trunk/reactos/ntoskrnl/ex/evtpair.c Modified: trunk/reactos/ntoskrnl/ex/mutant.c Modified: trunk/reactos/ntoskrnl/ex/profile.c Modified: trunk/reactos/ntoskrnl/ex/sem.c Modified: trunk/reactos/ntoskrnl/ex/timer.c Modified: trunk/reactos/ntoskrnl/ex/win32k.c Modified: trunk/reactos/ntoskrnl/io/driver.c Modified: trunk/reactos/ntoskrnl/io/iocomp.c Modified: trunk/reactos/ntoskrnl/io/iomgr.c Modified: trunk/reactos/ntoskrnl/lpc/port.c Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/ob/symlink.c Modified: trunk/reactos/ntoskrnl/ps/job.c Modified: trunk/reactos/ntoskrnl/ps/psmgr.c Modified: trunk/reactos/ntoskrnl/se/token.c _____ Modified: trunk/reactos/ntoskrnl/cm/registry.c --- trunk/reactos/ntoskrnl/cm/registry.c 2005-05-21 15:49:48 UTC (rev 15458) +++ trunk/reactos/ntoskrnl/cm/registry.c 2005-05-21 16:33:23 UTC (rev 15459) @@ -350,7 +350,7 @@ OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; - DPRINT1("Creating Registry Object Type\n"); + DPRINT("Creating Registry Object Type\n"); /* Initialize the Key object type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); Property changes on: trunk/reactos/ntoskrnl/ex/dbgctrl.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/ntoskrnl/ex/event.c --- trunk/reactos/ntoskrnl/ex/event.c 2005-05-21 15:49:48 UTC (rev 15458) +++ trunk/reactos/ntoskrnl/ex/event.c 2005-05-21 16:33:23 UTC (rev 15459) @@ -39,7 +39,7 @@ OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; - DPRINT1("Creating Event Object Type\n"); + DPRINT("Creating Event Object Type\n"); /* Create the Event Object Type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); Property changes on: trunk/reactos/ntoskrnl/ex/event.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/ntoskrnl/ex/evtpair.c --- trunk/reactos/ntoskrnl/ex/evtpair.c 2005-05-21 15:49:48 UTC (rev 15458) +++ trunk/reactos/ntoskrnl/ex/evtpair.c 2005-05-21 16:33:23 UTC (rev 15459) @@ -36,7 +36,7 @@ OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; - DPRINT1("Creating Event Pair Object Type\n"); + DPRINT("Creating Event Pair Object Type\n"); /* Create the Event Pair Object Type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); Property changes on: trunk/reactos/ntoskrnl/ex/evtpair.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/ntoskrnl/ex/mutant.c --- trunk/reactos/ntoskrnl/ex/mutant.c 2005-05-21 15:49:48 UTC (rev 15458) +++ trunk/reactos/ntoskrnl/ex/mutant.c 2005-05-21 16:33:23 UTC (rev 15459) @@ -52,7 +52,7 @@ OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; - DPRINT1("Creating Mutant Object Type\n"); + DPRINT("Creating Mutant Object Type\n"); /* Create the Event Pair Object Type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); Property changes on: trunk/reactos/ntoskrnl/ex/mutant.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/ntoskrnl/ex/profile.c --- trunk/reactos/ntoskrnl/ex/profile.c 2005-05-21 15:49:48 UTC (rev 15458) +++ trunk/reactos/ntoskrnl/ex/profile.c 2005-05-21 16:33:23 UTC (rev 15459) @@ -9,6 +9,7 @@ /* INCLUDES *****************************************************************/ +#define NDEBUG #include <ntoskrnl.h> #include <internal/debug.h> @@ -81,7 +82,7 @@ /* Initialize the Mutex to lock the States */ KeInitializeMutex(&ExpProfileMutex, 0x40); - DPRINT1("Creating Profile Object Type\n"); + DPRINT("Creating Profile Object Type\n"); /* Create the Event Pair Object Type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); Property changes on: trunk/reactos/ntoskrnl/ex/profile.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/ntoskrnl/ex/sem.c --- trunk/reactos/ntoskrnl/ex/sem.c 2005-05-21 15:49:48 UTC (rev 15458) +++ trunk/reactos/ntoskrnl/ex/sem.c 2005-05-21 16:33:23 UTC (rev 15459) @@ -37,7 +37,7 @@ OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; - DPRINT1("Creating Semaphore Object Type\n"); + DPRINT("Creating Semaphore Object Type\n"); /* Create the Event Pair Object Type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); Property changes on: trunk/reactos/ntoskrnl/ex/sem.c ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + author date id revision _____ Modified: trunk/reactos/ntoskrnl/ex/timer.c --- trunk/reactos/ntoskrnl/ex/timer.c 2005-05-21 15:49:48 UTC (rev 15458) +++ trunk/reactos/ntoskrnl/ex/timer.c 2005-05-21 16:33:23 UTC (rev 15459) @@ -226,7 +226,7 @@ OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; - DPRINT1("Creating Timer Object Type\n"); + DPRINT("Creating Timer Object Type\n"); /* Create the Event Pair Object Type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); Property changes on: trunk/reactos/ntoskrnl/ex/timer.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/ntoskrnl/ex/win32k.c --- trunk/reactos/ntoskrnl/ex/win32k.c 2005-05-21 15:49:48 UTC (rev 15458) +++ trunk/reactos/ntoskrnl/ex/win32k.c 2005-05-21 16:33:23 UTC (rev 15459) @@ -129,7 +129,7 @@ OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; - DPRINT1("Creating window station Object Type\n"); + DPRINT("Creating window station Object Type\n"); /* Create the window station Object Type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); _____ Modified: trunk/reactos/ntoskrnl/io/driver.c --- trunk/reactos/ntoskrnl/io/driver.c 2005-05-21 15:49:48 UTC (rev 15458) +++ trunk/reactos/ntoskrnl/io/driver.c 2005-05-21 16:33:23 UTC (rev 15459) @@ -90,7 +90,7 @@ OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; - DPRINT1("Creating Registry Object Type\n"); + DPRINT("Creating Registry Object Type\n"); /* Initialize the Driver object type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); _____ Modified: trunk/reactos/ntoskrnl/io/iocomp.c --- trunk/reactos/ntoskrnl/io/iocomp.c 2005-05-21 15:49:48 UTC (rev 15458) +++ trunk/reactos/ntoskrnl/io/iocomp.c 2005-05-21 16:33:23 UTC (rev 15459) @@ -204,7 +204,7 @@ OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; - DPRINT1("Creating IoCompletion Object Type\n"); + DPRINT("Creating IoCompletion Object Type\n"); /* Initialize the Driver object type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); _____ Modified: trunk/reactos/ntoskrnl/io/iomgr.c --- trunk/reactos/ntoskrnl/io/iomgr.c 2005-05-21 15:49:48 UTC (rev 15458) +++ trunk/reactos/ntoskrnl/io/iomgr.c 2005-05-21 16:33:23 UTC (rev 15459) @@ -186,7 +186,7 @@ IopInitDriverImplementation(); - DPRINT1("Creating Device Object Type\n"); + DPRINT("Creating Device Object Type\n"); /* Initialize the Driver object type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); _____ Modified: trunk/reactos/ntoskrnl/lpc/port.c --- trunk/reactos/ntoskrnl/lpc/port.c 2005-05-21 15:49:48 UTC (rev 15458) +++ trunk/reactos/ntoskrnl/lpc/port.c 2005-05-21 16:33:23 UTC (rev 15459) @@ -38,7 +38,7 @@ OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; - DPRINT1("Creating Port Object Type\n"); + DPRINT("Creating Port Object Type\n"); /* Create the Port Object Type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); _____ Modified: trunk/reactos/ntoskrnl/mm/section.c --- trunk/reactos/ntoskrnl/mm/section.c 2005-05-21 15:49:48 UTC (rev 15458) +++ trunk/reactos/ntoskrnl/mm/section.c 2005-05-21 16:33:23 UTC (rev 15459) @@ -2117,7 +2117,7 @@ OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; - DPRINT1("Creating Section Object Type\n"); + DPRINT("Creating Section Object Type\n"); /* Initialize the Section object type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); _____ Modified: trunk/reactos/ntoskrnl/ob/symlink.c --- trunk/reactos/ntoskrnl/ob/symlink.c 2005-05-21 15:49:48 UTC (rev 15458) +++ trunk/reactos/ntoskrnl/ob/symlink.c 2005-05-21 16:33:23 UTC (rev 15459) @@ -136,7 +136,7 @@ UNICODE_STRING Name; OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; - DPRINT1("Creating SymLink Object Type\n"); + DPRINT("Creating SymLink Object Type\n"); /* Initialize the Directory type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); _____ Modified: trunk/reactos/ntoskrnl/ps/job.c --- trunk/reactos/ntoskrnl/ps/job.c 2005-05-21 15:49:48 UTC (rev 15458) +++ trunk/reactos/ntoskrnl/ps/job.c 2005-05-21 16:33:23 UTC (rev 15459) @@ -12,6 +12,7 @@ /* Note: Jobs are only supported on Win2K+ */ /* INCLUDES *****************************************************************/ +#define NDEBUG #include <ntoskrnl.h> #include <internal/debug.h> @@ -61,7 +62,7 @@ UNICODE_STRING Name; OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; - DPRINT1("Creating Job Object Type\n"); + DPRINT("Creating Job Object Type\n"); /* Initialize the Job type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); _____ Modified: trunk/reactos/ntoskrnl/ps/psmgr.c --- trunk/reactos/ntoskrnl/ps/psmgr.c 2005-05-21 15:49:48 UTC (rev 15458) +++ trunk/reactos/ntoskrnl/ps/psmgr.c 2005-05-21 16:33:23 UTC (rev 15459) @@ -81,7 +81,7 @@ InitializeListHead(&PriorityListHead[i]); } - DPRINT1("Creating Thread Object Type\n"); + DPRINT("Creating Thread Object Type\n"); /* Initialize the Thread type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); @@ -124,7 +124,7 @@ * Register the process object type */ - DPRINT1("Creating Process Object Type\n"); + DPRINT("Creating Process Object Type\n"); /* Initialize the Thread type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); _____ Modified: trunk/reactos/ntoskrnl/se/token.c --- trunk/reactos/ntoskrnl/se/token.c 2005-05-21 15:49:48 UTC (rev 15458) +++ trunk/reactos/ntoskrnl/se/token.c 2005-05-21 16:33:23 UTC (rev 15459) @@ -565,7 +565,7 @@ ExInitializeResource(&SepTokenLock); - DPRINT1("Creating Token Object Type\n"); + DPRINT("Creating Token Object Type\n"); /* Initialize the Token type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer));

1 0

[hpoussin] 15458: Open file with FILE_SHARE_READ in LdrLoadModule
by hpoussin＠svn.reactos.com 21 May '05

21 May '05

Open file with FILE_SHARE_READ in LdrLoadModule Modified: trunk/reactos/ntoskrnl/ldr/loader.c _____ Modified: trunk/reactos/ntoskrnl/ldr/loader.c --- trunk/reactos/ntoskrnl/ldr/loader.c 2005-05-21 13:39:09 UTC (rev 15457) +++ trunk/reactos/ntoskrnl/ldr/loader.c 2005-05-21 15:49:48 UTC (rev 15458) @@ -309,7 +309,7 @@ GENERIC_READ, &ObjectAttributes, &IoStatusBlock, - 0, + FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT); CHECKPOINT; if (!NT_SUCCESS(Status))

1 0

[hbirr] 15457: Don't interpret STATUS_PIPE_CONNECTED as error.
by hbirr＠svn.reactos.com 21 May '05

21 May '05

Don't interpret STATUS_PIPE_CONNECTED as error. Modified: trunk/reactos/lib/kernel32/file/npipe.c _____ Modified: trunk/reactos/lib/kernel32/file/npipe.c --- trunk/reactos/lib/kernel32/file/npipe.c 2005-05-21 12:57:34 UTC (rev 15456) +++ trunk/reactos/lib/kernel32/file/npipe.c 2005-05-21 13:39:09 UTC (rev 15457) @@ -324,7 +324,8 @@ 0); /* return FALSE in case of failure and pending operations! */ - if (!NT_SUCCESS(Status) || Status == STATUS_PENDING) + if ((!NT_SUCCESS(Status) && Status != STATUS_PIPE_CONNECTED) || + Status == STATUS_PENDING) { SetLastErrorByStatus(Status); return FALSE; @@ -357,7 +358,7 @@ } } - if (!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status) && Status != STATUS_PIPE_CONNECTED) { SetLastErrorByStatus(Status); return FALSE;

1 0

[weiden] 15456: minor optimization
by weiden＠svn.reactos.com 21 May '05

21 May '05

minor optimization Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c Modified: trunk/reactos/ntoskrnl/ke/i386/irqhand.s _____ Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c --- trunk/reactos/ntoskrnl/ke/i386/irq.c 2005-05-21 12:23:07 UTC (rev 15455) +++ trunk/reactos/ntoskrnl/ke/i386/irq.c 2005-05-21 12:57:34 UTC (rev 15456) @@ -53,9 +53,7 @@ "pushl %esp\n\t" \ "pushl %ebx\n\t" \ "call _KiInterruptDispatch\n\t" \ - "popl %eax\n\t" \ - "popl %eax\n\t" \ - "popl %eax\n\t" \ + "addl $0xC, %esp\n\t" \ "popl %gs\n\t" \ "popl %fs\n\t" \ "popl %es\n\t" \ _____ Modified: trunk/reactos/ntoskrnl/ke/i386/irqhand.s --- trunk/reactos/ntoskrnl/ke/i386/irqhand.s 2005-05-21 12:23:07 UTC (rev 15455) +++ trunk/reactos/ntoskrnl/ke/i386/irqhand.s 2005-05-21 12:57:34 UTC (rev 15456) @@ -21,9 +21,7 @@ pushl %esp pushl $(IRQ_BASE + 0) call _KiInterruptDispatch - popl %eax - popl %eax - popl %eax + addl $0xC, %esp popl %gs popl %fs popl %es @@ -50,9 +48,7 @@ pushl %esp pushl $(IRQ_BASE + 1) call _KiInterruptDispatch - popl %eax - popl %eax - popl %eax + addl $0xC, %esp popl %gs popl %fs popl %es @@ -79,9 +75,7 @@ pushl %esp pushl $(IRQ_BASE + 2) call _KiInterruptDispatch - popl %eax - popl %eax - popl %eax + addl $0xC, %esp popl %gs popl %fs popl %es @@ -108,9 +102,7 @@ pushl %esp pushl $(IRQ_BASE + 3) call _KiInterruptDispatch - popl %eax - popl %eax - popl %eax + addl $0xC, %esp popl %gs popl %fs popl %es @@ -137,9 +129,7 @@ pushl %esp pushl $(IRQ_BASE + 4) call _KiInterruptDispatch - popl %eax - popl %eax - popl %eax + addl $0xC, %esp popl %gs popl %fs popl %es @@ -166,9 +156,7 @@ pushl %esp pushl $(IRQ_BASE + 5) call _KiInterruptDispatch - popl %eax - popl %eax - popl %eax + addl $0xC, %esp popl %gs popl %fs popl %es @@ -195,9 +183,7 @@ pushl %esp pushl $(IRQ_BASE + 6) call _KiInterruptDispatch - popl %eax - popl %eax - popl %eax + addl $0xC, %esp popl %gs popl %fs popl %es @@ -224,9 +210,7 @@ pushl %esp pushl $(IRQ_BASE + 7) call _KiInterruptDispatch - popl %eax - popl %eax - popl %eax + addl $0xC, %esp popl %gs popl %fs popl %es @@ -253,9 +237,7 @@ pushl %esp pushl $(IRQ_BASE + 8) call _KiInterruptDispatch - popl %eax - popl %eax - popl %eax + addl $0xC, %esp popl %gs popl %fs popl %es @@ -282,9 +264,7 @@ pushl %esp pushl $(IRQ_BASE + 9) call _KiInterruptDispatch - popl %eax - popl %eax - popl %eax + addl $0xC, %esp popl %gs popl %fs popl %es @@ -311,9 +291,7 @@ pushl %esp pushl $(IRQ_BASE + 10) call _KiInterruptDispatch - popl %eax - popl %eax - popl %eax + addl $0xC, %esp popl %gs popl %fs popl %es @@ -340,9 +318,7 @@ pushl %esp pushl $(IRQ_BASE + 11) call _KiInterruptDispatch - popl %eax - popl %eax - popl %eax + addl $0xC, %esp popl %gs popl %fs popl %es @@ -369,9 +345,7 @@ pushl %esp pushl $(IRQ_BASE + 12) call _KiInterruptDispatch - popl %eax - popl %eax - popl %eax + addl $0xC, %esp popl %gs popl %fs popl %es @@ -398,9 +372,7 @@ pushl %esp pushl $(IRQ_BASE + 13) call _KiInterruptDispatch - popl %eax - popl %eax - popl %eax + addl $0xC, %esp popl %gs popl %fs popl %es @@ -427,9 +399,7 @@ pushl %esp pushl $(IRQ_BASE + 14) call _KiInterruptDispatch - popl %eax - popl %eax - popl %eax + addl $0xC, %esp popl %gs popl %fs popl %es @@ -456,9 +426,7 @@ pushl %esp pushl $(IRQ_BASE + 15) call _KiInterruptDispatch - popl %eax - popl %eax - popl %eax + addl $0xC, %esp popl %gs popl %fs popl %es

1 0

[ekohl] 15455: Implement ConcatenatePaths and MyGetFileTitle.
by ekohl＠svn.reactos.com 21 May '05

21 May '05

Implement ConcatenatePaths and MyGetFileTitle. Modified: trunk/reactos/include/wine/setupapi.h Modified: trunk/reactos/lib/setupapi/misc.c Modified: trunk/reactos/lib/setupapi/setupapi.spec _____ Modified: trunk/reactos/include/wine/setupapi.h --- trunk/reactos/include/wine/setupapi.h 2005-05-21 12:21:30 UTC (rev 15454) +++ trunk/reactos/include/wine/setupapi.h 2005-05-21 12:23:07 UTC (rev 15455) @@ -669,6 +669,7 @@ VOID WINAPI AssertFail(LPSTR, UINT, LPSTR); DWORD WINAPI CaptureAndConvertAnsiArg(PCSTR lpSrc, PWSTR *lpDst); DWORD WINAPI CaptureStringArg(PCWSTR lpSrc, PWSTR *lpDst); +BOOL WINAPI ConcatenatePaths(LPWSTR, LPCWSTR, DWORD, LPDWORD); BOOL WINAPI DelayedMove(PCWSTR lpExistingFileName, PCWSTR lpNewFileName); BOOL WINAPI DoesUserHavePrivilege(PCWSTR lpPrivilegeName); PWSTR WINAPI DuplicateString(PCWSTR lpSrc); @@ -681,6 +682,7 @@ BOOL WINAPI IsUserAdmin(VOID); PWSTR WINAPI MultiByteToUnicode(PCSTR lpMultiByteStr, UINT uCodePage); VOID WINAPI MyFree(PVOID lpMem); +PWSTR WINAPI MyGetFileTitle(PCWSTR); PVOID WINAPI MyMalloc(DWORD dwSize); PVOID WINAPI MyRealloc(PVOID lpSrc, DWORD dwSize); DWORD WINAPI OpenAndMapForRead(PCWSTR, PDWORD, PHANDLE, PHANDLE, PVOID *); _____ Modified: trunk/reactos/lib/setupapi/misc.c --- trunk/reactos/lib/setupapi/misc.c 2005-05-21 12:21:30 UTC (rev 15454) +++ trunk/reactos/lib/setupapi/misc.c 2005-05-21 12:23:07 UTC (rev 15455) @@ -934,3 +934,113 @@ return dwError; } + + +/********************************************************************** **** + * MyGetFileTitle [SETUPAPI.@] + * + * Returns a pointer to the last part of a fully qualified file name. + * + * PARAMS + * lpFileName [I] File name + * + * RETURNS + * Pointer to a files name. + */ +LPWSTR WINAPI +MyGetFileTitle(LPCWSTR lpFileName) +{ + LPWSTR ptr; + LPWSTR ret; + WCHAR c; + + TRACE("%s\n", debugstr_w(lpFileName)); + + ptr = (LPWSTR)lpFileName; + ret = ptr; + while (TRUE) + { + c = *ptr; + + if (c == 0) + break; + + ptr++; + if (c == (WCHAR)'\\' || c == (WCHAR)'/' || c == (WCHAR)':') + ret = ptr; + } + + return ret; +} + + +/********************************************************************** **** + * ConcatenatePaths [SETUPAPI.@] + * + * Concatenates two paths. + * + * PARAMS + * lpPath [I/O] Path to append path to + * lpAppend [I] Path to append + * dwBufferSize [I] Size of the path buffer + * lpRequiredSize [O] Required size for the concatenated path. Optional + * + * RETURNS + * Success: TRUE + * Failure: FALSE + */ +BOOL WINAPI +ConcatenatePaths(LPWSTR lpPath, + LPCWSTR lpAppend, + DWORD dwBufferSize, + LPDWORD lpRequiredSize) +{ + DWORD dwPathSize; + DWORD dwAppendSize; + DWORD dwTotalSize; + BOOL bBackslash = FALSE; + + TRACE("%s %s %lu %p\n", debugstr_w(lpPath), debugstr_w(lpAppend), + dwBufferSize, lpRequiredSize); + + dwPathSize = lstrlenW(lpPath); + + /* Ignore trailing backslash */ + if (lpPath[dwPathSize - 1] == (WCHAR)'\\') + dwPathSize--; + + dwAppendSize = lstrlenW(lpAppend); + + /* Does the source string have a leading backslash? */ + if (lpAppend[0] == (WCHAR)'\\') + { + bBackslash = TRUE; + dwAppendSize--; + } + + dwTotalSize = dwPathSize + dwAppendSize + 2; + if (lpRequiredSize != NULL) + *lpRequiredSize = dwTotalSize; + + /* Append a backslash to the destination string */ + if (bBackslash == FALSE) + { + if (dwPathSize < dwBufferSize) + { + lpPath[dwPathSize - 1] = (WCHAR)'\\'; + dwPathSize++; + } + } + + if (dwPathSize + dwAppendSize < dwBufferSize) + { + lstrcpynW(&lpPath[dwPathSize], + lpAppend, + dwAppendSize); + } + + if (dwBufferSize >= dwTotalSize) + lpPath[dwTotalSize - 1] = 0; + + return (dwBufferSize >= dwTotalSize); +} _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-05-21 12:21:30 UTC (rev 15454) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-05-21 12:23:07 UTC (rev 15455) @@ -193,7 +193,7 @@ @ stdcall CaptureAndConvertAnsiArg(str ptr) @ stdcall CaptureStringArg(wstr ptr) @ stub CenterWindowRelativeToParent -@ stub ConcatenatePaths +@ stdcall ConcatenatePaths(wstr wstr long ptr) @ stdcall DelayedMove(wstr wstr) @ stub DelimStringToMultiSz @ stub DestroyTextFileReadBuffer @@ -220,7 +220,7 @@ @ stdcall MultiByteToUnicode(str long) @ stub MultiSzFromSearchControl @ stdcall MyFree(ptr) -@ stub MyGetFileTitle +@ stdcall MyGetFileTitle(wstr) @ stdcall MyMalloc(long) @ stdcall MyRealloc(ptr long) @ stdcall OpenAndMapFileForRead(wstr ptr ptr ptr ptr) @@ -424,8 +424,8 @@ @ stub SetupGetTargetPathW @ stdcall SetupInitDefaultQueueCallback(long) @ stdcall SetupInitDefaultQueueCallbackEx(long long long long ptr) -@ stdcall SetupInitializeFileLogA (str long) -@ stdcall SetupInitializeFileLogW (wstr long) +@ stdcall SetupInitializeFileLogA(str long) +@ stdcall SetupInitializeFileLogW(wstr long) @ stub SetupInstallFileA @ stub SetupInstallFileExA @ stub SetupInstallFileExW

1 0

[hbirr] 15454: Terminate the process on exit in NtProcessStartup.
by hbirr＠svn.reactos.com 21 May '05

21 May '05

Terminate the process on exit in NtProcessStartup. Modified: trunk/reactos/subsys/system/usetup/usetup.c _____ Modified: trunk/reactos/subsys/system/usetup/usetup.c --- trunk/reactos/subsys/system/usetup/usetup.c 2005-05-21 12:19:26 UTC (rev 15453) +++ trunk/reactos/subsys/system/usetup/usetup.c 2005-05-21 12:21:30 UTC (rev 15454) @@ -3945,6 +3945,7 @@ /* Reboot */ FreeConsole(); NtShutdownSystem(ShutdownReboot); + NtTerminateProcess(NtCurrentProcess(), 0); } /* EOF */

1 0

[hbirr] 15453: Free all allocated memory in ObpDeleteObject.
by hbirr＠svn.reactos.com 21 May '05

21 May '05

Free all allocated memory in ObpDeleteObject. Modified: trunk/reactos/ntoskrnl/ob/object.c _____ Modified: trunk/reactos/ntoskrnl/ob/object.c --- trunk/reactos/ntoskrnl/ob/object.c 2005-05-21 12:11:54 UTC (rev 15452) +++ trunk/reactos/ntoskrnl/ob/object.c 2005-05-21 12:19:26 UTC (rev 15453) @@ -801,21 +801,30 @@ KEBUGCHECK(0); } + if (Header->ObjectType != NULL && + Header->ObjectType->TypeInfo.DeleteProcedure != NULL) + { + Header->ObjectType->TypeInfo.DeleteProcedure(HEADER_TO_BODY(Header)); + } + if (Header->SecurityDescriptor != NULL) { ObpRemoveSecurityDescriptor(Header->SecurityDescriptor); } - if (Header->NameInfo && Header->NameInfo->Name.Buffer) - { - ExFreePool(Header->NameInfo->Name.Buffer); - } - - if (Header->ObjectType != NULL && - Header->ObjectType->TypeInfo.DeleteProcedure != NULL) + if (Header->NameInfo) { - Header->ObjectType->TypeInfo.DeleteProcedure(HEADER_TO_BODY(Header)); + if(Header->NameInfo->Name.Buffer) + { + ExFreePool(Header->NameInfo->Name.Buffer); + } + ExFreePool(Header->NameInfo); } + if (Header->ObjectCreateInfo) + { + ObpReleaseCapturedAttributes(Header->ObjectCreateInfo); + ExFreePool(Header->ObjectCreateInfo); + } DPRINT("ObPerformRetentionChecks() = Freeing object\n"); ExFreePool(Header);

1 0

[hbirr] 15452: Free the capture buffer in ObReferenceObjectByName.
by hbirr＠svn.reactos.com 21 May '05

21 May '05

Free the capture buffer in ObReferenceObjectByName. Modified: trunk/reactos/ntoskrnl/ob/namespc.c _____ Modified: trunk/reactos/ntoskrnl/ob/namespc.c --- trunk/reactos/ntoskrnl/ob/namespc.c 2005-05-21 12:08:46 UTC (rev 15451) +++ trunk/reactos/ntoskrnl/ob/namespc.c 2005-05-21 12:11:54 UTC (rev 15452) @@ -76,13 +76,13 @@ NULL, NULL); - /* Capture all the info */ - DPRINT("Capturing Create Info\n"); - Status = ObpCaptureObjectAttributes(&ObjectAttributes, - AccessMode, - ObjectType, - &ObjectCreateInfo, - &ObjectName); + /* Capture all the info */ + DPRINT("Capturing Create Info\n"); + Status = ObpCaptureObjectAttributes(&ObjectAttributes, + AccessMode, + ObjectType, + &ObjectCreateInfo, + &ObjectName); if (!NT_SUCCESS(Status)) { DPRINT("ObpCaptureObjectAttributes() failed (Status %lx)\n", Status); @@ -90,22 +90,23 @@ } Status = ObFindObject(&ObjectCreateInfo, - &ObjectName, + &ObjectName, &Object, &RemainingPath, ObjectType); + ObpReleaseCapturedAttributes(&ObjectCreateInfo); + if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); + if (!NT_SUCCESS(Status)) { return(Status); } -CHECKPOINT; -DPRINT("RemainingPath.Buffer '%S' Object %p\n", RemainingPath.Buffer, Object); + DPRINT("RemainingPath.Buffer '%S' Object %p\n", RemainingPath.Buffer, Object); if (RemainingPath.Buffer != NULL || Object == NULL) { -CHECKPOINT; -DPRINT("Object %p\n", Object); + DPRINT("Object %p\n", Object); *ObjectPtr = NULL; RtlFreeUnicodeString (&RemainingPath); return(STATUS_OBJECT_NAME_NOT_FOUND); @@ -177,22 +178,22 @@ } Status = ObFindObject(&ObjectCreateInfo, - &ObjectName, + &ObjectName, &Object, &RemainingPath, ObjectType); + ObpReleaseCapturedAttributes(&ObjectCreateInfo); + if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); if (!NT_SUCCESS(Status)) { DPRINT("ObFindObject() failed (Status %lx)\n", Status); return Status; } - DPRINT("OBject: %x, Remaining Path: %wZ\n", Object, &RemainingPath); + DPRINT("OBject: %x, Remaining Path: %wZ\n", Object, &RemainingPath); if (Object == NULL) { RtlFreeUnicodeString(&RemainingPath); - ObpReleaseCapturedAttributes(&ObjectCreateInfo); - if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); return STATUS_UNSUCCESSFUL; } if (RemainingPath.Buffer != NULL) @@ -203,8 +204,6 @@ Status =STATUS_OBJECT_PATH_NOT_FOUND; RtlFreeUnicodeString(&RemainingPath); ObDereferenceObject(Object); - ObpReleaseCapturedAttributes(&ObjectCreateInfo); - if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); return Status; } @@ -216,8 +215,6 @@ ObDereferenceObject(Object); RtlFreeUnicodeString(&RemainingPath); - ObpReleaseCapturedAttributes(&ObjectCreateInfo); - if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); return Status; }

1 0

[hbirr] 15451: Set the flag FO_DIRECT_DEVICE_OPEN after the call to IoCreateStreamFileObject in IoCreateFile.
by hbirr＠svn.reactos.com 21 May '05

21 May '05

Set the flag FO_DIRECT_DEVICE_OPEN after the call to IoCreateStreamFileObject in IoCreateFile. Modified: trunk/reactos/ntoskrnl/io/file.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-05-21 11:29:53 UTC (rev 15450) +++ trunk/reactos/ntoskrnl/io/file.c 2005-05-21 12:08:46 UTC (rev 15451) @@ -877,6 +877,10 @@ } /* FIXME: wt... */ FileObject = IoCreateStreamFileObject(NULL, DeviceObject); + /* HACK */ + FileObject->Flags |= FO_DIRECT_DEVICE_OPEN; + DPRINT("%wZ\n", ObjectAttributes->ObjectName); + ObDereferenceObject (DeviceObject); } } @@ -1145,8 +1149,6 @@ CreatedFileObject->DeviceObject = DeviceObject; CreatedFileObject->Vpb = DeviceObject->Vpb; CreatedFileObject->Type = IO_TYPE_FILE; - /* HACK */ - CreatedFileObject->Flags |= FO_DIRECT_DEVICE_OPEN; CreatedFileObject->Flags |= FO_STREAM_FILE; /* Initialize Lock and Event */

1 0

[jimtabor] 15450: Fix ups and Clean ups.
by jimtabor＠svn.reactos.com 21 May '05

21 May '05

Fix ups and Clean ups. Modified: trunk/reactos/drivers/usb/cromwell/core/hcd-pci.c Modified: trunk/reactos/drivers/usb/cromwell/core/hcd.h Modified: trunk/reactos/drivers/usb/cromwell/core/usb.c Modified: trunk/reactos/drivers/usb/cromwell/core/usbcore.c Modified: trunk/reactos/drivers/usb/cromwell/host/ohci-hcd.c Modified: trunk/reactos/drivers/usb/cromwell/linux/linux_wrapper.h Modified: trunk/reactos/drivers/usb/cromwell/linux/pci_ids.h Modified: trunk/reactos/drivers/usb/cromwell/sys/Makefile Modified: trunk/reactos/drivers/usb/cromwell/sys/linuxwrapper.c Modified: trunk/reactos/drivers/usb/cromwell/uhci/uhci-hcd.c _____ Modified: trunk/reactos/drivers/usb/cromwell/core/hcd-pci.c --- trunk/reactos/drivers/usb/cromwell/core/hcd-pci.c 2005-05-21 08:44:40 UTC (rev 15449) +++ trunk/reactos/drivers/usb/cromwell/core/hcd-pci.c 2005-05-21 11:29:53 UTC (rev 15450) @@ -59,7 +59,8 @@ * * Store this function in the HCD's struct pci_driver as probe(). */ -int STDCALL usb_hcd_pci_probe (struct pci_dev *dev, const struct pci_device_id *id) +int STDCALL +usb_hcd_pci_probe (struct pci_dev *dev, const struct pci_device_id *id) { struct hc_driver *driver; PHYSICAL_ADDRESS resource; _____ Modified: trunk/reactos/drivers/usb/cromwell/core/hcd.h --- trunk/reactos/drivers/usb/cromwell/core/hcd.h 2005-05-21 08:44:40 UTC (rev 15449) +++ trunk/reactos/drivers/usb/cromwell/core/hcd.h 2005-05-21 11:29:53 UTC (rev 15450) @@ -215,7 +215,7 @@ const char *description; /* "ehci-hcd" etc */ /* irq handler */ - void (*irq) (struct usb_hcd *hcd, struct pt_regs *regs); + int (*irq) (struct usb_hcd *hcd, struct pt_regs *regs); int flags; #define HCD_MEMORY 0x0001 /* HC regs use memory (else I/O) */ _____ Modified: trunk/reactos/drivers/usb/cromwell/core/usb.c --- trunk/reactos/drivers/usb/cromwell/core/usb.c 2005-05-21 08:44:40 UTC (rev 15449) +++ trunk/reactos/drivers/usb/cromwell/core/usb.c 2005-05-21 11:29:53 UTC (rev 15450) @@ -869,12 +869,14 @@ might_sleep (); if (!dev) { - pr_debug ("%s nodev\n", __FUNCTION__); +// pr_debug ("%s nodev\n", __FUNCTION__); + DPRINT ("%s nodev\n", __FUNCTION__); return; } bus = dev->bus; if (!bus) { - pr_debug ("%s nobus\n", __FUNCTION__); +// pr_debug ("%s nobus\n", __FUNCTION__); + DPRINT ("%s nobus\n", __FUNCTION__); return; } ops = bus->op; _____ Modified: trunk/reactos/drivers/usb/cromwell/core/usbcore.c --- trunk/reactos/drivers/usb/cromwell/core/usbcore.c 2005-05-21 08:44:40 UTC (rev 15449) +++ trunk/reactos/drivers/usb/cromwell/core/usbcore.c 2005-05-21 11:29:53 UTC (rev 15450) @@ -6,7 +6,8 @@ #include <ddk/ntddk.h> #include <debug.h> -NTSTATUS AddDevice(PDRIVER_OBJECT DriverObject, PDEVICE_OBJECT pdo) +NTSTATUS STDCALL +AddDevice(PDRIVER_OBJECT DriverObject, PDEVICE_OBJECT pdo) { DbgPrint("usbcore: AddDevice called\n"); @@ -19,13 +20,15 @@ return STATUS_SUCCESS; } -VOID DriverUnload(PDRIVER_OBJECT DriverObject) +VOID STDCALL +DriverUnload(PDRIVER_OBJECT DriverObject) { // nothing to do here yet } // Dispatch PNP -NTSTATUS DispatchPnp(PDEVICE_OBJECT fdo, PIRP Irp) +NTSTATUS STDCALL +DispatchPnp(PDEVICE_OBJECT fdo, PIRP Irp) { ULONG fcn; PIO_STACK_LOCATION stack; @@ -42,7 +45,8 @@ return STATUS_SUCCESS; } -NTSTATUS DispatchPower(PDEVICE_OBJECT fido, PIRP Irp) +NTSTATUS STDCALL +DispatchPower(PDEVICE_OBJECT fido, PIRP Irp) { DbgPrint("IRP_MJ_POWER dispatch\n"); return STATUS_SUCCESS; _____ Modified: trunk/reactos/drivers/usb/cromwell/host/ohci-hcd.c --- trunk/reactos/drivers/usb/cromwell/host/ohci-hcd.c 2005-05-21 08:44:40 UTC (rev 15449) +++ trunk/reactos/drivers/usb/cromwell/host/ohci-hcd.c 2005-05-21 11:29:53 UTC (rev 15450) @@ -520,7 +520,7 @@ (void) readl (&ohci->regs->control); // POTPGT delay is bits 24-31, in 2 ms units. - mdelay ((roothub_a (ohci) >> 23) & 0x1fe); + mdelay (((int)(roothub_a (ohci) >> 23) & 0x1fe)); /* connect the virtual root hub */ bus = hcd_to_bus (&ohci->hcd); @@ -552,7 +552,8 @@ /* an interrupt happens */ -static void ohci_irq (struct usb_hcd *hcd, struct pt_regs *ptregs) +static +int ohci_irq (struct usb_hcd *hcd, struct pt_regs *ptregs) { struct ohci_hcd *ohci = hcd_to_ohci (hcd); struct ohci_regs *regs = ohci->regs; @@ -567,11 +568,11 @@ } else if ((ints = readl (&regs->intrstatus)) == ~(u32)0) { disable (ohci); ohci_dbg (ohci, "device removed!\n"); - return; + return 0; /* interrupt for some other device? */ } else if ((ints &= readl (&regs->intrenable)) == 0) { - return; + return 0; } if (ints & OHCI_INTR_UE) { @@ -606,6 +607,7 @@ writel (OHCI_INTR_MIE, &regs->intrenable); // flush those pci writes (void) readl (&ohci->regs->control); + return 0; } /*---------------------------------------------------------------------- ---*/ _____ Modified: trunk/reactos/drivers/usb/cromwell/linux/linux_wrapper.h --- trunk/reactos/drivers/usb/cromwell/linux/linux_wrapper.h 2005-05-21 08:44:40 UTC (rev 15449) +++ trunk/reactos/drivers/usb/cromwell/linux/linux_wrapper.h 2005-05-21 11:29:53 UTC (rev 15450) @@ -234,8 +234,8 @@ struct list_head node; char *name; const struct pci_device_id *id_table; /* must be non-NULL for probe to be called */ - int (*probe) (struct pci_dev *dev, const struct pci_device_id *id); /* New device inserted */ - void (*remove) (struct pci_dev *dev); /* Device removed (NULL if not a hot-plug capable driver) */ + int STDCALL (*probe) (struct pci_dev *dev, const struct pci_device_id *id); /* New device inserted */ + void STDCALL (*remove) (struct pci_dev *dev); /* Device removed (NULL if not a hot-plug capable driver) */ int (*save_state) (struct pci_dev *dev, u32 state); /* Save Device Context */ int (*suspend) (struct pci_dev *dev, u32 state); /* Device suspended */ int (*resume) (struct pci_dev *dev); /* Device woken up */ @@ -328,7 +328,7 @@ #define inw(x) READ_PORT_USHORT((PUSHORT)(x)) #define outw(x,p) WRITE_PORT_USHORT((PUSHORT)(p),(x)) -#define outl(x,p) WRITE_PORT_ULONG((PUSHORT)(p),(x)) +#define outl(x,p) WRITE_PORT_ULONG((PULONG)(p),(x)) /* The kernel macro for list_for_each_entry makes nonsense (have no clue * why, this is just the same definition...) */ @@ -799,4 +799,5 @@ #define __KERNEL_DS 0x18 +int my_pci_write_config_word(struct pci_dev *, int, u16); _____ Modified: trunk/reactos/drivers/usb/cromwell/linux/pci_ids.h --- trunk/reactos/drivers/usb/cromwell/linux/pci_ids.h 2005-05-21 08:44:40 UTC (rev 15449) +++ trunk/reactos/drivers/usb/cromwell/linux/pci_ids.h 2005-05-21 11:29:53 UTC (rev 15450) @@ -10,7 +10,7 @@ #define PCI_DEVICE_ID_NS_87560_LIO 0x000e #define PCI_DEVICE_ID_INTEL_82371AB_2 0x7112 -#define PCI_CLASS_SERIAL_USB (PCI_CLASS_SERIAL_BUS_CTLR << 8 + PCI_SUBCLASS_SB_USB) +#define PCI_CLASS_SERIAL_USB ((PCI_CLASS_SERIAL_BUS_CTLR << 8) + PCI_SUBCLASS_SB_USB) #endif _____ Modified: trunk/reactos/drivers/usb/cromwell/sys/Makefile --- trunk/reactos/drivers/usb/cromwell/sys/Makefile 2005-05-21 08:44:40 UTC (rev 15449) +++ trunk/reactos/drivers/usb/cromwell/sys/Makefile 2005-05-21 11:29:53 UTC (rev 15450) @@ -2,3 +2,4 @@ O_TARGET := usbwrapper.o BootUSB.o linuxwrapper.o xpad.o xremote.o usbkey.o risefall.o include $(TOPDIR)/Rules.make + _____ Modified: trunk/reactos/drivers/usb/cromwell/sys/linuxwrapper.c --- trunk/reactos/drivers/usb/cromwell/sys/linuxwrapper.c 2005-05-21 08:44:40 UTC (rev 15449) +++ trunk/reactos/drivers/usb/cromwell/sys/linuxwrapper.c 2005-05-21 11:29:53 UTC (rev 15450) @@ -75,6 +75,7 @@ { int n; // printk("handle irqs\n"); + DPRINT1("Handle Irqs\n"); for(n=0;n<MAX_IRQS;n++) { if (reg_irqs[n].handler && (irq==reg_irqs[n].irq || irq==-1)) @@ -101,6 +102,7 @@ main_timer_list[n]=NULL; // remove timer // printk("do timer %i fn %p\n",n,function); + DPRINT1("do timer %i fn %p\n",n,function); function(data); } @@ -155,6 +157,8 @@ { int n,found=0; // printk("drv_num %i %p %p\n",drvs_num,m_drivers[0]->probe,m_drivers[1]->probe); + DPRINT1("drv_num %i %p %p\n",drvs_num,m_drivers[0]->probe,m_drivers[1]->probe); + if (dev->driver) { if (dev->driver->probe) @@ -168,6 +172,8 @@ { dev->driver=m_drivers[n]; // printk("probe%i %p ",n,m_drivers[n]->probe); + DPRINT1("probe%i %p ",n,m_drivers[n]->probe); + if (m_drivers[n]->probe(dev) == 0) { // return 0; @@ -187,6 +193,8 @@ if (drvs_num<MAX_DRVS) { // printk("driver_register %i: %p %p",drvs_num,driver,driver->probe); + DPRINT1("driver_register %i: %p %p",drvs_num,driver,driver->probe); + m_drivers[drvs_num++]=driver; return 0; } @@ -229,6 +237,8 @@ int wait=1; x+=10; // safety // printk("schedule_timeout %i\n",x); + DPRINT1("schedule_timeout %i\n",x); + while(x>0) { do_all_timers(); @@ -244,6 +254,8 @@ } need_wakeup=0; // printk("schedule DONE!!!!!!\n"); + DPRINT1("schedule DONE!!!!!!\n"); + return x; } /*---------------------------------------------------------------------- --*/ @@ -251,6 +263,8 @@ { int n=100; // printk("wait for completion\n"); + DPRINT1("wait for completion\n"); + while(!x->done && (n>0)) { do_all_timers(); @@ -262,6 +276,8 @@ n--; } // printk("wait for completion done %i\n",x->done); + DPRINT1("wait for completion done %i\n",x->done); + } /*---------------------------------------------------------------------- --*/ void my_interruptible_sleep_on(PKEVENT evnt) @@ -278,7 +294,7 @@ const struct pci_device_id *id=NULL; if (!pci_probe_dev) { - printk(KERN_ERR "PCI device not set!\n"); + DPRINT1("PCI device not set!\n"); return 0; } x->probe(dev, id); _____ Modified: trunk/reactos/drivers/usb/cromwell/uhci/uhci-hcd.c --- trunk/reactos/drivers/usb/cromwell/uhci/uhci-hcd.c 2005-05-21 08:44:40 UTC (rev 15449) +++ trunk/reactos/drivers/usb/cromwell/uhci/uhci-hcd.c 2005-05-21 11:29:53 UTC (rev 15450) @@ -1877,7 +1877,7 @@ spin_unlock_irqrestore(&uhci->urb_remove_list_lock, flags); } -static void uhci_irq(struct usb_hcd *hcd, struct pt_regs *regs) +static int uhci_irq(struct usb_hcd *hcd, struct pt_regs *regs) { struct uhci_hcd *uhci = hcd_to_uhci(hcd); unsigned int io_addr = uhci->io_addr; @@ -1890,7 +1890,7 @@ */ status = inw(io_addr + USBSTS); if (!status) /* shared interrupt, not mine */ - return; + return 0; outw(status, io_addr + USBSTS); /* Clear it */ if (status & ~(USBSTS_USBINT | USBSTS_ERROR | USBSTS_RD)) { @@ -1929,6 +1929,8 @@ spin_unlock(&uhci->urb_list_lock); uhci_finish_completion(hcd, regs); + + return 0; } static void reset_hc(struct uhci_hcd *uhci) @@ -2275,7 +2277,7 @@ err("unable to allocate root hub"); goto err_alloc_root_hub; } - hcd->pdev->bus = udev; /* Fix bus pointer for initial device */ + hcd->pdev->bus = (struct pci_bus *)udev; /* Fix bus pointer for initial device */ uhci->term_td = uhci_alloc_td(uhci, udev); if (!uhci->term_td) {

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