Ros-diffs May 2014

ros-diffs@reactos.org

14 participants
437 discussions

[tkreuzer] 63453: [ROSTESTS] disable some tests on x64, since they don't build. Disable some exports from dllexport_test on non-x86 build, since decorations are x86 specific.
by tkreuzer＠svn.reactos.org 25 May '14

25 May '14

Author: tkreuzer Date: Sun May 25 20:21:02 2014 New Revision: 63453 URL: http://svn.reactos.org/svn/reactos?rev=63453&view=rev Log: [ROSTESTS] disable some tests on x64, since they don't build. Disable some exports from dllexport_test on non-x86 build, since decorations are x86 specific. Modified: trunk/rostests/apitests/CMakeLists.txt trunk/rostests/apitests/crt/CMakeLists.txt trunk/rostests/tests/dllexport/dllexport_test.c trunk/rostests/tests/dllexport/dllexport_test_dll1.spec trunk/rostests/tests/dllexport/dllexport_test_dll2.spec trunk/rostests/winetests/CMakeLists.txt Modified: trunk/rostests/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/CMakeLists.txt?r… ============================================================================== --- trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] Sun May 25 20:21:02 2014 @@ -9,7 +9,9 @@ add_subdirectory(crt) add_subdirectory(dciman32) add_subdirectory(gdi32) +if(NOT ARCH STREQUAL "amd64") add_subdirectory(kernel32) +endif() add_subdirectory(msvcrt) add_subdirectory(ntdll) add_subdirectory(powrprof) Modified: trunk/rostests/apitests/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/CMakeLists.t… ============================================================================== --- trunk/rostests/apitests/crt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/CMakeLists.txt [iso-8859-1] Sun May 25 20:21:02 2014 @@ -1,4 +1,6 @@ include(ntdll_crt_apitest.cmake) -include(crtdll_crt_apitest.cmake) include(msvcrt_crt_apitest.cmake) +if(NOT ARCH STREQUAL "amd64") + include(crtdll_crt_apitest.cmake) +endif() Modified: trunk/rostests/tests/dllexport/dllexport_test.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/dllexport/dllexport… ============================================================================== --- trunk/rostests/tests/dllexport/dllexport_test.c [iso-8859-1] (original) +++ trunk/rostests/tests/dllexport/dllexport_test.c [iso-8859-1] Sun May 25 20:21:02 2014 @@ -58,27 +58,33 @@ ok_int(StdcallFunc1(str), 0x11); ok_int(StdcallFunc2(str), 0x11); ok_int(StdcallFunc3(str), 0x10011); +#ifdef _M_IX86 ok_int(StdcallFunc4(str), 0x21); +#endif ok_int(StdcallFunc5(str), 0x10021); +#ifdef _M_IX86 ok_int(DecoratedStdcallFunc1(str), 0x21); ok_int(DecoratedStdcallFunc2(str), 0x11); //ok_int(DecoratedStdcallFunc3(str), 11); ok_int(DecoratedStdcallFunc4(str), 0x21); ok_int(DecoratedStdcallFunc5(str), 0x10021); - +#endif ok_int(FastcallFunc0(), 0x30); ok_int(FastcallFunc1(str), 0x31); ok_int(FastcallFunc2(str), 0x31); ok_int(FastcallFunc3(str), 0x10031); +#ifdef _M_IX86 ok_int(FastcallFunc4(str), 0x42); ok_int(FastcallFunc5(str), 0x10041); +#endif +#ifdef _M_IX86 ok_int(DecoratedFastcallFunc1(str), 0x42); ok_int(DecoratedFastcallFunc2(str), 0x31); //ok_int(DecoratedFastcallFunc3(str), 11); ok_int(DecoratedFastcallFunc4(str), 0x42); ok_int(DecoratedFastcallFunc5(str), 0x10041); - +#endif ok_int(DataItem1, 0x51); ok_int(DataItem2, 0x51); ok_int(DataItem3, 0x10051); Modified: trunk/rostests/tests/dllexport/dllexport_test_dll1.spec URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/dllexport/dllexport… ============================================================================== --- trunk/rostests/tests/dllexport/dllexport_test_dll1.spec [iso-8859-1] (original) +++ trunk/rostests/tests/dllexport/dllexport_test_dll1.spec [iso-8859-1] Sun May 25 20:21:02 2014 @@ -13,35 +13,35 @@ # Decorated export of a stdcall function @ stdcall _StdcallFunc1@4(ptr) - @ stdcall _DecoratedStdcallFunc1@4(ptr) + @ stdcall -arch=i386 _DecoratedStdcallFunc1@4(ptr) # Redirected stdcall function @ stdcall StdcallFunc2(ptr) StdcallFunc1 @ stdcall StdcallFunc3(ptr) dllexport_test_dll2.StdcallFunc1 - @ stdcall StdcallFunc4(ptr) _DecoratedStdcallFunc1@4 + @ stdcall -arch=i386 StdcallFunc4(ptr) _DecoratedStdcallFunc1@4 @ stdcall StdcallFunc5(ptr) dllexport_test_dll2._DecoratedStdcallFunc1@4 - @ stdcall _DecoratedStdcallFunc2@4(ptr) StdcallFunc1 -; @ stdcall _DecoratedStdcallFunc3@4(ptr) dllexport_test_dll2.StdcallFunc1 # This doesn't work with MSVC! - @ stdcall _DecoratedStdcallFunc4@4(ptr) _DecoratedStdcallFunc1@4 - @ stdcall _DecoratedStdcallFunc5@4(ptr) dllexport_test_dll2._DecoratedStdcallFunc1@4 + @ stdcall -arch=i386 _DecoratedStdcallFunc2@4(ptr) StdcallFunc1 +; @ stdcall -arch=i386 _DecoratedStdcallFunc3@4(ptr) dllexport_test_dll2.StdcallFunc1 # This doesn't work with MSVC! + @ stdcall -arch=i386 _DecoratedStdcallFunc4@4(ptr) _DecoratedStdcallFunc1@4 + @ stdcall -arch=i386 _DecoratedStdcallFunc5@4(ptr) dllexport_test_dll2._DecoratedStdcallFunc1@4 # Normal export of a fastcall function @ fastcall FastcallFunc0() @ fastcall FastcallFunc1(ptr) # Decorated export of a fastcall function - @ fastcall @DecoratedFastcallFunc1@4(ptr) + @ fastcall -arch=i386 @DecoratedFastcallFunc1@4(ptr) # Redirected fastcall function @ fastcall FastcallFunc2(ptr) FastcallFunc1 @ fastcall FastcallFunc3(ptr) dllexport_test_dll2.FastcallFunc1 - @ fastcall FastcallFunc4(ptr) @DecoratedFastcallFunc1@4 - @ fastcall FastcallFunc5(ptr) dllexport_test_dll2.@DecoratedFastcallFunc1@4 + @ fastcall -arch=i386 FastcallFunc4(ptr) @DecoratedFastcallFunc1@4 + @ fastcall -arch=i386 FastcallFunc5(ptr) dllexport_test_dll2.@DecoratedFastcallFunc1@4 - @ fastcall @DecoratedFastcallFunc2@4(ptr) FastcallFunc1 -; @ fastcall @DecoratedFastcallFunc3@4(ptr) dllexport_test_dll2.FastcallFunc1 # This doesn't work with MSVC! - @ fastcall @DecoratedFastcallFunc4@4(ptr) @DecoratedFastcallFunc1@4 - @ fastcall @DecoratedFastcallFunc5@4(ptr) dllexport_test_dll2.@DecoratedFastcallFunc1@4 + @ fastcall -arch=i386 @DecoratedFastcallFunc2@4(ptr) FastcallFunc1 +; @ fastcall -arch=i386 @DecoratedFastcallFunc3@4(ptr) dllexport_test_dll2.FastcallFunc1 # This doesn't work with MSVC! + @ fastcall -arch=i386 @DecoratedFastcallFunc4@4(ptr) @DecoratedFastcallFunc1@4 + @ fastcall -arch=i386 @DecoratedFastcallFunc5@4(ptr) dllexport_test_dll2.@DecoratedFastcallFunc1@4 # Normal export of data @ extern DataItem1 Modified: trunk/rostests/tests/dllexport/dllexport_test_dll2.spec URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/dllexport/dllexport… ============================================================================== --- trunk/rostests/tests/dllexport/dllexport_test_dll2.spec [iso-8859-1] (original) +++ trunk/rostests/tests/dllexport/dllexport_test_dll2.spec [iso-8859-1] Sun May 25 20:21:02 2014 @@ -15,7 +15,7 @@ @ fastcall FastcallFunc1(ptr) # Decorated export of a fastcall function - @ fastcall @DecoratedFastcallFunc1@4(ptr) + @ fastcall -arch=i386 @DecoratedFastcallFunc1@4(ptr) # Normal export of data @ extern DataItem1 Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Sun May 25 20:21:02 2014 @@ -77,7 +77,9 @@ add_subdirectory(regedit) add_subdirectory(riched20) add_subdirectory(riched32) +if(NOT ARCH STREQUAL "amd64") add_subdirectory(rpcrt4) +endif() add_subdirectory(rsaenh) add_subdirectory(schannel) add_subdirectory(scrrun)

1 0

[cwittich] 63452: [bootdata] convert hivecls.inf and hivedef.inf to UTF16LE fixes CORE-7614
by cwittich＠svn.reactos.org 25 May '14

25 May '14

Author: cwittich Date: Sun May 25 20:17:25 2014 New Revision: 63452 URL: http://svn.reactos.org/svn/reactos?rev=63452&view=rev Log: [bootdata] convert hivecls.inf and hivedef.inf to UTF16LE fixes CORE-7614 Modified: trunk/reactos/boot/bootdata/hivecls.inf (contents, props changed) trunk/reactos/boot/bootdata/hivedef.inf (contents, props changed) Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls.inf [UTF-16LE] Sun May 25 20:17:25 2014 @@ -1,469 +1,480 @@ -[Version] -Signature="$ReactOS$" - -[AddReg] -HKLM,"SOFTWARE\Classes",,0x00000010 - -; Default key -HKCR,"*","",0x00000000,"" -HKCR,"SystemFileAssociations","",0x00000000,"" - -; Folders -HKCR,"Folder","",0x00000000,"Folder" -;HKCR,"Folder\DefaultIcon","",0x00000000,"%SystemRoot%\system32\shell32.dll,-4" -HKCR,"Folder\shell\open","BrowserFlags",0x00010001,"0x00000010" -HKCR,"Folder\shell\open","ExplorerFlags",0x00010001,"0x00000012" -HKCR,"Folder\shell\open\command","",0x00000000,"explorer.exe ""%1""" -HKCR,"Folder\shell\explore","BrowserFlags",0x00010001,"0x00000022" -HKCR,"Folder\shell\explore","ExplorerFlags",0x00010001,"0x00000021" -HKCR,"Folder\shell\explore\command","",0x00000000,"explorer.exe /e,""%1""" - -; Drive property page -HKCR,"CLSID\{5F5295E0-429F-1069-A2E2-08002B30309D}","",0x00000000,"Drive Property Page Extension" -HKCR,"CLSID\{5F5295E0-429F-1069-A2E2-08002B30309D}\InProcServer32","",0x00000000,"shell32.dll" -HKCR,"CLSID\{5F5295E0-429F-1069-A2E2-08002B30309D}\InProcServer32","ThreadingModel",0x00000000,"Apartment" - -; Rich Text Files -HKCR,".rtf","",0x00000000,"rtffile" -HKCR,".rtf\shellnew","",0x00000000,"" -HKCR,".rtf\shellnew","Data",0x00020000,"{\rtf1}" -HKCR,"rtffile","",0x00000000,"Rich Text Document" -HKCR,"rtffile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\wordpad.exe,-1404" -HKCR,"rtffile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-2" -HKCR,"rtffile\shell\open","",0x00000000,"Open" -HKCR,"rtffile\shell\open\command","",0x00020000,"%SystemRoot%\system32\wordpad.exe %1" - -; Virtual Device Drivers -HKCR,".386","",0x00000000,"vxdfile" -HKCR,".vxd","",0x00000000,"vxdfile" -HKCR,"vxdfile","",0x00000000,"Virtual Device Driver" -HKCR,"vxdfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-157" - -; Animated Cursors -HKCR,".ani","",0x00000000,"anifile" -HKCR,"anifile","",0x00000000,"Animated Cursor" -HKCR,"anifile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\main.cpl,-1039" -HKCR,"anifile\DefaultIcon","",0x00000000,"%1" - -; DOS Batch Files -HKCR,".bat","",0x00000000,"batfile" -HKCR,"batfile","",0x00000000,"DOS Batch File" -HKCR,"batfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-158" -HKCR,"batfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-153" -HKCR,"batfile\shell\edit\command","",0x00020000,"%SystemRoot%\system32\notepad.exe %1" -HKCR,"batfile\shell\open\command","",0x00000000,"""%1"" %*" - -; ReactOS Cmd Script Files -HKCR,".cmd","",0x00000000,"cmdfile" -HKCR,"cmdfile","",0x00000000,"ReactOS Command Script" -HKCR,"cmdfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-159" -HKCR,"cmdfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-153" -HKCR,"cmdfile\shell\edit\command","",0x00020000,"%SystemRoot%\system32\notepad.exe %1" -HKCR,"cmdfile\shell\open\command","",0x00000000,"""%1"" %*" - -; DOS Applications -HKCR,".com","",0x00000000,"comfile" -HKCR,"comfile","",0x00000000,"DOS Application" -HKCR,"comfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-160" -HKCR,"comfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-3" -HKCR,"comfile\shell\open\command","",0x00000000,"""%1"" %*" - -; Control Panel extensions -HKCR,".cpl","",0x00000000,"cplfile" -HKCR,"cplfile","",0x00000000,"Control Panel Extension" -HKCR,"cplfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-161" -HKCR,"cplfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154" -HKCR,"cplfile\shell\cplopen","",0x00000000,"Open with Control Panel" -HKCR,"cplfile\shell\cplopen\command","",0x00020000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %1,%*" -HKCR,"cplfile\shell\runas\command","",0x00020000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLLAsUser %1,%*" - -; Cursors -HKCR,".cur","",0x00000000,"curfile" -HKCR,"curfile","",0x00000000,"Cursor" -HKCR,"curfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-162" -HKCR,"curfile\DefaultIcon","",0x00000000,"%1" - -; Dynamic Link Libraries -HKCR,".dll","",0x00000000,"dllfile" -HKCR,"dllfile","",0x00000000,"Dynamic Link Library" -HKCR,"dllfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-163" -HKCR,"dllfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154" - -; Device Drivers -HKCR,".drv","",0x00000000,"drvfile" -HKCR,"drvfile","",0x00000000,"Device Driver" -HKCR,"drvfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-164" -HKCR,"drvfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154" - -; Applications -HKCR,".exe","",0x00000000,"exefile" -HKCR,"exefile","",0x00000000,"ReactOS Application" -HKCR,"exefile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-165" -HKCR,"exefile\Defaulticon","",0x00000000,"%1" -HKCR,"exefile\shell\open\command","",0x00000000,"""%1"" %*" -HKCR,"exefile\shell\runas\command","",0x00020000,"""%1"" %*" -HKCR,"exefile\shellex\DropHandler","",0x00020000,"{86C86720-42A0-1069-A2E8-08002B30309D}" - -; Fonts -HKCR,".fon","",0x00000000,"fonfile" -HKCR,"fonfile","",0x00000000,"Font File" -HKCR,"fonfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-166" -HKCR,"fonfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-155" - -HKCR,".ttf","",0x00000000,"ttffile" -HKCR,"ttffile","",0x00000000,"TrueType Font File" -HKCR,"ttffile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-156" -HKCR,"ttffile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-167" -HKCR,"ttffile\shell\open\command","",0x00020000,"%SystemRoot%\system32\fontview.exe %1" - -; Help Files -HKCR,".hlp","",0x00000000,"hlpfile" -HKCR,"hlpfile","",0x00000000,"Help File" -HKCR,"hlpfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-168" -HKCR,"hlpfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-24" -HKCR,"hlpfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\winhlp32.exe %1" - -HKCR,".chm","",0x00000000,"chm.file" -HKCR,"chm.file","",0x00000000,"Help File" -HKCR,"chm.file","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-168" -HKCR,"chm.file\DefaultIcon","",0x00020000,"%SystemRoot%\hh.exe,0" -HKCR,"chm.file\shell\open\command","",0x00020000,"%SystemRoot%\hh.exe %1" - -; set MIME type for .html and .htm because Tiny webserver needs it -HKCR,".htm","",0x00000000,"htmlfile" -HKCR,".htm","Content Type",0x00000000,"text/html" -HKCR,".html","",0x00000000,"htmlfile" -HKCR,".html","Content Type",0x00000000,"text/html" -HKCR,"htmlfile\shell\open\command","",0x00020000,"""%programfiles%\Internet Explorer\iexplore.exe"" %1" - -; Icons -HKCR,".ico","",0x00000000,"icofile" -HKCR,"icofile","",0x00000000,"Icon" -HKCR,"icofile\DefaultIcon","",0x00000000,"%1" - -; JPEG Images -HKCR,".jpg","",0x00000000,"jpegfile" -HKCR,".jpeg","",0x00000000,"jpegfile" -HKCR,"jpegfile","",0x00000000,"JPEG Image" -HKCR,"jpegfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shimgvw.dll,0" -HKCR,"jpegfile\shell\open\command","",0x00020000,"rundll32.exe %SystemRoot%\system32\shimgvw.dll,ImageView_Fullscreen %1" - -; Bitmap Images -HKCR,".bmp","",0x00000000,"bmpfile" -HKCR,"bmpfile","",0x00000000,"Bitmap Image" -HKCR,"bmpfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shimgvw.dll,0" -HKCR,"bmpfile\shell\open\command","",0x00020000,"rundll32.exe %SystemRoot%\system32\shimgvw.dll,ImageView_Fullscreen %1" - -; PNG Images -HKCR,".png","",0x00000000,"pngfile" -HKCR,"pngfile","",0x00000000,"PNG Image" -HKCR,"pngfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shimgvw.dll,0" -HKCR,"pngfile\shell\open\command","",0x00020000,"rundll32.exe %SystemRoot%\system32\shimgvw.dll,ImageView_Fullscreen %1" - -; GIF Images -HKCR,".gif","",0x00000000,"giffile" -HKCR,"giffile","",0x00000000,"GIF Image" -HKCR,"giffile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shimgvw.dll,0" -HKCR,"giffile\shell\open\command","",0x00020000,"rundll32.exe %SystemRoot%\system32\shimgvw.dll,ImageView_Fullscreen %1" - -; Configuration Files -HKCR,".ini","",0x00000000,"inifile" -HKCR,"inifile","",0x00000000,"Configuration Settings" -HKCR,"inifile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-169" -HKCR,"inifile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-151" -HKCR,"inifile\shell\open\command","",0x00000000,"notepad.exe ""%1""" -HKCR,"inifile\shell\print\command","",0x00000000,"notepad.exe /p ""%1""" - -; Setup Information Files -HKCR,".inf","",0x00000000,"inffile" -HKCR,"inffile","",0x00000000,"Setup Information" -HKCR,"inffile\FriendlyTypeName","",0x00020000,"%SystemRoot%\system32\setupapi.dll,-2001" -HKCR,"inffile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-151" -HKCR,"inffile\shell\open\command","",0x00000000,"notepad.exe ""%1""" -HKCR,"inffile\shell\Install","",0x00000000,"Install" -HKCR,"inffile\shell\Install\command","",0x00020000,"%SystemRoot%\system32\rundll32.exe setupapi,InstallHinfSection DefaultInstall 132 %1" - -; Show icons for shortcuts in shell views (lnkfile is handled specially in shell32) -; Don't display extension for shortcuts -HKCR,".lnk","",0x00000000,"lnkfile" -HKCR,".lnk\shellnew","",0x00000000,"" -HKCR,".lnk\shellnew","command",0x00020000,"%SystemRoot%\system32\rundll32.exe appwiz.cpl,NewLinkHere %1" -HKCR,"lnkfile","",0x00000000,"Shortcut" -HKCR,"lnkfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-170" -HKCR,"lnkfile","NeverShowExt",0x00000000,"" -HKCR,"lnkfile","IsShortcut",0x00000000,"yes" -HKCR,"lnkfile\CLSID","",0x00000000,"{00021401-0000-0000-C000-000000000046}" -HKCR,"lnkfile\shellex\IconHandler","",0x00000000,"{00021401-0000-0000-C000-000000000046}" -HKCR,"lnkfile\shellex\DropHandler","",0x00000000,"{00021401-0000-0000-C000-000000000046}" -HKCR,"lnkfile\shellex\ContextMenuHandlers\{00021401-0000-0000-C000-000000000046}","",0x00000000,"" -HKCR,"lnkfile\shellex\PropertySheetHandlers\Shellink Property Page", "", 0x00000000, "{00021401-0000-0000-C000-000000000046}" - -; Text Documents -HKCR,".log","",0x00000000,"txtfile" -HKCR,".txt","",0x00000000,"txtfile" -HKCR,".c","",0x00000000,"txtfile" -HKCR,".cpp","",0x00000000,"txtfile" -HKCR,".h","",0x00000000,"txtfile" -HKCR,".hpp","",0x00000000,"txtfile" -HKCR,".txt\shellnew","",0x00000000,"" -HKCR,".txt\shellnew","NullFile",0x00020000,"" -HKCR,"txtfile","",0x00000000,"Text Document" -HKCR,".txt","Content Type",0x00000000,"text/plain" -HKCR,"txtfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-152" -HKCR,"txtfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\notepad.exe %1" -HKCR,"txtfile\shell\print\command","",0x00000000,"notepad.exe /p ""%1""" - -; XML Documents -HKCR,".xml","",0x00000000,"xmlfile" -HKCR,"xmlfile","",0x00000000,"XML Document" -HKCR,".xml","Content Type",0x00000000,"text/xml" -HKCR,"xmlfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-151" -HKCR,"xmlfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\notepad.exe %1" - -; MSI files -HKCR,".msi","",0x00000000,"MSI.Package" -HKCR,"Msi.Package\DefaultIcon","",0x00000000,"msiexec.exe" -HKCR,"Msi.Package\shell\Open\command","",0x00020000,"%SystemRoot%\system32\msiexec.exe /i ""%1""" -HKCR,"Msi.Package\shell\Repair\command","",0x00020000,"%SystemRoot%\system32\msiexec.exe /f ""%1""" -HKCR,"Msi.Package\shell\Uninstall\command","",0x00020000,"%SystemRoot%\system32\msiexec.exe /x ""%1""" - -HKCR,".pif","",0x00000000,"piffile" - -; Registration Entries -HKCR,".reg","",0x00000000,"regfile" -HKCR,"regfile","",0x00000000,"Registration Entries" -HKCR,"regfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-170" -HKCR,"regfile\DefaultIcon","",0x00020000,"%SystemRoot%\regedit.exe,1" -HKCR,"regfile\shell\edit\command","",0x00020000,"%SystemRoot%\system32\notepad.exe %1" -HKCR,"regfile\shell\open","",0x00000000,"Merge" -HKCR,"regfile\shell\open\command","",0x00000000,"regedit.exe ""%1""" - -; Screen Savers -HKCR,".scr","",0x00000000,"scrfile" -HKCR,"scrfile","",0x00000000,"Screen Saver" -HKCR,"scrfile\Defaulticon","",0x00000000,"%1" -HKCR,"scrfile\shell\config","",0x00000000,"Configure" -HKCR,"scrfile\shell\config\command","",0x00000000,"""%1""" -HKCR,"scrfile\shell\install","",0x00000000,"Install" -HKCR,"scrfile\shell\install\command","",0x00000000,"rundll32.exe desk.cpl,InstallScreenSaver %l" -HKCR,"scrfile\shell\open","",0x00000000,"Test" -HKCR,"scrfile\shell\open\command","",0x00000000,"""%1"" /S" - -; shell command files (e.g. "Show Desktop" in quicklaunch bar) -HKCR,".scf","",0x00000000,"SHCmdFile" -HKCR,"SHCmdFile","NeverShowExt",0x00000000,"" -HKCR,"SHCmdFile","IsShortcut",0x00000000,"yes" -HKCR,"SHCmdFile\shell\open\command","",0x00000000,"explorer.exe ""%1""" -HKCR,"SHCmdFile\CLSID","",0x00000000,"{57651662-CE3E-11D0-8D77-00C04FC99D61}" -HKCR,"SHCmdFile\shellex\IconHandler","",0x00000000,"{57651662-CE3E-11D0-8D77-00C04FC99D61}" - -; System-Files -HKCR,".sys","",0x00000000,"sysfile" -HKCR,"sysfile","",0x00000000,"System File" -HKCR,"regfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-171" -HKCR,"sysfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154" - -; URL shortcuts (e.g. used in favorites folder of IExplorer) -HKCR,".url","",0x00000000,"InternetShortcut" - -; Wave Sounds -HKCR,".wav","",0x00000000,"SoundRec" -HKCR,"SoundRec","",0x00000000,"Wave Sound" -HKCR,"SoundRec\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-225" -HKCR,"SoundRec\shell\open\command","",0x00020000,"%SystemRoot%\system32\mplay32.exe %1" - -; Midi Sounds -HKCR,".mid","",0x00000000,"MIDFile" -HKCR,".midi","",0x00000000,"MIDFile" -HKCR,"MIDFile","",0x00000000,"MIDI Sequence" -HKCR,"MIDFile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-225" -HKCR,"MIDFile\shell\open\command","",0x00020000,"%SystemRoot%\system32\mplay32.exe %1" - -; Audio CD -HKCR,".cda","",0x00000000,"CDAFile" -HKCR,"CDAFile","",0x00000000,"CD Audio Track" -HKCR,"CDAFile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-225" -HKCR,"CDAFile\shell\open\command","",0x00020000,"%SystemRoot%\system32\mplay32.exe %1" - -; Avi Files -HKCR,".avi","",0x00000000,"AVIFile" -HKCR,"AVIFile","",0x00000000,"Video Clip" -HKCR,"AVIFile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-224" -HKCR,"AVIFile\shell\open\command","",0x00020000,"%SystemRoot%\system32\mplay32.exe %1" - -HKCR,"CLSID",,0x00000012 - -; For Shell32.dll -HKCR,"CLSID\{1F4DE370-D627-11D1-BA4F-00A0C91EEDBA}","",0x00000000,"Computer Search Results Folder" -HKCR,"CLSID\{1F4DE370-D627-11D1-BA4F-00A0C91EEDBA}","LocalizedString",0x00020000,"@%SystemRoot%\system32\shell32.dll,-30521" -HKCR,"CLSID\{1F4DE370-D627-11D1-BA4F-00A0C91EEDBA}\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-135" -HKCR,"CLSID\{1F4DE370-D627-11D1-BA4F-00A0C91EEDBA}\InProcServer32","",0x00020000,"%SystemRoot%\system32\shell32.dll" -HKCR,"CLSID\{1F4DE370-D627-11D1-BA4F-00A0C91EEDBA}\InProcServer32","ThreadingModel",0x00000000,"Apartment" -HKCR,"CLSID\{1F4DE370-D627-11D1-BA4F-00A0C91EEDBA}\ShellFolder","Attributes",0x00010001,0x20180000 - -; deskadp.dll shell extension -HKCR,"CLSID\{42071712-76d4-11d1-8b24-00a0c9068ff3}","",0x00000000,"Display Adapter CPL Extension" -HKCR,"CLSID\{42071712-76d4-11d1-8b24-00a0c9068ff3}\InProcServer32","",0x00020000,"%SystemRoot%\system32\deskadp.dll" -HKCR,"CLSID\{42071712-76d4-11d1-8b24-00a0c9068ff3}\InProcServer32","ThreadingModel",0x00000000,"Apartment" - -; deskmon.dll shell extension -HKCR,"CLSID\{42071713-76d4-11d1-8b24-00a0c9068ff3}","",0x00000000,"Display Monitor CPL Extension" -HKCR,"CLSID\{42071713-76d4-11d1-8b24-00a0c9068ff3}\InProcServer32","",0x00020000,"%SystemRoot%\system32\deskmon.dll" -HKCR,"CLSID\{42071713-76d4-11d1-8b24-00a0c9068ff3}\InProcServer32","ThreadingModel",0x00000000,"Apartment" - -; For TCPIP Protocol property page -HKCR,"CLSID\{A907657F-6FDF-11D0-8EFB-00C04FD912B2}","",0x00000000,"TCP/IP Configuration Notify Object" -HKCR,"CLSID\{A907657F-6FDF-11D0-8EFB-00C04FD912B2}\InProcServer32","",0x00000000,"netcfgx.dll" -HKCR,"CLSID\{A907657F-6FDF-11D0-8EFB-00C04FD912B2}\InProcServer32","ThreadingModel",0x00000000,"Both" - -; For dxdiagn.dll -HKCR,"CLSID\{A65B8071-3BFE-4213-9A5B-491DA4461CA7}","",0x00000000,"DxDiagProvider Class" -HKCR,"CLSID\{A65B8071-3BFE-4213-9A5B-491DA4461CA7}\InProcServer32","",0x00000000,"%SystemRoot%\system32\dxdiagn.dll" -HKCR,"CLSID\{A65B8071-3BFE-4213-9A5B-491DA4461CA7}\InProcServer32","ThreadingModel",0x00000000,"Apartment" -HKCR,"CLSID\{A65B8071-3BFE-4213-9A5B-491DA4461CA7}\ProgID","",0x00000000,"DxDiag.DxDiagProvider.1" -HKCR,"CLSID\{A65B8071-3BFE-4213-9A5B-491DA4461CA7}\VersionIndependentProgID","",0x00000000,"DxDiag.DxDiagProvider" - - -HKCR,"NDS\Clsid","",0x00000002,"{323991f0-7bad-11cf-b03d-00aa006e0975}" - -HKCR,"WinNT\Clsid","",0x00000002,"{8b20cd60-0f29-11cf-abc4-02608c9e7553}" - -; Applications -HKCR,"Applications\notepad.exe\shell\open\command","",0x00000002,"notepad.exe %1" -HKCR,"Applications\mspaint.exe\shell\open\command","",0x00000002,"mspaint.exe %1" -HKCR,"Applications\wordpad.exe\shell\open\command","",0x00000002,"wordpad.exe %1" - -; For language support: - -HKCR,"MIME",,0x00000012 -HKCR,"MIME\Database",,0x00000012 -HKCR,"MIME\Database\Rfc1766",,0x00000012 -HKCR,"MIME\Database\Rfc1766","0436",0x00000000,"af;Afrikaans" -HKCR,"MIME\Database\Rfc1766","041C",0x00000000,"sq;Albanian" -HKCR,"MIME\Database\Rfc1766","0001",0x00000000,"ar;Arabic" -HKCR,"MIME\Database\Rfc1766","1401",0x00000000,"ar-dz;Arabic (Algeria)" -HKCR,"MIME\Database\Rfc1766","3C01",0x00000000,"ar-bh;Arabic (Bahrain)" -HKCR,"MIME\Database\Rfc1766","0C01",0x00000000,"ar-eg;Arabic (Egypt)" -HKCR,"MIME\Database\Rfc1766","0801",0x00000000,"ar-iq;Arabic (Iraq)" -HKCR,"MIME\Database\Rfc1766","2C01",0x00000000,"ar-jo;Arabic (Jordan)" -HKCR,"MIME\Database\Rfc1766","3401",0x00000000,"ar-kw;Arabic (Kuwait)" -HKCR,"MIME\Database\Rfc1766","3001",0x00000000,"ar-lb;Arabic (Lebanon)" -HKCR,"MIME\Database\Rfc1766","1001",0x00000000,"ar-ly;Arabic (Libya)" -HKCR,"MIME\Database\Rfc1766","1801",0x00000000,"ar-ma;Arabic (Morocco)" -HKCR,"MIME\Database\Rfc1766","2001",0x00000000,"ar-om;Arabic (Oman)" -HKCR,"MIME\Database\Rfc1766","4001",0x00000000,"ar-qa;Arabic (Qatar)" -HKCR,"MIME\Database\Rfc1766","0401",0x00000000,"ar-sa;Arabic (Saudi Arabia)" -HKCR,"MIME\Database\Rfc1766","2801",0x00000000,"ar-sy;Arabic (Syria)" -HKCR,"MIME\Database\Rfc1766","1C01",0x00000000,"ar-tn;Arabic (Tunisia)" -HKCR,"MIME\Database\Rfc1766","3801",0x00000000,"ar-ae;Arabic (U.A.E.)" -HKCR,"MIME\Database\Rfc1766","2401",0x00000000,"ar-ye;Arabic (Yemen)" -HKCR,"MIME\Database\Rfc1766","042B",0x00000000,"hy;Armenian" -HKCR,"MIME\Database\Rfc1766","042D",0x00000000,"eu;Basque" -HKCR,"MIME\Database\Rfc1766","0423",0x00000000,"be;Belarusian" -HKCR,"MIME\Database\Rfc1766","0445",0x00000000,"bn;Bengali" -HKCR,"MIME\Database\Rfc1766","0402",0x00000000,"bg;Bulgarian" -HKCR,"MIME\Database\Rfc1766","0403",0x00000000,"ca;Catalan" -HKCR,"MIME\Database\Rfc1766","0004",0x00000000,"zh;Chinese" -HKCR,"MIME\Database\Rfc1766","0804",0x00000000,"zh-cn;Chinese (China)" -HKCR,"MIME\Database\Rfc1766","0C04",0x00000000,"zh-hk;Chinese (Hong Kong SAR)" -HKCR,"MIME\Database\Rfc1766","1004",0x00000000,"zh-sg;Chinese (Singapore)" -HKCR,"MIME\Database\Rfc1766","0404",0x00000000,"zh-tw;Chinese (Taiwan)" -HKCR,"MIME\Database\Rfc1766","041A",0x00000000,"hr;Croatian" -HKCR,"MIME\Database\Rfc1766","0405",0x00000000,"cs;Czech" -HKCR,"MIME\Database\Rfc1766","0406",0x00000000,"da;Danish" -HKCR,"MIME\Database\Rfc1766","0813",0x00000000,"nl-be;Dutch (Belgium)" -HKCR,"MIME\Database\Rfc1766","0413",0x00000000,"nl;Dutch (Netherlands)" -HKCR,"MIME\Database\Rfc1766","0009",0x00000000,"en;English" -HKCR,"MIME\Database\Rfc1766","0C09",0x00000000,"en-au;English (Australia)" -HKCR,"MIME\Database\Rfc1766","2809",0x00000000,"en-bz;English (Belize)" -HKCR,"MIME\Database\Rfc1766","1009",0x00000000,"en-ca;English (Canada)" -HKCR,"MIME\Database\Rfc1766","1809",0x00000000,"en-ie;English (Ireland)" -HKCR,"MIME\Database\Rfc1766","2009",0x00000000,"en-jm;English (Jamaica)" -HKCR,"MIME\Database\Rfc1766","1409",0x00000000,"en-nz;English (New Zealand)" -HKCR,"MIME\Database\Rfc1766","1C09",0x00000000,"en-za;English (South Africa)" -HKCR,"MIME\Database\Rfc1766","2C09",0x00000000,"en-tt;English (Trinidad)" -HKCR,"MIME\Database\Rfc1766","0809",0x00000000,"en-gb;English (United Kingdom)" -HKCR,"MIME\Database\Rfc1766","0409",0x00000000,"en-us;English (United States)" -HKCR,"MIME\Database\Rfc1766","048F",0x00000000,"eo;Esperanto" -HKCR,"MIME\Database\Rfc1766","0425",0x00000000,"et;Estonian" -HKCR,"MIME\Database\Rfc1766","0438",0x00000000,"fo;Faeroese" -HKCR,"MIME\Database\Rfc1766","0429",0x00000000,"fa;Farsi" -HKCR,"MIME\Database\Rfc1766","040B",0x00000000,"fi;Finnish" -HKCR,"MIME\Database\Rfc1766","080C",0x00000000,"fr-be;French (Belgium)" -HKCR,"MIME\Database\Rfc1766","0C0C",0x00000000,"fr-ca;French (Canada)" -HKCR,"MIME\Database\Rfc1766","040C",0x00000000,"fr;French (France)" -HKCR,"MIME\Database\Rfc1766","140C",0x00000000,"fr-lu;French (Luxembourg)" -HKCR,"MIME\Database\Rfc1766","100C",0x00000000,"fr-ch;French (Switzerland)" -HKCR,"MIME\Database\Rfc1766","043C",0x00000000,"gd;Gaelic" -HKCR,"MIME\Database\Rfc1766","0C07",0x00000000,"de-at;German (Austria)" -HKCR,"MIME\Database\Rfc1766","0407",0x00000000,"de;German (Germany)" -HKCR,"MIME\Database\Rfc1766","1407",0x00000000,"de-li;German (Liechtenstein)" -HKCR,"MIME\Database\Rfc1766","1007",0x00000000,"de-lu;German (Luxembourg)" -HKCR,"MIME\Database\Rfc1766","0807",0x00000000,"de-ch;German (Switzerland)" -HKCR,"MIME\Database\Rfc1766","0408",0x00000000,"el;Greek" -HKCR,"MIME\Database\Rfc1766","040D",0x00000000,"he;Hebrew" -HKCR,"MIME\Database\Rfc1766","0439",0x00000000,"hi;Hindi" -HKCR,"MIME\Database\Rfc1766","040E",0x00000000,"hu;Hungarian" -HKCR,"MIME\Database\Rfc1766","040F",0x00000000,"is;Icelandic" -HKCR,"MIME\Database\Rfc1766","0421",0x00000000,"in;Indonesian" -HKCR,"MIME\Database\Rfc1766","0410",0x00000000,"it;Italian (Italy)" -HKCR,"MIME\Database\Rfc1766","0810",0x00000000,"it-ch;Italian (Switzerland)" -HKCR,"MIME\Database\Rfc1766","0411",0x00000000,"ja;Japanese" -HKCR,"MIME\Database\Rfc1766","043F",0x00000000,"kk;Kazakh" -HKCR,"MIME\Database\Rfc1766","0412",0x00000000,"ko;Korean" -HKCR,"MIME\Database\Rfc1766","0426",0x00000000,"lv;Latvian" -HKCR,"MIME\Database\Rfc1766","0427",0x00000000,"lt;Lithuanian" -HKCR,"MIME\Database\Rfc1766","042F",0x00000000,"mk;FYRO Macedonian" -HKCR,"MIME\Database\Rfc1766","043E",0x00000000,"ms;Malay (Malaysia)" -HKCR,"MIME\Database\Rfc1766","043A",0x00000000,"mt;Maltese" -HKCR,"MIME\Database\Rfc1766","0414",0x00000000,"no;Norwegian (Bokmal)" -HKCR,"MIME\Database\Rfc1766","0814",0x00000000,"no;Norwegian (Nynorsk)" -HKCR,"MIME\Database\Rfc1766","0415",0x00000000,"pl;Polish" -HKCR,"MIME\Database\Rfc1766","0416",0x00000000,"pt-br;Portuguese (Brazil)" -HKCR,"MIME\Database\Rfc1766","0816",0x00000000,"pt;Portuguese (Portugal)" -HKCR,"MIME\Database\Rfc1766","0417",0x00000000,"rm;Rhaeto-Romanic" -HKCR,"MIME\Database\Rfc1766","0418",0x00000000,"ro;Romanian" -HKCR,"MIME\Database\Rfc1766","0818",0x00000000,"ro-mo;Romanian (Moldova)" -HKCR,"MIME\Database\Rfc1766","0419",0x00000000,"ru;Russian" -HKCR,"MIME\Database\Rfc1766","0819",0x00000000,"ru-mo;Russian (Moldova)" -HKCR,"MIME\Database\Rfc1766","0C1A",0x00000000,"sr;Serbian (Cyrillic)" -HKCR,"MIME\Database\Rfc1766","081A",0x00000000,"sr;Serbian (Latin)" -HKCR,"MIME\Database\Rfc1766","041B",0x00000000,"sk;Slovak" -HKCR,"MIME\Database\Rfc1766","0424",0x00000000,"sl;Slovenian" -HKCR,"MIME\Database\Rfc1766","042E",0x00000000,"sb;Sorbian" -HKCR,"MIME\Database\Rfc1766","2C0A",0x00000000,"es-ar;Spanish (Argentina)" -HKCR,"MIME\Database\Rfc1766","400A",0x00000000,"es-bo;Spanish (Bolivia)" -HKCR,"MIME\Database\Rfc1766","340A",0x00000000,"es-cl;Spanish (Chile)" -HKCR,"MIME\Database\Rfc1766","240A",0x00000000,"es-co;Spanish (Colombia)" -HKCR,"MIME\Database\Rfc1766","140A",0x00000000,"es-cr;Spanish (Costa Rica)" -HKCR,"MIME\Database\Rfc1766","1C0A",0x00000000,"es-do;Spanish (Dominican Republic)" -HKCR,"MIME\Database\Rfc1766","300A",0x00000000,"es-ec;Spanish (Ecuador)" -HKCR,"MIME\Database\Rfc1766","440A",0x00000000,"es-sv;Spanish (El Salvador)" -HKCR,"MIME\Database\Rfc1766","100A",0x00000000,"es-gt;Spanish (Guatemala)" -HKCR,"MIME\Database\Rfc1766","480A",0x00000000,"es-hn;Spanish (Honduras)" -HKCR,"MIME\Database\Rfc1766","0C0A",0x00000000,"es;Spanish (International Sort)" -HKCR,"MIME\Database\Rfc1766","080A",0x00000000,"es-mx;Spanish (Mexico)" -HKCR,"MIME\Database\Rfc1766","4C0A",0x00000000,"es-ni;Spanish (Nicaragua)" -HKCR,"MIME\Database\Rfc1766","180A",0x00000000,"es-pa;Spanish (Panama)" -HKCR,"MIME\Database\Rfc1766","3C0A",0x00000000,"es-py;Spanish (Paraguay)" -HKCR,"MIME\Database\Rfc1766","280A",0x00000000,"es-pe;Spanish (Peru)" -HKCR,"MIME\Database\Rfc1766","500A",0x00000000,"es-pr;Spanish (Puerto Rico)" -HKCR,"MIME\Database\Rfc1766","040A",0x00000000,"es;Spanish (Traditional Sort)" -HKCR,"MIME\Database\Rfc1766","380A",0x00000000,"es-uy;Spanish (Uruguay)" -HKCR,"MIME\Database\Rfc1766","200A",0x00000000,"es-ve;Spanish (Venezuela)" -HKCR,"MIME\Database\Rfc1766","0430",0x00000000,"sx;Sutu" -HKCR,"MIME\Database\Rfc1766","041D",0x00000000,"sv;Swedish" -HKCR,"MIME\Database\Rfc1766","081D",0x00000000,"sv-fi;Swedish (Finland)" -HKCR,"MIME\Database\Rfc1766","041E",0x00000000,"th;Thai" -HKCR,"MIME\Database\Rfc1766","0431",0x00000000,"ts;Tsonga" -HKCR,"MIME\Database\Rfc1766","0432",0x00000000,"tn;Tswana" -HKCR,"MIME\Database\Rfc1766","041F",0x00000000,"tr;Turkish" -HKCR,"MIME\Database\Rfc1766","0422",0x00000000,"uk;Ukrainian" -HKCR,"MIME\Database\Rfc1766","0420",0x00000000,"ur;Urdu" -HKCR,"MIME\Database\Rfc1766","042A",0x00000000,"vi;Vietnamese" -HKCR,"MIME\Database\Rfc1766","0490",0x00000000,"wa;Walloon" -HKCR,"MIME\Database\Rfc1766","0434",0x00000000,"xh;Xhosa" -HKCR,"MIME\Database\Rfc1766","043D",0x00000000,"ji;Yiddish" -HKCR,"MIME\Database\Rfc1766","0435",0x00000000,"zu;Zulu" - -; EOF +[Version] +Signature="$ReactOS$" + +[AddReg] +HKLM,"SOFTWARE\Classes",,0x00000010 + +; Default key +HKCR,"*","",0x00000000,"" +HKCR,"SystemFileAssociations","",0x00000000,"" + +; Folders +HKCR,"Folder","",0x00000000,"Folder" +;HKCR,"Folder\DefaultIcon","",0x00000000,"%SystemRoot%\system32\shell32.dll,-4" +HKCR,"Folder\shell\open","BrowserFlags",0x00010001,"0x00000010" +HKCR,"Folder\shell\open","ExplorerFlags",0x00010001,"0x00000012" +HKCR,"Folder\shell\open\command","",0x00000000,"explorer.exe ""%1""" +HKCR,"Folder\shell\explore","BrowserFlags",0x00010001,"0x00000022" +HKCR,"Folder\shell\explore","ExplorerFlags",0x00010001,"0x00000021" +HKCR,"Folder\shell\explore\command","",0x00000000,"explorer.exe /e,""%1""" + +; Drive property page +HKCR,"CLSID\{5F5295E0-429F-1069-A2E2-08002B30309D}","",0x00000000,"Drive Property Page Extension" +HKCR,"CLSID\{5F5295E0-429F-1069-A2E2-08002B30309D}\InProcServer32","",0x00000000,"shell32.dll" +HKCR,"CLSID\{5F5295E0-429F-1069-A2E2-08002B30309D}\InProcServer32","ThreadingModel",0x00000000,"Apartment" + +; Rich Text Files +HKCR,".rtf","",0x00000000,"rtffile" +HKCR,".rtf\shellnew","",0x00000000,"" +HKCR,".rtf\shellnew","Data",0x00020000,"{\rtf1}" +HKCR,"rtffile","",0x00000000,"Rich Text Document" +HKCR,"rtffile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\wordpad.exe,-1404" +HKCR,"rtffile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-2" +HKCR,"rtffile\shell\open","",0x00000000,"Open" +HKCR,"rtffile\shell\open\command","",0x00020000,"%SystemRoot%\system32\wordpad.exe %1" + +; Virtual Device Drivers +HKCR,".386","",0x00000000,"vxdfile" +HKCR,".vxd","",0x00000000,"vxdfile" +HKCR,"vxdfile","",0x00000000,"Virtual Device Driver" +HKCR,"vxdfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-157" + +; Animated Cursors +HKCR,".ani","",0x00000000,"anifile" +HKCR,"anifile","",0x00000000,"Animated Cursor" +HKCR,"anifile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\main.cpl,-1039" +HKCR,"anifile\DefaultIcon","",0x00000000,"%1" + +; DOS Batch Files +HKCR,".bat","",0x00000000,"batfile" +HKCR,"batfile","",0x00000000,"DOS Batch File" +HKCR,"batfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-158" +HKCR,"batfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-153" +HKCR,"batfile\shell\edit\command","",0x00020000,"%SystemRoot%\system32\notepad.exe %1" +HKCR,"batfile\shell\open\command","",0x00000000,"""%1"" %*" + +; ReactOS Cmd Script Files +HKCR,".cmd","",0x00000000,"cmdfile" +HKCR,"cmdfile","",0x00000000,"ReactOS Command Script" +HKCR,"cmdfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-159" +HKCR,"cmdfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-153" +HKCR,"cmdfile\shell\edit\command","",0x00020000,"%SystemRoot%\system32\notepad.exe %1" +HKCR,"cmdfile\shell\open\command","",0x00000000,"""%1"" %*" + +; DOS Applications +HKCR,".com","",0x00000000,"comfile" +HKCR,"comfile","",0x00000000,"DOS Application" +HKCR,"comfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-160" +HKCR,"comfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-3" +HKCR,"comfile\shell\open\command","",0x00000000,"""%1"" %*" + +; Control Panel extensions +HKCR,".cpl","",0x00000000,"cplfile" +HKCR,"cplfile","",0x00000000,%CPLFILE% +HKCR,"cplfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-161" +HKCR,"cplfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154" +HKCR,"cplfile\shell\cplopen","",0x00000000,%CPLFILE_OPENWITH% +HKCR,"cplfile\shell\cplopen\command","",0x00020000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %1,%*" +HKCR,"cplfile\shell\runas\command","",0x00020000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLLAsUser %1,%*" + +; Cursors +HKCR,".cur","",0x00000000,"curfile" +HKCR,"curfile","",0x00000000,"Cursor" +HKCR,"curfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-162" +HKCR,"curfile\DefaultIcon","",0x00000000,"%1" + +; Dynamic Link Libraries +HKCR,".dll","",0x00000000,"dllfile" +HKCR,"dllfile","",0x00000000,"Dynamic Link Library" +HKCR,"dllfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-163" +HKCR,"dllfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154" + +; Device Drivers +HKCR,".drv","",0x00000000,"drvfile" +HKCR,"drvfile","",0x00000000,"Device Driver" +HKCR,"drvfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-164" +HKCR,"drvfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154" + +; Applications +HKCR,".exe","",0x00000000,"exefile" +HKCR,"exefile","",0x00000000,"ReactOS Application" +HKCR,"exefile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-165" +HKCR,"exefile\Defaulticon","",0x00000000,"%1" +HKCR,"exefile\shell\open\command","",0x00000000,"""%1"" %*" +HKCR,"exefile\shell\runas\command","",0x00020000,"""%1"" %*" +HKCR,"exefile\shellex\DropHandler","",0x00020000,"{86C86720-42A0-1069-A2E8-08002B30309D}" + +; Fonts +HKCR,".fon","",0x00000000,"fonfile" +HKCR,"fonfile","",0x00000000,"Font File" +HKCR,"fonfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-166" +HKCR,"fonfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-155" + +HKCR,".ttf","",0x00000000,"ttffile" +HKCR,"ttffile","",0x00000000,"TrueType Font File" +HKCR,"ttffile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-156" +HKCR,"ttffile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-167" +HKCR,"ttffile\shell\open\command","",0x00020000,"%SystemRoot%\system32\fontview.exe %1" + +; Help Files +HKCR,".hlp","",0x00000000,"hlpfile" +HKCR,"hlpfile","",0x00000000,"Help File" +HKCR,"hlpfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-168" +HKCR,"hlpfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-24" +HKCR,"hlpfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\winhlp32.exe %1" + +HKCR,".chm","",0x00000000,"chm.file" +HKCR,"chm.file","",0x00000000,"Help File" +HKCR,"chm.file","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-168" +HKCR,"chm.file\DefaultIcon","",0x00020000,"%SystemRoot%\hh.exe,0" +HKCR,"chm.file\shell\open\command","",0x00020000,"%SystemRoot%\hh.exe %1" + +; set MIME type for .html and .htm because Tiny webserver needs it +HKCR,".htm","",0x00000000,"htmlfile" +HKCR,".htm","Content Type",0x00000000,"text/html" +HKCR,".html","",0x00000000,"htmlfile" +HKCR,".html","Content Type",0x00000000,"text/html" +HKCR,"htmlfile\shell\open\command","",0x00020000,"""%programfiles%\Internet Explorer\iexplore.exe"" %1" + +; Icons +HKCR,".ico","",0x00000000,"icofile" +HKCR,"icofile","",0x00000000,"Icon" +HKCR,"icofile\DefaultIcon","",0x00000000,"%1" + +; JPEG Images +HKCR,".jpg","",0x00000000,"jpegfile" +HKCR,".jpeg","",0x00000000,"jpegfile" +HKCR,"jpegfile","",0x00000000,"JPEG Image" +HKCR,"jpegfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shimgvw.dll,0" +HKCR,"jpegfile\shell\open\command","",0x00020000,"rundll32.exe %SystemRoot%\system32\shimgvw.dll,ImageView_Fullscreen %1" + +; Bitmap Images +HKCR,".bmp","",0x00000000,"bmpfile" +HKCR,"bmpfile","",0x00000000,"Bitmap Image" +HKCR,"bmpfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shimgvw.dll,0" +HKCR,"bmpfile\shell\open\command","",0x00020000,"rundll32.exe %SystemRoot%\system32\shimgvw.dll,ImageView_Fullscreen %1" + +; PNG Images +HKCR,".png","",0x00000000,"pngfile" +HKCR,"pngfile","",0x00000000,"PNG Image" +HKCR,"pngfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shimgvw.dll,0" +HKCR,"pngfile\shell\open\command","",0x00020000,"rundll32.exe %SystemRoot%\system32\shimgvw.dll,ImageView_Fullscreen %1" + +; GIF Images +HKCR,".gif","",0x00000000,"giffile" +HKCR,"giffile","",0x00000000,"GIF Image" +HKCR,"giffile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shimgvw.dll,0" +HKCR,"giffile\shell\open\command","",0x00020000,"rundll32.exe %SystemRoot%\system32\shimgvw.dll,ImageView_Fullscreen %1" + +; Configuration Files +HKCR,".ini","",0x00000000,"inifile" +HKCR,"inifile","",0x00000000,"Configuration Settings" +HKCR,"inifile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-169" +HKCR,"inifile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-151" +HKCR,"inifile\shell\open\command","",0x00000000,"notepad.exe ""%1""" +HKCR,"inifile\shell\print\command","",0x00000000,"notepad.exe /p ""%1""" + +; Setup Information Files +HKCR,".inf","",0x00000000,"inffile" +HKCR,"inffile","",0x00000000,"Setup Information" +HKCR,"inffile\FriendlyTypeName","",0x00020000,"%SystemRoot%\system32\setupapi.dll,-2001" +HKCR,"inffile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-151" +HKCR,"inffile\shell\open\command","",0x00000000,"notepad.exe ""%1""" +HKCR,"inffile\shell\Install","",0x00000000,"Install" +HKCR,"inffile\shell\Install\command","",0x00020000,"%SystemRoot%\system32\rundll32.exe setupapi,InstallHinfSection DefaultInstall 132 %1" + +; Show icons for shortcuts in shell views (lnkfile is handled specially in shell32) +; Don't display extension for shortcuts +HKCR,".lnk","",0x00000000,"lnkfile" +HKCR,".lnk\shellnew","",0x00000000,"" +HKCR,".lnk\shellnew","command",0x00020000,"%SystemRoot%\system32\rundll32.exe appwiz.cpl,NewLinkHere %1" +HKCR,"lnkfile","",0x00000000,"Shortcut" +HKCR,"lnkfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-170" +HKCR,"lnkfile","NeverShowExt",0x00000000,"" +HKCR,"lnkfile","IsShortcut",0x00000000,"yes" +HKCR,"lnkfile\CLSID","",0x00000000,"{00021401-0000-0000-C000-000000000046}" +HKCR,"lnkfile\shellex\IconHandler","",0x00000000,"{00021401-0000-0000-C000-000000000046}" +HKCR,"lnkfile\shellex\DropHandler","",0x00000000,"{00021401-0000-0000-C000-000000000046}" +HKCR,"lnkfile\shellex\ContextMenuHandlers\{00021401-0000-0000-C000-000000000046}","",0x00000000,"" +HKCR,"lnkfile\shellex\PropertySheetHandlers\Shellink Property Page", "", 0x00000000, "{00021401-0000-0000-C000-000000000046}" + +; Text Documents +HKCR,".log","",0x00000000,"txtfile" +HKCR,".txt","",0x00000000,"txtfile" +HKCR,".c","",0x00000000,"txtfile" +HKCR,".cpp","",0x00000000,"txtfile" +HKCR,".h","",0x00000000,"txtfile" +HKCR,".hpp","",0x00000000,"txtfile" +HKCR,".txt\shellnew","",0x00000000,"" +HKCR,".txt\shellnew","NullFile",0x00020000,"" +HKCR,"txtfile","",0x00000000,"Text Document" +HKCR,".txt","Content Type",0x00000000,"text/plain" +HKCR,"txtfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-152" +HKCR,"txtfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\notepad.exe %1" +HKCR,"txtfile\shell\print\command","",0x00000000,"notepad.exe /p ""%1""" + +; XML Documents +HKCR,".xml","",0x00000000,"xmlfile" +HKCR,"xmlfile","",0x00000000,"XML Document" +HKCR,".xml","Content Type",0x00000000,"text/xml" +HKCR,"xmlfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-151" +HKCR,"xmlfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\notepad.exe %1" + +; MSI files +HKCR,".msi","",0x00000000,"MSI.Package" +HKCR,"Msi.Package\DefaultIcon","",0x00000000,"msiexec.exe" +HKCR,"Msi.Package\shell\Open\command","",0x00020000,"%SystemRoot%\system32\msiexec.exe /i ""%1""" +HKCR,"Msi.Package\shell\Repair\command","",0x00020000,"%SystemRoot%\system32\msiexec.exe /f ""%1""" +HKCR,"Msi.Package\shell\Uninstall\command","",0x00020000,"%SystemRoot%\system32\msiexec.exe /x ""%1""" + +HKCR,".pif","",0x00000000,"piffile" + +; Registration Entries +HKCR,".reg","",0x00000000,"regfile" +HKCR,"regfile","",0x00000000,"Registration Entries" +HKCR,"regfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-170" +HKCR,"regfile\DefaultIcon","",0x00020000,"%SystemRoot%\regedit.exe,1" +HKCR,"regfile\shell\edit\command","",0x00020000,"%SystemRoot%\system32\notepad.exe %1" +HKCR,"regfile\shell\open","",0x00000000,"Merge" +HKCR,"regfile\shell\open\command","",0x00000000,"regedit.exe ""%1""" + +; Screen Savers +HKCR,".scr","",0x00000000,"scrfile" +HKCR,"scrfile","",0x00000000,"Screen Saver" +HKCR,"scrfile\Defaulticon","",0x00000000,"%1" +HKCR,"scrfile\shell\config","",0x00000000,"Configure" +HKCR,"scrfile\shell\config\command","",0x00000000,"""%1""" +HKCR,"scrfile\shell\install","",0x00000000,"Install" +HKCR,"scrfile\shell\install\command","",0x00000000,"rundll32.exe desk.cpl,InstallScreenSaver %l" +HKCR,"scrfile\shell\open","",0x00000000,"Test" +HKCR,"scrfile\shell\open\command","",0x00000000,"""%1"" /S" + +; shell command files (e.g. "Show Desktop" in quicklaunch bar) +HKCR,".scf","",0x00000000,"SHCmdFile" +HKCR,"SHCmdFile","NeverShowExt",0x00000000,"" +HKCR,"SHCmdFile","IsShortcut",0x00000000,"yes" +HKCR,"SHCmdFile\shell\open\command","",0x00000000,"explorer.exe ""%1""" +HKCR,"SHCmdFile\CLSID","",0x00000000,"{57651662-CE3E-11D0-8D77-00C04FC99D61}" +HKCR,"SHCmdFile\shellex\IconHandler","",0x00000000,"{57651662-CE3E-11D0-8D77-00C04FC99D61}" + +; System-Files +HKCR,".sys","",0x00000000,"sysfile" +HKCR,"sysfile","",0x00000000,"System File" +HKCR,"regfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-171" +HKCR,"sysfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154" + +; URL shortcuts (e.g. used in favorites folder of IExplorer) +HKCR,".url","",0x00000000,"InternetShortcut" + +; Wave Sounds +HKCR,".wav","",0x00000000,"SoundRec" +HKCR,"SoundRec","",0x00000000,"Wave Sound" +HKCR,"SoundRec\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-225" +HKCR,"SoundRec\shell\open\command","",0x00020000,"%SystemRoot%\system32\mplay32.exe %1" + +; Midi Sounds +HKCR,".mid","",0x00000000,"MIDFile" +HKCR,".midi","",0x00000000,"MIDFile" +HKCR,"MIDFile","",0x00000000,"MIDI Sequence" +HKCR,"MIDFile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-225" +HKCR,"MIDFile\shell\open\command","",0x00020000,"%SystemRoot%\system32\mplay32.exe %1" + +; Audio CD +HKCR,".cda","",0x00000000,"CDAFile" +HKCR,"CDAFile","",0x00000000,"CD Audio Track" +HKCR,"CDAFile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-225" +HKCR,"CDAFile\shell\open\command","",0x00020000,"%SystemRoot%\system32\mplay32.exe %1" + +; Avi Files +HKCR,".avi","",0x00000000,"AVIFile" +HKCR,"AVIFile","",0x00000000,"Video Clip" +HKCR,"AVIFile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-224" +HKCR,"AVIFile\shell\open\command","",0x00020000,"%SystemRoot%\system32\mplay32.exe %1" + +HKCR,"CLSID",,0x00000012 + +; For Shell32.dll +HKCR,"CLSID\{1F4DE370-D627-11D1-BA4F-00A0C91EEDBA}","",0x00000000,"Computer Search Results Folder" +HKCR,"CLSID\{1F4DE370-D627-11D1-BA4F-00A0C91EEDBA}","LocalizedString",0x00020000,"@%SystemRoot%\system32\shell32.dll,-30521" +HKCR,"CLSID\{1F4DE370-D627-11D1-BA4F-00A0C91EEDBA}\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-135" +HKCR,"CLSID\{1F4DE370-D627-11D1-BA4F-00A0C91EEDBA}\InProcServer32","",0x00020000,"%SystemRoot%\system32\shell32.dll" +HKCR,"CLSID\{1F4DE370-D627-11D1-BA4F-00A0C91EEDBA}\InProcServer32","ThreadingModel",0x00000000,"Apartment" +HKCR,"CLSID\{1F4DE370-D627-11D1-BA4F-00A0C91EEDBA}\ShellFolder","Attributes",0x00010001,0x20180000 + +; deskadp.dll shell extension +HKCR,"CLSID\{42071712-76d4-11d1-8b24-00a0c9068ff3}","",0x00000000,"Display Adapter CPL Extension" +HKCR,"CLSID\{42071712-76d4-11d1-8b24-00a0c9068ff3}\InProcServer32","",0x00020000,"%SystemRoot%\system32\deskadp.dll" +HKCR,"CLSID\{42071712-76d4-11d1-8b24-00a0c9068ff3}\InProcServer32","ThreadingModel",0x00000000,"Apartment" + +; deskmon.dll shell extension +HKCR,"CLSID\{42071713-76d4-11d1-8b24-00a0c9068ff3}","",0x00000000,"Display Monitor CPL Extension" +HKCR,"CLSID\{42071713-76d4-11d1-8b24-00a0c9068ff3}\InProcServer32","",0x00020000,"%SystemRoot%\system32\deskmon.dll" +HKCR,"CLSID\{42071713-76d4-11d1-8b24-00a0c9068ff3}\InProcServer32","ThreadingModel",0x00000000,"Apartment" + +; For TCPIP Protocol property page +HKCR,"CLSID\{A907657F-6FDF-11D0-8EFB-00C04FD912B2}","",0x00000000,"TCP/IP Configuration Notify Object" +HKCR,"CLSID\{A907657F-6FDF-11D0-8EFB-00C04FD912B2}\InProcServer32","",0x00000000,"netcfgx.dll" +HKCR,"CLSID\{A907657F-6FDF-11D0-8EFB-00C04FD912B2}\InProcServer32","ThreadingModel",0x00000000,"Both" + +; For dxdiagn.dll +HKCR,"CLSID\{A65B8071-3BFE-4213-9A5B-491DA4461CA7}","",0x00000000,"DxDiagProvider Class" +HKCR,"CLSID\{A65B8071-3BFE-4213-9A5B-491DA4461CA7}\InProcServer32","",0x00000000,"%SystemRoot%\system32\dxdiagn.dll" +HKCR,"CLSID\{A65B8071-3BFE-4213-9A5B-491DA4461CA7}\InProcServer32","ThreadingModel",0x00000000,"Apartment" +HKCR,"CLSID\{A65B8071-3BFE-4213-9A5B-491DA4461CA7}\ProgID","",0x00000000,"DxDiag.DxDiagProvider.1" +HKCR,"CLSID\{A65B8071-3BFE-4213-9A5B-491DA4461CA7}\VersionIndependentProgID","",0x00000000,"DxDiag.DxDiagProvider" + + +HKCR,"NDS\Clsid","",0x00000002,"{323991f0-7bad-11cf-b03d-00aa006e0975}" + +HKCR,"WinNT\Clsid","",0x00000002,"{8b20cd60-0f29-11cf-abc4-02608c9e7553}" + +; Applications +HKCR,"Applications\notepad.exe\shell\open\command","",0x00000002,"notepad.exe %1" +HKCR,"Applications\mspaint.exe\shell\open\command","",0x00000002,"mspaint.exe %1" +HKCR,"Applications\wordpad.exe\shell\open\command","",0x00000002,"wordpad.exe %1" + +; For language support: + +HKCR,"MIME",,0x00000012 +HKCR,"MIME\Database",,0x00000012 +HKCR,"MIME\Database\Rfc1766",,0x00000012 +HKCR,"MIME\Database\Rfc1766","0436",0x00000000,"af;Afrikaans" +HKCR,"MIME\Database\Rfc1766","041C",0x00000000,"sq;Albanian" +HKCR,"MIME\Database\Rfc1766","0001",0x00000000,"ar;Arabic" +HKCR,"MIME\Database\Rfc1766","1401",0x00000000,"ar-dz;Arabic (Algeria)" +HKCR,"MIME\Database\Rfc1766","3C01",0x00000000,"ar-bh;Arabic (Bahrain)" +HKCR,"MIME\Database\Rfc1766","0C01",0x00000000,"ar-eg;Arabic (Egypt)" +HKCR,"MIME\Database\Rfc1766","0801",0x00000000,"ar-iq;Arabic (Iraq)" +HKCR,"MIME\Database\Rfc1766","2C01",0x00000000,"ar-jo;Arabic (Jordan)" +HKCR,"MIME\Database\Rfc1766","3401",0x00000000,"ar-kw;Arabic (Kuwait)" +HKCR,"MIME\Database\Rfc1766","3001",0x00000000,"ar-lb;Arabic (Lebanon)" +HKCR,"MIME\Database\Rfc1766","1001",0x00000000,"ar-ly;Arabic (Libya)" +HKCR,"MIME\Database\Rfc1766","1801",0x00000000,"ar-ma;Arabic (Morocco)" +HKCR,"MIME\Database\Rfc1766","2001",0x00000000,"ar-om;Arabic (Oman)" +HKCR,"MIME\Database\Rfc1766","4001",0x00000000,"ar-qa;Arabic (Qatar)" +HKCR,"MIME\Database\Rfc1766","0401",0x00000000,"ar-sa;Arabic (Saudi Arabia)" +HKCR,"MIME\Database\Rfc1766","2801",0x00000000,"ar-sy;Arabic (Syria)" +HKCR,"MIME\Database\Rfc1766","1C01",0x00000000,"ar-tn;Arabic (Tunisia)" +HKCR,"MIME\Database\Rfc1766","3801",0x00000000,"ar-ae;Arabic (U.A.E.)" +HKCR,"MIME\Database\Rfc1766","2401",0x00000000,"ar-ye;Arabic (Yemen)" +HKCR,"MIME\Database\Rfc1766","042B",0x00000000,"hy;Armenian" +HKCR,"MIME\Database\Rfc1766","042D",0x00000000,"eu;Basque" +HKCR,"MIME\Database\Rfc1766","0423",0x00000000,"be;Belarusian" +HKCR,"MIME\Database\Rfc1766","0445",0x00000000,"bn;Bengali" +HKCR,"MIME\Database\Rfc1766","0402",0x00000000,"bg;Bulgarian" +HKCR,"MIME\Database\Rfc1766","0403",0x00000000,"ca;Catalan" +HKCR,"MIME\Database\Rfc1766","0004",0x00000000,"zh;Chinese" +HKCR,"MIME\Database\Rfc1766","0804",0x00000000,"zh-cn;Chinese (China)" +HKCR,"MIME\Database\Rfc1766","0C04",0x00000000,"zh-hk;Chinese (Hong Kong SAR)" +HKCR,"MIME\Database\Rfc1766","1004",0x00000000,"zh-sg;Chinese (Singapore)" +HKCR,"MIME\Database\Rfc1766","0404",0x00000000,"zh-tw;Chinese (Taiwan)" +HKCR,"MIME\Database\Rfc1766","041A",0x00000000,"hr;Croatian" +HKCR,"MIME\Database\Rfc1766","0405",0x00000000,"cs;Czech" +HKCR,"MIME\Database\Rfc1766","0406",0x00000000,"da;Danish" +HKCR,"MIME\Database\Rfc1766","0813",0x00000000,"nl-be;Dutch (Belgium)" +HKCR,"MIME\Database\Rfc1766","0413",0x00000000,"nl;Dutch (Netherlands)" +HKCR,"MIME\Database\Rfc1766","0009",0x00000000,"en;English" +HKCR,"MIME\Database\Rfc1766","0C09",0x00000000,"en-au;English (Australia)" +HKCR,"MIME\Database\Rfc1766","2809",0x00000000,"en-bz;English (Belize)" +HKCR,"MIME\Database\Rfc1766","1009",0x00000000,"en-ca;English (Canada)" +HKCR,"MIME\Database\Rfc1766","1809",0x00000000,"en-ie;English (Ireland)" +HKCR,"MIME\Database\Rfc1766","2009",0x00000000,"en-jm;English (Jamaica)" +HKCR,"MIME\Database\Rfc1766","1409",0x00000000,"en-nz;English (New Zealand)" +HKCR,"MIME\Database\Rfc1766","1C09",0x00000000,"en-za;English (South Africa)" +HKCR,"MIME\Database\Rfc1766","2C09",0x00000000,"en-tt;English (Trinidad)" +HKCR,"MIME\Database\Rfc1766","0809",0x00000000,"en-gb;English (United Kingdom)" +HKCR,"MIME\Database\Rfc1766","0409",0x00000000,"en-us;English (United States)" +HKCR,"MIME\Database\Rfc1766","048F",0x00000000,"eo;Esperanto" +HKCR,"MIME\Database\Rfc1766","0425",0x00000000,"et;Estonian" +HKCR,"MIME\Database\Rfc1766","0438",0x00000000,"fo;Faeroese" +HKCR,"MIME\Database\Rfc1766","0429",0x00000000,"fa;Farsi" +HKCR,"MIME\Database\Rfc1766","040B",0x00000000,"fi;Finnish" +HKCR,"MIME\Database\Rfc1766","080C",0x00000000,"fr-be;French (Belgium)" +HKCR,"MIME\Database\Rfc1766","0C0C",0x00000000,"fr-ca;French (Canada)" +HKCR,"MIME\Database\Rfc1766","040C",0x00000000,"fr;French (France)" +HKCR,"MIME\Database\Rfc1766","140C",0x00000000,"fr-lu;French (Luxembourg)" +HKCR,"MIME\Database\Rfc1766","100C",0x00000000,"fr-ch;French (Switzerland)" +HKCR,"MIME\Database\Rfc1766","043C",0x00000000,"gd;Gaelic" +HKCR,"MIME\Database\Rfc1766","0C07",0x00000000,"de-at;German (Austria)" +HKCR,"MIME\Database\Rfc1766","0407",0x00000000,"de;German (Germany)" +HKCR,"MIME\Database\Rfc1766","1407",0x00000000,"de-li;German (Liechtenstein)" +HKCR,"MIME\Database\Rfc1766","1007",0x00000000,"de-lu;German (Luxembourg)" +HKCR,"MIME\Database\Rfc1766","0807",0x00000000,"de-ch;German (Switzerland)" +HKCR,"MIME\Database\Rfc1766","0408",0x00000000,"el;Greek" +HKCR,"MIME\Database\Rfc1766","040D",0x00000000,"he;Hebrew" +HKCR,"MIME\Database\Rfc1766","0439",0x00000000,"hi;Hindi" +HKCR,"MIME\Database\Rfc1766","040E",0x00000000,"hu;Hungarian" +HKCR,"MIME\Database\Rfc1766","040F",0x00000000,"is;Icelandic" +HKCR,"MIME\Database\Rfc1766","0421",0x00000000,"in;Indonesian" +HKCR,"MIME\Database\Rfc1766","0410",0x00000000,"it;Italian (Italy)" +HKCR,"MIME\Database\Rfc1766","0810",0x00000000,"it-ch;Italian (Switzerland)" +HKCR,"MIME\Database\Rfc1766","0411",0x00000000,"ja;Japanese" +HKCR,"MIME\Database\Rfc1766","043F",0x00000000,"kk;Kazakh" +HKCR,"MIME\Database\Rfc1766","0412",0x00000000,"ko;Korean" +HKCR,"MIME\Database\Rfc1766","0426",0x00000000,"lv;Latvian" +HKCR,"MIME\Database\Rfc1766","0427",0x00000000,"lt;Lithuanian" +HKCR,"MIME\Database\Rfc1766","042F",0x00000000,"mk;FYRO Macedonian" +HKCR,"MIME\Database\Rfc1766","043E",0x00000000,"ms;Malay (Malaysia)" +HKCR,"MIME\Database\Rfc1766","043A",0x00000000,"mt;Maltese" +HKCR,"MIME\Database\Rfc1766","0414",0x00000000,"no;Norwegian (Bokmal)" +HKCR,"MIME\Database\Rfc1766","0814",0x00000000,"no;Norwegian (Nynorsk)" +HKCR,"MIME\Database\Rfc1766","0415",0x00000000,"pl;Polish" +HKCR,"MIME\Database\Rfc1766","0416",0x00000000,"pt-br;Portuguese (Brazil)" +HKCR,"MIME\Database\Rfc1766","0816",0x00000000,"pt;Portuguese (Portugal)" +HKCR,"MIME\Database\Rfc1766","0417",0x00000000,"rm;Rhaeto-Romanic" +HKCR,"MIME\Database\Rfc1766","0418",0x00000000,"ro;Romanian" +HKCR,"MIME\Database\Rfc1766","0818",0x00000000,"ro-mo;Romanian (Moldova)" +HKCR,"MIME\Database\Rfc1766","0419",0x00000000,"ru;Russian" +HKCR,"MIME\Database\Rfc1766","0819",0x00000000,"ru-mo;Russian (Moldova)" +HKCR,"MIME\Database\Rfc1766","0C1A",0x00000000,"sr;Serbian (Cyrillic)" +HKCR,"MIME\Database\Rfc1766","081A",0x00000000,"sr;Serbian (Latin)" +HKCR,"MIME\Database\Rfc1766","041B",0x00000000,"sk;Slovak" +HKCR,"MIME\Database\Rfc1766","0424",0x00000000,"sl;Slovenian" +HKCR,"MIME\Database\Rfc1766","042E",0x00000000,"sb;Sorbian" +HKCR,"MIME\Database\Rfc1766","2C0A",0x00000000,"es-ar;Spanish (Argentina)" +HKCR,"MIME\Database\Rfc1766","400A",0x00000000,"es-bo;Spanish (Bolivia)" +HKCR,"MIME\Database\Rfc1766","340A",0x00000000,"es-cl;Spanish (Chile)" +HKCR,"MIME\Database\Rfc1766","240A",0x00000000,"es-co;Spanish (Colombia)" +HKCR,"MIME\Database\Rfc1766","140A",0x00000000,"es-cr;Spanish (Costa Rica)" +HKCR,"MIME\Database\Rfc1766","1C0A",0x00000000,"es-do;Spanish (Dominican Republic)" +HKCR,"MIME\Database\Rfc1766","300A",0x00000000,"es-ec;Spanish (Ecuador)" +HKCR,"MIME\Database\Rfc1766","440A",0x00000000,"es-sv;Spanish (El Salvador)" +HKCR,"MIME\Database\Rfc1766","100A",0x00000000,"es-gt;Spanish (Guatemala)" +HKCR,"MIME\Database\Rfc1766","480A",0x00000000,"es-hn;Spanish (Honduras)" +HKCR,"MIME\Database\Rfc1766","0C0A",0x00000000,"es;Spanish (International Sort)" +HKCR,"MIME\Database\Rfc1766","080A",0x00000000,"es-mx;Spanish (Mexico)" +HKCR,"MIME\Database\Rfc1766","4C0A",0x00000000,"es-ni;Spanish (Nicaragua)" +HKCR,"MIME\Database\Rfc1766","180A",0x00000000,"es-pa;Spanish (Panama)" +HKCR,"MIME\Database\Rfc1766","3C0A",0x00000000,"es-py;Spanish (Paraguay)" +HKCR,"MIME\Database\Rfc1766","280A",0x00000000,"es-pe;Spanish (Peru)" +HKCR,"MIME\Database\Rfc1766","500A",0x00000000,"es-pr;Spanish (Puerto Rico)" +HKCR,"MIME\Database\Rfc1766","040A",0x00000000,"es;Spanish (Traditional Sort)" +HKCR,"MIME\Database\Rfc1766","380A",0x00000000,"es-uy;Spanish (Uruguay)" +HKCR,"MIME\Database\Rfc1766","200A",0x00000000,"es-ve;Spanish (Venezuela)" +HKCR,"MIME\Database\Rfc1766","0430",0x00000000,"sx;Sutu" +HKCR,"MIME\Database\Rfc1766","041D",0x00000000,"sv;Swedish" +HKCR,"MIME\Database\Rfc1766","081D",0x00000000,"sv-fi;Swedish (Finland)" +HKCR,"MIME\Database\Rfc1766","041E",0x00000000,"th;Thai" +HKCR,"MIME\Database\Rfc1766","0431",0x00000000,"ts;Tsonga" +HKCR,"MIME\Database\Rfc1766","0432",0x00000000,"tn;Tswana" +HKCR,"MIME\Database\Rfc1766","041F",0x00000000,"tr;Turkish" +HKCR,"MIME\Database\Rfc1766","0422",0x00000000,"uk;Ukrainian" +HKCR,"MIME\Database\Rfc1766","0420",0x00000000,"ur;Urdu" +HKCR,"MIME\Database\Rfc1766","042A",0x00000000,"vi;Vietnamese" +HKCR,"MIME\Database\Rfc1766","0490",0x00000000,"wa;Walloon" +HKCR,"MIME\Database\Rfc1766","0434",0x00000000,"xh;Xhosa" +HKCR,"MIME\Database\Rfc1766","043D",0x00000000,"ji;Yiddish" +HKCR,"MIME\Database\Rfc1766","0435",0x00000000,"zu;Zulu" + +;-------------------------------- STRINGS ------------------------------- + +[Strings] +CPLFILE="Control Panel Extension" +CPLFILE_OPENWITH="Open with Control Panel" + +; LANG_GERMAN SUBLANG_NEUTRAL +[Strings.0007] +CPLFILE="Systemsteuerungselement" +CPLFILE_OPENWITH="Mit der Systemsteuerung öffnen" + +; EOF Propchange: trunk/reactos/boot/bootdata/hivecls.inf ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style (removed) @@ -1 +0,0 @@ -native Propchange: trunk/reactos/boot/bootdata/hivecls.inf ------------------------------------------------------------------------------ svn:mime-type = text/plain;charset=UTF-16LE Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef.inf [UTF-16LE] Sun May 25 20:17:25 2014 @@ -1,4 +1,4 @@ -[Version] +[Version] Signature="$ReactOS$" [AddReg] @@ -1996,31 +1996,31 @@ ; LANG_GERMAN SUBLANG_NEUTRAL [Strings.0007] -POWERCFG_NAME_0="Zuhause/BÃ¼ro" -POWERCFG_DESC_0="Dieses Schema ist fÃ¼r die meisten Computer Zuhause oder im BÃ¼ro geeignet die durchgehend mit dem Stromnetz verbunden sind." +POWERCFG_NAME_0="Zuhause/Büro" +POWERCFG_DESC_0="Dieses Schema ist für die meisten Computer Zuhause oder im Büro geeignet die durchgehend mit dem Stromnetz verbunden sind." POWERCFG_NAME_1="Portabel/Laptop" -POWERCFG_DESC_1="Dieses Schema ist auf eine erweiterte Batterielebensdauer fÃ¼r unterwegs ausgelegt." -POWERCFG_NAME_2="PrÃ¤sentation" -POWERCFG_DESC_2="Dieses Schema lÃ¤sst den Bildschirm fÃ¼r PrÃ¤sentationen eingeschaltet." +POWERCFG_DESC_1="Dieses Schema ist auf eine erweiterte Batterielebensdauer für unterwegs ausgelegt." +POWERCFG_NAME_2="Präsentation" +POWERCFG_DESC_2="Dieses Schema lässt den Bildschirm für Präsentationen eingeschaltet." POWERCFG_NAME_3="Immer an" -POWERCFG_DESC_3="Dieses Schema lÃ¤sst den Computer immer eingeschaltet, so dass er immer aus dem Netzwerk erreicht werden kann. Nutzen Sie dieses Schema, wenn Ihre Hardware nicht Ã¼ber das Netzwerk aufgeweckt werden kann." +POWERCFG_DESC_3="Dieses Schema lässt den Computer immer eingeschaltet, so dass er immer aus dem Netzwerk erreicht werden kann. Nutzen Sie dieses Schema, wenn Ihre Hardware nicht über das Netzwerk aufgeweckt werden kann." POWERCFG_NAME_4="Minimales Power Management" -POWERCFG_DESC_4="Dieses Schema lÃ¤sst den Computer immer eingeschaltet und ist auf hohe Leistung optimiert." +POWERCFG_DESC_4="Dieses Schema lässt den Computer immer eingeschaltet und ist auf hohe Leistung optimiert." POWERCFG_NAME_5="Maximale Batterie" POWERCFG_DESC_5="Dieses Schema spart extrem aggressiv Strom." DESKTOP_SCHEME_0="ReactOS Standard" DESKTOP_SCHEME_1="Backstein" DESKTOP_SCHEME_2="Aubergine" -DESKTOP_SCHEME_3="OlivgrÃ¼n" +DESKTOP_SCHEME_3="Olivgrün" DESKTOP_SCHEME_4="Hoher Kontrast 1" DESKTOP_SCHEME_5="Hoher Kontrast 2" DESKTOP_SCHEME_6="Hoher Kontrast Schwarz" -DESKTOP_SCHEME_7="Hoher Kontrast WeiÃ" +DESKTOP_SCHEME_7="Hoher Kontrast Weiß" DESKTOP_SCHEME_8="Flieder" DESKTOP_SCHEME_9="Ahorn" DESKTOP_SCHEME_10="Ozean" DESKTOP_SCHEME_11="Pflaume" -DESKTOP_SCHEME_12="KÃ¼rbis" +DESKTOP_SCHEME_12="Kürbis" DESKTOP_SCHEME_13="Regentag" DESKTOP_SCHEME_14="ReactOS Klassisch" DESKTOP_SCHEME_15="Rose" @@ -2028,7 +2028,7 @@ DESKTOP_SCHEME_17="Himmel" DESKTOP_SCHEME_18="Schiefer" DESKTOP_SCHEME_19="Sturm" -DESKTOP_SCHEME_20="TÃ¼rkis" +DESKTOP_SCHEME_20="Türkis" DESKTOP_SCHEME_21="Gelbbraun" TEMP_DIR="%USERPROFILE%\Lokale Einstellungen\Temp" @@ -2075,17 +2075,17 @@ ; LANG_SPANISH SUBLANG_NEUTRAL [Strings.000A] POWERCFG_NAME_0="Casa/Officina" -POWERCFG_DESC_0="Esta combinaciÃ³n es ideal para la mayor pare de los usuarios home o desktop que dejan el equipo conectado todo el tiempo." -POWERCFG_NAME_1="PortÃ¡til/Laptop" -POWERCFG_DESC_1="Esta combinaciÃ³n estÃ¡ diseÃ±ada para aumentar la duraciÃ³n de la baterÃa cuando se viaja." -POWERCFG_NAME_2="PresentaciÃ³n" -POWERCFG_DESC_2="Esta combinaciÃ³n mantiene el monitor encendido para hacer presentaciones." +POWERCFG_DESC_0="Esta combinación es ideal para la mayor pare de los usuarios home o desktop que dejan el equipo conectado todo el tiempo." +POWERCFG_NAME_1="Portátil/Laptop" +POWERCFG_DESC_1="Esta combinación está diseñada para aumentar la duración de la batería cuando se viaja." +POWERCFG_NAME_2="Presentación" +POWERCFG_DESC_2="Esta combinación mantiene el monitor encendido para hacer presentaciones." POWERCFG_NAME_3="Siempre activa" -POWERCFG_DESC_3="Esta combinaciÃ³n mantiene la computadora encendida para que pueda ser accedida desde la red. Usar esta combinaciÃ³n si no se dispone de hardware WOL." -POWERCFG_NAME_4="AdministraciÃ³n mÃnima de la corriente" -POWERCFG_DESC_4="Esta combinaciÃ³n mantiene la computadora encendida y la optimiza para una performance elevada." -POWERCFG_NAME_5="MÃ¡xima BaterÃa" -POWERCFG_DESC_5="Esta combinaciÃ³n permite el mÃ¡ximo ahorro de la energÃa." +POWERCFG_DESC_3="Esta combinación mantiene la computadora encendida para que pueda ser accedida desde la red. Usar esta combinación si no se dispone de hardware WOL." +POWERCFG_NAME_4="Administración mínima de la corriente" +POWERCFG_DESC_4="Esta combinación mantiene la computadora encendida y la optimiza para una performance elevada." +POWERCFG_NAME_5="Máxima Batería" +POWERCFG_DESC_5="Esta combinación permite el máximo ahorro de la energía." DESKTOP_SCHEME_0="ReactOS Estandard" DESKTOP_SCHEME_1="Rojo ladrillo" DESKTOP_SCHEME_2="Berenjena" @@ -2099,8 +2099,8 @@ DESKTOP_SCHEME_10="Verde Marino" DESKTOP_SCHEME_11="Ciruela" DESKTOP_SCHEME_12="Calabaza" -DESKTOP_SCHEME_13="DÃa lluvioso" -DESKTOP_SCHEME_14="ReactOS ClÃ¡sico" +DESKTOP_SCHEME_13="Día lluvioso" +DESKTOP_SCHEME_14="ReactOS Clásico" DESKTOP_SCHEME_15="Rosa" DESKTOP_SCHEME_16="Arena" DESKTOP_SCHEME_17="Sky" @@ -2108,7 +2108,7 @@ DESKTOP_SCHEME_19="Tormenta" DESKTOP_SCHEME_20="Verde agua" DESKTOP_SCHEME_21="Tabaco" -TEMP_DIR="%USERPROFILE%\ConfiguraciÃ³n Local\Temp" +TEMP_DIR="%USERPROFILE%\Configuración Local\Temp" ; LANG_FINNISH SUBLANG_NEUTRAL @@ -2231,9 +2231,9 @@ ; LANG_ITALIAN SUBLANG_NEUTRAL [Strings.0010] POWERCFG_NAME_0="Casa/Ufficio" -POWERCFG_DESC_0="Questa combinazione Ã¨ ottimale per la maggior parte degli utenti che sono collegati tutto il tempo." +POWERCFG_DESC_0="Questa combinazione è ottimale per la maggior parte degli utenti che sono collegati tutto il tempo." POWERCFG_NAME_1="Portatile/Laptop" -POWERCFG_DESC_1="Questa combinazione Ã¨ pensata per incrementare la durata della batteria quendo si Ã¨ in viaggio." +POWERCFG_DESC_1="Questa combinazione è pensata per incrementare la durata della batteria quendo si è in viaggio." POWERCFG_NAME_2="Presentazione" POWERCFG_DESC_2="Questa combinazione mantiene il monitor acceso per presentazioni." POWERCFG_NAME_3="Sempre attivo" @@ -2387,38 +2387,38 @@ ; LANG_POLISH SUBLANG_NEUTRAL [Strings.0015] POWERCFG_NAME_0="Dom/Biuro" -POWERCFG_DESC_0="Ten profil przeznaczony jest dla komputerÃ³w domowych lub biurowych, ktÃ³re sÄ caÅy czas podÅÄczone do zasilania." -POWERCFG_NAME_1="PrzenoÅny/Laptop" -POWERCFG_DESC_1="Ten profil umoÅ¼liwia oszczÄdne gospodarowanie zasilaniem, co przydaje siÄ podczas pracy na urzÄdzeniach przenoÅnych, nie podÅÄczonych do zasilania zewnÄtrznego." +POWERCFG_DESC_0="Ten profil przeznaczony jest dla komputerów domowych lub biurowych, które są cały czas podłączone do zasilania." +POWERCFG_NAME_1="Przenośny/Laptop" +POWERCFG_DESC_1="Ten profil umożliwia oszczędne gospodarowanie zasilaniem, co przydaje się podczas pracy na urządzeniach przenośnych, nie podłączonych do zasilania zewnętrznego." POWERCFG_NAME_2="Prezentacja" -POWERCFG_DESC_2="Ten profil pozostawia monitor wÅÄczony caÅy czas, co jest przydatne podczas przeprowadzania prezentacji." -POWERCFG_NAME_3="Zawsze wÅÄczony" -POWERCFG_DESC_3="Ten schemat nigdy nie wyÅÄcza komputera, co jest istotne gdy maszyna nie obsÅuguje wybudzania przez sieÄ." -POWERCFG_NAME_4="Brak zarzÄdzania energiÄ" -POWERCFG_DESC_4="Ten schemat nie korzysta z Å¼adnych mechanizmÃ³w oszczÄdzania energii, przy jego maksymalnej wydajnoÅci." -POWERCFG_NAME_5="Maks. oszczÄdzanie" -POWERCFG_DESC_5="Ten profil minimalizuje zuÅ¼ycie energii, kosztem wydajnoÅci sprzÄtu." +POWERCFG_DESC_2="Ten profil pozostawia monitor włączony cały czas, co jest przydatne podczas przeprowadzania prezentacji." +POWERCFG_NAME_3="Zawsze włączony" +POWERCFG_DESC_3="Ten schemat nigdy nie wyłącza komputera, co jest istotne gdy maszyna nie obsługuje wybudzania przez sieć." +POWERCFG_NAME_4="Brak zarządzania energią" +POWERCFG_DESC_4="Ten schemat nie korzysta z żadnych mechanizmów oszczędzania energii, przy jego maksymalnej wydajności." +POWERCFG_NAME_5="Maks. oszczędzanie" +POWERCFG_DESC_5="Ten profil minimalizuje zużycie energii, kosztem wydajności sprzętu." DESKTOP_SCHEME_0="Podstawowy ReactOS" -DESKTOP_SCHEME_1="CegÅa" -DESKTOP_SCHEME_2="BakÅaÅ¼an" +DESKTOP_SCHEME_1="Cegła" +DESKTOP_SCHEME_2="Bakłażan" DESKTOP_SCHEME_3="Zielona Oliwka" -DESKTOP_SCHEME_4="DuÅ¼y kontrast nr 1" -DESKTOP_SCHEME_5="DuÅ¼y kontrast nr 2" -DESKTOP_SCHEME_6="CzerÅ o duÅ¼ym kontraÅcie" -DESKTOP_SCHEME_7="Biel o duÅ¼ym kontraÅcie" +DESKTOP_SCHEME_4="Duży kontrast nr 1" +DESKTOP_SCHEME_5="Duży kontrast nr 2" +DESKTOP_SCHEME_6="Czerń o dużym kontraście" +DESKTOP_SCHEME_7="Biel o dużym kontraście" DESKTOP_SCHEME_8="Lilak" DESKTOP_SCHEME_9="Klon" DESKTOP_SCHEME_10="Morski" -DESKTOP_SCHEME_11="Åliwkowy" +DESKTOP_SCHEME_11="Śliwkowy" DESKTOP_SCHEME_12="Dynia" -DESKTOP_SCHEME_13="Deszczowy DzieÅ" +DESKTOP_SCHEME_13="Deszczowy Dzień" DESKTOP_SCHEME_14="Klasyczny ReactOS" -DESKTOP_SCHEME_15="RÃ³Å¼a" +DESKTOP_SCHEME_15="Róża" DESKTOP_SCHEME_16="Piasek" DESKTOP_SCHEME_17="Niebo" -DESKTOP_SCHEME_18="Åupek" +DESKTOP_SCHEME_18="Łupek" DESKTOP_SCHEME_19="Burza" -DESKTOP_SCHEME_20="Morska ZieleÅ" +DESKTOP_SCHEME_20="Morska Zieleń" DESKTOP_SCHEME_21="Pszenica" TEMP_DIR="%USERPROFILE%\Ustawienia lokalne\Temp" @@ -2430,79 +2430,79 @@ ; LANG_ROMANIAN SUBLANG_NEUTRAL [Strings.0018] -POWERCFG_NAME_0="AcasÄ/Birou" -POWERCFG_DESC_0="Aceas regim este potrivit calculatoarelor conectate permanent la reÈeaua electricÄ." +POWERCFG_NAME_0="Acasă/Birou" +POWERCFG_DESC_0="Aceas regim este potrivit calculatoarelor conectate permanent la rețeaua electrică." POWERCFG_NAME_1="Portabilitate" POWERCFG_DESC_1="Aceast regim a fost conceput pentru a spori perioada de alimentare a bateriei calculatoarelor portabile." POWERCFG_NAME_2="Prezentare" -POWERCFG_DESC_2="Aceast regim menÈine ecranul Ã®n permanenÈÄ deschis (util pentru prezentÄri)." -POWERCFG_NAME_3="Conectat Ã®n permanenÈÄ" -POWERCFG_DESC_3="Aceast regim menÈine calculatorul disponibil pentru a putea fi accesat din reÈea. UtilizaÈi aceastÄ opÈiune Ã®n lipsa soluÈiilor de autodeschidere pentru reÈea." -POWERCFG_NAME_4="Gestiune minimÄ" -POWERCFG_DESC_4="Aceast regim menÈine calculatorul deschis Èi-i optimizeazÄ alimentarea pentru o Ã®naltÄ performanÈÄ." -POWERCFG_NAME_5="Alimentare maximÄ" -POWERCFG_DESC_5="Aceasta este cel mai agresiv regim de reducere a consumului Èi de extindere a perioadei de alimentare." +POWERCFG_DESC_2="Aceast regim menține ecranul în permanență deschis (util pentru prezentări)." +POWERCFG_NAME_3="Conectat în permanență" +POWERCFG_DESC_3="Aceast regim menține calculatorul disponibil pentru a putea fi accesat din rețea. Utilizați această opțiune în lipsa soluțiilor de autodeschidere pentru rețea." +POWERCFG_NAME_4="Gestiune minimă" +POWERCFG_DESC_4="Aceast regim menține calculatorul deschis și-i optimizează alimentarea pentru o înaltă performanță." +POWERCFG_NAME_5="Alimentare maximă" +POWERCFG_DESC_5="Aceasta este cel mai agresiv regim de reducere a consumului și de extindere a perioadei de alimentare." DESKTOP_SCHEME_0="ReactOS Standard" -DESKTOP_SCHEME_1="CÄrÄmiziu" -DESKTOP_SCHEME_2="VÃ¢nÄt" -DESKTOP_SCHEME_3="Verde mÄsliniu" +DESKTOP_SCHEME_1="Cărămiziu" +DESKTOP_SCHEME_2="Vânăt" +DESKTOP_SCHEME_3="Verde măsliniu" DESKTOP_SCHEME_4="Contrast sporit 1" DESKTOP_SCHEME_5="Contrast sporit 2" DESKTOP_SCHEME_6="Contrast sporit Negru" DESKTOP_SCHEME_7="Contrast sporit Alb" DESKTOP_SCHEME_8="Liliachiu" -DESKTOP_SCHEME_9="ArÈar" +DESKTOP_SCHEME_9="Arțar" DESKTOP_SCHEME_10="Marin" -DESKTOP_SCHEME_11="PrunÄ" +DESKTOP_SCHEME_11="Prună" DESKTOP_SCHEME_12="Dovleac" -DESKTOP_SCHEME_13="Zi ploioasÄ" +DESKTOP_SCHEME_13="Zi ploioasă" DESKTOP_SCHEME_14="ReactOS Clasic" DESKTOP_SCHEME_15="Trandafiriu" DESKTOP_SCHEME_16="Nisip" DESKTOP_SCHEME_17="Cer" DESKTOP_SCHEME_18="Ardezie" -DESKTOP_SCHEME_19="FurtunÄ" +DESKTOP_SCHEME_19="Furtună" DESKTOP_SCHEME_20="Turcoaz" -DESKTOP_SCHEME_21="GrÃ¢u" -TEMP_DIR="%USERPROFILE%\PreferinÈe locale\Temp" +DESKTOP_SCHEME_21="Grâu" +TEMP_DIR="%USERPROFILE%\Preferințe locale\Temp" ; LANG_RUSSIAN SUBLANG_NEUTRAL [Strings.0019] -POWERCFG_NAME_0="ÐÐ¾Ð¼Ð°ÑÐ½Ð¸Ð¹/Ð¾ÑÐ¸ÑÐ½ÑÐ¹ Ð½Ð°ÑÑÐ¾Ð»ÑÐ½ÑÐ¹" -POWERCFG_DESC_0="ÐÑÐ° ÑÑÐµÐ¼Ð° Ð¿Ð¾Ð´ÑÐ¾Ð´Ð¸Ñ Ð´Ð»Ñ Ð±Ð¾Ð»ÑÑÐ¸Ð½ÑÑÐ²Ð° Ð´Ð¾Ð¼Ð°ÑÐ½Ð¸Ñ Ð¸ Ð¾ÑÐ¸ÑÐ½ÑÑ Ð½Ð°ÑÑÐ¾Ð»ÑÐ½ÑÑ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ¾Ð², ÐºÐ¾ÑÐ¾ÑÑÐµ ÑÐ°Ð±Ð¾ÑÐ°ÑÑ Ð¾Ñ ÑÐ»ÐµÐºÑÑÐ¾ÑÐµÑÐ¸." -POWERCFG_NAME_1="ÐÐµÑÐµÐ½Ð¾ÑÐ½ÑÐ¹/Ð½Ð¾ÑÑÐ±ÑÐº" -POWERCFG_DESC_1="ÐÑÐ° ÑÑÐµÐ¼Ð° Ð¿ÑÐµÐ´Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð° Ð´Ð»Ñ Ð¿ÑÐ¾Ð´Ð»ÐµÐ½Ð¸Ñ Ð²ÑÐµÐ¼ÐµÐ½Ð¸ ÑÐ°Ð±Ð¾ÑÑ Ð¿ÐµÑÐµÐ½Ð¾ÑÐ½Ð¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ° Ð¾Ñ Ð±Ð°ÑÐ°ÑÐµÐ¸ Ð² Ð´Ð¾ÑÐ¾Ð³Ðµ." -POWERCFG_NAME_2="ÐÑÐµÐ·ÐµÐ½ÑÐ°ÑÐ¸Ñ" -POWERCFG_DESC_2="ÐÑÐ° ÑÑÐµÐ¼Ð° Ð¾ÑÑÐ°Ð²Ð»ÑÐµÑ Ð¼Ð¾Ð½Ð¸ÑÐ¾Ñ Ð²ÐºÐ»ÑÑÑÐ½Ð½ÑÐ¼ Ð´Ð»Ñ Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¿ÑÐµÐ·ÐµÐ½ÑÐ°ÑÐ¸Ð¹." -POWERCFG_NAME_3="ÐÑÐµÐ³Ð´Ð° Ð²ÐºÐ»ÑÑÑÐ½" -POWERCFG_DESC_3="ÐÑÐ° ÑÑÐµÐ¼Ð° Ð¾ÑÑÐ°Ð²Ð»ÑÐµÑ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ ÑÐ°Ð±Ð¾ÑÐ°ÑÑÐ¸Ð¼, ÑÐ°Ðº ÑÑÐ¾ Ð¾Ð½ Ð¾ÑÑÐ°ÑÑÑÑ Ð´Ð¾ÑÑÑÐ¿Ð½ÑÐ¼ Ð¸Ð· ÑÐµÑÐ¸. ÐÑÐ¿Ð¾Ð»ÑÐ·ÑÐ¹ÑÐµ ÑÑÑ ÑÑÐµÐ¼Ñ, ÐµÑÐ»Ð¸ Ð¾Ð±Ð¾ÑÑÐ´Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑ Ð²ÐºÐ»ÑÑÐµÐ½Ð¸Ðµ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ° ÑÐµÑÐµÐ· ÑÐµÑÑ." -POWERCFG_NAME_4="ÐÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑÐ½Ð¾Ðµ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¿Ð¸ÑÐ°Ð½Ð¸ÐµÐ¼" -POWERCFG_DESC_4="ÐÑÐ° ÑÑÐµÐ¼Ð° Ð¾ÑÑÐ°Ð²Ð»ÑÐµÑ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ð²ÐºÐ»ÑÑÑÐ½Ð½ÑÐ¼ Ð¸ Ð½Ð°ÑÑÑÐ°Ð¸Ð²Ð°ÐµÑ ÐµÐ³Ð¾ Ð½Ð° Ð²ÑÑÐ¾ÐºÑÑ Ð¿ÑÐ¾Ð¸Ð·Ð²Ð¾Ð´Ð¸ÑÐµÐ»ÑÐ½Ð¾ÑÑÑ." -POWERCFG_NAME_5="ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÐµÐ»ÑÐ½Ð°Ñ ÑÐ°Ð±Ð¾ÑÐ° Ð¾Ñ Ð±Ð°ÑÐ°ÑÐµÐ¸" -POWERCFG_DESC_5="ÐÑÐ° ÑÑÐµÐ¼Ð° Ð¿ÑÐµÐ´Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð° Ð´Ð»Ñ Ð¼Ð°ÐºÑÐ¸Ð¼Ð°Ð»ÑÐ½Ð¾Ð¹ ÑÐºÐ¾Ð½Ð¾Ð¼Ð¸Ð¸ ÑÐ½ÐµÑÐ³Ð¸Ð¸." -DESKTOP_SCHEME_0="ReactOS ÑÑÐ°Ð½Ð´Ð°ÑÑÐ½Ð°Ñ" -DESKTOP_SCHEME_1="ÐÐ¸ÑÐ¿Ð¸Ñ" -DESKTOP_SCHEME_2="ÐÐ°ÐºÐ»Ð°Ð¶Ð°Ð½" -DESKTOP_SCHEME_3="ÐÐµÐ»ÑÐ½Ð°Ñ Ð¾Ð»Ð¸Ð²ÐºÐ°" -DESKTOP_SCHEME_4="ÐÑÑÐ¾ÐºÐ°Ñ ÐºÐ¾Ð½ÑÑÐ°ÑÑÐ½Ð¾ÑÑÑâ1" -DESKTOP_SCHEME_5="ÐÑÑÐ¾ÐºÐ°Ñ ÐºÐ¾Ð½ÑÑÐ°ÑÑÐ½Ð¾ÑÑÑâ2" -DESKTOP_SCHEME_6="ÐÐ¾Ð½ÑÑÐ°ÑÑÐ½Ð°Ñ ÑÑÑÐ½Ð°Ñ" -DESKTOP_SCHEME_7="ÐÐ¾Ð½ÑÑÐ°ÑÑÐ½Ð°Ñ Ð±ÐµÐ»Ð°Ñ" -DESKTOP_SCHEME_8="Ð¡Ð¸ÑÐµÐ½Ñ" -DESKTOP_SCHEME_9="ÐÐ»ÑÐ½" -DESKTOP_SCHEME_10="ÐÐ¾ÑÑÐºÐ°Ñ" -DESKTOP_SCHEME_11="Ð¡Ð»Ð¸Ð²Ð°" -DESKTOP_SCHEME_12="Ð¢ÑÐºÐ²Ð°" -DESKTOP_SCHEME_13="ÐÐ¾Ð¶Ð´Ð»Ð¸Ð²ÑÐ¹ Ð´ÐµÐ½Ñ" -DESKTOP_SCHEME_14="ReactOS ÐºÐ»Ð°ÑÑÐ¸ÑÐµÑÐºÐ°Ñ" -DESKTOP_SCHEME_15="Ð Ð¾Ð·Ð°" -DESKTOP_SCHEME_16="ÐÐµÑÐ¾Ðº" -DESKTOP_SCHEME_17="ÐÐµÐ±Ð¾" -DESKTOP_SCHEME_18="Ð¨Ð¸ÑÐµÑ" -DESKTOP_SCHEME_19="Ð¨ÑÐ¾ÑÐ¼" -DESKTOP_SCHEME_20="ÐÐµÐ»ÐµÐ½Ð¾Ð²Ð°ÑÐ¾-Ð³Ð¾Ð»ÑÐ±Ð°Ñ" -DESKTOP_SCHEME_21="ÐÑÐµÐ½Ð¸ÑÐ°" +POWERCFG_NAME_0="Домашний/офисный настольный" +POWERCFG_DESC_0="Эта схема подходит для большинства домашних и офисных настольных компьютеров, которые работают от электросети." +POWERCFG_NAME_1="Переносный/ноутбук" +POWERCFG_DESC_1="Эта схема предназначена для продления времени работы переносного компьютера от батареи в дороге." +POWERCFG_NAME_2="Презентация" +POWERCFG_DESC_2="Эта схема оставляет монитор включённым для ведения презентаций." +POWERCFG_NAME_3="Всегда включён" +POWERCFG_DESC_3="Эта схема оставляет компьютер работающим, так что он остаётся доступным из сети. Используйте эту схему, если оборудование не поддерживает включение компьютера через сеть." +POWERCFG_NAME_4="Минимальное управление питанием" +POWERCFG_DESC_4="Эта схема оставляет компьютер включённым и настраивает его на высокую производительность." +POWERCFG_NAME_5="Продолжительная работа от батареи" +POWERCFG_DESC_5="Эта схема предназначена для максимальной экономии энергии." +DESKTOP_SCHEME_0="ReactOS стандартная" +DESKTOP_SCHEME_1="Кирпич" +DESKTOP_SCHEME_2="Баклажан" +DESKTOP_SCHEME_3="Зелёная оливка" +DESKTOP_SCHEME_4="Высокая контрастность–1" +DESKTOP_SCHEME_5="Высокая контрастность–2" +DESKTOP_SCHEME_6="Контрастная чёрная" +DESKTOP_SCHEME_7="Контрастная белая" +DESKTOP_SCHEME_8="Сирень" +DESKTOP_SCHEME_9="Клён" +DESKTOP_SCHEME_10="Морская" +DESKTOP_SCHEME_11="Слива" +DESKTOP_SCHEME_12="Тыква" +DESKTOP_SCHEME_13="Дождливый день" +DESKTOP_SCHEME_14="ReactOS классическая" +DESKTOP_SCHEME_15="Роза" +DESKTOP_SCHEME_16="Песок" +DESKTOP_SCHEME_17="Небо" +DESKTOP_SCHEME_18="Шифер" +DESKTOP_SCHEME_19="Шторм" +DESKTOP_SCHEME_20="Зеленовато-голубая" +DESKTOP_SCHEME_21="Пшеница" TEMP_DIR="%USERPROFILE%\Local Settings\Temp" @@ -2596,40 +2596,40 @@ ; LANG_UKRAINIAN SUBLANG_NEUTRAL [Strings.0022] -POWERCFG_NAME_0="ÐÐ¾Ð¼Ð°ÑÐ½ÑÐ¹/ÐÑÑÑÐ½Ð¸Ð¹ ÐÐ°ÑÑÑÐ»ÑÐ½Ð¸Ð¹" -POWERCFG_DESC_0="Ð¦Ñ ÑÑÐµÐ¼Ð° Ð¿ÑÐ´ÑÐ¾Ð´Ð¸ÑÑ Ð´Ð»Ñ Ð±ÑÐ»ÑÑÐ¾ÑÑÑ Ð´Ð¾Ð¼Ð°ÑÐ½ÑÑ Ð°Ð±Ð¾ Ð½Ð°ÑÑÑÐ»ÑÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð¿'ÑÑÐµÑÑÐ², ÑÐºÑ Ð·Ð°Ð»Ð¸ÑÐ°ÑÑÑÑÑ Ð¿ÑÐ´ÐºÐ»ÑÑÐµÐ½Ð¸Ð¼Ð¸ Ð²ÐµÑÑ ÑÐ°Ñ." -POWERCFG_NAME_1="ÐÐ¾ÑÑÐ°ÑÐ¸Ð²Ð½Ð¸Ð¹/ÐÐ¾ÑÑÐ±ÑÐº" -POWERCFG_DESC_1="Ð¦Ñ ÑÑÐµÐ¼Ð° Ð¿ÑÐ¸Ð·Ð½Ð°ÑÐµÐ½Ð° Ð´Ð»Ñ Ð±ÑÐ»ÑÑ ÑÑÐ¸Ð²Ð°Ð»Ð¾Ñ ÑÐ¾Ð±Ð¾ÑÐ¸ Ð´Ð»Ñ Ð¿Ð¾ÑÑÐ°ÑÐ¸Ð²Ð½Ð¸Ñ ÐºÐ¾Ð¼Ð¿'ÑÑÐµÑÑÐ² Ð² Ð´Ð¾ÑÐ¾Ð·Ñ." -POWERCFG_NAME_2="ÐÑÐµÐ·ÐµÐ½ÑÐ°ÑÑÑ" -POWERCFG_DESC_2="Ð¦Ñ ÑÑÐµÐ¼Ð° ÑÑÑÐ¸Ð¼ÑÑ Ð¼Ð¾Ð½ÑÑÐ¾Ñ Ð²Ð²ÑÐ¼ÐºÐ½ÐµÐ½Ð¸Ð¼ Ð´Ð»Ñ Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð¿ÑÐµÐ·ÐµÐ½ÑÐ°ÑÑÐ¹." -POWERCFG_NAME_3="ÐÐ°Ð²Ð¶Ð´Ð¸ Ð²Ð²ÑÐ¼ÐºÐ½ÐµÐ½Ð¾" -POWERCFG_DESC_3="Ð¦Ñ ÑÑÐµÐ¼Ð° ÑÑÑÐ¸Ð¼ÑÑ ÐºÐ¾Ð¼Ð¿'ÑÑÐµÑ Ð² ÑÐ¾Ð±Ð¾ÑÑ, Ñ Ð²ÑÐ½ Ð¼Ð¾Ð¶Ðµ Ð±ÑÑÐ¸ Ð´Ð¾ÑÑÑÐ¿Ð½Ð¸Ð¹ Ð· Ð¼ÐµÑÐµÐ¶Ñ. ÐÐ¸ÐºÐ¾ÑÐ¸ÑÑÐ¾Ð²ÑÐ¹ÑÐµ ÑÑ ÑÑÐµÐ¼Ñ, ÑÐºÑÐ¾ Ñ Ð²Ð°Ñ Ð½ÐµÐ¼Ð°Ñ Ð¾Ð±Ð»Ð°Ð´Ð½Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ð¼ÐµÑÐµÐ¶ÐµÐ²Ð¾Ð³Ð¾ Ð¿ÑÐ¾Ð±ÑÐ´Ð¶ÐµÐ½Ð½Ñ." -POWERCFG_NAME_4="ÐÑÐ½ÑÐ¼Ð°Ð»ÑÐ½Ðµ ÐÐµÑÑÐ²Ð°Ð½Ð½Ñ ÐÐ»ÐµÐºÑÑÐ¾Ð¶Ð¸Ð²Ð»ÐµÐ½Ð½ÑÐ¼" -POWERCFG_DESC_4="Ð¦Ñ ÑÑÐµÐ¼Ð° ÑÑÑÐ¸Ð¼ÑÑ ÐºÐ¾Ð¼Ð¿'ÑÑÐµÑ Ð²Ð²ÑÐ¼ÐºÐ½ÐµÐ½Ð¸Ð¼ Ñ Ð¾Ð¿ÑÐ¸Ð¼ÑÐ·ÑÑ Ð¹Ð¾Ð³Ð¾ Ð´Ð»Ñ Ð²Ð¸ÑÐ¾ÐºÐ¾Ñ Ð¿ÑÐ¾Ð´ÑÐºÑÐ¸Ð²Ð½Ð¾ÑÑÑ." -POWERCFG_NAME_5="ÐÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑÐ½Ð° Ð±Ð°ÑÐ°ÑÐµÑ" -POWERCFG_DESC_5="Ð¦Ñ ÑÑÐµÐ¼Ð° Ñ Ð²ÐºÑÐ°Ð¹ Ð°Ð³ÑÐµÑÐ¸Ð²Ð½Ð¾Ñ Ð´Ð»Ñ ÐµÐºÐ¾Ð½Ð¾Ð¼ÑÑ ÐµÐ½ÐµÑÐ³ÑÑ." -DESKTOP_SCHEME_0="ReactOS Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½Ð°" -DESKTOP_SCHEME_1="Ð¦ÐµÐ³Ð»Ð°" -DESKTOP_SCHEME_2="ÐÐ°ÐºÐ»Ð°Ð¶Ð°Ð½" -DESKTOP_SCHEME_3="ÐÐµÐ»ÐµÐ½Ð° ÐÐ»Ð¸Ð²ÐºÐ°" -DESKTOP_SCHEME_4="ÐÐ¸ÑÐ¾ÐºÐ° ÐÐ¾Ð½ÑÑÐ°ÑÑÐ½ÑÑÑÑ 1" -DESKTOP_SCHEME_5="ÐÐ¸ÑÐ¾ÐºÐ° ÐÐ¾Ð½ÑÑÐ°ÑÑÐ½ÑÑÑÑ 2" -DESKTOP_SCHEME_6="ÐÐ¾Ð½ÑÑÐ°ÑÑÐ½Ð° Ð§Ð¾ÑÐ½Ð°" -DESKTOP_SCHEME_7="ÐÐ¾Ð½ÑÑÐ°ÑÑÐ½Ð° ÐÑÐ»Ð°" -DESKTOP_SCHEME_8="ÐÑÐ·Ð¾Ðº" -DESKTOP_SCHEME_9="ÐÐ»ÐµÐ½" -DESKTOP_SCHEME_10="ÐÐ¾ÑÑÑÐºÐ°" -DESKTOP_SCHEME_11="Ð¡Ð»Ð¸Ð²Ð°" -DESKTOP_SCHEME_12="ÐÐ°ÑÐ±ÑÐ·" -DESKTOP_SCHEME_13="ÐÐ¾ÑÐ¾Ð²Ð¸Ð¹ ÐÐµÐ½Ñ" -DESKTOP_SCHEME_14="ReactOS ÐÐ»Ð°ÑÐ¸ÑÐ½Ð°" -DESKTOP_SCHEME_15="Ð¢ÑÐ¾ÑÐ½Ð´Ð°" -DESKTOP_SCHEME_16="ÐÑÑÐ¾Ðº" -DESKTOP_SCHEME_17="ÐÐµÐ±Ð¾" -DESKTOP_SCHEME_18="Ð¨Ð¸ÑÐµÑ" -DESKTOP_SCHEME_19="Ð¨ÑÐ¾ÑÐ¼" -DESKTOP_SCHEME_20="ÐÐµÐ»ÐµÐ½Ð¾Ð²Ð°ÑÐ¾-Ð±Ð»Ð°ÐºÐ¸ÑÐ½Ð°" -DESKTOP_SCHEME_21="ÐÑÐµÐ½Ð¸ÑÑ" +POWERCFG_NAME_0="Домашній/Офісний Настільний" +POWERCFG_DESC_0="Ця схема підходить для більшості домашніх або настільних комп'ютерів, які залишаються підключеними весь час." +POWERCFG_NAME_1="Портативний/Ноутбук" +POWERCFG_DESC_1="Ця схема призначена для більш тривалої роботи для портативних комп'ютерів в дорозі." +POWERCFG_NAME_2="Презентація" +POWERCFG_DESC_2="Ця схема утримує монітор ввімкненим для ведення презентацій." +POWERCFG_NAME_3="Завжди ввімкнено" +POWERCFG_DESC_3="Ця схема утримує комп'ютер в роботі, і він може бути доступний з мережі. Використовуйте цю схему, якщо у вас немає обладнання для мережевого пробудження." +POWERCFG_NAME_4="Мінімальне Керування Електроживленням" +POWERCFG_DESC_4="Ця схема утримує комп'ютер ввімкненим і оптимізує його для високої продуктивності." +POWERCFG_NAME_5="Максимальна батарея" +POWERCFG_DESC_5="Ця схема є вкрай агресивною для економії енергії." +DESKTOP_SCHEME_0="ReactOS Стандартна" +DESKTOP_SCHEME_1="Цегла" +DESKTOP_SCHEME_2="Баклажан" +DESKTOP_SCHEME_3="Зелена Оливка" +DESKTOP_SCHEME_4="Висока Контрастність 1" +DESKTOP_SCHEME_5="Висока Контрастність 2" +DESKTOP_SCHEME_6="Контрастна Чорна" +DESKTOP_SCHEME_7="Контрастна Біла" +DESKTOP_SCHEME_8="Бузок" +DESKTOP_SCHEME_9="Клен" +DESKTOP_SCHEME_10="Морська" +DESKTOP_SCHEME_11="Слива" +DESKTOP_SCHEME_12="Гарбуз" +DESKTOP_SCHEME_13="Дощовий День" +DESKTOP_SCHEME_14="ReactOS Класична" +DESKTOP_SCHEME_15="Троянда" +DESKTOP_SCHEME_16="Пісок" +DESKTOP_SCHEME_17="Небо" +DESKTOP_SCHEME_18="Шифер" +DESKTOP_SCHEME_19="Шторм" +DESKTOP_SCHEME_20="Зеленовато-блакитна" +DESKTOP_SCHEME_21="Пшениця" TEMP_DIR="%USERPROFILE%\Local Settings\Temp" Propchange: trunk/reactos/boot/bootdata/hivedef.inf ------------------------------------------------------------------------------ svn:mime-type = text/plain;charset=UTF-16LE

1 0

[tkreuzer] 63451: [NTOSKRNL] Revert unwanted white space changes
by tkreuzer＠svn.reactos.org 25 May '14

25 May '14

Author: tkreuzer Date: Sun May 25 20:10:31 2014 New Revision: 63451 URL: http://svn.reactos.org/svn/reactos?rev=63451&view=rev Log: [NTOSKRNL] Revert unwanted white space changes Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sun May 25 20:10:31 2014 @@ -4572,44 +4572,44 @@ { Status = STATUS_NO_MEMORY; goto FailPath; - } - } - else - { - /* Make sure it doesn't conflict with an existing allocation */ - Result = MiCheckForConflictingNode(StartingAddress >> PAGE_SHIFT, - EndingAddress >> PAGE_SHIFT, - &Process->VadRoot, - &Parent); - if (Result == TableFoundNode) - { - // - // The address specified is in conflict! - // - Status = STATUS_CONFLICTING_ADDRESSES; - goto FailPath; - } - } - - // - // Write out the VAD fields for this allocation - // - Vad->StartingVpn = StartingAddress >> PAGE_SHIFT; - Vad->EndingVpn = EndingAddress >> PAGE_SHIFT; - - // - // FIXME: Should setup VAD bitmap - // - Status = STATUS_SUCCESS; - - // - // Lock the working set and insert the VAD into the process VAD tree - // - MiLockProcessWorkingSetUnsafe(Process, CurrentThread); - Vad->ControlArea = NULL; // For Memory-Area hack - Process->VadRoot.NodeHint = Vad; - MiInsertNode(&Process->VadRoot, (PVOID)Vad, Parent, Result); - MiUnlockProcessWorkingSetUnsafe(Process, CurrentThread); + } + } + else + { + /* Make sure it doesn't conflict with an existing allocation */ + Result = MiCheckForConflictingNode(StartingAddress >> PAGE_SHIFT, + EndingAddress >> PAGE_SHIFT, + &Process->VadRoot, + &Parent); + if (Result == TableFoundNode) + { + // + // The address specified is in conflict! + // + Status = STATUS_CONFLICTING_ADDRESSES; + goto FailPath; + } + } + + // + // Write out the VAD fields for this allocation + // + Vad->StartingVpn = StartingAddress >> PAGE_SHIFT; + Vad->EndingVpn = EndingAddress >> PAGE_SHIFT; + + // + // FIXME: Should setup VAD bitmap + // + Status = STATUS_SUCCESS; + + // + // Lock the working set and insert the VAD into the process VAD tree + // + MiLockProcessWorkingSetUnsafe(Process, CurrentThread); + Vad->ControlArea = NULL; // For Memory-Area hack + Process->VadRoot.NodeHint = Vad; + MiInsertNode(&Process->VadRoot, (PVOID)Vad, Parent, Result); + MiUnlockProcessWorkingSetUnsafe(Process, CurrentThread); // // Make sure the actual region size is at least as big as the

1 0

[akhaldi] 63450: [PSDK] * Fix an ARM ifdef.
by akhaldi＠svn.reactos.org 25 May '14

25 May '14

Author: akhaldi Date: Sun May 25 19:28:14 2014 New Revision: 63450 URL: http://svn.reactos.org/svn/reactos?rev=63450&view=rev Log: [PSDK] * Fix an ARM ifdef. Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sun May 25 19:28:14 2014 @@ -3310,7 +3310,7 @@ DWORD Fill[2]; } CONTEXT; -#elif defined(ARM) +#elif defined(_ARM_) #ifndef PAGE_SIZE #define PAGE_SIZE 0x1000 // FIXME: This should probably go elsewhere

1 0

[tkreuzer] 63449: [NTOSKRNL] Implement prototype PTE support in MiGetPageProtection. Should hopefully fix crashes with OllyDbg.
by tkreuzer＠svn.reactos.org 25 May '14

25 May '14

Author: tkreuzer Date: Sun May 25 19:13:32 2014 New Revision: 63449 URL: http://svn.reactos.org/svn/reactos?rev=63449&view=rev Log: [NTOSKRNL] Implement prototype PTE support in MiGetPageProtection. Should hopefully fix crashes with OllyDbg. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sun May 25 19:13:32 2014 @@ -1261,6 +1261,11 @@ { MMPTE TempPte; PMMPFN Pfn; + PEPROCESS CurrentProcess; + PETHREAD CurrentThread; + BOOLEAN WsSafe, WsShared; + ULONG Protect; + KIRQL OldIrql; PAGED_CODE(); /* Copy this PTE's contents */ @@ -1270,12 +1275,79 @@ ASSERT(TempPte.u.Long); /* Check for a special prototype format */ - if (TempPte.u.Soft.Valid == 0 && - TempPte.u.Soft.Prototype == 1) - { - /* Unsupported now */ - UNIMPLEMENTED; - ASSERT(FALSE); + if ((TempPte.u.Soft.Valid == 0) && + (TempPte.u.Soft.Prototype == 1)) + { + /* Check if the prototype PTE is not yet pointing to a PTE */ + if (TempPte.u.Soft.PageFileHigh == MI_PTE_LOOKUP_NEEDED) + { + /* The prototype PTE contains the protection */ + return MmProtectToValue[TempPte.u.Soft.Protection]; + } + + /* Get a pointer to the underlying shared PTE */ + PointerPte = MiProtoPteToPte(&TempPte); + + /* Since the PTE we want to read can be paged out at any time, we need + to release the working set lock first, so that it can be paged in */ + CurrentThread = PsGetCurrentThread(); + CurrentProcess = PsGetCurrentProcess(); + MiUnlockProcessWorkingSetForFault(CurrentProcess, + CurrentThread, + &WsSafe, + &WsShared); + + /* Now read the PTE value */ + TempPte = *PointerPte; + + /* Check if that one is invalid */ + if (!TempPte.u.Hard.Valid) + { + /* We get the protection directly from this PTE */ + Protect = MmProtectToValue[TempPte.u.Soft.Protection]; + } + else + { + /* The PTE is valid, so we might need to get the protection from + the PFN. Lock the PFN database */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* Check if the PDE is still valid */ + if (MiAddressToPte(PointerPte)->u.Hard.Valid == 0) + { + /* It's not, make it valid */ + MiMakeSystemAddressValidPfn(PointerPte, OldIrql); + } + + /* Now it's safe to read the PTE value again */ + TempPte = *PointerPte; + ASSERT(TempPte.u.Long != 0); + + /* Check again if the PTE is invalid */ + if (!TempPte.u.Hard.Valid) + { + /* The PTE is not valid, so we can use it's protection field */ + Protect = MmProtectToValue[TempPte.u.Soft.Protection]; + } + else + { + /* The PTE is valid, so we can find the protection in the + OriginalPte field of the PFN */ + Pfn = MI_PFN_ELEMENT(TempPte.u.Hard.PageFrameNumber); + Protect = MmProtectToValue[Pfn->OriginalPte.u.Soft.Protection]; + } + + /* Release the PFN database */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + } + + /* Lock the working set again */ + MiLockProcessWorkingSetForFault(CurrentProcess, + CurrentThread, + WsSafe, + WsShared); + + return Protect; } /* In the easy case of transition or demand zero PTE just return its protection */ @@ -4500,44 +4572,44 @@ { Status = STATUS_NO_MEMORY; goto FailPath; - } - } - else - { - /* Make sure it doesn't conflict with an existing allocation */ - Result = MiCheckForConflictingNode(StartingAddress >> PAGE_SHIFT, - EndingAddress >> PAGE_SHIFT, - &Process->VadRoot, - &Parent); - if (Result == TableFoundNode) - { - // - // The address specified is in conflict! - // - Status = STATUS_CONFLICTING_ADDRESSES; - goto FailPath; - } - } - - // - // Write out the VAD fields for this allocation - // - Vad->StartingVpn = StartingAddress >> PAGE_SHIFT; - Vad->EndingVpn = EndingAddress >> PAGE_SHIFT; - - // - // FIXME: Should setup VAD bitmap - // - Status = STATUS_SUCCESS; - - // - // Lock the working set and insert the VAD into the process VAD tree - // - MiLockProcessWorkingSetUnsafe(Process, CurrentThread); - Vad->ControlArea = NULL; // For Memory-Area hack - Process->VadRoot.NodeHint = Vad; - MiInsertNode(&Process->VadRoot, (PVOID)Vad, Parent, Result); - MiUnlockProcessWorkingSetUnsafe(Process, CurrentThread); + } + } + else + { + /* Make sure it doesn't conflict with an existing allocation */ + Result = MiCheckForConflictingNode(StartingAddress >> PAGE_SHIFT, + EndingAddress >> PAGE_SHIFT, + &Process->VadRoot, + &Parent); + if (Result == TableFoundNode) + { + // + // The address specified is in conflict! + // + Status = STATUS_CONFLICTING_ADDRESSES; + goto FailPath; + } + } + + // + // Write out the VAD fields for this allocation + // + Vad->StartingVpn = StartingAddress >> PAGE_SHIFT; + Vad->EndingVpn = EndingAddress >> PAGE_SHIFT; + + // + // FIXME: Should setup VAD bitmap + // + Status = STATUS_SUCCESS; + + // + // Lock the working set and insert the VAD into the process VAD tree + // + MiLockProcessWorkingSetUnsafe(Process, CurrentThread); + Vad->ControlArea = NULL; // For Memory-Area hack + Process->VadRoot.NodeHint = Vad; + MiInsertNode(&Process->VadRoot, (PVOID)Vad, Parent, Result); + MiUnlockProcessWorkingSetUnsafe(Process, CurrentThread); // // Make sure the actual region size is at least as big as the

1 0

[akhaldi] 63448: [CMAKE] * Include the dummy source file for the PSEH ARM build too.
by akhaldi＠svn.reactos.org 25 May '14

25 May '14

Author: akhaldi Date: Sun May 25 19:04:21 2014 New Revision: 63448 URL: http://svn.reactos.org/svn/reactos?rev=63448&view=rev Log: [CMAKE] * Include the dummy source file for the PSEH ARM build too. Modified: trunk/reactos/lib/pseh/CMakeLists.txt Modified: trunk/reactos/lib/pseh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/CMakeLists.txt?re… ============================================================================== --- trunk/reactos/lib/pseh/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/CMakeLists.txt [iso-8859-1] Sun May 25 19:04:21 2014 @@ -29,14 +29,13 @@ list(APPEND ASM_SOURCE i386/seh.s i386/seh_prolog.s) - list(APPEND SOURCE dummy.c) elseif(ARCH STREQUAL "amd64") list(APPEND ASM_SOURCE amd64/seh.s amd64/seh_prolog.s) - list(APPEND SOURCE dummy.c) endif() + list(APPEND SOURCE dummy.c) add_asm_files(pseh_asm ${ASM_SOURCE}) add_library(pseh ${SOURCE} ${pseh_asm}) add_dependencies(pseh asm)

1 0

[akhaldi] 63447: [MSVCRT] * Zap some commented out exports that do not exist in native. CORE-8174
by akhaldi＠svn.reactos.org 25 May '14

25 May '14

Author: akhaldi Date: Sun May 25 17:55:48 2014 New Revision: 63447 URL: http://svn.reactos.org/svn/reactos?rev=63447&view=rev Log: [MSVCRT] * Zap some commented out exports that do not exist in native. CORE-8174 Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.sp… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Sun May 25 17:55:48 2014 @@ -478,131 +478,58 @@ @ cdecl _mbctoupper(long) @ extern _mbctype @ cdecl _mbsbtype(str long) -# stub _mbsbtype_l @ cdecl _mbscat(str str) -# stub _mbscat_s -# stub _mbscat_s_l @ cdecl _mbschr(str long) -# stub _mbschr_l @ cdecl _mbscmp(str str) -# stub _mbscmp_l @ cdecl _mbscoll(str str) -# stub _mbscoll_l @ cdecl _mbscpy(ptr str) -# stub _mbscpy_s -# stub _mbscpy_s_l @ cdecl _mbscspn(str str) -# stub _mbscspn_l @ cdecl _mbsdec(ptr ptr) -# stub _mbsdec_l @ cdecl _mbsdup(str) -# stub _strdup_dbg @ cdecl _mbsicmp(str str) -# stub _mbsicmp_l @ cdecl _mbsicoll(str str) -# stub _mbsicoll_l @ cdecl _mbsinc(str) -# stub _mbsinc_l @ cdecl _mbslen(str) -# stub _mbslen_l @ cdecl _mbslwr(str) -# stub _mbslwr_l -# stub _mbslwr_s -# stub _mbslwr_s_l @ cdecl _mbsnbcat(str str long) -# stub _mbsnbcat_l -# stub _mbsnbcat_s -# stub _mbsnbcat_s_l @ cdecl _mbsnbcmp(str str long) -# stub _mbsnbcmp_l @ cdecl _mbsnbcnt(ptr long) -# stub _mbsnbcnt_l @ cdecl _mbsnbcoll(str str long) -# stub _mbsnbcoll_l @ cdecl _mbsnbcpy(ptr str long) -# stub _mbsnbcpy_l @ cdecl _mbsnbcpy_s(ptr long str long) -# stub _mbsnbcpy_s_l @ cdecl _mbsnbicmp(str str long) -# stub _mbsnbicmp_l @ cdecl _mbsnbicoll(str str long) -# stub _mbsnbicoll_l @ cdecl _mbsnbset(str long long) -# stub _mbsnbset_l -# stub _mbsnbset_s -# stub _mbsnbset_s_l @ cdecl _mbsncat(str str long) -# stub _mbsncat_l -# stub _mbsncat_s -# stub _mbsncat_s_l @ cdecl _mbsnccnt(str long) -# stub _mbsnccnt_l @ cdecl _mbsncmp(str str long) -# stub _mbsncmp_l @ cdecl _mbsncoll(str str long) -# stub _mbsncoll_l @ cdecl _mbsncpy(str str long) -# stub _mbsncpy_l -# stub _mbsncpy_s -# stub _mbsncpy_s_l @ cdecl _mbsnextc(str) -# stub _mbsnextc_l @ cdecl _mbsnicmp(str str long) -# stub _mbsnicmp_l @ cdecl _mbsnicoll(str str long) -# stub _mbsnicoll_l @ cdecl _mbsninc(str long) -# stub _mbsninc_l -# stub _mbsnlen -# stub _mbsnlen_l @ cdecl _mbsnset(str long long) -# stub _mbsnset_l -# stub _mbsnset_s -# stub _mbsnset_s_l @ cdecl _mbspbrk(str str) -# stub _mbspbrk_l @ cdecl _mbsrchr(str long) -# stub _mbsrchr_l @ cdecl _mbsrev(str) -# stub _mbsrev_l @ cdecl _mbsset(str long) -# stub _mbsset_l -# stub _mbsset_s -# stub _mbsset_s_l @ cdecl _mbsspn(str str) -# stub _mbsspn_l @ cdecl _mbsspnp(str str) -# stub _mbsspnp_l @ cdecl _mbsstr(str str) -# stub _mbsstr_l @ cdecl _mbstok(str str) -# stub _mbstok_l -# stub _mbstok_s -# stub _mbstok_s_l -# stub _mbstowcs_l -# stub _mbstowcs_s_l @ cdecl _mbstrlen(str) -# stub _mbstrlen_l -# stub _mbstrnlen -# stub _mbstrnlen_l @ cdecl _mbsupr(str) -# stub _mbsupr_l -# stub _mbsupr_s -# stub _mbsupr_s_l -# stub _mbtowc_l @ cdecl _memccpy(ptr ptr long long) @ cdecl _memicmp(str str long) -# stub _memicmp_l @ cdecl _mkdir(str) @ cdecl _mkgmtime(ptr) @ cdecl _mkgmtime32(ptr) @ cdecl _mkgmtime64(ptr) @ cdecl _mktemp(str) -# stub _mktemp_s @ cdecl _mktime32(ptr) @ cdecl _mktime64(ptr) @ cdecl _msize(ptr) -# stub _msize_debug @ cdecl _nextafter(double double) @ cdecl _onexit(ptr) @ varargs _open(str long) @@ -617,20 +544,14 @@ @ extern _pgmptr @ cdecl _pipe(ptr long long) @ cdecl _popen(str str) -# stub _printf_l -# stub _printf_p -# stub _printf_p_l -# stub _printf_s_l @ cdecl _purecall() @ cdecl _putch(long) @ cdecl _putenv(str) -# stub _putenv_s @ cdecl _putw(long ptr) @ cdecl _putwch(long) @ cdecl _putws(wstr) # extern _pwctype @ cdecl _read(long ptr long) -# stub _realloc_dbg @ cdecl _resetstkoflw() @ cdecl _rmdir(str) @ cdecl _rmtmp() @@ -643,26 +564,16 @@ @ cdecl -arch=i386 _safe_fprem() @ cdecl -arch=i386 _safe_fprem1() @ cdecl _scalb(double long) -# @ varargs _scanf_l(str ptr) -# @ varargs _scanf_s_l(str ptr) # stub _scprintf -# stub _scprintf_l -# stub _scprintf_p_l # stub _scwprintf -# stub _scwprintf_l -# stub _scwprintf_p_l @ cdecl _searchenv(str str ptr) @ cdecl _searchenv_s(str str ptr long) @ stdcall -i386 _seh_longjmp_unwind4(ptr) @ stdcall -i386 _seh_longjmp_unwind(ptr) # stub _set_SSE2_enable -# stub _set_controlfp @ cdecl _set_doserrno(long) @ cdecl _set_errno(long) @ cdecl _set_error_mode(long) -# stub _set_fileinfo -# stub _set_fmode -# stub _set_output_format @ cdecl _set_sbh_threshold(long) @ cdecl _seterrormode(long) @ cdecl -arch=i386,x86_64 -norelay _setjmp(ptr) @@ -674,23 +585,11 @@ @ cdecl _setsystime(ptr long) @ cdecl _sleep(long) @ varargs _snprintf(ptr long str) -# stub _snprintf_c -# stub _snprintf_c_l -# stub _snprintf_l @ varargs _snprintf_s(ptr long long ptr) -# stub _snprintf_s_l # stub _snscanf -# stub _snscanf_l -# stub _snscanf_s -# stub _snscanf_s_l @ varargs _snwprintf(ptr long wstr) -# stub _snwprintf_l @ varargs _snwprintf_s(ptr long long ptr) -# stub _snwprintf_s_l # stub _snwscanf -# stub _snwscanf_l -# stub _snwscanf_s -# stub _snwscanf_s_l @ varargs _sopen(str long long) @ cdecl _sopen_s(ptr str long long long) @ varargs _spawnl(long str str) @@ -703,79 +602,39 @@ @ cdecl _spawnvpe(long str ptr ptr) @ cdecl _splitpath(str ptr ptr ptr ptr) @ cdecl _splitpath_s(str ptr long ptr long ptr long ptr long) -# stub _sprintf_l -# stub _sprintf_p_l -# stub _sprintf_s_l -# @ varargs _sscanf_l(str str ptr) -# @ varargs _sscanf_s_l(str str ptr) @ cdecl _stat(str ptr) @ cdecl _stat64(str ptr) @ cdecl _stati64(str ptr) @ cdecl _statusfp() @ cdecl _strcmpi(str str) -# stub _strcoll_l @ cdecl _strdate(ptr) -# stub _strdate_s @ cdecl _strdup(str) -# stub _strdup_dbg @ cdecl _strerror(long) -# stub _strerror_s @ cdecl _stricmp(str str) -# stub _stricmp_l @ cdecl _stricoll(str str) -# stub _stricoll_l @ cdecl _strlwr(str) -# stub _strlwr_l -# stub _strlwr_s -# stub _strlwr_s_l @ cdecl _strncoll(str str long) -# stub _strncoll_l @ cdecl _strnicmp(str str long) -# stub _strnicmp_l @ cdecl _strnicoll(str str long) -# stub _strnicoll_l @ cdecl _strnset(str long long) -# stub _strnset_s @ cdecl _strrev(str) @ cdecl _strset(str long) -# stub _strset_s @ cdecl _strtime(ptr) -# stub _strtime_s -# @ cdecl _strtod_l(str ptr ptr) @ cdecl _strtoi64(str ptr long) -# @ cdecl _strtoi64_l(str ptr long ptr) -# stub _strtol_l @ cdecl _strtoui64(str ptr long) strtoull -# @ cdecl _strtoui64_l(str ptr long ptr) -# stub _strtoul_l @ cdecl _strupr(str) -# stub _strupr_l -# stub _strupr_s -# stub _strupr_s_l -# stub _strxfrm_l @ cdecl _swab(str str long) @ varargs _swprintf(ptr str) swprintf -# stub _swprintf_c -# stub _swprintf_c_l -# stub _swprintf_p_l -# stub _swprintf_s_l -# @ varargs _swscanf_l(wstr wstr ptr) -# @ varargs _swscanf_s_l(wstr wstr ptr) @ extern _sys_errlist @ extern _sys_nerr @ cdecl _tell(long) @ cdecl -ret64 _telli64(long) @ cdecl _tempnam(str str) -# stub _tempnam_dbg @ cdecl _time32(ptr) @ cdecl _time64(ptr) @ extern _timezone @ cdecl _tolower(long) -# stub _tolower_l @ cdecl _toupper(long) -# stub _toupper_l -# stub _towlower_l -# stub _towupper_l @ extern _tzname @ cdecl _tzset() @ cdecl _ui64toa(long long ptr long) @@ -783,11 +642,8 @@ @ cdecl _ui64tow(long long ptr long) @ cdecl _ui64tow_s(long long ptr long long) @ cdecl _ultoa(long ptr long) -# stub _ultoa_s @ cdecl _ultow(long ptr long) -# stub _ultow_s @ cdecl _umask(long) -# stub _umask_s @ cdecl _ungetch(long) # stub _ungetwch @ cdecl _unlink(str) @@ -795,115 +651,45 @@ @ cdecl _unlock(long) @ cdecl _utime32(str ptr) @ cdecl _utime64(str ptr) -# stub _vcprintf -# stub _vcprintf_l -# stub _vcprintf_p -# stub _vcprintf_p_l -# stub _vcprintf_s -# stub _vcprintf_s_l @ cdecl _vcwprintf(wstr ptr) -# stub _vcwprintf_l -# stub _vcwprintf_p -# stub _vcwprintf_p_l -# stub _vcwprintf_s -# stub _vcwprintf_s_l -# stub _vfprintf_l -# stub _vfprintf_p -# stub _vfprintf_p_l -# stub _vfprintf_s_l -# stub _vfwprintf_l -# stub _vfwprintf_p -# stub _vfwprintf_p_l -# stub _vfwprintf_s_l -# stub _vprintf_l -# stub _vprintf_p -# stub _vprintf_p_l -# stub _vprintf_s_l @ cdecl _utime(str ptr) @ cdecl _vscprintf(str ptr) -# stub _vscprintf_l -# stub _vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) -# stub _vscwprintf_l -# stub _vscwprintf_p_l @ cdecl _vsnprintf(ptr long str ptr) @ cdecl _vsnprintf_c(ptr long str ptr) _vsnprintf -# @ cdecl _vsnprintf_c_l(ptr long str ptr ptr) _vsnprintf_l -# @ cdecl _vsnprintf_l(ptr long str ptr ptr) @ cdecl _vsnprintf_s(ptr long long str ptr) -# @ cdecl _vsnprintf_s_l(ptr long long str ptr ptr) @ cdecl _vsnwprintf(ptr long wstr ptr) -# @ cdecl _vsnwprintf_l(ptr long wstr ptr ptr) @ cdecl _vsnwprintf_s(ptr long long wstr ptr) -# @ cdecl _vsnwprintf_s_l(ptr long long wstr ptr ptr) -# stub _vsprintf_l @ cdecl _vsprintf_p(ptr long str ptr) -# stub _vsprintf_p_l -# stub _vsprintf_s_l -# @ cdecl _vswprintf(ptr wstr ptr) @ cdecl _vswprintf_c(ptr long wstr ptr) _vsnwprintf -# @ cdecl _vswprintf_c_l(ptr long wstr ptr ptr) _vsnwprintf_l -# @ cdecl _vswprintf_l(ptr wstr ptr ptr) -# @ cdecl _vswprintf_p_l(ptr long wstr ptr ptr) _vsnwprintf_l -# @ cdecl _vswprintf_s_l(ptr long wstr ptr ptr) -# stub _vwprintf_l -# stub _vwprintf_p -# stub _vwprintf_p_l -# stub _vwprintf_s_l @ cdecl _waccess(wstr long) @ cdecl _waccess_s(wstr long) @ cdecl _wasctime(ptr) -# stub _wasctime_s -# stub _wassert @ cdecl _wchdir(wstr) @ cdecl _wchmod(wstr long) @ extern _wcmdln @ cdecl _wcreat(wstr long) -# stub _wcscoll_l @ cdecl _wcsdup(wstr) -# stub _wcsdup_dbg @ cdecl _wcserror(long) @ cdecl _wcserror_s(ptr long long) -# stub _wcsftime_l @ cdecl _wcsicmp(wstr wstr) -# stub _wcsicmp_l @ cdecl _wcsicoll(wstr wstr) -# stub _wcsicoll_l @ cdecl _wcslwr(wstr) -# stub _wcslwr_l @ cdecl _wcslwr_s(wstr long) -# stub _wcslwr_s_l @ cdecl _wcsncoll(wstr wstr long) -# stub _wcsncoll_l @ cdecl _wcsnicmp(wstr wstr long) -# stub _wcsnicmp_l @ cdecl _wcsnicoll(wstr wstr long) -# stub _wcsnicoll_l @ cdecl _wcsnset(wstr long long) -# stub _wcsnset_s @ cdecl _wcsrev(wstr) @ cdecl _wcsset(wstr long) -# stub _wcsset_s @ cdecl _wcstoi64(wstr ptr long) -# @ cdecl _wcstoi64_l(wstr ptr long ptr) -# stub _wcstol_l @ cdecl _wcstombs_l(ptr ptr long ptr) -# @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) @ cdecl _wcstoui64(wstr ptr long) -# @ cdecl _wcstoui64_l(wstr ptr long ptr) -# stub _wcstoul_l @ cdecl _wcsupr(wstr) -# stub _wcsupr_l @ cdecl _wcsupr_s(wstr long) -# stub _wcsupr_s_l -# stub _wcsxfrm_l @ cdecl _wctime(ptr) @ cdecl _wctime32(ptr) -# stub _wctime32_s @ cdecl _wctime64(ptr) -# stub _wctime64_s -# stub _wctomb_l -# stub _wctomb_s_l # stub _wctype @ extern _wenviron @ varargs _wexecl(wstr wstr) @@ -924,42 +710,28 @@ @ cdecl _wfopen(wstr wstr) @ cdecl _wfopen_s(ptr wstr wstr) @ cdecl _wfreopen(wstr wstr ptr) -# stub _wfreopen_s @ cdecl _wfsopen(wstr wstr long) @ cdecl _wfullpath(ptr wstr long) -# stub _wfullpath_dbg @ cdecl _wgetcwd(wstr long) @ cdecl _wgetdcwd(long wstr long) @ cdecl _wgetenv(wstr) -# stub _wgetenv_s @ extern _winmajor @ extern _winminor -# stub _winput_s @ extern _winver @ cdecl _wmakepath(ptr wstr wstr wstr wstr) @ cdecl _wmakepath_s(ptr long wstr wstr wstr wstr) @ cdecl _wmkdir(wstr) @ cdecl _wmktemp(wstr) -# stub _wmktemp_s @ varargs _wopen(wstr long) -# stub _woutput_s @ cdecl _wperror(wstr) @ extern _wpgmptr @ cdecl _wpopen(wstr wstr) -# stub _wprintf_l -# stub _wprintf_p -# stub _wprintf_p_l -# stub _wprintf_s_l @ cdecl _wputenv(wstr) -# stub _wputenv_s @ cdecl _wremove(wstr) @ cdecl _wrename(wstr wstr) @ cdecl _write(long ptr long) @ cdecl _wrmdir(wstr) -# @ varargs _wscanf_l(wstr ptr) -# @ varargs _wscanf_s_l(wstr ptr) @ cdecl _wsearchenv(wstr wstr ptr) -# stub _wsearchenv_s @ cdecl _wsetlocale(long wstr) @ varargs _wsopen(wstr long long) @ cdecl _wsopen_s(ptr wstr long long long) @@ -977,22 +749,14 @@ @ cdecl _wstati64(wstr ptr) @ cdecl _wstat64(wstr ptr) @ cdecl _wstrdate(ptr) -# stub _wstrdate_s @ cdecl _wstrtime(ptr) -# stub _wstrtime_s @ cdecl _wsystem(wstr) @ cdecl _wtempnam(wstr wstr) -# stub _wtempnam_dbg @ cdecl _wtmpnam(ptr) -# stub _wtmpnam_s # @ cdecl _wtof(wstr) -# @ cdecl _wtof_l(wstr ptr) @ cdecl _wtoi(wstr) @ cdecl _wtoi64(wstr) -# stub _wtoi64_l -# stub _wtoi_l @ cdecl _wtol(wstr) -# stub _wtol_l @ cdecl _wunlink(wstr) @ cdecl _wutime(wstr ptr) @ cdecl _wutime32(wstr ptr) @@ -1004,7 +768,6 @@ @ cdecl abs(long) @ cdecl acos(double) @ cdecl asctime(ptr) -# stub asctime_s @ cdecl asin(double) @ cdecl atan(double) @ cdecl atan2(double double) @@ -1013,13 +776,10 @@ @ cdecl atoi(str) @ cdecl atol(str) @ cdecl bsearch(ptr ptr long long ptr) -# stub bsearch_s -# @ cdecl btowc(long) @ cdecl calloc(long long) @ cdecl ceil(double) @ cdecl -arch=x86_64 ceilf(double) @ cdecl clearerr(ptr) -# stub clearerr_s @ cdecl clock() @ cdecl cos(double) @ cdecl -arch=x86_64 cosf(double) @@ -1054,10 +814,8 @@ @ cdecl fread(ptr long long ptr) @ cdecl free(ptr) @ cdecl freopen(str str ptr) -# stub freopen_s @ cdecl frexp(double ptr) @ varargs fscanf(ptr str) -# @ varargs fscanf_s(ptr str) @ cdecl fseek(ptr long long) @ cdecl fsetpos(ptr ptr) @ cdecl ftell(ptr) @@ -1065,11 +823,9 @@ @ varargs fwprintf_s(ptr wstr) @ cdecl fwrite(ptr long long ptr) @ varargs fwscanf(ptr wstr) -# @ varargs fwscanf_s(ptr wstr) @ cdecl getc(ptr) @ cdecl getchar() @ cdecl getenv(str) -# stub getenv_s @ cdecl gets(str) @ cdecl getwc(ptr) @ cdecl getwchar() @@ -1112,10 +868,6 @@ @ cdecl malloc(long) @ cdecl mblen(ptr long) @ cdecl mbrlen(ptr long ptr) -# stub mbrtowc -# stub mbsdup_dbg -# stub mbsrtowcs -# stub mbsrtowcs_s @ cdecl mbstowcs(ptr str long) @ cdecl mbtowc(wstr str long) @ cdecl memchr(ptr long long) @@ -1138,7 +890,6 @@ @ cdecl putwc(long ptr) fputwc @ cdecl putwchar(long) _fputwchar @ cdecl qsort(ptr long long ptr) -# stub qsort_s @ cdecl raise(long) @ cdecl rand() @ cdecl rand_s(ptr) @@ -1147,7 +898,6 @@ @ cdecl rename(str str) @ cdecl rewind(ptr) @ varargs scanf(str) -# @ varargs scanf_s(str) @ cdecl setbuf(ptr ptr) @ cdecl -arch=x86_64 -norelay -private setjmp(ptr ptr) _setjmp @ cdecl setlocale(long str)

1 0

[akhaldi] 63446: [MSVCRT] * Zap some commented out exports that do not exist in native. CORE-8174
by akhaldi＠svn.reactos.org 25 May '14

25 May '14

Author: akhaldi Date: Sun May 25 17:04:44 2014 New Revision: 63446 URL: http://svn.reactos.org/svn/reactos?rev=63446&view=rev Log: [MSVCRT] * Zap some commented out exports that do not exist in native. CORE-8174 Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.sp… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Sun May 25 17:04:44 2014 @@ -111,31 +111,6 @@ @ cdecl -arch=i386 _CIsqrt() @ cdecl -arch=i386 _CItan() @ cdecl -arch=i386 _CItanh() -# stub _CrtCheckMemory -# stub _CrtDbgBreak -# stub _CrtDbgReport -# stub _CrtDbgReportV -# stub _CrtDbgReportW -# stub _CrtDbgReportWV -# stub _CrtDoForAllClientObjects -# stub _CrtDumpMemoryLeaks -# stub _CrtIsMemoryBlock -# stub _CrtIsValidHeapPointer -# stub _CrtIsValidPointer -# stub _CrtMemCheckpoint -# stub _CrtMemDifference -# stub _CrtMemDumpAllObjectsSince -# stub _CrtMemDumpStatistics -# stub _CrtReportBlockType -# stub _CrtSetAllocHook -# stub _CrtSetBreakAlloc -# stub _CrtSetDbgBlockType -# stub _CrtSetDbgFlag -# stub _CrtSetDumpClient -# stub _CrtSetReportFile -# stub _CrtSetReportHook -# stub _CrtSetReportHook2 -# stub _CrtSetReportMode @ stdcall _CxxThrowException(long long) @ cdecl -i386 -norelay _EH_prolog() @ cdecl _Getdays() @@ -146,7 +121,6 @@ @ cdecl _XcptFilter(long ptr) @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) @ cdecl __CppXcptFilter(long ptr) -# stub __CxxCallUnwindDelDtor # stub __CxxCallUnwindDtor # stub __CxxCallUnwindVecDtor @ cdecl __CxxDetectRethrow(ptr) @@ -190,31 +164,9 @@ @ cdecl __iscsym(long) @ cdecl __iscsymf(long) @ extern __lc_codepage -# @ stub __lc_collate # not in XP / 7 @ extern __lc_collate_cp MSVCRT___lc_collate_cp @ extern __lc_handle MSVCRT___lc_handle @ cdecl __lconv_init() -# stub __libm_sse2_acos -# stub __libm_sse2_acosf -# stub __libm_sse2_asin -# stub __libm_sse2_asinf -# stub __libm_sse2_atan -# stub __libm_sse2_atan2 -# stub __libm_sse2_atanf -# stub __libm_sse2_cos -# stub __libm_sse2_cosf -# stub __libm_sse2_exp -# stub __libm_sse2_expf -# stub __libm_sse2_log -# stub __libm_sse2_log10 -# stub __libm_sse2_log10f -# stub __libm_sse2_logf -# stub __libm_sse2_pow -# stub __libm_sse2_powf -# stub __libm_sse2_sin -# stub __libm_sse2_sinf -# stub __libm_sse2_tan -# stub __libm_sse2_tanf @ extern __mb_cur_max @ cdecl -arch=i386 __p___argc() @ cdecl -arch=i386 __p___argv() @@ -252,7 +204,6 @@ @ cdecl __set_app_type(long) @ extern __setlc_active @ cdecl __setusermatherr(ptr) -# stub __strncnt @ cdecl __threadhandle() kernel32.GetCurrentThread @ cdecl __threadid() kernel32.GetCurrentThreadId @ cdecl __toascii(long) @@ -262,7 +213,6 @@ @ extern __wargv __wargv @ cdecl __wcserror(wstr) @ cdecl __wcserror_s(ptr long wstr) -# stub __wcsncnt @ cdecl __wgetmainargs(ptr ptr ptr long ptr) @ extern __winitenv @ cdecl _abnormal_termination() @@ -286,48 +236,30 @@ @ extern -arch=i386 _adjust_fdiv @ extern _aexit_rtn @ cdecl _aligned_free(ptr) -# stub _aligned_free_dbg @ cdecl _aligned_malloc(long long) -# stub _aligned_malloc_dbg @ cdecl _aligned_offset_malloc(long long long) -# stub _aligned_offset_malloc_dbg @ cdecl _aligned_offset_realloc(ptr long long long) -# stub _aligned_offset_realloc_dbg @ cdecl _aligned_realloc(ptr long long) -# stub _aligned_realloc_dbg @ cdecl _amsg_exit(long) @ cdecl _assert(str str long) @ cdecl _atodbl(ptr str) -# stub _atodbl_l -# @ cdecl _atof_l(str ptr) -# stub _atoflt_l @ cdecl -ret64 _atoi64(str) -# stub _atoi64_l -# stub _atoi_l -# stub _atol_l @ cdecl _atoldbl(ptr str) -# stub _atoldbl_l @ cdecl _beep(long long) @ cdecl _beginthread(ptr long ptr) @ cdecl _beginthreadex(ptr long ptr ptr long ptr) @ cdecl _c_exit() @ cdecl _cabs(long) @ cdecl _callnewh(long) -# stub _calloc_dbg @ cdecl _cexit() @ cdecl _cgets(str) -# stub _cgets_s # stub _cgetws -# stub _cgetws_s @ cdecl _chdir(str) @ cdecl _chdrive(long) @ cdecl _chgsign(double) @ cdecl -i386 -norelay _chkesp() @ cdecl _chmod(str long) @ cdecl _chsize(long long) -# stub _chsize_s -# stub _chvalidator -# stub _chvalidator_l @ cdecl _clearfp() @ cdecl _close(long) @ cdecl _commit(long) @@ -337,21 +269,10 @@ @ cdecl _controlfp_s(ptr long long) @ cdecl _copysign( double double ) @ varargs _cprintf(str) -# stub _cprintf_l -# stub _cprintf_p -# stub _cprintf_p_l -# stub _cprintf_s -# stub _cprintf_s_l @ cdecl _cputs(str) # stub _cputws @ cdecl _creat(str long) -# stub _crtAssertBusy -# stub _crtBreakAlloc -# stub _crtDbgFlag @ varargs _cscanf(str) -# @ varargs _cscanf_l(str ptr) -# @ varargs _cscanf_s(str) -# @ varargs _cscanf_s_l(str ptr) @ cdecl _ctime32(ptr) @ cdecl _ctime32_s(str long ptr) @ cdecl _ctime64(ptr) @@ -359,15 +280,7 @@ @ extern _ctype @ cdecl _cwait(ptr long long) @ varargs _cwprintf(wstr) -# stub _cwprintf_l -# stub _cwprintf_p -# stub _cwprintf_p_l -# stub _cwprintf_s -# stub _cwprintf_s_l # @ varargs _cwscanf(wstr) -# @ varargs _cwscanf_l(wstr ptr) -# @ varargs _cwscanf_s(wstr) -# @ varargs _cwscanf_s_l(wstr ptr) @ extern _daylight @ cdecl _difftime32(long long) @ cdecl _difftime64(long long) @@ -375,7 +288,6 @@ @ cdecl _dup(long) @ cdecl _dup2(long long) @ cdecl _ecvt(double long ptr ptr) -# stub _ecvt_s @ cdecl _endthread() @ cdecl _endthreadex(long) @ extern _environ @@ -394,10 +306,8 @@ @ cdecl _execvpe(str ptr ptr) @ cdecl _exit(long) @ cdecl _expand(ptr long) -# stub _expand_dbg @ cdecl _fcloseall() @ cdecl _fcvt(double long ptr ptr) -# stub _fcvt_s @ cdecl _fdopen(long str) @ cdecl _fgetchar() @ cdecl _fgetwchar() @@ -420,18 +330,8 @@ @ cdecl _fpclass(double) @ cdecl _fpieee_flt(long ptr ptr) @ cdecl _fpreset() -# stub _fprintf_l -# stub _fprintf_p -# stub _fprintf_p_l -# stub _fprintf_s_l @ cdecl _fputchar(long) @ cdecl _fputwchar(long) -# stub _free_dbg -# stub _freea -# stub _freea_s -# stub _fscanf_l -# @ varargs _fscanf_l(ptr str ptr) -# @ varargs _fscanf_s_l(ptr str ptr) @ cdecl _fseeki64(ptr long long long) @ cdecl _fsopen(str str long) @ cdecl _fstat(long ptr) @@ -440,42 +340,23 @@ @ cdecl -ret64 _ftelli64(ptr) @ cdecl _ftime(ptr) @ cdecl _ftime32(ptr) -# stub _ftime32_s @ cdecl _ftime64(ptr) -# stub _ftime64_s @ cdecl -arch=i386 -ret64 _ftol() @ cdecl -arch=i386 -ret64 _ftol2() _ftol @ cdecl -arch=i386 -ret64 _ftol2_sse() _ftol #FIXME: SSE variant should be implemented -# stub _ftol2_sse_excpt @ cdecl _fullpath(ptr str long) -# stub _fullpath_dbg @ cdecl _futime(long ptr) @ cdecl _futime32(long ptr) @ cdecl _futime64(long ptr) -# stub _fwprintf_l -# stub _fwprintf_p -# stub _fwprintf_p_l -# stub _fwprintf_s_l -# @ varargs _fwscanf_l(ptr wstr ptr) -# @ varargs _fwscanf_s_l(ptr wstr ptr) @ cdecl _gcvt(double long str) -# stub _gcvt_s @ cdecl _get_doserrno(ptr) -# stub _get_environ @ cdecl _get_errno(ptr) -# stub _get_fileinfo -# stub _get_fmode # @ cdecl _get_heap_handle() @ cdecl _get_osfhandle(long) @ cdecl _get_osplatform(ptr) -# stub _get_osver @ cdecl _get_output_format() @ cdecl _get_pgmptr(ptr) @ cdecl _get_sbh_threshold() -# stub _get_wenviron -# stub _get_winmajor -# stub _get_winminor -# stub _get_winver @ cdecl _get_wpgmptr(ptr) @ cdecl _get_terminate() @ cdecl _get_tzname(ptr str long long) @@ -519,91 +400,39 @@ @ cdecl -arch=i386 _inpw(long) MSVCRT__inpw @ cdecl _invalid_parameter(wstr wstr wstr long long) @ extern _iob -# stub _isalnum_l -# stub _isalpha_l @ cdecl _isatty(long) -# stub _iscntrl_l @ cdecl _isctype(long long) @ cdecl _isctype_l(long long ptr) -# stub _isdigit_l -# stub _isgraph_l -# stub _isleadbyte_l -# stub _islower_l @ cdecl _ismbbalnum(long) -# stub _ismbbalnum_l @ cdecl _ismbbalpha(long) -# stub _ismbbalpha_l @ cdecl _ismbbgraph(long) -# stub _ismbbgraph_l @ cdecl _ismbbkalnum(long) -# stub _ismbbkalnum_l @ cdecl _ismbbkana(long) -# stub _ismbbkana_l @ cdecl _ismbbkprint(long) -# stub _ismbbkprint_l @ cdecl _ismbbkpunct(long) -# stub _ismbbkpunct_l @ cdecl _ismbblead(long) -# stub _ismbblead_l @ cdecl _ismbbprint(long) -# stub _ismbbprint_l @ cdecl _ismbbpunct(long) -# stub _ismbbpunct_l @ cdecl _ismbbtrail(long) -# stub _ismbbtrail_l @ cdecl _ismbcalnum(long) -# stub _ismbcalnum_l @ cdecl _ismbcalpha(long) -# stub _ismbcalpha_l @ cdecl _ismbcdigit(long) -# stub _ismbcdigit_l @ cdecl _ismbcgraph(long) -# stub _ismbcgraph_l @ cdecl _ismbchira(long) -# stub _ismbchira_l @ cdecl _ismbckata(long) -# stub _ismbckata_l @ cdecl _ismbcl0(long) -# stub _ismbcl0_l @ cdecl _ismbcl1(long) -# stub _ismbcl1_l @ cdecl _ismbcl2(long) -# stub _ismbcl2_l @ cdecl _ismbclegal(long) -# stub _ismbclegal_l @ cdecl _ismbclower(long) -# stub _ismbclower_l @ cdecl _ismbcprint(long) -# stub _ismbcprint_l @ cdecl _ismbcpunct(long) -# stub _ismbcpunct_l @ cdecl _ismbcspace(long) -# stub _ismbcspace_l @ cdecl _ismbcsymbol(long) -# stub _ismbcsymbol_l @ cdecl _ismbcupper(long) -# stub _ismbcupper_l @ cdecl _ismbslead(ptr ptr) -# stub _ismbslead_l @ cdecl _ismbstrail(ptr ptr) -# stub _ismbstrail_l @ cdecl _isnan(double) -# stub _isprint_l -# stub _isspace_l -# stub _isupper_l -# stub _iswalnum_l -# stub _iswalpha_l -# stub _iswcntrl_l -# stub _iswctype_l -# stub _iswdigit_l -# stub _iswgraph_l -# stub _iswlower_l -# stub _iswprint_l -# stub _iswpunct_l -# stub _iswspace_l -# stub _iswupper_l -# stub _iswxdigit_l -# stub _isxdigit_l @ cdecl _itoa(long ptr long) @ cdecl _itoa_s(long ptr long long) @ cdecl _itow(long ptr long) @@ -613,7 +442,6 @@ @ cdecl _jn(long double) @ cdecl _kbhit() @ cdecl _lfind(ptr ptr ptr long ptr) -# stub _lfind_s @ cdecl _loaddll(str) @ cdecl -i386 _local_unwind2(ptr long) @ cdecl -i386 _local_unwind4(ptr ptr long) @@ -628,7 +456,6 @@ @ cdecl _lrotl(long long) @ cdecl _lrotr(long long) @ cdecl _lsearch(ptr ptr long long ptr) -# stub _lsearch_s @ cdecl _lseek(long long long) @ cdecl -ret64 _lseeki64(long double long) @ cdecl _ltoa(long ptr long) @@ -637,33 +464,19 @@ @ cdecl _ltow_s(long ptr long long) @ cdecl _makepath(ptr str str str str) @ cdecl _makepath_s(ptr long str str str str) -# stub _malloc_dbg @ cdecl _mbbtombc(long) -# stub _mbbtombc_l @ cdecl _mbbtype(long long) @ extern _mbcasemap @ cdecl _mbccpy (str str) -# stub _mbccpy_l -# stub _mbccpy_s -# stub _mbccpy_s_l @ cdecl _mbcjistojms(long) -# stub _mbcjistojms_l @ cdecl _mbcjmstojis(long) -# stub _mbcjmstojis_l @ cdecl _mbclen(ptr) -# stub _mbclen_l @ cdecl _mbctohira(long) -# stub _mbctohira_l @ cdecl _mbctokata(long) -# stub _mbctokata_l @ cdecl _mbctolower(long) -# stub _mbctolower_l @ cdecl _mbctombb(long) -# stub _mbctombb_l @ cdecl _mbctoupper(long) -# stub _mbctoupper_l @ extern _mbctype -# stub _mblen_l @ cdecl _mbsbtype(str long) # stub _mbsbtype_l @ cdecl _mbscat(str str) @@ -1349,7 +1162,6 @@ @ cdecl -arch=x86_64 sqrtf(long) @ cdecl srand(long) @ varargs sscanf(str str) -# @ varargs sscanf_s(str str) @ cdecl strcat(str str) @ cdecl strcat_s(str long str) @ cdecl strchr(str long) @@ -1363,7 +1175,6 @@ @ cdecl strftime(str long str ptr) @ cdecl strlen(str) @ cdecl strncat(str str long) -# stub strncat_s @ cdecl strncmp(str str long) @ cdecl strncpy(ptr str long) @ cdecl strncpy_s(ptr long str long) @@ -1381,37 +1192,30 @@ @ varargs swprintf(ptr wstr) @ varargs swprintf_s(ptr long wstr) @ varargs swscanf(wstr wstr) -# @ varargs swscanf_s(wstr wstr) @ cdecl system(str) @ cdecl tan(double) @ cdecl tanh(double) @ cdecl time(ptr) @ cdecl tmpfile() -# stub tmpfile_s @ cdecl tmpnam(ptr) -# stub tmpnam_s @ cdecl tolower(long) @ cdecl toupper(long) @ cdecl towlower(long) @ cdecl towupper(long) @ cdecl ungetc(long ptr) @ cdecl ungetwc(long ptr) -# stub utime @ cdecl vfprintf(ptr str ptr) @ cdecl vfprintf_s(ptr str ptr) @ cdecl vfwprintf(ptr wstr ptr) @ cdecl vfwprintf_s(ptr wstr ptr) @ cdecl vprintf(str ptr) @ cdecl vprintf_s(str ptr) -# stub vsnprintf @ cdecl vsprintf(ptr str ptr) @ cdecl vsprintf_s(ptr long str ptr) @ cdecl vswprintf(ptr wstr ptr) @ cdecl vswprintf_s(ptr long wstr ptr) @ cdecl vwprintf(wstr ptr) @ cdecl vwprintf_s(wstr ptr) -# stub wcrtomb -# stub wcrtomb_s @ cdecl wcscat(wstr wstr) @ cdecl wcscat_s(wstr long wstr) @ cdecl wcschr(wstr long) @@ -1430,8 +1234,6 @@ @ cdecl wcsnlen(wstr long) @ cdecl wcspbrk(wstr wstr) @ cdecl wcsrchr(wstr long) -# stub wcsrtombs -# stub wcsrtombs_s @ cdecl wcsspn(wstr wstr) @ cdecl wcsstr(wstr wstr) @ cdecl wcstod(wstr ptr) @@ -1441,13 +1243,10 @@ @ cdecl wcstombs(ptr ptr long) @ cdecl wcstoul(wstr ptr long) @ cdecl wcsxfrm(ptr wstr long) -# stub wctob @ cdecl wctomb(ptr long) -# stub wctomb_s @ varargs wprintf(wstr) @ varargs wprintf_s(wstr) @ varargs wscanf(wstr) -# @ varargs wscanf_s(wstr) # Functions not exported in native dll: @ cdecl _get_invalid_parameter_handler()

1 0

[akhaldi] 63445: [CRT] * Partial update of scanf routines (MS ABI varargs). CORE-8080
by akhaldi＠svn.reactos.org 25 May '14

25 May '14

Author: akhaldi Date: Sun May 25 16:09:32 2014 New Revision: 63445 URL: http://svn.reactos.org/svn/reactos?rev=63445&view=rev Log: [CRT] * Partial update of scanf routines (MS ABI varargs). CORE-8080 Modified: trunk/reactos/lib/sdk/crt/string/scanf.c Modified: trunk/reactos/lib/sdk/crt/string/scanf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/scanf.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/scanf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/scanf.c [iso-8859-1] Sun May 25 16:09:32 2014 @@ -101,12 +101,12 @@ */ int CDECL fscanf(FILE *file, const char *format, ...) { - va_list valist; - int res; - - va_start(valist, format); + __ms_va_list valist; + int res; + + __ms_va_start(valist, format); res = vfscanf_l(file, format, NULL, valist); - va_end(valist); + __ms_va_end(valist); return res; } @@ -115,12 +115,12 @@ */ int CDECL scanf(const char *format, ...) { - va_list valist; - int res; - - va_start(valist, format); + __ms_va_list valist; + int res; + + __ms_va_start(valist, format); res = vfscanf_l(stdin, format, NULL, valist); - va_end(valist); + __ms_va_end(valist); return res; } @@ -129,12 +129,12 @@ */ int CDECL fwscanf(FILE *file, const wchar_t *format, ...) { - va_list valist; - int res; - - va_start(valist, format); + __ms_va_list valist; + int res; + + __ms_va_start(valist, format); res = vfwscanf_l(file, format, NULL, valist); - va_end(valist); + __ms_va_end(valist); return res; } @@ -144,12 +144,12 @@ */ int CDECL wscanf(const wchar_t *format, ...) { - va_list valist; - int res; - - va_start(valist, format); + __ms_va_list valist; + int res; + + __ms_va_start(valist, format); res = vfwscanf_l(stdin, format, NULL, valist); - va_end(valist); + __ms_va_end(valist); return res; } #endif /* !_LIBCNT_ */ @@ -160,12 +160,12 @@ */ int CDECL sscanf(const char *str, const char *format, ...) { - va_list valist; - int res; - - va_start(valist, format); + __ms_va_list valist; + int res; + + __ms_va_start(valist, format); res = vsscanf_l(str, format, NULL, valist); - va_end(valist); + __ms_va_end(valist); return res; } @@ -175,12 +175,12 @@ */ int CDECL swscanf(const wchar_t *str, const wchar_t *format, ...) { - va_list valist; - int res; - - va_start(valist, format); + __ms_va_list valist; + int res; + + __ms_va_start(valist, format); res = vswscanf_l(str, format, NULL, valist); - va_end(valist); + __ms_va_end(valist); return res; } @@ -190,12 +190,12 @@ */ int CDECL _cscanf(const char *format, ...) { - va_list valist; - int res; - - va_start(valist, format); + __ms_va_list valist; + int res; + + __ms_va_start(valist, format); res = vcscanf_l(format, NULL, valist); - va_end(valist); + __ms_va_end(valist); return res; } #endif

1 0

[tkreuzer] 63444: [WIN32K] Remove obsolete patblt.c (all the code is in bitblt.c)
by tkreuzer＠svn.reactos.org 25 May '14

25 May '14

Author: tkreuzer Date: Sun May 25 14:41:33 2014 New Revision: 63444 URL: http://svn.reactos.org/svn/reactos?rev=63444&view=rev Log: [WIN32K] Remove obsolete patblt.c (all the code is in bitblt.c) Removed: trunk/reactos/win32ss/gdi/ntgdi/patblt.c Removed: trunk/reactos/win32ss/gdi/ntgdi/patblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/patblt.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/patblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/patblt.c (removed) @@ -1,972 +0,0 @@ -/* - * COPYRIGHT: GNU GPL, See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Bit blit functions - * FILE: subsys/win32k/objects/bitblt.c - * PROGRAMER: Unknown - */ - -#include <win32k.h> - -#define NDEBUG -#include <debug.h> - -#define ROP_USES_SOURCE(Rop) (((((Rop) & 0xCC0000) >> 2) != ((Rop) & 0x330000)) || ((((Rop) & 0xCC000000) >> 2) != ((Rop) & 0x33000000))) -#define ROP_USES_MASK(Rop) (((Rop) & 0xFF000000) != (((Rop) & 0xff0000) << 8)) - -#define FIXUP_ROP(Rop) if(((Rop) & 0xFF000000) == 0) Rop = MAKEROP4((Rop), (Rop)) -#define ROP_TO_ROP4(Rop) ((Rop) >> 16) - -BOOL APIENTRY -NtGdiAlphaBlend( - HDC hDCDest, - LONG XOriginDest, - LONG YOriginDest, - LONG WidthDest, - LONG HeightDest, - HDC hDCSrc, - LONG XOriginSrc, - LONG YOriginSrc, - LONG WidthSrc, - LONG HeightSrc, - BLENDFUNCTION BlendFunc, - HANDLE hcmXform) -{ - PDC DCDest; - PDC DCSrc; - HDC ahDC[2]; - PGDIOBJ apObj[2]; - SURFACE *BitmapDest, *BitmapSrc; - RECTL DestRect, SourceRect; - BOOL bResult; - EXLATEOBJ exlo; - BLENDOBJ BlendObj; - BlendObj.BlendFunction = BlendFunc; - - if (WidthDest < 0 || HeightDest < 0 || WidthSrc < 0 || HeightSrc < 0) - { - EngSetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - DPRINT("Locking DCs\n"); - ahDC[0] = hDCDest; - ahDC[1] = hDCSrc ; - if (!GDIOBJ_bLockMultipleObjects(2, ahDC, apObj, GDIObjType_DC_TYPE)) - { - DPRINT1("Invalid dc handle (dest=0x%08x, src=0x%08x) passed to NtGdiAlphaBlend\n", hDCDest, hDCSrc); - EngSetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - DCDest = apObj[0]; - DCSrc = apObj[1]; - - if (DCDest->dctype == DC_TYPE_INFO || DCDest->dctype == DCTYPE_INFO) - { - GDIOBJ_vUnlockObject(&DCSrc->BaseObject); - GDIOBJ_vUnlockObject(&DCDest->BaseObject); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - DestRect.left = XOriginDest; - DestRect.top = YOriginDest; - DestRect.right = XOriginDest + WidthDest; - DestRect.bottom = YOriginDest + HeightDest; - IntLPtoDP(DCDest, (LPPOINT)&DestRect, 2); - - DestRect.left += DCDest->ptlDCOrig.x; - DestRect.top += DCDest->ptlDCOrig.y; - DestRect.right += DCDest->ptlDCOrig.x; - DestRect.bottom += DCDest->ptlDCOrig.y; - - SourceRect.left = XOriginSrc; - SourceRect.top = YOriginSrc; - SourceRect.right = XOriginSrc + WidthSrc; - SourceRect.bottom = YOriginSrc + HeightSrc; - IntLPtoDP(DCSrc, (LPPOINT)&SourceRect, 2); - - SourceRect.left += DCSrc->ptlDCOrig.x; - SourceRect.top += DCSrc->ptlDCOrig.y; - SourceRect.right += DCSrc->ptlDCOrig.x; - SourceRect.bottom += DCSrc->ptlDCOrig.y; - - if (!DestRect.right || - !DestRect.bottom || - !SourceRect.right || - !SourceRect.bottom) - { - GDIOBJ_vUnlockObject(&DCSrc->BaseObject); - GDIOBJ_vUnlockObject(&DCDest->BaseObject); - return TRUE; - } - - /* Prepare DCs for blit */ - DPRINT("Preparing DCs for blit\n"); - DC_vPrepareDCsForBlit(DCDest, DestRect, DCSrc, SourceRect); - - /* Determine surfaces to be used in the bitblt */ - BitmapDest = DCDest->dclevel.pSurface; - if (!BitmapDest) - { - bResult = FALSE ; - goto leave ; - } - - BitmapSrc = DCSrc->dclevel.pSurface; - if (!BitmapSrc) - { - bResult = FALSE; - goto leave; - } - - /* Create the XLATEOBJ. */ - EXLATEOBJ_vInitXlateFromDCs(&exlo, DCSrc, DCDest); - - /* Perform the alpha blend operation */ - DPRINT("Performing the alpha blend\n"); - bResult = IntEngAlphaBlend(&BitmapDest->SurfObj, - &BitmapSrc->SurfObj, - DCDest->rosdc.CombinedClip, - &exlo.xlo, - &DestRect, - &SourceRect, - &BlendObj); - - EXLATEOBJ_vCleanup(&exlo); -leave : - DPRINT("Finishing blit\n"); - DC_vFinishBlit(DCDest, DCSrc); - GDIOBJ_vUnlockObject(&DCSrc->BaseObject); - GDIOBJ_vUnlockObject(&DCDest->BaseObject); - - return bResult; -} - -BOOL APIENTRY -NtGdiBitBlt( - HDC hDCDest, - INT XDest, - INT YDest, - INT Width, - INT Height, - HDC hDCSrc, - INT XSrc, - INT YSrc, - DWORD ROP, - IN DWORD crBackColor, - IN FLONG fl) -{ - /* Forward to NtGdiMaskBlt */ - // TODO: What's fl for? - return NtGdiMaskBlt(hDCDest, - XDest, - YDest, - Width, - Height, - hDCSrc, - XSrc, - YSrc, - NULL, - 0, - 0, - ROP, - crBackColor); -} - -BOOL APIENTRY -NtGdiTransparentBlt( - HDC hdcDst, - INT xDst, - INT yDst, - INT cxDst, - INT cyDst, - HDC hdcSrc, - INT xSrc, - INT ySrc, - INT cxSrc, - INT cySrc, - COLORREF TransColor) -{ - PDC DCDest, DCSrc; - HDC ahDC[2]; - PGDIOBJ apObj[2]; - RECTL rcDest, rcSrc; - SURFACE *BitmapDest, *BitmapSrc = NULL; - ULONG TransparentColor = 0; - BOOL Ret = FALSE; - EXLATEOBJ exlo; - - DPRINT("Locking DCs\n"); - ahDC[0] = hdcDst; - ahDC[1] = hdcSrc ; - if (!GDIOBJ_bLockMultipleObjects(2, ahDC, apObj, GDIObjType_DC_TYPE)) - { - DPRINT1("Invalid dc handle (dest=0x%08x, src=0x%08x) passed to NtGdiAlphaBlend\n", hdcDst, hdcSrc); - EngSetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - DCDest = apObj[0]; - DCSrc = apObj[1]; - - if (DCDest->dctype == DC_TYPE_INFO || DCDest->dctype == DCTYPE_INFO) - { - GDIOBJ_vUnlockObject(&DCSrc->BaseObject); - GDIOBJ_vUnlockObject(&DCDest->BaseObject); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - rcDest.left = xDst; - rcDest.top = yDst; - rcDest.right = rcDest.left + cxDst; - rcDest.bottom = rcDest.top + cyDst; - IntLPtoDP(DCDest, (LPPOINT)&rcDest, 2); - - rcDest.left += DCDest->ptlDCOrig.x; - rcDest.top += DCDest->ptlDCOrig.y; - rcDest.right += DCDest->ptlDCOrig.x; - rcDest.bottom += DCDest->ptlDCOrig.y; - - rcSrc.left = xSrc; - rcSrc.top = ySrc; - rcSrc.right = rcSrc.left + cxSrc; - rcSrc.bottom = rcSrc.top + cySrc; - IntLPtoDP(DCSrc, (LPPOINT)&rcSrc, 2); - - rcSrc.left += DCSrc->ptlDCOrig.x; - rcSrc.top += DCSrc->ptlDCOrig.y; - rcSrc.right += DCSrc->ptlDCOrig.x; - rcSrc.bottom += DCSrc->ptlDCOrig.y; - - /* Prepare for blit */ - DC_vPrepareDCsForBlit(DCDest, rcDest, DCSrc, rcSrc); - - BitmapDest = DCDest->dclevel.pSurface; - if (!BitmapDest) - { - goto done; - } - - BitmapSrc = DCSrc->dclevel.pSurface; - if (!BitmapSrc) - { - goto done; - } - - /* Translate Transparent (RGB) Color to the source palette */ - EXLATEOBJ_vInitialize(&exlo, &gpalRGB, BitmapSrc->ppal, 0, 0, 0); - TransparentColor = XLATEOBJ_iXlate(&exlo.xlo, (ULONG)TransColor); - EXLATEOBJ_vCleanup(&exlo); - - EXLATEOBJ_vInitXlateFromDCs(&exlo, DCSrc, DCDest); - - Ret = IntEngTransparentBlt(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, - DCDest->rosdc.CombinedClip, &exlo.xlo, &rcDest, &rcSrc, - TransparentColor, 0); - - EXLATEOBJ_vCleanup(&exlo); - -done: - DC_vFinishBlit(DCDest, DCSrc); - GDIOBJ_vUnlockObject(&DCDest->BaseObject); - GDIOBJ_vUnlockObject(&DCSrc->BaseObject); - - return Ret; -} - -BOOL APIENTRY -NtGdiMaskBlt( - HDC hdcDest, - INT nXDest, - INT nYDest, - INT nWidth, - INT nHeight, - HDC hdcSrc, - INT nXSrc, - INT nYSrc, - HBITMAP hbmMask, - INT xMask, - INT yMask, - DWORD dwRop, - IN DWORD crBackColor) -{ - PDC DCDest; - PDC DCSrc = NULL; - HDC ahDC[2]; - PGDIOBJ apObj[2]; - PDC_ATTR pdcattr = NULL; - SURFACE *BitmapDest, *BitmapSrc = NULL, *psurfMask = NULL; - RECTL DestRect, SourceRect; - POINTL SourcePoint, MaskPoint; - BOOL Status = FALSE; - EXLATEOBJ exlo; - XLATEOBJ *XlateObj = NULL; - BOOL UsesSource = ROP_USES_SOURCE(dwRop); - BOOL UsesMask; - - FIXUP_ROP(dwRop); - - UsesMask = ROP_USES_MASK(dwRop); - - //DPRINT1("dwRop : 0x%08x\n", dwRop); - if (!hdcDest || (UsesSource && !hdcSrc)) - { - EngSetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - /* Take care of mask bitmap */ - if(hbmMask) - { - psurfMask = SURFACE_ShareLockSurface(hbmMask); - if(!psurfMask) - { - EngSetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - } - - if(UsesMask) - { - if(!psurfMask) - { - EngSetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - if(gajBitsPerFormat[psurfMask->SurfObj.iBitmapFormat] != 1) - { - EngSetLastError(ERROR_INVALID_PARAMETER); - SURFACE_ShareUnlockSurface(psurfMask); - return FALSE; - } - } - else if(psurfMask) - { - DPRINT1("Getting Mask bitmap without needing it?\n"); - SURFACE_ShareUnlockSurface(psurfMask); - psurfMask = NULL; - } - MaskPoint.x = xMask; - MaskPoint.y = yMask; - - /* Take care of source and destination bitmap */ - DPRINT("Locking DCs\n"); - ahDC[0] = hdcDest; - ahDC[1] = UsesSource ? hdcSrc : NULL; - if (!GDIOBJ_bLockMultipleObjects(2, ahDC, apObj, GDIObjType_DC_TYPE)) - { - DPRINT1("Invalid dc handle (dest=0x%08x, src=0x%08x) passed to NtGdiAlphaBlend\n", hdcDest, hdcSrc); - EngSetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - DCDest = apObj[0]; - DCSrc = apObj[1]; - - ASSERT(DCDest); - if (NULL == DCDest) - { - if(DCSrc) DC_UnlockDc(DCSrc); - DPRINT("Invalid destination dc handle (0x%08x) passed to NtGdiBitBlt\n", hdcDest); - return FALSE; - } - - if (DCDest->dctype == DC_TYPE_INFO) - { - if(DCSrc) DC_UnlockDc(DCSrc); - DC_UnlockDc(DCDest); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - if (UsesSource) - { - ASSERT(DCSrc); - if (DCSrc->dctype == DC_TYPE_INFO) - { - DC_UnlockDc(DCDest); - DC_UnlockDc(DCSrc); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - } - - pdcattr = DCDest->pdcattr; - - DestRect.left = nXDest; - DestRect.top = nYDest; - DestRect.right = nXDest + nWidth; - DestRect.bottom = nYDest + nHeight; - IntLPtoDP(DCDest, (LPPOINT)&DestRect, 2); - - DestRect.left += DCDest->ptlDCOrig.x; - DestRect.top += DCDest->ptlDCOrig.y; - DestRect.right += DCDest->ptlDCOrig.x; - DestRect.bottom += DCDest->ptlDCOrig.y; - - SourcePoint.x = nXSrc; - SourcePoint.y = nYSrc; - - if (UsesSource) - { - IntLPtoDP(DCSrc, (LPPOINT)&SourcePoint, 1); - - SourcePoint.x += DCSrc->ptlDCOrig.x; - SourcePoint.y += DCSrc->ptlDCOrig.y; - /* Calculate Source Rect */ - SourceRect.left = SourcePoint.x; - SourceRect.top = SourcePoint.y; - SourceRect.right = SourcePoint.x + DestRect.right - DestRect.left; - SourceRect.bottom = SourcePoint.y + DestRect.bottom - DestRect.top ; - } - - /* Prepare blit */ - DC_vPrepareDCsForBlit(DCDest, DestRect, DCSrc, SourceRect); - - if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) - DC_vUpdateFillBrush(DCDest); - - /* Determine surfaces to be used in the bitblt */ - BitmapDest = DCDest->dclevel.pSurface; - if (!BitmapDest) - goto cleanup; - - if (UsesSource) - { - { - BitmapSrc = DCSrc->dclevel.pSurface; - if (!BitmapSrc) - goto cleanup; - } - } - - /* Create the XLATEOBJ. */ - if (UsesSource) - { - EXLATEOBJ_vInitXlateFromDCs(&exlo, DCSrc, DCDest); - XlateObj = &exlo.xlo; - } - - - /* Perform the bitblt operation */ - Status = IntEngBitBlt(&BitmapDest->SurfObj, - BitmapSrc ? &BitmapSrc->SurfObj : NULL, - psurfMask ? &psurfMask->SurfObj : NULL, - DCDest->rosdc.CombinedClip, - XlateObj, - &DestRect, - &SourcePoint, - &MaskPoint, - &DCDest->eboFill.BrushObject, - &DCDest->dclevel.pbrFill->ptOrigin, - ROP_TO_ROP4(dwRop)); - - if (UsesSource) - EXLATEOBJ_vCleanup(&exlo); -cleanup: - DC_vFinishBlit(DCDest, DCSrc); - if (UsesSource) - { - DC_UnlockDc(DCSrc); - } - DC_UnlockDc(DCDest); - if(psurfMask) SURFACE_ShareUnlockSurface(psurfMask); - - return Status; -} - -BOOL -APIENTRY -NtGdiPlgBlt( - IN HDC hdcTrg, - IN LPPOINT pptlTrg, - IN HDC hdcSrc, - IN INT xSrc, - IN INT ySrc, - IN INT cxSrc, - IN INT cySrc, - IN HBITMAP hbmMask, - IN INT xMask, - IN INT yMask, - IN DWORD crBackColor) -{ - UNIMPLEMENTED; - return FALSE; -} - -BOOL APIENTRY -GreStretchBltMask( - HDC hDCDest, - INT XOriginDest, - INT YOriginDest, - INT WidthDest, - INT HeightDest, - HDC hDCSrc, - INT XOriginSrc, - INT YOriginSrc, - INT WidthSrc, - INT HeightSrc, - DWORD ROP, - IN DWORD dwBackColor, - HDC hDCMask, - INT XOriginMask, - INT YOriginMask) -{ - PDC DCDest; - PDC DCSrc = NULL; - PDC DCMask = NULL; - HDC ahDC[3]; - PGDIOBJ apObj[3]; - PDC_ATTR pdcattr; - SURFACE *BitmapDest, *BitmapSrc = NULL; - SURFACE *BitmapMask = NULL; - RECTL DestRect; - RECTL SourceRect; - POINTL MaskPoint; - BOOL Status = FALSE; - EXLATEOBJ exlo; - XLATEOBJ *XlateObj = NULL; - POINTL BrushOrigin; - BOOL UsesSource; - BOOL UsesMask; - - FIXUP_ROP(ROP); - UsesSource = ROP_USES_SOURCE(ROP); - UsesMask = ROP_USES_MASK(ROP); - - if (0 == WidthDest || 0 == HeightDest || 0 == WidthSrc || 0 == HeightSrc) - { - EngSetLastError(ERROR_INVALID_PARAMETER); - return TRUE; - } - - if (!hDCDest || (UsesSource && !hDCSrc) || (UsesMask && !hDCMask)) - { - EngSetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - ahDC[0] = hDCDest; - ahDC[1] = UsesSource ? hDCSrc : NULL; - ahDC[2] = UsesMask ? hDCMask : NULL; - if (!GDIOBJ_bLockMultipleObjects(3, ahDC, apObj, GDIObjType_DC_TYPE)) - { - DPRINT1("Invalid dc handle (dest=0x%08x, src=0x%08x) passed to NtGdiAlphaBlend\n", hDCDest, hDCSrc); - EngSetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - DCDest = apObj[0]; - DCSrc = apObj[1]; - DCMask = apObj[2]; - - if (DCDest->dctype == DC_TYPE_INFO) - { - if(DCSrc) GDIOBJ_vUnlockObject(&DCSrc->BaseObject); - if(DCMask) GDIOBJ_vUnlockObject(&DCMask->BaseObject); - GDIOBJ_vUnlockObject(&DCDest->BaseObject); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - if (UsesSource) - { - if (DCSrc->dctype == DC_TYPE_INFO) - { - GDIOBJ_vUnlockObject(&DCDest->BaseObject); - GDIOBJ_vUnlockObject(&DCSrc->BaseObject); - if(DCMask) GDIOBJ_vUnlockObject(&DCMask->BaseObject); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - } - - pdcattr = DCDest->pdcattr; - - DestRect.left = XOriginDest; - DestRect.top = YOriginDest; - DestRect.right = XOriginDest+WidthDest; - DestRect.bottom = YOriginDest+HeightDest; - IntLPtoDP(DCDest, (LPPOINT)&DestRect, 2); - - DestRect.left += DCDest->ptlDCOrig.x; - DestRect.top += DCDest->ptlDCOrig.y; - DestRect.right += DCDest->ptlDCOrig.x; - DestRect.bottom += DCDest->ptlDCOrig.y; - - SourceRect.left = XOriginSrc; - SourceRect.top = YOriginSrc; - SourceRect.right = XOriginSrc+WidthSrc; - SourceRect.bottom = YOriginSrc+HeightSrc; - - if (UsesSource) - { - IntLPtoDP(DCSrc, (LPPOINT)&SourceRect, 2); - - SourceRect.left += DCSrc->ptlDCOrig.x; - SourceRect.top += DCSrc->ptlDCOrig.y; - SourceRect.right += DCSrc->ptlDCOrig.x; - SourceRect.bottom += DCSrc->ptlDCOrig.y; - } - - BrushOrigin.x = 0; - BrushOrigin.y = 0; - - /* Only prepare Source and Dest, hdcMask represents a DIB */ - DC_vPrepareDCsForBlit(DCDest, DestRect, DCSrc, SourceRect); - - if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) - DC_vUpdateFillBrush(DCDest); - - /* Determine surfaces to be used in the bitblt */ - BitmapDest = DCDest->dclevel.pSurface; - if (BitmapDest == NULL) - goto failed; - if (UsesSource) - { - BitmapSrc = DCSrc->dclevel.pSurface; - if (BitmapSrc == NULL) - goto failed; - - /* Create the XLATEOBJ. */ - EXLATEOBJ_vInitXlateFromDCs(&exlo, DCSrc, DCDest); - XlateObj = &exlo.xlo; - } - - /* Offset the brush */ - BrushOrigin.x += DCDest->ptlDCOrig.x; - BrushOrigin.y += DCDest->ptlDCOrig.y; - - /* Make mask surface for source surface */ - if (BitmapSrc && DCMask) - { - BitmapMask = DCMask->dclevel.pSurface; - if (BitmapMask && - (BitmapMask->SurfObj.sizlBitmap.cx < WidthSrc || - BitmapMask->SurfObj.sizlBitmap.cy < HeightSrc)) - { - DPRINT1("%dx%d mask is smaller than %dx%d bitmap\n", - BitmapMask->SurfObj.sizlBitmap.cx, BitmapMask->SurfObj.sizlBitmap.cy, - WidthSrc, HeightSrc); - EXLATEOBJ_vCleanup(&exlo); - goto failed; - } - /* Create mask offset point */ - MaskPoint.x = XOriginMask; - MaskPoint.y = YOriginMask; - IntLPtoDP(DCMask, &MaskPoint, 1); - MaskPoint.x += DCMask->ptlDCOrig.x; - MaskPoint.y += DCMask->ptlDCOrig.y; - } - - /* Perform the bitblt operation */ - Status = IntEngStretchBlt(&BitmapDest->SurfObj, - &BitmapSrc->SurfObj, - BitmapMask ? &BitmapMask->SurfObj : NULL, - DCDest->rosdc.CombinedClip, - XlateObj, - &DestRect, - &SourceRect, - BitmapMask ? &MaskPoint : NULL, - &DCDest->eboFill.BrushObject, - &BrushOrigin, - ROP_TO_ROP4(ROP)); - if (UsesSource) - { - EXLATEOBJ_vCleanup(&exlo); - } - -failed: - DC_vFinishBlit(DCDest, DCSrc); - if (UsesSource) - { - DC_UnlockDc(DCSrc); - } - if (DCMask) - { - DC_UnlockDc(DCMask); - } - DC_UnlockDc(DCDest); - - return Status; -} - - -BOOL APIENTRY -NtGdiStretchBlt( - HDC hDCDest, - INT XOriginDest, - INT YOriginDest, - INT WidthDest, - INT HeightDest, - HDC hDCSrc, - INT XOriginSrc, - INT YOriginSrc, - INT WidthSrc, - INT HeightSrc, - DWORD ROP, - IN DWORD dwBackColor) -{ - return GreStretchBltMask( - hDCDest, - XOriginDest, - YOriginDest, - WidthDest, - HeightDest, - hDCSrc, - XOriginSrc, - YOriginSrc, - WidthSrc, - HeightSrc, - ROP, - dwBackColor, - NULL, - 0, - 0); -} - - -BOOL FASTCALL -IntPatBlt( - PDC pdc, - INT XLeft, - INT YLeft, - INT Width, - INT Height, - DWORD dwRop, - PBRUSH pbrush) -{ - RECTL DestRect; - SURFACE *psurf; - EBRUSHOBJ eboFill ; - POINTL BrushOrigin; - BOOL ret; - - ASSERT(pbrush); - - FIXUP_ROP(dwRop); - - if (pbrush->flAttrs & GDIBRUSH_IS_NULL) - { - return TRUE; - } - - if (Width > 0) - { - DestRect.left = XLeft; - DestRect.right = XLeft + Width; - } - else - { - DestRect.left = XLeft + Width + 1; - DestRect.right = XLeft + 1; - } - - if (Height > 0) - { - DestRect.top = YLeft; - DestRect.bottom = YLeft + Height; - } - else - { - DestRect.top = YLeft + Height + 1; - DestRect.bottom = YLeft + 1; - } - - IntLPtoDP(pdc, (LPPOINT)&DestRect, 2); - - DestRect.left += pdc->ptlDCOrig.x; - DestRect.top += pdc->ptlDCOrig.y; - DestRect.right += pdc->ptlDCOrig.x; - DestRect.bottom += pdc->ptlDCOrig.y; -#ifdef _USE_DIBLIB_ - BrushOrigin.x = pbrush->ptOrigin.x + pdc->ptlDCOrig.x + XLeft; - BrushOrigin.y = pbrush->ptOrigin.y + pdc->ptlDCOrig.y + YLeft; -#else - BrushOrigin.x = pbrush->ptOrigin.x + pdc->ptlDCOrig.x; - BrushOrigin.y = pbrush->ptOrigin.y + pdc->ptlDCOrig.y; -#endif - - DC_vPrepareDCsForBlit(pdc, DestRect, NULL, DestRect); - - psurf = pdc->dclevel.pSurface; - - if (pdc->pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) - DC_vUpdateFillBrush(pdc); - - EBRUSHOBJ_vInit(&eboFill, pbrush, pdc); - - ret = IntEngBitBlt( - &psurf->SurfObj, - NULL, - NULL, - pdc->rosdc.CombinedClip, - NULL, - &DestRect, - NULL, - NULL, - &eboFill.BrushObject, - &BrushOrigin, - ROP_TO_ROP4(dwRop)); - - DC_vFinishBlit(pdc, NULL); - - EBRUSHOBJ_vCleanup(&eboFill); - - return ret; -} - -BOOL FASTCALL -IntGdiPolyPatBlt( - HDC hDC, - DWORD dwRop, - PPATRECT pRects, - INT cRects, - ULONG Reserved) -{ - INT i; - PBRUSH pbrush; - PDC pdc; - - pdc = DC_LockDc(hDC); - if (!pdc) - { - EngSetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - - if (pdc->dctype == DC_TYPE_INFO) - { - DC_UnlockDc(pdc); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - for (i = 0; i < cRects; i++) - { - pbrush = BRUSH_ShareLockBrush(pRects->hBrush); - if(pbrush != NULL) - { - IntPatBlt( - pdc, - pRects->r.left, - pRects->r.top, - pRects->r.right, - pRects->r.bottom, - dwRop, - pbrush); - BRUSH_ShareUnlockBrush(pbrush); - } - pRects++; - } - - DC_UnlockDc(pdc); - - return TRUE; -} - -BOOL APIENTRY -NtGdiPatBlt( - HDC hDC, - INT XLeft, - INT YLeft, - INT Width, - INT Height, - DWORD ROP) -{ - PBRUSH pbrush; - DC *dc; - PDC_ATTR pdcattr; - BOOL ret; - - BOOL UsesSource = ROP_USES_SOURCE(ROP); - if (UsesSource) - { - /* In this case we call on GdiMaskBlt */ - return NtGdiMaskBlt(hDC, XLeft, YLeft, Width, Height, 0,0,0,0,0,0,ROP,0); - } - - dc = DC_LockDc(hDC); - if (dc == NULL) - { - EngSetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (dc->dctype == DC_TYPE_INFO) - { - DC_UnlockDc(dc); - DPRINT1("NtGdiPatBlt on info DC!\n"); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - pdcattr = dc->pdcattr; - - if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) - DC_vUpdateFillBrush(dc); - - pbrush = BRUSH_ShareLockBrush(pdcattr->hbrush); - if (pbrush == NULL) - { - EngSetLastError(ERROR_INVALID_HANDLE); - DC_UnlockDc(dc); - return FALSE; - } - - ret = IntPatBlt(dc, XLeft, YLeft, Width, Height, ROP, pbrush); - - BRUSH_ShareUnlockBrush(pbrush); - DC_UnlockDc(dc); - - return ret; -} - -BOOL APIENTRY -NtGdiPolyPatBlt( - HDC hDC, - DWORD dwRop, - IN PPOLYPATBLT pRects, - IN DWORD cRects, - IN DWORD Mode) -{ - PPATRECT rb = NULL; - NTSTATUS Status = STATUS_SUCCESS; - BOOL Ret; - - if (cRects > 0) - { - rb = ExAllocatePoolWithTag(PagedPool, sizeof(PATRECT) * cRects, GDITAG_PLGBLT_DATA); - if (!rb) - { - EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - _SEH2_TRY - { - ProbeForRead(pRects, - cRects * sizeof(PATRECT), - 1); - RtlCopyMemory(rb, - pRects, - cRects * sizeof(PATRECT)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if (!NT_SUCCESS(Status)) - { - ExFreePoolWithTag(rb, GDITAG_PLGBLT_DATA); - SetLastNtError(Status); - return FALSE; - } - } - - Ret = IntGdiPolyPatBlt(hDC, dwRop, rb, cRects, Mode); - - if (cRects > 0) - ExFreePoolWithTag(rb, GDITAG_PLGBLT_DATA); - - return Ret; -}

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
44
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2014