Ros-diffs November 2010

ros-diffs@reactos.org

16 participants
491 discussions

[tkreuzer] 49708: [NTOSKRNL] Don't include initguid.h in a global header. It causes the guids to be generated in every object file, using 16 bytes per guid. We were lucky that the linker seemed to ...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Nov 22 14:08:41 2010 New Revision: 49708 URL: http://svn.reactos.org/svn/reactos?rev=49708&view=rev Log: [NTOSKRNL] Don't include initguid.h in a global header. It causes the guids to be generated in every object file, using 16 bytes per guid. We were lucky that the linker seemed to detect duplicates, so that the resulting image size isn't affected. Add a new file guid.c, that only contains the guids. Added: branches/cmake-bringup/ntoskrnl/po/guid.c (with props) Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt branches/cmake-bringup/ntoskrnl/include/internal/po.h Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/CMakeLis… ============================================================================== --- branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] Mon Nov 22 14:08:41 2010 @@ -215,6 +215,7 @@ ob/obsecure.c ob/obwait.c po/events.c + po/guid.c po/poshtdwn.c po/povolume.c po/power.c Modified: branches/cmake-bringup/ntoskrnl/include/internal/po.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/include/… ============================================================================== --- branches/cmake-bringup/ntoskrnl/include/internal/po.h [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/include/internal/po.h [iso-8859-1] Mon Nov 22 14:08:41 2010 @@ -6,7 +6,7 @@ * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ -#include "initguid.h" +#include <guiddef.h> #include <poclass.h> // Added: branches/cmake-bringup/ntoskrnl/po/guid.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/po/guid.… ============================================================================== --- branches/cmake-bringup/ntoskrnl/po/guid.c (added) +++ branches/cmake-bringup/ntoskrnl/po/guid.c [iso-8859-1] Mon Nov 22 14:08:41 2010 @@ -1,0 +1,4 @@ + +#include <wdm.h> +#include <initguid.h> +#include <poclass.h> Propchange: branches/cmake-bringup/ntoskrnl/po/guid.c ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 5 months

[tkreuzer] 49707: [REGEDIT] Fix syntax

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Nov 22 13:06:05 2010 New Revision: 49707 URL: http://svn.reactos.org/svn/reactos?rev=49707&view=rev Log: [REGEDIT] Fix syntax Modified: branches/cmake-bringup/base/applications/regedit/framewnd.c Modified: branches/cmake-bringup/base/applications/regedit/framewnd.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/regedit/framewnd.c [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/regedit/framewnd.c [iso-8859-1] Mon Nov 22 13:06:05 2010 @@ -360,12 +360,14 @@ TCHAR Caption[128]; LPCTSTR pszKeyPath; HKEY hRootKey; + LONG regUnloadResult; + /* get the item key to unload */ pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); /* load and set the caption and flags for dialog */ LoadString(hInst, IDS_UNLOAD_HIVE, Caption, COUNT_OF(Caption)); /* now unload the hive */ - LONG regUnloadResult = RegUnLoadKey(hRootKey, pszKeyPath); + regUnloadResult = RegUnLoadKey(hRootKey, pszKeyPath); if(regUnloadResult == ERROR_SUCCESS) { /* refresh tree and list views */

14 years, 5 months

[tkreuzer] 49706: [CMAKE] Don't automatically create and link manifest files on MSVC

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Nov 22 12:57:51 2010 New Revision: 49706 URL: http://svn.reactos.org/svn/reactos?rev=49706&view=rev Log: [CMAKE] Don't automatically create and link manifest files on MSVC Modified: branches/cmake-bringup/cmake/Platform/Windows-cl.cmake Modified: branches/cmake-bringup/cmake/Platform/Windows-cl.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/cmake/Platform/Wi… ============================================================================== --- branches/cmake-bringup/cmake/Platform/Windows-cl.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/cmake/Platform/Windows-cl.cmake [iso-8859-1] Mon Nov 22 12:57:51 2010 @@ -196,14 +196,14 @@ # default to Debug builds IF(MSVC_VERSION GREATER 1310) # for 2005 make sure the manifest is put in the dll with mt - SET(CMAKE_CXX_CREATE_SHARED_LIBRARY "<CMAKE_COMMAND> -E vs_link_dll ${CMAKE_CXX_CREATE_SHARED_LIBRARY}") - SET(CMAKE_CXX_CREATE_SHARED_MODULE "<CMAKE_COMMAND> -E vs_link_dll ${CMAKE_CXX_CREATE_SHARED_MODULE}") +# SET(CMAKE_CXX_CREATE_SHARED_LIBRARY "<CMAKE_COMMAND> -E vs_link_dll ${CMAKE_CXX_CREATE_SHARED_LIBRARY}") +# SET(CMAKE_CXX_CREATE_SHARED_MODULE "<CMAKE_COMMAND> -E vs_link_dll ${CMAKE_CXX_CREATE_SHARED_MODULE}") # create a C shared library - SET(CMAKE_C_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY}") +# SET(CMAKE_C_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY}") # create a C shared module just copy the shared library rule - SET(CMAKE_C_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE}") - SET(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_COMMAND> -E vs_link_exe ${CMAKE_CXX_LINK_EXECUTABLE}") - SET(CMAKE_C_LINK_EXECUTABLE "<CMAKE_COMMAND> -E vs_link_exe ${CMAKE_C_LINK_EXECUTABLE}") +# SET(CMAKE_C_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE}") +# SET(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_COMMAND> -E vs_link_exe ${CMAKE_CXX_LINK_EXECUTABLE}") +# SET(CMAKE_C_LINK_EXECUTABLE "<CMAKE_COMMAND> -E vs_link_exe ${CMAKE_C_LINK_EXECUTABLE}") SET(CMAKE_BUILD_TYPE_INIT Debug)

14 years, 5 months

[tkreuzer] 49705: [CMAKE] No precompiled headers for MSVC atm

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Nov 22 12:25:25 2010 New Revision: 49705 URL: http://svn.reactos.org/svn/reactos?rev=49705&view=rev Log: [CMAKE] No precompiled headers for MSVC atm Modified: branches/cmake-bringup/CMakeMacros.cmake branches/cmake-bringup/gcc.cmake branches/cmake-bringup/msc.cmake Modified: branches/cmake-bringup/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeMacros.cmake… ============================================================================== --- branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] Mon Nov 22 12:25:25 2010 @@ -1,31 +1,4 @@ -MACRO(_PCH_GET_COMPILE_FLAGS _target_name _out_compile_flags _header_filename) - - # Add the precompiled header to the build - get_filename_component(FILE ${_header_filename} NAME) - set(_gch_filename "${_target_name}_${FILE}.gch") - list(APPEND ${_out_compile_flags} -c ${_header_filename} -o ${_gch_filename}) - - # This gets us our includes - get_directory_property(DIRINC INCLUDE_DIRECTORIES) - foreach(item ${DIRINC}) - list(APPEND ${_out_compile_flags} -I${item}) - endforeach(item) - - # This is a particular bit of undocumented/hacky magic I'm quite proud of - get_directory_property(_compiler_flags DEFINITIONS) - string(REPLACE "\ " "\t" _compiler_flags ${_compiler_flags}) - list(APPEND ${_out_compile_flags} ${_compiler_flags}) - - # This gets any specific definitions that were added with set-target-property - get_target_property(_target_defs ${_target_name} COMPILE_DEFINITIONS) - if (_target_defs) - foreach(item ${_target_defs}) - list(APPEND ${_out_compile_flags} -D${item}) - endforeach(item) - endif() - -ENDMACRO(_PCH_GET_COMPILE_FLAGS) if (NOT MSVC) MACRO(CreateBootSectorTarget _target_name _asm_file _object_file) Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=497… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Mon Nov 22 12:25:25 2010 @@ -33,6 +33,32 @@ add_definitions(-Os -fno-strict-aliasing -ftracer -momit-leaf-frame-pointer -mpreferred-stack-boundary=2 -fno-set-stack-executable -fno-optimize-sibling-calls) # Macros +MACRO(_PCH_GET_COMPILE_FLAGS _target_name _out_compile_flags _header_filename) + # Add the precompiled header to the build + get_filename_component(FILE ${_header_filename} NAME) + set(_gch_filename "${_target_name}_${FILE}.gch") + list(APPEND ${_out_compile_flags} -c ${_header_filename} -o ${_gch_filename}) + + # This gets us our includes + get_directory_property(DIRINC INCLUDE_DIRECTORIES) + foreach(item ${DIRINC}) + list(APPEND ${_out_compile_flags} -I${item}) + endforeach(item) + + # This is a particular bit of undocumented/hacky magic I'm quite proud of + get_directory_property(_compiler_flags DEFINITIONS) + string(REPLACE "\ " "\t" _compiler_flags ${_compiler_flags}) + list(APPEND ${_out_compile_flags} ${_compiler_flags}) + + # This gets any specific definitions that were added with set-target-property + get_target_property(_target_defs ${_target_name} COMPILE_DEFINITIONS) + if (_target_defs) + foreach(item ${_target_defs}) + list(APPEND ${_out_compile_flags} -D${item}) + endforeach(item) + endif() +ENDMACRO(_PCH_GET_COMPILE_FLAGS) + MACRO(add_pch _target_name _header_filename _src_list) get_filename_component(FILE ${_header_filename} NAME) set(_gch_filename "${_target_name}_${FILE}.gch") Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=497… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Mon Nov 22 12:25:25 2010 @@ -26,12 +26,9 @@ MACRO(add_pch _target_name _header_filename _src_list) get_filename_component(FILE ${_header_filename} NAME) set(_gch_filename "${_target_name}_${FILE}.gch") - list(APPEND ${_src_list} ${_gch_filename}) - _PCH_GET_COMPILE_FLAGS(${_target_name} _args ${_header_filename}) - file(REMOVE ${_gch_filename}) add_custom_command( OUTPUT ${_gch_filename} - COMMAND ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1} ${_args} + COMMAND echo Ignoring precompiled header DEPENDS ${_header_filename}) ENDMACRO(add_pch _target_name _header_filename _src_list)

14 years, 5 months

[tkreuzer] 49704: [PAINT] Fix syntax

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Nov 22 09:55:50 2010 New Revision: 49704 URL: http://svn.reactos.org/svn/reactos?rev=49704&view=rev Log: [PAINT] Fix syntax Modified: branches/cmake-bringup/base/applications/paint/registry.c Modified: branches/cmake-bringup/base/applications/paint/registry.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/paint/registry.c [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/paint/registry.c [iso-8859-1] Mon Nov 22 09:55:50 2010 @@ -16,10 +16,10 @@ void SetWallpaper(TCHAR * FileName, DWORD dwStyle, DWORD dwTile) //FIXME: Has to be called 2x to apply the pattern (tiled/stretched) too { - SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, (PVOID) FileName, SPIF_UPDATEINIFILE); - HKEY hDesktop; TCHAR szStyle[3], szTile[3]; + + SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, (PVOID) FileName, SPIF_UPDATEINIFILE); if ((dwStyle > 2) || (dwTile > 2)) return;

14 years, 5 months

[tkreuzer] 49703: [PDSK] MIDL doesn't like if interfaces are not defined. Add some empty interfaces to activedbg.idl make it compile.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Nov 22 00:34:25 2010 New Revision: 49703 URL: http://svn.reactos.org/svn/reactos?rev=49703&view=rev Log: [PDSK] MIDL doesn't like if interfaces are not defined. Add some empty interfaces to activedbg.idl make it compile. Modified: branches/cmake-bringup/include/psdk/CMakeLists.txt branches/cmake-bringup/include/psdk/activdbg.idl Modified: branches/cmake-bringup/include/psdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/CMak… ============================================================================== --- branches/cmake-bringup/include/psdk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/CMakeLists.txt [iso-8859-1] Mon Nov 22 00:34:25 2010 @@ -2,6 +2,7 @@ LIST(APPEND SOURCE # access.idl activaut.idl + activdbg.idl activscp.idl asptlb.idl # asynot.idl @@ -98,7 +99,6 @@ if(NOT MSVC) LIST(APPEND SOURCE - activdbg.idl ctfutb.idl mlang.idl msctf.idl Modified: branches/cmake-bringup/include/psdk/activdbg.idl URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/acti… ============================================================================== --- branches/cmake-bringup/include/psdk/activdbg.idl [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/activdbg.idl [iso-8859-1] Mon Nov 22 00:34:25 2010 @@ -553,6 +553,77 @@ [out] BOOL *pfCallOnScriptErrorWhenContinuing); } +[ + object, + uuid(51973C17-CB0C-11d0-B5C9-00A0244A0E7A), + pointer_default(unique) +] +interface IDebugStackFrame : IUnknown +{ + /* FIXME: fill me! */ +} + +[ + object, + uuid(51973C1e-CB0C-11d0-B5C9-00A0244A0E7A), + pointer_default(unique) +] +interface IEnumDebugStackFrames : IUnknown +{ + /* FIXME: fill me! */ +} + +[ + object, + uuid(51973C2a-CB0C-11d0-B5C9-00A0244A0E7A), + pointer_default(unique) +] +interface IApplicationDebugger : IUnknown +{ + /* FIXME: fill me! */ +}; + +[ + object, + uuid(51973C3c-CB0C-11d0-B5C9-00A0244A0E7A), + pointer_default(unique) +] +interface IEnumRemoteDebugApplicationThreads : IUnknown +{ + /* FIXME: fill me! */ +} + +[ + object, + uuid(51973C34-CB0C-11d0-B5C9-00A0244A0E7A), + pointer_default(unique) +] +interface IDebugApplicationNode : IUnknown +{ + /* FIXME: fill me! */ +} + +[ + object, + uuid(51973C40-CB0C-11d0-B5C9-00A0244A0E7A), + pointer_default(unique) +] +interface IEnumDebugExpressionContexts : IUnknown +{ + /* FIXME: fill me! */ +} + +[ + object, + uuid(51973C38-CB0C-11d0-B5C9-00A0244A0E7A), + pointer_default(unique), + local +] +interface IDebugApplicationThread : IRemoteDebugApplicationThread +{ + /* FIXME: fill me! */ +} + cpp_quote("#ifndef DISABLE_ACTIVDBG_INTERFACE_WRAPPERS") cpp_quote("#ifdef _WIN64")

14 years, 5 months

[tkreuzer] 49702: [PSDK] Fix HTMLFormElement uuid and add missing retval in IHTMLDocument6 Add back some previously disabled idl files for msvc

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Nov 21 23:51:09 2010 New Revision: 49702 URL: http://svn.reactos.org/svn/reactos?rev=49702&view=rev Log: [PSDK] Fix HTMLFormElement uuid and add missing retval in IHTMLDocument6 Add back some previously disabled idl files for msvc Modified: branches/cmake-bringup/include/psdk/CMakeLists.txt branches/cmake-bringup/include/psdk/mshtml.idl Modified: branches/cmake-bringup/include/psdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/CMak… ============================================================================== --- branches/cmake-bringup/include/psdk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/CMakeLists.txt [iso-8859-1] Sun Nov 21 23:51:09 2010 @@ -2,6 +2,8 @@ LIST(APPEND SOURCE # access.idl activaut.idl + activscp.idl + asptlb.idl # asynot.idl # asysta.idl bdaiface.idl @@ -41,6 +43,7 @@ mscoree.idl msdadc.idl mshtmhst.idl + mshtml.idl msinkaut.idl mstask.idl msxml.idl @@ -72,6 +75,7 @@ # sesprp.idl shdeprecated.idl shldisp.idl + shobjidl.idl shtypes.idl # stdole2.idl strmif.idl @@ -94,14 +98,10 @@ if(NOT MSVC) LIST(APPEND SOURCE - activscp.idl activdbg.idl - asptlb.idl ctfutb.idl mlang.idl msctf.idl - mshtml.idl - shobjidl.idl wincodec.idl wuapi.idl ) Modified: branches/cmake-bringup/include/psdk/mshtml.idl URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/msht… ============================================================================== --- branches/cmake-bringup/include/psdk/mshtml.idl [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/mshtml.idl [iso-8859-1] Sun Nov 21 23:51:09 2010 @@ -20,6 +20,10 @@ #include <mshtmdid.h> #include <mshtmcid.h> #include <olectl.h> + +#if defined(_MSC_VER) && (__midl >= 501) +midl_pragma warning(disable: 2362) +#endif import "ocidl.idl"; import "dimm.idl"; @@ -6909,7 +6913,7 @@ [ noncreatable, - uuid(3050F24D-98B5-11CF-BB82-00AA00BDCE0B) + uuid(3050F251-98B5-11CF-BB82-00AA00BDCE0B) ] coclass HTMLFormElement { @@ -12453,13 +12457,13 @@ HRESULT onstorage([in] VARIANT v); [propget, id(DISPID_IHTMLDOCUMENT6_ONSTORAGE), displaybind, bindable] - HRESULT onstorage([out] VARIANT *p); + HRESULT onstorage([retval, out] VARIANT *p); [propput, id(DISPID_IHTMLDOCUMENT6_ONSTORAGECOMMIT), displaybind, bindable] HRESULT onstoragecommit([in] VARIANT v); [propget, id(DISPID_IHTMLDOCUMENT6_ONSTORAGECOMMIT), displaybind, bindable] - HRESULT onstoragecommit([out] VARIANT *p); + HRESULT onstoragecommit([retval, out] VARIANT *p); [id(DISPID_IHTMLDOCUMENT6_IE8_GETELEMENTBYID)] HRESULT getElementById(

14 years, 5 months

[ekohl] 49701: [NPFS/KERNEL32] Switch back to the old pipe wait code but keep the new code in place (disabled).

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Nov 21 23:15:11 2010 New Revision: 49701 URL: http://svn.reactos.org/svn/reactos?rev=49701&view=rev Log: [NPFS/KERNEL32] Switch back to the old pipe wait code but keep the new code in place (disabled). Modified: trunk/reactos/dll/win32/kernel32/file/npipe.c trunk/reactos/drivers/filesystems/npfs/create.c trunk/reactos/drivers/filesystems/npfs/fsctrl.c Modified: trunk/reactos/dll/win32/kernel32/file/npipe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/np… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/npipe.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/npipe.c [iso-8859-1] Sun Nov 21 23:15:11 2010 @@ -14,7 +14,7 @@ #include <debug.h> DEBUG_CHANNEL(kernel32file); -#define USING_PROPER_NPFS_WAIT_SEMANTICS +//#define USING_PROPER_NPFS_WAIT_SEMANTICS /* FUNCTIONS ****************************************************************/ @@ -265,6 +265,16 @@ /* + * When NPFS will work properly, use this code instead. It is compatible with + * Microsoft's NPFS.SYS. The main difference is that: + * - This code actually respects the timeout instead of ignoring it! + * - This code validates and creates the proper names for both UNC and local pipes + * - On NT, you open the *root* pipe directory (either \DosDevices\Pipe or + * \DosDevices\Unc\Server\Pipe) and then send the pipe to wait on in the + * FILE_PIPE_WAIT_FOR_BUFFER structure. + */ +#ifdef USING_PROPER_NPFS_WAIT_SEMANTICS +/* * @implemented */ BOOL @@ -448,6 +458,95 @@ /* Success */ return TRUE; } +#else +/* + * @implemented + */ +BOOL +WINAPI +WaitNamedPipeW(LPCWSTR lpNamedPipeName, + DWORD nTimeOut) +{ + UNICODE_STRING NamedPipeName; + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + FILE_PIPE_WAIT_FOR_BUFFER WaitPipe; + HANDLE FileHandle; + IO_STATUS_BLOCK Iosb; + + if (RtlDosPathNameToNtPathName_U(lpNamedPipeName, + &NamedPipeName, + NULL, + NULL) == FALSE) + { + return FALSE; + } + + InitializeObjectAttributes(&ObjectAttributes, + &NamedPipeName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenFile(&FileHandle, + FILE_READ_ATTRIBUTES | SYNCHRONIZE, + &ObjectAttributes, + &Iosb, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + RtlFreeUnicodeString(&NamedPipeName); + return FALSE; + } + + /* Check what timeout we got */ + if (nTimeOut == NMPWAIT_USE_DEFAULT_WAIT) + { + /* Don't use a timeout */ + WaitPipe.TimeoutSpecified = FALSE; + } + else + { + /* Check if we should wait forever */ + if (nTimeOut == NMPWAIT_WAIT_FOREVER) + { + /* Set the max */ + WaitPipe.Timeout.LowPart = 0; + WaitPipe.Timeout.HighPart = 0x80000000; + } + else + { + /* Convert to NT format */ + WaitPipe.Timeout.QuadPart = UInt32x32To64(-10000, nTimeOut); + } + + /* In both cases, we do have a timeout */ + WaitPipe.TimeoutSpecified = TRUE; + } + + Status = NtFsControlFile(FileHandle, + NULL, + NULL, + NULL, + &Iosb, + FSCTL_PIPE_WAIT, + &WaitPipe, + sizeof(WaitPipe), + NULL, + 0); + NtClose(FileHandle); + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + RtlFreeUnicodeString(&NamedPipeName); + return FALSE; + } + + RtlFreeUnicodeString(&NamedPipeName); + return TRUE; +} +#endif /* Modified: trunk/reactos/drivers/filesystems/npfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] Sun Nov 21 23:15:11 2010 @@ -12,6 +12,8 @@ #define NDEBUG #include <debug.h> + +//#define USING_PROPER_NPFS_WAIT_SEMANTICS /* FUNCTIONS *****************************************************************/ @@ -146,6 +148,9 @@ PNPFS_VCB Vcb; ACCESS_MASK DesiredAccess; NTSTATUS Status; +#ifndef USING_PROPER_NPFS_WAIT_SEMANTICS + BOOLEAN SpecialAccess; +#endif DPRINT("NpfsCreate(DeviceObject %p Irp %p)\n", DeviceObject, Irp); @@ -160,6 +165,14 @@ DPRINT("FileName %wZ\n", &FileObject->FileName); Irp->IoStatus.Information = 0; + +#ifndef USING_PROPER_NPFS_WAIT_SEMANTICS + SpecialAccess = ((DesiredAccess & SPECIFIC_RIGHTS_ALL) == FILE_READ_ATTRIBUTES); + if (SpecialAccess) + { + DPRINT("NpfsCreate() open client end for special use!\n"); + } +#endif if (FileName->Length == 2 && FileName->Buffer[0] == L'\\' && RelatedFileObject == NULL) { @@ -217,8 +230,11 @@ ClientCcb->Fcb = Fcb; ClientCcb->PipeEnd = FILE_PIPE_CLIENT_END; ClientCcb->OtherSide = NULL; -// ClientCcb->PipeState = SpecialAccess ? 0 : FILE_PIPE_DISCONNECTED_STATE; +#ifndef USING_PROPER_NPFS_WAIT_SEMANTICS + ClientCcb->PipeState = SpecialAccess ? 0 : FILE_PIPE_DISCONNECTED_STATE; +#else ClientCcb->PipeState = FILE_PIPE_DISCONNECTED_STATE; +#endif InitializeListHead(&ClientCcb->ReadRequestListHead); DPRINT("CCB: %p\n", ClientCcb); @@ -256,10 +272,10 @@ /* * Step 3. Search for listening server CCB. */ -/* +#ifndef USING_PROPER_NPFS_WAIT_SEMANTICS if (!SpecialAccess) { -*/ +#endif /* * WARNING: Point of no return! Once we get the server CCB it's * possible that we completed a wait request and so we have to @@ -315,7 +331,7 @@ /* FIXME: Merge this with the NpfsFindListeningServerInstance routine. */ NpfsSignalAndRemoveListeningServerInstance(Fcb, ServerCcb); } -/* +#ifndef USING_PROPER_NPFS_WAIT_SEMANTICS } else if (IsListEmpty(&Fcb->ServerCcbListHead)) { @@ -333,7 +349,7 @@ IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_UNSUCCESSFUL; } -*/ +#endif /* * Step 4. Add the client CCB to a list and connect it if possible. Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] Sun Nov 21 23:15:11 2010 @@ -15,6 +15,8 @@ #define NDEBUG #include <debug.h> +//#define USING_PROPER_NPFS_WAIT_SEMANTICS + /* FUNCTIONS *****************************************************************/ static DRIVER_CANCEL NpfsListeningCancelRoutine; @@ -293,18 +295,21 @@ PNPFS_CCB Ccb) { PLIST_ENTRY current_entry; - PNPFS_VCB Vcb; PNPFS_FCB Fcb; PNPFS_CCB ServerCcb; PFILE_PIPE_WAIT_FOR_BUFFER WaitPipe; LARGE_INTEGER TimeOut; + NTSTATUS Status; +#ifdef USING_PROPER_NPFS_WAIT_SEMANTICS + PNPFS_VCB Vcb; UNICODE_STRING PipeName; - NTSTATUS Status; +#endif DPRINT("NpfsWaitPipe\n"); WaitPipe = (PFILE_PIPE_WAIT_FOR_BUFFER)Irp->AssociatedIrp.SystemBuffer; +#ifdef USING_PROPER_NPFS_WAIT_SEMANTICS /* Fail, if the CCB does not represent the root directory */ if (Ccb->Type != CCB_DIRECTORY) return STATUS_ILLEGAL_FUNCTION; @@ -352,6 +357,15 @@ } DPRINT("Fcb %p\n", Fcb); +#else + Fcb = Ccb->Fcb; + + if (Ccb->PipeState != 0) + { + DPRINT("Pipe is not in passive (waiting) state!\n"); + return STATUS_UNSUCCESSFUL; + } +#endif /* search for listening server */ current_entry = Fcb->ServerCcbListHead.Flink;

14 years, 5 months

[tkreuzer] 49700: [PSDK] Fix IRequestDictionary uuid

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Nov 21 21:27:57 2010 New Revision: 49700 URL: http://svn.reactos.org/svn/reactos?rev=49700&view=rev Log: [PSDK] Fix IRequestDictionary uuid Modified: branches/cmake-bringup/include/psdk/asptlb.idl Modified: branches/cmake-bringup/include/psdk/asptlb.idl URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/aspt… ============================================================================== --- branches/cmake-bringup/include/psdk/asptlb.idl [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/asptlb.idl [iso-8859-1] Sun Nov 21 21:27:57 2010 @@ -23,7 +23,7 @@ [ object, dual, - uuid(D97A6DA0-A864-11cf-83BE-00A0C90C2BD8) + uuid(D97A6DA0-A85F-11df-83AE-00A0C90C2BD8) ] interface IRequestDictionary : IDispatch {

14 years, 5 months

[tkreuzer] 49699: [PSDK] Fix ITravelLog uuid

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Nov 21 21:20:17 2010 New Revision: 49699 URL: http://svn.reactos.org/svn/reactos?rev=49699&view=rev Log: [PSDK] Fix ITravelLog uuid Modified: branches/cmake-bringup/include/psdk/shobjidl.idl Modified: branches/cmake-bringup/include/psdk/shobjidl.idl URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/shob… ============================================================================== --- branches/cmake-bringup/include/psdk/shobjidl.idl [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/shobjidl.idl [iso-8859-1] Sun Nov 21 21:20:17 2010 @@ -2224,7 +2224,7 @@ * ITravelLog interface */ [ - uuid(02BA3B52-0547-11D1-B833-00C04FC9B31F), + uuid(66A9CB08-4802-11d2-A561-00A0C92DBFE8), object, pointer_default(unique), local

14 years, 5 months

← Newer
1
...
15
16
17
18
19
20
21
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2010