Ros-diffs November 2013

ros-diffs@reactos.org

16 participants
348 discussions

[aandrejevic] 60959: [NTVDM] The command line in the PSP consists only of the parameters, the program name is omitted.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Tue Nov 12 01:56:18 2013 New Revision: 60959 URL: http://svn.reactos.org/svn/reactos?rev=60959&view=rev Log: [NTVDM] The command line in the PSP consists only of the parameters, the program name is omitted. Modified: branches/ntvdm/subsystems/ntvdm/dos.c Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Tue Nov 12 01:56:18 2013 @@ -1025,6 +1025,7 @@ LPBYTE Address = NULL; LPSTR ProgramFilePath, Parameters[256]; CHAR CommandLineCopy[DOS_CMDLINE_LENGTH]; + CHAR ParamString[DOS_CMDLINE_LENGTH]; INT ParamCount = 0; WORD Segment = 0; WORD MaxAllocSize; @@ -1040,8 +1041,6 @@ /* Save a copy of the command line */ strcpy(CommandLineCopy, CommandLine); - // FIXME: Improve parsing (especially: "some_path\with spaces\program.exe" options) - /* Get the file name of the executable */ ProgramFilePath = strtok(CommandLineCopy, " \t"); @@ -1050,6 +1049,15 @@ && ((Parameters[ParamCount] = strtok(NULL, " \t")) != NULL)) { ParamCount++; + } + + ZeroMemory(ParamString, sizeof(ParamString)); + + /* Store the parameters in a string */ + for (i = 0; i < ParamCount; i++) + { + strncat(ParamString, Parameters[i], DOS_CMDLINE_LENGTH - strlen(ParamString) - 1); + strncat(ParamString, " ", DOS_CMDLINE_LENGTH - strlen(ParamString) - 1); } /* Open a handle to the executable */ @@ -1124,7 +1132,7 @@ /* Initialize the PSP */ DosInitializePsp(Segment, - CommandLine, + ParamString, (WORD)ExeSize, EnvBlock); @@ -1193,7 +1201,7 @@ /* Initialize the PSP */ DosInitializePsp(Segment, - CommandLine, + ParamString, MaxAllocSize, EnvBlock);

11 years, 1 month

[aandrejevic] 60958: [NTVDM] Report the correct number of paragraphs in the PSP of a COM program.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Tue Nov 12 00:49:02 2013 New Revision: 60958 URL: http://svn.reactos.org/svn/reactos?rev=60958&view=rev Log: [NTVDM] Report the correct number of paragraphs in the PSP of a COM program. Modified: branches/ntvdm/subsystems/ntvdm/dos.c Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Tue Nov 12 00:49:02 2013 @@ -1194,7 +1194,7 @@ /* Initialize the PSP */ DosInitializePsp(Segment, CommandLine, - (WORD)((FileSize + sizeof(DOS_PSP)) >> 4), + MaxAllocSize, EnvBlock); /* Set the initial segment registers */

11 years, 1 month

[gadamopoulos] 60957: [shell32] - Fix double click or right click on the shell view control.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Nov 11 22:36:26 2013 New Revision: 60957 URL: http://svn.reactos.org/svn/reactos?rev=60957&view=rev Log: [shell32] - Fix double click or right click on the shell view control. Modified: trunk/reactos/dll/win32/shell32/shlview.cpp Modified: trunk/reactos/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] Mon Nov 11 22:36:26 2013 @@ -100,7 +100,7 @@ UINT cScrollDelay; /* Send a WM_*SCROLL msg every 250 ms during drag-scroll */ POINT ptLastMousePos; /* Mouse position at last DragOver call */ // - CComPtr<IContextMenu2> pCM; + CComPtr<IContextMenu> pCM; public: CDefView(); ~CDefView(); @@ -1114,7 +1114,7 @@ if (!hMenu) return E_FAIL; - hResult = GetItemObject( SVGIO_SELECTION, IID_PPV_ARG(IContextMenu2, &pCM)); + hResult = GetItemObject( SVGIO_SELECTION, IID_PPV_ARG(IContextMenu, &pCM)); if (FAILED(hResult)) goto cleanup; @@ -1181,7 +1181,7 @@ cidl = ListView_GetSelectedCount(hWndList); - hResult = GetItemObject( cidl ? SVGIO_SELECTION : SVGIO_BACKGROUND, IID_PPV_ARG(IContextMenu2, &pCM)); + hResult = GetItemObject( cidl ? SVGIO_SELECTION : SVGIO_BACKGROUND, IID_PPV_ARG(IContextMenu, &pCM)); if (FAILED( hResult)) goto cleanup; @@ -1235,7 +1235,7 @@ if (!hMenu) return 0; - hResult = GetItemObject( bUseSelection ? SVGIO_SELECTION : SVGIO_BACKGROUND, IID_PPV_ARG(IContextMenu2, &pCM)); + hResult = GetItemObject( bUseSelection ? SVGIO_SELECTION : SVGIO_BACKGROUND, IID_PPV_ARG(IContextMenu, &pCM)); if (FAILED( hResult)) goto cleanup; @@ -1814,7 +1814,12 @@ return FALSE; } - if (pCM.p->HandleMenuMsg(uMsg, (WPARAM)m_hWnd, lParam) == S_OK) + CComPtr<IContextMenu2> pCM2; + HRESULT hres = pCM.p->QueryInterface(IID_PPV_ARG(IContextMenu2, &pCM2)); + if(FAILED(hres)) + return FALSE; + + if (pCM2.p->HandleMenuMsg(uMsg, (WPARAM)m_hWnd, lParam) == S_OK) return TRUE; else return FALSE;

11 years, 1 month

[aandrejevic] 60956: [FAST486] Check for interrupts at the end of a cycle, to avoid confusing debug output.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Mon Nov 11 20:55:33 2013 New Revision: 60956 URL: http://svn.reactos.org/svn/reactos?rev=60956&view=rev Log: [FAST486] Check for interrupts at the end of a cycle, to avoid confusing debug output. Modified: branches/ntvdm/lib/fast486/fast486.c Modified: branches/ntvdm/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/fast486.c?rev… ============================================================================== --- branches/ntvdm/lib/fast486/fast486.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/fast486.c [iso-8859-1] Mon Nov 11 20:55:33 2013 @@ -55,42 +55,7 @@ do { /* Check if this is a new instruction */ - if (State->PrefixFlags == 0) - { - State->SavedInstPtr = State->InstPtr; - - /* - * Check if there is an interrupt to execute, or a hardware interrupt signal - * while interrupts are enabled. - */ - if (State->IntStatus == FAST486_INT_EXECUTE) - { - FAST486_IDT_ENTRY IdtEntry; - - /* Get the interrupt vector */ - if (Fast486GetIntVector(State, State->PendingIntNum, &IdtEntry)) - { - /* Perform the interrupt */ - Fast486InterruptInternal(State, - IdtEntry.Selector, - MAKELONG(IdtEntry.Offset, IdtEntry.OffsetHigh), - IdtEntry.Type); - } - - /* Clear the interrupt status */ - State->IntStatus = FAST486_INT_NONE; - } - else if (State->Flags.If - && (State->IntAckCallback != NULL) - && (State->IntStatus == FAST486_INT_SIGNAL)) - { - /* Acknowledge the interrupt to get the number */ - State->PendingIntNum = State->IntAckCallback(State); - - /* Set the interrupt status to execute on the next instruction */ - State->IntStatus = FAST486_INT_EXECUTE; - } - } + if (State->PrefixFlags == 0) State->SavedInstPtr = State->InstPtr; /* Perform an instruction fetch */ if (!Fast486FetchByte(State, &Opcode)) continue; @@ -108,15 +73,45 @@ Fast486Exception(State, FAST486_EXCEPTION_UD); } - if (Fast486OpcodeHandlers[Opcode] != Fast486OpcodePrefix) - { - /* A non-prefix opcode has been executed, reset the prefix flags */ - State->PrefixFlags = 0; - } - else + if (Fast486OpcodeHandlers[Opcode] == Fast486OpcodePrefix) { /* This is a prefix, go to the next instruction immediately */ continue; + } + + /* A non-prefix opcode has been executed, reset the prefix flags */ + State->PrefixFlags = 0; + + /* + * Check if there is an interrupt to execute, or a hardware interrupt signal + * while interrupts are enabled. + */ + if (State->IntStatus == FAST486_INT_EXECUTE) + { + FAST486_IDT_ENTRY IdtEntry; + + /* Get the interrupt vector */ + if (Fast486GetIntVector(State, State->PendingIntNum, &IdtEntry)) + { + /* Perform the interrupt */ + Fast486InterruptInternal(State, + IdtEntry.Selector, + MAKELONG(IdtEntry.Offset, IdtEntry.OffsetHigh), + IdtEntry.Type); + } + + /* Clear the interrupt status */ + State->IntStatus = FAST486_INT_NONE; + } + else if (State->Flags.If + && (State->IntAckCallback != NULL) + && (State->IntStatus == FAST486_INT_SIGNAL)) + { + /* Acknowledge the interrupt to get the number */ + State->PendingIntNum = State->IntAckCallback(State); + + /* Set the interrupt status to execute on the next instruction */ + State->IntStatus = FAST486_INT_EXECUTE; } } while ((Command == FAST486_CONTINUE)

11 years, 1 month

[aandrejevic] 60955: [NTVDM] Implement vertical scrolling in BiosScrollWindow.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Mon Nov 11 20:41:55 2013 New Revision: 60955 URL: http://svn.reactos.org/svn/reactos?rev=60955&view=rev Log: [NTVDM] Implement vertical scrolling in BiosScrollWindow. Modified: branches/ntvdm/subsystems/ntvdm/bios.c Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Mon Nov 11 20:41:55 2013 @@ -651,8 +651,9 @@ { DWORD i; LPWORD WindowData; - DWORD WindowSize = (Rectangle.Bottom - Rectangle.Top + 1) - * (Rectangle.Right - Rectangle.Left + 1); + WORD WindowWidth = Rectangle.Right - Rectangle.Left + 1; + WORD WindowHeight = Rectangle.Bottom - Rectangle.Top + 1; + DWORD WindowSize = WindowWidth * WindowHeight; /* Allocate a buffer for the window */ WindowData = (LPWORD)HeapAlloc(GetProcessHeap(), @@ -663,7 +664,13 @@ /* Read the window data */ BiosReadWindow(WindowData, Rectangle, Page); - if (Amount == 0) + if ((Amount == 0) + || (((Direction == SCROLL_DIRECTION_UP) + || (Direction == SCROLL_DIRECTION_DOWN)) + && (Amount >= WindowHeight)) + || (((Direction == SCROLL_DIRECTION_LEFT) + || (Direction == SCROLL_DIRECTION_RIGHT)) + && (Amount >= WindowWidth))) { /* Fill the window */ for (i = 0; i < WindowSize; i++) @@ -674,7 +681,42 @@ goto Done; } - // TODO: Scroll the window! + switch (Direction) + { + case SCROLL_DIRECTION_UP: + { + RtlMoveMemory(WindowData, + &WindowData[WindowWidth * Amount], + (WindowSize - WindowWidth * Amount) * sizeof(WORD)); + + for (i = 0; i < Amount * WindowWidth; i++) + { + WindowData[WindowSize - i - 1] = MAKEWORD(' ', FillAttribute); + } + + break; + } + + case SCROLL_DIRECTION_DOWN: + { + RtlMoveMemory(&WindowData[WindowWidth * Amount], + WindowData, + (WindowSize - WindowWidth * Amount) * sizeof(WORD)); + + for (i = 0; i < Amount * WindowWidth; i++) + { + WindowData[i] = MAKEWORD(' ', FillAttribute); + } + + break; + } + + default: + { + // TODO: NOT IMPLEMENTED! + UNIMPLEMENTED; + } + } Done: /* Write back the window data */

11 years, 1 month

[tkreuzer] 60954: [WATCHDOG] Remove some obsolete stuff. [DXAPI] Add a comment. [WIN32K] Fix a warning in release builds.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Nov 11 20:25:16 2013 New Revision: 60954 URL: http://svn.reactos.org/svn/reactos?rev=60954&view=rev Log: [WATCHDOG] Remove some obsolete stuff. [DXAPI] Add a comment. [WIN32K] Fix a warning in release builds. Modified: trunk/reactos/win32ss/drivers/watchdog/watchdog.c trunk/reactos/win32ss/reactx/dxapi/main.c trunk/reactos/win32ss/user/ntuser/object.h Modified: trunk/reactos/win32ss/drivers/watchdog/watchdog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/watchdog/w… ============================================================================== --- trunk/reactos/win32ss/drivers/watchdog/watchdog.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/watchdog/watchdog.c [iso-8859-1] Mon Nov 11 20:25:16 2013 @@ -3,9 +3,6 @@ #define NDEBUG #include <debug.h> - -extern char WatchdogPeHeader; -void Fixup_WatchdogPeHeader(void); NTSTATUS NTAPI Modified: trunk/reactos/win32ss/reactx/dxapi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/dxapi/main.… ============================================================================== --- trunk/reactos/win32ss/reactx/dxapi/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/reactx/dxapi/main.c [iso-8859-1] Mon Nov 11 20:25:16 2013 @@ -12,7 +12,7 @@ #include "dxapi_driver.h" -#define NDEBU +#define NDEBU /* debug prints are enabled, add a G at the end to disable it ;-) */ #include <debug.h> NTSTATUS NTAPI Modified: trunk/reactos/win32ss/user/ntuser/object.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/object… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/object.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/object.h [iso-8859-1] Mon Nov 11 20:25:16 2013 @@ -39,6 +39,7 @@ PTHREADINFO W32Thread; PSINGLE_LIST_ENTRY ReferenceEntry; PUSER_REFERENCE_ENTRY UserReferenceEntry; + UNREFERENCED_LOCAL_VARIABLE(UserReferenceEntry); ASSERT(obj != NULL); W32Thread = PsGetCurrentThreadWin32Thread();

11 years, 1 month

[tkreuzer] 60953: Fix build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Nov 11 20:14:27 2013 New Revision: 60953 URL: http://svn.reactos.org/svn/reactos?rev=60953&view=rev Log: Fix build Modified: trunk/reactos/win32ss/drivers/watchdog/watchdog.c Modified: trunk/reactos/win32ss/drivers/watchdog/watchdog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/watchdog/w… ============================================================================== --- trunk/reactos/win32ss/drivers/watchdog/watchdog.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/watchdog/watchdog.c [iso-8859-1] Mon Nov 11 20:14:27 2013 @@ -109,7 +109,8 @@ VOID NTAPI WdResumeWatch( - PVOID p1) + PVOID p1, + PVOID p2) { UNIMPLEMENTED; } @@ -117,7 +118,8 @@ VOID FASTCALL WdResumeDeferredWatch( - PVOID p1) + PVOID p1, + PVOID p2) { UNIMPLEMENTED; }

11 years, 1 month

[tkreuzer] 60952: [DXAPI] Fix export names, add missing stubs [VIDEOPRT] Add missing WdDdiWatchdogDpcCallback export [WATCHDOG] Add a dummy watchdog.sys Now win32k.sys from win 2003 can be loaded.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Nov 11 20:11:23 2013 New Revision: 60952 URL: http://svn.reactos.org/svn/reactos?rev=60952&view=rev Log: [DXAPI] Fix export names, add missing stubs [VIDEOPRT] Add missing WdDdiWatchdogDpcCallback export [WATCHDOG] Add a dummy watchdog.sys Now win32k.sys from win 2003 can be loaded. Added: trunk/reactos/win32ss/drivers/watchdog/ (with props) trunk/reactos/win32ss/drivers/watchdog/CMakeLists.txt (with props) trunk/reactos/win32ss/drivers/watchdog/watchdog.c (with props) trunk/reactos/win32ss/drivers/watchdog/watchdog.spec (with props) Modified: trunk/reactos/win32ss/drivers/CMakeLists.txt trunk/reactos/win32ss/drivers/videoprt/stubs.c trunk/reactos/win32ss/drivers/videoprt/videoprt.spec trunk/reactos/win32ss/reactx/dxapi/dxapi.spec trunk/reactos/win32ss/reactx/dxapi/main.c Modified: trunk/reactos/win32ss/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/CMakeLists… ============================================================================== --- trunk/reactos/win32ss/drivers/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/CMakeLists.txt [iso-8859-1] Mon Nov 11 20:11:23 2013 @@ -3,3 +3,5 @@ add_subdirectory(font) add_subdirectory(miniport) add_subdirectory(videoprt) +add_subdirectory(watchdog) + Modified: trunk/reactos/win32ss/drivers/videoprt/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/s… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/stubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/stubs.c [iso-8859-1] Mon Nov 11 20:11:23 2013 @@ -89,6 +89,18 @@ { UNIMPLEMENTED; return 0; +} + +_Function_class_(KDEFERRED_ROUTINE) +VOID +NTAPI +WdDdiWatchdogDpcCallback( + _In_ PKDPC Dpc, + _In_opt_ PVOID DeferredContext, + _In_opt_ PVOID SystemArgument1, + _In_opt_ PVOID SystemArgument2) +{ + UNIMPLEMENTED; } #ifdef _M_AMD64 Modified: trunk/reactos/win32ss/drivers/videoprt/videoprt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/v… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/videoprt.spec [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/videoprt.spec [iso-8859-1] Mon Nov 11 20:11:23 2013 @@ -141,3 +141,4 @@ @ stdcall VideoPortZeroMemory(ptr long) NTOSKRNL.RtlZeroMemory @ stdcall VideoPortZeroDeviceMemory(ptr long) NTOSKRNL.RtlZeroMemory @ stdcall VpNotifyEaData(ptr ptr) +@ stdcall WdDdiWatchdogDpcCallback(ptr ptr ptr ptr) Propchange: trunk/reactos/win32ss/drivers/watchdog/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Nov 11 20:11:23 2013 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/win32ss/drivers/watchdog/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/win32ss/drivers/watchdog/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/win32ss/drivers/watchdog/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/win32ss/drivers/watchdog/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/watchdog/C… ============================================================================== --- trunk/reactos/win32ss/drivers/watchdog/CMakeLists.txt (added) +++ trunk/reactos/win32ss/drivers/watchdog/CMakeLists.txt [iso-8859-1] Mon Nov 11 20:11:23 2013 @@ -0,0 +1,11 @@ + +spec2def(watchdog.sys watchdog.spec) + +add_library(watchdog SHARED + watchdog.c + ${CMAKE_CURRENT_BINARY_DIR}/watchdog.def) + +set_module_type(watchdog kernelmodedriver) +add_importlibs(watchdog ntoskrnl) + +add_cd_file(TARGET watchdog DESTINATION reactos/system32/drivers FOR all) Propchange: trunk/reactos/win32ss/drivers/watchdog/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/win32ss/drivers/watchdog/watchdog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/watchdog/w… ============================================================================== --- trunk/reactos/win32ss/drivers/watchdog/watchdog.c (added) +++ trunk/reactos/win32ss/drivers/watchdog/watchdog.c [iso-8859-1] Mon Nov 11 20:11:23 2013 @@ -0,0 +1,238 @@ + +#include <ntifs.h> + +#define NDEBUG +#include <debug.h> + +extern char WatchdogPeHeader; +void Fixup_WatchdogPeHeader(void); + +NTSTATUS +NTAPI +DriverEntry ( + _In_ PDRIVER_OBJECT DriverObject, + _In_ PUNICODE_STRING RegistryPath) +{ + UNIMPLEMENTED; + return STATUS_SUCCESS; +} + +VOID +NTAPI +WdAllocateWatchdog( + PVOID p1, + PVOID p2, + ULONG p3) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +WdAllocateDeferredWatchdog( + PVOID p1, + PVOID p2, + ULONG p3) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +WdFreeWatchdog( + PVOID p1) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +WdFreeDeferredWatchdog( + PVOID p1) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +WdStartWatch( + PVOID p1, + LARGE_INTEGER p2, + ULONG p3) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +WdStartDeferredWatch( + PVOID p1, + PVOID p2, + ULONG p3) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +WdStopWatch( + PVOID p1, + ULONG p2) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +WdStopDeferredWatch( + PVOID p1) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +WdSuspendWatch( + PVOID p1) +{ + UNIMPLEMENTED; +} + +VOID +FASTCALL +WdSuspendDeferredWatch( + PVOID p1) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +WdResumeWatch( + PVOID p1) +{ + UNIMPLEMENTED; +} + +VOID +FASTCALL +WdResumeDeferredWatch( + PVOID p1) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +WdResetWatch( + PVOID p1) +{ + UNIMPLEMENTED; +} + +VOID +FASTCALL +WdResetDeferredWatch( + PVOID p1) +{ + UNIMPLEMENTED; +} + +VOID +FASTCALL +WdEnterMonitoredSection( + PVOID p1) +{ + UNIMPLEMENTED; +} + +VOID +FASTCALL +WdExitMonitoredSection( + PVOID p1) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +WdAttachContext( + PVOID p1, + PVOID p2) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +WdDetachContext( + PVOID p1) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +WdGetDeviceObject( + PVOID p1) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +WdGetLowestDeviceObject( + PVOID p1) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +WdGetLastEvent( + PVOID p1) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +WdCompleteEvent( + PVOID p1, + PVOID p2) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +WdReferenceObject( + PVOID p1) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +WdDereferenceObject( + PVOID p1) +{ + UNIMPLEMENTED; +} + +BOOLEAN +NTAPI +WdMadeAnyProgress( + PVOID p1) +{ + UNIMPLEMENTED; + return FALSE; +} + + + + + + + + Propchange: trunk/reactos/win32ss/drivers/watchdog/watchdog.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/win32ss/drivers/watchdog/watchdog.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/watchdog/w… ============================================================================== --- trunk/reactos/win32ss/drivers/watchdog/watchdog.spec (added) +++ trunk/reactos/win32ss/drivers/watchdog/watchdog.spec [iso-8859-1] Mon Nov 11 20:11:23 2013 @@ -0,0 +1,25 @@ +@ fastcall WdEnterMonitoredSection(ptr) +@ fastcall WdExitMonitoredSection(ptr) +@ fastcall WdResetDeferredWatch(ptr) +@ fastcall WdResumeDeferredWatch(ptr ptr) +@ fastcall WdSuspendDeferredWatch(ptr) +@ stdcall WdAllocateDeferredWatchdog(ptr ptr long) +@ stdcall WdAllocateWatchdog(ptr ptr long) +@ stdcall WdAttachContext(ptr ptr) +@ stdcall WdCompleteEvent(ptr ptr) +@ stdcall WdDereferenceObject(ptr) +@ stdcall WdDetachContext(ptr) +@ stdcall WdFreeDeferredWatchdog(ptr) +@ stdcall WdFreeWatchdog(ptr) +@ stdcall WdGetDeviceObject(ptr) +@ stdcall WdGetLastEvent(ptr) +@ stdcall WdGetLowestDeviceObject(ptr) +@ stdcall WdMadeAnyProgress(ptr) +@ stdcall WdReferenceObject(ptr) +@ stdcall WdResetWatch(ptr) +@ stdcall WdResumeWatch(ptr ptr) +@ stdcall WdStartDeferredWatch(ptr ptr long) +@ stdcall WdStartWatch(ptr double ptr) +@ stdcall WdStopDeferredWatch(ptr) +@ stdcall WdStopWatch(ptr long) +@ stdcall WdSuspendWatch(ptr) Propchange: trunk/reactos/win32ss/drivers/watchdog/watchdog.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/win32ss/reactx/dxapi/dxapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/dxapi/dxapi… ============================================================================== --- trunk/reactos/win32ss/reactx/dxapi/dxapi.spec [iso-8859-1] (original) +++ trunk/reactos/win32ss/reactx/dxapi/dxapi.spec [iso-8859-1] Mon Nov 11 20:11:23 2013 @@ -1,8 +1,7 @@ -@ stdcall DxApi(long ptr long ptr long) -@ stdcall DxApiGetVersion() -;DxApiInitialize -;DxAutoflipUpdate -;DxEnableIRQ -;DxLoseObject -;DxUpdateCapture -@ stdcall GsDriverEntry(ptr ptr) +@ stdcall _DxApi@20(long ptr long ptr long) DxApi +@ stdcall _DxApiGetVersion@0() DxApiGetVersion +@ stdcall _DxApiInitialize@32(ptr ptr ptr ptr ptr ptr ptr ptr) DxApiInitialize +@ stdcall _DxAutoflipUpdate@20(ptr ptr ptr ptr ptr) DxAutoflipUpdate +@ stdcall _DxEnableIRQ@8(ptr ptr) DxEnableIRQ +@ stdcall _DxLoseObject@8(ptr ptr) DxLoseObject +@ stdcall _DxUpdateCapture@12(ptr ptr ptr) DxUpdateCapture Modified: trunk/reactos/win32ss/reactx/dxapi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/dxapi/main.… ============================================================================== --- trunk/reactos/win32ss/reactx/dxapi/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/reactx/dxapi/main.c [iso-8859-1] Mon Nov 11 20:11:23 2013 @@ -12,33 +12,27 @@ #include "dxapi_driver.h" +#define NDEBU +#include <debug.h> + NTSTATUS NTAPI DriverEntry(IN PVOID Context1, IN PVOID Context2) { - /* + /* * NOTE this driver will never be load, it only contain export list * to win32k eng functions */ return STATUS_SUCCESS; } -NTSTATUS NTAPI -GsDriverEntry(IN PVOID Context1, - IN PVOID Context2) -{ - return DriverEntry(Context1, Context2); -} - - - /*++ * @name DxApiGetVersion * @implemented * * The function DxApiGetVersion return the dsound version, and it always return 4.02 * -* @return +* @return * Always return 4.02 * * @remarks. @@ -46,7 +40,7 @@ * *--*/ ULONG -PASCAL +NTAPI DxApiGetVersion() { /* MSDN say this always return Direct Sound version 4.02 */ @@ -59,14 +53,14 @@ * @name DxApi * @implemented * -* The function DxApi calls to diffent functions, follow functions +* The function DxApi calls to diffent functions, follow functions * are supported * DxGetVersionNumber, DxCloseHandle, DxOpenDirectDraw, DxOpenSurface, * DxOpenVideoPort, DxGetKernelCaps, DxGetFieldNumber, DxSetFieldNumber, * DxSetSkipPattern, DxGetSurfaceState, DxSetSurfaceState, DxLock, * DxFlipOverlay, DxFlipVideoPort, DxGetCurrentAutoflip, DxGetPreviousAutoflip, * DxRegisterEvent, DxUnregisterEvent, DxGetPolarity, DxOpenVpCatureDevice, -* DxAddVpCaptureBuffer, DxFlushVpCaptureBuffs +* DxAddVpCaptureBuffer, DxFlushVpCaptureBuffs * * See ddkmapi.h as well @@ -89,8 +83,8 @@ * Our size in bytes of the output buffer, rember wrong size will result in the function * does not being call. * -* @return -* Return Always 0. +* @return +* Return Always 0. * * @remarks. * before call to any of this functions, do not forget set lpvOutBuffer->ddRVal = DDERR_GEN*, @@ -99,7 +93,7 @@ *--*/ DWORD -PASCAL +NTAPI DxApi(IN DWORD dwFunctionNum, IN LPVOID lpvInBuffer, IN DWORD cbInBuffer, @@ -109,7 +103,7 @@ dwFunctionNum -= DD_FIRST_DXAPI; - if ((lpvOutBuffer == NULL) || + if ((lpvOutBuffer == NULL) || /*(dwFunctionNum < (DD_FIRST_DXAPI - DD_FIRST_DXAPI)) ||*/ (dwFunctionNum > (DD_DXAPI_FLUSHVPCAPTUREBUFFERS - DD_FIRST_DXAPI)) || (gDxApiEntryPoint[dwFunctionNum].pfn == NULL) || @@ -124,13 +118,69 @@ return 0; } +VOID +NTAPI +DxApiInitialize ( + PVOID p1, + PVOID p2, + PVOID p3, + PVOID p4, + PVOID p5, + PVOID p6, + PVOID p7, + PVOID p8) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +DxAutoflipUpdate ( + PVOID p1, + PVOID p2, + PVOID p3, + PVOID p4, + PVOID p5) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +DxEnableIRQ ( + PVOID p1, + PVOID p2) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +DxLoseObject ( + PVOID p1, + PVOID p2) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +DxUpdateCapture ( + PVOID p1, + PVOID p2, + PVOID p3) +{ + UNIMPLEMENTED; +} + + /*++ * @name DxGetVersionNumber * @implemented * * The function DxGetVersionNumber return dxapi interface version, that is 1.0 * -* @return +* @return * Always return 1.0 * * @remarks.

11 years, 1 month

[tkreuzer] 60951: [NTOSKRNL] Fix MmLoadSystemImage, to check the system32\drivers path for import modules as well. This should normally only be done for session loaded images, but since we don't su...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Nov 11 20:01:13 2013 New Revision: 60951 URL: http://svn.reactos.org/svn/reactos?rev=60951&view=rev Log: [NTOSKRNL] Fix MmLoadSystemImage, to check the system32\drivers path for import modules as well. This should normally only be done for session loaded images, but since we don't support that yet, we do it for all images, until this is fixed. Simplify (flatten) the code by adding a common failure label and use goto where appropriate. Stop leaking memory in failure case (MissingDriverName was never freed. It is leaked on windows 2003 as well) Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] Mon Nov 11 20:01:13 2013 @@ -984,6 +984,7 @@ OUT PWCHAR *MissingDriver, OUT PLOAD_IMPORTS *LoadImports) { + static UNICODE_STRING DriversFolderName = RTL_CONSTANT_STRING(L"drivers\\"); PCHAR MissingApiBuffer = *MissingApi, ImportName; PIMAGE_IMPORT_DESCRIPTOR ImportDescriptor, CurrentImport; ULONG ImportSize, ImportCount = 0, LoadedImportsSize, ExportSize; @@ -1002,6 +1003,9 @@ DPRINT("%s - ImageBase: %p. ImageFileDirectory: %wZ\n", __FUNCTION__, ImageBase, ImageFileDirectory); + /* No name string buffer yet */ + NameString.Buffer = NULL; + /* Assume no imports */ *LoadImports = MM_SYSLDR_NO_IMPORTS; @@ -1064,12 +1068,8 @@ if ((GdiLink) && (NormalLink)) { /* It's not, it's importing stuff it shouldn't be! */ - if (LoadedImports) - { - MiDereferenceImports(LoadedImports); - ExFreePoolWithTag(LoadedImports, TAG_LDR_IMPORTS); - } - return STATUS_PROCEDURE_NOT_FOUND; + Status = STATUS_PROCEDURE_NOT_FOUND; + goto Failure; } /* Check for user-mode printer or video card drivers, which don't belong */ @@ -1081,12 +1081,8 @@ !(_strnicmp(ImportName, "gdi32", sizeof("gdi32") - 1))) { /* This is not kernel code */ - if (LoadedImports) - { - MiDereferenceImports(LoadedImports); - ExFreePoolWithTag(LoadedImports, TAG_LDR_IMPORTS); - } - return STATUS_PROCEDURE_NOT_FOUND; + Status = STATUS_PROCEDURE_NOT_FOUND; + goto Failure; } /* Check if this is a "core" import, which doesn't get referenced */ @@ -1109,12 +1105,7 @@ if (!NT_SUCCESS(Status)) { /* Failed */ - if (LoadedImports) - { - MiDereferenceImports(LoadedImports); - ExFreePoolWithTag(LoadedImports, TAG_LDR_IMPORTS); - } - return Status; + goto Failure; } /* We don't support name prefixes yet */ @@ -1169,78 +1160,108 @@ DllName.Buffer = ExAllocatePoolWithTag(NonPagedPool, DllName.MaximumLength, TAG_LDR_WSTR); - if (DllName.Buffer) + if (!DllName.Buffer) { - /* Setup the base length and copy it */ - DllName.Length = ImageFileDirectory->Length; + /* We're out of resources */ + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Failure; + } + + /* Setup the base length and copy it */ + DllName.Length = ImageFileDirectory->Length; + RtlCopyMemory(DllName.Buffer, + ImageFileDirectory->Buffer, + ImageFileDirectory->Length); + + /* Now add the import name and null-terminate it */ + RtlAppendUnicodeStringToString(&DllName, + &NameString); + DllName.Buffer[DllName.Length / sizeof(WCHAR)] = UNICODE_NULL; + + /* Load the image */ + Status = MmLoadSystemImage(&DllName, + NamePrefix, + NULL, + FALSE, + (PVOID)&DllEntry, + &DllBase); + + /* win32k / GDI drivers can also import from system32 folder */ + if ((Status == STATUS_OBJECT_NAME_NOT_FOUND) && + (MI_IS_SESSION_ADDRESS(ImageBase) || 1)) // HACK + { + /* Free the old name buffer */ + ExFreePoolWithTag(DllName.Buffer, TAG_LDR_WSTR); + + /* Calculate size for a string the adds 'drivers\' */ + DllName.MaximumLength += DriversFolderName.Length; + + /* Allocate the new buffer */ + DllName.Buffer = ExAllocatePoolWithTag(NonPagedPool, + DllName.MaximumLength, + TAG_LDR_WSTR); + if (!DllName.Buffer) + { + /* We're out of resources */ + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Failure; + } + + /* Copy the image directory */ RtlCopyMemory(DllName.Buffer, ImageFileDirectory->Buffer, ImageFileDirectory->Length); + DllName.Length = ImageFileDirectory->Length; + + /* Append 'drivers\' folder name */ + RtlAppendUnicodeStringToString(&DllName, &DriversFolderName); /* Now add the import name and null-terminate it */ - RtlAppendUnicodeStringToString(&DllName, - &NameString); + RtlAppendUnicodeStringToString(&DllName, &NameString); DllName.Buffer[DllName.Length / sizeof(WCHAR)] = UNICODE_NULL; - /* Load the image */ + /* Try once again to load the image */ Status = MmLoadSystemImage(&DllName, NamePrefix, NULL, FALSE, (PVOID)&DllEntry, &DllBase); - if (NT_SUCCESS(Status)) - { - /* We can free the DLL Name */ - ExFreePoolWithTag(DllName.Buffer, TAG_LDR_WSTR); - } - else - { - /* Fill out the information for the error */ - *MissingDriver = DllName.Buffer; - *(PULONG)MissingDriver |= 1; - *MissingApi = NULL; - - DPRINT1("Failed to load dependency: %wZ\n", &DllName); - } } - else - { - /* We're out of resources */ - Status = STATUS_INSUFFICIENT_RESOURCES; - } - - /* Check if we're OK until now */ - if (NT_SUCCESS(Status)) - { - /* We're now loaded */ - Loaded = TRUE; - - /* Sanity check */ - ASSERT(DllBase == DllEntry->DllBase); - - /* Call the initialization routines */ - Status = MmCallDllInitialize(DllEntry, &PsLoadedModuleList); - if (!NT_SUCCESS(Status)) - { - /* We failed, unload the image */ - MmUnloadSystemImage(DllEntry); - ERROR_DBGBREAK("MmCallDllInitialize failed with status 0x%x\n", Status); - Loaded = FALSE; - } - } - - /* Check if we failed by here */ + if (!NT_SUCCESS(Status)) { + /* Fill out the information for the error */ + *MissingDriver = DllName.Buffer; + *(PULONG)MissingDriver |= 1; + *MissingApi = NULL; + + /* Don't free the name */ + DllName.Buffer = NULL; + /* Cleanup and return */ - RtlFreeUnicodeString(&NameString); - if (LoadedImports) - { - MiDereferenceImports(LoadedImports); - ExFreePoolWithTag(LoadedImports, TAG_LDR_IMPORTS); - } - return Status; + DPRINT1("Failed to load dependency: %wZ\n", &DllName); + goto Failure; + } + + /* We can free the DLL Name */ + ExFreePoolWithTag(DllName.Buffer, TAG_LDR_WSTR); + DllName.Buffer = NULL; + + /* We're now loaded */ + Loaded = TRUE; + + /* Sanity check */ + ASSERT(DllBase == DllEntry->DllBase); + + /* Call the initialization routines */ + Status = MmCallDllInitialize(DllEntry, &PsLoadedModuleList); + if (!NT_SUCCESS(Status)) + { + /* We failed, unload the image */ + MmUnloadSystemImage(DllEntry); + ERROR_DBGBREAK("MmCallDllInitialize failed with status 0x%x\n", Status); + Loaded = FALSE; } /* Loop again to make sure that everything is OK */ @@ -1271,13 +1292,9 @@ if (!ExportDirectory) { /* Cleanup and return */ - if (LoadedImports) - { - MiDereferenceImports(LoadedImports); - ExFreePoolWithTag(LoadedImports, TAG_LDR_IMPORTS); - } DPRINT1("Warning: Driver failed to load, %S not found\n", *MissingDriver); - return STATUS_DRIVER_ENTRYPOINT_NOT_FOUND; + Status = STATUS_DRIVER_ENTRYPOINT_NOT_FOUND; + goto Failure; } /* Make sure we have an IAT */ @@ -1304,12 +1321,7 @@ if (!NT_SUCCESS(Status)) { /* Cleanup and return */ - if (LoadedImports) - { - MiDereferenceImports(LoadedImports); - ExFreePoolWithTag(LoadedImports, TAG_LDR_IMPORTS); - } - return Status; + goto Failure; } /* Reset the buffer */ @@ -1386,6 +1398,22 @@ /* Return success */ return STATUS_SUCCESS; + +Failure: + + /* Cleanup and return */ + if (NameString.Buffer != NULL) + { + ExFreePoolWithTag(NameString.Buffer, TAG_LDR_WSTR); + } + + if (LoadedImports) + { + MiDereferenceImports(LoadedImports); + ExFreePoolWithTag(LoadedImports, TAG_LDR_IMPORTS); + } + + return Status; } VOID @@ -3177,6 +3205,7 @@ /* Resolve imports */ MissingApiName = Buffer; + MissingDriverName = NULL; Status = MiResolveImageReferences(ModuleLoadBase, &BaseDirectory, NULL, @@ -3186,6 +3215,13 @@ if (!NT_SUCCESS(Status)) { DPRINT1("MiResolveImageReferences failed with status 0x%x\n", Status); + DPRINT1(" Missing driver '%ws', missing API '%s'\n", + MissingDriverName, MissingApiName); + + if (MissingDriverName != NULL) + { + ExFreePoolWithTag(MissingDriverName, TAG_LDR_WSTR); + } /* Fail */ MiProcessLoaderEntry(LdrEntry, FALSE);

11 years, 1 month

[tkreuzer] 60950: [NTOSKRNL] Fix probing of parameters in IoCreateFile. Also move the allocation of the OpenPacket down a bit and get rid of 15 ExFreePool() invocations.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Nov 11 19:45:39 2013 New Revision: 60950 URL: http://svn.reactos.org/svn/reactos?rev=60950&view=rev Log: [NTOSKRNL] Fix probing of parameters in IoCreateFile. Also move the allocation of the OpenPacket down a bit and get rid of 15 ExFreePool() invocations. Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Mon Nov 11 19:45:39 2013 @@ -1719,10 +1719,6 @@ PAGED_CODE(); IOTRACE(IO_FILE_DEBUG, "FileName: %wZ\n", ObjectAttributes->ObjectName); - /* Allocate the open packet */ - OpenPacket = ExAllocatePoolWithTag(NonPagedPool, sizeof(*OpenPacket), 'pOoI'); - if (!OpenPacket) return STATUS_INSUFFICIENT_RESOURCES; - RtlZeroMemory(OpenPacket, sizeof(*OpenPacket)); /* Check if we have no parameter checking to do */ if (Options & IO_NO_PARAMETER_CHECKING) @@ -1736,35 +1732,31 @@ AccessMode = ExGetPreviousMode(); } - /* Check if the call came from user mode */ + /* Check if we need to do parameter checking */ if ((AccessMode != KernelMode) || (Options & IO_CHECK_CREATE_PARAMETERS)) { /* Validate parameters */ if (FileAttributes & ~FILE_ATTRIBUTE_VALID_FLAGS) { DPRINT1("File Create 'FileAttributes' Parameter contains invalid flags!\n"); - ExFreePool(OpenPacket); return STATUS_INVALID_PARAMETER; } if (ShareAccess & ~FILE_SHARE_VALID_FLAGS) { DPRINT1("File Create 'ShareAccess' Parameter contains invalid flags!\n"); - ExFreePool(OpenPacket); return STATUS_INVALID_PARAMETER; } if (Disposition > FILE_MAXIMUM_DISPOSITION) { DPRINT1("File Create 'Disposition' Parameter is out of range!\n"); - ExFreePool(OpenPacket); return STATUS_INVALID_PARAMETER; } if (CreateOptions & ~FILE_VALID_OPTION_FLAGS) { DPRINT1("File Create 'CreateOptions' parameter contains invalid flags!\n"); - ExFreePool(OpenPacket); return STATUS_INVALID_PARAMETER; } @@ -1772,14 +1764,12 @@ (!(DesiredAccess & SYNCHRONIZE))) { DPRINT1("File Create 'CreateOptions' parameter FILE_SYNCHRONOUS_IO_* requested, but 'DesiredAccess' does not have SYNCHRONIZE!\n"); - ExFreePool(OpenPacket); return STATUS_INVALID_PARAMETER; } if ((CreateOptions & FILE_DELETE_ON_CLOSE) && (!(DesiredAccess & DELETE))) { DPRINT1("File Create 'CreateOptions' parameter FILE_DELETE_ON_CLOSE requested, but 'DesiredAccess' does not have DELETE!\n"); - ExFreePool(OpenPacket); return STATUS_INVALID_PARAMETER; } @@ -1787,7 +1777,6 @@ (FILE_SYNCHRONOUS_IO_NONALERT | FILE_SYNCHRONOUS_IO_ALERT)) { DPRINT1("File Create 'FileAttributes' parameter both FILE_SYNCHRONOUS_IO_NONALERT and FILE_SYNCHRONOUS_IO_ALERT specified!\n"); - ExFreePool(OpenPacket); return STATUS_INVALID_PARAMETER; } @@ -1805,7 +1794,6 @@ FILE_OPEN_REPARSE_POINT))) { DPRINT1("File Create 'CreateOptions' Parameter has flags incompatible with FILE_DIRECTORY_FILE!\n"); - ExFreePool(OpenPacket); return STATUS_INVALID_PARAMETER; } @@ -1813,21 +1801,18 @@ (Disposition != FILE_CREATE) && (Disposition != FILE_OPEN) && (Disposition != FILE_OPEN_IF)) { DPRINT1("File Create 'CreateOptions' Parameter FILE_DIRECTORY_FILE requested, but 'Disposition' is not FILE_CREATE/FILE_OPEN/FILE_OPEN_IF!\n"); - ExFreePool(OpenPacket); return STATUS_INVALID_PARAMETER; } if ((CreateOptions & FILE_COMPLETE_IF_OPLOCKED) && (CreateOptions & FILE_RESERVE_OPFILTER)) { DPRINT1("File Create 'CreateOptions' Parameter both FILE_COMPLETE_IF_OPLOCKED and FILE_RESERVE_OPFILTER specified!\n"); - ExFreePool(OpenPacket); return STATUS_INVALID_PARAMETER; } if ((CreateOptions & FILE_NO_INTERMEDIATE_BUFFERING) && (DesiredAccess & FILE_APPEND_DATA)) { DPRINT1("File Create 'CreateOptions' parameter FILE_NO_INTERMEDIATE_BUFFERING requested, but 'DesiredAccess' FILE_APPEND_DATA requires it!\n"); - ExFreePool(OpenPacket); return STATUS_INVALID_PARAMETER; } @@ -1837,26 +1822,19 @@ /* Make sure we have extra parameters */ if (!ExtraCreateParameters) { - ExFreePool(OpenPacket); return STATUS_INVALID_PARAMETER; } /* Get the parameters and validate them */ NamedPipeCreateParameters = ExtraCreateParameters; if ((NamedPipeCreateParameters->NamedPipeType > FILE_PIPE_MESSAGE_TYPE) || - (NamedPipeCreateParameters->ReadMode > FILE_PIPE_MESSAGE_MODE) || - (NamedPipeCreateParameters->CompletionMode > FILE_PIPE_COMPLETE_OPERATION) || - (ShareAccess & FILE_SHARE_DELETE) || - ((Disposition < FILE_OPEN) || (Disposition > FILE_OPEN_IF)) || - (CreateOptions & ~FILE_VALID_PIPE_OPTION_FLAGS)) { /* Invalid named pipe create */ - ExFreePool(OpenPacket); return STATUS_INVALID_PARAMETER; } } @@ -1865,25 +1843,29 @@ /* Make sure we have extra parameters */ if (!ExtraCreateParameters) { - ExFreePool(OpenPacket); return STATUS_INVALID_PARAMETER; } /* Get the parameters and validate them */ if ((ShareAccess & FILE_SHARE_DELETE) || - !(ShareAccess & ~FILE_SHARE_WRITE) || - (Disposition != FILE_CREATE) || - (CreateOptions & ~FILE_VALID_MAILSLOT_OPTION_FLAGS)) { /* Invalid mailslot create */ - ExFreePool(OpenPacket); return STATUS_INVALID_PARAMETER; } } - + } + + /* Allocate the open packet */ + OpenPacket = ExAllocatePoolWithTag(NonPagedPool, sizeof(*OpenPacket), 'pOoI'); + if (!OpenPacket) return STATUS_INSUFFICIENT_RESOURCES; + RtlZeroMemory(OpenPacket, sizeof(*OpenPacket)); + + /* Check if the call came from user mode */ + if (AccessMode != KernelMode) + { _SEH2_TRY { /* Probe the output parameters */

11 years, 1 month

← Newer
1
...
18
19
20
21
22
23
24
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2013