Ros-diffs March 2017

ros-diffs@reactos.org

14 participants
251 discussions

[mjansen] 74177: [ATL][ATL_APITEST] Allow CString to be initialized with a resource ID + add tests for this. Patch by Katayama Hirofumi MZ. CORE-12917 #resolve #comment Thanks!

by mjansen＠svn.reactos.org

Author: mjansen Date: Wed Mar 15 19:17:44 2017 New Revision: 74177 URL: http://svn.reactos.org/svn/reactos?rev=74177&view=rev Log: [ATL][ATL_APITEST] Allow CString to be initialized with a resource ID + add tests for this. Patch by Katayama Hirofumi MZ. CORE-12917 #resolve #comment Thanks! Added: trunk/rostests/apitests/atl/devenv/CString.vcxproj Modified: trunk/reactos/sdk/lib/atl/cstringt.h trunk/rostests/apitests/atl/CMakeLists.txt trunk/rostests/apitests/atl/CString.cpp trunk/rostests/apitests/atl/CString.inl trunk/rostests/apitests/atl/devenv/ATLTest.sln Modified: trunk/reactos/sdk/lib/atl/cstringt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/atl/cstringt.h?rev… ============================================================================== --- trunk/reactos/sdk/lib/atl/cstringt.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/atl/cstringt.h [iso-8859-1] Wed Mar 15 19:17:44 2017 @@ -326,48 +326,52 @@ *this = static_cast<const YCHAR*>(strSrc); } +protected: + /* helper function */ + template <typename T_CHAR> + void LoadFromPtr_(_In_opt_z_ const T_CHAR* pszSrc) + { + if (pszSrc == NULL) + return; + if (IS_INTRESOURCE(pszSrc)) + LoadString(LOWORD(pszSrc)); + else + *this = pszSrc; + } + +public: CStringT(_In_opt_z_ const XCHAR* pszSrc) : - CThisSimpleString( StringTraits::GetDefaultManager() ) - { - // FIXME: Check whether pszSrc is not a resource string ID! - *this = pszSrc; - } - - CStringT( - _In_opt_z_ const XCHAR* pszSrc, - _In_ IAtlStringMgr* pStringMgr) : - CThisSimpleString( pStringMgr ) - { - // FIXME: Check whether pszSrc is not a resource string ID! - *this = pszSrc; + CThisSimpleString(StringTraits::GetDefaultManager()) + { + LoadFromPtr_(pszSrc); + } + + CStringT(_In_opt_z_ const XCHAR* pszSrc, + _In_ IAtlStringMgr* pStringMgr) : CThisSimpleString(pStringMgr) + { + LoadFromPtr_(pszSrc); } CStringT(_In_opt_z_ const YCHAR* pszSrc) : - CThisSimpleString( StringTraits::GetDefaultManager() ) - { - // FIXME: Check whether pszSrc is not a resource string ID! - *this = pszSrc; - } - - CStringT( - _In_opt_z_ const YCHAR* pszSrc, - _In_ IAtlStringMgr* pStringMgr) : - CThisSimpleString( pStringMgr ) - { - // FIXME: Check whether pszSrc is not a resource string ID! - *this = pszSrc; - } - - CStringT( - _In_reads_z_(nLength) const XCHAR* pch, - _In_ int nLength) : + CThisSimpleString(StringTraits::GetDefaultManager()) + { + LoadFromPtr_(pszSrc); + } + + CStringT(_In_opt_z_ const YCHAR* pszSrc, + _In_ IAtlStringMgr* pStringMgr) : CThisSimpleString(pStringMgr) + { + LoadFromPtr_(pszSrc); + } + + CStringT(_In_reads_z_(nLength) const XCHAR* pch, + _In_ int nLength) : CThisSimpleString(pch, nLength, StringTraits::GetDefaultManager()) { } - CStringT( - _In_reads_z_(nLength) const YCHAR* pch, - _In_ int nLength) : + CStringT(_In_reads_z_(nLength) const YCHAR* pch, + _In_ int nLength) : CThisSimpleString(pch, nLength, StringTraits::GetDefaultManager()) { } Modified: trunk/rostests/apitests/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/atl/CMakeLists.t… ============================================================================== --- trunk/rostests/apitests/atl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/atl/CMakeLists.txt [iso-8859-1] Wed Mar 15 19:17:44 2017 @@ -17,7 +17,7 @@ testlist.c atl_apitest.rc) -target_link_libraries(atl_apitest wine uuid) +target_link_libraries(atl_apitest wine atlnew uuid) set_module_type(atl_apitest win32cui) add_importlibs(atl_apitest rpcrt4 ole32 oleaut32 msimg32 gdi32 advapi32 user32 msvcrt kernel32 ntdll) add_rostests_file(TARGET atl_apitest) Modified: trunk/rostests/apitests/atl/CString.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/atl/CString.cpp?… ============================================================================== --- trunk/rostests/apitests/atl/CString.cpp [iso-8859-1] (original) +++ trunk/rostests/apitests/atl/CString.cpp [iso-8859-1] Wed Mar 15 19:17:44 2017 @@ -2,12 +2,70 @@ * PROJECT: ReactOS api tests * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory * PURPOSE: Test for CString - * PROGRAMMER: Mark Jansen + * PROGRAMMERS: Mark Jansen + * Katayama Hirofumi MZ */ #include <atlstr.h> -#include <apitest.h> - +#include "resource.h" + +#ifdef __REACTOS__ + #include <apitest.h> +#else + #include <stdlib.h> + #include <stdio.h> + #include <stdarg.h> + #include <windows.h> + int g_tests_executed = 0; + int g_tests_failed = 0; + int g_tests_skipped = 0; + const char *g_file = NULL; + int g_line = 0; + void set_location(const char *file, int line) + { + g_file = file; + g_line = line; + } + void ok_func(int value, const char *fmt, ...) + { + va_list va; + va_start(va, fmt); + if (!value) + { + printf("%s (%d): ", g_file, g_line); + vprintf(fmt, va); + g_tests_failed++; + } + g_tests_executed++; + va_end(va); + } + void skip_func(const char *fmt, ...) + { + va_list va; + va_start(va, fmt); + printf("%s (%d): test skipped: ", g_file, g_line); + vprintf(fmt, va); + g_tests_skipped++; + va_end(va); + } + #undef ok + #define ok(value, ...) do { \ + set_location(__FILE__, __LINE__); \ + ok_func(value, __VA_ARGS__); \ + } while (0) + #define ok_(x1,x2) set_location(x1,x2); ok_func + #define skip(...) do { \ + set_location(__FILE__, __LINE__); \ + skip_func(__VA_ARGS__); \ + } while (0) + #define START_TEST(x) int main(void) + char *wine_dbgstr_w(const wchar_t *wstr) + { + static char buf[512]; + WideCharToMultiByte(CP_ACP, 0, wstr, -1, buf, _countof(buf), NULL, NULL); + return buf; + } +#endif struct traits_test { @@ -113,7 +171,11 @@ // Allocation strategy seems to differ a bit between us and MS's atl. // if someone cares enough to find out why, feel free to change the macro below. +#ifdef __REACTOS__ #define ALLOC_EXPECT(a, b) b +#else +#define ALLOC_EXPECT(a, b) a +#endif #undef ok @@ -123,9 +185,12 @@ #define CStringX CStringW #define _X(x) L ## x #define XCHAR WCHAR +#define YCHAR CHAR #define dbgstrx(x) wine_dbgstr_w(x) #define ok ok_("CStringW:\n" __FILE__, __LINE__) #define GetWindowsDirectoryX GetWindowsDirectoryW +#define MAKEINTRESOURCEX(x) MAKEINTRESOURCEW(x) +#define MAKEINTRESOURCEY(x) MAKEINTRESOURCEA(x) #include "CString.inl" @@ -133,17 +198,23 @@ #undef TEST_NAMEX #undef _X #undef XCHAR +#undef YCHAR #undef dbgstrx #undef ok #undef GetWindowsDirectoryX +#undef MAKEINTRESOURCEX +#undef MAKEINTRESOURCEY #define TEST_NAMEX(name) void test_##name##A() #define CStringX CStringA #define _X(x) x #define XCHAR CHAR +#define YCHAR WCHAR #define dbgstrx(x) (const char*)x #define ok ok_("CStringA:\n" __FILE__, __LINE__) #define GetWindowsDirectoryX GetWindowsDirectoryA +#define MAKEINTRESOURCEX(x) MAKEINTRESOURCEA(x) +#define MAKEINTRESOURCEY(x) MAKEINTRESOURCEW(x) #include "CString.inl" @@ -179,4 +250,12 @@ test_envW(); test_envA(); + + test_load_strW(); + test_load_strA(); + +#ifndef __REACTOS__ + printf("CString: %i tests executed (0 marked as todo, %i failures), %i skipped.\n", g_tests_executed, g_tests_failed, g_tests_skipped); + return 0; +#endif } Modified: trunk/rostests/apitests/atl/CString.inl URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/atl/CString.inl?… ============================================================================== --- trunk/rostests/apitests/atl/CString.inl [iso-8859-1] (original) +++ trunk/rostests/apitests/atl/CString.inl [iso-8859-1] Wed Mar 15 19:17:44 2017 @@ -388,3 +388,39 @@ ok(test.IsEmpty() == true, "Expected test to be empty\n"); ok(test.GetLength() == 0, "Expected GetLength() to be 0, was: %i\n", test.GetLength()); } + +TEST_NAMEX(load_str) +{ + CStringX str; + + ok(str.LoadString(0) == FALSE, "LoadString should fail.\n"); + + ok(str.LoadString(IDS_TEST1) == TRUE, "LoadString failed.\n"); + ok(str == _X("Test string one."), "The value was '%s'\n", dbgstrx(str)); + + ok(str.LoadString(IDS_TEST2) == TRUE, "LoadString failed.\n"); + ok(str == _X("I am a happy BSTR"), "The value was '%s'\n", dbgstrx(str)); + + ok(str.LoadString(0) == FALSE, "LoadString should fail.\n"); + ok(str == _X("I am a happy BSTR"), "The value was '%s'\n", dbgstrx(str)); + + XCHAR *xNULL = NULL; + CStringX str0(xNULL); + ok(str0.IsEmpty(), "str0 should be empty.\n"); + + YCHAR *yNULL = NULL; + CStringX str1(yNULL); + ok(str1.IsEmpty(), "str1 should be empty.\n"); + + CStringX str2(MAKEINTRESOURCEX(IDS_TEST1)); + ok(str2 == _X("Test string one."), "The value was '%s'\n", dbgstrx(str2)); + + CStringX str3(MAKEINTRESOURCEX(IDS_TEST2)); + ok(str3 == _X("I am a happy BSTR"), "The value was '%s'\n", dbgstrx(str3)); + + CStringX str4(MAKEINTRESOURCEY(IDS_TEST1)); + ok(str4 == _X("Test string one."), "The value was '%s'\n", dbgstrx(str4)); + + CStringX str5(MAKEINTRESOURCEY(IDS_TEST2)); + ok(str5 == _X("I am a happy BSTR"), "The value was '%s'\n", dbgstrx(str5)); +} Modified: trunk/rostests/apitests/atl/devenv/ATLTest.sln URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/atl/devenv/ATLTe… ============================================================================== --- trunk/rostests/apitests/atl/devenv/ATLTest.sln [iso-8859-1] (original) +++ trunk/rostests/apitests/atl/devenv/ATLTest.sln [iso-8859-1] Wed Mar 15 19:17:44 2017 @@ -1,13 +1,15 @@ ï»¿ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CImage", "CImage.vcxproj", "{AE520E17-2DAE-40FF-B082-F32A7A935FB2}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CSimpleArray", "CSimpleArray.vcxproj", "{9F029341-87C2-4BFD-B1FC-D5F5B8D28D55}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CSimpleMap", "CSimpleMap.vcxproj", "{EC560DE6-6DB3-437D-85CA-582491FE6F95}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CString", "CString.vcxproj", "{FBA6DAE7-7996-4DE1-BD03-9E44F7DB4ABD}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -41,6 +43,14 @@ {EC560DE6-6DB3-437D-85CA-582491FE6F95}.Release|x64.Build.0 = Release|x64 {EC560DE6-6DB3-437D-85CA-582491FE6F95}.Release|x86.ActiveCfg = Release|Win32 {EC560DE6-6DB3-437D-85CA-582491FE6F95}.Release|x86.Build.0 = Release|Win32 + {FBA6DAE7-7996-4DE1-BD03-9E44F7DB4ABD}.Debug|x64.ActiveCfg = Debug|x64 + {FBA6DAE7-7996-4DE1-BD03-9E44F7DB4ABD}.Debug|x64.Build.0 = Debug|x64 + {FBA6DAE7-7996-4DE1-BD03-9E44F7DB4ABD}.Debug|x86.ActiveCfg = Debug|Win32 + {FBA6DAE7-7996-4DE1-BD03-9E44F7DB4ABD}.Debug|x86.Build.0 = Debug|Win32 + {FBA6DAE7-7996-4DE1-BD03-9E44F7DB4ABD}.Release|x64.ActiveCfg = Release|x64 + {FBA6DAE7-7996-4DE1-BD03-9E44F7DB4ABD}.Release|x64.Build.0 = Release|x64 + {FBA6DAE7-7996-4DE1-BD03-9E44F7DB4ABD}.Release|x86.ActiveCfg = Release|Win32 + {FBA6DAE7-7996-4DE1-BD03-9E44F7DB4ABD}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Added: trunk/rostests/apitests/atl/devenv/CString.vcxproj URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/atl/devenv/CStri… ============================================================================== --- trunk/rostests/apitests/atl/devenv/CString.vcxproj (added) +++ trunk/rostests/apitests/atl/devenv/CString.vcxproj [iso-8859-1] Wed Mar 15 19:17:44 2017 @@ -0,0 +1,189 @@ +ï»¿<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{FBA6DAE7-7996-4DE1-BD03-9E44F7DB4ABD}</ProjectGuid> + <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + <Keyword>AtlProj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v120_xp</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v120_xp</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v120_xp</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v120_xp</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <IgnoreImportLibrary>true</IgnoreImportLibrary> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <IgnoreImportLibrary>true</IgnoreImportLibrary> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <IgnoreImportLibrary>true</IgnoreImportLibrary> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <IgnoreImportLibrary>true</IgnoreImportLibrary> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <ResourceCompile> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <RegisterOutput>true</RegisterOutput> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <ResourceCompile> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <RegisterOutput>true</RegisterOutput> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <ResourceCompile> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <RegisterOutput>true</RegisterOutput> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <ResourceCompile> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <RegisterOutput>true</RegisterOutput> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="../CString.cpp"> + <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MultiThreaded</RuntimeLibrary> + <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MultiThreaded</RuntimeLibrary> + <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MultiThreadedDebug</RuntimeLibrary> + <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MultiThreadedDebug</RuntimeLibrary> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\resource.h" /> + </ItemGroup> + <ItemGroup> + <ResourceCompile Include="..\atl_apitest.rc" /> + </ItemGroup> + <ItemGroup> + <None Include="..\cstring.inl" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>

7 years, 9 months

[gedmurphy] 74176: [IoCsq] - Clean up the DriverContext that was dirtied by the CSQ The do while(0) thing feels a bit weird. I can only assume it was done so a 'break' will unlock before returning.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Mar 15 18:01:54 2017 New Revision: 74176 URL: http://svn.reactos.org/svn/reactos?rev=74176&view=rev Log: [IoCsq] - Clean up the DriverContext that was dirtied by the CSQ The do while(0) thing feels a bit weird. I can only assume it was done so a 'break' will unlock before returning. Modified: trunk/reactos/sdk/lib/drivers/csq/csq.c Modified: trunk/reactos/sdk/lib/drivers/csq/csq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/csq/csq.c?… ============================================================================== --- trunk/reactos/sdk/lib/drivers/csq/csq.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/csq/csq.c [iso-8859-1] Wed Mar 15 18:01:54 2017 @@ -290,6 +290,9 @@ if(!IoSetCancelRoutine(Irp, NULL)) break; + + Irp->Tail.Overlay.DriverContext[3] = 0; + /* OK, looks like we have to de-queue and complete this ourselves */ Csq->CsqRemoveIrp(Csq, Irp); Csq->CsqCompleteCanceledIrp(Csq, Irp); @@ -363,6 +366,8 @@ ASSERT(Context->Csq == Csq); } + + Irp->Tail.Overlay.DriverContext[3] = 0; } while(0); @@ -423,6 +428,8 @@ ASSERT(Context->Csq == Csq); } + Irp->Tail.Overlay.DriverContext[3] = 0; + break; }

7 years, 9 months

[rnaumann] 74175: [EXPLORER] Show the notification settings dialog from it's context menu entry

by rnaumann＠svn.reactos.org

Author: rnaumann Date: Wed Mar 15 15:08:39 2017 New Revision: 74175 URL: http://svn.reactos.org/svn/reactos?rev=74175&view=rev Log: [EXPLORER] Show the notification settings dialog from it's context menu entry Modified: trunk/reactos/base/shell/explorer/traywnd.cpp Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Wed Mar 15 15:08:39 2017 @@ -511,6 +511,7 @@ break; case ID_SHELL_CMD_CUST_NOTIF: + ShowCustomizeNotifyIcons(hExplorerInstance, m_hWnd); break; case ID_SHELL_CMD_ADJUST_DAT:

7 years, 9 months

[sgasiorek] 74174: [DXG] replace EngDeleteSemaphore with EngReleaseSemaphore in DdHmgLock! CORE-4490

by sgasiorek＠svn.reactos.org

Author: sgasiorek Date: Wed Mar 15 14:16:00 2017 New Revision: 74174 URL: http://svn.reactos.org/svn/reactos?rev=74174&view=rev Log: [DXG] replace EngDeleteSemaphore with EngReleaseSemaphore in DdHmgLock! CORE-4490 Modified: trunk/reactos/win32ss/reactx/dxg/ddhmg.c Modified: trunk/reactos/win32ss/reactx/dxg/ddhmg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/dxg/ddhmg.c… ============================================================================== --- trunk/reactos/win32ss/reactx/dxg/ddhmg.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/reactx/dxg/ddhmg.c [iso-8859-1] Wed Mar 15 14:16:00 2017 @@ -174,7 +174,7 @@ if ( !LockOwned ) { - EngDeleteSemaphore(ghsemHmgr); + EngReleaseSemaphore(ghsemHmgr); } return Object;

7 years, 9 months

[dreimer] 74173: [ROSBE] Update RosBE in RAPPS too.

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Mar 15 07:55:11 2017 New Revision: 74173 URL: http://svn.reactos.org/svn/reactos?rev=74173&view=rev Log: [ROSBE] Update RosBE in RAPPS too. Modified: trunk/reactos/media/rapps/rosbe.txt Modified: trunk/reactos/media/rapps/rosbe.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/rosbe.txt?rev=… ============================================================================== --- trunk/reactos/media/rapps/rosbe.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/rosbe.txt [iso-8859-1] Wed Mar 15 07:55:11 2017 @@ -1,13 +1,13 @@ [Section] Name = ReactOS Build Environment -Version = 2.1.3 +Version = 2.1.4 License = GPL Description = Allows you to build the ReactOS Source. For more instructions see ReactOS wiki. -Size = 32.2 MiB +Size = 37.8 MiB Category = 7 URLSite = http://reactos.org/wiki/Build_Environment -URLDownload = http://download.sourceforge.net/reactos/RosBE-2.1.3.exe -SHA1 = 73cdd8b49af919064abced95872423e4be2afe6f +URLDownload = http://download.sourceforge.net/reactos/RosBE-2.1.4.exe +SHA1 = aa32af1d1d5ecffa1ebcdda97d3bafccaa17d803 CDPath = none [Section.0405] @@ -15,14 +15,14 @@ [Section.0407] Description = Erlaubt es Ihnen den ReactOS Source Code zu kompilieren. Im ReactOS-Wiki finden Sie dazu nÃ¤here Anweisungen. -Size = 32,2 MiB +Size = 37,8 MiB [Section.0a] Description = Te permite compilar el cÃ³digo de ReactOS. Para mÃ¡s informaciÃ³n consulta la Wiki de ReactOS. [Section.040c] Description = Vous permet de compiler le code source de ReactOS. Pour plus d'instructions, reportez-vous au wiki ReactOS. -Size = 32,2 Mio +Size = 37,8 Mio [Section.0410] Description = Permette di compilare i sorgenti di ReactOS. Per maggiori informazioni consultare il Wiki di ReactOS. @@ -35,16 +35,16 @@ [Section.0418] Description = Permite compilarea surselor ReactOS. Pentru instrucÈiuni, consultaÈi wiki ReactOS. -Size = 32,2 Mio +Size = 37,8 Mio [Section.0419] Description = ÐÐ¾Ð·Ð²Ð¾Ð»Ð¸Ñ ÐÐ°Ð¼ ÑÐ¾Ð±ÑÐ°ÑÑ ReactOS Ð¸Ð· Ð¸ÑÑÐ¾Ð´Ð½ÑÑ ÐºÐ¾Ð´Ð¾Ð². ÐÐ¾Ð´ÑÐ¾Ð±Ð½Ð¾ÑÑÐ¸ ÑÐ¼Ð¾ÑÑÐ¸ÑÐµ Ð² ReactOS wiki. -Size = 32,2 ÐÐ¸Ð +Size = 37,8 ÐÐ¸Ð [Section.041f] Name = ReactOS Yapma OrtamÄ± Description = ReactOS Kaynak KodlarÄ±'nÄ± derlemenize olanak saÄlar. Daha Ã§ok aÃ§Ä±klama iÃ§in ReactOS Wiki'ye bakÄ±nÄ±z. -Size = 32,2 MiB +Size = 37,8 MiB [Section.0422] Description = ÐÐ¾Ð·Ð²Ð¾Ð»ÑÑ Ð·ÑÐ±ÑÐ°ÑÐ¸ ReactOS Ð· Ð²Ð¸ÑÑÐ´Ð½Ð¸Ñ ÐºÐ¾Ð´ÑÐ². ÐÐ° Ð´ÐµÑÐ°Ð»ÑÐ½Ð¾Ñ ÑÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑÑ Ð´Ð¸Ð²ÑÑÑÑÑ Ð² ReactOS ÐÑÐºÑ.

7 years, 9 months

[hbelusca] 74172: [NDK]: No, the NDK applications do not have to use UNICODE. Indeed the RTL/NDK/whatever always explicitely uses ANSI and/or UNICODE string types where needed (and do not depend on...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Mar 15 00:06:42 2017 New Revision: 74172 URL: http://svn.reactos.org/svn/reactos?rev=74172&view=rev Log: [NDK]: No, the NDK applications do not have to use UNICODE. Indeed the RTL/NDK/whatever always explicitely uses ANSI and/or UNICODE string types where needed (and do not depend on tchar.h stuff). It is up to the given application to explicitely specify (in its CMakeLists.txt or elsewhere) whether it wants to define UNICODE or not. --> Fix the problem of having the UNICODE define magically being defined after including some NDK header. [DNSAPI][USER32_APITEST]: Explicitely use UNICODE functions where needed (and as was already done in other parts of the code). Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/query.c trunk/reactos/sdk/include/ndk/umtypes.h trunk/rostests/apitests/user32/RegisterClassEx.c Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi/qu… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/dnsapi/query.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/dnsapi/query.c [iso-8859-1] Wed Mar 15 00:06:42 2017 @@ -303,25 +303,25 @@ { /* Use defalt path */ GetSystemDirectoryW(ExpandedPath, MAX_PATH); - StringCchLength(ExpandedPath, MAX_PATH, &StringLength); + StringCchLengthW(ExpandedPath, MAX_PATH, &StringLength); if (ExpandedPath[StringLength - 1] != L'\\') { /* It isn't, so add it ourselves */ - StringCchCat(ExpandedPath, MAX_PATH, L"\\"); - } - StringCchCat(ExpandedPath, MAX_PATH, L"DRIVERS\\ETC\\"); + StringCchCatW(ExpandedPath, MAX_PATH, L"\\"); + } + StringCchCatW(ExpandedPath, MAX_PATH, L"DRIVERS\\ETC\\"); } /* Make sure that the path is backslash-terminated */ - StringCchLength(ExpandedPath, MAX_PATH, &StringLength); + StringCchLengthW(ExpandedPath, MAX_PATH, &StringLength); if (ExpandedPath[StringLength - 1] != L'\\') { /* It isn't, so add it ourselves */ - StringCchCat(ExpandedPath, MAX_PATH, L"\\"); + StringCchCatW(ExpandedPath, MAX_PATH, L"\\"); } /* Add the database name */ - StringCchCat(ExpandedPath, MAX_PATH, Name); + StringCchCatW(ExpandedPath, MAX_PATH, Name); /* Return a handle to the file */ ret = CreateFileW(ExpandedPath, Modified: trunk/reactos/sdk/include/ndk/umtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ndk/umtypes.h?… ============================================================================== --- trunk/reactos/sdk/include/ndk/umtypes.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ndk/umtypes.h [iso-8859-1] Wed Mar 15 00:06:42 2017 @@ -26,13 +26,6 @@ #include <sal.h> #if (_SAL_VERSION < 20) #include <no_sal2.h> -#endif - -// -// NDK Applications must use Unicode -// -#ifndef UNICODE -#define UNICODE #endif // Modified: trunk/rostests/apitests/user32/RegisterClassEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/RegisterC… ============================================================================== --- trunk/rostests/apitests/user32/RegisterClassEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/RegisterClassEx.c [iso-8859-1] Wed Mar 15 00:06:42 2017 @@ -79,7 +79,7 @@ a = _GetClassAtom(L"TestClass1", hmod); b = _RegisterClass(L"TestClass1", hmod, 0, DefWindowProcW); c = _GetClassAtom(L"TestClass1", hmod); - UnregisterClass(L"TestClass1", hmod); + UnregisterClassW(L"TestClass1", hmod); d = _GetClassAtom(L"TestClass1", hmod); ok( a == 0, "\n"); ok( b != 0, "\n"); @@ -90,7 +90,7 @@ a = _GetClassAtom(L"TestClass2", hmod); b = _RegisterClass(L"TestClass2", hmod, CS_GLOBALCLASS, DefWindowProcW); c = _GetClassAtom(L"TestClass2", hmod); - UnregisterClass(L"TestClass2", hmod); + UnregisterClassW(L"TestClass2", hmod); d = _GetClassAtom(L"TestClass2", hmod); ok( a == 0, "\n"); ok( b != 0, "\n"); @@ -101,7 +101,7 @@ a = _RegisterClass(L"TestClass3", hmod, 0, DefWindowProcW); b = _RegisterClass(L"TestClass3", hmod, 0, DefWindowProcW); c = _RegisterClass(L"TestClass3", hmod, CS_GLOBALCLASS, DefWindowProcW); - UnregisterClass(L"TestClass3", hmod); + UnregisterClassW(L"TestClass3", hmod); d = _GetClassAtom(L"TestClass3", hmod); ok( a != 0, "\n"); ok( b == 0, "\n"); @@ -111,9 +111,9 @@ a = _RegisterClass(L"TestClass4", hmod, CS_GLOBALCLASS, DefWindowProcW); b = _RegisterClass(L"TestClass4", hmod, 0, DefWindowProcW); c = _RegisterClass(L"TestClass4", hmod, 0, DefWindowProcW); - UnregisterClass(L"TestClass4", hmod); + UnregisterClassW(L"TestClass4", hmod); d = _GetClassAtom(L"TestClass4", hmod); - UnregisterClass(L"TestClass4", hmod); + UnregisterClassW(L"TestClass4", hmod); e = _GetClassAtom(L"TestClass4", hmod); ok( a != 0, "\n"); ok( b != 0, "\n"); @@ -124,9 +124,9 @@ a = _GetClassAtom(L"ComboBox", hmod); b = _RegisterClass(L"ComboBox", hmod, 0, DefWindowProcW); c = _RegisterClass(L"ComboBox", hmod, CS_GLOBALCLASS, DefWindowProcW); - UnregisterClass(L"ComboBox", hmod); + UnregisterClassW(L"ComboBox", hmod); d = _GetClassAtom(L"ComboBox", hmod); - UnregisterClass(L"TestClass4", hmod); + UnregisterClassW(L"TestClass4", hmod); e = _GetClassAtom(L"TestClass4", hmod); ok( a != 0, "\n"); ok( b != 0, "\n"); @@ -135,7 +135,7 @@ ok( e == 0, "\n"); a = _GetClassAtom(L"ScrollBar", hmod); - UnregisterClass(L"ScrollBar", hmod); + UnregisterClassW(L"ScrollBar", hmod); b = _GetClassAtom(L"ScrollBar", hmod); c = _RegisterClass(L"ScrollBar", hmod, CS_GLOBALCLASS, DefWindowProcW); d = _GetClassAtom(L"ScrollBar", hmod); @@ -147,14 +147,14 @@ ok( a == d, "\n"); /* In Windows 10 the last 4 tests fail */ a = _GetClassAtom(L"ListBox", (HMODULE)0xdead); - UnregisterClass(L"ListBox", (HMODULE)0xdead); + UnregisterClassW(L"ListBox", (HMODULE)0xdead); b = _GetClassAtom(L"ListBox", (HMODULE)0xdead); ok( a != 0, "\n"); ok( b == 0, "\n"); a = _RegisterClass(L"TestClass5", (HMODULE)0xdead, CS_GLOBALCLASS, DefWindowProcW); b = _GetClassAtom(L"TestClass5", hmod); - UnregisterClass(L"TestClass5", hmod); + UnregisterClassW(L"TestClass5", hmod); c = _GetClassAtom(L"TestClass5", (HMODULE)0xdead); d = _GetClassAtom(L"TestClass5", hmod); ok( a != 0, "\n");

7 years, 9 months

[sgasiorek] 74171: [DXG] Implement DxDdCreateDirectDrawObject and update DdHmgAlloc CORE-4490

by sgasiorek＠svn.reactos.org

Author: sgasiorek Date: Tue Mar 14 23:05:49 2017 New Revision: 74171 URL: http://svn.reactos.org/svn/reactos?rev=74171&view=rev Log: [DXG] Implement DxDdCreateDirectDrawObject and update DdHmgAlloc CORE-4490 Modified: trunk/reactos/sdk/include/reactos/drivers/directx/directxint.h trunk/reactos/win32ss/reactx/dxg/ddhmg.c trunk/reactos/win32ss/reactx/dxg/dxg_driver.h trunk/reactos/win32ss/reactx/dxg/dxg_int.h trunk/reactos/win32ss/reactx/dxg/eng.c trunk/reactos/win32ss/reactx/ntddraw/ddraw.c Modified: trunk/reactos/sdk/include/reactos/drivers/directx/directxint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/driver… ============================================================================== --- trunk/reactos/sdk/include/reactos/drivers/directx/directxint.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/drivers/directx/directxint.h [iso-8859-1] Tue Mar 14 23:05:49 2017 @@ -24,10 +24,10 @@ /* 0x2C */ FLONG fl; /* 0x30 */ struct _EDD_DIRECTDRAW_LOCAL *peDirectDrawLocal_prev; // verified to match Windows XP, // points to the old DDLocal when new handle is created. -/* 0x34 */ PEPROCESS Process; +/* 0x34 */ ULONG unk_034; /* 0x38 */ ULONG unk_038; /* 0x3C */ HANDLE UniqueProcess; -/* 0x40 */ VOID *unk_040; +/* 0x40 */ PEPROCESS Process; /* 0x44 */ VOID *unk_044; /* 0x48 */ ULONG unk_048; /* 0x4C */ ULONG unk_04C; Modified: trunk/reactos/win32ss/reactx/dxg/ddhmg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/dxg/ddhmg.c… ============================================================================== --- trunk/reactos/win32ss/reactx/dxg/ddhmg.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/reactx/dxg/ddhmg.c [iso-8859-1] Tue Mar 14 23:05:49 2017 @@ -323,12 +323,12 @@ * Size of memory to be allocated * @param CHAR objType * Object type -* @param UINT objFlags -* Object flags +* @param UINT objLock +* Object lock flag * * @return -* Handle if object is not locked by objFlags -* Object if lock is set in objFlags +* Handle if object is not locked by objLock +* Object if lock is set in objLock * 0 if it fails. * * @remarks. @@ -336,7 +336,7 @@ *--*/ HANDLE FASTCALL -DdHmgAlloc(ULONG objSize, CHAR objType, UINT objFlags) +DdHmgAlloc(ULONG objSize, CHAR objType, BOOLEAN objLock) { PVOID pObject = NULL; HANDLE DdHandle = NULL; @@ -363,16 +363,17 @@ pEntry->Pid = (HANDLE)(((ULONG)PsGetCurrentProcessId() & 0xFFFFFFFC) | ((ULONG)(pEntry->Pid) & 1)); - if (objFlags & 1) + if (objLock) + { + InterlockedIncrement((VOID*)&pEntry->pobj->cExclusiveLock); pEntry->pobj->Tid = KeGetCurrentThread(); - - pEntry->pobj->cExclusiveLock = objFlags & 1; + } pEntry->pobj->hHmgr = DdHandle; EngReleaseSemaphore(ghsemHmgr); /* Return handle if object not locked */ - if (!(objFlags & 1)) + if (!objLock) return DdHandle; return (HANDLE)pEntry; Modified: trunk/reactos/win32ss/reactx/dxg/dxg_driver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/dxg/dxg_dri… ============================================================================== --- trunk/reactos/win32ss/reactx/dxg/dxg_driver.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/reactx/dxg/dxg_driver.h [iso-8859-1] Tue Mar 14 23:05:49 2017 @@ -144,15 +144,6 @@ DxDdColorControl( PVOID p1, PVOID p2) -{ - TRACE(); - return 0; -} - -DWORD -NTAPI -DxDdCreateDirectDrawObject( - PVOID p1) { TRACE(); return 0; Modified: trunk/reactos/win32ss/reactx/dxg/dxg_int.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/dxg/dxg_int… ============================================================================== --- trunk/reactos/win32ss/reactx/dxg/dxg_int.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/reactx/dxg/dxg_int.h [iso-8859-1] Tue Mar 14 23:05:49 2017 @@ -22,6 +22,7 @@ #include <initguid.h> #include <ddrawi.h> #include <ntgdityp.h> +#include <psfuncs.h> DEFINE_GUID(GUID_NTCallbacks, 0x6fe9ecde, 0xdf89, 0x11d1, 0x9d, 0xb0, 0x00, 0x60, 0x08, 0x27, 0x71, 0xba); DEFINE_GUID(GUID_DDMoreCaps, 0x880baf30, 0xb030, 0x11d0, 0x8e, 0xa7, 0x00, 0x60, 0x97, 0x97, 0xea, 0x5b); @@ -52,8 +53,9 @@ #define CapOver_DisableOGL 0x8 #define CapOver_DisableEscapes 0x10 - +#define ObjType_DDLOCAL_TYPE 1 #define ObjType_DDSURFACE_TYPE 2 +#define ObjType_DDCONTEXT_TYPE 3 #define ObjType_DDVIDEOPORT_TYPE 4 #define ObjType_DDMOTIONCOMP_TYPE 5 @@ -171,7 +173,8 @@ NTSTATUS NTAPI DriverEntry(IN PVOID Context1, IN PVOID Context2); NTSTATUS NTAPI GsDriverEntry(IN PVOID Context1, IN PVOID Context2); NTSTATUS APIENTRY DxDdCleanupDxGraphics(VOID); -BOOL NTAPI DxDdEnableDirectDraw(PVOID arg1, BOOL arg2); +BOOL NTAPI DxDdEnableDirectDraw(HANDLE hDev, BOOL arg2); +DWORD NTAPI DxDdCreateDirectDrawObject(HDC hDC); /* Global pointers */ extern ULONG gcSizeDdHmgr; @@ -198,6 +201,7 @@ BOOL FASTCALL DdHmgCreate(VOID); BOOL FASTCALL DdHmgDestroy(VOID); PVOID FASTCALL DdHmgLock(HANDLE DdHandle, UCHAR ObjectType, BOOLEAN LockOwned); +HANDLE FASTCALL DdHmgAlloc(ULONG objSize, CHAR objType, BOOLEAN objLock); #endif /* _DXG_PCH_ */ Modified: trunk/reactos/win32ss/reactx/dxg/eng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/dxg/eng.c?r… ============================================================================== --- trunk/reactos/win32ss/reactx/dxg/eng.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/reactx/dxg/eng.c [iso-8859-1] Tue Mar 14 23:05:49 2017 @@ -68,6 +68,40 @@ } +PVOID +FASTCALL +intDdCreateDirectDrawLocal(HDEV hDev) +{ + PEDD_DIRECTDRAW_GLOBAL peDdGl = NULL; + PEDD_DIRECTDRAW_LOCAL peDdL = NULL; + PDD_ENTRY AllocRet; + + peDdGl = (PEDD_DIRECTDRAW_GLOBAL)gpEngFuncs.DxEngGetHdevData(hDev, DxEGShDevData_eddg); + + AllocRet = DdHmgAlloc(sizeof(EDD_DIRECTDRAW_LOCAL), ObjType_DDLOCAL_TYPE, TRUE); + if (!AllocRet) + return NULL; + + peDdL = (PEDD_DIRECTDRAW_LOCAL)AllocRet; + + /* initialize DIRECTDRAW_LOCAL */ + peDdL->peDirectDrawLocal_prev = peDdGl->peDirectDrawLocalList; + peDdL->UniqueProcess = PsGetCurrentThreadProcessId(); + peDdL->Process = PsGetCurrentProcess(); + + // link DirectDrawGlobal and DirectDrawLocal + peDdGl->peDirectDrawLocalList = peDdL; + peDdL->peDirectDrawGlobal = peDdGl; + peDdL->peDirectDrawGlobal2 = peDdGl; + + gpEngFuncs.DxEngReferenceHdev(hDev); + + InterlockedExchangeAdd((LONG*)&peDdL->pobj.cExclusiveLock, 0xFFFFFFFF); + + return peDdL->pobj.hHmgr; +} + + PDD_SURFACE_LOCAL NTAPI DxDdLockDirectDrawSurface(HANDLE hDdSurface) @@ -266,3 +300,56 @@ return FALSE; } + +/*++ +* @name DxDdCreateDirectDrawObject +* @implemented +* +* Function creates new DirectDraw object +* +* @param HDC hDC +* Device context handle +* +* @return +* Newly created DirectDraw object handle. +* +* @remarks. +* Missing all AGP stuff +*--*/ +DWORD +NTAPI +DxDdCreateDirectDrawObject( + HDC hDC) +{ + PDC pDC = NULL; + HDEV hDev = NULL; + DWORD retVal = 0; + + pDC = gpEngFuncs.DxEngLockDC(hDC); + if (!pDC) + return 0; + + // get driver hDev from DC + hDev = (HDEV)gpEngFuncs.DxEngGetDCState(hDC, 3); + if (!hDev) { + gpEngFuncs.DxEngUnlockDC(pDC); + return 0; + } + + // is this primary display? + if (!gpEngFuncs.DxEngGetHdevData(hDev, DxEGShDevData_display)) + { + gpEngFuncs.DxEngUnlockDC(pDC); + return 0; + } + + gpEngFuncs.DxEngLockHdev(hDev); + + // create object only for 8BPP and more + if (gpEngFuncs.DxEngGetHdevData(hDev, DxEGShDevData_DitherFmt) >= BMF_8BPP) + retVal = (DWORD)intDdCreateDirectDrawLocal(hDev); + + gpEngFuncs.DxEngUnlockHdev(hDev); + gpEngFuncs.DxEngUnlockDC(pDC); + return retVal; +} Modified: trunk/reactos/win32ss/reactx/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/ntddraw/ddr… ============================================================================== --- trunk/reactos/win32ss/reactx/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/reactx/ntddraw/ddraw.c [iso-8859-1] Tue Mar 14 23:05:49 2017 @@ -912,10 +912,10 @@ DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->fl : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, fl), pEddlcl->fl); DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->peDirectDrawLocal_prev : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, peDirectDrawLocal_prev), pEddlcl->peDirectDrawLocal_prev); - DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->Process : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, Process), pEddlcl->Process); + DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->unk_034 : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, unk_034), pEddlcl->unk_034); DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->unk_038 : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, unk_038), pEddlcl->unk_038); DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->UniqueProcess : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, UniqueProcess), pEddlcl->UniqueProcess); - DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->unk_040 : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, unk_040), pEddlcl->unk_040); + DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->Process : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, Process), pEddlcl->Process); DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->unk_044 : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, unk_044), pEddlcl->unk_044); DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->unk_048 : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, unk_048), pEddlcl->unk_048); DPRINT1("0x%08lx PEDD_DIRECTDRAW_LOCAL->unk_04C : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_LOCAL, unk_04C), pEddlcl->unk_04C);

7 years, 9 months

[sgasiorek] 74170: [DXG] Implement DxDdEnableDirectDraw CORE-4490 [NTDDRAW] Enable DxEGShDevData_hSpooler and DxEGShDevData_ldev in DxEngGetHdevData CORE-7733

by sgasiorek＠svn.reactos.org

Author: sgasiorek Date: Tue Mar 14 19:45:23 2017 New Revision: 74170 URL: http://svn.reactos.org/svn/reactos?rev=74170&view=rev Log: [DXG] Implement DxDdEnableDirectDraw CORE-4490 [NTDDRAW] Enable DxEGShDevData_hSpooler and DxEGShDevData_ldev in DxEngGetHdevData CORE-7733 Modified: trunk/reactos/win32ss/reactx/dxg/CMakeLists.txt trunk/reactos/win32ss/reactx/dxg/dxg_int.h trunk/reactos/win32ss/reactx/dxg/eng.c trunk/reactos/win32ss/reactx/dxg/main.c trunk/reactos/win32ss/reactx/dxg/tags.h trunk/reactos/win32ss/reactx/ntddraw/dxeng.c Modified: trunk/reactos/win32ss/reactx/dxg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/dxg/CMakeLi… ============================================================================== --- trunk/reactos/win32ss/reactx/dxg/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/reactx/dxg/CMakeLists.txt [iso-8859-1] Tue Mar 14 19:45:23 2017 @@ -8,6 +8,9 @@ historic.c dxg_int.h) +include_directories( + ${REACTOS_SOURCE_DIR}/win32ss/include) + add_library(dxg SHARED ${SOURCE} dxg.rc Modified: trunk/reactos/win32ss/reactx/dxg/dxg_int.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/dxg/dxg_int… ============================================================================== --- trunk/reactos/win32ss/reactx/dxg/dxg_int.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/reactx/dxg/dxg_int.h [iso-8859-1] Tue Mar 14 19:45:23 2017 @@ -19,7 +19,13 @@ #include <wingdi.h> #include <winddi.h> #include <ddkernel.h> +#include <initguid.h> #include <ddrawi.h> +#include <ntgdityp.h> + +DEFINE_GUID(GUID_NTCallbacks, 0x6fe9ecde, 0xdf89, 0x11d1, 0x9d, 0xb0, 0x00, 0x60, 0x08, 0x27, 0x71, 0xba); +DEFINE_GUID(GUID_DDMoreCaps, 0x880baf30, 0xb030, 0x11d0, 0x8e, 0xa7, 0x00, 0x60, 0x97, 0x97, 0xea, 0x5b); +DEFINE_GUID(GUID_NTPrivateDriverCaps, 0xfad16a23, 0x7b66, 0x11d2, 0x83, 0xd7, 0x00, 0xc0, 0x4f, 0x7c, 0xe5, 0x8c); /* DXG treats this as opaque */ typedef PVOID PDC; @@ -40,11 +46,18 @@ #include "tags.h" +#define CapOver_DisableAccel 0x1 +#define CapOver_DisableD3DDDAccel 0x2 +#define CapOver_DisableD3DAccel 0x4 +#define CapOver_DisableOGL 0x8 +#define CapOver_DisableEscapes 0x10 + + #define ObjType_DDSURFACE_TYPE 2 #define ObjType_DDVIDEOPORT_TYPE 4 #define ObjType_DDMOTIONCOMP_TYPE 5 - typedef struct _DD_ENTRY +typedef struct _DD_ENTRY { union { @@ -61,6 +74,98 @@ DD_BASEOBJECT Object; DD_SURFACE_LOCAL Surfacelcl; } EDD_SURFACE_LOCAL, *PEDD_SURFACE_LOCAL; + + +typedef BOOLEAN (APIENTRY* PFN_DxEngNUIsTermSrv)(VOID); +typedef DWORD (APIENTRY* PFN_DxEngScreenAccessCheck)(VOID); +typedef BOOLEAN (APIENTRY* PFN_DxEngRedrawDesktop)(VOID); +typedef ULONG (APIENTRY* PFN_DxEngDispUniq)(VOID); +typedef BOOLEAN (APIENTRY* PFN_DxEngIncDispUniq)(VOID); +typedef ULONG (APIENTRY* PFN_DxEngVisRgnUniq)(VOID); +typedef BOOLEAN (APIENTRY* PFN_DxEngLockShareSem)(VOID); +typedef BOOLEAN (APIENTRY* PFN_DxEngUnlockShareSem)(VOID); +typedef HDEV* (APIENTRY* PFN_DxEngEnumerateHdev)(HDEV*); +typedef BOOLEAN (APIENTRY* PFN_DxEngLockHdev)(HDEV); +typedef BOOLEAN (APIENTRY* PFN_DxEngUnlockHdev)(HDEV); +typedef BOOLEAN (APIENTRY* PFN_DxEngIsHdevLockedByCurrentThread)(HDEV); +typedef BOOLEAN (APIENTRY* PFN_DxEngReferenceHdev)(HDEV); +typedef BOOLEAN (APIENTRY* PFN_DxEngUnreferenceHdev)(HDEV); +typedef BOOL (APIENTRY* PFN_DxEngGetDeviceGammaRamp)(HDEV, PGAMMARAMP); +typedef BOOLEAN (APIENTRY* PFN_DxEngSetDeviceGammaRamp)(HDEV, PGAMMARAMP, BOOL); +typedef DWORD (APIENTRY* PFN_DxEngSpTearDownSprites)(DWORD, DWORD, DWORD); +typedef DWORD (APIENTRY* PFN_DxEngSpUnTearDownSprites)(DWORD, DWORD, DWORD); +typedef DWORD (APIENTRY* PFN_DxEngSpSpritesVisible)(DWORD); +typedef DWORD_PTR (APIENTRY* PFN_DxEngGetHdevData)(HDEV, DXEGSHDEVDATA); +typedef BOOLEAN (APIENTRY* PFN_DxEngSetHdevData)(HDEV, DXEGSHDEVDATA, DWORD_PTR); +typedef HDC (APIENTRY* PFN_DxEngCreateMemoryDC)(HDEV); +typedef HDC (APIENTRY* PFN_DxEngGetDesktopDC)(ULONG, BOOL, BOOL); +typedef BOOLEAN (APIENTRY* PFN_DxEngDeleteDC)(HDC, BOOL); +typedef BOOLEAN (APIENTRY* PFN_DxEngCleanDC)(HDC hdc); +typedef BOOL (APIENTRY* PFN_DxEngSetDCOwner)(HGDIOBJ, DWORD); +typedef PDC (APIENTRY* PFN_DxEngLockDC)(HDC); +typedef BOOLEAN (APIENTRY* PFN_DxEngUnlockDC)(PDC); +typedef BOOLEAN (APIENTRY* PFN_DxEngSetDCState)(HDC, DWORD, DWORD); +typedef DWORD_PTR (APIENTRY* PFN_DxEngGetDCState)(HDC, DWORD); +typedef DWORD (APIENTRY* PFN_DxEngSelectBitmap)(DWORD, DWORD); +typedef DWORD (APIENTRY* PFN_DxEngSetBitmapOwner)(DWORD, DWORD); +typedef DWORD (APIENTRY* PFN_DxEngDeleteSurface)(DWORD); +typedef DWORD (APIENTRY* PFN_DxEngGetSurfaceData)(DWORD, DWORD); +typedef DWORD (APIENTRY* PFN_DxEngAltLockSurface)(DWORD); +typedef DWORD (APIENTRY* PFN_DxEngUploadPaletteEntryToSurface)(DWORD, DWORD, DWORD, DWORD); +typedef DWORD (APIENTRY* PFN_DxEngMarkSurfaceAsDirectDraw)(DWORD, DWORD); +typedef DWORD (APIENTRY* PFN_DxEngSelectPaletteToSurface)(DWORD, DWORD); +typedef DWORD (APIENTRY* PFN_DxEngSyncPaletteTableWithDevice)(DWORD, DWORD); +typedef DWORD (APIENTRY* PFN_DxEngSetPaletteState)(DWORD, DWORD, DWORD); +typedef DWORD (APIENTRY* PFN_DxEngGetRedirectionBitmap)(DWORD); +typedef DWORD (APIENTRY* PFN_DxEngLoadImage)(DWORD, DWORD); + + +typedef struct _DXENG_FUNCTIONS +{ + PVOID Reserved; + PFN_DxEngNUIsTermSrv DxEngNUIsTermSrv; + PFN_DxEngScreenAccessCheck DxEngScreenAccessCheck; + PFN_DxEngRedrawDesktop DxEngRedrawDesktop; + PFN_DxEngDispUniq DxEngDispUniq; + PFN_DxEngIncDispUniq DxEngIncDispUniq; + PFN_DxEngVisRgnUniq DxEngVisRgnUniq; + PFN_DxEngLockShareSem DxEngLockShareSem; + PFN_DxEngUnlockShareSem DxEngUnlockShareSem; + PFN_DxEngEnumerateHdev DxEngEnumerateHdev; + PFN_DxEngLockHdev DxEngLockHdev; + PFN_DxEngUnlockHdev DxEngUnlockHdev; + PFN_DxEngIsHdevLockedByCurrentThread DxEngIsHdevLockedByCurrentThread; + PFN_DxEngReferenceHdev DxEngReferenceHdev; + PFN_DxEngUnreferenceHdev DxEngUnreferenceHdev; + PFN_DxEngGetDeviceGammaRamp DxEngGetDeviceGammaRamp; + PFN_DxEngSetDeviceGammaRamp DxEngSetDeviceGammaRamp; + PFN_DxEngSpTearDownSprites DxEngSpTearDownSprites; + PFN_DxEngSpUnTearDownSprites DxEngSpUnTearDownSprites; + PFN_DxEngSpSpritesVisible DxEngSpSpritesVisible; + PFN_DxEngGetHdevData DxEngGetHdevData; + PFN_DxEngSetHdevData DxEngSetHdevData; + PFN_DxEngCreateMemoryDC DxEngCreateMemoryDC; + PFN_DxEngGetDesktopDC DxEngGetDesktopDC; + PFN_DxEngDeleteDC DxEngDeleteDC; + PFN_DxEngCleanDC DxEngCleanDC; + PFN_DxEngSetDCOwner DxEngSetDCOwner; + PFN_DxEngLockDC DxEngLockDC; + PFN_DxEngUnlockDC DxEngUnlockDC; + PFN_DxEngSetDCState DxEngSetDCState; + PFN_DxEngGetDCState DxEngGetDCState; + PFN_DxEngSelectBitmap DxEngSelectBitmap; + PFN_DxEngSetBitmapOwner DxEngSetBitmapOwner; + PFN_DxEngDeleteSurface DxEngDeleteSurface; + PFN_DxEngGetSurfaceData DxEngGetSurfaceData; + PFN_DxEngAltLockSurface DxEngAltLockSurface; + PFN_DxEngUploadPaletteEntryToSurface DxEngUploadPaletteEntryToSurface; + PFN_DxEngMarkSurfaceAsDirectDraw DxEngMarkSurfaceAsDirectDraw; + PFN_DxEngSelectPaletteToSurface DxEngSelectPaletteToSurface; + PFN_DxEngSyncPaletteTableWithDevice DxEngSyncPaletteTableWithDevice; + PFN_DxEngSetPaletteState DxEngSetPaletteState; + PFN_DxEngGetRedirectionBitmap DxEngGetRedirectionBitmap; + PFN_DxEngLoadImage DxEngLoadImage; +} DXENG_FUNCTIONS, *PDXENG_FUNCTIONS; /* exported functions */ NTSTATUS NTAPI DriverEntry(IN PVOID Context1, IN PVOID Context2); @@ -80,6 +185,7 @@ extern VOID *gpDummyPage; extern PEPROCESS gpepSession; extern PLARGE_INTEGER gpLockShortDelay; +extern DXENG_FUNCTIONS gpEngFuncs; /* Driver list export functions */ DWORD NTAPI DxDxgGenericThunk(ULONG_PTR ulIndex, ULONG_PTR ulHandle, SIZE_T *pdwSizeOfPtr1, PVOID pvPtr1, SIZE_T *pdwSizeOfPtr2, PVOID pvPtr2); @@ -93,12 +199,5 @@ BOOL FASTCALL DdHmgDestroy(VOID); PVOID FASTCALL DdHmgLock(HANDLE DdHandle, UCHAR ObjectType, BOOLEAN LockOwned); -/* define stuff */ -#define drvDxEngLockDC gpEngFuncs[DXENG_INDEX_DxEngLockDC] -#define drvDxEngGetDCState gpEngFuncs[DXENG_INDEX_DxEngGetDCState] -#define drvDxEngGetHdevData gpEngFuncs[DXENG_INDEX_DxEngGetHdevData] -#define drvDxEngUnlockDC gpEngFuncs[DXENG_INDEX_DxEngUnlockDC] -#define drvDxEngUnlockHdev gpEngFuncs[DXENG_INDEX_DxEngUnlockHdev] -#define drvDxEngLockHdev gpEngFuncs[DXENG_INDEX_DxEngLockHdev] #endif /* _DXG_PCH_ */ Modified: trunk/reactos/win32ss/reactx/dxg/eng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/dxg/eng.c?r… ============================================================================== --- trunk/reactos/win32ss/reactx/dxg/eng.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/reactx/dxg/eng.c [iso-8859-1] Tue Mar 14 19:45:23 2017 @@ -10,6 +10,64 @@ #include <dxg_int.h> +/*++ +* @name intDdGetDriverInfo +* @implemented +* +* The function intDdGetDriverInfo is used internally in dxg.sys +* It retrieves driver information structures +* +* @param PEDD_DIRECTDRAW_GLOBAL peDdGl +* DirectDraw global structure +* +* @param GUID guid +* GUID of InfoData to read +* +* @param PVOID callbackStruct +* Callback structure pointer +* +* @param ULONG callbackSize +* Size of allocated callback structure +* +* @param ULONG *returnSize +* Desired structure size returned by driver +* +* @return +* Returns true on successful execution, false when error. +* +* @remarks. +* Only used internally in dxg.sys +*--*/ +BOOL intDdGetDriverInfo(PEDD_DIRECTDRAW_GLOBAL peDdGl, GUID guid, PVOID callbackStruct, ULONG callbackSize, ULONG *returnSize) +{ + DD_GETDRIVERINFODATA ddGetDriverInfoData; + + if (peDdGl->ddHalInfo.dwFlags & DDHALINFO_GETDRIVERINFOSET && peDdGl->ddHalInfo.GetDriverInfo) + { + memset(&ddGetDriverInfoData, 0, sizeof(DD_GETDRIVERINFODATA)); + ddGetDriverInfoData.dwSize = sizeof(DD_GETDRIVERINFODATA); + ddGetDriverInfoData.dhpdev = peDdGl->dhpdev; + memcpy(&ddGetDriverInfoData.guidInfo, &guid, sizeof(GUID)); + ddGetDriverInfoData.dwExpectedSize = callbackSize; + ddGetDriverInfoData.lpvData = callbackStruct; + ddGetDriverInfoData.ddRVal = DDERR_CURRENTLYNOTAVAIL; + if (peDdGl->ddHalInfo.GetDriverInfo(&ddGetDriverInfoData) && !ddGetDriverInfoData.ddRVal) + { + if (returnSize) + *returnSize = ddGetDriverInfoData.dwActualSize; + return TRUE; + } + + } + + /* cleanup on error */ + memset(callbackStruct, 0, callbackSize); + if (returnSize) + *returnSize = 0; + return FALSE; +} + + PDD_SURFACE_LOCAL NTAPI DxDdLockDirectDrawSurface(HANDLE hDdSurface) @@ -43,17 +101,168 @@ return retVal; } +/*++ +* @name intDdGetAllDriverInfo +* @implemented +* +* The function intDdGetAllDriverInfo is used internally in dxg.sys +* It retrieves all possible driver information structures +* +* @param PEDD_DIRECTDRAW_GLOBAL peDdGl +* Pointer to destination DirectDrawGlobal structure +* +* @remarks. +* Only used internally in dxg.sys +* Missing some callbacks (VideoPort, DxApi, AGP) +*--*/ +VOID intDdGetAllDriverInfo(PEDD_DIRECTDRAW_GLOBAL peDdGl) +{ + if (peDdGl->ddHalInfo.GetDriverInfo && peDdGl->ddHalInfo.dwFlags & DDHALINFO_GETDRIVERINFOSET) + { + intDdGetDriverInfo(peDdGl, GUID_KernelCaps, &peDdGl->ddKernelCaps, sizeof(peDdGl->ddKernelCaps), 0); + intDdGetDriverInfo(peDdGl, GUID_KernelCallbacks, &peDdGl->ddKernelCallbacks, sizeof(peDdGl->ddKernelCallbacks), 0); + + if (intDdGetDriverInfo(peDdGl, GUID_D3DCallbacks3, &peDdGl->d3dNtHalCallbacks3, sizeof(peDdGl->d3dNtHalCallbacks3), 0)) + peDdGl->dwCallbackFlags |= EDDDGBL_D3DCALLBACKS3; + + if (intDdGetDriverInfo(peDdGl, GUID_ColorControlCallbacks, &peDdGl->ddColorControlCallbacks, sizeof(peDdGl->ddColorControlCallbacks), 0)) + peDdGl->dwCallbackFlags |= EDDDGBL_COLORCONTROLCALLBACKS; + + if (intDdGetDriverInfo(peDdGl, GUID_MiscellaneousCallbacks, &peDdGl->ddMiscellanousCallbacks, sizeof(peDdGl->ddMiscellanousCallbacks), 0)) + peDdGl->dwCallbackFlags |= EDDDGBL_MISCCALLBACKS; + + if (intDdGetDriverInfo(peDdGl, GUID_Miscellaneous2Callbacks, &peDdGl->ddMiscellanous2Callbacks, sizeof(peDdGl->ddMiscellanous2Callbacks), 0)) + peDdGl->dwCallbackFlags |= EDDDGBL_MISC2CALLBACKS; + + if (intDdGetDriverInfo(peDdGl, GUID_NTCallbacks, &peDdGl->ddNtCallbacks, sizeof(peDdGl->ddNtCallbacks), 0) ) + peDdGl->dwCallbackFlags |= EDDDGBL_NTCALLBACKS; + + if (intDdGetDriverInfo(peDdGl, GUID_DDMoreCaps, &peDdGl->ddMoreCaps, sizeof(peDdGl->ddMoreCaps), 0) ) + peDdGl->dwCallbackFlags |= EDDDGBL_DDMORECAPS; + + if (intDdGetDriverInfo(peDdGl, GUID_NTPrivateDriverCaps, &peDdGl->ddNtPrivateDriverCaps, sizeof(peDdGl->ddNtPrivateDriverCaps), 0) ) + peDdGl->dwCallbackFlags |= EDDDGBL_PRIVATEDRIVERCAPS; + + if (intDdGetDriverInfo(peDdGl, GUID_MotionCompCallbacks, &peDdGl->ddMotionCompCallbacks, sizeof(peDdGl->ddMotionCompCallbacks), 0) ) + peDdGl->dwCallbackFlags |= EDDDGBL_MOTIONCOMPCALLBACKS; + } +} + + +/*++ +* @name intDdEnableDriver +* @implemented +* +* The function intDdEnableDriver is used internally in dxg.sys +* Fills in all EDD_DIRECTDRAW_GLOBAL structures and enables DirectDraw acceleration when possible +* +* @param PEDD_DIRECTDRAW_GLOBAL peDdGl +* Pointer to destination DirectDrawGlobal structure +* +* @remarks. +* Only used internally in dxg.sys +*--*/ +VOID intDdEnableDriver(PEDD_DIRECTDRAW_GLOBAL peDdGl) +{ + PDRIVER_FUNCTIONS DriverFunctions; + LPD3DNTHAL_GLOBALDRIVERDATA GlobalDriverData; + LPD3DNTHAL_CALLBACKS HalCallbacks; + PDD_D3DBUFCALLBACKS D3DBufCallbacks; + + + gpEngFuncs.DxEngLockHdev(peDdGl->hDev); + DriverFunctions = (PDRIVER_FUNCTIONS)gpEngFuncs.DxEngGetHdevData(peDdGl->hDev, DxEGShDevData_DrvFuncs); + + // check if driver has DirectDraw functions + if ((!DriverFunctions->GetDirectDrawInfo)||(!DriverFunctions->EnableDirectDraw)||(!DriverFunctions->DisableDirectDraw)) + peDdGl->dhpdev = 0; + + + // reset acceleration flag + peDdGl->fl = peDdGl->fl & 0xFFFFFFFE; + + // ask for structure sizes + if ((peDdGl->dhpdev)&&(DriverFunctions->GetDirectDrawInfo(peDdGl->dhpdev, &peDdGl->ddHalInfo, &peDdGl->dwNumHeaps, NULL, &peDdGl->dwNumFourCC, NULL))) + { + // allocate memory for DX data + if (peDdGl->dwNumHeaps) + peDdGl->pvmList = EngAllocMem(FL_ZERO_MEMORY, peDdGl->dwNumHeaps*sizeof(VIDEOMEMORY), TAG_GDDV); + if (peDdGl->dwNumFourCC) + peDdGl->pdwFourCC = EngAllocMem(FL_ZERO_MEMORY, peDdGl->dwNumFourCC * 4, TAG_GDDF); + + // get data from driver + if (!DriverFunctions->GetDirectDrawInfo(peDdGl->dhpdev, &peDdGl->ddHalInfo, &peDdGl->dwNumHeaps, peDdGl->pvmList, &peDdGl->dwNumFourCC, peDdGl->pdwFourCC)) + { + // failed - cleanup and exit + if (peDdGl->pvmList) + EngFreeMem(peDdGl->pvmList); + if (peDdGl->pdwFourCC) + EngFreeMem(peDdGl->pdwFourCC); + gpEngFuncs.DxEngUnlockHdev(peDdGl->hDev); + return; + } + + // check if we can enable DirectDraw acceleration + if ((peDdGl->ddHalInfo.vmiData.pvPrimary) && + (DriverFunctions->EnableDirectDraw(peDdGl->dhpdev, &peDdGl->ddCallbacks, &peDdGl->ddSurfaceCallbacks, &peDdGl->ddPaletteCallbacks))&& + !(gpEngFuncs.DxEngGetHdevData(peDdGl->hDev, DxEGShDevData_dd_flags) & CapOver_DisableD3DAccel)&& + (peDdGl->ddHalInfo.dwSize == sizeof(DD_HALINFO))) + { + GlobalDriverData = peDdGl->ddHalInfo.lpD3DGlobalDriverData; + HalCallbacks = peDdGl->ddHalInfo.lpD3DHALCallbacks; + D3DBufCallbacks = peDdGl->ddHalInfo.lpD3DHALCallbacks; + + if (GlobalDriverData && GlobalDriverData->dwSize == sizeof(D3DNTHAL_GLOBALDRIVERDATA)) + memcpy(&peDdGl->d3dNtGlobalDriverData, GlobalDriverData, sizeof(D3DNTHAL_GLOBALDRIVERDATA)); + + if (HalCallbacks && HalCallbacks->dwSize == sizeof(D3DNTHAL_CALLBACKS)) + memcpy(&peDdGl->d3dNtHalCallbacks, HalCallbacks, sizeof(D3DNTHAL_CALLBACKS)); + + if (D3DBufCallbacks && D3DBufCallbacks->dwSize == sizeof(DD_D3DBUFCALLBACKS)) + memcpy(&peDdGl->d3dBufCallbacks, D3DBufCallbacks, sizeof(DD_D3DBUFCALLBACKS)); + + intDdGetAllDriverInfo(peDdGl); + + // enable DirectDraw acceleration + peDdGl->fl |= 1; + } + else + { + // failed - cleanup and exit + if (peDdGl->pvmList) + EngFreeMem(peDdGl->pvmList); + if (peDdGl->pdwFourCC) + EngFreeMem(peDdGl->pdwFourCC); + } + } + + gpEngFuncs.DxEngUnlockHdev(peDdGl->hDev); +} + +/*++ +* @name DxDdEnableDirectDraw +* @implemented +* +* Function enables DirectDraw +* +* @param PEDD_DIRECTDRAW_GLOBAL peDdGl +* Pointer to destination DirectDrawGlobal structure +*--*/ BOOL NTAPI -DxDdEnableDirectDraw(PVOID arg1, BOOL arg2/*What for?*/) -{ - // taken from CORE-4490 - //PDEV_WIN32K pdev = (PDEV_WIN32K) arg1 ; - //return pdev->DriverFunctions.EnableDirectDraw(pdev->dhpdev, - // &pdev->EDDgpl.ddCallbacks, - // &pdev->EDDgpl.ddSurfaceCallbacks, - // &pdev->EDDgpl.ddPaletteCallbacks) ; - - return TRUE; -} - +DxDdEnableDirectDraw(HANDLE hDev, BOOL arg2/*What for?*/) +{ + PEDD_DIRECTDRAW_GLOBAL peDdGl = NULL; + + if (gpEngFuncs.DxEngGetHdevData(hDev, DxEGShDevData_display)) + { + peDdGl = (PEDD_DIRECTDRAW_GLOBAL)gpEngFuncs.DxEngGetHdevData(hDev, DxEGShDevData_eddg); + peDdGl->hDev = hDev; + peDdGl->bSuspended = FALSE; + peDdGl->dhpdev = (PVOID)gpEngFuncs.DxEngGetHdevData(hDev, DxEGShDevData_dhpdev); + intDdEnableDriver(peDdGl); + return TRUE; + } + + return FALSE; +} Modified: trunk/reactos/win32ss/reactx/dxg/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/dxg/main.c?… ============================================================================== --- trunk/reactos/win32ss/reactx/dxg/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/reactx/dxg/main.c [iso-8859-1] Tue Mar 14 19:45:23 2017 @@ -17,7 +17,8 @@ PEPROCESS gpepSession = NULL; PLARGE_INTEGER gpLockShortDelay = NULL; -PDRVFN gpEngFuncs; +DXENG_FUNCTIONS gpEngFuncs; + const ULONG gcDxgFuncs = DXG_INDEX_DxDdIoctl + 1; @@ -39,6 +40,9 @@ { PDRVFN drv_func; + ULONG peng_funcs; + PULONG peng_func; + UINT i; /* Test see if the data is vaild we got from win32k.sys */ @@ -71,6 +75,8 @@ * and if it really are exported */ + peng_funcs = (ULONG)&gpEngFuncs; + for (i=1 ; i < DXENG_INDEX_DxEngLoadImage + 1; i++) { drv_func = &pDxEngDrv->pdrvfn[i]; @@ -80,9 +86,9 @@ { return STATUS_INTERNAL_ERROR; } + peng_func = (PULONG)(peng_funcs+(i * sizeof(ULONG))); + *peng_func = (ULONG)drv_func->pfn; } - - gpEngFuncs = pDxEngDrv->pdrvfn; /* Note 12/1-2004 : Why is this set to 0x618 */ *DirectDrawContext = 0x618; Modified: trunk/reactos/win32ss/reactx/dxg/tags.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/dxg/tags.h?… ============================================================================== --- trunk/reactos/win32ss/reactx/dxg/tags.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/reactx/dxg/tags.h [iso-8859-1] Tue Mar 14 19:45:23 2017 @@ -1,3 +1,5 @@ #define TAG_THDD 'ddht' #define TAG_GINI 'iniG' +#define TAG_GDDV 'vddG' +#define TAG_GDDF 'fddG' #define TAG_DH_0 '0 hD' Modified: trunk/reactos/win32ss/reactx/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/ntddraw/dxe… ============================================================================== --- trunk/reactos/win32ss/reactx/ntddraw/dxeng.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/reactx/ntddraw/dxeng.c [iso-8859-1] Tue Mar 14 19:45:23 2017 @@ -249,7 +249,7 @@ * The following typs are supported * Type Purpose * DxEGShDevData_Surface Retrieve pointer to Surface handle. -* DxEGShDevData_hSpooler See if the device is a spooler driver. +* DxEGShDevData_hSpooler Device object of graphics driver. * DxEGShDevData_DitherFmt Retrieve the device iDitherFormat * DxEGShDevData_FxCaps Retrieve the device flGraphicsCaps * DxEGShDevData_FxCaps2 Retrieve the device flGraphicsCaps2 @@ -297,7 +297,7 @@ break; case DxEGShDevData_hSpooler: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_hSpooler\n"); - retVal = 0; // (DWORD_PTR) PDev->hSpooler; // If the device is a spooler driver. + retVal = (DWORD_PTR) PDev->hSpooler; break; case DxEGShDevData_DitherFmt: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_DitherFmt\n"); @@ -356,9 +356,8 @@ retVal = (DWORD_PTR) PDev->gdiinfo.flRaster & RC_PALETTE; break; case DxEGShDevData_ldev: - DPRINT1("DxEGShDevData_ldev not supported yet\n"); - // ATM we do not support the Loader Device driver structure. -// retVal = (DWORD) PDev->pldev; + DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_ldev\n"); + retVal = (DWORD) PDev->pldev; break; case DxEGShDevData_GDev: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_GDev\n");

7 years, 9 months

[sgasiorek] 74169: [GDI] Windows puts DeviceObject to hSpooler field when it is graphics device. CORE-7733 CORE-4490

by sgasiorek＠svn.reactos.org

Author: sgasiorek Date: Tue Mar 14 19:13:19 2017 New Revision: 74169 URL: http://svn.reactos.org/svn/reactos?rev=74169&view=rev Log: [GDI] Windows puts DeviceObject to hSpooler field when it is graphics device. CORE-7733 CORE-4490 Modified: trunk/reactos/win32ss/gdi/eng/pdevobj.c trunk/reactos/win32ss/gdi/eng/pdevobj.h Modified: trunk/reactos/win32ss/gdi/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/pdevobj.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/pdevobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/pdevobj.c [iso-8859-1] Tue Mar 14 19:13:19 2017 @@ -359,6 +359,10 @@ ppdev->pfnMovePointer = EngMovePointer; ppdev->pGraphicsDevice = pGraphicsDevice; + + // DxEngGetHdevData asks for Graphics DeviceObject in hSpooler field + ppdev->hSpooler = ppdev->pGraphicsDevice->DeviceObject; + // Should we change the ative mode of pGraphicsDevice ? ppdev->pdmwDev = PDEVOBJ_pdmMatchDevMode(ppdev, pdm) ; Modified: trunk/reactos/win32ss/gdi/eng/pdevobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/pdevobj.h?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/pdevobj.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/pdevobj.h [iso-8859-1] Tue Mar 14 19:13:19 2017 @@ -123,7 +123,7 @@ DEVINFO devinfo; GDIINFO gdiinfo; PSURFACE pSurface; /* SURFACE for this device. */ -// HANDLE hSpooler; /* Handle to spooler, if spooler dev driver. */ + HANDLE hSpooler; /* Handle to spooler, if spooler dev driver, DeviceObject if graphics device */ // PVOID pDesktopId; PGRAPHICS_DEVICE pGraphicsDevice; POINTL ptlOrigion;

7 years, 9 months

[rnaumann] 74168: [EXPLORER] Now that CORE-10575 is correctly fixed, delete the old and obsolete start icon. Final part of CORE-10030

by rnaumann＠svn.reactos.org

Author: rnaumann Date: Tue Mar 14 15:08:11 2017 New Revision: 74168 URL: http://svn.reactos.org/svn/reactos?rev=74168&view=rev Log: [EXPLORER] Now that CORE-10575 is correctly fixed, delete the old and obsolete start icon. Final part of CORE-10030 Removed: trunk/reactos/base/shell/explorer/res/ico/4711.ico Modified: trunk/reactos/base/shell/explorer/explorer.rc trunk/reactos/base/shell/explorer/resource.h Modified: trunk/reactos/base/shell/explorer/explorer.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer.rc [iso-8859-1] Tue Mar 14 15:08:11 2017 @@ -32,7 +32,6 @@ IDI_MAIL ICON "res/ico/254.ico" IDI_MAILSMALL ICON "res/ico/256.ico" IDI_STARTMENU2 ICON "res/ico/257.ico" -IDI_START ICON "res/ico/4711.ico" /*******************************************************************************\ Removed: trunk/reactos/base/shell/explorer/res/ico/4711.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/ic… ============================================================================== Binary file - no diff available. Modified: trunk/reactos/base/shell/explorer/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/resour… ============================================================================== --- trunk/reactos/base/shell/explorer/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/resource.h [iso-8859-1] Tue Mar 14 15:08:11 2017 @@ -24,7 +24,6 @@ #define IDI_MAIL 254 #define IDI_MAILSMALL 256 #define IDI_STARTMENU2 257 -#define IDI_START 4711 /*******************************************************************************\ |* Bitmap Resources *|

7 years, 9 months

← Newer
1
...
6
7
8
9
10
11
12
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2017