Ros-diffs September 2013

ros-diffs@reactos.org

16 participants
554 discussions

[dreimer] 60176: Add manifest files to ROS applications. Tidy up resource files from some ignored stuff.
by dreimer＠svn.reactos.org 16 Sep '13

16 Sep '13

Author: dreimer Date: Mon Sep 16 20:52:16 2013 New Revision: 60176 URL: http://svn.reactos.org/svn/reactos?rev=60176&view=rev Log: Add manifest files to ROS applications. Tidy up resource files from some ignored stuff. Added: trunk/reactos/base/applications/calc/manifest.xml (with props) trunk/reactos/base/applications/charmap/manifest.xml (with props) trunk/reactos/base/applications/dxdiag/manifest.xml (with props) trunk/reactos/base/applications/games/solitaire/manifest.xml (with props) trunk/reactos/base/applications/games/spider/manifest.xml (with props) trunk/reactos/base/applications/games/winmine/manifest.xml (with props) trunk/reactos/base/applications/magnify/manifest.xml (with props) trunk/reactos/base/applications/mplay32/manifest.xml (with props) trunk/reactos/base/applications/msconfig/manifest.xml (with props) trunk/reactos/base/applications/mscutils/devmgmt/manifest.xml (with props) trunk/reactos/base/applications/mscutils/eventvwr/manifest.xml (with props) trunk/reactos/base/applications/mspaint/manifest.xml (with props) trunk/reactos/base/applications/mstsc/manifest.xml (with props) trunk/reactos/base/applications/notepad/manifest.xml (with props) trunk/reactos/base/applications/regedit/manifest.xml (with props) trunk/reactos/base/applications/screensavers/3dtext/manifest.xml (with props) trunk/reactos/base/applications/screensavers/logon/manifest.xml (with props) trunk/reactos/base/applications/shutdown/manifest.xml (with props) trunk/reactos/base/applications/sndrec32/manifest.xml (with props) trunk/reactos/base/applications/sndvol32/manifest.xml (with props) trunk/reactos/base/applications/taskmgr/manifest.xml (with props) trunk/reactos/base/applications/winhlp32/manifest.xml (with props) trunk/reactos/base/applications/wordpad/manifest.xml (with props) trunk/reactos/base/applications/write/manifest.xml (with props) trunk/reactos/base/setup/reactos/manifest.xml (with props) Modified: trunk/reactos/base/applications/calc/resource.rc trunk/reactos/base/applications/charmap/charmap.rc trunk/reactos/base/applications/dxdiag/dxdiag.rc trunk/reactos/base/applications/games/solitaire/rsrc.rc trunk/reactos/base/applications/games/spider/rsrc.rc trunk/reactos/base/applications/games/winmine/rsrc.rc trunk/reactos/base/applications/magnify/magnify.rc trunk/reactos/base/applications/mplay32/mplay32.rc trunk/reactos/base/applications/msconfig/msconfig.rc trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.rc trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.rc trunk/reactos/base/applications/mscutils/servman/manifest.xml trunk/reactos/base/applications/mscutils/servman/servman.rc trunk/reactos/base/applications/mspaint/icons.rc trunk/reactos/base/applications/mspaint/rsrc.rc trunk/reactos/base/applications/mstsc/rdc.rc trunk/reactos/base/applications/notepad/rsrc.rc trunk/reactos/base/applications/rapps/lang/bg-BG.rc trunk/reactos/base/applications/rapps/lang/cs-CZ.rc trunk/reactos/base/applications/rapps/lang/de-DE.rc trunk/reactos/base/applications/rapps/lang/en-US.rc trunk/reactos/base/applications/rapps/lang/es-ES.rc trunk/reactos/base/applications/rapps/lang/fr-FR.rc trunk/reactos/base/applications/rapps/lang/he-IL.rc trunk/reactos/base/applications/rapps/lang/it-IT.rc trunk/reactos/base/applications/rapps/lang/ja-JP.rc trunk/reactos/base/applications/rapps/lang/no-NO.rc trunk/reactos/base/applications/rapps/lang/pl-PL.rc trunk/reactos/base/applications/rapps/lang/pt-BR.rc trunk/reactos/base/applications/rapps/lang/ro-RO.rc trunk/reactos/base/applications/rapps/lang/ru-RU.rc trunk/reactos/base/applications/rapps/lang/sk-SK.rc trunk/reactos/base/applications/rapps/lang/sv-SE.rc trunk/reactos/base/applications/rapps/lang/tr-TR.rc trunk/reactos/base/applications/rapps/lang/uk-UA.rc trunk/reactos/base/applications/rapps/lang/zh-CN.rc trunk/reactos/base/applications/rapps/lang/zh-TW.rc trunk/reactos/base/applications/rapps/manifest.xml trunk/reactos/base/applications/rapps/rapps.rc trunk/reactos/base/applications/regedit/regedit.rc trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc trunk/reactos/base/applications/screensavers/logon/logon.rc trunk/reactos/base/applications/shutdown/shutdown.rc trunk/reactos/base/applications/sndrec32/rsrc.rc trunk/reactos/base/applications/sndvol32/sndvol32.rc trunk/reactos/base/applications/taskmgr/taskmgr.rc trunk/reactos/base/applications/winhlp32/rsrc.rc trunk/reactos/base/applications/wordpad/rsrc.rc trunk/reactos/base/applications/write/rsrc.rc trunk/reactos/base/setup/reactos/reactos.rc trunk/reactos/base/shell/explorer/explorer-bg.rc trunk/reactos/base/shell/explorer/explorer-cz.rc trunk/reactos/base/shell/explorer/explorer-el.rc trunk/reactos/base/shell/explorer/explorer-en.rc trunk/reactos/base/shell/explorer/explorer-es.rc trunk/reactos/base/shell/explorer/explorer-fr.rc trunk/reactos/base/shell/explorer/explorer-he.rc trunk/reactos/base/shell/explorer/explorer-hu.rc trunk/reactos/base/shell/explorer/explorer-id.rc trunk/reactos/base/shell/explorer/explorer-ja.rc trunk/reactos/base/shell/explorer/explorer-ko.rc trunk/reactos/base/shell/explorer/explorer-nl.rc trunk/reactos/base/shell/explorer/explorer-no.rc trunk/reactos/base/shell/explorer/explorer-pl.rc trunk/reactos/base/shell/explorer/explorer-ro.rc trunk/reactos/base/shell/explorer/explorer-ru.rc trunk/reactos/base/shell/explorer/explorer-sk.rc trunk/reactos/base/shell/explorer/explorer-sv.rc trunk/reactos/base/shell/explorer/explorer-uk.rc trunk/reactos/base/shell/explorer/explorer-zh.rc trunk/reactos/base/shell/explorer/explorer_intres.rc Added: trunk/reactos/base/applications/calc/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/man… ============================================================================== --- trunk/reactos/base/applications/calc/manifest.xml (added) +++ trunk/reactos/base/applications/calc/manifest.xml [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + publicKeyToken="6595b64144ccf1df" + processorArchitecture="*" + language="*" + /> + </dependentAssembly> +</dependency> +<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel + level="asInvoker" + uiAccess="false" + /> + </requestedPrivileges> + </security> +</trustInfo> +</assembly> Propchange: trunk/reactos/base/applications/calc/manifest.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/calc/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res… ============================================================================== --- trunk/reactos/base/applications/calc/resource.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/resource.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -43,6 +43,8 @@ // Bitmaps IDB_BITMAP_ROS BITMAP DISCARDABLE "res/ROS_logo.bmp" + +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" // UTF-8 #pragma code_page(65001) Modified: trunk/reactos/base/applications/charmap/charmap.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/charmap.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/charmap.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -14,4 +14,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "charmap.exe\0" #include <reactos/version.rc> +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" + #include "rsrc.rc" Added: trunk/reactos/base/applications/charmap/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/manifest.xml (added) +++ trunk/reactos/base/applications/charmap/manifest.xml [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + publicKeyToken="6595b64144ccf1df" + processorArchitecture="*" + language="*" + /> + </dependentAssembly> +</dependency> +<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel + level="asInvoker" + uiAccess="false" + /> + </requestedPrivileges> + </security> +</trustInfo> +</assembly> Propchange: trunk/reactos/base/applications/charmap/manifest.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/dxdiag/dxdiag.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d… ============================================================================== --- trunk/reactos/base/applications/dxdiag/dxdiag.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/dxdiag.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -14,4 +14,6 @@ IDI_APPICON ICON "res/dxdiag.ico" +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" + #include "rsrc.rc" Added: trunk/reactos/base/applications/dxdiag/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/m… ============================================================================== --- trunk/reactos/base/applications/dxdiag/manifest.xml (added) +++ trunk/reactos/base/applications/dxdiag/manifest.xml [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + publicKeyToken="6595b64144ccf1df" + processorArchitecture="*" + language="*" + /> + </dependentAssembly> +</dependency> +<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel + level="asInvoker" + uiAccess="false" + /> + </requestedPrivileges> + </security> +</trustInfo> +</assembly> Propchange: trunk/reactos/base/applications/dxdiag/manifest.xml ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/games/solitaire/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/manifest.xml (added) +++ trunk/reactos/base/applications/games/solitaire/manifest.xml [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + publicKeyToken="6595b64144ccf1df" + processorArchitecture="*" + language="*" + /> + </dependentAssembly> +</dependency> +<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel + level="asInvoker" + uiAccess="false" + /> + </requestedPrivileges> + </security> +</trustInfo> +</assembly> Propchange: trunk/reactos/base/applications/games/solitaire/manifest.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/games/solitaire/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/rsrc.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -6,6 +6,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDI_SOLITAIRE ICON DISCARDABLE "solitaire.ico" + +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" // UTF-8 #pragma code_page(65001) Added: trunk/reactos/base/applications/games/spider/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/manifest.xml (added) +++ trunk/reactos/base/applications/games/spider/manifest.xml [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + publicKeyToken="6595b64144ccf1df" + processorArchitecture="*" + language="*" + /> + </dependentAssembly> +</dependency> +<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel + level="asInvoker" + uiAccess="false" + /> + </requestedPrivileges> + </security> +</trustInfo> +</assembly> Propchange: trunk/reactos/base/applications/games/spider/manifest.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/games/spider/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/rsrc.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -6,6 +6,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDI_SPIDER ICON DISCARDABLE "spider.ico" + +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" // UTF-8 #pragma code_page(65001) Added: trunk/reactos/base/applications/games/winmine/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/manifest.xml (added) +++ trunk/reactos/base/applications/games/winmine/manifest.xml [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + publicKeyToken="6595b64144ccf1df" + processorArchitecture="*" + language="*" + /> + </dependentAssembly> +</dependency> +<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel + level="asInvoker" + uiAccess="false" + /> + </requestedPrivileges> + </security> +</trustInfo> +</assembly> Propchange: trunk/reactos/base/applications/games/winmine/manifest.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/games/winmine/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/rsrc.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -43,6 +43,8 @@ /* @makedep: mines.bmp */ MINES BITMAP rc/mines.bmp + +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" /* include localised resources */ // UTF-8 Modified: trunk/reactos/base/applications/magnify/magnify.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/magnify.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/magnify.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -13,4 +13,6 @@ IDI_ICON ICON "res/magnify.ico" +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" + #include "rsrc.rc" Added: trunk/reactos/base/applications/magnify/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/manifest.xml (added) +++ trunk/reactos/base/applications/magnify/manifest.xml [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + publicKeyToken="6595b64144ccf1df" + processorArchitecture="*" + language="*" + /> + </dependentAssembly> +</dependency> +<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel + level="asInvoker" + uiAccess="false" + /> + </requestedPrivileges> + </security> +</trustInfo> +</assembly> Propchange: trunk/reactos/base/applications/magnify/manifest.xml ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/mplay32/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/manifest.xml (added) +++ trunk/reactos/base/applications/mplay32/manifest.xml [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + publicKeyToken="6595b64144ccf1df" + processorArchitecture="*" + language="*" + /> + </dependentAssembly> +</dependency> +<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel + level="asInvoker" + uiAccess="false" + /> + </requestedPrivileges> + </security> +</trustInfo> +</assembly> Propchange: trunk/reactos/base/applications/mplay32/manifest.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mplay32/mplay32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/mplay32.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/mplay32.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -22,4 +22,6 @@ IDB_FORWARDICON BITMAP "resources/forward.bmp" IDB_PAUSEICON BITMAP "resources/pause.bmp" +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" + #include "rsrc.rc" Added: trunk/reactos/base/applications/msconfig/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/manifest.xml (added) +++ trunk/reactos/base/applications/msconfig/manifest.xml [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + publicKeyToken="6595b64144ccf1df" + processorArchitecture="*" + language="*" + /> + </dependentAssembly> +</dependency> +<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel + level="highestAvailable" + uiAccess="false" + /> + </requestedPrivileges> + </security> +</trustInfo> +</assembly> Propchange: trunk/reactos/base/applications/msconfig/manifest.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/msconfig/msconfig.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/msconfig.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/msconfig.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -14,4 +14,6 @@ IDI_APPICON ICON "res/msconfig.ico" +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" + #include "rsrc.rc" Modified: trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -8,4 +8,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "devmgmt.exe\0" #include <reactos/version.rc> +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" + #include "rsrc.rc" Added: trunk/reactos/base/applications/mscutils/devmgmt/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/manifest.xml (added) +++ trunk/reactos/base/applications/mscutils/devmgmt/manifest.xml [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + publicKeyToken="6595b64144ccf1df" + processorArchitecture="*" + language="*" + /> + </dependentAssembly> +</dependency> +<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel + level="highestAvailable" + uiAccess="false" + /> + </requestedPrivileges> + </security> +</trustInfo> +</assembly> Propchange: trunk/reactos/base/applications/mscutils/devmgmt/manifest.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -8,4 +8,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "eventvwr.exe\0" #include <reactos/version.rc> +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" + #include "rsrc.rc" Added: trunk/reactos/base/applications/mscutils/eventvwr/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/manifest.xml (added) +++ trunk/reactos/base/applications/mscutils/eventvwr/manifest.xml [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + publicKeyToken="6595b64144ccf1df" + processorArchitecture="*" + language="*" + /> + </dependentAssembly> +</dependency> +<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel + level="highestAvailable" + uiAccess="false" + /> + </requestedPrivileges> + </security> +</trustInfo> +</assembly> Propchange: trunk/reactos/base/applications/mscutils/eventvwr/manifest.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mscutils/servman/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/manifest.xml [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/manifest.xml [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -1,15 +1,25 @@ -<?xml version='1.0' encoding='UTF-8' standalone='yes'?> -<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'> - <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + publicKeyToken="6595b64144ccf1df" + processorArchitecture="*" + language="*" + /> + </dependentAssembly> +</dependency> +<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> <security> - <requestedPrivileges> - <requestedExecutionLevel level='asInvoker' uiAccess='false' /> - </requestedPrivileges> + <requestedPrivileges> + <requestedExecutionLevel + level="highestAvailable" + uiAccess="false" + /> + </requestedPrivileges> </security> - </trustInfo> - <dependency> - <dependentAssembly> - <assemblyIdentity type='win32' name='Microsoft.VC90.CRT' version='9.0.21022.8' processorArchitecture='x86' publicKeyToken='1fc8b3b9a1e18e3b' /> - </dependentAssembly> - </dependency> +</trustInfo> </assembly> Modified: trunk/reactos/base/applications/mscutils/servman/servman.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/servman.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/servman.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -9,6 +9,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "servman.exe\0" //#include <reactos/version.rc> -1 24 DISCARDABLE "manifest.xml" +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" #include "rsrc.rc" Modified: trunk/reactos/base/applications/mspaint/icons.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/icons.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/icons.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -1,4 +1,4 @@ -IDI_APPICON ICON MOVEABLE PURE LOADONCALL DISCARDABLE "icons/paint.ico" +IDI_APPICON ICON LOADONCALL DISCARDABLE "icons/paint.ico" IDB_TOOLBARICONS BITMAP "icons/iconbar.bmp" Added: trunk/reactos/base/applications/mspaint/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/manifest.xml (added) +++ trunk/reactos/base/applications/mspaint/manifest.xml [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + publicKeyToken="6595b64144ccf1df" + processorArchitecture="*" + language="*" + /> + </dependentAssembly> +</dependency> +<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel + level="asInvoker" + uiAccess="false" + /> + </requestedPrivileges> + </security> +</trustInfo> +</assembly> Propchange: trunk/reactos/base/applications/mspaint/manifest.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mspaint/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/rsrc.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -20,6 +20,8 @@ #include <reactos/version.rc> #include "icons.rc" + +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" // UTF-8 #pragma code_page(65001) Added: trunk/reactos/base/applications/mstsc/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ma… ============================================================================== --- trunk/reactos/base/applications/mstsc/manifest.xml (added) +++ trunk/reactos/base/applications/mstsc/manifest.xml [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + publicKeyToken="6595b64144ccf1df" + processorArchitecture="*" + language="*" + /> + </dependentAssembly> +</dependency> +<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel + level="asInvoker" + uiAccess="false" + /> + </requestedPrivileges> + </security> +</trustInfo> +</assembly> Propchange: trunk/reactos/base/applications/mstsc/manifest.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mstsc/rdc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rd… ============================================================================== --- trunk/reactos/base/applications/mstsc/rdc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/rdc.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -9,4 +9,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "mstsc.exe\0" //#include <reactos/version.rc> +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" + #include "rsrc.rc" Added: trunk/reactos/base/applications/notepad/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/manifest.xml (added) +++ trunk/reactos/base/applications/notepad/manifest.xml [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + publicKeyToken="6595b64144ccf1df" + processorArchitecture="*" + language="*" + /> + </dependentAssembly> +</dependency> +<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel + level="asInvoker" + uiAccess="false" + /> + </requestedPrivileges> + </security> +</trustInfo> +</assembly> Propchange: trunk/reactos/base/applications/notepad/manifest.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/notepad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/rsrc.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -28,8 +28,9 @@ #include <reactos/version.rc> +IDI_NPICON ICON "res/notepad.ico" -IDI_NPICON ICON "res/notepad.ico" +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" // UTF-8 #pragma code_page(65001) Modified: trunk/reactos/base/applications/rapps/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/bg-BG.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -91,7 +91,7 @@ PUSHBUTTON "ÐÑÐºÐ°Ð·", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL DISCARDABLE 0, 0, 220, 76 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "Ð¡Ð²Ð°Ð»ÑÐ½Ðµ" FONT 8, "MS Shell Dlg" Modified: trunk/reactos/base/applications/rapps/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/cs-CZ.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -92,7 +92,7 @@ PUSHBUTTON "Storno", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL DISCARDABLE 0, 0, 220, 76 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "StahovÃ¡nÃ..." FONT 8, "MS Shell Dlg" Modified: trunk/reactos/base/applications/rapps/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/de-DE.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -87,7 +87,7 @@ PUSHBUTTON "Abbrechen", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL DISCARDABLE 0, 0, 220, 76 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "Herunterladen..." FONT 8, "MS Shell Dlg" Modified: trunk/reactos/base/applications/rapps/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -87,7 +87,7 @@ PUSHBUTTON "Cancel", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL DISCARDABLE 0, 0, 220, 76 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "Download..." FONT 8, "MS Shell Dlg" Modified: trunk/reactos/base/applications/rapps/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/es-ES.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -87,7 +87,7 @@ PUSHBUTTON "Cancelas", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL DISCARDABLE 0, 0, 220, 76 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "Descargar..." FONT 8, "MS Shell Dlg" Modified: trunk/reactos/base/applications/rapps/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/fr-FR.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -87,7 +87,7 @@ PUSHBUTTON "Annuler", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL DISCARDABLE 0, 0, 220, 76 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "TÃ©lÃ©charger..." FONT 8, "MS Shell Dlg" Modified: trunk/reactos/base/applications/rapps/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/he-IL.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -88,7 +88,7 @@ PUSHBUTTON "×××××", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL DISCARDABLE 0, 0, 220, 76 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "×××¨××..." FONT 8, "MS Shell Dlg" Modified: trunk/reactos/base/applications/rapps/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/it-IT.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -87,7 +87,7 @@ PUSHBUTTON "Annulla", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL DISCARDABLE 0, 0, 220, 76 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "Download in corso" FONT 8, "MS Shell Dlg" Modified: trunk/reactos/base/applications/rapps/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ja-JP.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -87,7 +87,7 @@ PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL DISCARDABLE 0, 0, 220, 76 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "ãã¦ã³ãã¼ã..." FONT 9, "MS UI Gothic" Modified: trunk/reactos/base/applications/rapps/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/no-NO.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -87,7 +87,7 @@ PUSHBUTTON "Cancel", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL DISCARDABLE 0, 0, 220, 76 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "Lastet ned..." FONT 8, "MS Shell Dlg" Modified: trunk/reactos/base/applications/rapps/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/pl-PL.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -95,7 +95,7 @@ PUSHBUTTON "Anuluj", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL DISCARDABLE 0, 0, 220, 76 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "ÅciÄgnij..." FONT 8, "MS Shell Dlg" Modified: trunk/reactos/base/applications/rapps/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/pt-BR.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -89,7 +89,7 @@ PUSHBUTTON "Cancelar", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL DISCARDABLE 0, 0, 220, 76 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "Download..." FONT 8, "MS Shell Dlg" Modified: trunk/reactos/base/applications/rapps/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ro-RO.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -94,7 +94,7 @@ PUSHBUTTON "A&nuleazÄ", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL DISCARDABLE 0, 0, 220, 76 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "DescÄrcareâ¦" FONT 8, "MS Shell Dlg" Modified: trunk/reactos/base/applications/rapps/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ru-RU.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -87,7 +87,7 @@ PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL DISCARDABLE 0, 0, 220, 76 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "ÐÐ°Ð³ÑÑÐ·ÐºÐ°..." FONT 8, "MS Shell Dlg" Modified: trunk/reactos/base/applications/rapps/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/sk-SK.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -92,7 +92,7 @@ PUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL DISCARDABLE 0, 0, 220, 76 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "SÅ¥ahujem ..." // StiahnuÅ¥ ??? FONT 8, "MS Shell Dlg" Modified: trunk/reactos/base/applications/rapps/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/sv-SE.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -94,7 +94,7 @@ PUSHBUTTON "Avbryt", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL DISCARDABLE 0, 0, 220, 76 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "Ladda ner..." FONT 8, "MS Shell Dlg" Modified: trunk/reactos/base/applications/rapps/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/tr-TR.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -92,7 +92,7 @@ PUSHBUTTON "VazgeÃ§", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL DISCARDABLE 0, 0, 220, 76 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "Ä°ndiriliyor" FONT 8, "MS Shell Dlg" Modified: trunk/reactos/base/applications/rapps/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/uk-UA.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -95,7 +95,7 @@ PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL DISCARDABLE 0, 0, 220, 76 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "ÐÐ°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ..." FONT 8, "MS Shell Dlg" Modified: trunk/reactos/base/applications/rapps/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/zh-CN.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -91,7 +91,7 @@ PUSHBUTTON "åæ¶", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL DISCARDABLE 0, 0, 220, 76 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "æ£å¨ä¸è½½..." FONT 8, "MS Shell Dlg" Modified: trunk/reactos/base/applications/rapps/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/zh-TW.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -92,7 +92,7 @@ PUSHBUTTON "åæ¶", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL DISCARDABLE 0, 0, 220, 76 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE CAPTION "æ£å¨ä¸è¼..." FONT 8, "MS Shell Dlg" Modified: trunk/reactos/base/applications/rapps/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ma… ============================================================================== --- trunk/reactos/base/applications/rapps/manifest.xml [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/manifest.xml [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -1,20 +1,25 @@ -<?xml version='1.0' encoding='UTF-8' standalone='yes'?> -<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'> - <dependency> +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<dependency> <dependentAssembly> - <assemblyIdentity type='win32' - name='Microsoft.Windows.Common-Controls' - version='6.0.0.0' - processorArchitecture='*' - publicKeyToken='6595b64144ccf1df' - language='*' /> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + publicKeyToken="6595b64144ccf1df" + processorArchitecture="*" + language="*" + /> </dependentAssembly> - </dependency> - <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> +</dependency> +<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> <security> - <requestedPrivileges> - <requestedExecutionLevel level='highestAvailable' uiAccess='false' /> - </requestedPrivileges> + <requestedPrivileges> + <requestedExecutionLevel + level="highestAvailable" + uiAccess="false" + /> + </requestedPrivileges> </security> - </trustInfo> +</trustInfo> </assembly> Modified: trunk/reactos/base/applications/rapps/rapps.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -39,7 +39,7 @@ IDI_CAT_TOOLS ICON DISCARDABLE "res/cats/tools.ico" IDI_CAT_VIDEO ICON DISCARDABLE "res/cats/video.ico" -1 24 DISCARDABLE "manifest.xml" +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" #include <rappsmsg.rc> Added: trunk/reactos/base/applications/regedit/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/manifest.xml (added) +++ trunk/reactos/base/applications/regedit/manifest.xml [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + publicKeyToken="6595b64144ccf1df" + processorArchitecture="*" + language="*" + /> + </dependentAssembly> +</dependency> +<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel + level="asInvoker" + uiAccess="false" + /> + </requestedPrivileges> + </security> +</trustInfo> +</assembly> Propchange: trunk/reactos/base/applications/regedit/manifest.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/regedit/regedit.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regedit.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/regedit.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -29,6 +29,8 @@ #define REACTOS_STR_ORIGINAL_FILENAME "regedit.exe" #include <reactos/version.rc> +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" + LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "rsrc.rc" Added: trunk/reactos/base/applications/screensavers/3dtext/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/manifest.xml (added) +++ trunk/reactos/base/applications/screensavers/3dtext/manifest.xml [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + publicKeyToken="6595b64144ccf1df" + processorArchitecture="*" + language="*" + /> + </dependentAssembly> +</dependency> +<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel + level="asInvoker" + uiAccess="false" + /> + </requestedPrivileges> + </security> +</trustInfo> +</assembly> Propchange: trunk/reactos/base/applications/screensavers/3dtext/manifest.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -11,6 +11,8 @@ #define REACTOS_STR_INTERNAL_NAME "3dtext\0" #define REACTOS_STR_ORIGINAL_FILENAME "3dtext.scr\0" #include <reactos/version.rc> + +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" // UTF-8 #pragma code_page(65001) Modified: trunk/reactos/base/applications/screensavers/logon/logon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/logon.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/screensavers/logon/logon.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -14,6 +14,8 @@ IDB_WORKSTATION BITMAP DISCARDABLE "res/0.bmp" IDB_SERVER BITMAP DISCARDABLE "res/1.bmp" + +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" // UTF-8 #pragma code_page(65001) Added: trunk/reactos/base/applications/screensavers/logon/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/manifest.xml (added) +++ trunk/reactos/base/applications/screensavers/logon/manifest.xml [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + publicKeyToken="6595b64144ccf1df" + processorArchitecture="*" + language="*" + /> + </dependentAssembly> +</dependency> +<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel + level="asInvoker" + uiAccess="false" + /> + </requestedPrivileges> + </security> +</trustInfo> +</assembly> Propchange: trunk/reactos/base/applications/screensavers/logon/manifest.xml ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/shutdown/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/manifest.xml (added) +++ trunk/reactos/base/applications/shutdown/manifest.xml [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + publicKeyToken="6595b64144ccf1df" + processorArchitecture="*" + language="*" + /> + </dependentAssembly> +</dependency> +<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel + level="asInvoker" + uiAccess="false" + /> + </requestedPrivileges> + </security> +</trustInfo> +</assembly> Propchange: trunk/reactos/base/applications/shutdown/manifest.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/shutdown/shutdown.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/shutdown.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/shutdown/shutdown.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -11,4 +11,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "shutdown.exe" #include <reactos/version.rc> +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" + #include "rsrc.rc" Added: trunk/reactos/base/applications/sndrec32/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/manifest.xml (added) +++ trunk/reactos/base/applications/sndrec32/manifest.xml [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + publicKeyToken="6595b64144ccf1df" + processorArchitecture="*" + language="*" + /> + </dependentAssembly> +</dependency> +<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel + level="asInvoker" + uiAccess="false" + /> + </requestedPrivileges> + </security> +</trustInfo> +</assembly> Propchange: trunk/reactos/base/applications/sndrec32/manifest.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/sndrec32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/rsrc.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -17,6 +17,8 @@ IDB_BITMAP2_REC_DIS BITMAP "resources/but_rec_dis.bmp" IDB_BITMAP2_START_DIS BITMAP "resources/but_start_dis.bmp" IDB_BITMAP2_STOP_DIS BITMAP "resources/but_stop_dis.bmp" + +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" // UTF-8 #pragma code_page(65001) Added: trunk/reactos/base/applications/sndvol32/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/manifest.xml (added) +++ trunk/reactos/base/applications/sndvol32/manifest.xml [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + publicKeyToken="6595b64144ccf1df" + processorArchitecture="*" + language="*" + /> + </dependentAssembly> +</dependency> +<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel + level="asInvoker" + uiAccess="false" + /> + </requestedPrivileges> + </security> +</trustInfo> +</assembly> Propchange: trunk/reactos/base/applications/sndvol32/manifest.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/sndvol32/sndvol32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/sndvol32.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/sndvol32.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -9,4 +9,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "sndvol32.exe\0" #include <reactos/version.rc> +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" + #include "rsrc.rc" Added: trunk/reactos/base/applications/taskmgr/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/manifest.xml (added) +++ trunk/reactos/base/applications/taskmgr/manifest.xml [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + publicKeyToken="6595b64144ccf1df" + processorArchitecture="*" + language="*" + /> + </dependentAssembly> +</dependency> +<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel + level="highestAvailable" + uiAccess="false" + /> + </requestedPrivileges> + </security> +</trustInfo> +</assembly> Propchange: trunk/reactos/base/applications/taskmgr/manifest.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/taskmgr/taskmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -10,4 +10,6 @@ IDB_TRAYMASK BITMAP DISCARDABLE "res/traymask.bmp" IDB_TRAYICON BITMAP DISCARDABLE "res/trayicon.bmp" +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" + #include "rsrc.rc" Added: trunk/reactos/base/applications/winhlp32/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/manifest.xml (added) +++ trunk/reactos/base/applications/winhlp32/manifest.xml [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + publicKeyToken="6595b64144ccf1df" + processorArchitecture="*" + language="*" + /> + </dependentAssembly> +</dependency> +<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel + level="asInvoker" + uiAccess="false" + /> + </requestedPrivileges> + </security> +</trustInfo> +</assembly> Propchange: trunk/reactos/base/applications/winhlp32/manifest.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/winhlp32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/rsrc.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -26,6 +26,8 @@ /* @makedep: winhelp.ico */ IDI_WINHELP ICON "res/winhelp.ico" + +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" #ifdef LANGUAGE_BG_BG #include "lang/Bg.rc" Added: trunk/reactos/base/applications/wordpad/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/manifest.xml (added) +++ trunk/reactos/base/applications/wordpad/manifest.xml [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + publicKeyToken="6595b64144ccf1df" + processorArchitecture="*" + language="*" + /> + </dependentAssembly> +</dependency> +<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel + level="asInvoker" + uiAccess="false" + /> + </requestedPrivileges> + </security> +</trustInfo> +</assembly> Propchange: trunk/reactos/base/applications/wordpad/manifest.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/wordpad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/rsrc.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -64,6 +64,7 @@ /* @makedep: zoom.cur */ IDC_ZOOM CURSOR "res/zoom.cur" +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" #ifdef LANGUAGE_EN_US #include "lang/En.rc" Added: trunk/reactos/base/applications/write/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/ma… ============================================================================== --- trunk/reactos/base/applications/write/manifest.xml (added) +++ trunk/reactos/base/applications/write/manifest.xml [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + publicKeyToken="6595b64144ccf1df" + processorArchitecture="*" + language="*" + /> + </dependentAssembly> +</dependency> +<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel + level="asInvoker" + uiAccess="false" + /> + </requestedPrivileges> + </security> +</trustInfo> +</assembly> Propchange: trunk/reactos/base/applications/write/manifest.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/write/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/rs… ============================================================================== --- trunk/reactos/base/applications/write/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/write/rsrc.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -19,6 +19,8 @@ #include <windef.h> #include "resources.h" + +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL Added: trunk/reactos/base/setup/reactos/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/manifes… ============================================================================== --- trunk/reactos/base/setup/reactos/manifest.xml (added) +++ trunk/reactos/base/setup/reactos/manifest.xml [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + publicKeyToken="6595b64144ccf1df" + processorArchitecture="*" + language="*" + /> + </dependentAssembly> +</dependency> +<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel + level="highestAvailable" + uiAccess="false" + /> + </requestedPrivileges> + </security> +</trustInfo> +</assembly> Propchange: trunk/reactos/base/setup/reactos/manifest.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/setup/reactos/reactos.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/reactos.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -20,6 +20,8 @@ IDB_HEADER BITMAP "res/header.bmp" IDB_ROSLOGO BITMAP "res/rosbitmap.bmp" +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" + /* Language-specific resources */ #include "rsrc.rc" Modified: trunk/reactos/base/shell/explorer/explorer-bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-bg.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-bg.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -299,18 +299,18 @@ // TEXTINCLUDE // -1 TEXTINCLUDE MOVEABLE PURE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE MOVEABLE PURE +2 TEXTINCLUDE BEGIN "#include <windows.h>\r\n" "\0" END -3 TEXTINCLUDE MOVEABLE PURE +3 TEXTINCLUDE BEGIN "\r\n" "\0" Modified: trunk/reactos/base/shell/explorer/explorer-cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-cz.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-cz.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -299,18 +299,18 @@ // TEXTINCLUDE // -1 TEXTINCLUDE MOVEABLE PURE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE MOVEABLE PURE +2 TEXTINCLUDE BEGIN "#include <windows.h>\r\n" "\0" END -3 TEXTINCLUDE MOVEABLE PURE +3 TEXTINCLUDE BEGIN "\r\n" "\0" Modified: trunk/reactos/base/shell/explorer/explorer-el.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-el.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-el.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -298,18 +298,18 @@ // TEXTINCLUDE // -1 TEXTINCLUDE MOVEABLE PURE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE MOVEABLE PURE +2 TEXTINCLUDE BEGIN "#include <windows.h>\r\n" "\0" END -3 TEXTINCLUDE MOVEABLE PURE +3 TEXTINCLUDE BEGIN "\r\n" "\0" Modified: trunk/reactos/base/shell/explorer/explorer-en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-en.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-en.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -299,18 +299,18 @@ // TEXTINCLUDE // -1 TEXTINCLUDE MOVEABLE PURE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE MOVEABLE PURE +2 TEXTINCLUDE BEGIN "#include <windows.h>\r\n" "\0" END -3 TEXTINCLUDE MOVEABLE PURE +3 TEXTINCLUDE BEGIN "\r\n" "\0" Modified: trunk/reactos/base/shell/explorer/explorer-es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-es.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-es.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -298,18 +298,18 @@ // TEXTINCLUDE // -1 TEXTINCLUDE MOVEABLE PURE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE MOVEABLE PURE +2 TEXTINCLUDE BEGIN "#include <windows.h>\r\n" "\0" END -3 TEXTINCLUDE MOVEABLE PURE +3 TEXTINCLUDE BEGIN "\r\n" "\0" Modified: trunk/reactos/base/shell/explorer/explorer-fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-fr.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-fr.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -298,18 +298,18 @@ // TEXTINCLUDE // -1 TEXTINCLUDE MOVEABLE PURE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE MOVEABLE PURE +2 TEXTINCLUDE BEGIN "#include <windows.h>\r\n" "\0" END -3 TEXTINCLUDE MOVEABLE PURE +3 TEXTINCLUDE BEGIN "\r\n" "\0" Modified: trunk/reactos/base/shell/explorer/explorer-he.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-he.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-he.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -298,18 +298,18 @@ // TEXTINCLUDE // -1 TEXTINCLUDE MOVEABLE PURE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE MOVEABLE PURE +2 TEXTINCLUDE BEGIN "#include <windows.h>\r\n" "\0" END -3 TEXTINCLUDE MOVEABLE PURE +3 TEXTINCLUDE BEGIN "\r\n" "\0" Modified: trunk/reactos/base/shell/explorer/explorer-hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-hu.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-hu.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -299,18 +299,18 @@ // TEXTINCLUDE // -1 TEXTINCLUDE MOVEABLE PURE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE MOVEABLE PURE +2 TEXTINCLUDE BEGIN "#include <windows.h>\r\n" "\0" END -3 TEXTINCLUDE MOVEABLE PURE +3 TEXTINCLUDE BEGIN "\r\n" "\0" Modified: trunk/reactos/base/shell/explorer/explorer-id.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-id.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-id.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -299,18 +299,18 @@ // TEXTINCLUDE // -1 TEXTINCLUDE MOVEABLE PURE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE MOVEABLE PURE +2 TEXTINCLUDE BEGIN "#include <windows.h>\r\n" "\0" END -3 TEXTINCLUDE MOVEABLE PURE +3 TEXTINCLUDE BEGIN "\r\n" "\0" Modified: trunk/reactos/base/shell/explorer/explorer-ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-ja.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-ja.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -299,18 +299,18 @@ // TEXTINCLUDE // -1 TEXTINCLUDE MOVEABLE PURE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE MOVEABLE PURE +2 TEXTINCLUDE BEGIN "#include <windows.h>\r\n" "\0" END -3 TEXTINCLUDE MOVEABLE PURE +3 TEXTINCLUDE BEGIN "\r\n" "\0" Modified: trunk/reactos/base/shell/explorer/explorer-ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-ko.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-ko.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -297,18 +297,18 @@ // TEXTINCLUDE // -1 TEXTINCLUDE MOVEABLE PURE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE MOVEABLE PURE +2 TEXTINCLUDE BEGIN "#include <windows.h>\r\n" "\0" END -3 TEXTINCLUDE MOVEABLE PURE +3 TEXTINCLUDE BEGIN "\r\n" "\0" Modified: trunk/reactos/base/shell/explorer/explorer-nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-nl.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-nl.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -299,18 +299,18 @@ // TEXTINCLUDE // -1 TEXTINCLUDE MOVEABLE PURE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE MOVEABLE PURE +2 TEXTINCLUDE BEGIN "#include <windows.h>\r\n" "\0" END -3 TEXTINCLUDE MOVEABLE PURE +3 TEXTINCLUDE BEGIN "\r\n" "\0" Modified: trunk/reactos/base/shell/explorer/explorer-no.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-no.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-no.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -299,18 +299,18 @@ // TEXTINCLUDE // -1 TEXTINCLUDE MOVEABLE PURE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE MOVEABLE PURE +2 TEXTINCLUDE BEGIN "#include <windows.h>\r\n" "\0" END -3 TEXTINCLUDE MOVEABLE PURE +3 TEXTINCLUDE BEGIN "\r\n" "\0" Modified: trunk/reactos/base/shell/explorer/explorer-pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-pl.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-pl.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -299,18 +299,18 @@ // TEXTINCLUDE // -1 TEXTINCLUDE MOVEABLE PURE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE MOVEABLE PURE +2 TEXTINCLUDE BEGIN "#include <windows.h>\r\n" "\0" END -3 TEXTINCLUDE MOVEABLE PURE +3 TEXTINCLUDE BEGIN "\r\n" "\0" Modified: trunk/reactos/base/shell/explorer/explorer-ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-ro.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-ro.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -293,18 +293,18 @@ // TEXTINCLUDE // -1 TEXTINCLUDE MOVEABLE PURE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE MOVEABLE PURE +2 TEXTINCLUDE BEGIN "#include <windows.h>\r\n" "\0" END -3 TEXTINCLUDE MOVEABLE PURE +3 TEXTINCLUDE BEGIN "\r\n" "\0" Modified: trunk/reactos/base/shell/explorer/explorer-ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-ru.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -298,18 +298,18 @@ // TEXTINCLUDE // -1 TEXTINCLUDE MOVEABLE PURE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE MOVEABLE PURE +2 TEXTINCLUDE BEGIN "#include <windows.h>\r\n" "\0" END -3 TEXTINCLUDE MOVEABLE PURE +3 TEXTINCLUDE BEGIN "\r\n" "\0" Modified: trunk/reactos/base/shell/explorer/explorer-sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-sk.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-sk.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -310,18 +310,18 @@ // TEXTINCLUDE // -1 TEXTINCLUDE MOVEABLE PURE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE MOVEABLE PURE +2 TEXTINCLUDE BEGIN "#include <windows.h>\r\n" "\0" END -3 TEXTINCLUDE MOVEABLE PURE +3 TEXTINCLUDE BEGIN "\r\n" "\0" Modified: trunk/reactos/base/shell/explorer/explorer-sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-sv.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-sv.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -27,18 +27,18 @@ // TEXTINCLUDE // -1 TEXTINCLUDE MOVEABLE PURE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE MOVEABLE PURE +2 TEXTINCLUDE BEGIN "#include <windows.h>\r\n" "\0" END -3 TEXTINCLUDE MOVEABLE PURE +3 TEXTINCLUDE BEGIN "\r\n" "\0" Modified: trunk/reactos/base/shell/explorer/explorer-uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-uk.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-uk.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -298,18 +298,18 @@ // TEXTINCLUDE // -1 TEXTINCLUDE MOVEABLE PURE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE MOVEABLE PURE +2 TEXTINCLUDE BEGIN "#include <windows.h>\r\n" "\0" END -3 TEXTINCLUDE MOVEABLE PURE +3 TEXTINCLUDE BEGIN "\r\n" "\0" Modified: trunk/reactos/base/shell/explorer/explorer-zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-zh.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-zh.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -298,18 +298,18 @@ // TEXTINCLUDE // -1 TEXTINCLUDE MOVEABLE PURE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE MOVEABLE PURE +2 TEXTINCLUDE BEGIN "#include <windows.h>\r\n" "\0" END -3 TEXTINCLUDE MOVEABLE PURE +3 TEXTINCLUDE BEGIN "\r\n" "\0" Modified: trunk/reactos/base/shell/explorer/explorer_intres.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer_intres.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer_intres.rc [iso-8859-1] Mon Sep 16 20:52:16 2013 @@ -27,30 +27,30 @@ // Bitmap // -IDB_DRIVEBAR BITMAP MOVEABLE PURE "res/drivebar.bmp" -IDB_LOGOV BITMAP MOVEABLE PURE "res/logov.bmp" -IDB_LOGOV256 BITMAP MOVEABLE PURE "res/logov256.bmp" -IDB_LOGOV16 BITMAP MOVEABLE PURE "res/logov16.bmp" -IDB_ICON_ALIGN_0 BITMAP MOVEABLE PURE "res/icoalig0.bmp" -IDB_ICON_ALIGN_1 BITMAP MOVEABLE PURE "res/icoalig1.bmp" -IDB_ICON_ALIGN_2 BITMAP MOVEABLE PURE "res/icoalig2.bmp" -IDB_ICON_ALIGN_3 BITMAP MOVEABLE PURE "res/icoalig3.bmp" -IDB_ICON_ALIGN_4 BITMAP MOVEABLE PURE "res/icoalig4.bmp" -IDB_ICON_ALIGN_5 BITMAP MOVEABLE PURE "res/icoalig5.bmp" -IDB_ICON_ALIGN_6 BITMAP MOVEABLE PURE "res/icoalig6.bmp" -IDB_ICON_ALIGN_7 BITMAP MOVEABLE PURE "res/icoalig7.bmp" -IDB_ICON_ALIGN_8 BITMAP MOVEABLE PURE "res/icoalig8.bmp" -IDB_ICON_ALIGN_9 BITMAP MOVEABLE PURE "res/icoalig9.bmp" -IDB_ICON_ALIGN_10 BITMAP MOVEABLE PURE "res/icoali10.bmp" -IDB_MDI BITMAP MOVEABLE PURE "res/mdi.bmp" -IDB_SDI BITMAP MOVEABLE PURE "res/sdi.bmp" +IDB_DRIVEBAR BITMAP "res/drivebar.bmp" +IDB_LOGOV BITMAP "res/logov.bmp" +IDB_LOGOV256 BITMAP "res/logov256.bmp" +IDB_LOGOV16 BITMAP "res/logov16.bmp" +IDB_ICON_ALIGN_0 BITMAP "res/icoalig0.bmp" +IDB_ICON_ALIGN_1 BITMAP "res/icoalig1.bmp" +IDB_ICON_ALIGN_2 BITMAP "res/icoalig2.bmp" +IDB_ICON_ALIGN_3 BITMAP "res/icoalig3.bmp" +IDB_ICON_ALIGN_4 BITMAP "res/icoalig4.bmp" +IDB_ICON_ALIGN_5 BITMAP "res/icoalig5.bmp" +IDB_ICON_ALIGN_6 BITMAP "res/icoalig6.bmp" +IDB_ICON_ALIGN_7 BITMAP "res/icoalig7.bmp" +IDB_ICON_ALIGN_8 BITMAP "res/icoalig8.bmp" +IDB_ICON_ALIGN_9 BITMAP "res/icoalig9.bmp" +IDB_ICON_ALIGN_10 BITMAP "res/icoali10.bmp" +IDB_MDI BITMAP "res/mdi.bmp" +IDB_SDI BITMAP "res/sdi.bmp" ///////////////////////////////////////////////////////////////////////////// // // Accelerator // -IDA_EXPLORER ACCELERATORS MOVEABLE PURE +IDA_EXPLORER ACCELERATORS BEGIN "S", ID_VIEW_FULLSCREEN, VIRTKEY, SHIFT, CONTROL, NOINVERT @@ -58,12 +58,12 @@ "X", ID_FILE_EXIT, VIRTKEY, ALT, NOINVERT END -IDA_SEARCH_PROGRAM ACCELERATORS MOVEABLE PURE +IDA_SEARCH_PROGRAM ACCELERATORS BEGIN VK_F5, ID_REFRESH, VIRTKEY, NOINVERT END -IDA_TRAYNOTIFY ACCELERATORS MOVEABLE PURE +IDA_TRAYNOTIFY ACCELERATORS BEGIN VK_F5, ID_REFRESH, VIRTKEY, NOINVERT END @@ -75,18 +75,18 @@ // TEXTINCLUDE // -1 TEXTINCLUDE MOVEABLE PURE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE MOVEABLE PURE +2 TEXTINCLUDE BEGIN "#include <windows.h>\r\n" "\0" END -3 TEXTINCLUDE MOVEABLE PURE +3 TEXTINCLUDE BEGIN "#ifndef ROSSHELL\r\n" "IDB_IMAGES BITMAP DISCARDABLE ""res/images.bmp""\r\n" @@ -105,7 +105,7 @@ "END\r\n" "#endif\r\n" "#ifndef _DEBUG\r\n" - "CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST DISCARDABLE PURE ""explorer.exe.manifest""\r\n" + "CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST ""explorer.exe.manifest""\r\n" "#endif\r\n" "\r\n" "#include ""explorer-bg.rc""\r\n" @@ -211,7 +211,7 @@ END #endif #ifndef _DEBUG -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST DISCARDABLE PURE "explorer.exe.manifest" +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST DISCARDABLE "explorer.exe.manifest" #endif #ifdef LANGUAGE_BG_BG

1 0

[tfaber] 60175: [KMTESTS:EX] - Test that quota allocations keep their QUOTA_POOL_MASK bit in POOL_HEADER
by tfaber＠svn.reactos.org 16 Sep '13

16 Sep '13

Author: tfaber Date: Mon Sep 16 19:02:28 2013 New Revision: 60175 URL: http://svn.reactos.org/svn/reactos?rev=60175&view=rev Log: [KMTESTS:EX] - Test that quota allocations keep their QUOTA_POOL_MASK bit in POOL_HEADER Modified: trunk/rostests/kmtests/include/kmt_test.h trunk/rostests/kmtests/ntos_ex/ExPools.c Modified: trunk/rostests/kmtests/include/kmt_test.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/include/kmt_test.… ============================================================================== --- trunk/rostests/kmtests/include/kmt_test.h [iso-8859-1] (original) +++ trunk/rostests/kmtests/include/kmt_test.h [iso-8859-1] Mon Sep 16 19:02:28 2013 @@ -131,6 +131,7 @@ VOID KmtSetIrql(IN KIRQL NewIrql); BOOLEAN KmtAreInterruptsEnabled(VOID); ULONG KmtGetPoolTag(PVOID Memory); +USHORT KmtGetPoolType(PVOID Memory); #elif defined KMT_USER_MODE DWORD KmtRunKernelTest(IN PCSTR TestName); @@ -334,6 +335,20 @@ return Header->PoolTag; } +USHORT KmtGetPoolType(PVOID Memory) +{ + PPOOL_HEADER Header; + + /* it's not so easy for allocations of PAGE_SIZE */ + if (((ULONG_PTR)Memory & (PAGE_SIZE - 1)) == 0) + return 0; + + Header = Memory; + Header--; + + return Header->PoolType; +} + INT __cdecl KmtVSNPrintF(PSTR Buffer, SIZE_T BufferMaxLength, PCSTR Format, va_list Arguments) KMT_FORMAT(ms_printf, 3, 0); #elif defined KMT_USER_MODE static PKMT_RESULTBUFFER KmtAllocateResultBuffer(SIZE_T ResultBufferSize) Modified: trunk/rostests/kmtests/ntos_ex/ExPools.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ex/ExPools.c… ============================================================================== --- trunk/rostests/kmtests/ntos_ex/ExPools.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ex/ExPools.c [iso-8859-1] Mon Sep 16 19:02:28 2013 @@ -10,6 +10,11 @@ #define NDEBUG #include <debug.h> +#define TAG_POOLTEST 'tstP' + +#define BASE_POOL_TYPE_MASK 1 +#define QUOTA_POOL_MASK 8 + static LONG GetRefCount( @@ -18,8 +23,6 @@ POBJECT_HEADER Header = OBJECT_TO_OBJECT_HEADER(Object); return Header->PointerCount; } - -#define TAG_POOLTEST 'tstP' static VOID PoolsTest(VOID) { @@ -190,6 +193,7 @@ PVOID Memory; LONG InitialRefCount; LONG RefCount; + USHORT PoolType; NTSTATUS ExceptionStatus; InitialRefCount = GetRefCount(Process); @@ -211,6 +215,13 @@ /* A pointer to the process is found right before the next pool header */ StoredProcess = ((PVOID *)((ULONG_PTR)Memory + 2 * sizeof(LIST_ENTRY)))[-1]; ok_eq_pointer(StoredProcess, Process); + + /* Pool type should have QUOTA_POOL_MASK set */ + PoolType = KmtGetPoolType(Memory); + ok(PoolType != 0, "PoolType is 0\n"); + PoolType--; + ok(PoolType & QUOTA_POOL_MASK, "PoolType = %x\n", PoolType); + ok((PoolType & BASE_POOL_TYPE_MASK) == PagedPool, "PoolType = %x\n", PoolType); ExFreePoolWithTag(Memory, 'tQmK'); RefCount = GetRefCount(Process);

1 0

[tfaber] 60174: [KMTESTS:EX] - Add test for ExAllocatePoolWithQuotaTag
by tfaber＠svn.reactos.org 16 Sep '13

16 Sep '13

Author: tfaber Date: Mon Sep 16 18:15:02 2013 New Revision: 60174 URL: http://svn.reactos.org/svn/reactos?rev=60174&view=rev Log: [KMTESTS:EX] - Add test for ExAllocatePoolWithQuotaTag Modified: trunk/rostests/kmtests/ntos_ex/ExPools.c Modified: trunk/rostests/kmtests/ntos_ex/ExPools.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ex/ExPools.c… ============================================================================== --- trunk/rostests/kmtests/ntos_ex/ExPools.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ex/ExPools.c [iso-8859-1] Mon Sep 16 18:15:02 2013 @@ -10,6 +10,15 @@ #define NDEBUG #include <debug.h> +static +LONG +GetRefCount( + _In_ PVOID Object) +{ + POBJECT_HEADER Header = OBJECT_TO_OBJECT_HEADER(Object); + return Header->PointerCount; +} + #define TAG_POOLTEST 'tstP' static VOID PoolsTest(VOID) @@ -172,9 +181,83 @@ ExFreePoolWithTag(Memory, 'MyTa'); } +static +VOID +TestPoolQuota(VOID) +{ + PEPROCESS Process = PsGetCurrentProcess(); + PEPROCESS StoredProcess; + PVOID Memory; + LONG InitialRefCount; + LONG RefCount; + NTSTATUS ExceptionStatus; + + InitialRefCount = GetRefCount(Process); + + /* We get some memory from this function, and it's properly aligned. + * Also, it takes a reference to the process, and releases it on free */ + Memory = ExAllocatePoolWithQuotaTag(PagedPool | POOL_QUOTA_FAIL_INSTEAD_OF_RAISE, + sizeof(LIST_ENTRY), + 'tQmK'); + ok(Memory != NULL, "ExAllocatePoolWithQuotaTag returned NULL\n"); + if (!skip(Memory != NULL, "No memory\n")) + { + ok((ULONG_PTR)Memory % sizeof(LIST_ENTRY) == 0, + "Allocation %p is badly aligned\n", + Memory); + RefCount = GetRefCount(Process); + ok_eq_long(RefCount, InitialRefCount + 1); + + /* A pointer to the process is found right before the next pool header */ + StoredProcess = ((PVOID *)((ULONG_PTR)Memory + 2 * sizeof(LIST_ENTRY)))[-1]; + ok_eq_pointer(StoredProcess, Process); + + ExFreePoolWithTag(Memory, 'tQmK'); + RefCount = GetRefCount(Process); + ok_eq_long(RefCount, InitialRefCount); + } + + /* Large allocations are page-aligned, don't reference the process */ + Memory = ExAllocatePoolWithQuotaTag(PagedPool | POOL_QUOTA_FAIL_INSTEAD_OF_RAISE, + PAGE_SIZE, + 'tQmK'); + ok(Memory != NULL, "ExAllocatePoolWithQuotaTag returned NULL\n"); + if (!skip(Memory != NULL, "No memory\n")) + { + ok((ULONG_PTR)Memory % PAGE_SIZE == 0, + "Allocation %p is badly aligned\n", + Memory); + RefCount = GetRefCount(Process); + ok_eq_long(RefCount, InitialRefCount); + ExFreePoolWithTag(Memory, 'tQmK'); + RefCount = GetRefCount(Process); + ok_eq_long(RefCount, InitialRefCount); + } + + /* Function raises by default */ + KmtStartSeh() + Memory = ExAllocatePoolWithQuotaTag(PagedPool, + 0x7FFFFFFF, + 'tQmK'); + if (Memory) + ExFreePoolWithTag(Memory, 'tQmK'); + KmtEndSeh(STATUS_INSUFFICIENT_RESOURCES); + + /* Function returns NULL with POOL_QUOTA_FAIL_INSTEAD_OF_RAISE */ + KmtStartSeh() + Memory = ExAllocatePoolWithQuotaTag(PagedPool | POOL_QUOTA_FAIL_INSTEAD_OF_RAISE, + 0x7FFFFFFF, + 'tQmK'); + ok(Memory == NULL, "Successfully got 2GB block: %p\n", Memory); + if (Memory) + ExFreePoolWithTag(Memory, 'tQmK'); + KmtEndSeh(STATUS_SUCCESS); +} + START_TEST(ExPools) { PoolsTest(); PoolsCorruption(); TestPoolTags(); -} + TestPoolQuota(); +}

1 0

[tfaber] 60173: [NPFS] - Fix usage of ExAllocatePoolWithQuotaTag
by tfaber＠svn.reactos.org 16 Sep '13

16 Sep '13

Author: tfaber Date: Mon Sep 16 17:37:47 2013 New Revision: 60173 URL: http://svn.reactos.org/svn/reactos?rev=60173&view=rev Log: [NPFS] - Fix usage of ExAllocatePoolWithQuotaTag Modified: trunk/reactos/drivers/filesystems/npfs_new/datasup.c trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c trunk/reactos/drivers/filesystems/npfs_new/secursup.c trunk/reactos/drivers/filesystems/npfs_new/waitsup.c Modified: trunk/reactos/drivers/filesystems/npfs_new/datasup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/datasup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/datasup.c [iso-8859-1] Mon Sep 16 17:37:47 2013 @@ -329,7 +329,7 @@ case 3: ASSERT(Irp != NULL); - DataEntry = ExAllocatePoolWithQuotaTag(NonPagedPool, + DataEntry = ExAllocatePoolWithQuotaTag(NonPagedPool | POOL_QUOTA_FAIL_INSTEAD_OF_RAISE, sizeof(*DataEntry), NPFS_DATA_ENTRY_TAG); if (!DataEntry) @@ -371,7 +371,7 @@ HasSpace = FALSE; } - DataEntry = ExAllocatePoolWithQuotaTag(NonPagedPool, + DataEntry = ExAllocatePoolWithQuotaTag(NonPagedPool | POOL_QUOTA_FAIL_INSTEAD_OF_RAISE, EntrySize, NPFS_DATA_ENTRY_TAG); if (!DataEntry) Modified: trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c [iso-8859-1] Mon Sep 16 17:37:47 2013 @@ -433,7 +433,9 @@ if (BytesWritten) { - NewIrp->AssociatedIrp.SystemBuffer = ExAllocatePoolWithQuotaTag(PagedPool, BytesWritten, NPFS_WRITE_BLOCK_TAG); + NewIrp->AssociatedIrp.SystemBuffer = ExAllocatePoolWithQuotaTag(PagedPool | POOL_QUOTA_FAIL_INSTEAD_OF_RAISE, + BytesWritten, + NPFS_WRITE_BLOCK_TAG); if (!NewIrp->AssociatedIrp.SystemBuffer) { IoFreeIrp(NewIrp); Modified: trunk/reactos/drivers/filesystems/npfs_new/secursup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/secursup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/secursup.c [iso-8859-1] Mon Sep 16 17:37:47 2013 @@ -139,7 +139,9 @@ } else { - NewContext = ExAllocatePoolWithQuotaTag(PagedPool, sizeof(*NewContext), NPFS_CLIENT_SEC_CTX_TAG); + NewContext = ExAllocatePoolWithQuotaTag(PagedPool | POOL_QUOTA_FAIL_INSTEAD_OF_RAISE, + sizeof(*NewContext), + NPFS_CLIENT_SEC_CTX_TAG); if (!NewContext) return STATUS_INSUFFICIENT_RESOURCES; Status = SeCreateClientSecurity(Thread, &Ccb->ClientQos, 0, NewContext); Modified: trunk/reactos/drivers/filesystems/npfs_new/waitsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/waitsup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/waitsup.c [iso-8859-1] Mon Sep 16 17:37:47 2013 @@ -219,7 +219,7 @@ IoStack = IoGetCurrentIrpStackLocation(Irp); - WaitEntry = ExAllocatePoolWithQuotaTag(NonPagedPool, + WaitEntry = ExAllocatePoolWithQuotaTag(NonPagedPool | POOL_QUOTA_FAIL_INSTEAD_OF_RAISE, sizeof(*WaitEntry), NPFS_WRITE_BLOCK_TAG); if (!WaitEntry)

1 0

[jgardou] 60172: [FIX_BUILD_DAMN_IT] - forgot this file
by jgardou＠svn.reactos.org 16 Sep '13

16 Sep '13

Author: jgardou Date: Mon Sep 16 17:23:06 2013 New Revision: 60172 URL: http://svn.reactos.org/svn/reactos?rev=60172&view=rev Log: [FIX_BUILD_DAMN_IT] - forgot this file Modified: trunk/reactos/dll/opengl/opengl32_new/opengl32.h Modified: trunk/reactos/dll/opengl/opengl32_new/opengl32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32_new/op… ============================================================================== --- trunk/reactos/dll/opengl/opengl32_new/opengl32.h [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/opengl32_new/opengl32.h [iso-8859-1] Mon Sep 16 17:23:06 2013 @@ -22,7 +22,7 @@ { DWORD magic; volatile LONG lock; - + DHGLRC dhglrc; struct ICD_Data* icd_data; INT pixelformat; @@ -65,6 +65,7 @@ HGLRC hglrc; HDC hdc; struct wgl_dc_data* dc_data; + PVOID* icdData; }; static inline

1 0

[jgardou] 60171: [OPENGL32_NEW] - Call DrvSetCallbackProcs when initializing the ICD. Prototype taken from mesa ICD, functionality documented by one of them.
by jgardou＠svn.reactos.org 16 Sep '13

16 Sep '13

Author: jgardou Date: Mon Sep 16 17:17:04 2013 New Revision: 60171 URL: http://svn.reactos.org/svn/reactos?rev=60171&view=rev Log: [OPENGL32_NEW] - Call DrvSetCallbackProcs when initializing the ICD. Prototype taken from mesa ICD, functionality documented by one of them. Modified: trunk/reactos/dll/opengl/opengl32_new/icdload.c Modified: trunk/reactos/dll/opengl/opengl32_new/icdload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32_new/ic… ============================================================================== --- trunk/reactos/dll/opengl/opengl32_new/icdload.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/opengl32_new/icdload.c [iso-8859-1] Mon Sep 16 17:17:04 2013 @@ -21,6 +21,31 @@ static CRITICAL_SECTION icdload_cs = {NULL, -1, 0, 0, 0, 0}; static struct ICD_Data* ICD_Data_List = NULL; static const WCHAR OpenGLDrivers_Key[] = L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\OpenGLDrivers"; + +static void APIENTRY wglSetCurrentValue(PVOID value) +{ +#ifdef OPENGL32_USE_TLS + struct Opengl32_ThreadData* data = TlsGetValue(OglTlsIndex); + data->icdData = value; +#else + NtCurrentTeb()->glReserved2 = value; +#endif +} + +static PVOID APIENTRY wglGetCurrentValue() +{ +#ifdef OPENGL32_USE_TLS + struct Opengl32_ThreadData* data = TlsGetValue(OglTlsIndex); + return data->icdData; +#else + return NtCurrentTeb()->glReserved2; +#endif +} + +static DHGLRC wglGetDHGLRC(struct wgl_context* context) +{ + return context->dhglrc; +} /* Retrieves the ICD data (driver version + relevant DLL entry points) for a device context */ struct ICD_Data* IntGetIcdData(HDC hdc) @@ -32,6 +57,7 @@ HKEY OglKey, DrvKey; WCHAR DllName[MAX_PATH]; BOOL (WINAPI *DrvValidateVersion)(DWORD); + void (WINAPI *DrvSetCallbackProcs)(int nProcs, PROC* pProcs); /* First, see if the driver supports this */ dwInput = OPENGL_GETINFO; @@ -190,6 +216,16 @@ ERR("DrvValidateVersion failed!.\n"); goto fail; } + } + + /* Pass the callbacks */ + DrvSetCallbackProcs = (void*)GetProcAddress(data->hModule, "DrvSetCallbackProcs"); + if(DrvSetCallbackProcs) + { + PROC callbacks[] = {(PROC)wglGetCurrentValue, + (PROC)wglSetCurrentValue, + (PROC)wglGetDHGLRC}; + DrvSetCallbackProcs(3, callbacks); } /* Get the DLL exports */

1 0

[akhaldi] 60170: [FUSION_WINETEST] * Sync with Wine 1.7.1.
by akhaldi＠svn.reactos.org 16 Sep '13

16 Sep '13

Author: akhaldi Date: Mon Sep 16 15:16:11 2013 New Revision: 60170 URL: http://svn.reactos.org/svn/reactos?rev=60170&view=rev Log: [FUSION_WINETEST] * Sync with Wine 1.7.1. Modified: trunk/rostests/winetests/fusion/CMakeLists.txt trunk/rostests/winetests/fusion/asmcache.c Modified: trunk/rostests/winetests/fusion/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/fusion/CMakeLis… ============================================================================== --- trunk/rostests/winetests/fusion/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/fusion/CMakeLists.txt [iso-8859-1] Mon Sep 16 15:16:11 2013 @@ -9,11 +9,6 @@ testlist.c) add_executable(fusion_winetest ${SOURCE}) -target_link_libraries(fusion_winetest wine) set_module_type(fusion_winetest win32cui) -add_importlibs(fusion_winetest user32 msvcrt kernel32 ntdll) +add_importlibs(fusion_winetest user32 msvcrt kernel32) add_cd_file(TARGET fusion_winetest DESTINATION reactos/bin FOR all) - -if(NOT MSVC) - allow_warnings(fusion_winetest) -endif() Modified: trunk/rostests/winetests/fusion/asmcache.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/fusion/asmcache… ============================================================================== --- trunk/rostests/winetests/fusion/asmcache.c [iso-8859-1] (original) +++ trunk/rostests/winetests/fusion/asmcache.c [iso-8859-1] Mon Sep 16 15:16:11 2013 @@ -830,11 +830,11 @@ assembly.tableshdr.MaskValid.u.LowPart = 0x00000005; assembly.tableshdr.MaskSorted.u.HighPart = 0x1600; assembly.tableshdr.MaskSorted.u.LowPart = 0x3301FA00; - U1(assembly.labelres).Name = 0x10; + U(assembly.labelres).Name = 0x10; U2(assembly.labelres).OffsetToData = 0x80000018; - U1(assembly.label11res).Name = 0x1; + U(assembly.label11res).Name = 0x1; U2(assembly.label11res).OffsetToData = 0x80000030; - U1(assembly.label10res).Name = 0x0; + U(assembly.label10res).Name = 0x0; U2(assembly.label10res).OffsetToData = 0x48; hfile = CreateFileA(file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0);

1 0

[akhaldi] 60169: [FUSION] * Sync with Wine 1.7.1.
by akhaldi＠svn.reactos.org 16 Sep '13

16 Sep '13

Author: akhaldi Date: Mon Sep 16 15:15:20 2013 New Revision: 60169 URL: http://svn.reactos.org/svn/reactos?rev=60169&view=rev Log: [FUSION] * Sync with Wine 1.7.1. Modified: trunk/reactos/dll/win32/fusion/CMakeLists.txt trunk/reactos/dll/win32/fusion/assembly.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/fusion/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/fusion/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/CMakeLists.txt [iso-8859-1] Mon Sep 16 15:15:20 2013 @@ -10,13 +10,12 @@ asmname.c assembly.c fusion.c - version.rc ${CMAKE_CURRENT_BINARY_DIR}/fusion_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/fusion.def) -add_library(fusion SHARED ${SOURCE}) +add_library(fusion SHARED ${SOURCE} version.rc) set_module_type(fusion win32dll) -target_link_libraries(fusion wine uuid) +target_link_libraries(fusion wine) add_importlibs(fusion advapi32 dbghelp shlwapi user32 msvcrt kernel32 ntdll) add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v1.0.3705 FOR all) add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v1.1.4322 FOR all) Modified: trunk/reactos/dll/win32/fusion/assembly.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/assembly.… ============================================================================== --- trunk/reactos/dll/win32/fusion/assembly.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/assembly.c [iso-8859-1] Mon Sep 16 15:15:20 2013 @@ -599,8 +599,7 @@ else if (!lstrcmpA(stream, "#Blob") || !lstrcmpA(stream, "Blob")) assembly->blobs = assembly_data_offset(assembly, ofs); - ptr += lstrlenA(stream) + 1; - ptr = (BYTE *)(((UINT_PTR)ptr + 3) & ~3); /* align on DWORD boundary */ + ptr += ((lstrlenA(stream) + 1) + 3) & ~3; /* align on DWORD boundary */ } return S_OK; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Sep 16 15:15:20 2013 @@ -72,7 +72,7 @@ reactos/dll/win32/dciman32 # Synced to Wine-1.7.1 reactos/dll/win32/dwmapi # Synced to Wine-1.7.1 reactos/dll/win32/faultrep # Synced to Wine-1.7.1 -reactos/dll/win32/fusion # Synced to Wine-1.5.26 +reactos/dll/win32/fusion # Synced to Wine-1.7.1 reactos/dll/win32/gdiplus # Synced to Wine-1.5.26 reactos/dll/win32/hhctrl.ocx # Synced to Wine-1.5.26 reactos/dll/win32/hlink # Synced to Wine-1.5.4

1 0

[akhaldi] 60168: [FAULTREP_WINETEST] * Import from Wine 1.7.1.
by akhaldi＠svn.reactos.org 16 Sep '13

16 Sep '13

Author: akhaldi Date: Mon Sep 16 15:08:03 2013 New Revision: 60168 URL: http://svn.reactos.org/svn/reactos?rev=60168&view=rev Log: [FAULTREP_WINETEST] * Import from Wine 1.7.1. Added: trunk/rostests/winetests/faultrep/ trunk/rostests/winetests/faultrep/CMakeLists.txt (with props) trunk/rostests/winetests/faultrep/faultrep.c (with props) trunk/rostests/winetests/faultrep/testlist.c (with props) Modified: trunk/rostests/winetests/CMakeLists.txt 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] Mon Sep 16 15:08:03 2013 @@ -21,6 +21,7 @@ add_subdirectory(dinput) add_subdirectory(dnsapi) add_subdirectory(dsound) +add_subdirectory(faultrep) add_subdirectory(fusion) add_subdirectory(gdi32) add_subdirectory(gdiplus) Added: trunk/rostests/winetests/faultrep/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/faultrep/CMakeL… ============================================================================== --- trunk/rostests/winetests/faultrep/CMakeLists.txt (added) +++ trunk/rostests/winetests/faultrep/CMakeLists.txt [iso-8859-1] Mon Sep 16 15:08:03 2013 @@ -0,0 +1,5 @@ + +add_executable(faultrep_winetest faultrep.c testlist.c) +set_module_type(faultrep_winetest win32cui) +add_importlibs(faultrep_winetest faultrep advapi32 msvcrt kernel32) +add_cd_file(TARGET faultrep_winetest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/winetests/faultrep/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/faultrep/faultrep.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/faultrep/faultr… ============================================================================== --- trunk/rostests/winetests/faultrep/faultrep.c (added) +++ trunk/rostests/winetests/faultrep/faultrep.c [iso-8859-1] Mon Sep 16 15:08:03 2013 @@ -0,0 +1,90 @@ +/* + * Unit test suite for fault reporting in XP and above + * + * Copyright 2010 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winreg.h" + +#include "errorrep.h" +#include "wine/test.h" + +static char regpath_root[] = "Software\\Microsoft\\PCHealth\\ErrorReporting"; +static char regpath_exclude[] = "ExclusionList"; + +/* ###### */ + +static void test_AddERExcludedApplicationA(void) +{ + BOOL res; + LONG lres; + HKEY hroot; + HKEY hexclude = 0; + + /* clean state */ + lres = RegCreateKeyA(HKEY_LOCAL_MACHINE, regpath_root, &hroot); + if (lres == ERROR_ACCESS_DENIED) + { + skip("Not enough access rights\n"); + return; + } + + if (!lres) + lres = RegOpenKeyA(hroot, regpath_exclude, &hexclude); + + if (!lres) + RegDeleteValueA(hexclude, "winetest_faultrep.exe"); + + + SetLastError(0xdeadbeef); + res = AddERExcludedApplicationA(NULL); + ok(!res, "got %d and 0x%x (expected FALSE)\n", res, GetLastError()); + + SetLastError(0xdeadbeef); + res = AddERExcludedApplicationA(""); + ok(!res, "got %d and 0x%x (expected FALSE)\n", res, GetLastError()); + + SetLastError(0xdeadbeef); + /* existence of the path doesn't matter this function succeeded */ + res = AddERExcludedApplicationA("winetest_faultrep.exe"); + ok(res, "got %d and 0x%x (expected TRUE)\n", res, GetLastError()); + + /* add, when already present */ + SetLastError(0xdeadbeef); + res = AddERExcludedApplicationA("winetest_faultrep.exe"); + ok(res, "got %d and 0x%x (expected TRUE)\n", res, GetLastError()); + + /* cleanup */ + RegDeleteValueA(hexclude, "winetest_faultrep.exe"); + + RegCloseKey(hexclude); + RegCloseKey(hroot); +} + +/* ########################### */ + +START_TEST(faultrep) +{ + test_AddERExcludedApplicationA(); +} Propchange: trunk/rostests/winetests/faultrep/faultrep.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/faultrep/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/faultrep/testli… ============================================================================== --- trunk/rostests/winetests/faultrep/testlist.c (added) +++ trunk/rostests/winetests/faultrep/testlist.c [iso-8859-1] Mon Sep 16 15:08:03 2013 @@ -0,0 +1,12 @@ +/* Automatically generated file; DO NOT EDIT!! */ + +#define STANDALONE +#include <wine/test.h> + +extern void func_faultrep(void); + +const struct test winetest_testlist[] = +{ + { "faultrep", func_faultrep }, + { 0, 0 } +}; Propchange: trunk/rostests/winetests/faultrep/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 60167: [FAULTREP] * Sync with Wine 1.7.1.
by akhaldi＠svn.reactos.org 16 Sep '13

16 Sep '13

Author: akhaldi Date: Mon Sep 16 15:06:48 2013 New Revision: 60167 URL: http://svn.reactos.org/svn/reactos?rev=60167&view=rev Log: [FAULTREP] * Sync with Wine 1.7.1. Modified: trunk/reactos/dll/win32/faultrep/CMakeLists.txt trunk/reactos/dll/win32/faultrep/faultrep.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/faultrep/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/faultrep/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/faultrep/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/faultrep/CMakeLists.txt [iso-8859-1] Mon Sep 16 15:06:48 2013 @@ -1,7 +1,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(faultrep.dll faultrep.spec) +spec2def(faultrep.dll faultrep.spec ADD_IMPORTLIB) list(APPEND SOURCE faultrep.c Modified: trunk/reactos/dll/win32/faultrep/faultrep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/faultrep/faultre… ============================================================================== --- trunk/reactos/dll/win32/faultrep/faultrep.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/faultrep/faultrep.c [iso-8859-1] Mon Sep 16 15:06:48 2013 @@ -53,14 +53,13 @@ * Wine doesn't use this data but stores it in the registry (in the same place * as Windows would) in case it will be useful in a future version * - * According to MSDN this function should succeed even if the user has no write - * access to HKLM. This probably means that there is no error checking. */ BOOL WINAPI AddERExcludedApplicationW(LPCWSTR lpAppFileName) { WCHAR *bslash; DWORD value = 1; HKEY hkey; + LONG res; TRACE("(%s)\n", wine_dbgstr_w(lpAppFileName)); bslash = strrchrW(lpAppFileName, '\\'); @@ -72,13 +71,14 @@ return FALSE; } - if (!RegCreateKeyW(HKEY_LOCAL_MACHINE, SZ_EXCLUSIONLIST_KEY, &hkey)) + res = RegCreateKeyW(HKEY_LOCAL_MACHINE, SZ_EXCLUSIONLIST_KEY, &hkey); + if (!res) { RegSetValueExW(hkey, lpAppFileName, 0, REG_DWORD, (LPBYTE)&value, sizeof(value)); RegCloseKey(hkey); } - return TRUE; + return !res; } /************************************************************************* @@ -123,8 +123,6 @@ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(inst); break; - case DLL_PROCESS_DETACH: - break; } return TRUE; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Sep 16 15:06:48 2013 @@ -71,7 +71,7 @@ reactos/dll/win32/dbghelp # Synced to Wine-1.7.1 reactos/dll/win32/dciman32 # Synced to Wine-1.7.1 reactos/dll/win32/dwmapi # Synced to Wine-1.7.1 -reactos/dll/win32/faultrep # Synced to Wine-1.5.4 +reactos/dll/win32/faultrep # Synced to Wine-1.7.1 reactos/dll/win32/fusion # Synced to Wine-1.5.26 reactos/dll/win32/gdiplus # Synced to Wine-1.5.26 reactos/dll/win32/hhctrl.ocx # Synced to Wine-1.5.26

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
56
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 September 2013