Ros-diffs July 2013

ros-diffs@reactos.org

13 participants
199 discussions

[ekohl] 59484: [SAMSRV] Implement SamIFree_SAMPR_GET_MEMBERS_BUFFER.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jul 14 14:22:30 2013 New Revision: 59484 URL: http://svn.reactos.org/svn/reactos?rev=59484&view=rev Log: [SAMSRV] Implement SamIFree_SAMPR_GET_MEMBERS_BUFFER. Modified: trunk/reactos/dll/win32/samsrv/samsrv.c trunk/reactos/dll/win32/samsrv/samsrv.spec Modified: trunk/reactos/dll/win32/samsrv/samsrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] Sun Jul 14 14:22:30 2013 @@ -181,6 +181,23 @@ VOID NTAPI +SamIFree_SAMPR_GET_MEMBERS_BUFFER(PSAMPR_GET_MEMBERS_BUFFER Ptr) +{ + if (Ptr != NULL) + { + if (Ptr->Members != NULL) + MIDL_user_free(Ptr->Members); + + if (Ptr->Attributes != NULL) + MIDL_user_free(Ptr->Attributes); + + MIDL_user_free(Ptr); + } +} + + +VOID +NTAPI SamIFree_SAMPR_PSID_ARRAY(PSAMPR_PSID_ARRAY Ptr) { if (Ptr != NULL) Modified: trunk/reactos/dll/win32/samsrv/samsrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.sp… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.spec [iso-8859-1] Sun Jul 14 14:22:30 2013 @@ -22,7 +22,7 @@ @ stub SamIFree_SAMPR_DOMAIN_INFO_BUFFER @ stdcall SamIFree_SAMPR_ENUMERATION_BUFFER(ptr) @ stdcall SamIFree_SAMPR_GET_GROUPS_BUFFER(ptr) -@ stub SamIFree_SAMPR_GET_MEMBERS_BUFFER +@ stdcall SamIFree_SAMPR_GET_MEMBERS_BUFFER(ptr) @ stub SamIFree_SAMPR_GROUP_INFO_BUFFER @ stdcall SamIFree_SAMPR_PSID_ARRAY(ptr) @ stdcall SamIFree_SAMPR_RETURNED_USTRING_ARRAY(ptr)

11 years, 5 months

[tfaber] 59483: [BROWSEUI] - This is not Wine source. Remove hacks accordingly

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jul 14 13:18:32 2013 New Revision: 59483 URL: http://svn.reactos.org/svn/reactos?rev=59483&view=rev Log: [BROWSEUI] - This is not Wine source. Remove hacks accordingly Modified: trunk/reactos/dll/win32/browseui/CMakeLists.txt trunk/reactos/dll/win32/browseui/bandsitemenu.cpp trunk/reactos/dll/win32/browseui/browseui.cpp trunk/reactos/dll/win32/browseui/shellbrowser.cpp Modified: trunk/reactos/dll/win32/browseui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/browseui/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/CMakeLists.txt [iso-8859-1] Sun Jul 14 13:18:32 2013 @@ -1,8 +1,5 @@ set_cpp(WITH_RUNTIME) - -add_definitions( - -D__WINESRC__) remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) @@ -38,12 +35,6 @@ ${SOURCE} browseui.rc) -if(NOT MSVC) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #allow_warnings(browseui) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") -endif() - set_module_type(browseui win32dll UNICODE) target_link_libraries(browseui Modified: trunk/reactos/dll/win32/browseui/bandsitemenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandsit… ============================================================================== --- trunk/reactos/dll/win32/browseui/bandsitemenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/bandsitemenu.cpp [iso-8859-1] Sun Jul 14 13:18:32 2013 @@ -40,7 +40,7 @@ HRESULT STDMETHODCALLTYPE CBandSiteMenu::QueryContextMenu( HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) { - FIXME("(%p, %p, %p, %p, %p, %p)\n", this, hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags); + FIXME("(%p, %p, %u, %u, %u, 0x%x)\n", this, hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags); return E_NOTIMPL; } @@ -53,7 +53,7 @@ HRESULT STDMETHODCALLTYPE CBandSiteMenu::GetCommandString(UINT_PTR idCmd, UINT uType, UINT *pwReserved, LPSTR pszName, UINT cchMax) { - FIXME("(%p, %p, %p, %p, %p, %p)\n", this, idCmd, uType, pwReserved, pszName, cchMax); + FIXME("(%p, %p, %u, %p, %p, %u)\n", this, idCmd, uType, pwReserved, pszName, cchMax); return E_NOTIMPL; } @@ -65,6 +65,6 @@ HRESULT STDMETHODCALLTYPE CBandSiteMenu::HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plResult) { - FIXME("(%p, %u, %p, %p, %p)\n", this, uMsg, wParam, lParam); + FIXME("(%p, %u, %p, %p, %p)\n", this, uMsg, wParam, lParam, plResult); return E_NOTIMPL; } Modified: trunk/reactos/dll/win32/browseui/browseui.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/browseui.cpp [iso-8859-1] Sun Jul 14 13:18:32 2013 @@ -110,7 +110,7 @@ /*********************************************************************** * DllGetVersion (BROWSEUI.@) */ -HRESULT WINAPI DllGetVersion(DLLVERSIONINFO *info) +STDAPI DllGetVersion(DLLVERSIONINFO *info) { if (info->cbSize != sizeof(DLLVERSIONINFO)) FIXME("support DLLVERSIONINFO2\n"); Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Sun Jul 14 13:18:32 2013 @@ -532,13 +532,6 @@ virtual HRESULT STDMETHODCALLTYPE get_Document(IDispatch **ppDisp); virtual HRESULT STDMETHODCALLTYPE get_TopLevelContainer(VARIANT_BOOL *pBool); virtual HRESULT STDMETHODCALLTYPE get_Type(BSTR *Type); - -// WIDL temp hack : when the interface contains 'long' WIDL writes it out as a 'LONG' -// Setting the prototype to LONG in this class breaks building with MSVC so we use -// the correct 'long' type here and temp hack it for WIDL generated prototypes. -#ifdef __exdisp_h__ -#define long LONG -#endif virtual HRESULT STDMETHODCALLTYPE get_Left(long *pl); virtual HRESULT STDMETHODCALLTYPE put_Left(long Left); virtual HRESULT STDMETHODCALLTYPE get_Top(long *pl); @@ -547,9 +540,6 @@ virtual HRESULT STDMETHODCALLTYPE put_Width(long Width); virtual HRESULT STDMETHODCALLTYPE get_Height(long *pl); virtual HRESULT STDMETHODCALLTYPE put_Height(long Height); -#ifdef __exdisp_h__ -#undef long -#endif virtual HRESULT STDMETHODCALLTYPE get_LocationName(BSTR *LocationName); virtual HRESULT STDMETHODCALLTYPE get_LocationURL(BSTR *LocationURL); virtual HRESULT STDMETHODCALLTYPE get_Busy(VARIANT_BOOL *pBool); @@ -612,9 +602,6 @@ virtual HRESULT STDMETHODCALLTYPE SaveHistory(IStream *pStream); virtual HRESULT STDMETHODCALLTYPE SetPositionCookie(DWORD dwPositioncookie); virtual HRESULT STDMETHODCALLTYPE GetPositionCookie(DWORD *pdwPositioncookie); - - // *** IBrowserService2 methods *** - // message handlers LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);

11 years, 5 months

[tfaber] 59482: [IEFRAME][MSHTML_WINETEST] - Use SHANDLE_PTR in IWebBrowserApp::get_HWND. Already sent to Wine.

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jul 14 13:01:55 2013 New Revision: 59482 URL: http://svn.reactos.org/svn/reactos?rev=59482&view=rev Log: [IEFRAME][MSHTML_WINETEST] - Use SHANDLE_PTR in IWebBrowserApp::get_HWND. Already sent to Wine. Modified: trunk/reactos/dll/win32/ieframe/CMakeLists.txt trunk/reactos/dll/win32/ieframe/ie.c trunk/reactos/dll/win32/ieframe/webbrowser.c trunk/rostests/winetests/mshtml/CMakeLists.txt trunk/rostests/winetests/mshtml/htmldoc.c Modified: trunk/reactos/dll/win32/ieframe/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/ieframe/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/CMakeLists.txt [iso-8859-1] Sun Jul 14 13:01:55 2013 @@ -28,12 +28,6 @@ add_library(ieframe SHARED ${SOURCE} ieframe.rc) -if(NOT MSVC) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #allow_warnings(aclui) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") -endif() - add_typelib(ieframe_v1.idl) list(APPEND ieframe_rc_deps Modified: trunk/reactos/dll/win32/ieframe/ie.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ie.c?rev… ============================================================================== --- trunk/reactos/dll/win32/ieframe/ie.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/ie.c [iso-8859-1] Sun Jul 14 13:01:55 2013 @@ -358,7 +358,7 @@ return E_NOTIMPL; } -static HRESULT WINAPI InternetExplorer_get_HWND(IWebBrowser2 *iface, LONG *pHWND) +static HRESULT WINAPI InternetExplorer_get_HWND(IWebBrowser2 *iface, SHANDLE_PTR *pHWND) { InternetExplorer *This = impl_from_IWebBrowser2(iface); FIXME("(%p)->(%p)\n", This, pHWND); Modified: trunk/reactos/dll/win32/ieframe/webbrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/webbrows… ============================================================================== --- trunk/reactos/dll/win32/ieframe/webbrowser.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/webbrowser.c [iso-8859-1] Sun Jul 14 13:01:55 2013 @@ -565,7 +565,7 @@ return S_OK; } -static HRESULT WINAPI WebBrowser_get_HWND(IWebBrowser2 *iface, LONG *pHWND) +static HRESULT WINAPI WebBrowser_get_HWND(IWebBrowser2 *iface, SHANDLE_PTR *pHWND) { WebBrowser *This = impl_from_IWebBrowser2(iface); Modified: trunk/rostests/winetests/mshtml/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/CMakeLis… ============================================================================== --- trunk/rostests/winetests/mshtml/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/CMakeLists.txt [iso-8859-1] Sun Jul 14 13:01:55 2013 @@ -28,12 +28,6 @@ set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS "${mshtml_winetest_rc_deps}") -if(NOT MSVC) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #allow_warnings(mshtml_winetest) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") -endif() - target_link_libraries(mshtml_winetest wine uuid strmiids) set_module_type(mshtml_winetest win32cui) add_importlibs(mshtml_winetest wininet ole32 oleaut32 user32 gdi32 urlmon advapi32 msvcrt kernel32 ntdll) Modified: trunk/rostests/winetests/mshtml/htmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/htmldoc.… ============================================================================== --- trunk/rostests/winetests/mshtml/htmldoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/htmldoc.c [iso-8859-1] Sun Jul 14 13:01:55 2013 @@ -4176,7 +4176,7 @@ return E_NOTIMPL; } -static HRESULT WINAPI WebBrowser_get_HWND(IWebBrowser2 *iface, LONG *pHWND) +static HRESULT WINAPI WebBrowser_get_HWND(IWebBrowser2 *iface, SHANDLE_PTR *pHWND) { ok(0, "unexpected call\n"); return E_NOTIMPL;

11 years, 5 months

[tfaber] 59481: [CMAKE] - Do not allow add_delay_importlibs to be called on static libraries

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jul 14 11:44:21 2013 New Revision: 59481 URL: http://svn.reactos.org/svn/reactos?rev=59481&view=rev Log: [CMAKE] - Do not allow add_delay_importlibs to be called on static libraries Modified: trunk/reactos/cmake/gcc.cmake trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=59481&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sun Jul 14 11:44:21 2013 @@ -211,11 +211,15 @@ endif() endfunction() -function(add_delay_importlibs MODULE) +function(add_delay_importlibs _module) + get_target_property(_module_type ${_module} TYPE) + if(_module_type STREQUAL "STATIC_LIBRARY") + message(FATAL_ERROR "Cannot add delay imports to a static library") + endif() foreach(LIB ${ARGN}) - target_link_libraries(${MODULE} lib${LIB}_delayed) + target_link_libraries(${_module} lib${LIB}_delayed) endforeach() - target_link_libraries(${MODULE} delayimp) + target_link_libraries(${_module} delayimp) endfunction() if(NOT ARCH STREQUAL "i386") Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=59481… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sun Jul 14 11:44:21 2013 @@ -128,13 +128,17 @@ #define those for having real libraries set(CMAKE_IMPLIB_CREATE_STATIC_LIBRARY "LINK /LIB /NOLOGO <LINK_FLAGS> /OUT:<TARGET> <OBJECTS>") set(CMAKE_STUB_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> /Cp /Fo<OBJECT> /c /Ta <SOURCE>") -macro(add_delay_importlibs MODULE) +function(add_delay_importlibs _module) + get_target_property(_module_type ${_module} TYPE) + if(_module_type STREQUAL "STATIC_LIBRARY") + message(FATAL_ERROR "Cannot add delay imports to a static library") + endif() foreach(LIB ${ARGN}) - add_target_link_flags(${MODULE} "/DELAYLOAD:${LIB}.dll") - target_link_libraries(${MODULE} lib${LIB}) + add_target_link_flags(${_module} "/DELAYLOAD:${LIB}.dll") + target_link_libraries(${_module} lib${LIB}) endforeach() - target_link_libraries(${MODULE} delayimp) -endmacro() + target_link_libraries(${_module} delayimp) +endfunction() function(generate_import_lib _libname _dllname _spec_file)

11 years, 5 months

[hbelusca] 59480: [WINSRV] Fix a delayed-imports problem, catched by Timo and Thomas with a MSVC build. Caused by the fact that the static library consrv specified delayed imports for it, thinking ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jul 14 11:33:26 2013 New Revision: 59480 URL: http://svn.reactos.org/svn/reactos?rev=59480&view=rev Log: [WINSRV] Fix a delayed-imports problem, catched by Timo and Thomas with a MSVC build. Caused by the fact that the static library consrv specified delayed imports for it, thinking that they will be added to the list of delayed imports of winsrv. In fact it doesn't work and those imports become real imports. Modified: trunk/reactos/win32ss/user/winsrv/CMakeLists.txt trunk/reactos/win32ss/user/winsrv/consrv.cmake Modified: trunk/reactos/win32ss/user/winsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/CMakeL… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/CMakeLists.txt [iso-8859-1] Sun Jul 14 11:33:26 2013 @@ -18,12 +18,13 @@ # Add the components target_link_libraries(winsrv consrv usersrv) -target_link_libraries(winsrv win32ksys ${PSEH_LIB}) # win32ksys because of NtUser...() +# Add win32ksys because of NtUser...() +target_link_libraries(winsrv win32ksys ${PSEH_LIB} ${CONSRV_TARGET_LINK_LIBS}) set_module_type(winsrv win32dll UNICODE) -add_importlibs(winsrv msvcrt kernel32 ntdll csrsrv) -add_delay_importlibs(winsrv user32 gdi32 advapi32) +add_importlibs(winsrv msvcrt kernel32 ntdll csrsrv ${CONSRV_IMPORT_LIBS}) +add_delay_importlibs(winsrv user32 gdi32 advapi32 ${CONSRV_DELAY_IMPORT_LIBS}) add_dependencies(winsrv bugcodes) add_cd_file(TARGET winsrv DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/win32ss/user/winsrv/consrv.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv.cmake [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv.cmake [iso-8859-1] Sun Jul 14 11:33:26 2013 @@ -45,8 +45,8 @@ add_library(consrv ${CONSRV_SOURCE}) #add_object_library(consrv ${CONSRV_SOURCE}) -add_importlibs(consrv psapi) # And the default ones from winsrv -add_delay_importlibs(consrv ole32) # And the default ones from winsrv -target_link_libraries(consrv uuid) # And the default ones from winsrv +list(APPEND CONSRV_IMPORT_LIBS psapi) +list(APPEND CONSRV_DELAY_IMPORT_LIBS ole32) +list(APPEND CONSRV_TARGET_LINK_LIBS uuid) set_module_type(consrv module UNICODE)

11 years, 5 months

[tfaber] 59479: [MSHTML_WINETEST] - Use winetest_interactive to disable tests

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jul 14 10:11:45 2013 New Revision: 59479 URL: http://svn.reactos.org/svn/reactos?rev=59479&view=rev Log: [MSHTML_WINETEST] - Use winetest_interactive to disable tests Modified: trunk/rostests/winetests/mshtml/activex.c trunk/rostests/winetests/mshtml/htmldoc.c Modified: trunk/rostests/winetests/mshtml/activex.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/activex.… ============================================================================== --- trunk/rostests/winetests/mshtml/activex.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/activex.c [iso-8859-1] Sun Jul 14 10:11:45 2013 @@ -2435,14 +2435,18 @@ /* Set in DoVerb */ CHECK_CALLED(InPlaceObject_GetWindow); CHECK_CALLED(SetObjectRects); -#if ROSTESTS_114_IS_FIXED - test_ui_activate(); - test_container(notif_doc); - test_object_elem(notif_doc); -#endif - win_skip("Skipping test_ui_activate(). ROSTESTS-114.\n"); - win_skip("Skipping test_container(notif_doc). ROSTESTS-114.\n"); - win_skip("Skipping test_object_elem(notif_doc). ROSTESTS-114.\n"); + if (winetest_interactive) + { + test_ui_activate(); + test_container(notif_doc); + test_object_elem(notif_doc); + } + else + { + skip("Skipping test_ui_activate(). ROSTESTS-114.\n"); + skip("Skipping test_container(notif_doc). ROSTESTS-114.\n"); + skip("Skipping test_object_elem(notif_doc). ROSTESTS-114.\n"); + } SET_EXPECT(UIDeactivate); SET_EXPECT(Invoke_ENABLED); @@ -2557,10 +2561,10 @@ CHECK_CALLED(FindConnectionPoint); CHECK_CALLED(Advise); -#if ROSTESTS_114_IS_FIXED - test_event_call(); -#endif - win_skip("Skipping test_event_call(). ROSTESTS-114.\n"); + if (winetest_interactive) + test_event_call(); + else + skip("Skipping test_event_call(). ROSTESTS-114.\n"); SET_EXPECT(InPlaceDeactivate); SET_EXPECT(Close); Modified: trunk/rostests/winetests/mshtml/htmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/htmldoc.… ============================================================================== --- trunk/rostests/winetests/mshtml/htmldoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/htmldoc.c [iso-8859-1] Sun Jul 14 10:11:45 2013 @@ -7574,17 +7574,21 @@ test_HTMLDocument(TRUE, TRUE); test_HTMLDocument_StreamLoad(); test_HTMLDocument_StreamInitNew(); -#if ROSTESTS_113_IS_FIXED - test_editing_mode(FALSE); -#endif - win_skip("Skipping test_editing_mode(FALSE). ROSTESTS-113.\n"); + if (winetest_interactive) + test_editing_mode(FALSE); + else + skip("Skipping test_editing_mode(FALSE). ROSTESTS-113.\n"); test_editing_mode(TRUE); -#if ROSTESTS_113_IS_FIXED - test_HTMLDocument_http(FALSE); - test_HTMLDocument_http(TRUE); -#endif - win_skip("Skipping test_HTMLDocument_http(FALSE). ROSTESTS-113.\n"); - win_skip("Skipping test_HTMLDocument_http(TRUE). ROSTESTS-113.\n"); + if (winetest_interactive) + { + test_HTMLDocument_http(FALSE); + test_HTMLDocument_http(TRUE); + } + else + { + skip("Skipping test_HTMLDocument_http(FALSE). ROSTESTS-113.\n"); + skip("Skipping test_HTMLDocument_http(TRUE). ROSTESTS-113.\n"); + } test_UIActivate(FALSE, FALSE, FALSE); test_UIActivate(FALSE, TRUE, FALSE);

11 years, 5 months

[pschweitzer] 59478: [NTOSKRNL] Fix return of MiProtectedPoolUnProtectLinks() which was always returning null, instead of returning safe unprotected links when needed

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Jul 14 09:30:26 2013 New Revision: 59478 URL: http://svn.reactos.org/svn/reactos?rev=59478&view=rev Log: [NTOSKRNL] Fix return of MiProtectedPoolUnProtectLinks() which was always returning null, instead of returning safe unprotected links when needed Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Sun Jul 14 09:30:26 2013 @@ -118,7 +118,7 @@ /* So make it safe to access */ Safe = MiUnProtectFreeNonPagedPool(PoolVa, 1); - if (Safe) PoolFlink = PoolVa; + if (Safe) *PoolFlink = PoolVa; } /* Are we going to need a backward link too? */ @@ -129,7 +129,7 @@ /* Make it safe to access */ Safe = MiUnProtectFreeNonPagedPool(PoolVa, 1); - if (Safe) PoolBlink = PoolVa; + if (Safe) *PoolBlink = PoolVa; } }

11 years, 5 months

[tfaber] 59477: [UUID] - Remove unused file whose only purpose is to confuse people

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jul 14 09:05:50 2013 New Revision: 59477 URL: http://svn.reactos.org/svn/reactos?rev=59477&view=rev Log: [UUID] - Remove unused file whose only purpose is to confuse people Removed: trunk/reactos/lib/sdk/uuid/uuid.c Removed: trunk/reactos/lib/sdk/uuid/uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/uuid.c?rev=59… ============================================================================== --- trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/uuid/uuid.c (removed) @@ -1,175 +0,0 @@ -/* - * GUID definitions - * - * Copyright 2000 Alexandre Julliard - * Copyright 2000 Francois Gouget - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> - -#define COM_NO_WINDOWS_H -#include "windef.h" -#include "initguid.h" - -/* GUIDs defined in uuids.lib */ - -DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); - -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" - -#define USE_COM_CONTEXT_DEF -#include "objbase.h" -#include "servprov.h" - -#include "oleauto.h" -#include "oleidl.h" -#include "objidl.h" -#include "olectl.h" - -#include "ocidl.h" -#include "ctxtcall.h" - -#include "docobj.h" -#include "exdisp.h" - -#include "shdeprecated.h" -#include "shlguid.h" -#include "shlguid_undoc.h" -#include "shlobj.h" -#include "shldisp.h" -#include "comcat.h" -#include "urlmon.h" -#define _NO_AUTHOR_GUIDS -#include "activaut.h" -#include "activdbg.h" -#define _NO_SCRIPT_GUIDS -#include "activscp.h" -#include "dispex.h" -#include "mlang.h" -#include "mshtml.h" -#include "mshtmhst.h" -#include "richole.h" -#include "xmldom.h" -#include "xmldso.h" -#include "downloadmgr.h" -#include "objsel.h" -#include "hlink.h" -#include "optary.h" -#include "indexsrv.h" -#include "htiframe.h" -#include "urlhist.h" -#include "hlguids.h" -#include "dimm.h" -#include "isguids.h" -#include "objsafe.h" -#include "perhist.h" -#include "netcon.h" -#include "netfw.h" -#include "msctf.h" -#include "sensevts.h" -#include "ocmm.h" -#include "commoncontrols.h" - -/* FIXME: cguids declares GUIDs but does not define their values */ - -/* other GUIDs */ - -#if 0 /* FIXME */ -#include "uuids.h" -#endif - -/* the GUID for these interfaces are already defined by dxguid.c */ -#define __IReferenceClock_INTERFACE_DEFINED__ -#define __IKsPropertySet_INTERFACE_DEFINED__ -#if 0 /* FIXME */ -#include "strmif.h" -#endif -#if 0 /* FIXME */ -#include "control.h" -#endif - -/* GUIDs not declared in an exported header file */ -DEFINE_GUID(IID_IDirectPlaySP, 0x0c9f6360,0xcc61,0x11cf,0xac,0xec,0x00,0xaa,0x00,0x68,0x86,0xe3); -DEFINE_GUID(IID_ISFHelper, 0x1fe68efb,0x1874,0x9812,0x56,0xdc,0x00,0x00,0x00,0x00,0x00,0x00); -DEFINE_GUID(IID_IDPLobbySP, 0x5a4e5a20,0x2ced,0x11d0,0xa8,0x89,0x00,0xa0,0xc9,0x05,0x43,0x3c); -DEFINE_GUID(IID_IProxyManager, 0x00000008,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(IID_IBindStatusCallbackHolder,0x79eac9cc,0xbaf9,0x11ce,0x8c,0x82,0x00,0xaa,0x00,0x4b,0xa9,0x0b); -DEFINE_GUID(IID_IEnumNetConnection, 0xC08956A0,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); -DEFINE_GUID(IID_INetConnection, 0xC08956A1,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); -DEFINE_GUID(IID_INetConnectionManager, 0xC08956A2,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); -DEFINE_GUID(IID_INetConnectionConnectUi, 0xC08956A3,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); -DEFINE_GUID(IID_INetConnectionPropertyUi, 0xC08956A4,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); -DEFINE_GUID(IID_INetLanConnectionUiInfo, 0xC08956A6,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); -DEFINE_GUID(IID_IEnumNetCfgComponent, 0xC0E8AE92,0x306E,0x11D1,0xAA,0xCF,0x00,0x80,0x5F,0xC1,0x27,0x0E); -DEFINE_GUID(IID_INetCfg, 0xC0E8AE93,0x306E,0x11D1,0xAA,0xCF,0x00,0x80,0x5F,0xC1,0x27,0x0E); -DEFINE_GUID(IID_INetCfgComponent, 0xC0E8AE99,0x306E,0x11D1,0xAA,0xCF,0x00,0x80,0x5F,0xC1,0x27,0x0E); -DEFINE_GUID(IID_INetCfgComponentBindings, 0xC0E8AE9E,0x306E,0x11D1,0xAA,0xCF,0x00,0x80,0x5F,0xC1,0x27,0x0E); -DEFINE_GUID(IID_INetCfgLock, 0xC0E8AE9F,0x306E,0x11D1,0xAA,0xCF,0x00,0x80,0x5F,0xC1,0x27,0x0E); -DEFINE_GUID(IID_INetConnectionPropertyUi2, 0xC08956B9,0x1CD3,0x11D1,0xB1,0xC5,0x00,0x80,0x5F,0xC1,0x27,0x0E); -DEFINE_GUID(IID_INetCfgPnpReconfigCallback,0x8D84BD35,0xE227,0x11D2,0xB7,0x00,0x00,0xA0,0xC9,0x8A,0x6A,0x85); -DEFINE_GUID(IID_INetCfgComponentPropertyUi,0x932238E0,0xBEA1,0x11D0,0x92,0x98,0x00,0xC0,0x4f,0xC9,0x9D,0xCF); -DEFINE_GUID(IID_INetCfgComponentControl, 0x932238DF,0xBEA1,0x11D0,0x92,0x98,0x00,0xC0,0x4f,0xC9,0x9D,0xCF); - -DEFINE_GUID(FMTID_SummaryInformation,0xF29F85E0,0x4FF9,0x1068,0xAB,0x91,0x08,0x00,0x2B,0x27,0xB3,0xD9); -DEFINE_GUID(FMTID_DocSummaryInformation,0xD5CDD502,0x2E9C,0x101B,0x93,0x97,0x08,0x00,0x2B,0x2C,0xF9,0xAE); -DEFINE_GUID(FMTID_UserDefinedProperties,0xD5CDD505,0x2E9C,0x101B,0x93,0x97,0x08,0x00,0x2B,0x2C,0xF9,0xAE); - -/* COM CLSIDs not declared in an exported header file */ -DEFINE_GUID(CLSID_StdMarshal, 0x00000017,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(CLSID_IdentityUnmarshal, 0x0000001b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(CLSID_PSGenObject, 0x0000030c,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(CLSID_PSClientSite, 0x0000030d,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(CLSID_PSClassObject, 0x0000030e,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(CLSID_PSInPlaceActive, 0x0000030f,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(CLSID_PSInPlaceFrame, 0x00000310,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(CLSID_PSDragDrop, 0x00000311,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(CLSID_PSBindCtx, 0x00000312,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(CLSID_PSEnumerators, 0x00000313,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(CLSID_Picture_Metafile, 0x00000315,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(CLSID_StaticMetafile, 0x00000315,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(CLSID_Picture_Dib, 0x00000316,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(CLSID_StaticDib, 0x00000316,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(CLSID_Picture_EnhMetafile, 0x00000319,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(CLSID_DCOMAccessControl, 0x0000031d,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(CLSID_StdGlobalInterfaceTable,0x00000323,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(CLSID_ComBinding, 0x00000328,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(CLSID_StdEvent, 0x0000032b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(CLSID_ManualResetEvent, 0x0000032c,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(CLSID_SynchronizeContainer, 0x0000032d,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(CLSID_InProcFreeMarshaler, 0x0000033a,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(CLSID_TF_ThreadMgr, 0x529a9e6b,0x6587,0x4f23,0xab,0x9e,0x9c,0x7d,0x68,0x3e,0x3c,0x50); -DEFINE_GUID(CLSID_TF_InputProcessorProfiles, 0x33c53a50,0xf456,0x4884,0xb0,0x49,0x85,0xfd,0x64,0x3e,0xcf,0xed); -DEFINE_GUID(CLSID_TF_CategoryMgr, 0xA4B544A1,0x438D,0x4B41,0x93,0x25,0x86,0x95,0x23,0xE2,0xD6,0xC7); -DEFINE_GUID(CLSID_TF_LangBarMgr, 0xebb08c45,0x6c4a,0x4fdc,0xae,0x53,0x4e,0xb8,0xc4,0xc7,0xdb,0x8e); -DEFINE_GUID(CLSID_TF_DisplayAttributeMgr, 0x3ce74de4,0x53d3,0x4d74,0x8b,0x83,0x43,0x1b,0x38,0x28,0xba,0x53); -DEFINE_GUID(GUID_TFCAT_TIP_KEYBOARD, 0x34745c63,0xb2f0,0x4784,0x8b,0x67,0x5e,0x12,0xc8,0x70,0x1a,0x31); -DEFINE_GUID(GUID_TFCAT_TIP_SPEECH, 0xB5A73CD1,0x8355,0x426B,0xA1,0x61,0x25,0x98,0x08,0xF2,0x6B,0x14); -DEFINE_GUID(GUID_TFCAT_TIP_HANDWRITING, 0x246ecb87,0xc2f2,0x4abe,0x90,0x5b,0xc8,0xb3,0x8a,0xdd,0x2c,0x43); -DEFINE_GUID(CLSID_ConnectionManager, 0xBA126AD1,0x2166,0x11D1,0xB1,0xD0,0x0,0x80,0x5F,0xC1,0x27,0x0E); -DEFINE_GUID(CLSID_CNetCfg, 0x5B035261,0x40F9,0x11D1,0xAA,0xEC,0x00,0x80,0x5F,0xC1,0x27,0x0E); -DEFINE_GUID(GUID_TFCAT_DISPLAYATTRIBUTEPROVIDER, 0x046B8C80,0x1647,0x40F7,0x9B,0x21,0xB9,0x3B,0x81,0xAA,0xBC,0x1B); -DEFINE_GUID(GUID_COMPARTMENT_KEYBOARD_DISABLED, 0x71a5b253,0x1951,0x466b,0x9f,0xbc,0x9c,0x88,0x08,0xfa,0x84,0xf2); -DEFINE_GUID(GUID_COMPARTMENT_KEYBOARD_OPENCLOSE, 0x58273aad,0x01bb,0x4164,0x95,0xc6,0x75,0x5b,0xa0,0xb5,0x16,0x2d); -DEFINE_GUID(GUID_COMPARTMENT_HANDWRITING_OPENCLOSE, 0xf9ae2c6b,0x1866,0x4361,0xaf,0x72,0x7a,0xa3,0x09,0x48,0x89,0x0e); -DEFINE_GUID(GUID_COMPARTMENT_SPEECH_DISABLED, 0x56c5c607,0x0703,0x4e59,0x8e,0x52,0xcb,0xc8,0x4e,0x8b,0xbe,0x35); -DEFINE_GUID(GUID_COMPARTMENT_SPEECH_OPENCLOSE, 0x544d6a63,0xe2e8,0x4752,0xbb,0xd1,0x00,0x09,0x60,0xbc,0xa0,0x83); -DEFINE_GUID(GUID_COMPARTMENT_SPEECH_GLOBALSTATE, 0x2a54fe8e,0x0d08,0x460c,0xa7,0x5d,0x87,0x03,0x5f,0xf4,0x36,0xc5); -DEFINE_GUID(GUID_COMPARTMENT_PERSISTMENUENABLED, 0x575f3783,0x70c8,0x47c8,0xae,0x5d,0x91,0xa0,0x1a,0x1f,0x75,0x92); -DEFINE_GUID(GUID_COMPARTMENT_EMPTYCONTEXT, 0xd7487dbf,0x804e,0x41c5,0x89,0x4d,0xad,0x96,0xfd,0x4e,0xea,0x13); -DEFINE_GUID(GUID_COMPARTMENT_TIPUISTATUS, 0x148ca3ec,0x0366,0x401c,0x8d,0x75,0xed,0x97,0x8d,0x85,0xfb,0xc9);

11 years, 5 months

[tfaber] 59476: [PSDK] - Reduce shdeprecated.idl differences to Wine. Fixes a few warnings

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jul 14 07:12:59 2013 New Revision: 59476 URL: http://svn.reactos.org/svn/reactos?rev=59476&view=rev Log: [PSDK] - Reduce shdeprecated.idl differences to Wine. Fixes a few warnings Modified: trunk/reactos/dll/win32/browseui/commonbrowser.cpp trunk/reactos/dll/win32/browseui/commonbrowser.h trunk/reactos/dll/win32/browseui/shellbrowser.cpp trunk/reactos/include/psdk/shdeprecated.idl Modified: trunk/reactos/dll/win32/browseui/commonbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/commonb… ============================================================================== --- trunk/reactos/dll/win32/browseui/commonbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/commonbrowser.cpp [iso-8859-1] Sun Jul 14 07:12:59 2013 @@ -85,7 +85,7 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CCommonBrowser::IEParseDisplayName(UINT uiCP, LPCWSTR pwszPath, LPCITEMIDLIST *ppidlOut) +HRESULT STDMETHODCALLTYPE CCommonBrowser::IEParseDisplayName(UINT uiCP, LPCWSTR pwszPath, LPITEMIDLIST *ppidlOut) { return E_NOTIMPL; } @@ -140,7 +140,7 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CCommonBrowser::GetPidl(LPCITEMIDLIST *ppidl) +HRESULT STDMETHODCALLTYPE CCommonBrowser::GetPidl(LPITEMIDLIST *ppidl) { return E_NOTIMPL; } Modified: trunk/reactos/dll/win32/browseui/commonbrowser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/commonb… ============================================================================== --- trunk/reactos/dll/win32/browseui/commonbrowser.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/commonbrowser.h [iso-8859-1] Sun Jul 14 07:12:59 2013 @@ -54,7 +54,7 @@ virtual HRESULT STDMETHODCALLTYPE ShowControlWindow(UINT id, BOOL fShow); virtual HRESULT STDMETHODCALLTYPE IsControlWindowShown(UINT id, BOOL *pfShown); virtual HRESULT STDMETHODCALLTYPE IEGetDisplayName(LPCITEMIDLIST pidl, LPWSTR pwszName, UINT uFlags); - virtual HRESULT STDMETHODCALLTYPE IEParseDisplayName(UINT uiCP, LPCWSTR pwszPath, LPCITEMIDLIST *ppidlOut); + virtual HRESULT STDMETHODCALLTYPE IEParseDisplayName(UINT uiCP, LPCWSTR pwszPath, LPITEMIDLIST *ppidlOut); virtual HRESULT STDMETHODCALLTYPE DisplayParseError(HRESULT hres, LPCWSTR pwszPath); virtual HRESULT STDMETHODCALLTYPE NavigateToPidl(LPCITEMIDLIST pidl, DWORD grfHLNF); virtual HRESULT STDMETHODCALLTYPE SetNavigateState(BNSTATE bnstate); @@ -65,7 +65,7 @@ virtual HRESULT STDMETHODCALLTYPE SetFlags(DWORD dwFlags, DWORD dwFlagMask); virtual HRESULT STDMETHODCALLTYPE GetFlags(DWORD *pdwFlags); virtual HRESULT STDMETHODCALLTYPE CanNavigateNow(); - virtual HRESULT STDMETHODCALLTYPE GetPidl(LPCITEMIDLIST *ppidl); + virtual HRESULT STDMETHODCALLTYPE GetPidl(LPITEMIDLIST *ppidl); virtual HRESULT STDMETHODCALLTYPE SetReferrer(LPCITEMIDLIST pidl); virtual DWORD STDMETHODCALLTYPE GetBrowserIndex(); virtual HRESULT STDMETHODCALLTYPE GetBrowserByIndex(DWORD dwID, IUnknown **ppunk); Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Sun Jul 14 07:12:59 2013 @@ -426,7 +426,7 @@ virtual HRESULT STDMETHODCALLTYPE ShowControlWindow(UINT id, BOOL fShow); virtual HRESULT STDMETHODCALLTYPE IsControlWindowShown(UINT id, BOOL *pfShown); virtual HRESULT STDMETHODCALLTYPE IEGetDisplayName(LPCITEMIDLIST pidl, LPWSTR pwszName, UINT uFlags); - virtual HRESULT STDMETHODCALLTYPE IEParseDisplayName(UINT uiCP, LPCWSTR pwszPath, LPCITEMIDLIST *ppidlOut); + virtual HRESULT STDMETHODCALLTYPE IEParseDisplayName(UINT uiCP, LPCWSTR pwszPath, LPITEMIDLIST *ppidlOut); virtual HRESULT STDMETHODCALLTYPE DisplayParseError(HRESULT hres, LPCWSTR pwszPath); virtual HRESULT STDMETHODCALLTYPE NavigateToPidl(LPCITEMIDLIST pidl, DWORD grfHLNF); virtual HRESULT STDMETHODCALLTYPE SetNavigateState(BNSTATE bnstate); @@ -437,7 +437,7 @@ virtual HRESULT STDMETHODCALLTYPE SetFlags(DWORD dwFlags, DWORD dwFlagMask); virtual HRESULT STDMETHODCALLTYPE GetFlags(DWORD *pdwFlags); virtual HRESULT STDMETHODCALLTYPE CanNavigateNow( void); - virtual HRESULT STDMETHODCALLTYPE GetPidl(LPCITEMIDLIST *ppidl); + virtual HRESULT STDMETHODCALLTYPE GetPidl(LPITEMIDLIST *ppidl); virtual HRESULT STDMETHODCALLTYPE SetReferrer(LPCITEMIDLIST pidl); virtual DWORD STDMETHODCALLTYPE GetBrowserIndex(); virtual HRESULT STDMETHODCALLTYPE GetBrowserByIndex(DWORD dwID, IUnknown **ppunk); @@ -2070,7 +2070,7 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CShellBrowser::IEParseDisplayName(UINT uiCP, LPCWSTR pwszPath, LPCITEMIDLIST *ppidlOut) +HRESULT STDMETHODCALLTYPE CShellBrowser::IEParseDisplayName(UINT uiCP, LPCWSTR pwszPath, LPITEMIDLIST *ppidlOut) { return E_NOTIMPL; } @@ -2125,7 +2125,7 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CShellBrowser::GetPidl(LPCITEMIDLIST *ppidl) +HRESULT STDMETHODCALLTYPE CShellBrowser::GetPidl(LPITEMIDLIST *ppidl) { // called by explorer bar to get current pidl if (ppidl == NULL) Modified: trunk/reactos/include/psdk/shdeprecated.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shdeprecated.… ============================================================================== --- trunk/reactos/include/psdk/shdeprecated.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shdeprecated.idl [iso-8859-1] Sun Jul 14 07:12:59 2013 @@ -47,10 +47,10 @@ HRESULT Update( [in] IUnknown *punk, - BOOL fIsLocalAnchor); + [in] BOOL fIsLocalAnchor); HRESULT GetPidl( - [in] LPITEMIDLIST *ppidl); + [out] LPITEMIDLIST *ppidl); }; [ @@ -63,11 +63,11 @@ { HRESULT AddEntry( [in] IUnknown *punk, - BOOL fIsLocalAnchor); + [in] BOOL fIsLocalAnchor); HRESULT UpdateEntry( [in] IUnknown *punk, - BOOL fIsLocalAnchor); + [in] BOOL fIsLocalAnchor); HRESULT UpdateExternal( [in] IUnknown *punk, @@ -75,32 +75,32 @@ HRESULT Travel( [in] IUnknown *punk, - int iOffset); + [in] int iOffset); HRESULT GetTravelEntry( - [in] IUnknown *punk, - int iOffset, + [in] IUnknown *punk, + [in] int iOffset, + [optional, out] ITravelEntry **ppte); + + HRESULT FindTravelEntry( + [in] IUnknown *punk, + [in] LPCITEMIDLIST pidl, [out] ITravelEntry **ppte); - HRESULT FindTravelEntry( - [in] IUnknown *punk, - [in] LPCITEMIDLIST pidl, - [out] ITravelEntry **ppte); - HRESULT GetToolTipText( - [in] IUnknown *punk, - int iOffset, - int idsTemplate, - [out] LPWSTR pwzText, - DWORD cchText); + [in] IUnknown *punk, + [in] int iOffset, + [in] int idsTemplate, + [out, size_is(cchText)] LPWSTR pwzText, + [in] DWORD cchText); HRESULT InsertMenuEntries( [in] IUnknown *punk, - [in, out] HMENU hmenu, - int nPos, - int idFirst, - int idLast, - DWORD dwFlags); + [in] HMENU hmenu, + [in] int nPos, + [in] int idFirst, + [in] int idLast, + [in] DWORD dwFlags); HRESULT Clone( [out] ITravelLog **pptl); @@ -182,7 +182,7 @@ pointer_default(unique), local, object, - uuid(02BA3B52-0547-11D1-B833-00C04FC9B31F) + uuid(02ba3b52-0547-11d1-b833-00c04fc9b31f) ] interface IBrowserService : IUnknown { @@ -195,50 +195,50 @@ HRESULT GetTitle( [in] IShellView *psv, - [out] LPWSTR pszName, - DWORD cchName); + [out, size_is(cchName)] LPWSTR pszName, + [in] DWORD cchName); HRESULT GetOleObject( [out] IOleObject **ppobjv); HRESULT GetTravelLog( - [out] ITravelLog **pptl); + [out, optional] ITravelLog **pptl); HRESULT ShowControlWindow( - UINT id, - BOOL fShow); + [in] UINT id, + [in] BOOL fShow); HRESULT IsControlWindowShown( - UINT id, + [in] UINT id, [out] BOOL *pfShown); HRESULT IEGetDisplayName( - [in] LPCITEMIDLIST pidl, + [in] PCIDLIST_ABSOLUTE pidl, [out] LPWSTR pwszName, - UINT uFlags); + [in] UINT uFlags); HRESULT IEParseDisplayName( - UINT uiCP, + [in] UINT uiCP, [in] LPCWSTR pwszPath, - [out] LPCITEMIDLIST *ppidlOut); + [out] PIDLIST_ABSOLUTE *ppidlOut); HRESULT DisplayParseError( - HRESULT hres, + [in] HRESULT hres, [in] LPCWSTR pwszPath); HRESULT NavigateToPidl( - [in] LPCITEMIDLIST pidl, - DWORD grfHLNF); + [in] PCIDLIST_ABSOLUTE pidl, + [in] DWORD grfHLNF); HRESULT SetNavigateState( - BNSTATE bnstate); + [in] BNSTATE bnstate); HRESULT GetNavigateState( [out] BNSTATE *pbnstate); HRESULT NotifyRedirect( [in] IShellView *psv, - [in] LPCITEMIDLIST pidl, + [in] PCIDLIST_ABSOLUTE pidl, [out] BOOL *pfDidBrowse); HRESULT UpdateWindowList(); @@ -246,8 +246,8 @@ HRESULT UpdateBackForwardState(); HRESULT SetFlags( - DWORD dwFlags, - DWORD dwFlagMask); + [in] DWORD dwFlags, + [in] DWORD dwFlagMask); HRESULT GetFlags( [out] DWORD *pdwFlags); @@ -255,15 +255,15 @@ HRESULT CanNavigateNow(); HRESULT GetPidl( - [out] LPCITEMIDLIST *ppidl); + [out] PIDLIST_ABSOLUTE *ppidl); HRESULT SetReferrer( - [in] LPCITEMIDLIST pidl); + [in] PCIDLIST_ABSOLUTE pidl); DWORD GetBrowserIndex(); HRESULT GetBrowserByIndex( - DWORD dwID, + [in] DWORD dwID, [out] IUnknown **ppunk); HRESULT GetHistoryObject( @@ -273,7 +273,7 @@ HRESULT SetHistoryObject( [in] IOleObject *pole, - BOOL fIsLocalAnchor); + [in] BOOL fIsLocalAnchor); HRESULT CacheOLEServer( [in] IOleObject *pole); @@ -284,7 +284,7 @@ HRESULT OnHttpEquiv( [in] IShellView *psv, - BOOL fDone, + [in] BOOL fDone, [in] VARIANT *pvarargIn, [out] VARIANT *pvarargOut); @@ -292,25 +292,24 @@ [out] HPALETTE *hpal); HRESULT RegisterWindow( - BOOL fForceRegister, - int swc); + [in] BOOL fForceRegister, + [in] int swc); } [ pointer_default(unique), - local, - object, - uuid(5836FB00-8187-11CF-A12B-00AA004AE837) + object, + local, + uuid(5836fb00-8187-11cf-a12b-00aa004ae837) ] interface IShellService : IUnknown { - HRESULT SetOwner( - [in] IUnknown *owner); -}; + HRESULT SetOwner( [in] IUnknown *pUnk ); +} cpp_quote("#if 0") typedef HANDLE HMONITOR; -cpp_quote("#endif /* 0 */") +cpp_quote("#endif") enum { SECURELOCK_NOCHANGE = -1, @@ -336,65 +335,73 @@ { HWND _hwnd; ITravelLog *_ptl; - IUnknown *_phlf; - IUnknown *_pautoWB2; - IUnknown *_pautoEDS; + IHlinkFrame *_phlf; + IWebBrowser2 *_pautoWB2; + IExpDispSupport *_pautoEDS; IShellService *_pautoSS; int _eSecureLockIcon; DWORD _fCreatingViewWindow; UINT _uActivateState; - LPITEMIDLIST _pidlViewState; + + LPCITEMIDLIST _pidlNewShellView; + IOleCommandTarget *_pctView; + LPITEMIDLIST _pidlCur; IShellView *_psv; IShellFolder *_psf; HWND _hwndView; LPWSTR _pszTitleCur; + LPITEMIDLIST _pidlPending; IShellView *_psvPending; IShellFolder *_psfPending; HWND _hwndViewPending; LPWSTR _pszTitlePending; + BOOL _fIsViewMSHTML; BOOL _fPrivacyImpacted; CLSID _clsidView; CLSID _clsidViewPending; HWND _hwndFrame; -} BASEBROWSERDATAXP; -typedef struct basebrowserdataxp *LPBASEBROWSERDATAXP; +} BASEBROWSERDATAXP, *LPBASEBROWSERDATAXP; typedef struct basebrowserdatalh { HWND _hwnd; ITravelLog *_ptl; - IUnknown *_phlf; - IUnknown *_pautoWB2; - IUnknown *_pautoEDS; + IHlinkFrame *_phlf; + IWebBrowser2 *_pautoWB2; + IExpDispSupport *_pautoEDS; IShellService *_pautoSS; int _eSecureLockIcon; DWORD _fCreatingViewWindow; UINT _uActivateState; - LPITEMIDLIST _pidlViewState; + + LPCITEMIDLIST _pidlNewShellView; + IOleCommandTarget *_pctView; + LPITEMIDLIST _pidlCur; IShellView *_psv; IShellFolder *_psf; HWND _hwndView; LPWSTR _pszTitleCur; + LPITEMIDLIST _pidlPending; IShellView *_psvPending; IShellFolder *_psfPending; HWND _hwndViewPending; LPWSTR _pszTitlePending; + BOOL _fIsViewMSHTML; BOOL _fPrivacyImpacted; CLSID _clsidView; CLSID _clsidViewPending; HWND _hwndFrame; LONG _lPhishingFilterStatus; -} BASEBROWSERDATALH; +} BASEBROWSERDATALH, *LPBASEBROWSERDATALH; cpp_quote("#include <poppack.h>") -typedef struct basebrowserdatalh *LPBASEBROWSERDATALH; typedef BASEBROWSERDATAXP BASEBROWSERDATA; @@ -413,25 +420,19 @@ cpp_quote("#define VIEW_PRIORITY_DESPERATE 0x00000010") cpp_quote("#define VIEW_PRIORITY_NONE 0x00000000") -typedef struct tagFolderSetData -{ +typedef struct tagFolderSetData { FOLDERSETTINGS _fs; SHELLVIEWID _vidRestore; DWORD _dwViewPriority; -} FOLDERSETDATA; - -typedef struct tagFolderSetData *LPFOLDERSETDATA; - -typedef struct SToolbarItem -{ +} FOLDERSETDATA, *LPFOLDERSETDATA; + +typedef struct SToolbarItem { IDockingWindow *ptbar; BORDERWIDTHS rcBorderTool; LPWSTR pwszItem; BOOL fShow; HMONITOR hMon; -} TOOLBARITEM; - -typedef struct SToolbarItem *LPTOOLBARITEM; +} TOOLBARITEM, *LPTOOLBARITEM; cpp_quote("#define ITB_VIEW ((UINT)-1)") @@ -439,40 +440,40 @@ pointer_default(unique), local, object, - uuid(68BD21CC-438B-11D2-A560-00A0C92DBFE8) + uuid(68BD21CC-438B-11d2-A560-00A0C92DBFE8) ] interface IBrowserService2 : IBrowserService { LRESULT WndProcBS( [in] HWND hwnd, - UINT uMsg, - WPARAM wParam, - LPARAM lParam); + [in] UINT uMsg, + [in, out] WPARAM wParam, + [in, out] LPARAM lParam); HRESULT SetAsDefFolderSettings(); HRESULT GetViewRect( - [out] RECT *prc); + [in, out] RECT *prc); HRESULT OnSize( - WPARAM wParam); + [in] WPARAM wParam); HRESULT OnCreate( [in] struct tagCREATESTRUCTW *pcs); LRESULT OnCommand( - WPARAM wParam, - LPARAM lParam); + [in] WPARAM wParam, + [in] LPARAM lParam); HRESULT OnDestroy(); LRESULT OnNotify( - [in] struct tagNMHDR *pnm); + [in, out] struct tagNMHDR *pnm); HRESULT OnSetFocus(); HRESULT OnFrameWindowActivateBS( - BOOL fActive); + [in] BOOL fActive); HRESULT ReleaseShellView(); @@ -481,7 +482,7 @@ HRESULT CreateViewWindow( [in] IShellView *psvNew, [in] IShellView *psvOld, - [in] LPRECT prcView, + [out] LPRECT prcView, [out] HWND *phwnd); HRESULT CreateBrowserPropSheetExt( @@ -492,27 +493,27 @@ [out] HWND *phwndView); HRESULT GetBaseBrowserData( - [out] LPCBASEBROWSERDATA *pbbd); + [in, out] LPCBASEBROWSERDATA *pbbd); LPBASEBROWSERDATA PutBaseBrowserData(); HRESULT InitializeTravelLog( [in] ITravelLog *ptl, - DWORD dw); + [in] DWORD dw); HRESULT SetTopBrowser(); HRESULT Offline( - int iCmd); + [in] int iCmd); HRESULT AllowViewResize( - BOOL f); + [in] BOOL f); HRESULT SetActivateState( - UINT u); + [in] UINT u); HRESULT UpdateSecureLockIcon( - int eSecureLock); + [in] int eSecureLock); HRESULT InitializeDownloadManager(); @@ -529,14 +530,14 @@ HRESULT _MaySaveChanges(); HRESULT _PauseOrResumeView( - BOOL fPaused); + [in] BOOL fPaused); HRESULT _DisableModeless(); HRESULT _NavigateToPidl( [in] LPCITEMIDLIST pidl, - DWORD grfHLNF, - DWORD dwFlags); + [in] DWORD grfHLNF, + [in] DWORD dwFlags); HRESULT _TryShell2Rename( [in] IShellView *psv, @@ -546,60 +547,60 @@ HRESULT _ExecChildren( [in] IUnknown *punkBar, - BOOL fBroadcast, + [in] BOOL fBroadcast, [in] const GUID *pguidCmdGroup, - DWORD nCmdID, - DWORD nCmdexecopt, + [in] DWORD nCmdID, + [in] DWORD nCmdexecopt, [in] VARIANTARG *pvarargIn, [in, out] VARIANTARG *pvarargOut); HRESULT _SendChildren( [in] HWND hwndBar, - BOOL fBroadcast, - UINT uMsg, - WPARAM wParam, - LPARAM lParam); + [in] BOOL fBroadcast, + [in] UINT uMsg, + [in, out] WPARAM wParam, + [in, out] LPARAM lParam); HRESULT GetFolderSetData( - [out] struct tagFolderSetData *pfsd); + [in, out] struct tagFolderSetData *pfsd); HRESULT _OnFocusChange( - UINT itb); + [in] UINT itb); HRESULT v_ShowHideChildWindows( - BOOL fChildOnly); + [in] BOOL fChildOnly); UINT _get_itbLastFocus(); HRESULT _put_itbLastFocus( - UINT itbLastFocus); + [in] UINT itbLastFocus); HRESULT _UIActivateView( - UINT uState); + [in] UINT uState); HRESULT _GetViewBorderRect( - [out] RECT *prc); + [in, out] RECT* prc); HRESULT _UpdateViewRectSize(); HRESULT _ResizeNextBorder( - UINT itb); + [in] UINT itb); HRESULT _ResizeView(); HRESULT _GetEffectiveClientArea( - [out] LPRECT lprectBorder, + [in, out] LPRECT lprectBorder, [in] HMONITOR hmon); - IStream *v_GetViewStream( + IStream* v_GetViewStream( [in] LPCITEMIDLIST pidl, - DWORD grfMode, + [in] DWORD grfMode, [in] LPCWSTR pwszName); LRESULT ForwardViewMsg( - UINT uMsg, - WPARAM wParam, - LPARAM lParam); + [in] UINT uMsg, + [in] WPARAM wParam, + [in] LPARAM lParam); HRESULT SetAcceleratorMenu( [in] HACCEL hacc); @@ -607,7 +608,7 @@ int _GetToolbarCount(); LPTOOLBARITEM _GetToolbarItem( - int itb); + [in] int itb); HRESULT _SaveToolbars( [in] IStream *pstm); @@ -616,18 +617,18 @@ [in] IStream *pstm); HRESULT _CloseAndReleaseToolbars( - BOOL fClose); + [in] BOOL fClose); HRESULT v_MayGetNextToolbarFocus( [in] LPMSG lpMsg, - UINT itbNext, - int citb, + [in] UINT itbNext, + [in] int citb, [out] LPTOOLBARITEM *pptbi, [out] HWND *phwnd); HRESULT _ResizeNextBorderHelper( - UINT itb, - BOOL bUseHmonitor); + [in] UINT itb, + [in] BOOL bUseHmonitor); UINT _FindTBar( [in] IUnknown *punkSrc); @@ -638,16 +639,16 @@ [in] LPMSG lpMsg); HRESULT v_MayTranslateAccelerator( - [in] MSG *pmsg); + [in] MSG* pmsg); HRESULT _GetBorderDWHelper( [in] IUnknown *punkSrc, - [out] LPRECT lprectBorder, - BOOL bUseHmonitor); + [in] LPRECT lprectBorder, + [in] BOOL bUseHmonitor); HRESULT v_CheckZoneCrossing( - [in] LPCITEMIDLIST pidl); -} + [in, out] LPCITEMIDLIST pidl); +}; [ pointer_default(unique), @@ -662,11 +663,11 @@ [in] LPRECT prc); HRESULT IEParseDisplayNameEx( - UINT uiCP, + [in] UINT uiCP, [in] LPCWSTR pwszPath, - DWORD dwFlags, + [in] DWORD dwFlags, [out] LPITEMIDLIST *ppidlOut); -} +}; [ pointer_default(unique), @@ -677,9 +678,9 @@ interface IBrowserService4 : IBrowserService3 { HRESULT ActivateView( - BOOL fPendingView); + [in] BOOL fPendingView); HRESULT SaveViewState(); HRESULT _ResizeAllBorders(); -} +};

11 years, 5 months

[tfaber] 59475: [PSDK] - Move some stuff around in shdeprecated.idl to reduce the difference with Wine - Move TLENUMF to tlogstg.idl

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jul 14 06:29:16 2013 New Revision: 59475 URL: http://svn.reactos.org/svn/reactos?rev=59475&view=rev Log: [PSDK] - Move some stuff around in shdeprecated.idl to reduce the difference with Wine - Move TLENUMF to tlogstg.idl Modified: trunk/reactos/include/psdk/shdeprecated.idl trunk/reactos/include/psdk/tlogstg.idl Modified: trunk/reactos/include/psdk/shdeprecated.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shdeprecated.… ============================================================================== --- trunk/reactos/include/psdk/shdeprecated.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shdeprecated.idl [iso-8859-1] Sun Jul 14 06:29:16 2013 @@ -35,10 +35,10 @@ cpp_quote("#define TLMENUF_BACKANDFORTH (TLMENUF_BACK | TLMENUF_FORE | TLMENUF_INCLUDECURRENT)") [ - uuid(F46EDB3B-BC2F-11d0-9412-00AA00A3EBD3), - object, pointer_default(unique), - local + local, + object, + uuid(F46EDB3B-BC2F-11d0-9412-00AA00A3EBD3) ] interface ITravelEntry : IUnknown { @@ -54,23 +54,13 @@ }; [ - uuid(66A9CB08-4802-11d2-A561-00A0C92DBFE8), - object, pointer_default(unique), - local + local, + object, + uuid(66A9CB08-4802-11d2-A561-00A0C92DBFE8) ] interface ITravelLog : IUnknown { - enum tagTLENUMF - { - TLEF_RELATIVE_INCLUDE_CURRENT = 0x00000001, - TLEF_RELATIVE_BACK = 0x00000010, - TLEF_RELATIVE_FORE = 0x00000020, - TLEF_INCLUDE_UNINVOKEABLE = 0x00000040, - TLEF_ABSOLUTE = 0x00000031, - }; - typedef DWORD TLENUMF; - HRESULT AddEntry( [in] IUnknown *punk, BOOL fIsLocalAnchor); @@ -149,6 +139,12 @@ UINT *puArgErr); }; +typedef enum tagBNSTATE +{ + BNS_NORMAL = 0, + BNS_BEGIN_NAVIGATE = 1, + BNS_NAVIGATE = 2 +} BNSTATE; enum { SBSC_HIDE = 0, @@ -183,118 +179,13 @@ cpp_quote("#define HLNF_NEWWINDOWSMANAGED 0x80000000") [ - object, - uuid(5836FB00-8187-11CF-A12B-00AA004AE837), pointer_default(unique), - local -] -interface IShellService : IUnknown -{ - HRESULT SetOwner( - [in] IUnknown *owner); -}; - -[ - object, - uuid(02BA3B52-0547-11D1-B833-00C04FC9B31F), - pointer_default(unique), - local + local, + object, + uuid(02BA3B52-0547-11D1-B833-00C04FC9B31F) ] interface IBrowserService : IUnknown { - typedef enum tagBNSTATE - { - BNS_NORMAL = 0, - BNS_BEGIN_NAVIGATE = 1, - BNS_NAVIGATE = 2 - } BNSTATE; - - cpp_quote("#include <pshpack8.h>") - typedef struct basebrowserdataxp - { - HWND _hwnd; - ITravelLog *_ptl; - IUnknown *_phlf; - IUnknown *_pautoWB2; - IUnknown *_pautoEDS; - IShellService *_pautoSS; - int _eSecureLockIcon; - DWORD _fCreatingViewWindow; - UINT _uActivateState; - LPITEMIDLIST _pidlViewState; - IOleCommandTarget *_pctView; - LPITEMIDLIST _pidlCur; - IShellView *_psv; - IShellFolder *_psf; - HWND _hwndView; - LPWSTR _pszTitleCur; - LPITEMIDLIST _pidlPending; - IShellView *_psvPending; - IShellFolder *_psfPending; - HWND _hwndViewPending; - LPWSTR _pszTitlePending; - BOOL _fIsViewMSHTML; - BOOL _fPrivacyImpacted; - CLSID _clsidView; - CLSID _clsidViewPending; - HWND _hwndFrame; - } BASEBROWSERDATAXP; - typedef struct basebrowserdataxp *LPBASEBROWSERDATAXP; - - typedef struct basebrowserdatalh - { - HWND _hwnd; - ITravelLog *_ptl; - IUnknown *_phlf; - IUnknown *_pautoWB2; - IUnknown *_pautoEDS; - IShellService *_pautoSS; - int _eSecureLockIcon; - DWORD _fCreatingViewWindow; - UINT _uActivateState; - LPITEMIDLIST _pidlViewState; - IOleCommandTarget *_pctView; - LPITEMIDLIST _pidlCur; - IShellView *_psv; - IShellFolder *_psf; - HWND _hwndView; - LPWSTR _pszTitleCur; - LPITEMIDLIST _pidlPending; - IShellView *_psvPending; - IShellFolder *_psfPending; - HWND _hwndViewPending; - LPWSTR _pszTitlePending; - BOOL _fIsViewMSHTML; - BOOL _fPrivacyImpacted; - CLSID _clsidView; - CLSID _clsidViewPending; - HWND _hwndFrame; - LONG _lPhishingFilterStatus; - } BASEBROWSERDATALH; - cpp_quote("#include <poppack.h>") - typedef struct basebrowserdatalh *LPBASEBROWSERDATALH; - - typedef BASEBROWSERDATAXP BASEBROWSERDATA; - - typedef const BASEBROWSERDATA *LPCBASEBROWSERDATA; - - typedef BASEBROWSERDATA *LPBASEBROWSERDATA; - -cpp_quote("#if 0") -typedef HANDLE HMONITOR; -cpp_quote("#endif /* 0 */") - - typedef struct SToolbarItem - { - IDockingWindow *ptbar; - BORDERWIDTHS rcBorderTool; - LPWSTR pwszItem; - BOOL fShow; - HMONITOR hMon; - } TOOLBARITEM; - - typedef struct SToolbarItem *LPTOOLBARITEM; - HRESULT GetParentSite( [out] IOleInPlaceSite **ppipsite); @@ -404,6 +295,22 @@ BOOL fForceRegister, int swc); } + +[ + pointer_default(unique), + local, + object, + uuid(5836FB00-8187-11CF-A12B-00AA004AE837) +] +interface IShellService : IUnknown +{ + HRESULT SetOwner( + [in] IUnknown *owner); +}; + +cpp_quote("#if 0") +typedef HANDLE HMONITOR; +cpp_quote("#endif /* 0 */") enum { SECURELOCK_NOCHANGE = -1, @@ -424,7 +331,76 @@ SECURELOCK_SUGGEST_SECURE128BIT = 13, }; - +cpp_quote("#include <pshpack8.h>") +typedef struct basebrowserdataxp +{ + HWND _hwnd; + ITravelLog *_ptl; + IUnknown *_phlf; + IUnknown *_pautoWB2; + IUnknown *_pautoEDS; + IShellService *_pautoSS; + int _eSecureLockIcon; + DWORD _fCreatingViewWindow; + UINT _uActivateState; + LPITEMIDLIST _pidlViewState; + IOleCommandTarget *_pctView; + LPITEMIDLIST _pidlCur; + IShellView *_psv; + IShellFolder *_psf; + HWND _hwndView; + LPWSTR _pszTitleCur; + LPITEMIDLIST _pidlPending; + IShellView *_psvPending; + IShellFolder *_psfPending; + HWND _hwndViewPending; + LPWSTR _pszTitlePending; + BOOL _fIsViewMSHTML; + BOOL _fPrivacyImpacted; + CLSID _clsidView; + CLSID _clsidViewPending; + HWND _hwndFrame; +} BASEBROWSERDATAXP; +typedef struct basebrowserdataxp *LPBASEBROWSERDATAXP; + +typedef struct basebrowserdatalh +{ + HWND _hwnd; + ITravelLog *_ptl; + IUnknown *_phlf; + IUnknown *_pautoWB2; + IUnknown *_pautoEDS; + IShellService *_pautoSS; + int _eSecureLockIcon; + DWORD _fCreatingViewWindow; + UINT _uActivateState; + LPITEMIDLIST _pidlViewState; + IOleCommandTarget *_pctView; + LPITEMIDLIST _pidlCur; + IShellView *_psv; + IShellFolder *_psf; + HWND _hwndView; + LPWSTR _pszTitleCur; + LPITEMIDLIST _pidlPending; + IShellView *_psvPending; + IShellFolder *_psfPending; + HWND _hwndViewPending; + LPWSTR _pszTitlePending; + BOOL _fIsViewMSHTML; + BOOL _fPrivacyImpacted; + CLSID _clsidView; + CLSID _clsidViewPending; + HWND _hwndFrame; + LONG _lPhishingFilterStatus; +} BASEBROWSERDATALH; +cpp_quote("#include <poppack.h>") +typedef struct basebrowserdatalh *LPBASEBROWSERDATALH; + +typedef BASEBROWSERDATAXP BASEBROWSERDATA; + +typedef const BASEBROWSERDATA *LPCBASEBROWSERDATA; + +typedef BASEBROWSERDATA *LPBASEBROWSERDATA; cpp_quote("#define VIEW_PRIORITY_RESTRICTED 0x00000070") cpp_quote("#define VIEW_PRIORITY_CACHEHIT 0x00000050") @@ -437,26 +413,36 @@ cpp_quote("#define VIEW_PRIORITY_DESPERATE 0x00000010") cpp_quote("#define VIEW_PRIORITY_NONE 0x00000000") +typedef struct tagFolderSetData +{ + FOLDERSETTINGS _fs; + SHELLVIEWID _vidRestore; + DWORD _dwViewPriority; +} FOLDERSETDATA; + +typedef struct tagFolderSetData *LPFOLDERSETDATA; + +typedef struct SToolbarItem +{ + IDockingWindow *ptbar; + BORDERWIDTHS rcBorderTool; + LPWSTR pwszItem; + BOOL fShow; + HMONITOR hMon; +} TOOLBARITEM; + +typedef struct SToolbarItem *LPTOOLBARITEM; cpp_quote("#define ITB_VIEW ((UINT)-1)") [ - uuid(68BD21CC-438B-11D2-A560-00A0C92DBFE8), - object, pointer_default(unique), - local + local, + object, + uuid(68BD21CC-438B-11D2-A560-00A0C92DBFE8) ] interface IBrowserService2 : IBrowserService { - typedef struct tagFolderSetData - { - FOLDERSETTINGS _fs; - SHELLVIEWID _vidRestore; - DWORD _dwViewPriority; - } FOLDERSETDATA; - - typedef struct tagFolderSetData *LPFOLDERSETDATA; - LRESULT WndProcBS( [in] HWND hwnd, UINT uMsg, @@ -664,10 +650,10 @@ } [ - uuid(27D7CE21-762D-48F3-86F3-40E2FD3749C4), - object, pointer_default(unique), - local + local, + object, + uuid(27D7CE21-762D-48F3-86F3-40E2FD3749C4) ] interface IBrowserService3 : IBrowserService2 { @@ -683,10 +669,10 @@ } [ - uuid(639f1bff-e135-4096-abd8-e0f504d649a4), - object, pointer_default(unique), - local + local, + object, + uuid(639f1bff-e135-4096-abd8-e0f504d649a4) ] interface IBrowserService4 : IBrowserService3 { Modified: trunk/reactos/include/psdk/tlogstg.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/tlogstg.idl?r… ============================================================================== --- trunk/reactos/include/psdk/tlogstg.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/tlogstg.idl [iso-8859-1] Sun Jul 14 06:29:16 2013 @@ -50,3 +50,13 @@ [in] LPWSTR pszUrlLocation, [in] DWORD dwPosition); } + +enum tagTLENUMF +{ + TLEF_RELATIVE_INCLUDE_CURRENT = 0x00000001, + TLEF_RELATIVE_BACK = 0x00000010, + TLEF_RELATIVE_FORE = 0x00000020, + TLEF_INCLUDE_UNINVOKEABLE = 0x00000040, + TLEF_ABSOLUTE = 0x00000031, +}; +typedef DWORD TLENUMF;

11 years, 5 months

← Newer
1
...
10
11
12
13
14
15
16
...
20
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 July 2013