Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 42631: Properly set the active window frame flag. Add missing file header. Add a note in defwnd.c.
by jimtabor＠svn.reactos.org 12 Aug '09

12 Aug '09

Author: jimtabor Date: Wed Aug 12 09:03:58 2009 New Revision: 42631 URL: http://svn.reactos.org/svn/reactos?rev=42631&view=rev Log: Properly set the active window frame flag. Add missing file header. Add a note in defwnd.c. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c trunk/reactos/subsystems/win32/win32k/ntuser/event.c trunk/reactos/subsystems/win32/win32k/ntuser/focus.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] Wed Aug 12 09:03:58 2009 @@ -133,7 +133,7 @@ if (LOWORD(lParam)) { if (wParam) - { + {// WNDS_HIDDENPOPUP if (!(Window->Flags & WIN_NEEDS_SHOW_OWNEDPOPUP)) break; Window->Flags &= ~WIN_NEEDS_SHOW_OWNEDPOPUP; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] Wed Aug 12 09:03:58 2009 @@ -1,3 +1,10 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Window event handlers + * FILE: subsystem/win32/win32k/ntuser/event.c + * PROGRAMER: James Tabor (james.tabor(a)rectos.org) + */ #include <w32k.h> Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] Wed Aug 12 09:03:58 2009 @@ -95,7 +95,11 @@ Window->Wnd->hWndLastActive = hWnd; if (Window->Wnd->spwndOwner) Window->Wnd->spwndOwner->hWndLastActive = hWnd; - } + Window->Wnd->state |= WNDS_ACTIVEFRAME; + } + + if (WindowPrev && WindowPrev->Wnd) + WindowPrev->Wnd->state &= ~WNDS_ACTIVEFRAME; if (Window && WindowPrev) {

1 0

[jimtabor] 42630: - Move W32 Process flags to the proper place.
by jimtabor＠svn.reactos.org 12 Aug '09

12 Aug '09

Author: jimtabor Date: Wed Aug 12 08:54:31 2009 New Revision: 42630 URL: http://svn.reactos.org/svn/reactos?rev=42630&view=rev Log: - Move W32 Process flags to the proper place. Modified: trunk/reactos/subsystems/win32/win32k/include/misc.h trunk/reactos/subsystems/win32/win32k/include/win32.h Modified: trunk/reactos/subsystems/win32/win32k/include/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/misc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/misc.h [iso-8859-1] Wed Aug 12 08:54:31 2009 @@ -1,34 +1,5 @@ #ifndef __WIN32K_MISC_H #define __WIN32K_MISC_H - -/* W32PROCESS flags */ -#define W32PF_CONSOLEAPPLICATION 0x00000001 -#define W32PF_FORCEOFFFEEDBACK 0x00000002 -#define W32PF_STARTGLASS 0x00000004 -#define W32PF_WOW 0x00000008 -#define W32PF_READSCREENACCESSGRANTED 0x00000010 -#define W32PF_INITIALIZED 0x00000020 -#define W32PF_APPSTARTING 0x00000040 -#define W32PF_WOW64 0x00000080 -#define W32PF_ALLOWFOREGROUNDACTIVATE 0x00000100 -#define W32PF_OWNDCCLEANUP 0x00000200 -#define W32PF_SHOWSTARTGLASSCALLED 0x00000400 -#define W32PF_FORCEBACKGROUNDPRIORITY 0x00000800 -#define W32PF_TERMINATED 0x00001000 -#define W32PF_CLASSESREGISTERED 0x00002000 -#define W32PF_THREADCONNECTED 0x00004000 -#define W32PF_PROCESSCONNECTED 0x00008000 -#define W32PF_WAKEWOWEXEC 0x00010000 -#define W32PF_WAITFORINPUTIDLE 0x00020000 -#define W32PF_IOWINSTA 0x00040000 -#define W32PF_CONSOLEFOREGROUND 0x00080000 -#define W32PF_OLELOADED 0x00100000 -#define W32PF_SCREENSAVER 0x00200000 -#define W32PF_IDLESCREENSAVER 0x00400000 -// ReactOS -#define W32PF_NOWINDOWGHOSTING (0x01000000) -#define W32PF_MANUALGUICHECK (0x02000000) -#define W32PF_CREATEDWINORDC (0x04000000) typedef struct INTENG_ENTER_LEAVE_TAG { Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Wed Aug 12 08:54:31 2009 @@ -1,5 +1,35 @@ #ifndef __INCLUDE_NAPI_WIN32_H #define __INCLUDE_NAPI_WIN32_H + +/* W32PROCESS flags */ +#define W32PF_CONSOLEAPPLICATION 0x00000001 +#define W32PF_FORCEOFFFEEDBACK 0x00000002 +#define W32PF_STARTGLASS 0x00000004 +#define W32PF_WOW 0x00000008 +#define W32PF_READSCREENACCESSGRANTED 0x00000010 +#define W32PF_INITIALIZED 0x00000020 +#define W32PF_APPSTARTING 0x00000040 +#define W32PF_WOW64 0x00000080 +#define W32PF_ALLOWFOREGROUNDACTIVATE 0x00000100 +#define W32PF_OWNDCCLEANUP 0x00000200 +#define W32PF_SHOWSTARTGLASSCALLED 0x00000400 +#define W32PF_FORCEBACKGROUNDPRIORITY 0x00000800 +#define W32PF_TERMINATED 0x00001000 +#define W32PF_CLASSESREGISTERED 0x00002000 +#define W32PF_THREADCONNECTED 0x00004000 +#define W32PF_PROCESSCONNECTED 0x00008000 +#define W32PF_WAKEWOWEXEC 0x00010000 +#define W32PF_WAITFORINPUTIDLE 0x00020000 +#define W32PF_IOWINSTA 0x00040000 +#define W32PF_CONSOLEFOREGROUND 0x00080000 +#define W32PF_OLELOADED 0x00100000 +#define W32PF_SCREENSAVER 0x00200000 +#define W32PF_IDLESCREENSAVER 0x00400000 +#define W32PF_ICONTITLEREGISTERED 0x10000000 +// ReactOS +#define W32PF_NOWINDOWGHOSTING (0x01000000) +#define W32PF_MANUALGUICHECK (0x02000000) +#define W32PF_CREATEDWINORDC (0x04000000) extern BOOL ClientPfnInit; extern HINSTANCE hModClient; @@ -95,8 +125,10 @@ { W32PROCESS; - PCLS pclsPrivateList; - PCLS pclsPublicList; + PCLS pclsPrivateList; + PCLS pclsPublicList; + + DWORD dwRegisteredClasses; /* ReactOS */ LIST_ENTRY ClassList; LIST_ENTRY MenuListHead;

1 0

[jimtabor] 42629: Properly set and clear the dialog window flag.
by jimtabor＠svn.reactos.org 12 Aug '09

12 Aug '09

Author: jimtabor Date: Wed Aug 12 08:41:20 2009 New Revision: 42629 URL: http://svn.reactos.org/svn/reactos?rev=42629&view=rev Log: Properly set and clear the dialog window flag. Modified: trunk/reactos/dll/win32/user32/windows/dialog.c trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] Wed Aug 12 08:41:20 2009 @@ -160,7 +160,7 @@ SETDLGINFO( hWnd, dlgInfo ); - NtUserSetWindowFNID( hWnd, FNID_DIALOG ); + NtUserCallHwndParam( hWnd, (DWORD)dlgInfo, HWNDPARAM_ROUTINE_SETDIALOGPOINTER ); } else { @@ -1088,6 +1088,7 @@ if (dlgInfo->hUserFont) DeleteObject( dlgInfo->hUserFont ); if (dlgInfo->hMenu) DestroyMenu( dlgInfo->hMenu ); HeapFree( GetProcessHeap(), 0, dlgInfo ); + NtUserCallHwndParam( hwnd, 0, HWNDPARAM_ROUTINE_SETDIALOGPOINTER ); } /* Window clean-up */ return DefWindowProcA( hwnd, msg, wParam, lParam ); Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Wed Aug 12 08:41:20 2009 @@ -36,7 +36,7 @@ { W32THREAD; PTL ptl; - PVOID ppi; // FIXME: use PPROCESSINFO + PPROCESSINFO ppi; struct _USER_MESSAGE_QUEUE* MessageQueue; struct _KBL* KeyboardLayout; PCLIENTTHREADINFO pcti; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Wed Aug 12 08:41:20 2009 @@ -802,6 +802,42 @@ { case HWNDPARAM_ROUTINE_KILLSYSTEMTIMER: return IntKillTimer(hWnd, (UINT_PTR)Param, TRUE); + + case HWNDPARAM_ROUTINE_SETDIALOGPOINTER: + { + PWINDOW_OBJECT Window; + PWND pWnd; + USER_REFERENCE_ENTRY Ref; + + UserEnterExclusive(); + + if (!(Window = UserGetWindowObject(hWnd)) || !Window->Wnd) + { + UserLeave(); + return 0; + } + UserRefObjectCo(Window, &Ref); + + pWnd = Window->Wnd; + if (pWnd->head.pti->ppi == PsGetCurrentProcessWin32Process() && + pWnd->cbwndExtra == DLGWINDOWEXTRA) + { + if (Param) + { + if (!pWnd->fnid) pWnd->fnid = FNID_DIALOG; + pWnd->state |= WNDS_DIALOGWINDOW; + } + else + { + pWnd->fnid |= FNID_DESTROY; + pWnd->state &= ~WNDS_DIALOGWINDOW; + } + } + + UserDerefObjectCo(Window); + UserLeave(); + return 0; + } } UNIMPLEMENTED;

1 0

[tkreuzer] 42628: Make the tui console background black instead of blue.
by tkreuzer＠svn.reactos.org 11 Aug '09

11 Aug '09

Author: tkreuzer Date: Tue Aug 11 22:23:18 2009 New Revision: 42628 URL: http://svn.reactos.org/svn/reactos?rev=42628&view=rev Log: Make the tui console background black instead of blue. Modified: trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c [iso-8859-1] Tue Aug 11 22:23:18 2009 @@ -66,6 +66,7 @@ CONSOLE_SCREEN_BUFFER_INFO ScrInfo; DWORD BytesReturned; WNDCLASSEXW wc; + USHORT TextAttribute = FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED; TuiStartService(L"Blue"); @@ -81,8 +82,15 @@ &OemCP, sizeof(OemCP), NULL, 0, &BytesReturned, NULL)) { - DPRINT("Failed to load the font for codepage %d\n", OemCP); + DPRINT1("Failed to load the font for codepage %d\n", OemCP); /* Let's suppose the font is good enough to continue */ + } + + if (!DeviceIoControl(ConsoleDeviceHandle, IOCTL_CONSOLE_SET_TEXT_ATTRIBUTE, + &TextAttribute, sizeof(TextAttribute), NULL, 0, + &BytesReturned, NULL)) + { + DPRINT1("Failed to set text attribute\n"); } ActiveConsole = NULL; @@ -112,7 +120,7 @@ static VOID WINAPI TuiInitScreenBuffer(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buffer) { - Buffer->DefaultAttrib = FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED | BACKGROUND_BLUE; + Buffer->DefaultAttrib = FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED; } static void FASTCALL

1 0

[gschneider] 42627: Amendment to r42615: add the check in the correct line
by gschneider＠svn.reactos.org 11 Aug '09

11 Aug '09

Author: gschneider Date: Tue Aug 11 21:50:42 2009 New Revision: 42627 URL: http://svn.reactos.org/svn/reactos?rev=42627&view=rev Log: Amendment to r42615: add the check in the correct line Modified: trunk/reactos/subsystems/win32/win32k/dib/stretchblt.c Modified: trunk/reactos/subsystems/win32/win32k/dib/stretchblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/stretchblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/stretchblt.c [iso-8859-1] Tue Aug 11 21:50:42 2009 @@ -144,9 +144,9 @@ } } - if (UsesPattern && CanDraw) + if (CanDraw) { - if (PatternSurface) + if (UsesPattern && PatternSurface) { Pattern = fnPattern_GetPixel(PatternSurface, PatternX, PatternY); PatternX++;

1 0

[tkreuzer] 42626: [win32k] - EngSetPointerShape: Don't dereference psoMask without checking it
by tkreuzer＠svn.reactos.org 11 Aug '09

11 Aug '09

Author: tkreuzer Date: Tue Aug 11 21:03:51 2009 New Revision: 42626 URL: http://svn.reactos.org/svn/reactos?rev=42626&view=rev Log: [win32k] - EngSetPointerShape: Don't dereference psoMask without checking it Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] Tue Aug 11 21:03:51 2009 @@ -358,7 +358,7 @@ } } } - else + else if (psoMask) { pgp->Size.cx = psoMask->sizlBitmap.cx; pgp->Size.cy = psoMask->sizlBitmap.cy / 2;

1 0

[tkreuzer] 42625: [win32k] - GreSetPointerShape: Don't cleanup the XLATEOBJ when it wasn't initialized. - Found by Amine Khaldi
by tkreuzer＠svn.reactos.org 11 Aug '09

11 Aug '09

Author: tkreuzer Date: Tue Aug 11 20:42:30 2009 New Revision: 42625 URL: http://svn.reactos.org/svn/reactos?rev=42625&view=rev Log: [win32k] - GreSetPointerShape: Don't cleanup the XLATEOBJ when it wasn't initialized. - Found by Amine Khaldi Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] Tue Aug 11 20:42:30 2009 @@ -686,11 +686,11 @@ fl | SPS_CHANGE); /* Cleanup */ - if (hbmColor) + if (psurfColor) + { EXLATEOBJ_vCleanup(&exlo); - - if (psurfColor) SURFACE_ShareUnlockSurface(psurfColor); + } if (psurfMask) SURFACE_ShareUnlockSurface(psurfMask);

1 0

[pschweitzer] 42624: Other resync. Now branch builds up to gdi32.
by pschweitzer＠svn.reactos.org 11 Aug '09

11 Aug '09

Author: pschweitzer Date: Tue Aug 11 19:08:58 2009 New Revision: 42624 URL: http://svn.reactos.org/svn/reactos?rev=42624&view=rev Log: Other resync. Now branch builds up to gdi32. Modified: branches/pierre-fsd/drivers/filesystems/fastfat/fastio.c branches/pierre-fsd/drivers/filesystems/fs_rec/fs_rec.h branches/pierre-fsd/include/ddk/winddk.h Modified: branches/pierre-fsd/drivers/filesystems/fastfat/fastio.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/fastfat/fastio.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/fastfat/fastio.c [iso-8859-1] Tue Aug 11 19:08:58 2009 @@ -114,7 +114,7 @@ static BOOLEAN NTAPI VfatFastIoUnlockAllByKey(IN PFILE_OBJECT FileObject, - PEPROCESS ProcessId, + PVOID ProcessId, ULONG Key, OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject) Modified: branches/pierre-fsd/drivers/filesystems/fs_rec/fs_rec.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/fs_rec/fs_rec.h [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/fs_rec/fs_rec.h [iso-8859-1] Tue Aug 11 19:08:58 2009 @@ -25,6 +25,12 @@ // #define UDFS_VRS_START_OFFSET 32768 #define UDFS_AVDP_SECTOR 256 + +// +// Ext2 Magic +// Taken from Linux Kernel +// +#define EXT2_SUPER_MAGIC 0xEF53 // // Non-standard rounding macros Modified: branches/pierre-fsd/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/include/ddk/winddk.h… ============================================================================== --- branches/pierre-fsd/include/ddk/winddk.h [iso-8859-1] (original) +++ branches/pierre-fsd/include/ddk/winddk.h [iso-8859-1] Tue Aug 11 19:08:58 2009 @@ -2157,6 +2157,7 @@ #define DO_POWER_PAGABLE 0x00002000 #define DO_POWER_INRUSH 0x00004000 #define DO_LOW_PRIORITY_FILESYSTEM 0x00010000 +#define DO_XIP 0x00020000 /* DEVICE_OBJECT.Characteristics */ @@ -3289,7 +3290,7 @@ typedef BOOLEAN (DDKAPI *PFAST_IO_UNLOCK_ALL_BY_KEY)( IN struct _FILE_OBJECT *FileObject, - PEPROCESS ProcessId, + PVOID ProcessId, ULONG Key, OUT PIO_STATUS_BLOCK IoStatus, IN struct _DEVICE_OBJECT *DeviceObject); @@ -4548,6 +4549,9 @@ #define IO_FORCE_ACCESS_CHECK 0x001 #define IO_NO_PARAMETER_CHECKING 0x100 +#define IO_REPARSE 0x0 +#define IO_REMOUNT 0x1 + typedef NTSTATUS (DDKAPI *PIO_QUERY_DEVICE_ROUTINE)( IN PVOID Context,

1 0

[jmorlan] 42623: Fix a buffer overflow in ConvertULargeInteger
by jmorlan＠svn.reactos.org 11 Aug '09

11 Aug '09

Author: jmorlan Date: Tue Aug 11 18:21:46 2009 New Revision: 42623 URL: http://svn.reactos.org/svn/reactos?rev=42623&view=rev Log: Fix a buffer overflow in ConvertULargeInteger Modified: trunk/reactos/base/shell/cmd/cmd.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Tue Aug 11 18:21:46 2009 @@ -182,7 +182,7 @@ INT ConvertULargeInteger(ULONGLONG num, LPTSTR des, INT len, BOOL bPutSeperator) { - TCHAR temp[32]; + TCHAR temp[39]; /* maximum length with nNumberGroups == 1 */ UINT n, iTarget; if (len <= 1) @@ -198,15 +198,15 @@ if (iTarget == n && bPutSeperator) { iTarget += nNumberGroups + 1; - temp[31 - n++] = cThousandSeparator; - } - temp[31 - n++] = (TCHAR)(num % 10) + _T('0'); + temp[38 - n++] = cThousandSeparator; + } + temp[38 - n++] = (TCHAR)(num % 10) + _T('0'); num /= 10; } while (num > 0); if (n > len-1) n = len-1; - memcpy(des, temp + 32 - n, n * sizeof(TCHAR)); + memcpy(des, temp + 39 - n, n * sizeof(TCHAR)); des[n] = _T('\0'); return n;

1 0

[janderwald] 42622: - Filter dispatch is optional, handle it when creating new filters
by janderwald＠svn.reactos.org 11 Aug '09

11 Aug '09

Author: janderwald Date: Tue Aug 11 17:22:06 2009 New Revision: 42622 URL: http://svn.reactos.org/svn/reactos?rev=42622&view=rev Log: - Filter dispatch is optional, handle it when creating new filters Modified: trunk/reactos/drivers/ksfilter/ks/filter.c Modified: trunk/reactos/drivers/ksfilter/ks/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/filter… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] Tue Aug 11 17:22:06 2009 @@ -442,6 +442,13 @@ /* free object header */ KsFreeObjectHeader(This->ObjectHeader); + } + else + { + /* complete and forget */ + Irp->IoStatus.Status = Status; + /* complete irp */ + IoCompleteRequest(Irp, IO_NO_INCREMENT); } /* done */ @@ -1085,21 +1092,29 @@ return Status; } - /* now let driver initialize the filter instance */ - Status = Factory->FilterDescriptor->Dispatch->Create(&This->Filter, Irp); - - if (!NT_SUCCESS(Status) && Status != STATUS_PENDING) - { - /* driver failed to initialize */ - DPRINT1("Driver: Status %x\n", Status); - - /* remove filter instance from filter factory */ - iface->lpVtbl->RemoveFilterInstance(iface, (IKsFilter*)&This->lpVtbl); - - /* free filter instance */ - FreeItem(This); - FreeItem(CreateItem); - return Status; + /* does the filter have a filter dispatch */ + if (Factory->FilterDescriptor->Dispatch) + { + /* does it have a create routine */ + if (Factory->FilterDescriptor->Dispatch->Create) + { + /* now let driver initialize the filter instance */ + Status = Factory->FilterDescriptor->Dispatch->Create(&This->Filter, Irp); + + if (!NT_SUCCESS(Status) && Status != STATUS_PENDING) + { + /* driver failed to initialize */ + DPRINT1("Driver: Status %x\n", Status); + + /* remove filter instance from filter factory */ + iface->lpVtbl->RemoveFilterInstance(iface, (IKsFilter*)&This->lpVtbl); + + /* free filter instance */ + FreeItem(This); + FreeItem(CreateItem); + return Status; + } + } } /* now allocate the object header */

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