Ros-diffs April 2013

ros-diffs@reactos.org

14 participants
265 discussions

[akhaldi] 58796: [PSDK] * Sync some exdisp.idl changes with Wine.
by akhaldi＠svn.reactos.org 20 Apr '13

20 Apr '13

Author: akhaldi Date: Sat Apr 20 22:21:07 2013 New Revision: 58796 URL: http://svn.reactos.org/svn/reactos?rev=58796&view=rev Log: [PSDK] * Sync some exdisp.idl changes with Wine. Modified: trunk/reactos/include/psdk/exdisp.idl Modified: trunk/reactos/include/psdk/exdisp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/exdisp.idl?re… ============================================================================== --- trunk/reactos/include/psdk/exdisp.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/exdisp.idl [iso-8859-1] Sat Apr 20 22:21:07 2013 @@ -26,6 +26,12 @@ #include <olectl.h> #include <exdispid.h> +#ifndef __WIDL__ +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + cpp_quote("#ifdef WINE_NO_UNICODE_MACROS") cpp_quote("#undef FindText") cpp_quote("#endif") @@ -473,6 +479,10 @@ } [ + helpstring("Microsoft Web Browser Version 1"), + threading(apartment), + progid("Shell.Explorer.1"), + vi_progid("Shell.Explorer"), uuid(eab22ac3-30c1-11cf-a7eb-0000c05bae0b), control ] @@ -485,6 +495,10 @@ } [ + helpstring("Microsoft Web Browser"), + threading(apartment), + progid("Shell.Explorer.2"), + vi_progid("Shell.Explorer"), uuid(8856f961-340a-11d0-a96b-00c04fd705a2), control ] @@ -497,6 +511,9 @@ } [ + helpstring("Internet Explorer(Ver 1.0)"), + progid("InternetExplorer.Application.1"), + vi_progid("InternetExplorer.Application"), uuid(0002df01-0000-0000-c000-000000000046) ] coclass InternetExplorer @@ -599,6 +616,7 @@ } [ + threading(apartment), uuid(9ba05972-f6a8-11cf-a442-00a0c90a8f39) ] coclass ShellWindows @@ -720,6 +738,10 @@ } [ + helpstring("Microsoft Shell UI Helper"), + threading(apartment), + progid("Shell.UIHelper.1"), + vi_progid("Shell.UIHelper"), uuid(64ab4bb7-111e-11d1-8f79-00c04fc2fbe1) ] coclass ShellUIHelper { @@ -810,17 +832,25 @@ } [ - uuid(55136805-b2de-11d1-b9f2-00a0c98bc547) -] -coclass ShellNameSpace { + helpstring("Shell Name Space"), + threading(apartment), + progid("ShellNameSpace.ShellNameSpace.1"), + vi_progid("ShellNameSpace.ShellNameSpace"), + uuid(2f2f1f96-2bc1-4b1c-be28-ea3774f4676a) +] +coclass ShellShellNameSpace { [default] interface IShellNameSpace; [default, source] dispinterface DShellNameSpaceEvents; } [ - uuid(2f2f1f96-2bc1-4b1c-be28-ea3774f4676a) -] -coclass ShellShellNameSpace { + helpstring("Shell Name Space"), + threading(apartment), + progid("ShellNameSpace.ShellNameSpace.1"), + vi_progid("ShellNameSpace.ShellNameSpace"), + uuid(55136805-b2de-11d1-b9f2-00a0c98bc547) +] +coclass ShellNameSpace { [default] interface IShellNameSpace; [default, source] dispinterface DShellNameSpaceEvents; } @@ -989,6 +1019,22 @@ } [ + helpstring("SearchAssistantOC"), + threading(apartment), + progid("SearchAssistantOC.SearchAssistantOC.1"), + vi_progid("SearchAssistantOC.SearchAssistantOC"), + uuid(2e71fd0f-aab1-42c0-9146-6d2c4edcf07d), + hidden +] +coclass ShellSearchAssistantOC { + [default] interface ISearchAssistantOC3; + [default, source] dispinterface _SearchAssistantEvents; +} + +[ + threading(apartment), + progid("SearchAssistantOC.SearchAssistantOC.1"), + vi_progid("SearchAssistantOC.SearchAssistantOC"), uuid(b45ff030-4447-11d2-85de-00C04fa35c89), hidden ] @@ -997,13 +1043,4 @@ [default, source] dispinterface _SearchAssistantEvents; } -[ - uuid(2e71fd0f-aab1-42c0-9146-6d2c4edcf07d), - hidden -] -coclass ShellSearchAssistantOC { - [default] interface ISearchAssistantOC3; - [default, source] dispinterface _SearchAssistantEvents; -} - } /* library */

1 0

[akhaldi] 58795: [ACTXPRXY] * Sync with Wine 1.5.26.
by akhaldi＠svn.reactos.org 20 Apr '13

20 Apr '13

Author: akhaldi Date: Sat Apr 20 21:18:05 2013 New Revision: 58795 URL: http://svn.reactos.org/svn/reactos?rev=58795&view=rev Log: [ACTXPRXY] * Sync with Wine 1.5.26. Added: trunk/reactos/dll/win32/actxprxy/actxprxy.rc (with props) trunk/reactos/dll/win32/actxprxy/actxprxy_activscp.rgs (with props) trunk/reactos/dll/win32/actxprxy/actxprxy_comcat.rgs (with props) trunk/reactos/dll/win32/actxprxy/actxprxy_docobj.rgs (with props) trunk/reactos/dll/win32/actxprxy/actxprxy_hlink.rgs (with props) trunk/reactos/dll/win32/actxprxy/actxprxy_htiface.idl (with props) trunk/reactos/dll/win32/actxprxy/actxprxy_htiface.rgs (with props) trunk/reactos/dll/win32/actxprxy/actxprxy_htiframe.rgs (with props) trunk/reactos/dll/win32/actxprxy/actxprxy_objsafe.rgs (with props) trunk/reactos/dll/win32/actxprxy/actxprxy_ocmm.rgs (with props) trunk/reactos/dll/win32/actxprxy/actxprxy_servprov.rgs (with props) trunk/reactos/dll/win32/actxprxy/actxprxy_shldisp.rgs (with props) trunk/reactos/dll/win32/actxprxy/actxprxy_shobjidl.rgs (with props) trunk/reactos/dll/win32/actxprxy/actxprxy_urlhist.rgs (with props) Modified: trunk/reactos/dll/win32/actxprxy/CMakeLists.txt trunk/reactos/dll/win32/actxprxy/actxprxy_activscp.idl trunk/reactos/dll/win32/actxprxy/actxprxy_comcat.idl trunk/reactos/dll/win32/actxprxy/actxprxy_docobj.idl trunk/reactos/dll/win32/actxprxy/actxprxy_hlink.idl trunk/reactos/dll/win32/actxprxy/actxprxy_htiframe.idl trunk/reactos/dll/win32/actxprxy/actxprxy_objsafe.idl trunk/reactos/dll/win32/actxprxy/actxprxy_ocmm.idl trunk/reactos/dll/win32/actxprxy/actxprxy_servprov.idl trunk/reactos/dll/win32/actxprxy/actxprxy_shldisp.idl trunk/reactos/dll/win32/actxprxy/actxprxy_shobjidl.idl trunk/reactos/dll/win32/actxprxy/actxprxy_urlhist.idl trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/actxprxy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] Sat Apr 20 21:18:05 2013 @@ -1,6 +1,8 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-DWINE_REGISTER_DLL -DPROXY_DELEGATION) spec2def(actxprxy.dll actxprxy.spec) @@ -9,6 +11,7 @@ actxprxy_comcat.idl actxprxy_docobj.idl actxprxy_hlink.idl + actxprxy_htiface.idl actxprxy_htiframe.idl actxprxy_objsafe.idl actxprxy_ocmm.idl @@ -19,10 +22,12 @@ list(APPEND SOURCE usrmarshal.c + actxprxy.rc ${CMAKE_CURRENT_BINARY_DIR}/actxprxy_activscp_p.c ${CMAKE_CURRENT_BINARY_DIR}/actxprxy_comcat_p.c ${CMAKE_CURRENT_BINARY_DIR}/actxprxy_docobj_p.c ${CMAKE_CURRENT_BINARY_DIR}/actxprxy_hlink_p.c + ${CMAKE_CURRENT_BINARY_DIR}/actxprxy_htiface_p.c ${CMAKE_CURRENT_BINARY_DIR}/actxprxy_htiframe_p.c ${CMAKE_CURRENT_BINARY_DIR}/actxprxy_objsafe_p.c ${CMAKE_CURRENT_BINARY_DIR}/actxprxy_ocmm_p.c @@ -34,22 +39,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/actxprxy.def) add_library(actxprxy SHARED ${SOURCE}) - set_module_type(actxprxy win32dll) - -target_link_libraries(actxprxy - uuid - wine - ${PSEH_LIB}) - -add_importlibs(actxprxy - rpcrt4 - ole32 - oleaut32 - msvcrt - kernel32 - ntdll) - -add_definitions(-DWINE_REGISTER_DLL -DPROXY_DELEGATION) - +target_link_libraries(actxprxy uuid wine ${PSEH_LIB}) +add_importlibs(actxprxy rpcrt4 ole32 oleaut32 msvcrt kernel32 ntdll) add_cd_file(TARGET actxprxy DESTINATION reactos/system32 FOR all) Added: trunk/reactos/dll/win32/actxprxy/actxprxy.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy.rc (added) +++ trunk/reactos/dll/win32/actxprxy/actxprxy.rc [iso-8859-1] Sat Apr 20 21:18:05 2013 @@ -1,0 +1,12 @@ +1 WINE_REGISTRY actxprxy_activscp.rgs +2 WINE_REGISTRY actxprxy_comcat.rgs +3 WINE_REGISTRY actxprxy_docobj.rgs +4 WINE_REGISTRY actxprxy_hlink.rgs +5 WINE_REGISTRY actxprxy_htiface.rgs +6 WINE_REGISTRY actxprxy_htiframe.rgs +7 WINE_REGISTRY actxprxy_objsafe.rgs +8 WINE_REGISTRY actxprxy_ocmm.rgs +9 WINE_REGISTRY actxprxy_servprov.rgs +10 WINE_REGISTRY actxprxy_shldisp.rgs +11 WINE_REGISTRY actxprxy_shobjidl.rgs +12 WINE_REGISTRY actxprxy_urlhist.rgs Propchange: trunk/reactos/dll/win32/actxprxy/actxprxy.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_activscp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_activscp.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_activscp.idl [iso-8859-1] Sat Apr 20 21:18:05 2013 @@ -20,10 +20,8 @@ #include "activscp.idl" -#ifdef __WIDL__ [ threading(both), uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ ] coclass PSFactoryBuffer { interface IFactoryBuffer; } -#endif Added: trunk/reactos/dll/win32/actxprxy/actxprxy_activscp.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_activscp.rgs (added) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_activscp.rgs [iso-8859-1] Sat Apr 20 21:18:05 2013 @@ -1,0 +1,98 @@ +HKCR +{ + NoRemove Interface + { + '{EAE1BA61-A4ED-11CF-8F20-00805F2CD064}' = s 'IActiveScriptError' + { + NumMethods = s 6 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{DB01A1E3-A42B-11CF-8F20-00805F2CD064}' = s 'IActiveScriptSite' + { + NumMethods = s 11 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{D10F6761-83E9-11CF-8F20-00805F2CD064}' = s 'IActiveScriptSiteWindow' + { + NumMethods = s 5 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{AEDAE97E-D7EE-4796-B960-7F092AE844AB}' = s 'IActiveScriptSiteUIControl' + { + NumMethods = s 4 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{539698A0-CDCA-11CF-A5EB-00AA0047A063}' = s 'IActiveScriptSiteInterruptPoll' + { + NumMethods = s 4 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{BB1A2AE1-A4F9-11CF-8F20-00805F2CD064}' = s 'IActiveScript' + { + NumMethods = s 16 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{BB1A2AE2-A4F9-11CF-8F20-00805F2CD064}' = s 'IActiveScriptParse32' + { + NumMethods = s 6 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{C7EF7658-E1EE-480E-97EA-D52CB4D76D17}' = s 'IActiveScriptParse64' + { + NumMethods = s 6 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{1CFF0050-6FDD-11D0-9328-00A0C90DCAA9}' = s 'IActiveScriptParseProcedureOld32' + { + NumMethods = s 4 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{21F57128-08C9-4638-BA12-22D15D88DC5C}' = s 'IActiveScriptParseProcedureOld64' + { + NumMethods = s 4 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{AA5B6A80-B834-11D0-932F-00A0C90DCAA9}' = s 'IActiveScriptParseProcedure32' + { + NumMethods = s 4 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{C64713B6-E029-4CC5-9200-438B72890B6A}' = s 'IActiveScriptParseProcedure64' + { + NumMethods = s 4 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{71EE5B20-FB04-11D1-B3A8-00A0C911E8B2}' = s 'IActiveScriptParseProcedure2_32' + { + NumMethods = s 4 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{FE7C4271-210C-448D-9F54-76DAB7047B28}' = s 'IActiveScriptParseProcedure2_64' + { + NumMethods = s 4 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{63CDBCB0-C1B1-11D0-9336-00A0C90DCAA9}' = s 'IBindEventHandler' + { + NumMethods = s 4 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' = s 'IActiveScriptStats' + { + NumMethods = s 6 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{4954E0D0-FBC7-11D1-8410-006008C3FBFC}' = s 'IActiveScriptProperty' + { + NumMethods = s 5 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + } + NoRemove CLSID + { + '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' = s 'PSFactoryBuffer' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + } + } +} Propchange: trunk/reactos/dll/win32/actxprxy/actxprxy_activscp.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_comcat.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_comcat.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_comcat.idl [iso-8859-1] Sat Apr 20 21:18:05 2013 @@ -20,10 +20,8 @@ #include "comcat.idl" -#ifdef __WIDL__ [ threading(both), uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ ] coclass PSFactoryBuffer { interface IFactoryBuffer; } -#endif Added: trunk/reactos/dll/win32/actxprxy/actxprxy_comcat.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_comcat.rgs (added) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_comcat.rgs [iso-8859-1] Sat Apr 20 21:18:05 2013 @@ -1,0 +1,33 @@ +HKCR +{ + NoRemove Interface + { + '{0002E000-0000-0000-C000-000000000046}' = s 'IEnumGUID' + { + NumMethods = s 7 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{0002E011-0000-0000-C000-000000000046}' = s 'IEnumCATEGORYINFO' + { + NumMethods = s 7 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{0002E013-0000-0000-C000-000000000046}' = s 'ICatInformation' + { + NumMethods = s 9 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{0002E012-0000-0000-C000-000000000046}' = s 'ICatRegister' + { + NumMethods = s 9 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + } + NoRemove CLSID + { + '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' = s 'PSFactoryBuffer' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + } + } +} Propchange: trunk/reactos/dll/win32/actxprxy/actxprxy_comcat.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_docobj.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_docobj.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_docobj.idl [iso-8859-1] Sat Apr 20 21:18:05 2013 @@ -20,10 +20,8 @@ #include "docobj.idl" -#ifdef __WIDL__ [ threading(both), uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ ] coclass PSFactoryBuffer { interface IFactoryBuffer; } -#endif Added: trunk/reactos/dll/win32/actxprxy/actxprxy_docobj.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_docobj.rgs (added) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_docobj.rgs [iso-8859-1] Sat Apr 20 21:18:05 2013 @@ -1,0 +1,48 @@ +HKCR +{ + NoRemove Interface + { + '{B722BCC5-4E68-101B-A2BC-00AA00404770}' = s 'IOleDocument' + { + NumMethods = s 6 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{B722BCC7-4E68-101B-A2BC-00AA00404770}' = s 'IOleDocumentSite' + { + NumMethods = s 4 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{B722BCC6-4E68-101B-A2BC-00AA00404770}' = s 'IOleDocumentView' + { + NumMethods = s 16 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{B722BCC8-4E68-101B-A2BC-00AA00404770}' = s 'IEnumOleDocumentViews' + { + NumMethods = s 7 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{B722BCCB-4E68-101B-A2BC-00AA00404770}' = s 'IOleCommandTarget' + { + NumMethods = s 5 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{B722BCCA-4E68-101B-A2BC-00AA00404770}' = s 'IContinueCallback' + { + NumMethods = s 5 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{B722BCC9-4E68-101B-A2BC-00AA00404770}' = s 'IPrint' + { + NumMethods = s 6 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + } + NoRemove CLSID + { + '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' = s 'PSFactoryBuffer' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + } + } +} Propchange: trunk/reactos/dll/win32/actxprxy/actxprxy_docobj.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_hlink.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_hlink.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_hlink.idl [iso-8859-1] Sat Apr 20 21:18:05 2013 @@ -20,10 +20,8 @@ #include "hlink.idl" -#ifdef __WIDL__ [ threading(both), uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ ] coclass PSFactoryBuffer { interface IFactoryBuffer; } -#endif Added: trunk/reactos/dll/win32/actxprxy/actxprxy_hlink.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_hlink.rgs (added) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_hlink.rgs [iso-8859-1] Sat Apr 20 21:18:05 2013 @@ -1,0 +1,38 @@ +HKCR +{ + NoRemove Interface + { + '{79EAC9C3-BAF9-11CE-8C82-00AA004BA90B}' = s 'IHlink' + { + NumMethods = s 17 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{79EAC9C2-BAF9-11CE-8C82-00AA004BA90B}' = s 'IHlinkSite' + { + NumMethods = s 7 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{79EAC9C4-BAF9-11CE-8C82-00AA004BA90B}' = s 'IHlinkTarget' + { + NumMethods = s 8 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{79EAC9C5-BAF9-11CE-8C82-00AA004BA90B}' = s 'IHlinkFrame' + { + NumMethods = s 8 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{79EAC9CB-BAF9-11CE-8C82-00AA004BA90B}' = s 'IExtensionServices' + { + NumMethods = s 5 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + } + NoRemove CLSID + { + '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' = s 'PSFactoryBuffer' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + } + } +} Propchange: trunk/reactos/dll/win32/actxprxy/actxprxy_hlink.rgs ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/actxprxy/actxprxy_htiface.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_htiface.idl (added) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_htiface.idl [iso-8859-1] Sat Apr 20 21:18:05 2013 @@ -1,0 +1,27 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * 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 + */ + +/* just a wrapper for htiface.idl */ + +#include "htiface.idl" + +[ + threading(both), + uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } Propchange: trunk/reactos/dll/win32/actxprxy/actxprxy_htiface.idl ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/actxprxy/actxprxy_htiface.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_htiface.rgs (added) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_htiface.rgs [iso-8859-1] Sat Apr 20 21:18:05 2013 @@ -1,0 +1,28 @@ +HKCR +{ + NoRemove Interface + { + '{D5F78C80-5252-11CF-90FA-00AA0042106E}' = s 'ITargetFrame' + { + NumMethods = s 9 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{9216E421-2BF5-11D0-82B4-00A0C90C29C5}' = s 'ITargetFramePriv' + { + NumMethods = s 9 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{B2C867E6-69D6-46F2-A611-DED9A4BD7FEF}' = s 'ITargetFramePriv2' + { + NumMethods = s 10 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + } + NoRemove CLSID + { + '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' = s 'PSFactoryBuffer' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + } + } +} Propchange: trunk/reactos/dll/win32/actxprxy/actxprxy_htiface.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_htiframe.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_htiframe.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_htiframe.idl [iso-8859-1] Sat Apr 20 21:18:05 2013 @@ -20,10 +20,8 @@ #include "htiframe.idl" -#ifdef __WIDL__ [ threading(both), uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ ] coclass PSFactoryBuffer { interface IFactoryBuffer; } -#endif Added: trunk/reactos/dll/win32/actxprxy/actxprxy_htiframe.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_htiframe.rgs (added) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_htiframe.rgs [iso-8859-1] Sat Apr 20 21:18:05 2013 @@ -1,0 +1,33 @@ +HKCR +{ + NoRemove Interface + { + '{863A99A0-21BC-11D0-82B4-00A0C90C29C5}' = s 'ITargetNotify' + { + NumMethods = s 5 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{3050F6B1-98B5-11CF-BB82-00AA00BDCE0B}' = s 'ITargetNotify2' + { + NumMethods = s 6 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{86D52E11-94A8-11D0-82AF-00C04FD5AE38}' = s 'ITargetFrame2' + { + NumMethods = s 15 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{7847EC01-2BEC-11D0-82B4-00A0C90C29C5}' = s 'ITargetContainer' + { + NumMethods = s 5 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + } + NoRemove CLSID + { + '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' = s 'PSFactoryBuffer' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + } + } +} Propchange: trunk/reactos/dll/win32/actxprxy/actxprxy_htiframe.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_objsafe.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_objsafe.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_objsafe.idl [iso-8859-1] Sat Apr 20 21:18:05 2013 @@ -20,10 +20,8 @@ #include "objsafe.idl" -#ifdef __WIDL__ [ threading(both), uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ ] coclass PSFactoryBuffer { interface IFactoryBuffer; } -#endif Added: trunk/reactos/dll/win32/actxprxy/actxprxy_objsafe.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_objsafe.rgs (added) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_objsafe.rgs [iso-8859-1] Sat Apr 20 21:18:05 2013 @@ -1,0 +1,18 @@ +HKCR +{ + NoRemove Interface + { + '{CB5BDC81-93C1-11CF-8F20-00805F2CD064}' = s 'IObjectSafety' + { + NumMethods = s 5 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + } + NoRemove CLSID + { + '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' = s 'PSFactoryBuffer' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + } + } +} Propchange: trunk/reactos/dll/win32/actxprxy/actxprxy_objsafe.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_ocmm.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_ocmm.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_ocmm.idl [iso-8859-1] Sat Apr 20 21:18:05 2013 @@ -20,10 +20,8 @@ #include "ocmm.idl" -#ifdef __WIDL__ [ threading(both), uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ ] coclass PSFactoryBuffer { interface IFactoryBuffer; } -#endif Added: trunk/reactos/dll/win32/actxprxy/actxprxy_ocmm.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_ocmm.rgs (added) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_ocmm.rgs [iso-8859-1] Sat Apr 20 21:18:05 2013 @@ -1,0 +1,28 @@ +HKCR +{ + NoRemove Interface + { + '{3050F361-98B5-11CF-BB82-00AA00BDCE0B}' = s 'ITimerSink' + { + NumMethods = s 4 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{3050F360-98B5-11CF-BB82-00AA00BDCE0B}' = s 'ITimer' + { + NumMethods = s 7 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{3050F35F-98B5-11CF-BB82-00AA00BDCE0B}' = s 'ITimerService' + { + NumMethods = s 6 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + } + NoRemove CLSID + { + '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' = s 'PSFactoryBuffer' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + } + } +} Propchange: trunk/reactos/dll/win32/actxprxy/actxprxy_ocmm.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_servprov.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_servprov.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_servprov.idl [iso-8859-1] Sat Apr 20 21:18:05 2013 @@ -1,9 +1,7 @@ #include "servprov.idl" -#ifdef __WIDL__ [ threading(both), uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ ] coclass PSFactoryBuffer { interface IFactoryBuffer; } -#endif Added: trunk/reactos/dll/win32/actxprxy/actxprxy_servprov.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_servprov.rgs (added) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_servprov.rgs [iso-8859-1] Sat Apr 20 21:18:05 2013 @@ -1,0 +1,18 @@ +HKCR +{ + NoRemove Interface + { + '{6D5140C1-7436-11CE-8034-00AA006009FA}' = s 'IServiceProvider' + { + NumMethods = s 4 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + } + NoRemove CLSID + { + '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' = s 'PSFactoryBuffer' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + } + } +} Propchange: trunk/reactos/dll/win32/actxprxy/actxprxy_servprov.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_shldisp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_shldisp.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_shldisp.idl [iso-8859-1] Sat Apr 20 21:18:05 2013 @@ -20,10 +20,8 @@ #include "shldisp.idl" -#ifdef __WIDL__ [ threading(both), uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ ] coclass PSFactoryBuffer { interface IFactoryBuffer; } -#endif Added: trunk/reactos/dll/win32/actxprxy/actxprxy_shldisp.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_shldisp.rgs (added) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_shldisp.rgs [iso-8859-1] Sat Apr 20 21:18:05 2013 @@ -1,0 +1,18 @@ +HKCR +{ + NoRemove Interface + { + '{3D8B0590-F691-11D2-8EA9-006097DF5BD4}' = s 'IAsyncOperation' + { + NumMethods = s 8 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + } + NoRemove CLSID + { + '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' = s 'PSFactoryBuffer' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + } + } +} Propchange: trunk/reactos/dll/win32/actxprxy/actxprxy_shldisp.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_shobjidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_shobjidl.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_shobjidl.idl [iso-8859-1] Sat Apr 20 21:18:05 2013 @@ -20,10 +20,8 @@ #include "shobjidl.idl" -#ifdef __WIDL__ [ threading(both), uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ ] coclass PSFactoryBuffer { interface IFactoryBuffer; } -#endif Added: trunk/reactos/dll/win32/actxprxy/actxprxy_shobjidl.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_shobjidl.rgs (added) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_shobjidl.rgs [iso-8859-1] Sat Apr 20 21:18:05 2013 @@ -1,0 +1,268 @@ +HKCR +{ + NoRemove Interface + { + '{000214EA-0000-0000-C000-000000000046}' = s 'IPersistFolder' + { + NumMethods = s 5 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{1AC3D9F0-175C-11D1-95BE-00609797EA4F}' = s 'IPersistFolder2' + { + NumMethods = s 6 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{1079ACFC-29BD-11D3-8E0D-00C04F6837D5}' = s 'IPersistIDList' + { + NumMethods = s 6 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{000214F2-0000-0000-C000-000000000046}' = s 'IEnumIDList' + { + NumMethods = s 7 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{000214E6-0000-0000-C000-000000000046}' = s 'IShellFolder' + { + NumMethods = s 13 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{0E700BE1-9DB6-11D1-A1CE-00C04FD75D13}' = s 'IEnumExtraSearch' + { + NumMethods = s 7 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{93F2F68C-1D1B-11D3-A30E-00C04F79ABD1}' = s 'IShellFolder2' + { + NumMethods = s 20 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{43826D1E-E718-42EE-BC55-A1E261C37BFE}' = s 'IShellItem' + { + NumMethods = s 8 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{7E9FB0D3-919F-4307-AB2E-9B1860310C93}' = s 'IShellItem2' + { + NumMethods = s 21 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{D2BC4C84-3F72-4A52-A604-7BCBF3982CBB}' = s 'INewWindowManager' + { + NumMethods = s 4 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{70629033-E363-4A28-A567-0DB78006E6D7}' = s 'IEnumShellItems' + { + NumMethods = s 7 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{B63EA76D-1F85-456F-A19C-48159EFA858B}' = s 'IShellItemArray' + { + NumMethods = s 10 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{2659B475-EEB8-48B7-8F07-B378810F48CF}' = s 'IShellItemFilter' + { + NumMethods = s 5 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{000214E5-0000-0000-C000-000000000046}' = s 'IShellIcon' + { + NumMethods = s 4 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{000214E3-0000-0000-C000-000000000046}' = s 'IShellView' + { + NumMethods = s 16 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{88E39E80-3578-11CF-AE69-08002B2E1262}' = s 'IShellView2' + { + NumMethods = s 20 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{CDE725B0-CCC9-4519-917E-325D72FAB4CE}' = s 'IFolderView' + { + NumMethods = s 17 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{000214E2-0000-0000-C000-000000000046}' = s 'IShellBrowser' + { + NumMethods = s 18 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{000214EE-0000-0000-C000-000000000046}' = s 'IShellLinkA' + { + NumMethods = s 21 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{000214F9-0000-0000-C000-000000000046}' = s 'IShellLinkW' + { + NumMethods = s 21 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{CEF04FDF-FE72-11D2-87A5-00C04F6837CF}' = s 'IPersistFolder3' + { + NumMethods = s 8 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{000214F1-0000-0000-C000-000000000046}' = s 'ICommDlgBrowser' + { + NumMethods = s 6 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{10339516-2894-11D2-9039-00C04F8EEB3E}' = s 'ICommDlgBrowser2' + { + NumMethods = s 9 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{C8AD25A1-3294-41EE-8165-71174BD01C57}' = s 'ICommDlgBrowser3' + { + NumMethods = s 12 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{012DD920-7B26-11D0-8CA9-00A0C92DBFE8}' = s 'IDockingWindow' + { + NumMethods = s 8 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{45E2B4AE-B1C3-11D0-B92F-00A0C90312E1}' = s 'IShellLinkDataList' + { + NumMethods = s 8 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{5CD52983-9449-11D2-963A-00C04F79ADF0}' = s 'IResolveShellLink' + { + NumMethods = s 4 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{56FDF342-FD6D-11D0-958A-006097C9A090}' = s 'ITaskbarList' + { + NumMethods = s 8 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{602D4995-B13A-429B-A66E-1935E44F4317}' = s 'ITaskbarList2' + { + NumMethods = s 9 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{EA1AFB91-9E28-4B86-90E9-9E9F8A5EEFAF}' = s 'ITaskbarList3' + { + NumMethods = s 21 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{C43DC798-95D1-4BEA-9030-BB99E2983A1A}' = s 'ITaskbarList4' + { + NumMethods = s 22 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{3CD141F4-3C6A-11D2-BCAA-00C04FD929DB}' = s 'IAutoCompleteDropDown' + { + NumMethods = s 5 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{CB728B20-F786-11CE-92AD-00AA00A74CD0}' = s 'IProfferService' + { + NumMethods = s 5 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{361BBDC7-E6EE-4E13-BE58-58E2240C810F}' = s 'IExplorerBrowserEvents' + { + NumMethods = s 7 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{E07010EC-BC17-44C0-97B0-46C7C95B9EDC}' = s 'IExplorerPaneVisibility' + { + NumMethods = s 4 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{DFD3B6B5-C10C-4BE9-85F6-A66969F402F6}' = s 'IExplorerBrowser' + { + NumMethods = s 18 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{028212A3-B627-47E9-8856-C14265554E4F}' = s 'INameSpaceTreeControl' + { + NumMethods = s 22 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{7CC7AED8-290E-49BC-8945-C1401CC9306C}' = s 'INameSpaceTreeControl2' + { + NumMethods = s 26 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{973510DB-7D7F-452B-8975-74A85828D354}' = s 'IFileDialogEvents' + { + NumMethods = s 10 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{B4DB1657-70D7-485E-8E3E-6FCB5A5C1802}' = s 'IModalWindow' + { + NumMethods = s 4 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{42F85136-DB7E-439C-85F1-E4075D135FC8}' = s 'IFileDialog' + { + NumMethods = s 27 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{61744FC7-85B5-4791-A9B0-272276309B13}' = s 'IFileDialog2' + { + NumMethods = s 29 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{04B0F1A7-9490-44BC-96E1-4296A31252E2}' = s 'IFileOperationProgressSink' + { + NumMethods = s 19 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{84BCCD23-5FDE-4CDB-AEA4-AF64B83D78AB}' = s 'IFileSaveDialog' + { + NumMethods = s 32 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{D57C7288-D4AD-4768-BE02-9D969532D960}' = s 'IFileOpenDialog' + { + NumMethods = s 29 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{E6FDD21A-163F-4975-9C8C-A69F1BA37034}' = s 'IFileDialogCustomize' + { + NumMethods = s 30 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{36116642-D713-4B97-9B83-7484A9D00433}' = s 'IFileDialogControlEvents' + { + NumMethods = s 7 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{3AA7AF7E-9B36-420C-A8E3-F77D4674A488}' = s 'IKnownFolder' + { + NumMethods = s 12 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{8BE2D872-86AA-4D47-B776-32CCA40C7018}' = s 'IKnownFolderManager' + { + NumMethods = s 13 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{4E530B0A-E611-4C77-A3AC-9031D022281B}' = s 'IApplicationAssociationRegistration' + { + NumMethods = s 9 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{6332DEBF-87B5-4670-90C0-5E57B408A49E}' = s 'ICustomDestinationList' + { + NumMethods = s 12 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + } + NoRemove CLSID + { + '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' = s 'PSFactoryBuffer' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + } + } +} Propchange: trunk/reactos/dll/win32/actxprxy/actxprxy_shobjidl.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_urlhist.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_urlhist.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_urlhist.idl [iso-8859-1] Sat Apr 20 21:18:05 2013 @@ -20,10 +20,8 @@ #include "urlhist.idl" -#ifdef __WIDL__ [ threading(both), uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ ] coclass PSFactoryBuffer { interface IFactoryBuffer; } -#endif Added: trunk/reactos/dll/win32/actxprxy/actxprxy_urlhist.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_urlhist.rgs (added) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_urlhist.rgs [iso-8859-1] Sat Apr 20 21:18:05 2013 @@ -1,0 +1,33 @@ +HKCR +{ + NoRemove Interface + { + '{3C374A42-BAE4-11CF-BF7D-00AA006946EE}' = s 'IEnumSTATURL' + { + NumMethods = s 8 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{3C374A41-BAE4-11CF-BF7D-00AA006946EE}' = s 'IUrlHistoryStg' + { + NumMethods = s 8 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{AFA0DC11-C313-11D0-831A-00C04FD5AE38}' = s 'IUrlHistoryStg2' + { + NumMethods = s 10 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + '{BC40BEC1-C493-11D0-831B-00C04FD5AE38}' = s 'IUrlHistoryNotify' + { + NumMethods = s 5 + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + } + } + NoRemove CLSID + { + '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' = s 'PSFactoryBuffer' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + } + } +} Propchange: trunk/reactos/dll/win32/actxprxy/actxprxy_urlhist.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Apr 20 21:18:05 2013 @@ -39,7 +39,7 @@ reactos/dll/directx/qedit # Autosync reactos/dll/directx/quartz # Autosync reactos/dll/win32/activeds # Synced to Wine-1.1.43? -reactos/dll/win32/actxprxy # Synced to Wine-1.3.29? +reactos/dll/win32/actxprxy # Synced to Wine-1.5.26 reactos/dll/win32/advpack # Synced to Wine-1.5.19 reactos/dll/win32/atl # Synced to Wine-1.5.19 reactos/dll/win32/atl100 # Synced to Wine-1.5.19

1 0

[tfaber] 58794: [EXPLORER_NEW] - Open Date and Time Properties on double-click on the tray clock. Based on patch by Edijs Kolesnikovičs and Grégori Macário Harbs. CORE-6860 #resolve
by tfaber＠svn.reactos.org 20 Apr '13

20 Apr '13

Author: tfaber Date: Sat Apr 20 19:34:32 2013 New Revision: 58794 URL: http://svn.reactos.org/svn/reactos?rev=58794&view=rev Log: [EXPLORER_NEW] - Open Date and Time Properties on double-click on the tray clock. Based on patch by Edijs Kolesnikovičs and Grégori Macário Harbs. CORE-6860 #resolve Modified: trunk/reactos/base/shell/explorer-new/precomp.h trunk/reactos/base/shell/explorer-new/trayntfy.c trunk/reactos/base/shell/explorer-new/traywnd.c Modified: trunk/reactos/base/shell/explorer-new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/pr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] Sat Apr 20 19:34:32 2013 @@ -424,6 +424,10 @@ IN WPARAM wParam, IN LPARAM lParam); +BOOL +TrayNotify_GetClockRect(IN HWND hwnd, + OUT PRECT rcClock); + /* * taskswnd.c */ Modified: trunk/reactos/base/shell/explorer-new/trayntfy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/trayntfy.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/trayntfy.c [iso-8859-1] Sat Apr 20 19:34:32 2013 @@ -1683,6 +1683,17 @@ } } +BOOL +TrayNotify_GetClockRect(IN HWND hwnd, + OUT PRECT rcClock) +{ + PTRAY_NOTIFY_WND_DATA This = (PTRAY_NOTIFY_WND_DATA)GetWindowLongPtr(hwnd, 0); + if (!IsWindowVisible(This->hWndTrayClock)) + return FALSE; + + return GetWindowRect(This->hWndTrayClock, rcClock); +} + static LRESULT CALLBACK TrayNotifyWndProc(IN HWND hwnd, IN UINT uMsg, Modified: trunk/reactos/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] Sat Apr 20 19:34:32 2013 @@ -2494,9 +2494,23 @@ } case WM_NCLBUTTONDBLCLK: + { /* We "handle" this message so users can't cause a weird maximize/restore window animation when double-clicking the tray window! */ + + /* We should forward mouse messages to child windows here. + Right now, this is only clock double-click */ + RECT rcClock; + if (TrayNotify_GetClockRect(This->hwndTrayNotify, &rcClock)) + { + POINT ptClick; + ptClick.x = MAKEPOINTS(lParam).x; + ptClick.y = MAKEPOINTS(lParam).y; + if (PtInRect(&rcClock, ptClick)) + LaunchCPanel(NULL, TEXT("timedate.cpl")); + } break; + } case WM_NCCREATE: {

1 0

[ekohl] 58793: [SAMSRV] Add missing header file.
by ekohl＠svn.reactos.org 20 Apr '13

20 Apr '13

Author: ekohl Date: Sat Apr 20 19:21:37 2013 New Revision: 58793 URL: http://svn.reactos.org/svn/reactos?rev=58793&view=rev Log: [SAMSRV] Add missing header file. Added: trunk/reactos/dll/win32/samsrv/resources.h (with props) Added: trunk/reactos/dll/win32/samsrv/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/resources… ============================================================================== --- trunk/reactos/dll/win32/samsrv/resources.h (added) +++ trunk/reactos/dll/win32/samsrv/resources.h [iso-8859-1] Sat Apr 20 19:21:37 2013 @@ -1,0 +1,27 @@ +/* + * PROJECT: Local Security Authority Server DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/samsrv/resource.h + * PURPOSE: Resource IDs + * COPYRIGHT: Copyright 2013 Eric Kohl + */ + +#pragma once + +#define IDS_DOMAIN_BUILTIN_NAME 100 + +#define IDS_ALIAS_ADMINISTRATORS_NAME 110 +#define IDS_ALIAS_ADMINISTRATORS_COMMENT 111 +#define IDS_ALIAS_GUESTS_NAME 112 +#define IDS_ALIAS_GUESTS_COMMENT 113 +#define IDS_ALIAS_POWER_USERS_NAME 114 +#define IDS_ALIAS_POWER_USERS_COMMENT 115 +#define IDS_ALIAS_USERS_NAME 116 +#define IDS_ALIAS_USERS_COMMENT 117 + +#define IDS_USER_ADMINISTRATOR_NAME 120 +#define IDS_USER_ADMINISTRATOR_COMMENT 121 +#define IDS_USER_GUEST_NAME 122 +#define IDS_USER_GUEST_COMMENT 123 + +/* EOF */ Propchange: trunk/reactos/dll/win32/samsrv/resources.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[ekohl] 58792: [SAMSRV] - Add string resources for SAM object names and comments. - Use the string resources in the setup code.
by ekohl＠svn.reactos.org 20 Apr '13

20 Apr '13

Author: ekohl Date: Sat Apr 20 18:54:27 2013 New Revision: 58792 URL: http://svn.reactos.org/svn/reactos?rev=58792&view=rev Log: [SAMSRV] - Add string resources for SAM object names and comments. - Use the string resources in the setup code. Added: trunk/reactos/dll/win32/samsrv/lang/ (with props) trunk/reactos/dll/win32/samsrv/lang/de-DE.rc (with props) trunk/reactos/dll/win32/samsrv/lang/en-US.rc (with props) Modified: trunk/reactos/dll/win32/samsrv/samsrv.h trunk/reactos/dll/win32/samsrv/samsrv.rc trunk/reactos/dll/win32/samsrv/setup.c Propchange: trunk/reactos/dll/win32/samsrv/lang/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Apr 20 18:54:27 2013 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Added: trunk/reactos/dll/win32/samsrv/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/samsrv/lang/de-DE.rc (added) +++ trunk/reactos/dll/win32/samsrv/lang/de-DE.rc [iso-8859-1] Sat Apr 20 18:54:27 2013 @@ -1,0 +1,24 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_DOMAIN_BUILTIN_NAME "Builtin" + + IDS_ALIAS_ADMINISTRATORS_NAME "Administratoren" + IDS_ALIAS_ADMINISTRATORS_COMMENT "Administratoren haben unbeschrÃ¤nkten Zugriff auf den Computer oder die DomÃ¤ne." + + IDS_ALIAS_GUESTS_NAME "GÃ¤ste" + IDS_ALIAS_GUESTS_COMMENT "GÃ¤ste besitzen standadmÃ¤Ãig die selben Rechte wie die Mitglieder der Benutzer-Gruppe." + + IDS_ALIAS_POWER_USERS_NAME "Hauptbenutzer" + IDS_ALIAS_POWER_USERS_COMMENT "Hauptbenutzer besitzen die meisten Rechte mit einigen EinschrÃ¤nkungen." + + IDS_ALIAS_USERS_NAME "Benutzer" + IDS_ALIAS_USERS_COMMENT "Benutzer kÃ¶nnen keine Ãnderungen am System vornehmen." + + IDS_USER_ADMINISTRATOR_NAME "Administrator" + IDS_USER_ADMINISTRATOR_COMMENT "Vordefiniertes Konto fÃ¼r die Verwaltung des Comuters oder der DomÃ¤ne." + + IDS_USER_GUEST_NAME "Gast" + IDS_USER_GUEST_COMMENT "Vordefiniertes Konto fÃ¼r Gastzugriff auf den Computer oder die DomÃ¤ne." +END Propchange: trunk/reactos/dll/win32/samsrv/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/samsrv/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/samsrv/lang/en-US.rc (added) +++ trunk/reactos/dll/win32/samsrv/lang/en-US.rc [iso-8859-1] Sat Apr 20 18:54:27 2013 @@ -1,0 +1,24 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +BEGIN + IDS_DOMAIN_BUILTIN_NAME "Builtin" + + IDS_ALIAS_ADMINISTRATORS_NAME "Administrators" + IDS_ALIAS_ADMINISTRATORS_COMMENT "Administrators have unrestricted access to the computer or domain." + + IDS_ALIAS_GUESTS_NAME "Guests" + IDS_ALIAS_GUESTS_COMMENT "Guests have the same rights a members of the Users group by default." + + IDS_ALIAS_POWER_USERS_NAME "Power Users" + IDS_ALIAS_POWER_USERS_COMMENT "Power Users have most administrative rights with some restrictions." + + IDS_ALIAS_USERS_NAME "Users" + IDS_ALIAS_USERS_COMMENT "Users are prevented from making system-wide changes." + + IDS_USER_ADMINISTRATOR_NAME "Administrator" + IDS_USER_ADMINISTRATOR_COMMENT "Built-in account used to administate the computer or domain." + + IDS_USER_GUEST_NAME "Guest" + IDS_USER_GUEST_COMMENT "Built-in account for guest access to the computer or domain." +END Propchange: trunk/reactos/dll/win32/samsrv/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Sat Apr 20 18:54:27 2013 @@ -15,6 +15,7 @@ #include <windef.h> #include <winbase.h> #include <winreg.h> +#include <winuser.h> #define NTOS_MODE_USER #include <ndk/cmfuncs.h> #include <ndk/kefuncs.h> @@ -29,6 +30,8 @@ #include <sam_s.h> #include <wine/debug.h> + +#include "resources.h" typedef enum _SAM_DB_OBJECT_TYPE { Modified: trunk/reactos/dll/win32/samsrv/samsrv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.rc… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.rc [iso-8859-1] Sat Apr 20 18:54:27 2013 @@ -1,5 +1,28 @@ +#include <windows.h> +#include "resources.h" + #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "SAM server DLL\0" #define REACTOS_STR_INTERNAL_NAME "samsrv\0" #define REACTOS_STR_ORIGINAL_FILENAME "samsrv.dll\0" +#define REACTOS_FILEVERSION 5,1,2600,0 +#define REACTOS_STR_FILE_VERSION "5.1.2600\0" #include <reactos/version.rc> + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +/* + * Everything specific to any language goes in one of the specific + * files. Note that you can and may override resources which also have + * a neutral version. This is to get localized bitmaps for example. + */ + +/* UTF-8 */ +#pragma code_page(65001) +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif + Modified: trunk/reactos/dll/win32/samsrv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/setup.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] Sat Apr 20 18:54:27 2013 @@ -22,6 +22,53 @@ /* FUNCTIONS ***************************************************************/ + +static INT +SampLoadString(HINSTANCE hInstance, + UINT uId, + LPWSTR lpBuffer, + INT nBufferMax) +{ + HGLOBAL hmem; + HRSRC hrsrc; + WCHAR *p; + int string_num; + int i; + + /* Use loword (incremented by 1) as resourceid */ + hrsrc = FindResourceW(hInstance, + MAKEINTRESOURCEW((LOWORD(uId) >> 4) + 1), + (LPWSTR)RT_STRING); + if (!hrsrc) + return 0; + + hmem = LoadResource(hInstance, hrsrc); + if (!hmem) + return 0; + + p = LockResource(hmem); + string_num = uId & 0x000f; + for (i = 0; i < string_num; i++) + p += *p + 1; + + i = min(nBufferMax - 1, *p); + if (i > 0) + { + memcpy(lpBuffer, p + 1, i * sizeof(WCHAR)); + lpBuffer[i] = 0; + } + else + { + if (nBufferMax > 1) + { + lpBuffer[0] = 0; + return 0; + } + } + + return i; +} + BOOL SampIsSetupRunning(VOID) @@ -222,9 +269,22 @@ } +#if 0 +static BOOL +SampCreateGroupAccount(HKEY hDomainKey, + LPCWSTR lpAccountName, + ULONG ulRelativeId) +{ + + return FALSE; +} +#endif + + static BOOL SampCreateUserAccount(HKEY hDomainKey, LPCWSTR lpAccountName, + LPCWSTR lpComment, ULONG ulRelativeId, ULONG UserAccountControl) { @@ -320,31 +380,31 @@ L"AdminComment", 0, REG_SZ, + (LPVOID)lpComment, + (wcslen(lpComment) + 1) * sizeof(WCHAR)); + + RegSetValueEx(hAccountKey, + L"UserComment", + 0, + REG_SZ, (LPVOID)lpEmptyString, sizeof(WCHAR)); RegSetValueEx(hAccountKey, - L"UserComment", + L"WorkStations", 0, REG_SZ, (LPVOID)lpEmptyString, sizeof(WCHAR)); RegSetValueEx(hAccountKey, - L"WorkStations", + L"Parameters", 0, REG_SZ, (LPVOID)lpEmptyString, sizeof(WCHAR)); - RegSetValueEx(hAccountKey, - L"Parameters", - 0, - REG_SZ, - (LPVOID)lpEmptyString, - sizeof(WCHAR)); - - /* Set LogonHours attribute */ + /* Set LogonHours attribute*/ *((PUSHORT)LogonHours) = 168; memset(&(LogonHours[2]), 0xff, 21); @@ -630,9 +690,14 @@ PSID pBuiltinSid = NULL; BOOL bResult = TRUE; PSID pSid; + HINSTANCE hInstance; + WCHAR szComment[256]; + WCHAR szName[80]; NTSTATUS Status; TRACE("SampInitializeSAM() called\n"); + + hInstance = GetModuleHandleW(L"samsrv.dll"); if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, L"SAM\\SAM", @@ -687,31 +752,45 @@ goto done; } + SampLoadString(hInstance, IDS_DOMAIN_BUILTIN_NAME, szName, 80); + /* Create the Builtin domain */ if (SampCreateDomain(hDomainsKey, L"Builtin", - L"Builtin", + szName, //L"Builtin", // SampGetResourceString(hInstance, IDS_DOMAIN_BUILTIN_NAME), pBuiltinSid, &hDomainKey)) { + SampLoadString(hInstance, IDS_ALIAS_ADMINISTRATORS_NAME, szName, 80); + SampLoadString(hInstance, IDS_ALIAS_ADMINISTRATORS_COMMENT, szComment, 256); + SampCreateAliasAccount(hDomainKey, - L"Administrators", - L"Testabc1234567890", + szName, + szComment, DOMAIN_ALIAS_RID_ADMINS); + SampLoadString(hInstance, IDS_ALIAS_USERS_NAME, szName, 80); + SampLoadString(hInstance, IDS_ALIAS_USERS_COMMENT, szComment, 256); + SampCreateAliasAccount(hDomainKey, - L"Users", - L"Users Group", + szName, + szComment, DOMAIN_ALIAS_RID_USERS); + SampLoadString(hInstance, IDS_ALIAS_GUESTS_NAME, szName, 80); + SampLoadString(hInstance, IDS_ALIAS_GUESTS_COMMENT, szComment, 256); + SampCreateAliasAccount(hDomainKey, - L"Guests", - L"Guests Group", + szName, + szComment, DOMAIN_ALIAS_RID_GUESTS); + SampLoadString(hInstance, IDS_ALIAS_POWER_USERS_NAME, szName, 80); + SampLoadString(hInstance, IDS_ALIAS_POWER_USERS_COMMENT, szComment, 256); + SampCreateAliasAccount(hDomainKey, - L"Power Users", - L"Power Users Group", + szName, + szComment, DOMAIN_ALIAS_RID_POWER_USERS); @@ -737,13 +816,21 @@ AccountDomainInfo->DomainSid, &hDomainKey)) { + SampLoadString(hInstance, IDS_USER_ADMINISTRATOR_NAME, szName, 80); + SampLoadString(hInstance, IDS_USER_ADMINISTRATOR_COMMENT, szComment, 256); + SampCreateUserAccount(hDomainKey, - L"Administrator", + szName, + szComment, DOMAIN_USER_RID_ADMIN, USER_DONT_EXPIRE_PASSWORD | USER_NORMAL_ACCOUNT); + SampLoadString(hInstance, IDS_USER_GUEST_NAME, szName, 80); + SampLoadString(hInstance, IDS_USER_GUEST_COMMENT, szComment, 256); + SampCreateUserAccount(hDomainKey, - L"Guest", + szName, + szComment, DOMAIN_USER_RID_GUEST, USER_ACCOUNT_DISABLED | USER_DONT_EXPIRE_PASSWORD | USER_NORMAL_ACCOUNT);

1 0

[pschweitzer] 58791: [NTOSKRNL] Also allow null matching at the end of the expression with * wc in FsRtlIs*InExpression() This should fix a few tests
by pschweitzer＠svn.reactos.org 20 Apr '13

20 Apr '13

Author: pschweitzer Date: Sat Apr 20 16:49:53 2013 New Revision: 58791 URL: http://svn.reactos.org/svn/reactos?rev=58791&view=rev Log: [NTOSKRNL] Also allow null matching at the end of the expression with * wc in FsRtlIs*InExpression() This should fix a few tests Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c trunk/reactos/ntoskrnl/fsrtl/name.c Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/dbcsname.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] Sat Apr 20 16:49:53 2013 @@ -248,7 +248,7 @@ } } if (ExpressionPosition + 1 == Expression->Length && NamePosition == Name->Length && - Expression->Buffer[ExpressionPosition] == ANSI_DOS_DOT) + (Expression->Buffer[ExpressionPosition] == ANSI_DOS_DOT || Expression->Buffer[ExpressionPosition] == '*')) { ExpressionPosition++; } Modified: trunk/reactos/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/name.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] Sat Apr 20 16:49:53 2013 @@ -185,7 +185,7 @@ } } if (ExpressionPosition + 1 == Expression->Length / sizeof(WCHAR) && NamePosition == Name->Length / sizeof(WCHAR) && - Expression->Buffer[ExpressionPosition] == DOS_DOT) + (Expression->Buffer[ExpressionPosition] == DOS_DOT || Expression->Buffer[ExpressionPosition] == L'*')) { ExpressionPosition++; }

1 0

[pschweitzer] 58790: [NTOSKRNL] Allow null matching with * wc in FsRtlIs*InExpression() This should fix a few tests
by pschweitzer＠svn.reactos.org 20 Apr '13

20 Apr '13

Author: pschweitzer Date: Sat Apr 20 14:10:10 2013 New Revision: 58790 URL: http://svn.reactos.org/svn/reactos?rev=58790&view=rev Log: [NTOSKRNL] Allow null matching with * wc in FsRtlIs*InExpression() This should fix a few tests Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c trunk/reactos/ntoskrnl/fsrtl/name.c Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/dbcsname.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] Sat Apr 20 14:10:10 2013 @@ -207,7 +207,9 @@ NamePosition = Name->Length; break; } - else if (Expression->Buffer[ExpressionPosition] != '?') + /* Allow null matching */ + else if (Expression->Buffer[ExpressionPosition] != '?' && + Expression->Buffer[ExpressionPosition] != Name->Buffer[NamePosition]) { NamePosition++; } Modified: trunk/reactos/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/name.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] Sat Apr 20 14:10:10 2013 @@ -143,7 +143,9 @@ NamePosition = Name->Length / sizeof(WCHAR); break; } - else if (Expression->Buffer[ExpressionPosition] != L'?') + /* Allow null matching */ + else if (Expression->Buffer[ExpressionPosition] != L'?' && + Expression->Buffer[ExpressionPosition] != Name->Buffer[NamePosition]) { NamePosition++; }

1 0

[pschweitzer] 58789: [KMTEST:FSRTL] Fix assertion failure on checked builds
by pschweitzer＠svn.reactos.org 20 Apr '13

20 Apr '13

Author: pschweitzer Date: Sat Apr 20 12:54:38 2013 New Revision: 58789 URL: http://svn.reactos.org/svn/reactos?rev=58789&view=rev Log: [KMTEST:FSRTL] Fix assertion failure on checked builds Modified: trunk/rostests/kmtests/ntos_fsrtl/FsRtlExpression.c Modified: trunk/rostests/kmtests/ntos_fsrtl/FsRtlExpression.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_fsrtl/FsRtlE… ============================================================================== --- trunk/rostests/kmtests/ntos_fsrtl/FsRtlExpression.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_fsrtl/FsRtlExpression.c [iso-8859-1] Sat Apr 20 12:54:38 2013 @@ -475,8 +475,12 @@ ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); RtlInitAnsiString(&Name, " "); ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); - RtlInitAnsiString(&Name, ""); - ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); + + if (!KmtIsCheckedBuild) + { + RtlInitAnsiString(&Name, ""); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); + } RtlInitAnsiString(&Name, "."); ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); RtlInitAnsiString(&Name, "1.txt");

1 0

[pschweitzer] 58788: [KMTEST:FSRTL] Add more tests for FsRtlIsNameInExpression() by Victor Martinez Also add these tests for FsRtlIsDbcsInExpression() See CORE-5125 for more information
by pschweitzer＠svn.reactos.org 20 Apr '13

20 Apr '13

Author: pschweitzer Date: Sat Apr 20 12:24:57 2013 New Revision: 58788 URL: http://svn.reactos.org/svn/reactos?rev=58788&view=rev Log: [KMTEST:FSRTL] Add more tests for FsRtlIsNameInExpression() by Victor Martinez Also add these tests for FsRtlIsDbcsInExpression() See CORE-5125 for more information Modified: trunk/rostests/kmtests/ntos_fsrtl/FsRtlExpression.c Modified: trunk/rostests/kmtests/ntos_fsrtl/FsRtlExpression.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_fsrtl/FsRtlE… ============================================================================== --- trunk/rostests/kmtests/ntos_fsrtl/FsRtlExpression.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_fsrtl/FsRtlExpression.c [iso-8859-1] Sat Apr 20 12:24:57 2013 @@ -96,8 +96,76 @@ ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); RtlInitUnicodeString(&Name, L"SETUP.EXE"); ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitUnicodeString(&Name, L"f0_"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitUnicodeString(&Name, L"f0_"); + ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitUnicodeString(&Name, L"F0_"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitUnicodeString(&Name, L"f0_."); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitUnicodeString(&Name, L"f0_."); + ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == TRUE, "expected TRUE, got FALSE\n"); + RtlInitUnicodeString(&Name, L"F0_."); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); RtlInitUnicodeString(&Name, L"F0_001"); ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitUnicodeString(&Name, L"F0_001"); + ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitUnicodeString(&Name, L"f0_001"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitUnicodeString(&Name, L"f0_001"); + ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitUnicodeString(&Name, L"F0_001."); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); + RtlInitUnicodeString(&Name, L"f0_001.txt"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitUnicodeString(&Name, L"f0_001.txt"); + ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == TRUE, "expected TRUE, got FALSE\n"); + RtlInitUnicodeString(&Name, L"F0_001.txt"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); + RtlInitUnicodeString(&Name, L"F0_001.txt"); + ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == TRUE, "expected TRUE, got FALSE\n"); + RtlInitUnicodeString(&Name, L"F0_001.txt"); + ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == TRUE, "expected TRUE, got FALSE\n"); + + RtlInitUnicodeString(&Expression, L"F0_*."); + RtlInitUnicodeString(&Name, L"."); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitUnicodeString(&Name, L".."); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitUnicodeString(&Name, L"SETUP.EXE"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitUnicodeString(&Name, L"f0_"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitUnicodeString(&Name, L"f0_"); + ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitUnicodeString(&Name, L"F0_"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitUnicodeString(&Name, L"f0_."); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitUnicodeString(&Name, L"f0_."); + ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == TRUE, "expected TRUE, got FALSE\n"); + RtlInitUnicodeString(&Name, L"F0_."); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); + RtlInitUnicodeString(&Name, L"F0_001"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitUnicodeString(&Name, L"F0_001"); + ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitUnicodeString(&Name, L"f0_001"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitUnicodeString(&Name, L"f0_001"); + ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitUnicodeString(&Name, L"F0_OO1."); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); + RtlInitUnicodeString(&Name, L"f0_001.txt"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitUnicodeString(&Name, L"f0_001.txt"); + ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitUnicodeString(&Name, L"F0_001.txt"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitUnicodeString(&Name, L"F0_001.txt"); + ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == FALSE, "expected FALSE, got TRUE\n"); RtlInitUnicodeString(&Expression, L"*.TTF"); RtlInitUnicodeString(&Name, L"."); @@ -114,6 +182,24 @@ ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); RtlInitUnicodeString(&Name, L"SETUP.INI"); ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); + + RtlInitUnicodeString(&Expression, L".*"); + RtlInitUnicodeString(&Name, L"1"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitUnicodeString(&Name, L"01"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitUnicodeString(&Name, L" "); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitUnicodeString(&Name, L""); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitUnicodeString(&Name, L"."); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); + RtlInitUnicodeString(&Name, L"1.txt"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitUnicodeString(&Name, L" .txt"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitUnicodeString(&Name, L".txt"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); RtlInitUnicodeString(&Expression, L"\"ntoskrnl.exe"); RtlInitUnicodeString(&Name, L"ntoskrnl.exe"); @@ -320,7 +406,50 @@ ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); RtlInitAnsiString(&Name, "SETUP.EXE"); ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitAnsiString(&Name, "f0_"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitAnsiString(&Name, "F0_"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitAnsiString(&Name, "f0_."); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitAnsiString(&Name, "F0_."); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); RtlInitAnsiString(&Name, "F0_001"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); + + RtlInitAnsiString(&Name, "f0_001"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitAnsiString(&Name, "F0_001."); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); + RtlInitAnsiString(&Name, "f0_001.txt"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitAnsiString(&Name, "F0_001.txt"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); + + RtlInitAnsiString(&Expression, "F0_*."); + RtlInitAnsiString(&Name, "."); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitAnsiString(&Name, ".."); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitAnsiString(&Name, "SETUP.EXE"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitAnsiString(&Name, "f0_"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitAnsiString(&Name, "F0_"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitAnsiString(&Name, "f0_."); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitAnsiString(&Name, "F0_."); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); + RtlInitAnsiString(&Name, "F0_001"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitAnsiString(&Name, "f0_001"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitAnsiString(&Name, "F0_OO1."); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); + RtlInitAnsiString(&Name, "f0_001.txt"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitAnsiString(&Name, "F0_001.txt"); ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); RtlInitAnsiString(&Expression, "*.TTF"); @@ -338,6 +467,24 @@ ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); RtlInitAnsiString(&Name, "SETUP.INI"); ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); + + RtlInitAnsiString(&Expression, ".*"); + RtlInitAnsiString(&Name, "1"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitAnsiString(&Name, "01"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitAnsiString(&Name, " "); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitAnsiString(&Name, ""); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitAnsiString(&Name, "."); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); + RtlInitAnsiString(&Name, "1.txt"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitAnsiString(&Name, " .txt"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitAnsiString(&Name, ".txt"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); RtlInitAnsiString(&Expression, "\"ntoskrnl.exe"); RtlInitAnsiString(&Name, "ntoskrnl.exe");

1 0

[hbelusca] 58787: [WINSRV] Declare a helper as static.
by hbelusca＠svn.reactos.org 19 Apr '13

19 Apr '13

Author: hbelusca Date: Fri Apr 19 22:52:36 2013 New Revision: 58787 URL: http://svn.reactos.org/svn/reactos?rev=58787&view=rev Log: [WINSRV] Declare a helper as static. Modified: trunk/reactos/win32ss/user/winsrv/shutdown.c Modified: trunk/reactos/win32ss/user/winsrv/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/shutdo… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/shutdown.c [iso-8859-1] Fri Apr 19 22:52:36 2013 @@ -431,7 +431,7 @@ } /*** Taken from win32ss/user/consrv/console.c ***/ -BOOL FASTCALL +static BOOL DtbgIsDesktopVisible(VOID) { return !((BOOL)NtUserCallNoParam(NOPARAM_ROUTINE_ISCONSOLEMODE));

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
27
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 April 2013