Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

[dquintana] 64510: Sync with trunk r64509.
by dquintana＠svn.reactos.org 03 Oct '14

03 Oct '14

Author: dquintana Date: Fri Oct 3 19:20:19 2014 New Revision: 64510 URL: http://svn.reactos.org/svn/reactos?rev=64510&view=rev Log: Sync with trunk r64509. Added: branches/shell-experiments/base/system/winlogon/rpcserver.c - copied unchanged from r64509, trunk/reactos/base/system/winlogon/rpcserver.c branches/shell-experiments/dll/win32/advapi32/reg/hkcr.c - copied unchanged from r64509, trunk/reactos/dll/win32/advapi32/reg/hkcr.c branches/shell-experiments/dll/win32/advapi32/reg/reg.h - copied unchanged from r64509, trunk/reactos/dll/win32/advapi32/reg/reg.h branches/shell-experiments/dll/win32/framedyn/framedyn.spec - copied unchanged from r64509, trunk/reactos/dll/win32/framedyn/framedyn.spec branches/shell-experiments/dll/win32/oleacc/client.c - copied unchanged from r64509, trunk/reactos/dll/win32/oleacc/client.c branches/shell-experiments/dll/win32/oleacc/oleacc_private.h - copied unchanged from r64509, trunk/reactos/dll/win32/oleacc/oleacc_private.h branches/shell-experiments/dll/win32/oleacc/propservice.c - copied unchanged from r64509, trunk/reactos/dll/win32/oleacc/propservice.c branches/shell-experiments/dll/win32/oleacc/resource.h - copied unchanged from r64509, trunk/reactos/dll/win32/oleacc/resource.h branches/shell-experiments/dll/win32/oleacc/window.c - copied unchanged from r64509, trunk/reactos/dll/win32/oleacc/window.c branches/shell-experiments/dll/win32/rasdlg/lang/tr-TR.rc - copied unchanged from r64509, trunk/reactos/dll/win32/rasdlg/lang/tr-TR.rc branches/shell-experiments/include/reactos/idl/winreg.acf - copied unchanged from r64509, trunk/reactos/include/reactos/idl/winreg.acf branches/shell-experiments/include/reactos/idl/winreg.idl - copied unchanged from r64509, trunk/reactos/include/reactos/idl/winreg.idl branches/shell-experiments/subsystems/ntvdm/cpu/ - copied from r64509, trunk/reactos/subsystems/ntvdm/cpu/ branches/shell-experiments/tools/mkhive/cmindex.c - copied unchanged from r64509, trunk/reactos/tools/mkhive/cmindex.c branches/shell-experiments/tools/mkhive/cmname.c - copied unchanged from r64509, trunk/reactos/tools/mkhive/cmname.c branches/shell-experiments/tools/mkhive/ntoskrnl.h - copied unchanged from r64509, trunk/reactos/tools/mkhive/ntoskrnl.h Removed: branches/shell-experiments/dll/win32/framedyn/alias_msvc.s branches/shell-experiments/dll/win32/framedyn/fix_exports_msvc.s branches/shell-experiments/dll/win32/framedyn/framedyn_gcc.spec branches/shell-experiments/dll/win32/framedyn/framedyn_msvc.spec branches/shell-experiments/dll/win32/msacm32/imaadp32/ branches/shell-experiments/dll/win32/msacm32/msadp32/ branches/shell-experiments/dll/win32/msxml/Makefile.in branches/shell-experiments/dll/win32/msxml2/Makefile.in branches/shell-experiments/dll/win32/msxml4/Makefile.in branches/shell-experiments/dll/win32/msxml6/Makefile.in branches/shell-experiments/subsystems/ntvdm/bop.c branches/shell-experiments/subsystems/ntvdm/bop.h branches/shell-experiments/subsystems/ntvdm/callback.c branches/shell-experiments/subsystems/ntvdm/callback.h Modified: branches/shell-experiments/ (props changed) branches/shell-experiments/base/applications/regedit/lang/tr-TR.rc branches/shell-experiments/base/setup/usetup/CMakeLists.txt branches/shell-experiments/base/setup/usetup/errorcode.h branches/shell-experiments/base/setup/usetup/lang/bg-BG.h branches/shell-experiments/base/setup/usetup/lang/cs-CZ.h branches/shell-experiments/base/setup/usetup/lang/de-DE.h branches/shell-experiments/base/setup/usetup/lang/el-GR.h branches/shell-experiments/base/setup/usetup/lang/en-US.h branches/shell-experiments/base/setup/usetup/lang/es-ES.h branches/shell-experiments/base/setup/usetup/lang/et-EE.h branches/shell-experiments/base/setup/usetup/lang/fr-FR.h branches/shell-experiments/base/setup/usetup/lang/he-IL.h branches/shell-experiments/base/setup/usetup/lang/it-IT.h branches/shell-experiments/base/setup/usetup/lang/ja-JP.h branches/shell-experiments/base/setup/usetup/lang/lt-LT.h branches/shell-experiments/base/setup/usetup/lang/nl-NL.h branches/shell-experiments/base/setup/usetup/lang/pl-PL.h branches/shell-experiments/base/setup/usetup/lang/pt-BR.h branches/shell-experiments/base/setup/usetup/lang/ro-RO.h branches/shell-experiments/base/setup/usetup/lang/ru-RU.h branches/shell-experiments/base/setup/usetup/lang/sk-SK.h branches/shell-experiments/base/setup/usetup/lang/sq-AL.h branches/shell-experiments/base/setup/usetup/lang/sv-SE.h branches/shell-experiments/base/setup/usetup/lang/tr-TR.h branches/shell-experiments/base/setup/usetup/lang/uk-UA.h branches/shell-experiments/base/setup/usetup/partlist.c branches/shell-experiments/base/system/services/database.c branches/shell-experiments/base/system/services/services.h branches/shell-experiments/base/system/winlogon/CMakeLists.txt branches/shell-experiments/base/system/winlogon/winlogon.c branches/shell-experiments/base/system/winlogon/winlogon.h branches/shell-experiments/boot/bootdata/hivedef.inf branches/shell-experiments/boot/bootdata/hivesys.inf branches/shell-experiments/cmake/gcc.cmake branches/shell-experiments/dll/win32/advapi32/CMakeLists.txt branches/shell-experiments/dll/win32/advapi32/reg/reg.c branches/shell-experiments/dll/win32/comdlg32/lang/cdlg_Tr.rc branches/shell-experiments/dll/win32/crypt32/lang/crypt32_Tr.rc branches/shell-experiments/dll/win32/cryptui/lang/cryptui_Tr.rc branches/shell-experiments/dll/win32/devmgr/lang/tr-TR.rc branches/shell-experiments/dll/win32/framedyn/CMakeLists.txt branches/shell-experiments/dll/win32/framedyn/alias_gcc.s branches/shell-experiments/dll/win32/hhctrl.ocx/lang/Tr.rc branches/shell-experiments/dll/win32/hnetcfg/CMakeLists.txt branches/shell-experiments/dll/win32/itss/CMakeLists.txt branches/shell-experiments/dll/win32/jscript/lang/jscript_Tr.rc branches/shell-experiments/dll/win32/lsasrv/session.c branches/shell-experiments/dll/win32/msacm32/CMakeLists.txt branches/shell-experiments/dll/win32/msacm32/lang/msacm_Bg.rc branches/shell-experiments/dll/win32/msacm32/lang/msacm_Cs.rc branches/shell-experiments/dll/win32/msacm32/lang/msacm_Da.rc branches/shell-experiments/dll/win32/msacm32/lang/msacm_De.rc branches/shell-experiments/dll/win32/msacm32/lang/msacm_El.rc branches/shell-experiments/dll/win32/msacm32/lang/msacm_En.rc branches/shell-experiments/dll/win32/msacm32/lang/msacm_Es.rc branches/shell-experiments/dll/win32/msacm32/lang/msacm_Fr.rc branches/shell-experiments/dll/win32/msacm32/lang/msacm_He.rc branches/shell-experiments/dll/win32/msacm32/lang/msacm_Hu.rc branches/shell-experiments/dll/win32/msacm32/lang/msacm_It.rc branches/shell-experiments/dll/win32/msacm32/lang/msacm_Ja.rc branches/shell-experiments/dll/win32/msacm32/lang/msacm_Ko.rc branches/shell-experiments/dll/win32/msacm32/lang/msacm_Lt.rc branches/shell-experiments/dll/win32/msacm32/lang/msacm_Nl.rc branches/shell-experiments/dll/win32/msacm32/lang/msacm_No.rc branches/shell-experiments/dll/win32/msacm32/lang/msacm_Pl.rc branches/shell-experiments/dll/win32/msacm32/lang/msacm_Pt.rc branches/shell-experiments/dll/win32/msacm32/lang/msacm_Ro.rc branches/shell-experiments/dll/win32/msacm32/lang/msacm_Ru.rc branches/shell-experiments/dll/win32/msacm32/lang/msacm_Si.rc branches/shell-experiments/dll/win32/msacm32/lang/msacm_Sq.rc branches/shell-experiments/dll/win32/msacm32/lang/msacm_Sv.rc branches/shell-experiments/dll/win32/msacm32/lang/msacm_Tr.rc branches/shell-experiments/dll/win32/msacm32/lang/msacm_Uk.rc branches/shell-experiments/dll/win32/msacm32/lang/msacm_Zh.rc branches/shell-experiments/dll/win32/msacm32/msacm.rc branches/shell-experiments/dll/win32/mscms/profile.c branches/shell-experiments/dll/win32/msctf/inputprocessor.c branches/shell-experiments/dll/win32/mshtml/binding.h branches/shell-experiments/dll/win32/mshtml/conpoint.c branches/shell-experiments/dll/win32/mshtml/dispex.c branches/shell-experiments/dll/win32/mshtml/editor.c branches/shell-experiments/dll/win32/mshtml/htmlanchor.c branches/shell-experiments/dll/win32/mshtml/htmlattr.c branches/shell-experiments/dll/win32/mshtml/htmlcurstyle.c branches/shell-experiments/dll/win32/mshtml/htmldoc.c branches/shell-experiments/dll/win32/mshtml/htmlelem.c branches/shell-experiments/dll/win32/mshtml/htmlelem2.c branches/shell-experiments/dll/win32/mshtml/htmlelem3.c branches/shell-experiments/dll/win32/mshtml/htmlelemcol.c branches/shell-experiments/dll/win32/mshtml/htmlevent.c branches/shell-experiments/dll/win32/mshtml/htmlevent.h branches/shell-experiments/dll/win32/mshtml/htmlform.c branches/shell-experiments/dll/win32/mshtml/htmlhead.c branches/shell-experiments/dll/win32/mshtml/htmlimg.c branches/shell-experiments/dll/win32/mshtml/htmlinput.c branches/shell-experiments/dll/win32/mshtml/htmllink.c branches/shell-experiments/dll/win32/mshtml/htmllocation.c branches/shell-experiments/dll/win32/mshtml/htmlmeta.c branches/shell-experiments/dll/win32/mshtml/htmlnode.c branches/shell-experiments/dll/win32/mshtml/htmloption.c branches/shell-experiments/dll/win32/mshtml/htmlscreen.c branches/shell-experiments/dll/win32/mshtml/htmlscript.h branches/shell-experiments/dll/win32/mshtml/htmlselect.c branches/shell-experiments/dll/win32/mshtml/htmlstorage.c branches/shell-experiments/dll/win32/mshtml/htmlstyle.c branches/shell-experiments/dll/win32/mshtml/htmlstyle.h branches/shell-experiments/dll/win32/mshtml/htmlstyle2.c branches/shell-experiments/dll/win32/mshtml/htmlstyle3.c branches/shell-experiments/dll/win32/mshtml/htmlstylesheet.c branches/shell-experiments/dll/win32/mshtml/htmltable.c branches/shell-experiments/dll/win32/mshtml/htmltablecell.c branches/shell-experiments/dll/win32/mshtml/htmltablerow.c branches/shell-experiments/dll/win32/mshtml/htmlwindow.c branches/shell-experiments/dll/win32/mshtml/ifacewrap.c branches/shell-experiments/dll/win32/mshtml/ipwindow.c branches/shell-experiments/dll/win32/mshtml/lang/Da.rc branches/shell-experiments/dll/win32/mshtml/lang/De.rc branches/shell-experiments/dll/win32/mshtml/lang/Es.rc branches/shell-experiments/dll/win32/mshtml/lang/Fr.rc branches/shell-experiments/dll/win32/mshtml/lang/He.rc branches/shell-experiments/dll/win32/mshtml/lang/Hu.rc branches/shell-experiments/dll/win32/mshtml/lang/It.rc branches/shell-experiments/dll/win32/mshtml/lang/Ja.rc branches/shell-experiments/dll/win32/mshtml/lang/Ko.rc branches/shell-experiments/dll/win32/mshtml/lang/Lt.rc branches/shell-experiments/dll/win32/mshtml/lang/Nl.rc branches/shell-experiments/dll/win32/mshtml/lang/No.rc branches/shell-experiments/dll/win32/mshtml/lang/Pl.rc branches/shell-experiments/dll/win32/mshtml/lang/Pt.rc branches/shell-experiments/dll/win32/mshtml/lang/Ro.rc branches/shell-experiments/dll/win32/mshtml/lang/Ru.rc branches/shell-experiments/dll/win32/mshtml/lang/Si.rc branches/shell-experiments/dll/win32/mshtml/lang/Sv.rc branches/shell-experiments/dll/win32/mshtml/lang/Uk.rc branches/shell-experiments/dll/win32/mshtml/lang/Zh.rc branches/shell-experiments/dll/win32/mshtml/loadopts.c branches/shell-experiments/dll/win32/mshtml/main.c branches/shell-experiments/dll/win32/mshtml/mshtml_private.h branches/shell-experiments/dll/win32/mshtml/mutation.c branches/shell-experiments/dll/win32/mshtml/navigate.c branches/shell-experiments/dll/win32/mshtml/npplugin.c branches/shell-experiments/dll/win32/mshtml/nsembed.c branches/shell-experiments/dll/win32/mshtml/nsiface.idl branches/shell-experiments/dll/win32/mshtml/nsio.c branches/shell-experiments/dll/win32/mshtml/oleobj.c branches/shell-experiments/dll/win32/mshtml/omnavigator.c branches/shell-experiments/dll/win32/mshtml/pluginhost.h branches/shell-experiments/dll/win32/mshtml/propbag.c branches/shell-experiments/dll/win32/mshtml/script.c branches/shell-experiments/dll/win32/msimg32/msimg32_main.c branches/shell-experiments/dll/win32/msisip/main.c branches/shell-experiments/dll/win32/msrle32/lang/msrle_Da.rc branches/shell-experiments/dll/win32/msrle32/lang/msrle_Ro.rc branches/shell-experiments/dll/win32/msvfw32/drawdib.c branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Da.rc branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_De.rc branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_En.rc branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Es.rc branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Fr.rc branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_He.rc branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Hu.rc branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_It.rc branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Ko.rc branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Lt.rc branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Nl.rc branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_No.rc branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Pl.rc branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Pt.rc branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Ro.rc branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Ru.rc branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Si.rc branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Sq.rc branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Sv.rc branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Tr.rc branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Uk.rc branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Zh.rc branches/shell-experiments/dll/win32/msvfw32/msvideo_main.c branches/shell-experiments/dll/win32/msvfw32/msvideo_private.h branches/shell-experiments/dll/win32/msvfw32/resource.h branches/shell-experiments/dll/win32/msxml3/domdoc.c branches/shell-experiments/dll/win32/msxml3/element.c branches/shell-experiments/dll/win32/msxml3/msxml_private.h branches/shell-experiments/dll/win32/msxml3/node.c branches/shell-experiments/dll/win32/msxml3/saxreader.c branches/shell-experiments/dll/win32/msxml3/schema.c branches/shell-experiments/dll/win32/msxml3/xslpattern.tab.c branches/shell-experiments/dll/win32/msxml3/xslpattern.tab.h branches/shell-experiments/dll/win32/msxml3/xslpattern.y branches/shell-experiments/dll/win32/ole32/compobj.c branches/shell-experiments/dll/win32/ole32/filelockbytes.c branches/shell-experiments/dll/win32/ole32/filemoniker.c branches/shell-experiments/dll/win32/ole32/ole2.c branches/shell-experiments/dll/win32/ole32/stg_stream.c branches/shell-experiments/dll/win32/ole32/storage32.c branches/shell-experiments/dll/win32/ole32/storage32.h branches/shell-experiments/dll/win32/oleacc/CMakeLists.txt branches/shell-experiments/dll/win32/oleacc/lang/oleacc_De.rc branches/shell-experiments/dll/win32/oleacc/lang/oleacc_En.rc branches/shell-experiments/dll/win32/oleacc/lang/oleacc_Fr.rc branches/shell-experiments/dll/win32/oleacc/lang/oleacc_He.rc branches/shell-experiments/dll/win32/oleacc/lang/oleacc_Hu.rc branches/shell-experiments/dll/win32/oleacc/lang/oleacc_It.rc branches/shell-experiments/dll/win32/oleacc/lang/oleacc_Ko.rc branches/shell-experiments/dll/win32/oleacc/lang/oleacc_Lt.rc branches/shell-experiments/dll/win32/oleacc/lang/oleacc_Nl.rc branches/shell-experiments/dll/win32/oleacc/lang/oleacc_No.rc branches/shell-experiments/dll/win32/oleacc/lang/oleacc_Pl.rc branches/shell-experiments/dll/win32/oleacc/lang/oleacc_Pt.rc branches/shell-experiments/dll/win32/oleacc/lang/oleacc_Ro.rc branches/shell-experiments/dll/win32/oleacc/lang/oleacc_Ru.rc branches/shell-experiments/dll/win32/oleacc/lang/oleacc_Si.rc branches/shell-experiments/dll/win32/oleacc/lang/oleacc_Sq.rc branches/shell-experiments/dll/win32/oleacc/lang/oleacc_Tr.rc branches/shell-experiments/dll/win32/oleacc/lang/oleacc_Uk.rc branches/shell-experiments/dll/win32/oleacc/main.c branches/shell-experiments/dll/win32/oleacc/oleacc.rc branches/shell-experiments/dll/win32/oleacc/oleacc.spec branches/shell-experiments/dll/win32/oleaut32/recinfo.c branches/shell-experiments/dll/win32/oleaut32/tmarshal.c branches/shell-experiments/dll/win32/oleaut32/typelib.c branches/shell-experiments/dll/win32/oleaut32/varformat.c branches/shell-experiments/dll/win32/oleaut32/variant.c branches/shell-experiments/dll/win32/oleaut32/variant.h branches/shell-experiments/dll/win32/oleaut32/vartype.c branches/shell-experiments/dll/win32/rasdlg/rasdlg.rc branches/shell-experiments/dll/win32/samsrv/lang/tr-TR.rc branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Da.rc branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_De.rc branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_En.rc branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Es.rc branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Fi.rc branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Fr.rc branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_He.rc branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Hu.rc branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_It.rc branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Ja.rc branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Ko.rc branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Lt.rc branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Nl.rc branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_No.rc branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Pl.rc branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Pt.rc branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Ro.rc branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Ru.rc branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Si.rc branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Sk.rc branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Sq.rc branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Sv.rc branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Tr.rc branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Uk.rc branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Zh.rc branches/shell-experiments/dll/win32/shlwapi/ordinal.c branches/shell-experiments/dll/win32/shlwapi/path.c branches/shell-experiments/dll/win32/shlwapi/reg.c branches/shell-experiments/dll/win32/wbemdisp/CMakeLists.txt branches/shell-experiments/dll/win32/wldap32/lang/wldap32_Tr.rc branches/shell-experiments/dll/win32/ws2_32/misc/ns.c branches/shell-experiments/drivers/filters/mountmgr/device.c branches/shell-experiments/drivers/filters/mountmgr/mountmgr.c branches/shell-experiments/drivers/hid/kbdhid/kbdhid.c branches/shell-experiments/drivers/network/tcpip/tcpip/main.c branches/shell-experiments/include/crt/crtdefs.h branches/shell-experiments/include/crt/rtcapi.h branches/shell-experiments/include/crt/wctype.h branches/shell-experiments/include/psdk/docobj.idl branches/shell-experiments/include/psdk/msacmdlg.h branches/shell-experiments/include/psdk/msctf.idl branches/shell-experiments/include/psdk/ntdef.h branches/shell-experiments/include/psdk/oleacc.idl branches/shell-experiments/include/psdk/winddi.h branches/shell-experiments/include/psdk/winnt.h branches/shell-experiments/include/reactos/wine/test.h branches/shell-experiments/include/xdk/ntbasedef.h branches/shell-experiments/include/xdk/ntdef.template.h branches/shell-experiments/include/xdk/winnt_old.h branches/shell-experiments/lib/fast486/opcodes.c branches/shell-experiments/lib/sdk/dxguid/CMakeLists.txt branches/shell-experiments/media/doc/README.WINE branches/shell-experiments/ntoskrnl/config/cmapi.c branches/shell-experiments/subsystems/ntvdm/CMakeLists.txt branches/shell-experiments/subsystems/ntvdm/bios/bios.c branches/shell-experiments/subsystems/ntvdm/bios/bios32/bios32.c branches/shell-experiments/subsystems/ntvdm/bios/bios32/bios32p.h branches/shell-experiments/subsystems/ntvdm/bios/bios32/kbdbios32.c branches/shell-experiments/subsystems/ntvdm/bios/bios32/moubios32.c branches/shell-experiments/subsystems/ntvdm/bios/bios32/vidbios32.c branches/shell-experiments/subsystems/ntvdm/bios/kbdbios.c branches/shell-experiments/subsystems/ntvdm/bios/rom.c branches/shell-experiments/subsystems/ntvdm/bios/vidbios.c branches/shell-experiments/subsystems/ntvdm/bios/vidbios.h branches/shell-experiments/subsystems/ntvdm/clock.c branches/shell-experiments/subsystems/ntvdm/dos/dem.c branches/shell-experiments/subsystems/ntvdm/dos/dos32krnl/bios.c branches/shell-experiments/subsystems/ntvdm/dos/dos32krnl/dos.c branches/shell-experiments/subsystems/ntvdm/dos/dos32krnl/dos.h branches/shell-experiments/subsystems/ntvdm/dos/dos32krnl/dosfiles.c branches/shell-experiments/subsystems/ntvdm/dos/mouse32.c branches/shell-experiments/subsystems/ntvdm/emulator.c branches/shell-experiments/subsystems/ntvdm/emulator.h branches/shell-experiments/subsystems/ntvdm/hardware/vga.c branches/shell-experiments/subsystems/ntvdm/hardware/vga.h branches/shell-experiments/subsystems/ntvdm/int32.c branches/shell-experiments/subsystems/ntvdm/int32.h branches/shell-experiments/subsystems/ntvdm/registers.c branches/shell-experiments/subsystems/ntvdm/vddsup.c branches/shell-experiments/tools/mkhive/CMakeLists.txt branches/shell-experiments/tools/mkhive/cmi.c branches/shell-experiments/tools/mkhive/mkhive.h branches/shell-experiments/tools/mkhive/registry.c branches/shell-experiments/tools/mkhive/rtl.c branches/shell-experiments/tools/spec2def/spec2def.c branches/shell-experiments/win32ss/gdi/eng/ldevobj.c branches/shell-experiments/win32ss/gdi/ntgdi/dcobjs.c branches/shell-experiments/win32ss/reactx/ntddraw/eng.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/shell-experiments/base/applications/regedit/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/setup/usetup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/us… Modified: branches/shell-experiments/base/setup/usetup/errorcode.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/us… Modified: branches/shell-experiments/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/us… Modified: branches/shell-experiments/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/us… Modified: branches/shell-experiments/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/us… Modified: branches/shell-experiments/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/us… Modified: branches/shell-experiments/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/us… Modified: branches/shell-experiments/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/us… Modified: branches/shell-experiments/base/setup/usetup/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/us… Modified: branches/shell-experiments/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/us… Modified: branches/shell-experiments/base/setup/usetup/lang/he-IL.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/us… Modified: branches/shell-experiments/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/us… Modified: branches/shell-experiments/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/us… Modified: branches/shell-experiments/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/us… Modified: branches/shell-experiments/base/setup/usetup/lang/nl-NL.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/us… Modified: branches/shell-experiments/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/us… Modified: branches/shell-experiments/base/setup/usetup/lang/pt-BR.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/us… Modified: branches/shell-experiments/base/setup/usetup/lang/ro-RO.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/us… Modified: branches/shell-experiments/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/us… Modified: branches/shell-experiments/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/us… Modified: branches/shell-experiments/base/setup/usetup/lang/sq-AL.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/us… Modified: branches/shell-experiments/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/us… Modified: branches/shell-experiments/base/setup/usetup/lang/tr-TR.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/us… Modified: branches/shell-experiments/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/us… Modified: branches/shell-experiments/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/us… Modified: branches/shell-experiments/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/system/s… Modified: branches/shell-experiments/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/system/s… Modified: branches/shell-experiments/base/system/winlogon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/system/w… Modified: branches/shell-experiments/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/system/w… Modified: branches/shell-experiments/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/system/w… Modified: branches/shell-experiments/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/boot/bootdata… Modified: branches/shell-experiments/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/boot/bootdata… Modified: branches/shell-experiments/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/cmake/gcc.cma… Modified: branches/shell-experiments/dll/win32/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/adv… Modified: branches/shell-experiments/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/adv… Modified: branches/shell-experiments/dll/win32/comdlg32/lang/cdlg_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/com… Modified: branches/shell-experiments/dll/win32/crypt32/lang/crypt32_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/cry… Modified: branches/shell-experiments/dll/win32/cryptui/lang/cryptui_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/cry… Modified: branches/shell-experiments/dll/win32/devmgr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/dev… Modified: branches/shell-experiments/dll/win32/framedyn/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/fra… Modified: branches/shell-experiments/dll/win32/framedyn/alias_gcc.s URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/fra… Removed: branches/shell-experiments/dll/win32/framedyn/alias_msvc.s URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/fra… Removed: branches/shell-experiments/dll/win32/framedyn/fix_exports_msvc.s URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/fra… Removed: branches/shell-experiments/dll/win32/framedyn/framedyn_gcc.spec URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/fra… Removed: branches/shell-experiments/dll/win32/framedyn/framedyn_msvc.spec URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/fra… Modified: branches/shell-experiments/dll/win32/hhctrl.ocx/lang/Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/hhc… Modified: branches/shell-experiments/dll/win32/hnetcfg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/hne… Modified: branches/shell-experiments/dll/win32/itss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/its… Modified: branches/shell-experiments/dll/win32/jscript/lang/jscript_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/jsc… Modified: branches/shell-experiments/dll/win32/lsasrv/session.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/lsa… Modified: branches/shell-experiments/dll/win32/msacm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msa… Modified: branches/shell-experiments/dll/win32/msacm32/lang/msacm_Bg.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msa… Modified: branches/shell-experiments/dll/win32/msacm32/lang/msacm_Cs.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msa… Modified: branches/shell-experiments/dll/win32/msacm32/lang/msacm_Da.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msa… Modified: branches/shell-experiments/dll/win32/msacm32/lang/msacm_De.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msa… Modified: branches/shell-experiments/dll/win32/msacm32/lang/msacm_El.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msa… Modified: branches/shell-experiments/dll/win32/msacm32/lang/msacm_En.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msa… Modified: branches/shell-experiments/dll/win32/msacm32/lang/msacm_Es.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msa… Modified: branches/shell-experiments/dll/win32/msacm32/lang/msacm_Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msa… Modified: branches/shell-experiments/dll/win32/msacm32/lang/msacm_He.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msa… Modified: branches/shell-experiments/dll/win32/msacm32/lang/msacm_Hu.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msa… Modified: branches/shell-experiments/dll/win32/msacm32/lang/msacm_It.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msa… Modified: branches/shell-experiments/dll/win32/msacm32/lang/msacm_Ja.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msa… Modified: branches/shell-experiments/dll/win32/msacm32/lang/msacm_Ko.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msa… Modified: branches/shell-experiments/dll/win32/msacm32/lang/msacm_Lt.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msa… Modified: branches/shell-experiments/dll/win32/msacm32/lang/msacm_Nl.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msa… Modified: branches/shell-experiments/dll/win32/msacm32/lang/msacm_No.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msa… Modified: branches/shell-experiments/dll/win32/msacm32/lang/msacm_Pl.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msa… Modified: branches/shell-experiments/dll/win32/msacm32/lang/msacm_Pt.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msa… Modified: branches/shell-experiments/dll/win32/msacm32/lang/msacm_Ro.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msa… Modified: branches/shell-experiments/dll/win32/msacm32/lang/msacm_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msa… Modified: branches/shell-experiments/dll/win32/msacm32/lang/msacm_Si.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msa… Modified: branches/shell-experiments/dll/win32/msacm32/lang/msacm_Sq.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msa… Modified: branches/shell-experiments/dll/win32/msacm32/lang/msacm_Sv.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msa… Modified: branches/shell-experiments/dll/win32/msacm32/lang/msacm_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msa… Modified: branches/shell-experiments/dll/win32/msacm32/lang/msacm_Uk.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msa… Modified: branches/shell-experiments/dll/win32/msacm32/lang/msacm_Zh.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msa… Modified: branches/shell-experiments/dll/win32/msacm32/msacm.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msa… Modified: branches/shell-experiments/dll/win32/mscms/profile.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msc… Modified: branches/shell-experiments/dll/win32/msctf/inputprocessor.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msc… Modified: branches/shell-experiments/dll/win32/mshtml/binding.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/conpoint.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/dispex.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/editor.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/htmlanchor.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/htmlattr.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/htmlcurstyle.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/htmldoc.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/htmlelem.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/htmlelem2.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/htmlelem3.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/htmlelemcol.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/htmlevent.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/htmlevent.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/htmlform.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/htmlhead.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/htmlimg.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/htmlinput.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/htmllink.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/htmllocation.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/htmlmeta.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/htmlnode.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/htmloption.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/htmlscreen.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/htmlscript.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/htmlselect.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/htmlstorage.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/htmlstyle.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/htmlstyle.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/htmlstyle2.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/htmlstyle3.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/htmlstylesheet.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/htmltable.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/htmltablecell.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/htmltablerow.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/htmlwindow.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/ifacewrap.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/ipwindow.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/lang/Da.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/lang/De.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/lang/Es.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/lang/Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/lang/He.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/lang/Hu.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/lang/It.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/lang/Ja.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/lang/Ko.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/lang/Lt.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/lang/Nl.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/lang/No.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/lang/Pl.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/lang/Pt.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/lang/Ro.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/lang/Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/lang/Si.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/lang/Sv.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/lang/Uk.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/lang/Zh.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/loadopts.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/main.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/mshtml_private.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/mutation.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/navigate.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/npplugin.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/nsembed.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/nsiface.idl URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/nsio.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/oleobj.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/omnavigator.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/pluginhost.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/propbag.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/mshtml/script.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msh… Modified: branches/shell-experiments/dll/win32/msimg32/msimg32_main.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msi… Modified: branches/shell-experiments/dll/win32/msisip/main.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msi… Modified: branches/shell-experiments/dll/win32/msrle32/lang/msrle_Da.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msr… Modified: branches/shell-experiments/dll/win32/msrle32/lang/msrle_Ro.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msr… Modified: branches/shell-experiments/dll/win32/msvfw32/drawdib.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msv… Modified: branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Da.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msv… Modified: branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_De.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msv… Modified: branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_En.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msv… Modified: branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Es.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msv… Modified: branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msv… Modified: branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_He.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msv… Modified: branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Hu.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msv… Modified: branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_It.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msv… Modified: branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Ko.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msv… Modified: branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Lt.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msv… Modified: branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Nl.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msv… Modified: branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_No.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msv… Modified: branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Pl.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msv… Modified: branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Pt.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msv… Modified: branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Ro.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msv… Modified: branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msv… Modified: branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Si.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msv… Modified: branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Sq.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msv… Modified: branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Sv.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msv… Modified: branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msv… Modified: branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Uk.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msv… Modified: branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Zh.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msv… Modified: branches/shell-experiments/dll/win32/msvfw32/msvideo_main.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msv… Modified: branches/shell-experiments/dll/win32/msvfw32/msvideo_private.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msv… Modified: branches/shell-experiments/dll/win32/msvfw32/resource.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msv… Removed: branches/shell-experiments/dll/win32/msxml/Makefile.in URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msx… Removed: branches/shell-experiments/dll/win32/msxml2/Makefile.in URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msx… Modified: branches/shell-experiments/dll/win32/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msx… Modified: branches/shell-experiments/dll/win32/msxml3/element.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msx… Modified: branches/shell-experiments/dll/win32/msxml3/msxml_private.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msx… Modified: branches/shell-experiments/dll/win32/msxml3/node.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msx… Modified: branches/shell-experiments/dll/win32/msxml3/saxreader.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msx… Modified: branches/shell-experiments/dll/win32/msxml3/schema.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msx… Modified: branches/shell-experiments/dll/win32/msxml3/xslpattern.tab.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msx… Modified: branches/shell-experiments/dll/win32/msxml3/xslpattern.tab.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msx… Modified: branches/shell-experiments/dll/win32/msxml3/xslpattern.y URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msx… Removed: branches/shell-experiments/dll/win32/msxml4/Makefile.in URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msx… Removed: branches/shell-experiments/dll/win32/msxml6/Makefile.in URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msx… Modified: branches/shell-experiments/dll/win32/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/ole32/filelockbytes.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/ole32/filemoniker.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/ole32/ole2.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/ole32/stg_stream.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/ole32/storage32.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/ole32/storage32.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/oleacc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/oleacc/lang/oleacc_De.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/oleacc/lang/oleacc_En.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/oleacc/lang/oleacc_Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/oleacc/lang/oleacc_He.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/oleacc/lang/oleacc_Hu.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/oleacc/lang/oleacc_It.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/oleacc/lang/oleacc_Ko.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/oleacc/lang/oleacc_Lt.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/oleacc/lang/oleacc_Nl.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/oleacc/lang/oleacc_No.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/oleacc/lang/oleacc_Pl.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/oleacc/lang/oleacc_Pt.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/oleacc/lang/oleacc_Ro.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/oleacc/lang/oleacc_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/oleacc/lang/oleacc_Si.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/oleacc/lang/oleacc_Sq.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/oleacc/lang/oleacc_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/oleacc/lang/oleacc_Uk.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/oleacc/main.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/oleacc/oleacc.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/oleacc/oleacc.spec URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/oleaut32/recinfo.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/oleaut32/tmarshal.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/oleaut32/typelib.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/oleaut32/varformat.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/oleaut32/variant.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/oleaut32/variant.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/oleaut32/vartype.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/rasdlg/rasdlg.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ras… Modified: branches/shell-experiments/dll/win32/samsrv/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/sam… Modified: branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Da.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shl… Modified: branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_De.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shl… Modified: branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_En.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shl… Modified: branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Es.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shl… Modified: branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Fi.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shl… Modified: branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shl… Modified: branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_He.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shl… Modified: branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Hu.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shl… Modified: branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_It.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shl… Modified: branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Ja.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shl… Modified: branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Ko.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shl… Modified: branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Lt.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shl… Modified: branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Nl.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shl… Modified: branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_No.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shl… Modified: branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Pl.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shl… Modified: branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Pt.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shl… Modified: branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Ro.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shl… Modified: branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shl… Modified: branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Si.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shl… Modified: branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Sk.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shl… Modified: branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Sq.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shl… Modified: branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Sv.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shl… Modified: branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shl… Modified: branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Uk.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shl… Modified: branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Zh.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shl… Modified: branches/shell-experiments/dll/win32/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shl… Modified: branches/shell-experiments/dll/win32/shlwapi/path.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shl… Modified: branches/shell-experiments/dll/win32/shlwapi/reg.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shl… Modified: branches/shell-experiments/dll/win32/wbemdisp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/wbe… Modified: branches/shell-experiments/dll/win32/wldap32/lang/wldap32_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/wld… Modified: branches/shell-experiments/dll/win32/ws2_32/misc/ns.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ws2… Modified: branches/shell-experiments/drivers/filters/mountmgr/device.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/filte… Modified: branches/shell-experiments/drivers/filters/mountmgr/mountmgr.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/filte… Modified: branches/shell-experiments/drivers/hid/kbdhid/kbdhid.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/hid/k… Modified: branches/shell-experiments/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/netwo… Modified: branches/shell-experiments/include/crt/crtdefs.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/crt/c… Modified: branches/shell-experiments/include/crt/rtcapi.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/crt/r… Modified: branches/shell-experiments/include/crt/wctype.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/crt/w… Modified: branches/shell-experiments/include/psdk/docobj.idl URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… Modified: branches/shell-experiments/include/psdk/msacmdlg.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… Modified: branches/shell-experiments/include/psdk/msctf.idl URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… Modified: branches/shell-experiments/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… Modified: branches/shell-experiments/include/psdk/oleacc.idl URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… Modified: branches/shell-experiments/include/psdk/winddi.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… Modified: branches/shell-experiments/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… Modified: branches/shell-experiments/include/reactos/wine/test.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/react… Modified: branches/shell-experiments/include/xdk/ntbasedef.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/xdk/n… Modified: branches/shell-experiments/include/xdk/ntdef.template.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/xdk/n… Modified: branches/shell-experiments/include/xdk/winnt_old.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/xdk/w… Modified: branches/shell-experiments/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/o… Modified: branches/shell-experiments/lib/sdk/dxguid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/sdk/dxgui… Modified: branches/shell-experiments/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/media/doc/REA… Modified: branches/shell-experiments/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/conf… Modified: branches/shell-experiments/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/bios/bios.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/bios/bios32/bios32p.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/bios/bios32/kbdbios32.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/bios/bios32/moubios32.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/bios/bios32/vidbios32.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/bios/kbdbios.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/bios/rom.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/bios/vidbios.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Removed: branches/shell-experiments/subsystems/ntvdm/bop.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Removed: branches/shell-experiments/subsystems/ntvdm/bop.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Removed: branches/shell-experiments/subsystems/ntvdm/callback.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Removed: branches/shell-experiments/subsystems/ntvdm/callback.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/clock.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/dos/dos32krnl/bios.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/dos/dos32krnl/dos.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/dos/dos32krnl/dosfiles.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/dos/mouse32.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/hardware/vga.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/hardware/vga.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/int32.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/int32.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/registers.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/vddsup.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/tools/mkhive/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/tools/mkhive/… Modified: branches/shell-experiments/tools/mkhive/cmi.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/tools/mkhive/… Modified: branches/shell-experiments/tools/mkhive/mkhive.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/tools/mkhive/… Modified: branches/shell-experiments/tools/mkhive/registry.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/tools/mkhive/… Modified: branches/shell-experiments/tools/mkhive/rtl.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/tools/mkhive/… Modified: branches/shell-experiments/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/tools/spec2de… Modified: branches/shell-experiments/win32ss/gdi/eng/ldevobj.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/e… Modified: branches/shell-experiments/win32ss/gdi/ntgdi/dcobjs.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n… Modified: branches/shell-experiments/win32ss/reactx/ntddraw/eng.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/react…

1 0

[tfaber] 64509: [SHLWAPI] - Merge Sebastian Lackner's SH*Shared/SHMapHandle fixes (Wine commits 5e4f15db, c95b182d, 403ff373) CORE-8563 #resolve
by tfaber＠svn.reactos.org 03 Oct '14

03 Oct '14

Author: tfaber Date: Fri Oct 3 18:42:20 2014 New Revision: 64509 URL: http://svn.reactos.org/svn/reactos?rev=64509&view=rev Log: [SHLWAPI] - Merge Sebastian Lackner's SH*Shared/SHMapHandle fixes (Wine commits 5e4f15db, c95b182d, 403ff373) CORE-8563 #resolve Modified: trunk/reactos/dll/win32/shlwapi/ordinal.c Modified: trunk/reactos/dll/win32/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/ordinal.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/ordinal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/ordinal.c [iso-8859-1] Fri Oct 3 18:42:20 2014 @@ -52,13 +52,24 @@ */ /************************************************************************* - * SHLWAPI_DupSharedHandle - * - * Internal implementation of SHLWAPI_11. - */ -static HANDLE SHLWAPI_DupSharedHandle(HANDLE hShared, DWORD dwDstProcId, - DWORD dwSrcProcId, DWORD dwAccess, - DWORD dwOptions) + * @ [SHLWAPI.11] + * + * Copy a sharable memory handle from one process to another. + * + * PARAMS + * hShared [I] Shared memory handle to duplicate + * dwSrcProcId [I] ID of the process owning hShared + * dwDstProcId [I] ID of the process wanting the duplicated handle + * dwAccess [I] Desired DuplicateHandle() access + * dwOptions [I] Desired DuplicateHandle() options + * + * RETURNS + * Success: A handle suitable for use by the dwDstProcId process. + * Failure: A NULL handle. + * + */ +HANDLE WINAPI SHMapHandle(HANDLE hShared, DWORD dwSrcProcId, DWORD dwDstProcId, + DWORD dwAccess, DWORD dwOptions) { HANDLE hDst, hSrc; DWORD dwMyProcId = GetCurrentProcessId(); @@ -84,7 +95,7 @@ if (hSrc) { /* Make handle available to dest process */ - if (!DuplicateHandle(hDst, hShared, hSrc, &hRet, + if (!DuplicateHandle(hSrc, hShared, hDst, &hRet, dwAccess, 0, dwOptions | DUPLICATE_SAME_ACCESS)) hRet = NULL; @@ -148,9 +159,8 @@ /* Release view. All further views mapped will be opaque */ UnmapViewOfFile(pMapped); - hRet = SHLWAPI_DupSharedHandle(hMap, dwProcId, - GetCurrentProcessId(), FILE_MAP_ALL_ACCESS, - DUPLICATE_SAME_ACCESS); + hRet = SHMapHandle(hMap, GetCurrentProcessId(), dwProcId, + FILE_MAP_ALL_ACCESS, DUPLICATE_SAME_ACCESS); } CloseHandle(hMap); @@ -179,8 +189,8 @@ TRACE("(%p %d)\n", hShared, dwProcId); /* Get handle to shared memory for current process */ - hDup = SHLWAPI_DupSharedHandle(hShared, dwProcId, GetCurrentProcessId(), - FILE_MAP_ALL_ACCESS, 0); + hDup = SHMapHandle(hShared, dwProcId, GetCurrentProcessId(), FILE_MAP_ALL_ACCESS, 0); + /* Get View */ pMapped = MapViewOfFile(hDup, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 0); CloseHandle(hDup); @@ -230,37 +240,10 @@ TRACE("(%p %d)\n", hShared, dwProcId); /* Get a copy of the handle for our process, closing the source handle */ - hClose = SHLWAPI_DupSharedHandle(hShared, dwProcId, GetCurrentProcessId(), - FILE_MAP_ALL_ACCESS,DUPLICATE_CLOSE_SOURCE); + hClose = SHMapHandle(hShared, dwProcId, GetCurrentProcessId(), + FILE_MAP_ALL_ACCESS,DUPLICATE_CLOSE_SOURCE); /* Close local copy */ return CloseHandle(hClose); -} - -/************************************************************************* - * @ [SHLWAPI.11] - * - * Copy a sharable memory handle from one process to another. - * - * PARAMS - * hShared [I] Shared memory handle to duplicate - * dwDstProcId [I] ID of the process wanting the duplicated handle - * dwSrcProcId [I] ID of the process owning hShared - * dwAccess [I] Desired DuplicateHandle() access - * dwOptions [I] Desired DuplicateHandle() options - * - * RETURNS - * Success: A handle suitable for use by the dwDstProcId process. - * Failure: A NULL handle. - * - */ -HANDLE WINAPI SHMapHandle(HANDLE hShared, DWORD dwDstProcId, DWORD dwSrcProcId, - DWORD dwAccess, DWORD dwOptions) -{ - HANDLE hRet; - - hRet = SHLWAPI_DupSharedHandle(hShared, dwDstProcId, dwSrcProcId, - dwAccess, dwOptions); - return hRet; } /*************************************************************************

1 0

[tfaber] 64508: [SHLWAPI_WINETEST] - Merge Sebastian Lackner's SH*Shared/SHMapHandle tests (Wine commits cad3e3e5, 5e4f15db, ef065486, c95b182d) CORE-8563
by tfaber＠svn.reactos.org 03 Oct '14

03 Oct '14

Author: tfaber Date: Fri Oct 3 18:39:34 2014 New Revision: 64508 URL: http://svn.reactos.org/svn/reactos?rev=64508&view=rev Log: [SHLWAPI_WINETEST] - Merge Sebastian Lackner's SH*Shared/SHMapHandle tests (Wine commits cad3e3e5, 5e4f15db, ef065486, c95b182d) CORE-8563 Modified: trunk/rostests/winetests/shlwapi/ordinal.c Modified: trunk/rostests/winetests/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/ordinal… ============================================================================== --- trunk/rostests/winetests/shlwapi/ordinal.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/ordinal.c [iso-8859-1] Fri Oct 3 18:39:34 2014 @@ -21,7 +21,7 @@ #define _INC_WINDOWS #define COM_NO_WINDOWS_H -//#include <stdio.h> +#include <stdio.h> #define COBJMACROS #define CONST_VTABLE @@ -52,6 +52,7 @@ static LPVOID (WINAPI *pSHLockShared)(HANDLE,DWORD); static BOOL (WINAPI *pSHUnlockShared)(LPVOID); static BOOL (WINAPI *pSHFreeShared)(HANDLE,DWORD); +static HANDLE (WINAPI *pSHMapHandle)(HANDLE,DWORD,DWORD,DWORD,DWORD); static HRESULT(WINAPIV *pSHPackDispParams)(DISPPARAMS*,VARIANTARG*,UINT,...); static HRESULT(WINAPI *pIConnectionPoint_SimpleInvoke)(IConnectionPoint*,DISPID,DISPPARAMS*); static HRESULT(WINAPI *pIConnectionPoint_InvokeWithCancel)(IConnectionPoint*,DISPID,DISPPARAMS*,DWORD,DWORD); @@ -450,12 +451,20 @@ ok(i == values[0], "Len 3, expected %d, got %d\n", values[0], i); } -static void test_alloc_shared(void) -{ +struct shared_struct +{ + DWORD value; + HANDLE handle; +}; + +static void test_alloc_shared(int argc, char **argv) +{ + char cmdline[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFOA si = { 0 }; DWORD procid; - HANDLE hmem; - int val; - int* p; + HANDLE hmem, hmem2 = 0; + struct shared_struct val, *p; BOOL ret; procid=GetCurrentProcessId(); @@ -464,19 +473,106 @@ ret = pSHFreeShared(hmem, procid); ok( ret, "SHFreeShared failed: %u\n", GetLastError()); - val=0x12345678; - hmem=pSHAllocShared(&val,4,procid); + val.value = 0x12345678; + val.handle = 0; + hmem = pSHAllocShared(&val, sizeof(val), procid); ok(hmem!=NULL,"SHAllocShared(NULL...) failed: %u\n", GetLastError()); p=pSHLockShared(hmem,procid); ok(p!=NULL,"SHLockShared failed: %u\n", GetLastError()); if (p!=NULL) - ok(*p==val,"Wrong value in shared memory: %d instead of %d\n",*p,val); + ok(p->value == 0x12345678, "Wrong value in shared memory: %d instead of %d\n", p->value, 0x12345678); ret = pSHUnlockShared(p); ok( ret, "SHUnlockShared failed: %u\n", GetLastError()); + sprintf(cmdline, "%s %s %d %p", argv[0], argv[1], procid, hmem); + ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "could not create child process error: %u\n", GetLastError()); + if (ret) + { + winetest_wait_child_process(pi.hProcess); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + + p = pSHLockShared(hmem, procid); + ok(p != NULL,"SHLockShared failed: %u\n", GetLastError()); + if (p != NULL && p->value != 0x12345678) + { + ok(p->value == 0x12345679, "Wrong value in shared memory: %d instead of %d\n", p->value, 0x12345679); + hmem2 = p->handle; + ok(hmem2 != NULL, "Expected handle in shared memory\n"); + } + ret = pSHUnlockShared(p); + ok(ret, "SHUnlockShared failed: %u\n", GetLastError()); + } + ret = pSHFreeShared(hmem, procid); ok( ret, "SHFreeShared failed: %u\n", GetLastError()); + + if (hmem2) + { + p = pSHLockShared(hmem2, procid); + ok(p != NULL,"SHLockShared failed: %u\n", GetLastError()); + if (p != NULL) + ok(p->value == 0xDEADBEEF, "Wrong value in shared memory: %d instead of %d\n", p->value, 0xDEADBEEF); + ret = pSHUnlockShared(p); + ok(ret, "SHUnlockShared failed: %u\n", GetLastError()); + + ret = pSHFreeShared(hmem2, procid); + ok(ret, "SHFreeShared failed: %u\n", GetLastError()); + } +} + +static void test_alloc_shared_remote(DWORD procid, HANDLE hmem) +{ + struct shared_struct val, *p; + HANDLE hmem2; + BOOL ret; + + /* test directly accessing shared memory of a remote process */ + p = pSHLockShared(hmem, procid); + ok(p != NULL || broken(p == NULL) /* Windows 7/8 */, "SHLockShared failed: %u\n", GetLastError()); + if (p == NULL) + { + win_skip("Subprocess failed to modify shared memory, skipping test\n"); + return; + } + + ok(p->value == 0x12345678, "Wrong value in shared memory: %d instead of %d\n", p->value, 0x12345678); + p->value++; + + val.value = 0xDEADBEEF; + val.handle = 0; + p->handle = pSHAllocShared(&val, sizeof(val), procid); + ok(p->handle != NULL, "SHAllocShared failed: %u\n", GetLastError()); + + ret = pSHUnlockShared(p); + ok(ret, "SHUnlockShared failed: %u\n", GetLastError()); + + /* test SHMapHandle */ + hmem2 = pSHMapHandle(hmem, procid, GetCurrentProcessId(), 0, 0); + + /* It seems like Windows Vista/2008 uses a different internal implementation + * for shared memory, and calling SHMapHandle fails with ERROR_INVALID_HANDLE. */ + ok(hmem2 != NULL || broken(hmem2 == NULL && GetLastError() == ERROR_INVALID_HANDLE), + "SHMapHandle failed: %u\n", GetLastError()); + if (hmem2 == NULL && GetLastError() == ERROR_INVALID_HANDLE) + { + win_skip("Subprocess failed to map shared memory, skipping test\n"); + return; + } + + p = pSHLockShared(hmem2, GetCurrentProcessId()); + ok(p != NULL, "SHLockShared failed: %u\n", GetLastError()); + + if (p != NULL) + ok(p->value == 0x12345679, "Wrong value in shared memory: %d instead of %d\n", p->value, 0x12345679); + + ret = pSHUnlockShared(p); + ok(ret, "SHUnlockShared failed: %u\n", GetLastError()); + + ret = pSHFreeShared(hmem2, GetCurrentProcessId()); + ok(ret, "SHFreeShared failed: %u\n", GetLastError()); } static void test_fdsa(void) @@ -2952,6 +3048,7 @@ MAKEFUNC(SHLockShared, 8); MAKEFUNC(SHUnlockShared, 9); MAKEFUNC(SHFreeShared, 10); + MAKEFUNC(SHMapHandle, 11); MAKEFUNC(GetAcceptLanguagesA, 14); MAKEFUNC(SHSetWindowBits, 165); MAKEFUNC(SHSetParentHwnd, 167); @@ -3063,6 +3160,9 @@ START_TEST(ordinal) { + char **argv; + int argc; + hShlwapi = GetModuleHandleA("shlwapi.dll"); is_win2k_and_lower = GetProcAddress(hShlwapi, "StrChrNW") == 0; is_win9x = GetProcAddress(hShlwapi, (LPSTR)99) == 0; /* StrCpyNXA */ @@ -3075,6 +3175,17 @@ init_pointers(); + argc = winetest_get_mainargs(&argv); + if (argc >= 4) + { + DWORD procid; + HANDLE hmem; + sscanf(argv[2], "%d", &procid); + sscanf(argv[3], "%p", &hmem); + test_alloc_shared_remote(procid, hmem); + return; + } + hmlang = LoadLibraryA("mlang.dll"); pLcidToRfc1766A = (void *)GetProcAddress(hmlang, "LcidToRfc1766A"); @@ -3083,7 +3194,7 @@ test_GetAcceptLanguagesA(); test_SHSearchMapInt(); - test_alloc_shared(); + test_alloc_shared(argc, argv); test_fdsa(); test_GetShellSecurityDescriptor(); test_SHPackDispParams();

1 0

[tkreuzer] 64507: [MKHIVE] Fix warnings. (Compiling source files from ntoskrnl in mkhive is as ugly as it can get, this stuff needs to go to cmlib, if it is shared!)
by tkreuzer＠svn.reactos.org 03 Oct '14

03 Oct '14

Author: tkreuzer Date: Fri Oct 3 18:01:46 2014 New Revision: 64507 URL: http://svn.reactos.org/svn/reactos?rev=64507&view=rev Log: [MKHIVE] Fix warnings. (Compiling source files from ntoskrnl in mkhive is as ugly as it can get, this stuff needs to go to cmlib, if it is shared!) Modified: trunk/reactos/tools/mkhive/ntoskrnl.h Modified: trunk/reactos/tools/mkhive/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/ntoskrnl.h?re… ============================================================================== --- trunk/reactos/tools/mkhive/ntoskrnl.h [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/ntoskrnl.h [iso-8859-1] Fri Oct 3 18:01:46 2014 @@ -1,2 +1,10 @@ #define NDEBUG #include "mkhive.h" + +PVOID +NTAPI +CmpAllocate( + IN SIZE_T Size, + IN BOOLEAN Paged, + IN ULONG Tag +);

1 0

[akhaldi] 64506: [OLEAUT32_WINETEST] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 03 Oct '14

03 Oct '14

Author: akhaldi Date: Fri Oct 3 17:10:32 2014 New Revision: 64506 URL: http://svn.reactos.org/svn/reactos?rev=64506&view=rev Log: [OLEAUT32_WINETEST] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/rostests/winetests/oleaut32/olefont.c trunk/rostests/winetests/oleaut32/safearray.c trunk/rostests/winetests/oleaut32/typelib.c trunk/rostests/winetests/oleaut32/vartest.c trunk/rostests/winetests/oleaut32/vartype.c Modified: trunk/rostests/winetests/oleaut32/olefont.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/olefon… ============================================================================== --- trunk/rostests/winetests/oleaut32/olefont.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/olefont.c [iso-8859-1] Fri Oct 3 17:10:32 2014 @@ -417,10 +417,12 @@ IConnectionPoint_Release(pCP); fonteventsdisp_invoke_called = 0; + fonteventsdisp_invoke_arg0 = NULL; hr = IFont_put_Bold(pFont, TRUE); EXPECT_HR(hr, S_OK); ok(fonteventsdisp_invoke_called == 1, "IFontEventDisp::Invoke wasn't called once\n"); + SysFreeString(fonteventsdisp_invoke_arg0); hr = IFont_QueryInterface(pFont, &IID_IFontDisp, (void **)&pFontDisp); EXPECT_HR(hr, S_OK); Modified: trunk/rostests/winetests/oleaut32/safearray.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/safear… ============================================================================== --- trunk/rostests/winetests/oleaut32/safearray.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/safearray.c [iso-8859-1] Fri Oct 3 17:10:32 2014 @@ -1654,7 +1654,7 @@ sacopy = pSafeArrayCreateEx(VT_RECORD, 1, sab, &iRec->IRecordInfo_iface); iRec->recordcopy = 0; iRec->clearCalled = 0; - /* array copy code doesn't explicitely clear a record */ + /* array copy code doesn't explicitly clear a record */ hres = SafeArrayCopyData(sa, sacopy); ok(hres == S_OK, "got 0x%08x\n", hres); ok(iRec->recordcopy == sab[0].cElements, "got %d\n", iRec->recordcopy); Modified: trunk/rostests/winetests/oleaut32/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/typeli… ============================================================================== --- trunk/rostests/winetests/oleaut32/typelib.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/typelib.c [iso-8859-1] Fri Oct 3 17:10:32 2014 @@ -80,6 +80,8 @@ static HANDLE (WINAPI *pCreateActCtxW)(PCACTCTXW); static BOOL (WINAPI *pDeactivateActCtx)(DWORD,ULONG_PTR); static VOID (WINAPI *pReleaseActCtx)(HANDLE); +static BOOL (WINAPI *pIsWow64Process)(HANDLE,LPBOOL); +static LONG (WINAPI *pRegDeleteKeyExW)(HKEY,LPCWSTR,REGSAM,DWORD); static const WCHAR wszStdOle2[] = {'s','t','d','o','l','e','2','.','t','l','b',0}; static WCHAR wszGUID[] = {'G','U','I','D',0}; @@ -171,6 +173,7 @@ { HMODULE hmod = GetModuleHandleA("oleaut32.dll"); HMODULE hk32 = GetModuleHandleA("kernel32.dll"); + HMODULE hadv = GetModuleHandleA("advapi32.dll"); pRegisterTypeLibForUser = (void *)GetProcAddress(hmod, "RegisterTypeLibForUser"); pUnRegisterTypeLibForUser = (void *)GetProcAddress(hmod, "UnRegisterTypeLibForUser"); @@ -178,6 +181,8 @@ pCreateActCtxW = (void *)GetProcAddress(hk32, "CreateActCtxW"); pDeactivateActCtx = (void *)GetProcAddress(hk32, "DeactivateActCtx"); pReleaseActCtx = (void *)GetProcAddress(hk32, "ReleaseActCtx"); + pIsWow64Process = (void *)GetProcAddress(hk32, "IsWow64Process"); + pRegDeleteKeyExW = (void*)GetProcAddress(hadv, "RegDeleteKeyExW"); } static void ref_count_test(LPCWSTR type_lib) @@ -1158,18 +1163,19 @@ ok(V_VT(&result) == 0xcccc, "V_VT(result) = %u\n", V_VT(&result)); } -/* RegDeleteTreeW from dlls/advapi32/registry.c */ -static LSTATUS myRegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey) +/* RegDeleteTreeW from dlls/advapi32/registry.c, plus additional view flag */ +static LSTATUS myRegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey, REGSAM view) { LONG ret; DWORD dwMaxSubkeyLen, dwMaxValueLen; DWORD dwMaxLen, dwSize; WCHAR szNameBuf[MAX_PATH], *lpszName = szNameBuf; HKEY hSubKey = hKey; + view &= (KEY_WOW64_64KEY | KEY_WOW64_32KEY); if(lpszSubKey) { - ret = RegOpenKeyExW(hKey, lpszSubKey, 0, KEY_READ, &hSubKey); + ret = RegOpenKeyExW(hKey, lpszSubKey, 0, KEY_READ | view, &hSubKey); if (ret) return ret; } @@ -1197,12 +1203,15 @@ if (RegEnumKeyExW(hSubKey, 0, lpszName, &dwSize, NULL, NULL, NULL, NULL)) break; - ret = myRegDeleteTreeW(hSubKey, lpszName); + ret = myRegDeleteTreeW(hSubKey, lpszName, view); if (ret) goto cleanup; } if (lpszSubKey) - ret = RegDeleteKeyW(hKey, lpszSubKey); + if (pRegDeleteKeyExW && view != 0) + ret = pRegDeleteKeyExW(hKey, lpszSubKey, view, 0); + else + ret = RegDeleteKeyW(hKey, lpszSubKey); else while (TRUE) { @@ -1237,7 +1246,7 @@ if (remove) { - ok(myRegDeleteTreeW(HKEY_CLASSES_ROOT, buf) == ERROR_SUCCESS, "SHDeleteKey failed\n"); + ok(myRegDeleteTreeW(HKEY_CLASSES_ROOT, buf, 0) == ERROR_SUCCESS, "SHDeleteKey failed\n"); return TRUE; } @@ -1304,11 +1313,11 @@ StringFromGUID2(&uid, uid_str, 40); /*trace("GUID: %s\n", wine_dbgstr_w(uid_str));*/ - if (!do_typelib_reg_key(&uid, 3, 0, arch, base, 0)) return; - if (!do_typelib_reg_key(&uid, 3, 1, arch, base, 0)) return; - if (!do_typelib_reg_key(&uid, 3, 37, arch, base, 0)) return; - if (!do_typelib_reg_key(&uid, 5, 37, arch, base, 0)) return; - if (arch == 64 && !do_typelib_reg_key(&uid, 5, 37, 32, wrongW, 0)) return; + if (!do_typelib_reg_key(&uid, 3, 0, arch, base, FALSE)) return; + if (!do_typelib_reg_key(&uid, 3, 1, arch, base, FALSE)) return; + if (!do_typelib_reg_key(&uid, 3, 37, arch, base, FALSE)) return; + if (!do_typelib_reg_key(&uid, 5, 37, arch, base, FALSE)) return; + if (arch == 64 && !do_typelib_reg_key(&uid, 5, 37, 32, wrongW, FALSE)) return; for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { @@ -1321,7 +1330,7 @@ } } - do_typelib_reg_key(&uid, 0, 0, arch, NULL, 1); + do_typelib_reg_key(&uid, 0, 0, arch, NULL, TRUE); } static void test_inheritance(void) @@ -4201,6 +4210,8 @@ LONG ret, expect_ret; UINT count, i; HKEY hkey; + REGSAM opposite = (sizeof(void*) == 8 ? KEY_WOW64_32KEY : KEY_WOW64_64KEY); + BOOL is_wow64 = FALSE; struct { TYPEKIND kind; @@ -4230,6 +4241,9 @@ return; } + if (pIsWow64Process) + pIsWow64Process(GetCurrentProcess(), &is_wow64); + filenameA = create_test_typelib(3); MultiByteToWideChar(CP_ACP, 0, filenameA, -1, filename, MAX_PATH); @@ -4256,7 +4270,6 @@ { ITypeInfo *typeinfo; TYPEATTR *attr; - REGSAM opposite = (sizeof(void*) == 8 ? KEY_WOW64_32KEY : KEY_WOW64_64KEY); hr = ITypeLib_GetTypeInfo(typelib, i, &typeinfo); ok(hr == S_OK, "got %08x\n", hr); @@ -4307,9 +4320,12 @@ if(ret == ERROR_SUCCESS) RegCloseKey(hkey); /* 32-bit typelibs should be registered into both registry bit modes */ - ret = RegOpenKeyExA(HKEY_CLASSES_ROOT, key_name, 0, KEY_READ | opposite, &hkey); - ok(ret == expect_ret, "%d: got %d\n", i, ret); - if(ret == ERROR_SUCCESS) RegCloseKey(hkey); + if (is_win64 || is_wow64) + { + ret = RegOpenKeyExA(HKEY_CLASSES_ROOT, key_name, 0, KEY_READ | opposite, &hkey); + ok(ret == expect_ret, "%d: got %d\n", i, ret); + if(ret == ERROR_SUCCESS) RegCloseKey(hkey); + } ITypeInfo_ReleaseTypeAttr(typeinfo, attr); ITypeInfo_Release(typeinfo); @@ -4320,6 +4336,36 @@ else hr = pUnRegisterTypeLibForUser(&LIBID_register_test, 1, 0, LOCALE_NEUTRAL, is_win64 ? SYS_WIN64 : SYS_WIN32); ok(hr == S_OK, "got %08x\n", hr); + + for(i = 0; i < count; i++) + { + ITypeInfo *typeinfo; + TYPEATTR *attr; + + hr = ITypeLib_GetTypeInfo(typelib, i, &typeinfo); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ITypeInfo_GetTypeAttr(typeinfo, &attr); + ok(hr == S_OK, "got %08x\n", hr); + + if((attr->typekind == TKIND_INTERFACE && (attr->wTypeFlags & TYPEFLAG_FOLEAUTOMATION)) || + attr->typekind == TKIND_DISPATCH) + { + StringFromGUID2(&attr->guid, uuidW, sizeof(uuidW) / sizeof(uuidW[0])); + WideCharToMultiByte(CP_ACP, 0, uuidW, -1, uuid, sizeof(uuid), NULL, NULL); + sprintf(key_name, "Interface\\%s", uuid); + + ret = RegOpenKeyExA(HKEY_CLASSES_ROOT, key_name, 0, KEY_READ, &hkey); + ok(ret == ERROR_FILE_NOT_FOUND, "Interface registry remains in %s (%d)\n", key_name, i); + if (is_win64 || is_wow64) + { + ret = RegOpenKeyExA(HKEY_CLASSES_ROOT, key_name, 0, KEY_READ | opposite, &hkey); + ok(ret == ERROR_FILE_NOT_FOUND, "Interface registry remains in %s (%d)\n", key_name, i); + } + } + ITypeInfo_ReleaseTypeAttr(typeinfo, attr); + ITypeInfo_Release(typeinfo); + } ITypeLib_Release(typelib); DeleteFileA( filenameA ); @@ -5297,10 +5343,9 @@ static void test_stub(void) { + BOOL is_wow64 = FALSE; + DWORD *sam_list; HRESULT hr; - CLSID clsid; - IPSFactoryBuffer *factory; - IRpcStubBuffer *base_stub; ITypeLib *stdole; ICreateTypeLib2 *ctl; ICreateTypeInfo *cti; @@ -5309,14 +5354,22 @@ HREFTYPE href; char filenameA[MAX_PATH]; WCHAR filenameW[MAX_PATH]; - HKEY hkey; - LONG lr; + int i; static const GUID libguid = {0x3b9ff02e,0x9675,0x4861,{0xb7,0x81,0xce,0xae,0xa4,0x78,0x2a,0xcc}}; static const GUID interfaceguid = {0x3b9ff02f,0x9675,0x4861,{0xb7,0x81,0xce,0xae,0xa4,0x78,0x2a,0xcc}}; static const GUID coclassguid = {0x3b9ff030,0x9675,0x4861,{0xb7,0x81,0xce,0xae,0xa4,0x78,0x2a,0xcc}}; static OLECHAR interfaceW[] = {'i','n','t','e','r','f','a','c','e',0}; static OLECHAR classW[] = {'c','l','a','s','s',0}; + static DWORD sam_list32[] = { 0, ~0 }; + static DWORD sam_list64[] = { 0, KEY_WOW64_32KEY, KEY_WOW64_64KEY, ~0 }; + + if (pIsWow64Process) + pIsWow64Process(GetCurrentProcess(), &is_wow64); + if (is_wow64 || is_win64) + sam_list = sam_list64; + else + sam_list = sam_list32; CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); @@ -5381,44 +5434,180 @@ hr = ICreateTypeLib2_QueryInterface(ctl, &IID_ITypeLib, (void**)&tl); ok(hr == S_OK, "got %08x\n", hr); - hr = RegisterTypeLib(tl, filenameW, NULL); - if (hr == TYPE_E_REGISTRYACCESS) + for (i = 0; sam_list[i] != ~0; i++) { - win_skip("Insufficient privileges to register typelib in the registry\n"); - ITypeLib_Release(tl); - DeleteFileW(filenameW); - CoUninitialize(); - return; + IPSFactoryBuffer *factory; + IRpcStubBuffer *base_stub; + REGSAM side = sam_list[i]; + CLSID clsid; + HKEY hkey; + LONG lr; + + hr = RegisterTypeLib(tl, filenameW, NULL); + if (hr == TYPE_E_REGISTRYACCESS) + { + win_skip("Insufficient privileges to register typelib in the registry\n"); + break; + } + ok(hr == S_OK, "got %08x, side: %04x\n", hr, side); + + /* SYS_WIN32 typelibs should be registered only as 32-bit */ + lr = RegOpenKeyExA(HKEY_CLASSES_ROOT, "TypeLib\\{3b9ff02e-9675-4861-b781-ceaea4782acc}\\0.0\\0\\win64", 0, KEY_READ | side, &hkey); + ok(lr == ERROR_FILE_NOT_FOUND, "got wrong return code: %u, side: %04x\n", lr, side); + + lr = RegOpenKeyExA(HKEY_CLASSES_ROOT, "TypeLib\\{3b9ff02e-9675-4861-b781-ceaea4782acc}\\0.0\\0\\win32", 0, KEY_READ | side, &hkey); + ok(lr == ERROR_SUCCESS, "got wrong return code: %u, side: %04x\n", lr, side); + RegCloseKey(hkey); + + /* Simulate pre-win7 installers that create interface key on one side */ + if (side != 0) + { + WCHAR guidW[40]; + REGSAM opposite = side ^ (KEY_WOW64_64KEY | KEY_WOW64_32KEY); + + StringFromGUID2(&interfaceguid, guidW, sizeof(guidW)/sizeof(guidW[0])); + + /* Delete the opposite interface key */ + lr = RegOpenKeyExA(HKEY_CLASSES_ROOT, "Interface", 0, KEY_READ | opposite, &hkey); + ok(lr == ERROR_SUCCESS, "got wrong return code: %u, side: %04x\n", lr, side); + lr = myRegDeleteTreeW(hkey, guidW, opposite); + ok(lr == ERROR_SUCCESS, "got wrong return code: %u, side: %04x\n", lr, side); + RegCloseKey(hkey); + + /* Is our side interface key affected by above operation? */ + lr = RegOpenKeyExA(HKEY_CLASSES_ROOT, "Interface\\{3b9ff02f-9675-4861-b781-ceaea4782acc}", 0, KEY_READ | side, &hkey); + ok(lr == ERROR_SUCCESS || broken(lr == ERROR_FILE_NOT_FOUND), "got wrong return code: %u, side: %04x\n", lr, side); + if (lr == ERROR_FILE_NOT_FOUND) + { + /* win2k3, vista, 2008 */ + win_skip("Registry reflection is enabled on this platform.\n"); + goto next; + } + RegCloseKey(hkey); + + /* Opposite side typelib key still exists */ + lr = RegOpenKeyExA(HKEY_CLASSES_ROOT, "TypeLib\\{3b9ff02e-9675-4861-b781-ceaea4782acc}\\0.0\\0\\win32", 0, KEY_READ | opposite, &hkey); + ok(lr == ERROR_SUCCESS, "got wrong return code: %u, side: %04x\n", lr, side); + RegCloseKey(hkey); + } + + hr = CoGetPSClsid(&interfaceguid, &clsid); + ok(hr == S_OK, "got: %x, side: %04x\n", hr, side); + + hr = CoGetClassObject(&clsid, CLSCTX_INPROC_SERVER, NULL, + &IID_IPSFactoryBuffer, (void **)&factory); + ok(hr == S_OK, "got: %x, side: %04x\n", hr, side); + + hr = IPSFactoryBuffer_CreateStub(factory, &interfaceguid, &uk, &base_stub); + ok(hr == S_OK, "got: %x, side: %04x\n", hr, side); + + IPSFactoryBuffer_Release(factory); + next: + hr = UnRegisterTypeLib(&libguid, 0, 0, 0, SYS_WIN32); + ok(hr == S_OK, "got: %x, side: %04x\n", hr, side); } - ok(hr == S_OK, "got %08x\n", hr); ITypeLib_Release(tl); ok(0 == ICreateTypeLib2_Release(ctl), "Typelib still has references\n"); - /* SYS_WIN32 typelibs should be registered only as 32-bit */ - lr = RegOpenKeyExA(HKEY_CLASSES_ROOT, "TypeLib\\{3b9ff02e-9675-4861-b781-ceaea4782acc}\\0.0\\0\\win64", 0, KEY_READ, &hkey); - ok(lr == ERROR_FILE_NOT_FOUND, "got wrong return code: %u\n", lr); - - lr = RegOpenKeyExA(HKEY_CLASSES_ROOT, "TypeLib\\{3b9ff02e-9675-4861-b781-ceaea4782acc}\\0.0\\0\\win32", 0, KEY_READ, &hkey); - ok(lr == ERROR_SUCCESS, "got wrong return code: %u\n", lr); - RegCloseKey(hkey); - - hr = CoGetPSClsid(&interfaceguid, &clsid); + DeleteFileW(filenameW); + + CoUninitialize(); +} + +static void test_dep(void) { + HRESULT hr; + const char *refFilename; + WCHAR refFilenameW[MAX_PATH]; + ITypeLib *preftLib; + ITypeInfo *preftInfo; + char filename[MAX_PATH]; + WCHAR filenameW[MAX_PATH]; + ICreateTypeLib2 *pctLib; + ICreateTypeInfo *pctInfo; + ITypeLib *ptLib; + ITypeInfo *ptInfo; + ITypeInfo *ptInfoExt = NULL; + HREFTYPE refType; + + static WCHAR ifacenameW[] = {'I','T','e','s','t','D','e','p',0}; + + static const GUID libguid = {0xe0228f26,0x2946,0x478c,{0xb6,0x4a,0x93,0xfe,0xef,0xa5,0x05,0x32}}; + static const GUID ifaceguid = {0x394376dd,0x3bb8,0x4804,{0x8c,0xcc,0x95,0x59,0x43,0x40,0x04,0xf3}}; + + trace("Starting typelib dependency tests\n"); + + refFilename = create_test_typelib(2); + MultiByteToWideChar(CP_ACP, 0, refFilename, -1, refFilenameW, MAX_PATH); + + hr = LoadTypeLibEx(refFilenameW, REGKIND_NONE, &preftLib); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ITypeLib_GetTypeInfoOfGuid(preftLib, &IID_ISimpleIface, &preftInfo); + ok(hr == S_OK, "got %08x\n", hr); + + GetTempFileNameA(".", "tlb", 0, filename); + MultiByteToWideChar(CP_ACP, 0, filename, -1, filenameW, MAX_PATH); + + if(sizeof(void*) == 8) { + hr = CreateTypeLib2(SYS_WIN64, filenameW, &pctLib); + ok(hr == S_OK, "got %08x\n", hr); + } else { + hr = CreateTypeLib2(SYS_WIN32, filenameW, &pctLib); + ok(hr == S_OK, "got %08x\n", hr); + } + + hr = ICreateTypeLib2_SetGuid(pctLib, &libguid); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_SetLcid(pctLib, LOCALE_NEUTRAL); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_CreateTypeInfo(pctLib, ifacenameW, TKIND_INTERFACE, &pctInfo); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetGuid(pctInfo, &ifaceguid); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetTypeFlags(pctInfo, TYPEFLAG_FOLEAUTOMATION); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_AddRefTypeInfo(pctInfo, preftInfo, &refType); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_AddImplType(pctInfo, 0, refType); + ok(hr == S_OK, "got %08x\n", hr); + + ICreateTypeInfo_Release(pctInfo); + + hr = ICreateTypeLib2_SaveAllChanges(pctLib); + ok(hr == S_OK, "got %08x\n", hr); + + ICreateTypeLib2_Release(pctLib); + + ITypeInfo_Release(preftInfo); + ITypeLib_Release(preftLib); + + DeleteFileW(refFilenameW); + + hr = LoadTypeLibEx(filenameW, REGKIND_NONE, &ptLib); ok(hr == S_OK, "got: %x\n", hr); - hr = CoGetClassObject(&clsid, CLSCTX_INPROC_SERVER, NULL, - &IID_IPSFactoryBuffer, (void **)&factory); + hr = ITypeLib_GetTypeInfoOfGuid(ptLib, &ifaceguid, &ptInfo); ok(hr == S_OK, "got: %x\n", hr); - hr = IPSFactoryBuffer_CreateStub(factory, &interfaceguid, &uk, &base_stub); + hr = ITypeInfo_GetRefTypeOfImplType(ptInfo, 0, &refType); ok(hr == S_OK, "got: %x\n", hr); - IPSFactoryBuffer_Release(factory); - - UnRegisterTypeLib(&libguid, 0, 0, 0, SYS_WIN32); + hr = ITypeInfo_GetRefTypeInfo(ptInfo, refType, &ptInfoExt); + todo_wine ok(hr == S_OK || broken(hr == TYPE_E_CANTLOADLIBRARY) /* win 2000 */, "got: %x\n", hr); + + ITypeInfo_Release(ptInfo); + if(ptInfoExt) + ITypeInfo_Release(ptInfoExt); + ITypeLib_Release(ptLib); + DeleteFileW(filenameW); - - CoUninitialize(); } START_TEST(typelib) @@ -5460,4 +5649,5 @@ test_LoadRegTypeLib(); test_GetLibAttr(); test_stub(); -} + test_dep(); +} Modified: trunk/rostests/winetests/oleaut32/vartest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/vartes… ============================================================================== --- trunk/rostests/winetests/oleaut32/vartest.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/vartest.c [iso-8859-1] Fri Oct 3 17:10:32 2014 @@ -1938,6 +1938,12 @@ /* for DATE values 0.0 < x < 1.0, x and -x represent the same datetime */ /* but when converting to DATE, prefer the positive versions */ UD2T(30,12,1899,6,0,0,0,6,364,0,S_OK,0.25); + + UD2T(1,1,1980,18,1,16,0,2,1,VAR_TIMEVALUEONLY,S_OK,0.7508796296296296); + UD2T(1,1,1980,18,1,16,0,2,1,VAR_DATEVALUEONLY,S_OK,29221.0); + UD2T(25,12,1899,6,0,0,0,1,359,VAR_TIMEVALUEONLY,S_OK,0.25); + UD2T(25,12,1899,6,0,0,0,1,359,VAR_DATEVALUEONLY,S_OK,-5.0); + UD2T(1,-1,1980,18,1,16,0,0,0,VAR_TIMEVALUEONLY|VAR_DATEVALUEONLY,S_OK,0.7508796296296296); } static void test_st2dt(int line, WORD d, WORD m, WORD y, WORD h, WORD mn, @@ -2162,7 +2168,7 @@ V_VT(&vDst) = VT_EMPTY; hres = pVarAbs(&v,&vDst); - if (ExtraFlags[i] & (VT_ARRAY|VT_ARRAY) || + if (ExtraFlags[i] & VT_ARRAY || (!ExtraFlags[i] && (vt == VT_UNKNOWN || vt == VT_BSTR || vt == VT_DISPATCH || vt == VT_ERROR || vt == VT_RECORD))) { @@ -2336,7 +2342,6 @@ VARNOT(BSTR, (BSTR)szTrue, BOOL, VARIANT_FALSE); VARNOT(BSTR, (BSTR)szFalse, BOOL, VARIANT_TRUE); - V_VT(&v) = VT_DECIMAL; S(U(*pdec)).sign = DECIMAL_NEG; S(U(*pdec)).scale = 0; pdec->Hi32 = 0; @@ -2907,9 +2912,6 @@ } else if((l == VT_VARIANT) || (r == VT_VARIANT)) { hexpected = DISP_E_BADVARTYPE; - } else if(lFound && !rFound) - { - hexpected = DISP_E_BADVARTYPE; } else if(!lFound && !rFound) { hexpected = DISP_E_BADVARTYPE; @@ -5615,6 +5617,7 @@ VARTYPE leftvt, rightvt, resultvt; HRESULT hres; HRESULT expected_error_num; + int cmp; CHECKPTR(VarCat); @@ -5956,7 +5959,11 @@ V_BSTR(&right) = SysAllocStringLen(NULL,0); hres = pVarCat(&left, &right, &result); ok(hres == S_OK, "VarCat failed: %08x\n", hres); - if(!strcmp_wa(V_BSTR(&result), "True")) { + VariantClear(&right); + + cmp = strcmp_wa(V_BSTR(&result), "True"); + VariantClear(&result); + if(!cmp) { V_VT(&right) = VT_BOOL; V_BOOL(&right) = 100; hres = pVarCat(&left, &right, &result); Modified: trunk/rostests/winetests/oleaut32/vartype.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/vartyp… ============================================================================== --- trunk/rostests/winetests/oleaut32/vartype.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/vartype.c [iso-8859-1] Fri Oct 3 17:10:32 2014 @@ -4413,8 +4413,39 @@ ok(hres == DISP_E_OVERFLOW,"Expected overflow, got (%d,%d,%d,(%8x,%8x)x) hres 0x%08x\n", S(U(out)).scale, S(U(out)).sign, out.Hi32, S1(U1(out)).Mid32, S1(U1(out)).Lo32, hres); + SETDEC64(l,1,0,0xffffffff,0xffffffff,0xffffffff);SETDEC(r,1,0,0,1); MATH2(VarDecAdd); + todo_wine EXPECTDEC64(0,0,0x19999999,0x99999999,0x9999999A); + + SETDEC64(l,0,0,0xe22ea493,0xb30310a7,0x70000000);SETDEC64(r,0,0,0xe22ea493,0xb30310a7,0x70000000); MATH2(VarDecAdd); + ok(hres == DISP_E_OVERFLOW,"Expected overflow, got (%d,%d,%d,(%8x,%8x)x) hres 0x%08x\n", + S(U(out)).scale, S(U(out)).sign, out.Hi32, S1(U1(out)).Mid32, S1(U1(out)).Lo32, hres); + + SETDEC64(l,1,0,0xe22ea493,0xb30310a7,0x70000000);SETDEC64(r,1,0,0xe22ea493,0xb30310a7,0x70000000); MATH2(VarDecAdd); + todo_wine EXPECTDEC64(0,0,0x2d3c8750,0xbd670354,0xb0000000); + SETDEC(l,3,128,0,123456); SETDEC64(r,0,0,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF); - MATH2(VarDecAdd); todo_wine EXPECTDEC64(0,0,-1,0xFFFFFFFF,0xFFFFFF84); + MATH2(VarDecAdd); EXPECTDEC64(0,0,-1,0xFFFFFFFF,0xFFFFFF84); + + SETDEC(l,3,0,0,123456); SETDEC64(r,0,0,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF); MATH2(VarDecAdd); + ok(hres == DISP_E_OVERFLOW,"Expected overflow, got (%d,%d,%d,(%8x,%8x)x) hres 0x%08x\n", + S(U(out)).scale, S(U(out)).sign, out.Hi32, S1(U1(out)).Mid32, S1(U1(out)).Lo32, hres); + + SETDEC(l,4,0,0,123456); SETDEC64(r,0,0,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF); MATH2(VarDecAdd); + ok(hres == DISP_E_OVERFLOW,"Expected overflow, got (%d,%d,%d,(%8x,%8x)x) hres 0x%08x\n", + S(U(out)).scale, S(U(out)).sign, out.Hi32, S1(U1(out)).Mid32, S1(U1(out)).Lo32, hres); + + SETDEC(l,5,0,0,123456); SETDEC64(r,0,0,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF); MATH2(VarDecAdd); + ok(hres == DISP_E_OVERFLOW,"Expected overflow, got (%d,%d,%d,(%8x,%8x)x) hres 0x%08x\n", + S(U(out)).scale, S(U(out)).sign, out.Hi32, S1(U1(out)).Mid32, S1(U1(out)).Lo32, hres); + + SETDEC(l,6,0,0,123456); SETDEC64(r,0,0,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF); + MATH2(VarDecAdd); EXPECTDEC64(0,0,-1,0xFFFFFFFF,0xFFFFFFFF); + + SETDEC(l,3,128,0,123456); SETDEC64(r,0,0,0x19999999,0x99999999,0x99999999); + MATH2(VarDecAdd); EXPECTDEC64(1,0,-1,0xFFFFFFFF,0xFFFFFB27); + + SETDEC(l,3,128,0,123567); SETDEC64(r,0,0,0x19999999,0x99999999,0x99999999); + MATH2(VarDecAdd); EXPECTDEC64(1,0,-1,0xFFFFFFFF,0xFFFFFB26); /* Promotes to the highest scale, so here the results are in the scale of 2 */ SETDEC(l,2,0,0,0); SETDEC(r,0,0,0,0); MATH2(VarDecAdd); EXPECTDEC(2,0,0,0); @@ -4637,7 +4668,7 @@ SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); EXPECT_EQ; SETDEC(l,3,0,0,123456); SETDEC64(out,0,0,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF); - MATH1(VarDecCmp); todo_wine EXPECT_LT; + MATH1(VarDecCmp); EXPECT_LT; } static void test_VarDecCmpR8(void) @@ -6274,6 +6305,13 @@ hres = VariantChangeTypeEx(&v2, &v1, 0, 0, VT_INT); ok(hres == DISP_E_TYPEMISMATCH, "VariantChangeTypeEx returns %08x\n", hres); ok(V_VT(&v2) == VT_INT && V_INT(&v2) == 4, "VariantChangeTypeEx changed dst variant\n"); + V_VT(&v2) = 0xff; /* incorrect variant type */ + hres = VariantChangeTypeEx(&v2, &v1, 0, 0, VT_INT); + ok(hres == DISP_E_TYPEMISMATCH, "VariantChangeTypeEx returns %08x\n", hres); + ok(V_VT(&v2) == 0xff, "VariantChangeTypeEx changed dst variant\n"); + hres = VariantChangeTypeEx(&v2, &v1, 0, 0, VT_BSTR); + ok(hres == DISP_E_BADVARTYPE, "VariantChangeTypeEx returns %08x\n", hres); + ok(V_VT(&v2) == 0xff, "VariantChangeTypeEx changed dst variant\n"); SysFreeString(bstr); }

1 0

[akhaldi] 64505: [OLEAUT32] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 03 Oct '14

03 Oct '14

Author: akhaldi Date: Fri Oct 3 17:10:15 2014 New Revision: 64505 URL: http://svn.reactos.org/svn/reactos?rev=64505&view=rev Log: [OLEAUT32] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/oleaut32/recinfo.c trunk/reactos/dll/win32/oleaut32/tmarshal.c trunk/reactos/dll/win32/oleaut32/typelib.c trunk/reactos/dll/win32/oleaut32/varformat.c trunk/reactos/dll/win32/oleaut32/variant.c trunk/reactos/dll/win32/oleaut32/variant.h trunk/reactos/dll/win32/oleaut32/vartype.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/oleaut32/recinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/recinfo… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/recinfo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/recinfo.c [iso-8859-1] Fri Oct 3 17:10:15 2014 @@ -166,7 +166,7 @@ int i; for(i=0; i<This->n_vars; i++) SysFreeString(This->fields[i].name); - HeapFree(GetProcessHeap(), 0, This->name); + SysFreeString(This->name); HeapFree(GetProcessHeap(), 0, This->fields); ITypeInfo_Release(This->pTypeInfo); HeapFree(GetProcessHeap(), 0, This); Modified: trunk/reactos/dll/win32/oleaut32/tmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/tmarsha… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/tmarshal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/tmarshal.c [iso-8859-1] Fri Oct 3 17:10:15 2014 @@ -248,11 +248,13 @@ _get_typeinfo_for_iid(REFIID riid, ITypeInfo**ti) { HRESULT hres; HKEY ikey; + REGSAM opposite = (sizeof(void*) == 8) ? KEY_WOW64_32KEY : KEY_WOW64_64KEY; + BOOL is_wow64; char tlguid[200],typelibkey[300],interfacekey[300],ver[100]; char tlfn[260]; OLECHAR tlfnW[260]; DWORD tlguidlen, verlen, type; - LONG tlfnlen; + LONG tlfnlen, err; ITypeLib *tl; sprintf( interfacekey, "Interface\\{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\Typelib", @@ -261,9 +263,14 @@ riid->Data4[4], riid->Data4[5], riid->Data4[6], riid->Data4[7] ); - if (RegOpenKeyA(HKEY_CLASSES_ROOT,interfacekey,&ikey)) { - ERR("No %s key found.\n",interfacekey); - return E_FAIL; + err = RegOpenKeyExA(HKEY_CLASSES_ROOT,interfacekey,0,KEY_READ,&ikey); + if (err && (opposite == KEY_WOW64_32KEY || (IsWow64Process(GetCurrentProcess(), &is_wow64) + && is_wow64))) { + err = RegOpenKeyExA(HKEY_CLASSES_ROOT,interfacekey,0,KEY_READ|opposite,&ikey); + } + if (err) { + ERR("No %s key found.\n",interfacekey); + return E_FAIL; } tlguidlen = sizeof(tlguid); if (RegQueryValueExA(ikey,NULL,NULL,&type,(LPBYTE)tlguid,&tlguidlen)) { @@ -694,7 +701,7 @@ hres = xbuf_add(buf,(LPBYTE)arg,sizeof(DWORD)); return hres; case VT_VARIANT: { - if (debugout) TRACE_(olerelay)("Vt(%s%s)(",debugstr_vt(V_VT((VARIANT *)arg)),debugstr_vf(V_VT((VARIANT *)arg))); + if (debugout) TRACE_(olerelay)("%s", debugstr_variant((VARIANT *)arg)); if (writeit) { ULONG flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION); Modified: trunk/reactos/dll/win32/oleaut32/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/typelib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/typelib.c [iso-8859-1] Fri Oct 3 17:10:15 2014 @@ -581,12 +581,17 @@ TLIBATTR *attr; res = ITypeLib_GetLibAttr(*ppTLib, &attr); - if (res == S_OK && (attr->wMajorVerNum != wVerMajor || attr->wMinorVerNum < wVerMinor)) + if (res == S_OK) { + BOOL mismatch = attr->wMajorVerNum != wVerMajor || attr->wMinorVerNum < wVerMinor; ITypeLib_ReleaseTLibAttr(*ppTLib, attr); - ITypeLib_Release(*ppTLib); - *ppTLib = NULL; - res = TYPE_E_LIBNOTREGISTERED; + + if (mismatch) + { + ITypeLib_Release(*ppTLib); + *ppTLib = NULL; + res = TYPE_E_LIBNOTREGISTERED; + } } } } @@ -872,6 +877,24 @@ return res; } +static void TLB_unregister_interface(GUID *guid, REGSAM flag) +{ + WCHAR subKeyName[50]; + HKEY subKey; + + /* the path to the type */ + get_interface_key( guid, subKeyName ); + + /* Delete its bits */ + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, subKeyName, 0, KEY_WRITE | flag, &subKey) != ERROR_SUCCESS) + return; + + RegDeleteKeyW(subKey, ProxyStubClsidW); + RegDeleteKeyW(subKey, ProxyStubClsid32W); + RegDeleteKeyW(subKey, TypeLibW); + RegCloseKey(subKey); + RegDeleteKeyExW(HKEY_CLASSES_ROOT, subKeyName, flag, 0); +} /****************************************************************************** * UnRegisterTypeLib [OLEAUT32.186] @@ -897,7 +920,6 @@ DWORD i = 0; BOOL deleteOtherStuff; HKEY key = NULL; - HKEY subKey = NULL; TYPEATTR* typeAttr = NULL; TYPEKIND kind; ITypeInfo* typeInfo = NULL; @@ -956,19 +978,16 @@ if ((kind == TKIND_INTERFACE && (typeAttr->wTypeFlags & TYPEFLAG_FOLEAUTOMATION)) || kind == TKIND_DISPATCH) { - /* the path to the type */ - get_interface_key( &typeAttr->guid, subKeyName ); - - /* Delete its bits */ - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, subKeyName, 0, KEY_WRITE, &subKey) != ERROR_SUCCESS) - goto enddeleteloop; - - RegDeleteKeyW(subKey, ProxyStubClsidW); - RegDeleteKeyW(subKey, ProxyStubClsid32W); - RegDeleteKeyW(subKey, TypeLibW); - RegCloseKey(subKey); - subKey = NULL; - RegDeleteKeyW(HKEY_CLASSES_ROOT, subKeyName); + BOOL is_wow64; + REGSAM opposite = (sizeof(void*) == 8 ? KEY_WOW64_32KEY : KEY_WOW64_64KEY); + + TLB_unregister_interface(&typeAttr->guid, 0); + + /* unregister TLBs into the opposite registry view, too */ + if(opposite == KEY_WOW64_32KEY || + (IsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64)) { + TLB_unregister_interface(&typeAttr->guid, opposite); + } } enddeleteloop: @@ -1014,7 +1033,6 @@ end: SysFreeString(tlibPath); if (typeLib) ITypeLib_Release(typeLib); - if (subKey) RegCloseKey(subKey); if (key) RegCloseKey(key); return result; } @@ -1571,61 +1589,6 @@ } } -static void dump_Variant(const VARIANT * pvar) -{ - SYSTEMTIME st; - - TRACE("%p->{%s%s", pvar, debugstr_VT(pvar), debugstr_VF(pvar)); - - if (pvar) - { - if (V_ISBYREF(pvar) || V_TYPE(pvar) == VT_UNKNOWN || - V_TYPE(pvar) == VT_DISPATCH || V_TYPE(pvar) == VT_RECORD) - { - TRACE(",%p", V_BYREF(pvar)); - } - else if (V_ISARRAY(pvar) || V_ISVECTOR(pvar)) - { - TRACE(",%p", V_ARRAY(pvar)); - } - else switch (V_TYPE(pvar)) - { - case VT_I1: TRACE(",%d", V_I1(pvar)); break; - case VT_UI1: TRACE(",%d", V_UI1(pvar)); break; - case VT_I2: TRACE(",%d", V_I2(pvar)); break; - case VT_UI2: TRACE(",%d", V_UI2(pvar)); break; - case VT_INT: - case VT_I4: TRACE(",%d", V_I4(pvar)); break; - case VT_UINT: - case VT_UI4: TRACE(",%d", V_UI4(pvar)); break; - case VT_I8: TRACE(",0x%08x,0x%08x", (ULONG)(V_I8(pvar) >> 32), - (ULONG)(V_I8(pvar) & 0xffffffff)); break; - case VT_UI8: TRACE(",0x%08x,0x%08x", (ULONG)(V_UI8(pvar) >> 32), - (ULONG)(V_UI8(pvar) & 0xffffffff)); break; - case VT_R4: TRACE(",%3.3e", V_R4(pvar)); break; - case VT_R8: TRACE(",%3.3e", V_R8(pvar)); break; - case VT_BOOL: TRACE(",%s", V_BOOL(pvar) ? "TRUE" : "FALSE"); break; - case VT_BSTR: TRACE(",%s", debugstr_w(V_BSTR(pvar))); break; - case VT_CY: TRACE(",0x%08x,0x%08x", V_CY(pvar).s.Hi, - V_CY(pvar).s.Lo); break; - case VT_DATE: - if(!VariantTimeToSystemTime(V_DATE(pvar), &st)) - TRACE(",<invalid>"); - else - TRACE(",%04d/%02d/%02d %02d:%02d:%02d", st.wYear, st.wMonth, st.wDay, - st.wHour, st.wMinute, st.wSecond); - break; - case VT_ERROR: - case VT_VOID: - case VT_USERDEFINED: - case VT_EMPTY: - case VT_NULL: break; - default: TRACE(",?"); break; - } - } - TRACE("}\n"); -} - static void dump_DispParms(const DISPPARAMS * pdp) { unsigned int index; @@ -1643,7 +1606,7 @@ { TRACE("args:\n"); for (index = 0; index < pdp->cArgs; index++) - dump_Variant( &pdp->rgvarg[index] ); + TRACE(" [%d] %s\n", index, debugstr_variant(pdp->rgvarg+index)); } } @@ -6832,8 +6795,7 @@ args[argspos++] = V_UI4(arg); break; } - TRACE("arg %u: type %d\n",i,prgvt[i]); - dump_Variant(arg); + TRACE("arg %u: type %s %s\n", i, debugstr_vt(prgvt[i]), debugstr_variant(arg)); } switch (vtReturn) @@ -6873,7 +6835,7 @@ return DISP_E_BADCALLEE; } if (vtReturn != VT_VARIANT) V_VT(pvargResult) = vtReturn; - TRACE("retval: "); dump_Variant(pvargResult); + TRACE("retval: %s\n", debugstr_variant(pvargResult)); return S_OK; #elif defined(__x86_64__) @@ -6922,8 +6884,7 @@ args[argspos++] = V_UI8(arg); break; } - TRACE("arg %u: type %d\n",i,prgvt[i]); - dump_Variant(arg); + TRACE("arg %u: type %s %s\n", i, debugstr_vt(prgvt[i]), debugstr_variant(arg)); } switch (vtReturn) @@ -6950,7 +6911,7 @@ } heap_free( args ); if (vtReturn != VT_VARIANT) V_VT(pvargResult) = vtReturn; - TRACE("retval: "); dump_Variant(pvargResult); + TRACE("retval: %s\n", debugstr_variant(pvargResult)); return S_OK; #else @@ -7145,7 +7106,7 @@ } else if (src_arg) { - dump_Variant(src_arg); + TRACE("%s\n", debugstr_variant(src_arg)); if(rgvt[i]!=V_VT(src_arg)) { @@ -7222,9 +7183,8 @@ if (FAILED(hres)) { - ERR("failed to convert param %d to %s%s from %s%s\n", i, - debugstr_vt(rgvt[i]), debugstr_vf(rgvt[i]), - debugstr_VT(src_arg), debugstr_VF(src_arg)); + ERR("failed to convert param %d to %s from %s\n", i, + debugstr_vt(rgvt[i]), debugstr_variant(src_arg)); break; } prgpvarg[i] = &rgvarg[i]; @@ -7316,11 +7276,7 @@ continue; else if (wParamFlags & PARAMFLAG_FRETVAL) { - if (TRACE_ON(ole)) - { - TRACE("[retval] value: "); - dump_Variant(prgpvarg[i]); - } + TRACE("[retval] value: %s\n", debugstr_variant(prgpvarg[i])); if (pVarResult) { @@ -7409,8 +7365,7 @@ } if (V_VT(&varresult) != VT_ERROR) { - TRACE("varresult value: "); - dump_Variant(&varresult); + TRACE("varresult value: %s\n", debugstr_variant(&varresult)); if (pVarResult) { Modified: trunk/reactos/dll/win32/oleaut32/varformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/varform… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/varformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/varformat.c [iso-8859-1] Fri Oct 3 17:10:15 2014 @@ -1187,9 +1187,8 @@ const BYTE* pToken = NULL; HRESULT hRes = S_OK; - TRACE("(%p->(%s%s),%s,%p,0x%08x,%p,0x%08x)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), debugstr_w(lpszFormat), rgbTok, dwFlags, pbstrOut, - lcid); + TRACE("(%s,%s,%p,0x%08x,%p,0x%08x)\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat), + rgbTok, dwFlags, pbstrOut, lcid); V_VT(&vString) = VT_EMPTY; V_VT(&vBool) = VT_BOOL; @@ -1598,9 +1597,8 @@ const BYTE* pToken = NULL; HRESULT hRes; - TRACE("(%p->(%s%s),%s,%p,0x%08x,%p,0x%08x)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), debugstr_w(lpszFormat), rgbTok, dwFlags, pbstrOut, - lcid); + TRACE("(%s,%s,%p,0x%08x,%p,0x%08x)\n", debugstr_variant(pVarIn), + debugstr_w(lpszFormat), rgbTok, dwFlags, pbstrOut, lcid); V_VT(&vDate) = VT_EMPTY; @@ -1940,9 +1938,8 @@ BOOL bUpper = FALSE; HRESULT hRes = S_OK; - TRACE("(%p->(%s%s),%s,%p,0x%08x,%p,0x%08x)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), debugstr_w(lpszFormat), rgbTok, dwFlags, pbstrOut, - lcid); + TRACE("%s,%s,%p,0x%08x,%p,0x%08x)\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat), + rgbTok, dwFlags, pbstrOut, lcid); V_VT(&vStr) = VT_EMPTY; @@ -2154,9 +2151,8 @@ BYTE buff[256]; HRESULT hres; - TRACE("(%p->(%s%s),%s,%d,%d,0x%08x,%p)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), debugstr_w(lpszFormat), nFirstDay, nFirstWeek, - dwFlags, pbstrOut); + TRACE("(%s,%s,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat), + nFirstDay, nFirstWeek, dwFlags, pbstrOut); if (!pbstrOut) return E_INVALIDARG; @@ -2205,8 +2201,7 @@ static WCHAR szEmpty[] = { '\0' }; const BYTE* lpFmt = NULL; - TRACE("(%p->(%s%s),%d,0x%08x,%p)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), nFormat, dwFlags, pbstrOut); + TRACE("%s,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nFormat, dwFlags, pbstrOut); if (!pVarIn || !pbstrOut || nFormat < 0 || nFormat > 4) return E_INVALIDARG; @@ -2258,8 +2253,8 @@ HRESULT hRet; VARIANT vStr; - TRACE("(%p->(%s%s),%d,%d,%d,%d,0x%08x,%p)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), nDigits, nLeading, nParens, nGrouping, dwFlags, pbstrOut); + TRACE("(%s,%d,%d,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nDigits, nLeading, + nParens, nGrouping, dwFlags, pbstrOut); if (!pVarIn || !pbstrOut || nDigits > 9) return E_INVALIDARG; @@ -2369,9 +2364,8 @@ HRESULT hRet; VARIANT vDbl; - TRACE("(%p->(%s%s),%d,%d,%d,%d,0x%08x,%p)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), nDigits, nLeading, nParens, nGrouping, - dwFlags, pbstrOut); + TRACE("(%s,%d,%d,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nDigits, nLeading, + nParens, nGrouping, dwFlags, pbstrOut); if (!pVarIn || !pbstrOut || nDigits > 9) return E_INVALIDARG; @@ -2443,8 +2437,8 @@ HRESULT hRet; VARIANT vStr; - TRACE("(%p->(%s%s),%d,%d,%d,%d,0x%08x,%p)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), nDigits, nLeading, nParens, nGrouping, dwFlags, pbstrOut); + TRACE("(%s,%d,%d,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nDigits, nLeading, + nParens, nGrouping, dwFlags, pbstrOut); if (!pVarIn || !pbstrOut || nDigits > 9) return E_INVALIDARG; Modified: trunk/reactos/dll/win32/oleaut32/variant.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/variant… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/variant.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/variant.c [iso-8859-1] Fri Oct 3 17:10:15 2014 @@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(variant); -const char * const wine_vtypes[VT_CLSID+1] = +static const char * const variant_types[] = { "VT_EMPTY","VT_NULL","VT_I2","VT_I4","VT_R4","VT_R8","VT_CY","VT_DATE", "VT_BSTR","VT_DISPATCH","VT_ERROR","VT_BOOL","VT_VARIANT","VT_UNKNOWN", @@ -39,10 +39,11 @@ "VT_RECORD","VT_INT_PTR","VT_UINT_PTR","39","40","41","42","43","44","45", "46","47","48","49","50","51","52","53","54","55","56","57","58","59","60", "61","62","63","VT_FILETIME","VT_BLOB","VT_STREAM","VT_STORAGE", - "VT_STREAMED_OBJECT","VT_STORED_OBJECT","VT_BLOB_OBJECT","VT_CF","VT_CLSID" + "VT_STREAMED_OBJECT","VT_STORED_OBJECT","VT_BLOB_OBJECT","VT_CF","VT_CLSID", + "VT_VERSIONED_STREAM" }; -const char * const wine_vflags[16] = +static const char * const variant_flags[16] = { "", "|VT_VECTOR", @@ -52,14 +53,14 @@ "|VT_VECTOR|VT_ARRAY", "|VT_ARRAY|VT_BYREF", "|VT_VECTOR|VT_ARRAY|VT_BYREF", - "|VT_HARDTYPE", - "|VT_VECTOR|VT_HARDTYPE", - "|VT_ARRAY|VT_HARDTYPE", - "|VT_VECTOR|VT_ARRAY|VT_HARDTYPE", - "|VT_BYREF|VT_HARDTYPE", - "|VT_VECTOR|VT_ARRAY|VT_HARDTYPE", - "|VT_ARRAY|VT_BYREF|VT_HARDTYPE", - "|VT_VECTOR|VT_ARRAY|VT_BYREF|VT_HARDTYPE", + "|VT_RESERVED", + "|VT_VECTOR|VT_RESERVED", + "|VT_ARRAY|VT_RESERVED", + "|VT_VECTOR|VT_ARRAY|VT_RESERVED", + "|VT_BYREF|VT_RESERVED", + "|VT_VECTOR|VT_ARRAY|VT_RESERVED", + "|VT_ARRAY|VT_BYREF|VT_RESERVED", + "|VT_VECTOR|VT_ARRAY|VT_BYREF|VT_RESERVED", }; /* Convert a variant from one type to another */ @@ -70,9 +71,8 @@ VARTYPE vtFrom = V_TYPE(ps); DWORD dwFlags = 0; - TRACE("(%p->(%s%s),0x%08x,0x%04x,%p->(%s%s),%s%s)\n", pd, debugstr_VT(pd), - debugstr_VF(pd), lcid, wFlags, ps, debugstr_VT(ps), debugstr_VF(ps), - debugstr_vt(vt), debugstr_vf(vt)); + TRACE("(%s,0x%08x,0x%04x,%s,%s)\n", debugstr_variant(pd), lcid, wFlags, + debugstr_variant(ps), debugstr_vt(vt)); if (vt == VT_BSTR || vtFrom == VT_BSTR) { @@ -567,7 +567,7 @@ { HRESULT hres; - TRACE("(%p->(%s%s))\n", pVarg, debugstr_VT(pVarg), debugstr_VF(pVarg)); + TRACE("(%s)\n", debugstr_variant(pVarg)); hres = VARIANT_ValidateType(V_VT(pVarg)); if (FAILED(hres)) @@ -639,7 +639,7 @@ { HRESULT hres; - TRACE("(%p->(%s%s))\n", pVarg, debugstr_VT(pVarg), debugstr_VF(pVarg)); + TRACE("(%s)\n", debugstr_variant(pVarg)); hres = VARIANT_ValidateType(V_VT(pVarg)); @@ -739,9 +739,7 @@ { HRESULT hres = S_OK; - TRACE("(%p->(%s%s),%p->(%s%s))\n", pvargDest, debugstr_VT(pvargDest), - debugstr_VF(pvargDest), pvargSrc, debugstr_VT(pvargSrc), - debugstr_VF(pvargSrc)); + TRACE("(%s,%s)\n", debugstr_variant(pvargDest), debugstr_variant(pvargSrc)); if (V_TYPE(pvargSrc) == VT_CLSID || /* VT_CLSID is a special case */ FAILED(VARIANT_ValidateType(V_VT(pvargSrc)))) @@ -804,7 +802,7 @@ case VT_CY: return sizeof(CY); case VT_ERROR: return sizeof(SCODE); } - TRACE("Shouldn't be called for vt %s%s!\n", debugstr_VT(pv), debugstr_VF(pv)); + TRACE("Shouldn't be called for variant %s!\n", debugstr_variant(pv)); return 0; } @@ -842,9 +840,7 @@ VARTYPE vt; HRESULT hres = S_OK; - TRACE("(%p->(%s%s),%p->(%s%s))\n", pvargDest, debugstr_VT(pvargDest), - debugstr_VF(pvargDest), pvargSrc, debugstr_VT(pvargSrc), - debugstr_VF(pvargSrc)); + TRACE("(%s,%s)\n", debugstr_variant(pvargDest), debugstr_variant(pvargSrc)); if (!V_ISBYREF(pvargSrc)) return VariantCopy(pvargDest, pvargSrc); @@ -930,8 +926,7 @@ if (pSrc != pvargSrc) VariantClear(pSrc); - TRACE("returning 0x%08x, %p->(%s%s)\n", hres, pvargDest, - debugstr_VT(pvargDest), debugstr_VF(pvargDest)); + TRACE("returning 0x%08x, %s\n", hres, debugstr_variant(pvargDest)); return hres; } @@ -985,10 +980,8 @@ { HRESULT res = S_OK; - TRACE("(%p->(%s%s),%p->(%s%s),0x%08x,0x%04x,%s%s)\n", pvargDest, - debugstr_VT(pvargDest), debugstr_VF(pvargDest), pvargSrc, - debugstr_VT(pvargSrc), debugstr_VF(pvargSrc), lcid, wFlags, - debugstr_vt(vt), debugstr_vf(vt)); + TRACE("(%s,%s,0x%08x,0x%04x,%s)\n", debugstr_variant(pvargDest), + debugstr_variant(pvargSrc), lcid, wFlags, debugstr_vt(vt)); if (vt == VT_CLSID) res = DISP_E_BADVARTYPE; @@ -1026,7 +1019,7 @@ if (SUCCEEDED(res)) { V_VT(&vTmp) = vt; - VariantCopy(pvargDest, &vTmp); + res = VariantCopy(pvargDest, &vTmp); } VariantClear(&vTmp); VariantClear(&vSrcDeref); @@ -1036,8 +1029,7 @@ } } - TRACE("returning 0x%08x, %p->(%s%s)\n", res, pvargDest, - debugstr_VT(pvargDest), debugstr_VF(pvargDest)); + TRACE("returning 0x%08x, %s\n", res, debugstr_variant(pvargDest)); return res; } @@ -1343,7 +1335,7 @@ HRESULT WINAPI VarDateFromUdateEx(UDATE *pUdateIn, LCID lcid, ULONG dwFlags, DATE *pDateOut) { UDATE ud; - double dateVal, dateSign; + double dateVal = 0; TRACE("(%p->%d/%d/%d %d:%d:%d:%d %d %d,0x%08x,0x%08x,%p)\n", pUdateIn, pUdateIn->st.wMonth, pUdateIn->st.wDay, pUdateIn->st.wYear, @@ -1353,6 +1345,8 @@ if (lcid != MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT)) FIXME("lcid possibly not handled, treating as en-us\n"); + if (dwFlags & ~(VAR_TIMEVALUEONLY|VAR_DATEVALUEONLY)) + FIXME("unsupported flags: %x\n", dwFlags); ud = *pUdateIn; @@ -1363,15 +1357,18 @@ return E_INVALIDARG; /* Date */ - dateVal = VARIANT_DateFromJulian(VARIANT_JulianFromDMY(ud.st.wYear, ud.st.wMonth, ud.st.wDay)); - - /* Sign */ - dateSign = (dateVal < 0.0) ? -1.0 : 1.0; - - /* Time */ - dateVal += ud.st.wHour / 24.0 * dateSign; - dateVal += ud.st.wMinute / 1440.0 * dateSign; - dateVal += ud.st.wSecond / 86400.0 * dateSign; + if (!(dwFlags & VAR_TIMEVALUEONLY)) + dateVal = VARIANT_DateFromJulian(VARIANT_JulianFromDMY(ud.st.wYear, ud.st.wMonth, ud.st.wDay)); + + if ((dwFlags & VAR_TIMEVALUEONLY) || !(dwFlags & VAR_DATEVALUEONLY)) + { + double dateSign = (dateVal < 0.0) ? -1.0 : 1.0; + + /* Time */ + dateVal += ud.st.wHour / 24.0 * dateSign; + dateVal += ud.st.wMinute / 1440.0 * dateSign; + dateVal += ud.st.wSecond / 86400.0 * dateSign; + } TRACE("Returning %g\n", dateVal); *pDateOut = dateVal; @@ -2517,8 +2514,7 @@ leftvt = V_VT(left); rightvt = V_VT(right); - TRACE("(%p->(%s%s),%p->(%s%s),%p)\n", left, debugstr_VT(left), - debugstr_VF(left), right, debugstr_VT(right), debugstr_VF(right), out); + TRACE("%s,%s,%p)\n", debugstr_variant(left), debugstr_variant(right), out); if (!str_true[0]) { VARIANT_GetLocalisedText(LOCALE_USER_DEFAULT, IDS_FALSE, str_false); @@ -2761,8 +2757,7 @@ DWORD xmask; HRESULT rc; - TRACE("(%p->(%s%s),%p->(%s%s),0x%08x,0x%08x)\n", left, debugstr_VT(left), - debugstr_VF(left), right, debugstr_VT(right), debugstr_VF(right), lcid, flags); + TRACE("(%s,%s,0x%08x,0x%08x)\n", debugstr_variant(left), debugstr_variant(right), lcid, flags); lvt = V_VT(left) & VT_TYPEMASK; rvt = V_VT(right) & VT_TYPEMASK; @@ -2966,8 +2961,7 @@ VariantInit(&tempLeft); VariantInit(&tempRight); - TRACE("(%p->(%s%s),%p->(%s%s),%p)\n", left, debugstr_VT(left), - debugstr_VF(left), right, debugstr_VT(right), debugstr_VF(right), result); + TRACE("(%s,%s,%p)\n", debugstr_variant(left), debugstr_variant(right), result); /* Handle VT_DISPATCH by storing and taking address of returned value */ if ((V_VT(left) & VT_TYPEMASK) == VT_DISPATCH) @@ -3012,7 +3006,6 @@ else if (leftvt == VT_I4 || rightvt == VT_I4 || leftvt == VT_UINT || rightvt == VT_UINT || leftvt == VT_INT || rightvt == VT_INT || - leftvt == VT_UINT || rightvt == VT_UINT || leftvt == VT_R4 || rightvt == VT_R4 || leftvt == VT_R8 || rightvt == VT_R8 || leftvt == VT_CY || rightvt == VT_CY || @@ -3221,9 +3214,7 @@ vt_ERROR, vt_ERROR, vt_UI1, vt_ERROR, vt_ERROR, vt_I8 }; - TRACE("(%p->(%s%s),%p->(%s%s),%p)\n", left, debugstr_VT(left), - debugstr_VF(left), right, debugstr_VT(right), debugstr_VF(right), - result); + TRACE("(%s,%s,%p)\n", debugstr_variant(left), debugstr_variant(right), result); VariantInit(&lv); VariantInit(&rv); @@ -3377,7 +3368,7 @@ VariantClear(&tv); VariantClear(&tempLeft); VariantClear(&tempRight); - TRACE("returning 0x%8x (variant type %s)\n", hres, debugstr_VT(result)); + TRACE("returning 0x%8x %s\n", hres, debugstr_variant(result)); return hres; } @@ -3434,9 +3425,7 @@ vt_ERROR, vt_ERROR, vt_UI1, vt_ERROR, vt_ERROR, vt_I8 }; - TRACE("(%p->(%s%s),%p->(%s%s),%p)\n", left, debugstr_VT(left), - debugstr_VF(left), right, debugstr_VT(right), debugstr_VF(right), - result); + TRACE("(%s,%s,%p)\n", debugstr_variant(left), debugstr_variant(right), result); VariantInit(&lv); VariantInit(&rv); @@ -3568,7 +3557,7 @@ VariantClear(&tv); VariantClear(&tempLeft); VariantClear(&tempRight); - TRACE("returning 0x%8x (variant type %s)\n", hres, debugstr_VT(result)); + TRACE("returning 0x%8x %s\n", hres, debugstr_variant(result)); return hres; } @@ -3600,8 +3589,7 @@ VariantInit(&lv); VariantInit(&rv); - TRACE("(%p->(%s%s),%p->(%s%s),%p)\n", left, debugstr_VT(left), - debugstr_VF(left), right, debugstr_VT(right), debugstr_VF(right), result); + TRACE("(%s,%s,%p)\n", debugstr_variant(left), debugstr_variant(right), result); /* Handle VT_DISPATCH by storing and taking address of returned value */ if ((V_VT(left) & VT_TYPEMASK) == VT_DISPATCH) @@ -3731,7 +3719,7 @@ VariantClear(&rv); VariantClear(&tempLeft); VariantClear(&tempRight); - TRACE("returning 0x%8x (variant type %s)\n", hres, debugstr_VT(result)); + TRACE("returning 0x%8x %s\n", hres, debugstr_variant(result)); return hres; } @@ -3763,8 +3751,7 @@ VariantInit(&tempLeft); VariantInit(&tempRight); - TRACE("(%p->(%s%s),%p->(%s%s),%p)\n", left, debugstr_VT(left), - debugstr_VF(left), right, debugstr_VT(right), debugstr_VF(right), result); + TRACE("(%s,%s,%p)\n", debugstr_variant(left), debugstr_variant(right), result); if ((V_VT(left) & VT_TYPEMASK) == VT_DISPATCH && (V_VT(left)&(~VT_TYPEMASK)) == 0 && @@ -3998,7 +3985,7 @@ VariantClear(&rv); VariantClear(&tempLeft); VariantClear(&tempRight); - TRACE("returning 0x%8x (variant type %s)\n", hres, debugstr_VT(result)); + TRACE("returning 0x%8x %s\n", hres, debugstr_variant(result)); return hres; } @@ -4034,9 +4021,7 @@ VariantInit(&varRight); VariantInit(&varStr); - TRACE("(%p->(%s%s),%p->(%s%s),%p)\n", pVarLeft, debugstr_VT(pVarLeft), - debugstr_VF(pVarLeft), pVarRight, debugstr_VT(pVarRight), - debugstr_VF(pVarRight), pVarOut); + TRACE("(%s,%s,%p)\n", debugstr_variant(pVarLeft), debugstr_variant(pVarRight), pVarOut); /* Handle VT_DISPATCH by storing and taking address of returned value */ if ((V_VT(pVarLeft) & VT_TYPEMASK) == VT_DISPATCH) @@ -4343,8 +4328,7 @@ VariantInit(&temp); - TRACE("(%p->(%s%s),%p)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), pVarOut); + TRACE("(%s,%p)\n", debugstr_variant(pVarIn), pVarOut); /* Handle VT_DISPATCH by storing and taking address of returned value */ if ((V_VT(pVarIn) & VT_TYPEMASK) == VT_DISPATCH && ((V_VT(pVarIn) & ~VT_TYPEMASK) == 0)) @@ -4447,8 +4431,7 @@ VariantInit(&temp); - TRACE("(%p->(%s%s),%p)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), pVarOut); + TRACE("(%s,%p)\n", debugstr_variant(pVarIn), pVarOut); /* Handle VT_DISPATCH by storing and taking address of returned value */ if ((V_VT(pVarIn) & VT_TYPEMASK) == VT_DISPATCH && ((V_VT(pVarIn) & ~VT_TYPEMASK) == 0)) @@ -4554,8 +4537,7 @@ VariantInit(&temp); - TRACE("(%p->(%s%s),%p)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), pVarOut); + TRACE("(%s,%p)\n", debugstr_variant(pVarIn), pVarOut); /* Handle VT_DISPATCH by storing and taking address of returned value */ if ((V_VT(pVarIn) & VT_TYPEMASK) == VT_DISPATCH && ((V_VT(pVarIn) & ~VT_TYPEMASK) == 0)) @@ -4629,9 +4611,7 @@ double d; HRESULT hRet; - TRACE("(%p->(%s%s),%p->(%s%s),%p)\n", pVarLeft, debugstr_VT(pVarLeft), - debugstr_VF(pVarLeft), pVarRight, debugstr_VT(pVarRight), - debugstr_VF(pVarRight), pVarOut); + TRACE("(%s,%s,%p)\n", debugstr_variant(pVarLeft), debugstr_variant(pVarRight), pVarOut); if (V_EXTRA_TYPE(pVarLeft) || V_EXTRA_TYPE(pVarRight) || V_VT(pVarLeft) > VT_UINT || V_VT(pVarRight) > VT_UINT || @@ -4808,9 +4788,7 @@ { HRESULT hRet; - TRACE("(%p->(%s%s),%p->(%s%s),%p)\n", pVarLeft, debugstr_VT(pVarLeft), - debugstr_VF(pVarLeft), pVarRight, debugstr_VT(pVarRight), - debugstr_VF(pVarRight), pVarOut); + TRACE("(%s,%s,%p)\n", debugstr_variant(pVarLeft), debugstr_variant(pVarRight), pVarOut); hRet = VarXor(pVarLeft, pVarRight, pVarOut); if (SUCCEEDED(hRet)) @@ -4867,8 +4845,7 @@ VariantInit(&temp); - TRACE("(%p->(%s%s),%p)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), pVarOut); + TRACE("(%s,%p)\n", debugstr_variant(pVarIn), pVarOut); /* Handle VT_DISPATCH by storing and taking address of returned value */ if ((V_VT(pVarIn) & VT_TYPEMASK) == VT_DISPATCH && ((V_VT(pVarIn) & ~VT_TYPEMASK) == 0)) @@ -4997,8 +4974,7 @@ VariantInit(&temp); - TRACE("(%p->(%s%s),%p)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), pVarOut); + TRACE("(%s,%p)\n", debugstr_variant(pVarIn), pVarOut); /* Handle VT_DISPATCH by storing and taking address of returned value */ if ((V_VT(pVarIn) & VT_TYPEMASK) == VT_DISPATCH && ((V_VT(pVarIn) & ~VT_TYPEMASK) == 0)) @@ -5122,7 +5098,7 @@ VariantInit(&temp); - TRACE("(%p->(%s%s),%d)\n", pVarIn, debugstr_VT(pVarIn), debugstr_VF(pVarIn), deci); + TRACE("(%s,%d)\n", debugstr_variant(pVarIn), deci); /* Handle VT_DISPATCH by storing and taking address of returned value */ if ((V_VT(pVarIn) & VT_TYPEMASK) == VT_DISPATCH && ((V_VT(pVarIn) & ~VT_TYPEMASK) == 0)) @@ -5227,10 +5203,7 @@ V_VT(pVarOut) = VT_EMPTY; VariantClear(&temp); - TRACE("returning 0x%08x (%s%s),%f\n", hRet, debugstr_VT(pVarOut), - debugstr_VF(pVarOut), (V_VT(pVarOut) == VT_R4) ? V_R4(pVarOut) : - (V_VT(pVarOut) == VT_R8) ? V_R8(pVarOut) : 0); - + TRACE("returning 0x%08x %s\n", hRet, debugstr_variant(pVarOut)); return hRet; } @@ -5260,8 +5233,7 @@ VARIANT lv,rv; VARIANT tempLeft, tempRight; - TRACE("(%p->(%s%s),%p->(%s%s),%p)\n", left, debugstr_VT(left), - debugstr_VF(left), right, debugstr_VT(right), debugstr_VF(right), result); + TRACE("(%s,%s,%p)\n", debugstr_variant(left), debugstr_variant(right), result); VariantInit(&lv); VariantInit(&rv); @@ -5419,8 +5391,7 @@ VariantInit(&lv); VariantInit(&rv); - TRACE("(%p->(%s%s),%p->(%s%s),%p)\n", left, debugstr_VT(left), - debugstr_VF(left), right, debugstr_VT(right), debugstr_VF(right), result); + TRACE("(%s,%s,%p)\n", debugstr_variant(left), debugstr_variant(right), result); /* Handle VT_DISPATCH by storing and taking address of returned value */ if ((V_VT(left) & VT_TYPEMASK) == VT_DISPATCH) @@ -5658,8 +5629,7 @@ VARTYPE rightExtraFlags,leftExtraFlags,ExtraFlags; VARIANT tempLeft, tempRight; - TRACE("(%p->(%s%s),%p->(%s%s),%p)\n", left, debugstr_VT(left), debugstr_VF(left), - right, debugstr_VT(right), debugstr_VF(right), result); + TRACE("(%s,%s,%p)\n", debugstr_variant(left), debugstr_variant(right), result); VariantInit(&dl); VariantInit(&dr); @@ -5779,8 +5749,7 @@ VariantInit(&tempLeft); VariantInit(&tempRight); - TRACE("(%p->(%s%s),%p->(%s%s),%p)\n", left, debugstr_VT(left), - debugstr_VF(left), right, debugstr_VT(right), debugstr_VF(right), result); + TRACE("(%s,%s,%p)\n", debugstr_variant(left), debugstr_variant(right), result); /* Handle VT_DISPATCH by storing and taking address of returned value */ if ((V_VT(left) & VT_TYPEMASK) == VT_DISPATCH) Modified: trunk/reactos/dll/win32/oleaut32/variant.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/variant… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/variant.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/variant.h [iso-8859-1] Fri Oct 3 17:10:15 2014 @@ -44,15 +44,6 @@ #define VTBIT_UNKNOWN (1 << VT_UNKNOWN) #define VTBIT_VARIANT (1 << VT_VARIANT) #define VTBIT_15 (1 << 15) /* no variant type with this number */ - -extern const char * const wine_vtypes[] DECLSPEC_HIDDEN; -#define debugstr_vt(v) (((v)&VT_TYPEMASK) <= VT_CLSID ? wine_vtypes[((v)&VT_TYPEMASK)] : \ - ((v)&VT_TYPEMASK) == VT_BSTR_BLOB ? "VT_BSTR_BLOB": "Invalid") -#define debugstr_VT(v) (!(v) ? "(null)" : debugstr_vt(V_TYPE((v)))) - -extern const char * const wine_vflags[] DECLSPEC_HIDDEN; -#define debugstr_vf(v) (wine_vflags[((v)&VT_EXTRA_TYPE)>>12]) -#define debugstr_VF(v) (!(v) ? "(null)" : debugstr_vf(V_EXTRA_TYPE(v))) /* Size constraints */ #define I1_MAX 0x7f Modified: trunk/reactos/dll/win32/oleaut32/vartype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/vartype… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/vartype.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/vartype.c [iso-8859-1] Fri Oct 3 17:10:15 2014 @@ -4154,6 +4154,8 @@ static HRESULT VARIANT_DI_FromR8(double source, VARIANT_DI * dest); static void VARIANT_DIFromDec(const DECIMAL * from, VARIANT_DI * to); static void VARIANT_DecFromDI(const VARIANT_DI * from, DECIMAL * to); +static unsigned char VARIANT_int_divbychar(DWORD * p, unsigned int n, unsigned char divisor); +static BOOL VARIANT_int_iszero(const DWORD * p, unsigned int n); /************************************************************************ * VarDecFromR4 (OLEAUT32.193) @@ -4429,12 +4431,13 @@ /* Make two DECIMALS the same scale; used by math functions below */ static HRESULT VARIANT_DecScale(const DECIMAL** ppDecLeft, const DECIMAL** ppDecRight, - DECIMAL* pDecOut) + DECIMAL pDecOut[2]) { static DECIMAL scaleFactor; + unsigned char remainder; DECIMAL decTemp; + VARIANT_DI di; int scaleAmount, i; - HRESULT hRet = S_OK; if (DEC_SIGN(*ppDecLeft) & ~DECIMAL_NEG || DEC_SIGN(*ppDecRight) & ~DECIMAL_NEG) return E_INVALIDARG; @@ -4449,27 +4452,62 @@ if (scaleAmount > 0) { decTemp = *(*ppDecRight); /* Left is bigger - scale the right hand side */ - *ppDecRight = pDecOut; + *ppDecRight = &pDecOut[0]; } else { decTemp = *(*ppDecLeft); /* Right is bigger - scale the left hand side */ - *ppDecLeft = pDecOut; - i = scaleAmount = -scaleAmount; + *ppDecLeft = &pDecOut[0]; + i = -scaleAmount; } - if (DEC_SCALE(&decTemp) + scaleAmount > DEC_MAX_SCALE) - return DISP_E_OVERFLOW; /* Can't scale up */ - - /* Multiply up the value to be scaled by the correct amount */ - while (SUCCEEDED(hRet) && i--) + /* Multiply up the value to be scaled by the correct amount (if possible) */ + while (i > 0 && SUCCEEDED(VarDecMul(&decTemp, &scaleFactor, &pDecOut[0]))) { - /* Note we are multiplying by a value with a scale of 0, so we don't recurse */ - hRet = VarDecMul(&decTemp, &scaleFactor, pDecOut); - decTemp = *pDecOut; + decTemp = pDecOut[0]; + i--; } - DEC_SCALE(pDecOut) += scaleAmount; /* Set the new scale */ - return hRet; + + if (!i) + { + DEC_SCALE(&pDecOut[0]) += (scaleAmount > 0) ? scaleAmount : (-scaleAmount); + return S_OK; /* Same scale */ + } + + /* Scaling further not possible, reduce accuracy of other argument */ + pDecOut[0] = decTemp; + if (scaleAmount > 0) + { + DEC_SCALE(&pDecOut[0]) += scaleAmount - i; + VARIANT_DIFromDec(*ppDecLeft, &di); + *ppDecLeft = &pDecOut[1]; + } + else + { + DEC_SCALE(&pDecOut[0]) += (-scaleAmount) - i; + VARIANT_DIFromDec(*ppDecRight, &di); + *ppDecRight = &pDecOut[1]; + } + + di.scale -= i; + remainder = 0; + while (i-- > 0 && !VARIANT_int_iszero(di.bitsnum, sizeof(di.bitsnum)/sizeof(DWORD))) + { + remainder = VARIANT_int_divbychar(di.bitsnum, sizeof(di.bitsnum)/sizeof(DWORD), 10); + if (remainder > 0) WARN("losing significant digits (remainder %u)...\n", remainder); + } + + /* round up the result - native oleaut32 does this */ + if (remainder >= 5) { + for (remainder = 1, i = 0; i < sizeof(di.bitsnum)/sizeof(DWORD) && remainder; i++) { + ULONGLONG digit = di.bitsnum[i] + 1; + remainder = (digit > 0xFFFFFFFF) ? 1 : 0; + di.bitsnum[i] = digit & 0xFFFFFFFF; + } + } + + VARIANT_DecFromDI(&di, &pDecOut[1]); + return S_OK; } /* Add two unsigned 32 bit values with overflow */ @@ -4544,9 +4582,9 @@ HRESULT WINAPI VarDecAdd(const DECIMAL* pDecLeft, const DECIMAL* pDecRight, DECIMAL* pDecOut) { HRESULT hRet; - DECIMAL scaled; - - hRet = VARIANT_DecScale(&pDecLeft, &pDecRight, &scaled); + DECIMAL scaled[2]; + + hRet = VARIANT_DecScale(&pDecLeft, &pDecRight, scaled); if (SUCCEEDED(hRet)) { 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] Fri Oct 3 17:10:15 2014 @@ -152,7 +152,7 @@ reactos/dll/win32/odbccp32 # Synced to Wine-1.7.17 reactos/dll/win32/ole32 # Synced to Wine-1.7.27 reactos/dll/win32/oleacc # Synced to Wine-1.7.27 -reactos/dll/win32/oleaut32 # Synced to Wine-1.7.17 +reactos/dll/win32/oleaut32 # Synced to Wine-1.7.27 reactos/dll/win32/olecli32 # Synced to Wine-1.7.17 reactos/dll/win32/oledlg # Synced to Wine-1.7.17 reactos/dll/win32/olepro32 # Synced to Wine-1.7.17

1 0

[akhaldi] 64504: [OLEACC_WINETEST] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 03 Oct '14

03 Oct '14

Author: akhaldi Date: Fri Oct 3 16:42:24 2014 New Revision: 64504 URL: http://svn.reactos.org/svn/reactos?rev=64504&view=rev Log: [OLEACC_WINETEST] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/rostests/winetests/oleacc/CMakeLists.txt trunk/rostests/winetests/oleacc/main.c Modified: trunk/rostests/winetests/oleacc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleacc/CMakeLis… ============================================================================== --- trunk/rostests/winetests/oleacc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/oleacc/CMakeLists.txt [iso-8859-1] Fri Oct 3 16:42:24 2014 @@ -1,5 +1,6 @@ add_executable(oleacc_winetest main.c testlist.c) set_module_type(oleacc_winetest win32cui) -add_importlibs(oleacc_winetest oleacc msvcrt kernel32) +target_link_libraries(oleacc_winetest uuid) +add_importlibs(oleacc_winetest oleacc oleaut32 ole32 user32 msvcrt kernel32) add_cd_file(TARGET oleacc_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/oleacc/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleacc/main.c?r… ============================================================================== --- trunk/rostests/winetests/oleacc/main.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleacc/main.c [iso-8859-1] Fri Oct 3 16:42:24 2014 @@ -18,8 +18,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + +#include <stdio.h> #include <oleacc.h> -#include "wine/test.h" + +#include <wine/test.h> + +static HANDLE (WINAPI *pGetProcessHandleFromHwnd)(HWND); + +static BOOL init(void) +{ + HMODULE oleacc = GetModuleHandleA("oleacc.dll"); + + pGetProcessHandleFromHwnd = (void*)GetProcAddress(oleacc, "GetProcessHandleFromHwnd"); + if(!pGetProcessHandleFromHwnd) { + win_skip("GetProcessHandleFromHwnd not available\n"); + return FALSE; + } + + return TRUE; +} static void test_getroletext(void) { @@ -33,9 +52,7 @@ buf[0] = '*'; ret = GetRoleTextA(-1, buf, 2); ok(ret == 0, "GetRoleTextA doesn't return zero on wrong role number, got %d\n", ret); - ok(buf[0] == '*' || - broken(buf[0] == 0), /* Win98 and WinMe */ - "GetRoleTextA modified buffer on wrong role number\n"); + ok(buf[0] == 0, "GetRoleTextA doesn't return NULL char on wrong role number\n"); buf[0] = '*'; ret = GetRoleTextA(-1, buf, 0); ok(ret == 0, "GetRoleTextA doesn't return zero on wrong role number, got %d\n", ret); @@ -46,9 +63,7 @@ bufW[0] = '*'; ret = GetRoleTextW(-1, bufW, 2); ok(ret == 0, "GetRoleTextW doesn't return zero on wrong role number, got %d\n", ret); - ok(bufW[0] == '\0' || - broken(bufW[0] == '*'), /* Win98 and WinMe */ - "GetRoleTextW doesn't return NULL char on wrong role number\n"); + ok(bufW[0] == '\0', "GetRoleTextW doesn't return NULL char on wrong role number\n"); bufW[0] = '*'; ret = GetRoleTextW(-1, bufW, 0); ok(ret == 0, "GetRoleTextW doesn't return zero on wrong role number, got %d\n", ret); @@ -70,17 +85,23 @@ ok(ret > 0, "GetRoleTextW doesn't return length on NULL buffer, got %d\n", ret); /* use a smaller buffer */ + bufW[0] = '*'; + ret = GetRoleTextA(ROLE_SYSTEM_TITLEBAR, buf, 0); + ok(!ret, "GetRoleTextA doesn't return 0, got %d\n", ret); + ok(buf[0] == '*', "GetRoleTextA modified buffer\n"); + buffW = NULL; + ret = GetRoleTextW(ROLE_SYSTEM_TITLEBAR, (WCHAR*)&buffW, 0); + ok(ret, "GetRoleTextW doesn't return length\n"); + ok(buffW != NULL, "GetRoleTextW doesn't modify buffer\n"); buf[0] = '*'; ret = GetRoleTextA(ROLE_SYSTEM_TITLEBAR, buf, 1); ok(ret == 0, "GetRoleTextA returned wrong length\n"); ok(buf[0] == '\0', "GetRoleTextA returned not zero-length buffer\n"); - buf[1] = '*'; + buf[0] = '*'; ret = GetRoleTextA(ROLE_SYSTEM_TITLEBAR, buf, 2); - ok(ret == 1 || - ret == 0, /* Vista and W2K8 */ - "GetRoleTextA returned wrong length, got %d, expected 0 or 1\n", ret); - if (ret == 1) - ok(buf[1] == '\0', "GetRoleTextA returned not zero-length buffer : (%c)\n", buf[1]); + ok(!ret, "GetRoleTextA returned wrong length, got %d, expected 0\n", ret); + ok(!buf[0] || broken(buf[0]!='*') /* WinXP */, + "GetRoleTextA returned not zero-length buffer : (%c)\n", buf[0]); bufW[0] = '*'; ret = GetRoleTextW(ROLE_SYSTEM_TITLEBAR, bufW, 1); @@ -115,11 +136,7 @@ memset(buff2, 0, sizeof(buff2)); ret = GetRoleTextA(role, NULL, 0); - /* Win98 up to W2K miss some of the roles */ - if (role >= ROLE_SYSTEM_SPLITBUTTON) - ok(ret > 0 || broken(ret == 0), "Expected the role %d to be present\n", role); - else - ok(ret > 0, "Expected the role to be present\n"); + ok(ret > 0, "Expected the role to be present\n"); GetRoleTextA(role, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2), @@ -135,7 +152,480 @@ } } +static void test_GetStateText(void) +{ + WCHAR buf[1024], buf2[1024]; + char bufa[1024]; + void *ptr; + UINT ret, ret2; + int i; + + ret2 = GetStateTextW(0, NULL, 1024); + ok(ret2, "GetStateText failed\n"); + + ptr = NULL; + ret = GetStateTextW(0, (WCHAR*)&ptr, 0); + ok(ret == ret2, "got %d, expected %d\n", ret, ret2); + ok(ptr != NULL, "ptr was not changed\n"); + + ret = GetStateTextW(0, buf, 1024); + ok(ret == ret2, "got %d, expected %d\n", ret, ret2); + ok(!memcmp(buf, ptr, ret*sizeof(WCHAR)), "got %s, expected %s\n", + wine_dbgstr_wn(buf, ret), wine_dbgstr_wn(ptr, ret)); + + ret = GetStateTextW(0, buf, 1); + ok(!ret, "got %d, expected 0\n", ret); + ok(!buf[0], "buf[0] = '%c'\n", buf[0]); + + for(i=0; i<31; i++) { + ret = GetStateTextW(1<<i, buf, 1024); + ok(ret, "%d) GetStateText failed\n", i); + } + ret = GetStateTextW(1<<31, buf, 1024); + ok(!ret, "31) GetStateText succeeded: %d\n", ret); + + ret = GetStateTextW(2, buf, 1024); + ok(ret, "GetStateText failed\n"); + ret2 = GetStateTextW(3, buf2, 1024); + ok(ret2, "GetStateText failed\n"); + ok(ret == ret2, "got %d, expected %d\n", ret2, ret); + ok(!memcmp(buf, buf2, ret*sizeof(WCHAR)), + "GetStateText(2,...) returned different data than GetStateText(3,...)\n"); + + ret2 = GetStateTextA(0, NULL, 1024); + ok(ret2, "GetStateText failed\n"); + + ptr = NULL; + ret = GetStateTextA(0, (CHAR*)&ptr, 0); + ok(!ret, "got %d\n", ret); + ok(ptr == NULL, "ptr was changed\n"); + + ret = GetStateTextA(0, NULL, 0); + ok(ret == ret2, "got %d, expected %d\n", ret, ret2); + + ret = GetStateTextA(0, bufa, 1024); + ok(ret == ret2, "got %d, expected %d\n", ret, ret2); + + ret = GetStateTextA(0, bufa, 1); + ok(!ret, "got %d, expected 0\n", ret); + ok(!bufa[0], "bufa[0] = '%c'\n", bufa[0]); + + for(i=0; i<31; i++) { + ret = GetStateTextA(1<<i, bufa, 1024); + ok(ret, "%d) GetStateText failed\n", i); + } + ret = GetStateTextA(1<<31, bufa, 1024); + ok(!ret, "31) GetStateText succeeded: %d\n", ret); +} + +static int Object_ref = 1; +static HRESULT WINAPI Object_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + if(IsEqualIID(riid, &IID_IUnknown)) { + *ppv = iface; + IUnknown_AddRef(iface); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI Object_AddRef(IUnknown *iface) +{ + return InterlockedIncrement(&Object_ref); +} + +static ULONG WINAPI Object_Release(IUnknown *iface) +{ + return InterlockedDecrement(&Object_ref); +} + +static IUnknownVtbl ObjectVtbl = { + Object_QueryInterface, + Object_AddRef, + Object_Release +}; + +static IUnknown Object = {&ObjectVtbl}; + +static void test_LresultFromObject(const char *name) +{ + PROCESS_INFORMATION proc; + STARTUPINFOA startup; + char cmdline[MAX_PATH]; + IUnknown *unk; + HRESULT hres; + LRESULT lres; + + lres = LresultFromObject(NULL, 0, 0); + ok(lres == E_INVALIDARG, "got %lx\n", lres); + + hres = ObjectFromLresult(0, &IID_IUnknown, 0, (void**)&unk); + ok(hres == E_FAIL, "got %x\n", hres); + hres = ObjectFromLresult(0x10000, &IID_IUnknown, 0, (void**)&unk); + ok(hres == E_FAIL, "got %x\n", hres); + + ok(Object_ref == 1, "Object_ref = %d\n", Object_ref); + lres = LresultFromObject(&IID_IUnknown, 0, &Object); + ok(SUCCEEDED(lres), "got %lx\n", lres); + ok(Object_ref > 1, "Object_ref = %d\n", Object_ref); + + hres = ObjectFromLresult(lres, &IID_IUnknown, 0, (void**)&unk); + ok(hres == S_OK, "hres = %x\n", hres); + ok(unk == &Object, "unk != &Object\n"); + IUnknown_Release(unk); + ok(Object_ref == 1, "Object_ref = %d\n", Object_ref); + + lres = LresultFromObject(&IID_IUnknown, 0, &Object); + ok(SUCCEEDED(lres), "got %lx\n", lres); + ok(Object_ref > 1, "Object_ref = %d\n", Object_ref); + + sprintf(cmdline, "\"%s\" main ObjectFromLresult %lx", name, lres); + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &proc); + winetest_wait_child_process(proc.hProcess); + ok(Object_ref == 1, "Object_ref = %d\n", Object_ref); +} + +static LRESULT WINAPI test_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch(msg) { + case WM_GETOBJECT: + if(lparam == OBJID_QUERYCLASSNAMEIDX) { + ok(!wparam, "wparam = %lx\n", wparam); + return 0; + } + + ok(wparam==0xffffffff, "wparam = %lx\n", wparam); + if(lparam == (DWORD)OBJID_CURSOR) + return E_UNEXPECTED; + if(lparam == (DWORD)OBJID_CLIENT) + return LresultFromObject(&IID_IUnknown, wparam, &Object); + if(lparam == (DWORD)OBJID_WINDOW) + return 0; + + ok(0, "unexpected (%ld)\n", lparam); + return 0; + } + + return DefWindowProcA(hwnd, msg, wparam, lparam); +} + +static BOOL register_window_class(void) +{ + WNDCLASSA cls; + + memset(&cls, 0, sizeof(cls)); + cls.lpfnWndProc = test_window_proc; + cls.lpszClassName = "oleacc_test"; + cls.hInstance = GetModuleHandleA(NULL); + + return RegisterClassA(&cls); +} + +static void unregister_window_class(void) +{ + UnregisterClassA("oleacc_test", NULL); +} + +static void test_AccessibleObjectFromWindow(void) +{ + IUnknown *unk; + HRESULT hr; + HWND hwnd; + + hr = AccessibleObjectFromWindow(NULL, OBJID_CURSOR, &IID_IUnknown, NULL); + ok(hr == E_INVALIDARG, "got %x\n", hr); + + hr = AccessibleObjectFromWindow(NULL, OBJID_CURSOR, &IID_IUnknown, (void**)&unk); + todo_wine ok(hr == S_OK, "got %x\n", hr); + if(hr == S_OK) IUnknown_Release(unk); + + hwnd = CreateWindowA("oleacc_test", "test", WS_OVERLAPPEDWINDOW, + 0, 0, 0, 0, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed\n"); + + hr = AccessibleObjectFromWindow(hwnd, OBJID_CURSOR, &IID_IUnknown, (void**)&unk); + ok(hr == E_UNEXPECTED, "got %x\n", hr); + + ok(Object_ref == 1, "Object_ref = %d\n", Object_ref); + hr = AccessibleObjectFromWindow(hwnd, OBJID_CLIENT, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "got %x\n", hr); + ok(Object_ref == 2, "Object_ref = %d\n", Object_ref); + IUnknown_Release(unk); + + DestroyWindow(hwnd); +} + +static void test_GetProcessHandleFromHwnd(void) +{ + HANDLE proc; + HWND hwnd; + + proc = pGetProcessHandleFromHwnd(NULL); + ok(!proc, "proc = %p\n", proc); + + hwnd = CreateWindowA("static", "", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed\n"); + + proc = pGetProcessHandleFromHwnd(hwnd); + ok(proc != NULL, "proc == NULL\n"); + CloseHandle(proc); + + DestroyWindow(hwnd); +} + +static void test_default_client_accessible_object(void) +{ + static const WCHAR testW[] = {'t','e','s','t',' ','t',' ','&','j','u','n','k',0}; + static const WCHAR shortcutW[] = {'A','l','t','+','t',0}; + + IAccessible *acc; + IDispatch *disp; + IOleWindow *ow; + HWND chld, hwnd, hwnd2; + HRESULT hr; + VARIANT vid, v; + BSTR str; + POINT pt; + RECT rect; + LONG l, left, top, width, height; + + hwnd = CreateWindowA("oleacc_test", "test &t &junk", WS_OVERLAPPEDWINDOW, + 0, 0, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed\n"); + chld = CreateWindowA("static", "message", WS_CHILD | WS_VISIBLE, + 0, 0, 50, 50, hwnd, NULL, NULL, NULL); + ok(chld != NULL, "CreateWindow failed\n"); + + hr = CreateStdAccessibleObject(NULL, OBJID_CLIENT, &IID_IAccessible, (void**)&acc); + ok(hr == E_FAIL, "got %x\n", hr); + + hr = CreateStdAccessibleObject(hwnd, OBJID_CLIENT, &IID_IAccessible, (void**)&acc); + ok(hr == S_OK, "got %x\n", hr); + + hr = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void**)&ow); + ok(hr == S_OK, "got %x\n", hr); + hr = IOleWindow_GetWindow(ow, &hwnd2); + ok(hr == S_OK, "got %x\n", hr); + ok(hwnd == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, hwnd); + hr = WindowFromAccessibleObject(acc, &hwnd2); + ok(hr == S_OK, "got %x\n", hr); + ok(hwnd == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, hwnd); + IOleWindow_Release(ow); + + hr = IAccessible_get_accChildCount(acc, &l); + ok(hr == S_OK, "got %x\n", hr); + ok(l == 1, "l = %d\n", l); + + V_VT(&vid) = VT_I4; + V_I4(&vid) = CHILDID_SELF; + hr = IAccessible_get_accName(acc, vid, &str); + ok(hr == S_OK, "got %x\n", hr); + ok(!lstrcmpW(str, testW), "name = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + V_I4(&vid) = 1; + str = (void*)0xdeadbeef; + hr = IAccessible_get_accName(acc, vid, &str); + ok(hr == E_INVALIDARG, "got %x\n", hr); + ok(!str, "str != NULL\n"); + V_I4(&vid) = CHILDID_SELF; + + str = (void*)0xdeadbeef; + hr = IAccessible_get_accValue(acc, vid, &str); + ok(hr == S_FALSE, "got %x\n", hr); + ok(!str, "str != NULL\n"); + + str = (void*)0xdeadbeef; + hr = IAccessible_get_accDescription(acc, vid, &str); + ok(hr == S_FALSE, "got %x\n", hr); + ok(!str, "str != NULL\n"); + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (void*)0xdeadbeef; + hr = IAccessible_get_accRole(acc, vid, &v); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == ROLE_SYSTEM_CLIENT, "V_I4(&v) = %d\n", V_I4(&v)); + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (void*)0xdeadbeef; + hr = IAccessible_get_accState(acc, vid, &v); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == (STATE_SYSTEM_FOCUSABLE|STATE_SYSTEM_INVISIBLE), + "V_I4(&v) = %x\n", V_I4(&v)); + + str = (void*)0xdeadbeef; + hr = IAccessible_get_accHelp(acc, vid, &str); + ok(hr == S_FALSE, "got %x\n", hr); + ok(!str, "str != NULL\n"); + + hr = IAccessible_get_accKeyboardShortcut(acc, vid, &str); + ok(hr == S_OK, "got %x\n", hr); + ok(!lstrcmpW(str, shortcutW), "str = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = (void*)0xdeadbeef; + hr = IAccessible_get_accDefaultAction(acc, vid, &str); + ok(hr == S_FALSE, "got %x\n", hr); + ok(!str, "str != NULL\n"); + + pt.x = pt.y = 60; + ok(ClientToScreen(hwnd, &pt), "ClientToScreen failed\n"); + hr = IAccessible_accHitTest(acc, pt.x, pt.y, &v); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 0, "V_I4(&v) = %d\n", V_I4(&v)); + + pt.x = pt.y = 25; + ok(ClientToScreen(hwnd, &pt), "ClientToScreen failed\n"); + hr = IAccessible_accHitTest(acc, pt.x, pt.y, &v); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 0, "V_I4(&v) = %d\n", V_I4(&v)); + + ShowWindow(hwnd, TRUE); + pt.x = pt.y = 60; + ok(ClientToScreen(hwnd, &pt), "ClientToScreen failed\n"); + hr = IAccessible_accHitTest(acc, pt.x, pt.y, &v); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 0, "V_I4(&v) = %d\n", V_I4(&v)); + + pt.x = pt.y = 25; + ok(ClientToScreen(hwnd, &pt), "ClientToScreen failed\n"); + hr = IAccessible_accHitTest(acc, pt.x, pt.y, &v); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_DISPATCH(&v) != NULL, "V_DISPATCH(&v) = %p\n", V_DISPATCH(&v)); + VariantClear(&v); + + ShowWindow(chld, FALSE); + pt.x = pt.y = 25; + ok(ClientToScreen(hwnd, &pt), "ClientToScreen failed\n"); + hr = IAccessible_accHitTest(acc, pt.x, pt.y, &v); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 0, "V_I4(&v) = %d\n", V_I4(&v)); + + hr = IAccessible_get_accParent(acc, &disp); + ok(hr == S_OK, "got %x\n", hr); + ok(disp != NULL, "disp == NULL\n"); + IDispatch_Release(disp); + + ok(GetClientRect(hwnd, &rect), "GetClientRect failed\n"); + pt.x = rect.left; + pt.y = rect.top; + MapWindowPoints(hwnd, NULL, &pt, 1); + rect.left = pt.x; + rect.top = pt.y; + pt.x = rect.right; + pt.y = rect.bottom; + MapWindowPoints(hwnd, NULL, &pt, 1); + hr = IAccessible_accLocation(acc, &left, &top, &width, &height, vid); + ok(hr == S_OK, "got %x\n", hr); + ok(left == rect.left, "left = %d, expected %d\n", left, rect.left); + ok(top == rect.top, "top = %d, expected %d\n", top, rect.top); + ok(width == pt.x-rect.left, "width = %d, expected %d\n", width, pt.x-rect.left); + ok(height == pt.y-rect.top, "height = %d, expected %d\n", height, pt.y-rect.top); + + DestroyWindow(hwnd); + + hr = IAccessible_get_accChildCount(acc, &l); + ok(hr == S_OK, "got %x\n", hr); + ok(l == 0, "l = %d\n", l); + + hr = IAccessible_get_accName(acc, vid, &str); + ok(hr == E_INVALIDARG, "got %x\n", hr); + + hr = IAccessible_get_accValue(acc, vid, &str); + ok(hr == S_FALSE, "got %x\n", hr); + + hr = IAccessible_get_accRole(acc, vid, &v); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == ROLE_SYSTEM_CLIENT, "V_I4(&v) = %d\n", V_I4(&v)); + + hr = IAccessible_get_accState(acc, vid, &v); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == STATE_SYSTEM_INVISIBLE, "V_I4(&v) = %x\n", V_I4(&v)); + + hr = IAccessible_accHitTest(acc, 200, 200, &v); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 0, "V_I4(&v) = %d\n", V_I4(&v)); + + disp = (void*)0xdeadbeef; + hr = IAccessible_get_accParent(acc, &disp); + ok(hr == E_FAIL, "got %x\n", hr); + ok(disp == NULL, "disp = %p\n", disp); + + hr = IAccessible_accLocation(acc, &left, &top, &width, &height, vid); + ok(hr == S_OK, "got %x\n", hr); + ok(left == 0, "left = %d\n", left); + ok(top == 0, "top = %d\n", top); + ok(width == 0, "width = %d\n", width); + ok(height == 0, "height = %d\n", height); + + IAccessible_Release(acc); +} + +static void test_CAccPropServices(void) +{ + IAccPropServices *acc_prop_services; + HRESULT hres; + + hres = CoCreateInstance(&CLSID_CAccPropServices, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IAccPropServices, (void**)&acc_prop_services); + ok(hres == S_OK, "Could not create CAccPropServices instance: %08x\n", hres); + + IAccPropServices_Release(acc_prop_services); +} + START_TEST(main) { + int argc; + char **argv; + + if(!init()) + return; + + CoInitializeEx(NULL, COINIT_MULTITHREADED); + + argc = winetest_get_mainargs(&argv); + if(argc == 4 && !strcmp(argv[2], "ObjectFromLresult")) { + IUnknown *unk; + HRESULT hres; + LRESULT lres; + + sscanf(argv[3], "%lx", &lres); + hres = ObjectFromLresult(lres, &IID_IUnknown, 0, (void**)&unk); + ok(hres == S_OK, "hres = %x\n", hres); + IUnknown_Release(unk); + + CoUninitialize(); + return; + } + + if(!register_window_class()) { + skip("can't register test window class\n"); + return; + } + test_getroletext(); -} + test_GetStateText(); + test_LresultFromObject(argv[0]); + test_AccessibleObjectFromWindow(); + test_GetProcessHandleFromHwnd(); + test_default_client_accessible_object(); + + unregister_window_class(); + CoUninitialize(); + + CoInitialize(NULL); + test_CAccPropServices(); + CoUninitialize(); +}

1 0

[akhaldi] 64503: [OLEACC] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 03 Oct '14

03 Oct '14

Author: akhaldi Date: Fri Oct 3 16:42:05 2014 New Revision: 64503 URL: http://svn.reactos.org/svn/reactos?rev=64503&view=rev Log: [OLEACC] * Sync with Wine 1.7.27. CORE-8540 Added: trunk/reactos/dll/win32/oleacc/client.c (with props) trunk/reactos/dll/win32/oleacc/oleacc_private.h (with props) trunk/reactos/dll/win32/oleacc/propservice.c (with props) trunk/reactos/dll/win32/oleacc/resource.h (with props) trunk/reactos/dll/win32/oleacc/window.c (with props) Modified: trunk/reactos/dll/win32/oleacc/CMakeLists.txt trunk/reactos/dll/win32/oleacc/lang/oleacc_De.rc trunk/reactos/dll/win32/oleacc/lang/oleacc_En.rc trunk/reactos/dll/win32/oleacc/lang/oleacc_Fr.rc trunk/reactos/dll/win32/oleacc/lang/oleacc_He.rc trunk/reactos/dll/win32/oleacc/lang/oleacc_Hu.rc trunk/reactos/dll/win32/oleacc/lang/oleacc_It.rc trunk/reactos/dll/win32/oleacc/lang/oleacc_Ko.rc trunk/reactos/dll/win32/oleacc/lang/oleacc_Lt.rc trunk/reactos/dll/win32/oleacc/lang/oleacc_Nl.rc trunk/reactos/dll/win32/oleacc/lang/oleacc_No.rc trunk/reactos/dll/win32/oleacc/lang/oleacc_Pl.rc trunk/reactos/dll/win32/oleacc/lang/oleacc_Pt.rc trunk/reactos/dll/win32/oleacc/lang/oleacc_Ro.rc trunk/reactos/dll/win32/oleacc/lang/oleacc_Ru.rc trunk/reactos/dll/win32/oleacc/lang/oleacc_Si.rc trunk/reactos/dll/win32/oleacc/lang/oleacc_Sq.rc trunk/reactos/dll/win32/oleacc/lang/oleacc_Tr.rc trunk/reactos/dll/win32/oleacc/lang/oleacc_Uk.rc trunk/reactos/dll/win32/oleacc/main.c trunk/reactos/dll/win32/oleacc/oleacc.rc trunk/reactos/dll/win32/oleacc/oleacc.spec trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/oleacc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/CMakeList… Added: trunk/reactos/dll/win32/oleacc/client.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/client.c?… Modified: trunk/reactos/dll/win32/oleacc/lang/oleacc_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/lang/olea… Modified: trunk/reactos/dll/win32/oleacc/lang/oleacc_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/lang/olea… Modified: trunk/reactos/dll/win32/oleacc/lang/oleacc_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/lang/olea… Modified: trunk/reactos/dll/win32/oleacc/lang/oleacc_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/lang/olea… Modified: trunk/reactos/dll/win32/oleacc/lang/oleacc_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/lang/olea… Modified: trunk/reactos/dll/win32/oleacc/lang/oleacc_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/lang/olea… Modified: trunk/reactos/dll/win32/oleacc/lang/oleacc_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/lang/olea… Modified: trunk/reactos/dll/win32/oleacc/lang/oleacc_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/lang/olea… Modified: trunk/reactos/dll/win32/oleacc/lang/oleacc_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/lang/olea… Modified: trunk/reactos/dll/win32/oleacc/lang/oleacc_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/lang/olea… Modified: trunk/reactos/dll/win32/oleacc/lang/oleacc_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/lang/olea… Modified: trunk/reactos/dll/win32/oleacc/lang/oleacc_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/lang/olea… Modified: trunk/reactos/dll/win32/oleacc/lang/oleacc_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/lang/olea… Modified: trunk/reactos/dll/win32/oleacc/lang/oleacc_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/lang/olea… Modified: trunk/reactos/dll/win32/oleacc/lang/oleacc_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/lang/olea… Modified: trunk/reactos/dll/win32/oleacc/lang/oleacc_Sq.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/lang/olea… Modified: trunk/reactos/dll/win32/oleacc/lang/oleacc_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/lang/olea… Modified: trunk/reactos/dll/win32/oleacc/lang/oleacc_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/lang/olea… Modified: trunk/reactos/dll/win32/oleacc/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/main.c?re… Modified: trunk/reactos/dll/win32/oleacc/oleacc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc.rc… Modified: trunk/reactos/dll/win32/oleacc/oleacc.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc.sp… Added: trunk/reactos/dll/win32/oleacc/oleacc_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc_pr… Added: trunk/reactos/dll/win32/oleacc/propservice.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/propservi… Added: trunk/reactos/dll/win32/oleacc/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/resource.… Added: trunk/reactos/dll/win32/oleacc/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/window.c?… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[akhaldi] 64502: [PSDK] * Update oleacc.idl. CORE-8540
by akhaldi＠svn.reactos.org 03 Oct '14

03 Oct '14

Author: akhaldi Date: Fri Oct 3 16:10:46 2014 New Revision: 64502 URL: http://svn.reactos.org/svn/reactos?rev=64502&view=rev Log: [PSDK] * Update oleacc.idl. CORE-8540 Modified: trunk/reactos/include/psdk/oleacc.idl Modified: trunk/reactos/include/psdk/oleacc.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/oleacc.idl?re… ============================================================================== --- trunk/reactos/include/psdk/oleacc.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/oleacc.idl [iso-8859-1] Fri Oct 3 16:10:46 2014 @@ -18,6 +18,11 @@ import "oaidl.idl"; +#ifndef __WIDL__ +#define threading(model) +#endif + +cpp_quote("#define NAVDIR_MIN 0") cpp_quote("#define NAVDIR_UP 1") cpp_quote("#define NAVDIR_DOWN 2") cpp_quote("#define NAVDIR_LEFT 3") @@ -26,6 +31,7 @@ cpp_quote("#define NAVDIR_PREVIOUS 6") cpp_quote("#define NAVDIR_FIRSTCHILD 7") cpp_quote("#define NAVDIR_LASTCHILD 8") +cpp_quote("#define NAVDIR_MAX 9") cpp_quote("#define ROLE_SYSTEM_TITLEBAR 1") cpp_quote("#define ROLE_SYSTEM_MENUBAR 2") @@ -100,6 +106,45 @@ cpp_quote("#define SELFLAG_REMOVESELECTION 0x10") cpp_quote("#define SELFLAG_VALID 0x1f") +cpp_quote("#ifndef STATE_SYSTEM_UNAVAILABLE") +cpp_quote("#define STATE_SYSTEM_NORMAL 0x00000000") +cpp_quote("#define STATE_SYSTEM_UNAVAILABLE 0x00000001") +cpp_quote("#define STATE_SYSTEM_SELECTED 0x00000002") +cpp_quote("#define STATE_SYSTEM_FOCUSED 0x00000004") +cpp_quote("#define STATE_SYSTEM_PRESSED 0x00000008") +cpp_quote("#define STATE_SYSTEM_CHECKED 0x00000010") +cpp_quote("#define STATE_SYSTEM_MIXED 0x00000020") +cpp_quote("#define STATE_SYSTEM_INDETERMINATE STATE_SYSTEM_MIXED") +cpp_quote("#define STATE_SYSTEM_READONLY 0x00000040") +cpp_quote("#define STATE_SYSTEM_HOTTRACKED 0x00000080") +cpp_quote("#define STATE_SYSTEM_DEFAULT 0x00000100") +cpp_quote("#define STATE_SYSTEM_EXPANDED 0x00000200") +cpp_quote("#define STATE_SYSTEM_COLLAPSED 0x00000400") +cpp_quote("#define STATE_SYSTEM_BUSY 0x00000800") +cpp_quote("#define STATE_SYSTEM_FLOATING 0x00001000") +cpp_quote("#define STATE_SYSTEM_MARQUEED 0x00002000") +cpp_quote("#define STATE_SYSTEM_ANIMATED 0x00004000") +cpp_quote("#define STATE_SYSTEM_INVISIBLE 0x00008000") +cpp_quote("#define STATE_SYSTEM_OFFSCREEN 0x00010000") +cpp_quote("#define STATE_SYSTEM_SIZEABLE 0x00020000") +cpp_quote("#define STATE_SYSTEM_MOVEABLE 0x00040000") +cpp_quote("#define STATE_SYSTEM_SELFVOICING 0x00080000") +cpp_quote("#define STATE_SYSTEM_FOCUSABLE 0x00100000") +cpp_quote("#define STATE_SYSTEM_SELECTABLE 0x00200000") +cpp_quote("#define STATE_SYSTEM_LINKED 0x00400000") +cpp_quote("#define STATE_SYSTEM_TRAVERSED 0x00800000") +cpp_quote("#define STATE_SYSTEM_MULTISELECTABLE 0x01000000") +cpp_quote("#define STATE_SYSTEM_EXTSELECTABLE 0x02000000") +cpp_quote("#define STATE_SYSTEM_ALERT_LOW 0x04000000") +cpp_quote("#define STATE_SYSTEM_ALERT_MEDIUM 0x08000000") +cpp_quote("#define STATE_SYSTEM_ALERT_HIGH 0x10000000") +cpp_quote("#define STATE_SYSTEM_PROTECTED 0x20000000") +cpp_quote("#define STATE_SYSTEM_VALID 0x7FFFFFFF") +cpp_quote("#endif") +cpp_quote("#ifndef STATE_SYSTEM_HASPOPUP") +cpp_quote("#define STATE_SYSTEM_HASPOPUP 0x40000000") +cpp_quote("#endif") + typedef GUID MSAAPROPID; typedef enum AnnoScope @@ -262,7 +307,8 @@ interface IAccPropServices; [ - uuid(b5f8350b-0548-48b1-a6ee-88bd00b4a5e7) + uuid(b5f8350b-0548-48b1-a6ee-88bd00b4a5e7), + threading(apartment) ] coclass CAccPropServices { @@ -270,7 +316,6 @@ } }; -cpp_quote("DEFINE_GUID(LIBID_Accessibility, 0x1ea4dbf0, 0x3c3b, 0x11cf, 0x81, 0x0c, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);") cpp_quote("DEFINE_GUID(CLSID_AccPropServices, 0xb5f8350b, 0x0548, 0x48b1, 0xa6, 0xee, 0x88, 0xbd, 0x00, 0xb4, 0xa5, 0xe7);") cpp_quote("DEFINE_GUID(IIS_IsOleaccProxy, 0x902697fa, 0x80e4, 0x4560, 0x80, 0x2a, 0xa1, 0x3f, 0x22, 0xa6, 0x47, 0x09);")

1 0

[hpoussin] 64501: [MKHIVE] Misc fixes: - add missing initialization - support trailing backslash at end of registry key name CORE-8584 #resolve
by hpoussin＠svn.reactos.org 03 Oct '14

03 Oct '14

Author: hpoussin Date: Fri Oct 3 15:11:31 2014 New Revision: 64501 URL: http://svn.reactos.org/svn/reactos?rev=64501&view=rev Log: [MKHIVE] Misc fixes: - add missing initialization - support trailing backslash at end of registry key name CORE-8584 #resolve Modified: trunk/reactos/tools/mkhive/registry.c Modified: trunk/reactos/tools/mkhive/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/registry.c?re… ============================================================================== --- trunk/reactos/tools/mkhive/registry.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/registry.c [iso-8859-1] Fri Oct 3 15:11:31 2014 @@ -88,6 +88,8 @@ free(Key); return NULL; } + Key->KeyCell->SubKeyLists[Stable] = HCELL_NIL; + Key->KeyCell->SubKeyLists[Volatile] = HCELL_NIL; Key->LinkedKey = NULL; return Key; } @@ -136,7 +138,14 @@ (USHORT)((ULONG_PTR)End - (ULONG_PTR)LocalKeyName); } else + { RtlInitUnicodeString(&KeyString, LocalKeyName); + if (KeyString.Length == 0) + { + /* Trailing backslash char; we're done */ + break; + } + } /* Redirect from 'CurrentControlSet' to 'ControlSet001' */ if (!strncmpW(LocalKeyName, L"CurrentControlSet", 17) &&

1 0

← Newer
1
...
63
64
65
66
67
68
69
...
73
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 October 2014