Ros-diffs April 2014

ros-diffs@reactos.org

15 participants
492 discussions

[akhaldi] 62818: [D3DX9_37] => [D3DX9_43] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Apr 19 18:55:57 2014 New Revision: 62818 URL: http://svn.reactos.org/svn/reactos?rev=62818&view=rev Log: [D3DX9_37] => [D3DX9_43] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/directx/wine/d3dx9_37/version.rc trunk/reactos/dll/directx/wine/d3dx9_38/version.rc trunk/reactos/dll/directx/wine/d3dx9_39/version.rc trunk/reactos/dll/directx/wine/d3dx9_40/version.rc trunk/reactos/dll/directx/wine/d3dx9_41/version.rc trunk/reactos/dll/directx/wine/d3dx9_42/version.rc trunk/reactos/dll/directx/wine/d3dx9_43/d3dx9_43_main.c trunk/reactos/dll/directx/wine/d3dx9_43/version.rc Modified: trunk/reactos/dll/directx/wine/d3dx9_37/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_37/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_37/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_37/version.rc [iso-8859-1] Sat Apr 19 18:55:57 2014 @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_37.dll" #define WINE_FILEVERSION 9,22,949,2248 #define WINE_FILEVERSION_STR "9.22.949.2248" #define WINE_PRODUCTVERSION 9,22,949,2248 Modified: trunk/reactos/dll/directx/wine/d3dx9_38/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_38/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_38/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_38/version.rc [iso-8859-1] Sat Apr 19 18:55:57 2014 @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_38.dll" #define WINE_FILEVERSION 9,23,949,2378 #define WINE_FILEVERSION_STR "9.23.949.2378" #define WINE_PRODUCTVERSION 9,23,949,2378 Modified: trunk/reactos/dll/directx/wine/d3dx9_39/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_39/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_39/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_39/version.rc [iso-8859-1] Sat Apr 19 18:55:57 2014 @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_39.dll" #define WINE_FILEVERSION 9,24,949,2307 #define WINE_FILEVERSION_STR "9.24.949.2307" #define WINE_PRODUCTVERSION 9,24,949,2307 Modified: trunk/reactos/dll/directx/wine/d3dx9_40/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_40/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_40/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_40/version.rc [iso-8859-1] Sat Apr 19 18:55:57 2014 @@ -18,7 +18,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_40.dll" #define WINE_FILEVERSION 9,24,950,2656 #define WINE_FILEVERSION_STR "9.24.950.2656" #define WINE_PRODUCTVERSION 9,24,950,2656 Modified: trunk/reactos/dll/directx/wine/d3dx9_41/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_41/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_41/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_41/version.rc [iso-8859-1] Sat Apr 19 18:55:57 2014 @@ -18,7 +18,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_41.dll" #define WINE_FILEVERSION 9,26,952,2844 #define WINE_FILEVERSION_STR "9.26.952.2844" #define WINE_PRODUCTVERSION 9,26,952,2844 Modified: trunk/reactos/dll/directx/wine/d3dx9_42/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_42/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_42/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_42/version.rc [iso-8859-1] Sat Apr 19 18:55:57 2014 @@ -19,7 +19,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_42.dll" #define WINE_FILEVERSION 9,27,952,3001 #define WINE_FILEVERSION_STR "9.27.952.3001" #define WINE_PRODUCTVERSION 9,27,952,3001 Modified: trunk/reactos/dll/directx/wine/d3dx9_43/d3dx9_43_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_43/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_43/d3dx9_43_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_43/d3dx9_43_main.c [iso-8859-1] Sat Apr 19 18:55:57 2014 @@ -2,7 +2,7 @@ * Direct3D X 9 main file * * Copyright (C) 2007 David Adam - * Copyright (C) 2009 Rico SchØ£Â¼ller + * Copyright (C) 2009 Rico SchÃ¼ller * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,17 +20,21 @@ * */ -#include "config.h" -#include "wine/port.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <config.h> +//#include "wine/port.h" #include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +//#include "winuser.h" -#include "d3dx9.h" +#include <d3dx9.h> /*********************************************************************** * DllMain. Modified: trunk/reactos/dll/directx/wine/d3dx9_43/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_43/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_43/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_43/version.rc [iso-8859-1] Sat Apr 19 18:55:57 2014 @@ -1,6 +1,6 @@ /* * Copyright 2008 Louis Lenders - * Copyright 2009 Rico SchØ£Â¼ller + * Copyright 2009 Rico SchÃ¼ller * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,7 +18,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_43.dll" #define WINE_FILEVERSION 9,29,952,3111 #define WINE_FILEVERSION_STR "9.29.952.3111" #define WINE_PRODUCTVERSION 9,29,952,3111

10 years, 5 months

[akhaldi] 62817: [DXSDK] * Sync the d3dx9 headers with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Apr 19 18:48:40 2014 New Revision: 62817 URL: http://svn.reactos.org/svn/reactos?rev=62817&view=rev Log: [DXSDK] * Sync the d3dx9 headers with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/include/dxsdk/d3dx9anim.h trunk/reactos/include/dxsdk/d3dx9core.h trunk/reactos/include/dxsdk/d3dx9effect.h trunk/reactos/include/dxsdk/d3dx9math.h trunk/reactos/include/dxsdk/d3dx9math.inl trunk/reactos/include/dxsdk/d3dx9mesh.h trunk/reactos/include/dxsdk/d3dx9shader.h trunk/reactos/include/dxsdk/d3dx9tex.h trunk/reactos/include/dxsdk/d3dx9xof.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/dxsdk/d3dx9anim.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3dx9anim.h?… Modified: trunk/reactos/include/dxsdk/d3dx9core.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3dx9core.h?… Modified: trunk/reactos/include/dxsdk/d3dx9effect.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3dx9effect.… Modified: trunk/reactos/include/dxsdk/d3dx9math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3dx9math.h?… Modified: trunk/reactos/include/dxsdk/d3dx9math.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3dx9math.in… Modified: trunk/reactos/include/dxsdk/d3dx9mesh.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3dx9mesh.h?… Modified: trunk/reactos/include/dxsdk/d3dx9shader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3dx9shader.… Modified: trunk/reactos/include/dxsdk/d3dx9tex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3dx9tex.h?r… Modified: trunk/reactos/include/dxsdk/d3dx9xof.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3dx9xof.h?r…

10 years, 5 months

[akhaldi] 62816: [D3DX9_24] => [D3DX9_35] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Apr 19 18:35:05 2014 New Revision: 62816 URL: http://svn.reactos.org/svn/reactos?rev=62816&view=rev Log: [D3DX9_24] => [D3DX9_35] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/directx/wine/d3dx9_24/version.rc trunk/reactos/dll/directx/wine/d3dx9_25/version.rc trunk/reactos/dll/directx/wine/d3dx9_26/version.rc trunk/reactos/dll/directx/wine/d3dx9_27/version.rc trunk/reactos/dll/directx/wine/d3dx9_28/version.rc trunk/reactos/dll/directx/wine/d3dx9_29/version.rc trunk/reactos/dll/directx/wine/d3dx9_30/version.rc trunk/reactos/dll/directx/wine/d3dx9_31/version.rc trunk/reactos/dll/directx/wine/d3dx9_32/version.rc trunk/reactos/dll/directx/wine/d3dx9_33/version.rc trunk/reactos/dll/directx/wine/d3dx9_34/version.rc trunk/reactos/dll/directx/wine/d3dx9_35/version.rc Modified: trunk/reactos/dll/directx/wine/d3dx9_24/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_24/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_24/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_24/version.rc [iso-8859-1] Sat Apr 19 18:35:05 2014 @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_24.dll" #define WINE_FILEVERSION 9,5,132,0 #define WINE_FILEVERSION_STR "9.5.132.0" #define WINE_PRODUCTVERSION 9,5,132,0 Modified: trunk/reactos/dll/directx/wine/d3dx9_25/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_25/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_25/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_25/version.rc [iso-8859-1] Sat Apr 19 18:35:05 2014 @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_25.dll" #define WINE_FILEVERSION 9,6,168,0 #define WINE_FILEVERSION_STR "9.6.168.0" #define WINE_PRODUCTVERSION 9,6,168,0 Modified: trunk/reactos/dll/directx/wine/d3dx9_26/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_26/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_26/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_26/version.rc [iso-8859-1] Sat Apr 19 18:35:05 2014 @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_26.dll" #define WINE_FILEVERSION 9,7,239,0 #define WINE_FILEVERSION_STR "9.7.239.0" #define WINE_PRODUCTVERSION 9,7,239,0 Modified: trunk/reactos/dll/directx/wine/d3dx9_27/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_27/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_27/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_27/version.rc [iso-8859-1] Sat Apr 19 18:35:05 2014 @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_27.dll" #define WINE_FILEVERSION 9,8,299,0 #define WINE_FILEVERSION_STR "9.8.299.0" #define WINE_PRODUCTVERSION 9,8,299,0 Modified: trunk/reactos/dll/directx/wine/d3dx9_28/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_28/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_28/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_28/version.rc [iso-8859-1] Sat Apr 19 18:35:05 2014 @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_28.dll" #define WINE_FILEVERSION 9,10,455,0 #define WINE_FILEVERSION_STR "9.10.455.0" #define WINE_PRODUCTVERSION 9,10,455,0 Modified: trunk/reactos/dll/directx/wine/d3dx9_29/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_29/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_29/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_29/version.rc [iso-8859-1] Sat Apr 19 18:35:05 2014 @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_29.dll" #define WINE_FILEVERSION 9,11,519,0 #define WINE_FILEVERSION_STR "9.11.519.0" #define WINE_PRODUCTVERSION 9,11,519,0 Modified: trunk/reactos/dll/directx/wine/d3dx9_30/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_30/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_30/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_30/version.rc [iso-8859-1] Sat Apr 19 18:35:05 2014 @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_30.dll" #define WINE_FILEVERSION 9,12,589,0 #define WINE_FILEVERSION_STR "9.12.589.0" #define WINE_PRODUCTVERSION 9,12,589,0 Modified: trunk/reactos/dll/directx/wine/d3dx9_31/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_31/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_31/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_31/version.rc [iso-8859-1] Sat Apr 19 18:35:05 2014 @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_31.dll" #define WINE_FILEVERSION 9,15,779,0 #define WINE_FILEVERSION_STR "9.15.779.0" #define WINE_PRODUCTVERSION 9,15,779,0 Modified: trunk/reactos/dll/directx/wine/d3dx9_32/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_32/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_32/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_32/version.rc [iso-8859-1] Sat Apr 19 18:35:05 2014 @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_32.dll" #define WINE_FILEVERSION 9,16,843,0 #define WINE_FILEVERSION_STR "9.16.843.0" #define WINE_PRODUCTVERSION 9,16,843,0 Modified: trunk/reactos/dll/directx/wine/d3dx9_33/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_33/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_33/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_33/version.rc [iso-8859-1] Sat Apr 19 18:35:05 2014 @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_33.dll" #define WINE_FILEVERSION 9,18,904,15 #define WINE_FILEVERSION_STR "9.18.904.15" #define WINE_PRODUCTVERSION 9,18,904,15 Modified: trunk/reactos/dll/directx/wine/d3dx9_34/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_34/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_34/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_34/version.rc [iso-8859-1] Sat Apr 19 18:35:05 2014 @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_34.dll" #define WINE_FILEVERSION 9,19,949,46 #define WINE_FILEVERSION_STR "9.19.949.46" #define WINE_PRODUCTVERSION 9,19,949,46 Modified: trunk/reactos/dll/directx/wine/d3dx9_35/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_35/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_35/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_35/version.rc [iso-8859-1] Sat Apr 19 18:35:05 2014 @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_35.dll" #define WINE_FILEVERSION 9,19,949,1104 #define WINE_FILEVERSION_STR "9.19.949.1104" #define WINE_PRODUCTVERSION 9,19,949,1104

10 years, 5 months

[akhaldi] 62815: [D3DCOMPILER_43] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Apr 19 18:26:34 2014 New Revision: 62815 URL: http://svn.reactos.org/svn/reactos?rev=62815&view=rev Log: [D3DCOMPILER_43] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/asmparser.c trunk/reactos/dll/directx/wine/d3dcompiler_43/asmshader.tab.c trunk/reactos/dll/directx/wine/d3dcompiler_43/asmshader.tab.h trunk/reactos/dll/directx/wine/d3dcompiler_43/asmshader.y trunk/reactos/dll/directx/wine/d3dcompiler_43/asmshader.yy.c trunk/reactos/dll/directx/wine/d3dcompiler_43/compiler.c trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_43_main.c trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h trunk/reactos/dll/directx/wine/d3dcompiler_43/hlsl.yy.c trunk/reactos/dll/directx/wine/d3dcompiler_43/reflection.c trunk/reactos/dll/directx/wine/d3dcompiler_43/utils.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/asmparser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dcompiler_43/asmparser.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dcompiler_43/asmparser.c [iso-8859-1] Sat Apr 19 18:26:34 2014 @@ -497,11 +497,10 @@ * go through asmparser_instr). */ -static void asmparser_instr(struct asm_parser *This, DWORD opcode, - DWORD mod, DWORD shift, - BWRITER_COMPARISON_TYPE comp, - const struct shader_reg *dst, - const struct src_regs *srcs, int expectednsrcs) { +static void asmparser_instr(struct asm_parser *This, DWORD opcode, DWORD mod, DWORD shift, + enum bwriter_comparison_type comp, const struct shader_reg *dst, + const struct src_regs *srcs, int expectednsrcs) +{ struct instruction *instr; unsigned int i; BOOL firstreg = TRUE; Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/asmshader.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dcompiler_43/asmshader.tab.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dcompiler_43/asmshader.tab.c [iso-8859-1] Sat Apr 19 18:26:34 2014 @@ -343,12 +343,12 @@ DWORD mod; DWORD shift; } modshift; - BWRITER_COMPARISON_TYPE comptype; + enum bwriter_comparison_type comptype; struct { DWORD dclusage; unsigned int regnum; } declaration; - BWRITERSAMPLER_TEXTURE_TYPE samplertype; + enum bwritersampler_texture_type samplertype; struct rel_reg rel_reg; struct src_regs sregs; Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/asmshader.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dcompiler_43/asmshader.tab.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dcompiler_43/asmshader.tab.h [iso-8859-1] Sat Apr 19 18:26:34 2014 @@ -233,12 +233,12 @@ DWORD mod; DWORD shift; } modshift; - BWRITER_COMPARISON_TYPE comptype; + enum bwriter_comparison_type comptype; struct { DWORD dclusage; unsigned int regnum; } declaration; - BWRITERSAMPLER_TEXTURE_TYPE samplertype; + enum bwritersampler_texture_type samplertype; struct rel_reg rel_reg; struct src_regs sregs; Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/asmshader.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dcompiler_43/asmshader.y [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dcompiler_43/asmshader.y [iso-8859-1] Sat Apr 19 18:26:34 2014 @@ -92,12 +92,12 @@ DWORD mod; DWORD shift; } modshift; - BWRITER_COMPARISON_TYPE comptype; + enum bwriter_comparison_type comptype; struct { DWORD dclusage; unsigned int regnum; } declaration; - BWRITERSAMPLER_TEXTURE_TYPE samplertype; + enum bwritersampler_texture_type samplertype; struct rel_reg rel_reg; struct src_regs sregs; } Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/asmshader.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dcompiler_43/asmshader.yy.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dcompiler_43/asmshader.yy.c [iso-8859-1] Sat Apr 19 18:26:34 2014 @@ -360,7 +360,7 @@ /* Begin user sect3 */ -#define asmshader_wrap() 1 +#define asmshader_wrap(n) 1 #define YY_SKIP_YYWRAP typedef unsigned char YY_CHAR; Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/compiler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dcompiler_43/compiler.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dcompiler_43/compiler.c [iso-8859-1] Sat Apr 19 18:26:34 2014 @@ -144,8 +144,10 @@ char *path; int i; + TRACE("Looking for include %s.\n", debugstr_a(filename)); + parent_include = NULL; - if(parent_name[0] != '\0') + if (strcmp(parent_name, initial_filename)) { for(i = 0; i < includes_size; i++) { @@ -157,7 +159,7 @@ } if(parent_include == NULL) { - ERR("Parent include file missing\n"); + ERR("Parent include %s missing.\n", debugstr_a(parent_name)); return NULL; } } @@ -173,6 +175,8 @@ struct mem_file_desc *desc; HRESULT hr; + TRACE("Opening include %s.\n", debugstr_a(filename)); + if(!strcmp(filename, initial_filename)) { current_shader.pos = 0; @@ -184,11 +188,8 @@ if(!desc) return NULL; - hr = ID3DInclude_Open(current_include, - type ? D3D_INCLUDE_LOCAL : D3D_INCLUDE_SYSTEM, - filename, parent_include, (LPCVOID *)&desc->buffer, - &desc->size); - if(FAILED(hr)) + if (FAILED(hr = ID3DInclude_Open(current_include, type ? D3D_INCLUDE_LOCAL : D3D_INCLUDE_SYSTEM, + filename, parent_include, (const void **)&desc->buffer, &desc->size))) { HeapFree(GetProcessHeap(), 0, desc); return NULL; Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_43_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_43_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_43_main.c [iso-8859-1] Sat Apr 19 18:26:34 2014 @@ -21,7 +21,7 @@ #include "d3dcompiler_private.h" -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) { switch (reason) { Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h [iso-8859-1] Sat Apr 19 18:26:34 2014 @@ -57,7 +57,8 @@ ST_PIXEL }; -typedef enum BWRITER_COMPARISON_TYPE { +enum bwriter_comparison_type +{ BWRITER_COMPARISON_NONE, BWRITER_COMPARISON_GT, BWRITER_COMPARISON_EQ, @@ -65,7 +66,7 @@ BWRITER_COMPARISON_LT, BWRITER_COMPARISON_NE, BWRITER_COMPARISON_LE -} BWRITER_COMPARISON_TYPE; +}; struct constant { DWORD regnum; @@ -92,7 +93,7 @@ DWORD opcode; DWORD dstmod; DWORD shift; - BWRITER_COMPARISON_TYPE comptype; + enum bwriter_comparison_type comptype; BOOL has_dst; struct shader_reg dst; struct shader_reg *src; @@ -218,9 +219,9 @@ void (*end)(struct asm_parser *This); - void (*instr)(struct asm_parser *This, DWORD opcode, DWORD mod, DWORD shift, - BWRITER_COMPARISON_TYPE comp, const struct shader_reg *dst, - const struct src_regs *srcs, int expectednsrcs); + void (*instr)(struct asm_parser *parser, DWORD opcode, DWORD mod, DWORD shift, + enum bwriter_comparison_type comp, const struct shader_reg *dst, + const struct src_regs *srcs, int expectednsrcs); }; struct instruction *alloc_instr(unsigned int srcs) DECLSPEC_HIDDEN; @@ -367,11 +368,10 @@ /* Used to signal an incorrect swizzle/writemask */ #define SWIZZLE_ERR ~0U -/* - Enumerations and defines used in the bytecode writer - intermediate representation -*/ -typedef enum _BWRITERSHADER_INSTRUCTION_OPCODE_TYPE { +/* Enumerations and defines used in the bytecode writer intermediate + * representation. */ +enum bwritershader_instruction_opcode_type +{ BWRITERSIO_NOP, BWRITERSIO_MOV, BWRITERSIO_ADD, @@ -460,9 +460,10 @@ BWRITERSIO_PHASE, BWRITERSIO_COMMENT, BWRITERSIO_END, -} BWRITERSHADER_INSTRUCTION_OPCODE_TYPE; - -typedef enum _BWRITERSHADER_PARAM_REGISTER_TYPE { +}; + +enum bwritershader_param_register_type +{ BWRITERSPR_TEMP, BWRITERSPR_INPUT, BWRITERSPR_CONST, @@ -481,14 +482,14 @@ BWRITERSPR_MISCTYPE, BWRITERSPR_LABEL, BWRITERSPR_PREDICATE -} BWRITERSHADER_PARAM_REGISTER_TYPE; - -typedef enum _BWRITERVS_RASTOUT_OFFSETS +}; + +enum bwritervs_rastout_offsets { BWRITERSRO_POSITION, BWRITERSRO_FOG, BWRITERSRO_POINT_SIZE -} BWRITERVS_RASTOUT_OFFSETS; +}; #define BWRITERSP_WRITEMASK_0 0x1 /* .x r */ #define BWRITERSP_WRITEMASK_1 0x2 /* .y g */ @@ -496,25 +497,28 @@ #define BWRITERSP_WRITEMASK_3 0x8 /* .w a */ #define BWRITERSP_WRITEMASK_ALL 0xf /* all */ -typedef enum _BWRITERSHADER_PARAM_DSTMOD_TYPE { +enum bwritershader_param_dstmod_type +{ BWRITERSPDM_NONE = 0, BWRITERSPDM_SATURATE = 1, BWRITERSPDM_PARTIALPRECISION = 2, BWRITERSPDM_MSAMPCENTROID = 4, -} BWRITERSHADER_PARAM_DSTMOD_TYPE; - -typedef enum _BWRITERSAMPLER_TEXTURE_TYPE { +}; + +enum bwritersampler_texture_type +{ BWRITERSTT_UNKNOWN = 0, BWRITERSTT_1D = 1, BWRITERSTT_2D = 2, BWRITERSTT_CUBE = 3, BWRITERSTT_VOLUME = 4, -} BWRITERSAMPLER_TEXTURE_TYPE; +}; #define BWRITERSI_TEXLD_PROJECT 1 #define BWRITERSI_TEXLD_BIAS 2 -typedef enum _BWRITERSHADER_PARAM_SRCMOD_TYPE { +enum bwritershader_param_srcmod_type +{ BWRITERSPSM_NONE = 0, BWRITERSPSM_NEG, BWRITERSPSM_BIAS, @@ -529,7 +533,7 @@ BWRITERSPSM_ABS, BWRITERSPSM_ABSNEG, BWRITERSPSM_NOT, -} BWRITERSHADER_PARAM_SRCMOD_TYPE; +}; #define BWRITER_SM1_VS 0xfffe #define BWRITER_SM1_PS 0xffff @@ -567,7 +571,8 @@ #define BWRITERVS_SWIZZLE_Z (BWRITERVS_X_Z | BWRITERVS_Y_Z | BWRITERVS_Z_Z | BWRITERVS_W_Z) #define BWRITERVS_SWIZZLE_W (BWRITERVS_X_W | BWRITERVS_Y_W | BWRITERVS_Z_W | BWRITERVS_W_W) -typedef enum _BWRITERDECLUSAGE { +enum bwriterdeclusage +{ BWRITERDECLUSAGE_POSITION, BWRITERDECLUSAGE_BLENDWEIGHT, BWRITERDECLUSAGE_BLENDINDICES, @@ -582,7 +587,7 @@ BWRITERDECLUSAGE_FOG, BWRITERDECLUSAGE_DEPTH, BWRITERDECLUSAGE_SAMPLE -} BWRITERDECLUSAGE; +}; /* ps 1.x texture registers mappings */ #define T0_REG 2 Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/hlsl.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dcompiler_43/hlsl.yy.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dcompiler_43/hlsl.yy.c [iso-8859-1] Sat Apr 19 18:26:34 2014 @@ -360,7 +360,7 @@ /* Begin user sect3 */ -#define hlsl_wrap() 1 +#define hlsl_wrap(n) 1 #define YY_SKIP_YYWRAP typedef unsigned char YY_CHAR; Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/reflection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dcompiler_43/reflection.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dcompiler_43/reflection.c [iso-8859-1] Sat Apr 19 18:26:34 2014 @@ -69,7 +69,7 @@ UINT start_offset; UINT size; UINT flags; - LPVOID default_value; + void *default_value; }; struct d3dcompiler_shader_reflection_constant_buffer @@ -179,7 +179,7 @@ *value = HeapAlloc(GetProcessHeap(), 0, size); if (!*value) { - ERR("Failed to allocate vlaue memory.\n"); + ERR("Failed to allocate value memory.\n"); return FALSE; } @@ -442,7 +442,7 @@ } static struct ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetConstantBufferByName( - ID3D11ShaderReflection *iface, LPCSTR name) + ID3D11ShaderReflection *iface, const char *name) { struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); unsigned int i; @@ -544,7 +544,7 @@ } static struct ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetVariableByName( - ID3D11ShaderReflection *iface, LPCSTR name) + ID3D11ShaderReflection *iface, const char *name) { struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); unsigned int i, k; @@ -579,7 +579,7 @@ } static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetResourceBindingDescByName( - ID3D11ShaderReflection *iface, LPCSTR name, D3D11_SHADER_INPUT_BIND_DESC *desc) + ID3D11ShaderReflection *iface, const char *name, D3D11_SHADER_INPUT_BIND_DESC *desc) { struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); unsigned int i; @@ -658,7 +658,7 @@ { FIXME("iface %p stub!\n", iface); - return 0; + return FALSE; } static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetNumInterfaceSlots( @@ -764,7 +764,7 @@ } static ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_shader_reflection_constant_buffer_GetVariableByName( - ID3D11ShaderReflectionConstantBuffer *iface, LPCSTR name) + ID3D11ShaderReflectionConstantBuffer *iface, const char *name) { struct d3dcompiler_shader_reflection_constant_buffer *This = impl_from_ID3D11ShaderReflectionConstantBuffer(iface); unsigned int i; @@ -921,7 +921,7 @@ } static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetMemberTypeByName( - ID3D11ShaderReflectionType *iface, LPCSTR name) + ID3D11ShaderReflectionType *iface, const char *name) { struct d3dcompiler_shader_reflection_type *This = impl_from_ID3D11ShaderReflectionType(iface); unsigned int i; @@ -950,7 +950,7 @@ return &null_type.ID3D11ShaderReflectionType_iface; } -static LPCSTR STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetMemberTypeName( +static const char * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetMemberTypeName( ID3D11ShaderReflectionType *iface, UINT index) { struct d3dcompiler_shader_reflection_type *This = impl_from_ID3D11ShaderReflectionType(iface); Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dcompiler_43/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dcompiler_43/utils.c [iso-8859-1] Sat Apr 19 18:26:34 2014 @@ -1683,7 +1683,7 @@ static int compare_hlsl_types_rb(const void *key, const struct wine_rb_entry *entry) { - const char *name = (const char *)key; + const char *name = key; const struct hlsl_type *type = WINE_RB_ENTRY_VALUE(entry, const struct hlsl_type, scope_entry); if (name == type->name) @@ -1820,7 +1820,7 @@ static int compare_function_decl_rb(const void *key, const struct wine_rb_entry *entry) { - const struct list *params = (const struct list *)key; + const struct list *params = key; const struct hlsl_ir_function_decl *decl = WINE_RB_ENTRY_VALUE(entry, const struct hlsl_ir_function_decl, entry); int params_count = params ? list_count(params) : 0; int decl_params_count = decl->parameters ? list_count(decl->parameters) : 0; @@ -1855,7 +1855,7 @@ static int compare_function_rb(const void *key, const struct wine_rb_entry *entry) { - const char *name = (const char *)key; + const char *name = key; const struct hlsl_ir_function *func = WINE_RB_ENTRY_VALUE(entry, const struct hlsl_ir_function,entry); return strcmp(name, func->name); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Apr 19 18:26:34 2014 @@ -30,7 +30,7 @@ reactos/dll/directx/wine/amstream # Synced to Wine-1.7.17 reactos/dll/directx/wine/d3d8 # Synced to Wine-1.7.17 reactos/dll/directx/wine/d3d9 # Synced to Wine-1.7.17 -reactos/dll/directx/wine/d3dcompiler_43 # Synced to Wine-1.7.1 +reactos/dll/directx/wine/d3dcompiler_43 # Synced to Wine-1.7.17 reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to Wine-1.7.1 reactos/dll/directx/wine/d3dxof # Synced to Wine-1.7.1 reactos/dll/directx/wine/ddraw # Synced to Wine-1.7.17

10 years, 5 months

[akhaldi] 62814: [RSAENH_WINETEST] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Apr 19 18:12:06 2014 New Revision: 62814 URL: http://svn.reactos.org/svn/reactos?rev=62814&view=rev Log: [RSAENH_WINETEST] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/rostests/winetests/rsaenh/rsaenh.c Modified: trunk/rostests/winetests/rsaenh/rsaenh.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rsaenh/rsaenh.c… ============================================================================== --- trunk/rostests/winetests/rsaenh/rsaenh.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rsaenh/rsaenh.c [iso-8859-1] Sat Apr 19 18:12:06 2014 @@ -84,9 +84,9 @@ RegQueryValueExA(hkey, szMachineGuid, NULL, NULL, (LPBYTE)guid, &size); RegCloseKey(hkey); - lstrcpy(unique, szContainer_md5); - lstrcat(unique, "_"); - lstrcat(unique, guid); + lstrcpyA(unique, szContainer_md5); + lstrcatA(unique, "_"); + lstrcatA(unique, guid); } static void printBytes(const char *heading, const BYTE *pb, size_t cb) @@ -118,7 +118,7 @@ } */ -static int init_base_environment(DWORD dwKeyFlags) +static BOOL init_base_environment(DWORD dwKeyFlags) { HCRYPTKEY hKey; BOOL result; @@ -127,12 +127,12 @@ hProv = (HCRYPTPROV)INVALID_HANDLE_VALUE; - result = CryptAcquireContext(&hProv, szContainer, szProvider, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + result = CryptAcquireContextA(&hProv, szContainer, szProvider, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); ok(!result && (GetLastError()==NTE_BAD_FLAGS || broken(GetLastError() == NTE_KEYSET_NOT_DEF /* Win9x/NT4 */)), "%d, %08x\n", result, GetLastError()); - if (!CryptAcquireContext(&hProv, szContainer, szProvider, PROV_RSA_FULL, 0)) + if (!CryptAcquireContextA(&hProv, szContainer, szProvider, PROV_RSA_FULL, 0)) { ok(GetLastError()==NTE_BAD_KEYSET || broken(GetLastError() == NTE_TEMPORARY_PROFILE /* some Win7 setups */) || @@ -141,15 +141,15 @@ if (GetLastError()!=NTE_BAD_KEYSET) { win_skip("RSA full provider not available\n"); - return 0; + return FALSE; } - result = CryptAcquireContext(&hProv, szContainer, szProvider, PROV_RSA_FULL, + result = CryptAcquireContextA(&hProv, szContainer, szProvider, PROV_RSA_FULL, CRYPT_NEWKEYSET); ok(result, "%08x\n", GetLastError()); if (!result) { win_skip("Couldn't create crypto provider\n"); - return 0; + return FALSE; } result = CryptGenKey(hProv, AT_KEYEXCHANGE, dwKeyFlags, &hKey); ok(result, "%08x\n", GetLastError()); @@ -158,7 +158,7 @@ ok(result, "%08x\n", GetLastError()); if (result) CryptDestroyKey(hKey); } - return 1; + return TRUE; } static void clean_up_base_environment(void) @@ -175,10 +175,10 @@ result = CryptReleaseContext(hProv, 0); ok(!result && GetLastError()==ERROR_INVALID_PARAMETER, "%08x\n", GetLastError()); - CryptAcquireContext(&hProv, szContainer, szProvider, PROV_RSA_FULL, CRYPT_DELETEKEYSET); -} - -static int init_aes_environment(void) + CryptAcquireContextA(&hProv, szContainer, szProvider, PROV_RSA_FULL, CRYPT_DELETEKEYSET); +} + +static BOOL init_aes_environment(void) { HCRYPTKEY hKey; BOOL result; @@ -188,26 +188,26 @@ hProv = (HCRYPTPROV)INVALID_HANDLE_VALUE; /* we are using NULL as provider name for RSA_AES provider as the provider - * names are different in Windows XP and Vista. Its different as to what - * its defined in the SDK on Windows XP. + * names are different in Windows XP and Vista. It's different to what + * is defined in the SDK on Windows XP. * This provider is available on Windows XP, Windows 2003 and Vista. */ - result = CryptAcquireContext(&hProv, szContainer, NULL, PROV_RSA_AES, CRYPT_VERIFYCONTEXT); + result = CryptAcquireContextA(&hProv, szContainer, NULL, PROV_RSA_AES, CRYPT_VERIFYCONTEXT); if (!result && GetLastError() == NTE_PROV_TYPE_NOT_DEF) { win_skip("RSA_AES provider not supported\n"); - return 0; + return FALSE; } ok(!result && GetLastError()==NTE_BAD_FLAGS, "%d, %08x\n", result, GetLastError()); - if (!CryptAcquireContext(&hProv, szContainer, NULL, PROV_RSA_AES, 0)) + if (!CryptAcquireContextA(&hProv, szContainer, NULL, PROV_RSA_AES, 0)) { ok(GetLastError()==NTE_BAD_KEYSET, "%08x\n", GetLastError()); - if (GetLastError()!=NTE_BAD_KEYSET) return 0; - result = CryptAcquireContext(&hProv, szContainer, NULL, PROV_RSA_AES, + if (GetLastError()!=NTE_BAD_KEYSET) return FALSE; + result = CryptAcquireContextA(&hProv, szContainer, NULL, PROV_RSA_AES, CRYPT_NEWKEYSET); ok(result, "%08x\n", GetLastError()); - if (!result) return 0; + if (!result) return FALSE; result = CryptGenKey(hProv, AT_KEYEXCHANGE, 0, &hKey); ok(result, "%08x\n", GetLastError()); if (result) CryptDestroyKey(hKey); @@ -215,7 +215,7 @@ ok(result, "%08x\n", GetLastError()); if (result) CryptDestroyKey(hKey); } - return 1; + return TRUE; } static void clean_up_aes_environment(void) @@ -225,7 +225,7 @@ result = CryptReleaseContext(hProv, 1); ok(!result && GetLastError()==NTE_BAD_FLAGS, "%08x\n", GetLastError()); - CryptAcquireContext(&hProv, szContainer, NULL, PROV_RSA_AES, CRYPT_DELETEKEYSET); + CryptAcquireContextA(&hProv, szContainer, NULL, PROV_RSA_AES, CRYPT_DELETEKEYSET); } static void test_prov(void) @@ -446,7 +446,10 @@ result = CryptCreateHash(hProv, CALG_MD4, 0, 0, &hHash); ok(result, "%08x\n", GetLastError()); - result = CryptHashData(hHash, pbData, sizeof(pbData), 0); + result = CryptHashData(hHash, pbData, sizeof(pbData), ~0); + ok(!result && GetLastError() == NTE_BAD_FLAGS, "%08x\n", GetLastError()); + + result = CryptHashData(hHash, pbData, sizeof(pbData), CRYPT_USERDATA); ok(result, "%08x\n", GetLastError()); len = sizeof(DWORD); @@ -470,7 +473,10 @@ result = CryptGetHashParam(hHash, HP_HASHSIZE, (BYTE*)&hashlen, &len, 0); ok(result && (hashlen == 16), "%08x, hashlen: %d\n", GetLastError(), hashlen); - result = CryptHashData(hHash, pbData, sizeof(pbData), 0); + result = CryptHashData(hHash, pbData, sizeof(pbData), ~0); + ok(!result && GetLastError() == NTE_BAD_FLAGS, "%08x\n", GetLastError()); + + result = CryptHashData(hHash, pbData, sizeof(pbData), CRYPT_USERDATA); ok(result, "%08x\n", GetLastError()); len = 16; @@ -519,7 +525,7 @@ result = CryptCreateHash(hProv, CALG_SHA, 0, 0, &hHash); ok(result, "%08x\n", GetLastError()); - result = CryptHashData(hHash, pbData, 5, 0); + result = CryptHashData(hHash, pbData, 5, CRYPT_USERDATA); ok(result, "%08x\n", GetLastError()); if(pCryptDuplicateHash) { @@ -558,7 +564,7 @@ "expected NTE_BAD_ALGID, got %08x\n", GetLastError()); result = CryptAcquireContextA(&prov, NULL, szProvider, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); - ok(result, "CryptAcquireContext failed 0x%08x\n", GetLastError()); + ok(result, "CryptAcquireContextA failed 0x%08x\n", GetLastError()); result = CryptCreateHash(prov, CALG_SHA1, 0, 0, &hHash); ok(result, "CryptCreateHash failed 0x%08x\n", GetLastError()); @@ -586,7 +592,7 @@ } result = CryptAcquireContextA(&prov, NULL, szProvider, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); - ok(result, "CryptAcquireContext failed 0x%08x\n", GetLastError()); + ok(result, "CryptAcquireContextA failed 0x%08x\n", GetLastError()); result = CryptCreateHash(hProv, CALG_SHA1, 0, 0, &hHash); ok(result, "CryptCreateHash failed 0x%08x\n", GetLastError()); @@ -616,7 +622,7 @@ /* Test CALG_SSL3_SHAMD5 */ result = CryptAcquireContextA(&prov, NULL, szProvider, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); - ok(result, "CryptAcquireContext failed 0x%08x\n", GetLastError()); + ok(result, "CryptAcquireContextA failed 0x%08x\n", GetLastError()); /* Step 1: create an MD5 hash of the data */ result = CryptCreateHash(hProv, CALG_MD5, 0, 0, &hHash); @@ -650,10 +656,10 @@ result = CryptImportKey(hProv, abPlainPrivateKey, len, 0, 0, &hKeyExchangeKey); ok(result, "%08x\n", GetLastError()); len = 0; - result = CryptSignHash(hHash, AT_KEYEXCHANGE, NULL, 0, NULL, &len); + result = CryptSignHashA(hHash, AT_KEYEXCHANGE, NULL, 0, NULL, &len); ok(result, "%08x\n", GetLastError()); ok(len == 128, "expected len 128, got %d\n", len); - result = CryptSignHash(hHash, AT_KEYEXCHANGE, NULL, 0, pbSigValue, &len); + result = CryptSignHashA(hHash, AT_KEYEXCHANGE, NULL, 0, pbSigValue, &len); ok(result, "%08x\n", GetLastError()); ok(!memcmp(pbSigValue, signed_ssl3_shamd5_hash, len), "unexpected value\n"); if (len != 128 || memcmp(pbSigValue, signed_ssl3_shamd5_hash, len)) @@ -1916,28 +1922,28 @@ if (!result) return; /*check that a NULL pointer signature is correctly handled*/ - result = CryptVerifySignature(hHash, NULL, 128, hPubSignKey, NULL, 0); + result = CryptVerifySignatureA(hHash, NULL, 128, hPubSignKey, NULL, 0); ok(!result && ERROR_INVALID_PARAMETER == GetLastError(), "Expected ERROR_INVALID_PARAMETER error, got %08x\n", GetLastError()); if (result) return; /* check that we get a bad signature error when the signature is too short*/ SetLastError(0xdeadbeef); - result = CryptVerifySignature(hHash, abSignatureMD2, 64, hPubSignKey, NULL, 0); + result = CryptVerifySignatureA(hHash, abSignatureMD2, 64, hPubSignKey, NULL, 0); ok((!result && NTE_BAD_SIGNATURE == GetLastError()) || broken(result), /* Win9x, WinMe, NT4 */ "Expected NTE_BAD_SIGNATURE, got %08x\n", GetLastError()); - result = CryptVerifySignature(hHash, abSignatureMD2, 128, hPubSignKey, NULL, 0); + result = CryptVerifySignatureA(hHash, abSignatureMD2, 128, hPubSignKey, NULL, 0); ok(result, "%08x\n", GetLastError()); if (!result) return; /* It seems that CPVerifySignature doesn't care about the OID at all. */ - result = CryptVerifySignature(hHash, abSignatureMD2NoOID, 128, hPubSignKey, NULL, 0); - ok(result, "%08x\n", GetLastError()); - if (!result) return; - - result = CryptVerifySignature(hHash, abSignatureMD2NoOID, 128, hPubSignKey, NULL, CRYPT_NOHASHOID); + result = CryptVerifySignatureA(hHash, abSignatureMD2NoOID, 128, hPubSignKey, NULL, 0); + ok(result, "%08x\n", GetLastError()); + if (!result) return; + + result = CryptVerifySignatureA(hHash, abSignatureMD2NoOID, 128, hPubSignKey, NULL, CRYPT_NOHASHOID); ok(result, "%08x\n", GetLastError()); if (!result) return; @@ -1951,15 +1957,15 @@ ok(result, "%08x\n", GetLastError()); if (!result) return; - result = CryptVerifySignature(hHash, abSignatureMD4, 128, hPubSignKey, NULL, 0); - ok(result, "%08x\n", GetLastError()); - if (!result) return; - - result = CryptVerifySignature(hHash, abSignatureMD4NoOID, 128, hPubSignKey, NULL, 0); - ok(result, "%08x\n", GetLastError()); - if (!result) return; - - result = CryptVerifySignature(hHash, abSignatureMD4NoOID, 128, hPubSignKey, NULL, CRYPT_NOHASHOID); + result = CryptVerifySignatureA(hHash, abSignatureMD4, 128, hPubSignKey, NULL, 0); + ok(result, "%08x\n", GetLastError()); + if (!result) return; + + result = CryptVerifySignatureA(hHash, abSignatureMD4NoOID, 128, hPubSignKey, NULL, 0); + ok(result, "%08x\n", GetLastError()); + if (!result) return; + + result = CryptVerifySignatureA(hHash, abSignatureMD4NoOID, 128, hPubSignKey, NULL, CRYPT_NOHASHOID); ok(result, "%08x\n", GetLastError()); if (!result) return; @@ -1973,15 +1979,15 @@ ok(result, "%08x\n", GetLastError()); if (!result) return; - result = CryptVerifySignature(hHash, abSignatureMD5, 128, hPubSignKey, NULL, 0); - ok(result, "%08x\n", GetLastError()); - if (!result) return; - - result = CryptVerifySignature(hHash, abSignatureMD5NoOID, 128, hPubSignKey, NULL, 0); - ok(result, "%08x\n", GetLastError()); - if (!result) return; - - result = CryptVerifySignature(hHash, abSignatureMD5NoOID, 128, hPubSignKey, NULL, CRYPT_NOHASHOID); + result = CryptVerifySignatureA(hHash, abSignatureMD5, 128, hPubSignKey, NULL, 0); + ok(result, "%08x\n", GetLastError()); + if (!result) return; + + result = CryptVerifySignatureA(hHash, abSignatureMD5NoOID, 128, hPubSignKey, NULL, 0); + ok(result, "%08x\n", GetLastError()); + if (!result) return; + + result = CryptVerifySignatureA(hHash, abSignatureMD5NoOID, 128, hPubSignKey, NULL, CRYPT_NOHASHOID); ok(result, "%08x\n", GetLastError()); if (!result) return; @@ -1995,15 +2001,15 @@ ok(result, "%08x\n", GetLastError()); if (!result) return; - result = CryptVerifySignature(hHash, abSignatureSHA, 128, hPubSignKey, NULL, 0); - ok(result, "%08x\n", GetLastError()); - if (!result) return; - - result = CryptVerifySignature(hHash, abSignatureSHANoOID, 128, hPubSignKey, NULL, 0); - ok(result, "%08x\n", GetLastError()); - if (!result) return; - - result = CryptVerifySignature(hHash, abSignatureSHANoOID, 128, hPubSignKey, NULL, CRYPT_NOHASHOID); + result = CryptVerifySignatureA(hHash, abSignatureSHA, 128, hPubSignKey, NULL, 0); + ok(result, "%08x\n", GetLastError()); + if (!result) return; + + result = CryptVerifySignatureA(hHash, abSignatureSHANoOID, 128, hPubSignKey, NULL, 0); + ok(result, "%08x\n", GetLastError()); + if (!result) return; + + result = CryptVerifySignatureA(hHash, abSignatureSHANoOID, 128, hPubSignKey, NULL, CRYPT_NOHASHOID); ok(result, "%08x\n", GetLastError()); if (!result) return; @@ -2487,7 +2493,7 @@ 0x3d, 0xca, 0x6a, 0x6f, 0xfa, 0x15, 0x4e, 0xaa }; - result = CryptAcquireContext(&hProv, NULL, NULL, PROV_RSA_SCHANNEL, CRYPT_VERIFYCONTEXT|CRYPT_NEWKEYSET); + result = CryptAcquireContextA(&hProv, NULL, NULL, PROV_RSA_SCHANNEL, CRYPT_VERIFYCONTEXT|CRYPT_NEWKEYSET); if (!result) { win_skip("no PROV_RSA_SCHANNEL support\n"); @@ -2497,7 +2503,7 @@ if (result) CryptReleaseContext(hProv, 0); - result = CryptAcquireContext(&hProv, NULL, NULL, PROV_RSA_SCHANNEL, CRYPT_VERIFYCONTEXT); + result = CryptAcquireContextA(&hProv, NULL, NULL, PROV_RSA_SCHANNEL, CRYPT_VERIFYCONTEXT); ok (result, "%08x\n", GetLastError()); if (!result) return; @@ -2636,7 +2642,7 @@ CryptDestroyKey(hRSAKey); CryptDestroyKey(hMasterSecret); CryptReleaseContext(hProv, 0); - CryptAcquireContext(&hProv, NULL, NULL, PROV_RSA_SCHANNEL, CRYPT_DELETEKEYSET); + CryptAcquireContextA(&hProv, NULL, NULL, PROV_RSA_SCHANNEL, CRYPT_DELETEKEYSET); } /* Test that a key can be used to encrypt data and exported, and that, when @@ -2652,13 +2658,13 @@ BYTE data[256], *exportedKey; DWORD dataLen, keyLen; - CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, + CryptAcquireContextA(&prov, szContainer, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET); /* Generate a new key... */ - result = CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, + result = CryptAcquireContextA(&prov, szContainer, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET); - ok(result, "CryptAcquireContext failed: %08x\n", GetLastError()); + ok(result, "CryptAcquireContextA failed: %08x\n", GetLastError()); result = CryptGenKey(prov, CALG_RSA_KEYX, CRYPT_EXPORTABLE, &signKey); ok(result, "CryptGenKey with CALG_RSA_KEYX failed with error %08x\n", GetLastError()); result = CryptGetUserKey(prov, AT_KEYEXCHANGE, &keyExchangeKey); @@ -2701,7 +2707,7 @@ CryptDestroyKey(keyExchangeKey); CryptReleaseContext(prov, 0); - CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, + CryptAcquireContextA(&prov, szContainer, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET); } @@ -2764,36 +2770,36 @@ DWORD keySpec, dataLen,dwParam; char szName[MAX_PATH]; - result = CryptAcquireContext(NULL, szContainer, NULL, 0, 0); + result = CryptAcquireContextA(NULL, szContainer, NULL, 0, 0); ok(!result && GetLastError() == NTE_BAD_PROV_TYPE, "Expected NTE_BAD_PROV_TYPE, got %08x\n", GetLastError()); - result = CryptAcquireContext(NULL, szContainer, NULL, PROV_RSA_FULL, 0); + result = CryptAcquireContextA(NULL, szContainer, NULL, PROV_RSA_FULL, 0); ok(!result && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == NTE_BAD_KEYSET), "Expected ERROR_INVALID_PARAMETER or NTE_BAD_KEYSET, got %08x\n", GetLastError()); - result = CryptAcquireContext(NULL, szContainer, NULL, PROV_RSA_FULL, + result = CryptAcquireContextA(NULL, szContainer, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET); ok(!result && ( GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == NTE_BAD_KEYSET), "Expected ERROR_INVALID_PARAMETER or NTE_BAD_KEYSET, got %08x\n", GetLastError()); - result = CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, + result = CryptAcquireContextA(&prov, szContainer, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET); ok(!result && GetLastError() == NTE_BAD_KEYSET, "Expected NTE_BAD_KEYSET, got %08x\n", GetLastError()); - result = CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, 0); + result = CryptAcquireContextA(&prov, szContainer, NULL, PROV_RSA_FULL, 0); ok(!result && GetLastError() == NTE_BAD_KEYSET, "Expected NTE_BAD_KEYSET, got %08x\n", GetLastError()); /* Delete the default container. */ - CryptAcquireContext(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET); + CryptAcquireContextA(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET); /* Once you've deleted the default container you can't open it as if it * already exists. */ - result = CryptAcquireContext(&prov, NULL, NULL, PROV_RSA_FULL, 0); + result = CryptAcquireContextA(&prov, NULL, NULL, PROV_RSA_FULL, 0); ok(!result && GetLastError() == NTE_BAD_KEYSET, "Expected NTE_BAD_KEYSET, got %08x\n", GetLastError()); /* But you can always open the default container for CRYPT_VERIFYCONTEXT. */ - result = CryptAcquireContext(&prov, NULL, NULL, PROV_RSA_FULL, + result = CryptAcquireContextA(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); - ok(result, "CryptAcquireContext failed: %08x\n", GetLastError()); + ok(result, "CryptAcquireContextA failed: %08x\n", GetLastError()); if (!result) return; dataLen = sizeof(keySpec); result = CryptGetProvParam(prov, PP_KEYSPEC, (LPBYTE)&keySpec, &dataLen, 0); @@ -2812,9 +2818,9 @@ result = CryptReleaseContext(prov, 0); ok(result, "CryptReleaseContext failed: %08x\n", GetLastError()); /* You can create a new default container. */ - result = CryptAcquireContext(&prov, NULL, NULL, PROV_RSA_FULL, + result = CryptAcquireContextA(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET); - ok(result, "CryptAcquireContext failed: %08x\n", GetLastError()); + ok(result, "CryptAcquireContextA failed: %08x\n", GetLastError()); /* But you still can't get the keys (until one's been generated.) */ result = CryptGetUserKey(prov, AT_KEYEXCHANGE, &key); ok(!result && GetLastError() == NTE_NO_KEY, @@ -2823,20 +2829,20 @@ ok(!result && GetLastError() == NTE_NO_KEY, "Expected NTE_NO_KEY, got %08x\n", GetLastError()); CryptReleaseContext(prov, 0); - CryptAcquireContext(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET); - - CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, + CryptAcquireContextA(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET); + + CryptAcquireContextA(&prov, szContainer, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET); - result = CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, 0); + result = CryptAcquireContextA(&prov, szContainer, NULL, PROV_RSA_FULL, 0); ok(!result && GetLastError() == NTE_BAD_KEYSET, "Expected NTE_BAD_KEYSET, got %08x\n", GetLastError()); - result = CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, + result = CryptAcquireContextA(&prov, szContainer, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); ok(!result && GetLastError() == NTE_BAD_FLAGS, "Expected NTE_BAD_FLAGS, got %08x\n", GetLastError()); - result = CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, + result = CryptAcquireContextA(&prov, szContainer, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET); - ok(result, "CryptAcquireContext failed: %08x\n", GetLastError()); + ok(result, "CryptAcquireContextA failed: %08x\n", GetLastError()); if (!result) return; /* Test provider parameters getter */ dataLen = sizeof(dwParam); @@ -2910,13 +2916,13 @@ ok(!result && GetLastError() == NTE_NO_KEY, "Expected NTE_NO_KEY, got %08x\n", GetLastError()); CryptReleaseContext(prov, 0); - CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, + CryptAcquireContextA(&prov, szContainer, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET); /* Whereas importing a sign blob.. */ - result = CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, + result = CryptAcquireContextA(&prov, szContainer, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET); - ok(result, "CryptAcquireContext failed: %08x\n", GetLastError()); + ok(result, "CryptAcquireContextA failed: %08x\n", GetLastError()); if (!result) return; result = CryptImportKey(prov, signBlob, sizeof(signBlob), 0, 0, &key); ok(result, "CryptImportKey failed: %08x\n", GetLastError()); @@ -2931,13 +2937,13 @@ CryptDestroyKey(key); CryptReleaseContext(prov, 0); - CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, + CryptAcquireContextA(&prov, szContainer, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET); /* Test for being able to get a key generated with CALG_RSA_SIGN. */ - result = CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, + result = CryptAcquireContextA(&prov, szContainer, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET); - ok(result, "CryptAcquireContext failed: %08x\n", GetLastError()); + ok(result, "CryptAcquireContextA failed: %08x\n", GetLastError()); result = CryptGenKey(prov, CALG_RSA_SIGN, 0, &key); ok(result, "CryptGenKey with CALG_RSA_SIGN failed with error %08x\n", GetLastError()); CryptDestroyKey(key); @@ -2948,13 +2954,13 @@ CryptDestroyKey(key); CryptReleaseContext(prov, 0); - CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, + CryptAcquireContextA(&prov, szContainer, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET); /* Test for being able to get a key generated with CALG_RSA_KEYX. */ - result = CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, + result = CryptAcquireContextA(&prov, szContainer, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET); - ok(result, "CryptAcquireContext failed: %08x\n", GetLastError()); + ok(result, "CryptAcquireContextA failed: %08x\n", GetLastError()); result = CryptGenKey(prov, CALG_RSA_KEYX, 0, &key); ok(result, "CryptGenKey with CALG_RSA_KEYX failed with error %08x\n", GetLastError()); CryptDestroyKey(key); @@ -2965,44 +2971,44 @@ ok(!result, "expected CryptGetUserKey to fail\n"); CryptReleaseContext(prov, 0); - CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, + CryptAcquireContextA(&prov, szContainer, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET); /* test for the bug in accessing the user key in a container */ - result = CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, + result = CryptAcquireContextA(&prov, szContainer, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET); - ok(result, "CryptAcquireContext failed: %08x\n", GetLastError()); + ok(result, "CryptAcquireContextA failed: %08x\n", GetLastError()); result = CryptGenKey(prov, AT_KEYEXCHANGE, 0, &key); ok(result, "CryptGenKey with AT_KEYEXCHANGE failed with error %08x\n", GetLastError()); CryptDestroyKey(key); CryptReleaseContext(prov,0); - result = CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL,0); - ok(result, "CryptAcquireContext failed: 0x%08x\n", GetLastError()); + result = CryptAcquireContextA(&prov, szContainer, NULL, PROV_RSA_FULL,0); + ok(result, "CryptAcquireContextA failed: 0x%08x\n", GetLastError()); result = CryptGetUserKey(prov, AT_KEYEXCHANGE, &key); ok (result, "CryptGetUserKey failed with error %08x\n", GetLastError()); CryptDestroyKey(key); CryptReleaseContext(prov, 0); - CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, + CryptAcquireContextA(&prov, szContainer, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET); /* test the machine key set */ - CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, + CryptAcquireContextA(&prov, szContainer, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET|CRYPT_MACHINE_KEYSET); - result = CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, + result = CryptAcquireContextA(&prov, szContainer, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET|CRYPT_MACHINE_KEYSET); - ok(result, "CryptAcquireContext with CRYPT_MACHINE_KEYSET failed: %08x\n", GetLastError()); + ok(result, "CryptAcquireContextA with CRYPT_MACHINE_KEYSET failed: %08x\n", GetLastError()); CryptReleaseContext(prov, 0); - result = CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, + result = CryptAcquireContextA(&prov, szContainer, NULL, PROV_RSA_FULL, CRYPT_MACHINE_KEYSET); - ok(result, "CryptAcquireContext with CRYPT_MACHINE_KEYSET failed: %08x\n", GetLastError()); + ok(result, "CryptAcquireContextA with CRYPT_MACHINE_KEYSET failed: %08x\n", GetLastError()); CryptReleaseContext(prov,0); - result = CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, + result = CryptAcquireContextA(&prov, szContainer, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET|CRYPT_MACHINE_KEYSET); - ok(result, "CryptAcquireContext with CRYPT_DELETEKEYSET|CRYPT_MACHINE_KEYSET failed: %08x\n", + ok(result, "CryptAcquireContextA with CRYPT_DELETEKEYSET|CRYPT_MACHINE_KEYSET failed: %08x\n", GetLastError()); - result = CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, + result = CryptAcquireContextA(&prov, szContainer, NULL, PROV_RSA_FULL, CRYPT_MACHINE_KEYSET); ok(!result && GetLastError() == NTE_BAD_KEYSET , "Expected NTE_BAD_KEYSET, got %08x\n", GetLastError()); @@ -3114,11 +3120,11 @@ /* Like init_base_environment, but doesn't generate new keys, as they'll * be imported instead. */ - if (!CryptAcquireContext(&prov1, szContainer, szProvider, PROV_RSA_FULL, 0)) + if (!CryptAcquireContextA(&prov1, szContainer, szProvider, PROV_RSA_FULL, 0)) { - result = CryptAcquireContext(&prov1, szContainer, szProvider, PROV_RSA_FULL, + result = CryptAcquireContextA(&prov1, szContainer, szProvider, PROV_RSA_FULL, CRYPT_NEWKEYSET); - ok(result, "CryptAcquireContext failed: %08x\n", GetLastError()); + ok(result, "CryptAcquireContextA failed: %08x\n", GetLastError()); } dwLen = (DWORD)sizeof(abPlainPrivateKey); result = CryptImportKey(prov1, abPlainPrivateKey, dwLen, 0, 0, &hKeyExchangeKey); @@ -3131,8 +3137,8 @@ /* Once the key has been imported, subsequently acquiring a context with * the same name will allow retrieving the key. */ - result = CryptAcquireContext(&prov2, szContainer, szProvider, PROV_RSA_FULL, 0); - ok(result, "CryptAcquireContext failed: %08x\n", GetLastError()); + result = CryptAcquireContextA(&prov2, szContainer, szProvider, PROV_RSA_FULL, 0); + ok(result, "CryptAcquireContextA failed: %08x\n", GetLastError()); result = CryptGetUserKey(prov2, AT_KEYEXCHANGE, &hKey); ok(result, "CryptGetUserKey failed: %08x\n", GetLastError()); if (result) CryptDestroyKey(hKey); @@ -3141,7 +3147,7 @@ CryptDestroyKey(hSessionKey); CryptDestroyKey(hKeyExchangeKey); CryptReleaseContext(prov1, 0); - CryptAcquireContext(&prov1, szContainer, NULL, PROV_RSA_FULL, + CryptAcquireContextA(&prov1, szContainer, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET); }

10 years, 5 months

[akhaldi] 62813: [RSAENH] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Apr 19 18:11:58 2014 New Revision: 62813 URL: http://svn.reactos.org/svn/reactos?rev=62813&view=rev Log: [RSAENH] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/win32/rsaenh/handle.c trunk/reactos/dll/win32/rsaenh/handle.h trunk/reactos/dll/win32/rsaenh/implglue.c trunk/reactos/dll/win32/rsaenh/implglue.h trunk/reactos/dll/win32/rsaenh/mpi.c trunk/reactos/dll/win32/rsaenh/rsaenh.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/rsaenh/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/handle.c?… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/handle.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/handle.c [iso-8859-1] Sat Apr 19 18:11:58 2014 @@ -90,13 +90,13 @@ * dwType [I] A magic value that identifies the referenced object's type. * * RETURNS - * non zero, if handle is valid. - * zero, if handle is not valid. - */ -int is_valid_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType) + * TRUE, if handle is valid. + * FALSE, if handle is not valid. + */ +BOOL is_valid_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType) { unsigned int index = HANDLE2INDEX(handle); - int ret = 0; + BOOL ret = FALSE; TRACE("(lpTable=%p, handle=%ld)\n", lpTable, handle); @@ -113,8 +113,8 @@ /* Check if this handle references an object of the correct type. */ if (lpTable->paEntries[index].pObject->dwType != dwType) goto exit; - - ret = 1; + + ret = TRUE; exit: LeaveCriticalSection(&lpTable->mutex); return ret; @@ -129,13 +129,13 @@ * lpTable [I] Pointer to the table, which is to be grown * * RETURNS - * non zero, if successful - * zero, if not successful (out of memory on process heap) + * TRUE, if successful + * FALSE, if not successful (out of memory on process heap) * * NOTES * This is a support function for alloc_handle. Do not call! */ -static int grow_handle_table(struct handle_table *lpTable) +static BOOL grow_handle_table(struct handle_table *lpTable) { struct handle_table_entry *newEntries; unsigned int i, newIEntries; @@ -143,8 +143,8 @@ newIEntries = lpTable->iEntries + TABLE_SIZE_INCREMENT; newEntries = HeapAlloc(GetProcessHeap(), 0, sizeof(struct handle_table_entry)*newIEntries); - if (!newEntries) - return 0; + if (!newEntries) + return FALSE; if (lpTable->paEntries) { @@ -161,7 +161,7 @@ lpTable->paEntries = newEntries; lpTable->iEntries = newIEntries; - return 1; + return TRUE; } /****************************************************************************** @@ -177,12 +177,12 @@ * be stored. If not successful, this will be * INVALID_HANDLE_VALUE * RETURNS - * non zero, if successful - * zero, if not successful (no free handle) - */ -static int alloc_handle(struct handle_table *lpTable, OBJECTHDR *lpObject, HCRYPTKEY *lpHandle) -{ - int ret = 0; + * TRUE, if successful + * FALSE, if not successful (no free handle) + */ +static BOOL alloc_handle(struct handle_table *lpTable, OBJECTHDR *lpObject, HCRYPTKEY *lpHandle) +{ + BOOL ret = FALSE; TRACE("(lpTable=%p, lpObject=%p, lpHandle=%p)\n", lpTable, lpObject, lpHandle); @@ -200,7 +200,7 @@ lpTable->iFirstFree = lpTable->paEntries[lpTable->iFirstFree].iNextFree; InterlockedIncrement(&lpObject->refcount); - ret = 1; + ret = TRUE; exit: LeaveCriticalSection(&lpTable->mutex); return ret; @@ -224,14 +224,14 @@ * to be released. * * RETURNS - * non zero, if successful - * zero, if not successful (invalid handle) - */ -int release_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType) + * TRUE, if successful + * FALSE, if not successful (invalid handle) + */ +BOOL release_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType) { unsigned int index = HANDLE2INDEX(handle); OBJECTHDR *pObject; - int ret = 0; + BOOL ret = FALSE; TRACE("(lpTable=%p, handle=%ld)\n", lpTable, handle); @@ -251,8 +251,8 @@ lpTable->paEntries[index].pObject = NULL; lpTable->paEntries[index].iNextFree = lpTable->iFirstFree; lpTable->iFirstFree = index; - - ret = 1; + + ret = TRUE; exit: LeaveCriticalSection(&lpTable->mutex); return ret; @@ -266,16 +266,16 @@ * PARAMS * lpTable [I] Pointer to the handle table, in which the handle is looked up. * handle [I] The handle, which is to be looked up - * lplpObject [O] Pointer to the variable, into which the pointer to the - * object looked up is copied. - * RETURNS - * non zero, if successful - * zero, if not successful (invalid handle) - */ -int lookup_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, OBJECTHDR **lplpObject) -{ - int ret = 0; - + * lplpObject [O] Pointer to the variable, into which the pointer to the + * object looked up is copied. + * RETURNS + * TRUE, if successful + * FALSE, if not successful (invalid handle) + */ +BOOL lookup_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, OBJECTHDR **lplpObject) +{ + BOOL ret = FALSE; + TRACE("(lpTable=%p, handle=%ld, lplpObject=%p)\n", lpTable, handle, lplpObject); EnterCriticalSection(&lpTable->mutex); @@ -286,7 +286,7 @@ } *lplpObject = lpTable->paEntries[HANDLE2INDEX(handle)].pObject; - ret = 1; + ret = TRUE; exit: LeaveCriticalSection(&lpTable->mutex); return ret; @@ -304,14 +304,14 @@ * copy [O] Pointer to a handle variable, where the copied handle is put. * * RETURNS - * non zero, if successful - * zero, if not successful (invalid handle or out of memory) - */ -int copy_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, HCRYPTKEY *copy) + * TRUE, if successful + * FALSE, if not successful (invalid handle or out of memory) + */ +BOOL copy_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, HCRYPTKEY *copy) { OBJECTHDR *pObject; - int ret; - + BOOL ret; + TRACE("(lpTable=%p, handle=%ld, copy=%p)\n", lpTable, handle, copy); EnterCriticalSection(&lpTable->mutex); @@ -319,7 +319,7 @@ { *copy = (HCRYPTKEY)INVALID_HANDLE_VALUE; LeaveCriticalSection(&lpTable->mutex); - return 0; + return FALSE; } ret = alloc_handle(lpTable, pObject, copy); Modified: trunk/reactos/dll/win32/rsaenh/handle.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/handle.h?… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/handle.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/handle.h [iso-8859-1] Sat Apr 19 18:11:58 2014 @@ -58,10 +58,10 @@ void init_handle_table (struct handle_table *lpTable) DECLSPEC_HIDDEN; void destroy_handle_table(struct handle_table *lpTable) DECLSPEC_HIDDEN; -int release_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType) DECLSPEC_HIDDEN; -int copy_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, HCRYPTKEY *copy) DECLSPEC_HIDDEN; -int lookup_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, OBJECTHDR **lplpObject) DECLSPEC_HIDDEN; -int is_valid_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType) DECLSPEC_HIDDEN; +BOOL release_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType) DECLSPEC_HIDDEN; +BOOL copy_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, HCRYPTKEY *copy) DECLSPEC_HIDDEN; +BOOL lookup_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, OBJECTHDR **lplpObject) DECLSPEC_HIDDEN; +BOOL is_valid_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType) DECLSPEC_HIDDEN; HCRYPTKEY new_object (struct handle_table *lpTable, size_t cbSize, DWORD dwType, DESTRUCTOR destructor, OBJECTHDR **ppObject) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/rsaenh/implglue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/implglue.… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/implglue.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/implglue.c [iso-8859-1] Sat Apr 19 18:11:58 2014 @@ -87,7 +87,7 @@ return TRUE; } -BOOL update_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, CONST BYTE *pbData, +BOOL update_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, const BYTE *pbData, DWORD dwDataLen) { switch (aiAlgid) @@ -170,7 +170,7 @@ return TRUE; } -BOOL duplicate_hash_impl(ALG_ID aiAlgid, CONST HASH_CONTEXT *pSrcHashContext, +BOOL duplicate_hash_impl(ALG_ID aiAlgid, const HASH_CONTEXT *pSrcHashContext, HASH_CONTEXT *pDestHashContext) { *pDestHashContext = *pSrcHashContext; @@ -252,7 +252,7 @@ return TRUE; } -BOOL duplicate_key_impl(ALG_ID aiAlgid, CONST KEY_CONTEXT *pSrcKeyContext, +BOOL duplicate_key_impl(ALG_ID aiAlgid, const KEY_CONTEXT *pSrcKeyContext, KEY_CONTEXT *pDestKeyContext) { switch (aiAlgid) @@ -300,8 +300,8 @@ } } -BOOL encrypt_block_impl(ALG_ID aiAlgid, DWORD dwKeySpec, KEY_CONTEXT *pKeyContext, CONST BYTE *in, BYTE *out, - DWORD enc) +BOOL encrypt_block_impl(ALG_ID aiAlgid, DWORD dwKeySpec, KEY_CONTEXT *pKeyContext, const BYTE *in, + BYTE *out, DWORD enc) { unsigned long inlen, outlen; BYTE *in_reversed = NULL; @@ -409,7 +409,7 @@ return TRUE; } -BOOL import_public_key_impl(CONST BYTE *pbSrc, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, +BOOL import_public_key_impl(const BYTE *pbSrc, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, DWORD dwPubExp) { BYTE *pbTemp; @@ -484,7 +484,7 @@ return TRUE; } -BOOL import_private_key_impl(CONST BYTE *pbSrc, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, +BOOL import_private_key_impl(const BYTE *pbSrc, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, DWORD dwDataLen, DWORD dwPubExp) { BYTE *pbTemp, *pbBigNum; Modified: trunk/reactos/dll/win32/rsaenh/implglue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/implglue.… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/implglue.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/implglue.h [iso-8859-1] Sat Apr 19 18:11:58 2014 @@ -73,31 +73,31 @@ } KEY_CONTEXT; BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) DECLSPEC_HIDDEN; -BOOL update_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, CONST BYTE *pbData, +BOOL update_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, const BYTE *pbData, DWORD dwDataLen) DECLSPEC_HIDDEN; BOOL finalize_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, BYTE *pbHashValue) DECLSPEC_HIDDEN; -BOOL duplicate_hash_impl(ALG_ID aiAlgid, CONST HASH_CONTEXT *pSrcHashContext, +BOOL duplicate_hash_impl(ALG_ID aiAlgid, const HASH_CONTEXT *pSrcHashContext, HASH_CONTEXT *pDestHashContext) DECLSPEC_HIDDEN; BOOL new_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen) DECLSPEC_HIDDEN; BOOL free_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext) DECLSPEC_HIDDEN; BOOL setup_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, DWORD dwEffectiveKeyLen, DWORD dwSaltLen, BYTE *abKeyValue) DECLSPEC_HIDDEN; -BOOL duplicate_key_impl(ALG_ID aiAlgid, CONST KEY_CONTEXT *pSrcKeyContext, +BOOL duplicate_key_impl(ALG_ID aiAlgid, const KEY_CONTEXT *pSrcKeyContext, KEY_CONTEXT *pDestKeyContext) DECLSPEC_HIDDEN; /* dwKeySpec is optional for symmetric key algorithms */ -BOOL encrypt_block_impl(ALG_ID aiAlgid, DWORD dwKeySpec, KEY_CONTEXT *pKeyContext, CONST BYTE *pbIn, BYTE *pbOut, - DWORD enc) DECLSPEC_HIDDEN; +BOOL encrypt_block_impl(ALG_ID aiAlgid, DWORD dwKeySpec, KEY_CONTEXT *pKeyContext, const BYTE *pbIn, + BYTE *pbOut, DWORD enc) DECLSPEC_HIDDEN; BOOL encrypt_stream_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, BYTE *pbInOut, DWORD dwLen) DECLSPEC_HIDDEN; BOOL export_public_key_impl(BYTE *pbDest, const KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, DWORD *pdwPubExp) DECLSPEC_HIDDEN; -BOOL import_public_key_impl(CONST BYTE *pbSrc, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, +BOOL import_public_key_impl(const BYTE *pbSrc, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, DWORD dwPubExp) DECLSPEC_HIDDEN; BOOL export_private_key_impl(BYTE *pbDest, const KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, DWORD *pdwPubExp) DECLSPEC_HIDDEN; -BOOL import_private_key_impl(CONST BYTE* pbSrc, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, +BOOL import_private_key_impl(const BYTE* pbSrc, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, DWORD dwDataLen, DWORD dwPubExp) DECLSPEC_HIDDEN; BOOL gen_rand_impl(BYTE *pbBuffer, DWORD dwLen) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/rsaenh/mpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/mpi.c?rev… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/mpi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/mpi.c [iso-8859-1] Sat Apr 19 18:11:58 2014 @@ -1387,7 +1387,7 @@ { int x, res; - /* if its less than zero return */ + /* if it's less than zero return */ if (b <= 0) { return MP_OKAY; } @@ -1624,7 +1624,7 @@ norm = 0; } - /* note hac does 0 based, so if used==5 then its 0,1,2,3,4, e.g. use 4 */ + /* note hac does 0 based, so if used==5 then it's 0,1,2,3,4, e.g. use 4 */ n = x.used - 1; t = y.used - 1; @@ -1745,17 +1745,17 @@ return res; } -static int s_is_power_of_two(mp_digit b, int *p) +static BOOL s_is_power_of_two(mp_digit b, int *p) { int x; for (x = 1; x < DIGIT_BIT; x++) { if (b == (((mp_digit)1)<<x)) { *p = x; - return 1; + return TRUE; } } - return 0; + return FALSE; } /* single digit division (based on routine from MPI) */ @@ -2536,7 +2536,7 @@ goto __ERR; } - /* if its too low */ + /* if it's too low */ while (mp_cmp_d(&C, 0) == MP_LT) { if ((res = mp_add(&C, b, &C)) != MP_OKAY) { goto __ERR; @@ -2821,13 +2821,13 @@ /* divide the smallest by the GCD */ if (mp_cmp_mag(a, b) == MP_LT) { - /* store quotient in t2 such that t2 * b is the LCM */ + /* store quotient in t2 so that t2 * b is the LCM */ if ((res = mp_div(a, &t1, &t2, NULL)) != MP_OKAY) { goto __T; } res = mp_mul(b, &t2, c); } else { - /* store quotient in t2 such that t2 * a is the LCM */ + /* store quotient in t2 so that t2 * a is the LCM */ if ((res = mp_div(b, &t1, &t2, NULL)) != MP_OKAY) { goto __T; } Modified: trunk/reactos/dll/win32/rsaenh/rsaenh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/rsaenh.c?… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/rsaenh.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/rsaenh.c [iso-8859-1] Sat Apr 19 18:11:58 2014 @@ -37,11 +37,12 @@ #include <windef.h> //#include "winbase.h" #include <winreg.h> -//#include "wincrypt.h" +#include <wincrypt.h> #include "handle.h" #include "implglue.h" #include <objbase.h> #include <rpcproxy.h> +#include <aclapi.h> WINE_DEFAULT_DEBUG_CHANNEL(crypt); @@ -335,7 +336,7 @@ static BOOL import_key( HCRYPTPROV hProv, - CONST BYTE *pbData, + const BYTE *pbData, DWORD dwDataLen, HCRYPTKEY hPubKey, DWORD dwFlags, @@ -347,7 +348,7 @@ RSAENH_CPHashData( HCRYPTPROV hProv, HCRYPTHASH hHash, - CONST BYTE *pbData, + const BYTE *pbData, DWORD dwDataLen, DWORD dwFlags ); @@ -398,8 +399,8 @@ * Success: TRUE (pbParam was copied into pbBuffer or pbBuffer is NULL) * Failure: FALSE (pbBuffer is not large enough to hold pbParam). Last error: ERROR_MORE_DATA */ -static inline BOOL copy_param( - BYTE *pbBuffer, DWORD *pdwBufferSize, CONST BYTE *pbParam, DWORD dwParamSize) +static inline BOOL copy_param(BYTE *pbBuffer, DWORD *pdwBufferSize, const BYTE *pbParam, + DWORD dwParamSize) { if (pbBuffer) { @@ -461,7 +462,8 @@ * NOTES * Use free_data_blob to release resources occupied by copy_data_blob. */ -static inline BOOL copy_data_blob(PCRYPT_DATA_BLOB dst, CONST PCRYPT_DATA_BLOB src) { +static inline BOOL copy_data_blob(PCRYPT_DATA_BLOB dst, const PCRYPT_DATA_BLOB src) +{ dst->pbData = HeapAlloc(GetProcessHeap(), 0, src->cbData); if (!dst->pbData) { SetLastError(NTE_NO_MEMORY); @@ -489,8 +491,8 @@ * NOTES * Release resources occupied by concat_data_blobs with free_data_blobs */ -static inline BOOL concat_data_blobs(PCRYPT_DATA_BLOB dst, CONST PCRYPT_DATA_BLOB src1, - CONST PCRYPT_DATA_BLOB src2) +static inline BOOL concat_data_blobs(PCRYPT_DATA_BLOB dst, const PCRYPT_DATA_BLOB src1, + const PCRYPT_DATA_BLOB src2) { dst->cbData = src1->cbData + src2->cbData; dst->pbData = HeapAlloc(GetProcessHeap(), 0, dst->cbData); @@ -655,7 +657,8 @@ * pbData [I] Pointer to data stream to be hashed. * dwDataLen [I] Length of data stream. */ -static inline void update_hash(CRYPTHASH *pCryptHash, CONST BYTE *pbData, DWORD dwDataLen) { +static inline void update_hash(CRYPTHASH *pCryptHash, const BYTE *pbData, DWORD dwDataLen) +{ BYTE *pbTemp; switch (pCryptHash->aiAlgid) @@ -1099,7 +1102,7 @@ * dwFlags [I] Flags indicating which keyset to be opened. * phKey [O] Returned key */ -static BOOL open_container_key(LPCSTR pszContainerName, DWORD dwFlags, HKEY *phKey) +static BOOL open_container_key(LPCSTR pszContainerName, DWORD dwFlags, REGSAM access, HKEY *phKey) { CHAR szRSABase[MAX_PATH]; HKEY hRootKey; @@ -1113,7 +1116,7 @@ /* @@ Wine registry key: HKLM\Software\Wine\Crypto\RSA */ /* @@ Wine registry key: HKCU\Software\Wine\Crypto\RSA */ - return RegOpenKeyExA(hRootKey, szRSABase, 0, KEY_READ, phKey) == + return RegOpenKeyExA(hRootKey, szRSABase, 0, access, phKey) == ERROR_SUCCESS; } @@ -1383,7 +1386,7 @@ HCRYPTPROV hKeyContainer; HCRYPTKEY hCryptKey; - if (!open_container_key(pszContainerName, dwFlags, &hKey)) + if (!open_container_key(pszContainerName, dwFlags, KEY_READ, &hKey)) { SetLastError(NTE_BAD_KEYSET); return (HCRYPTPROV)INVALID_HANDLE_VALUE; @@ -1434,14 +1437,14 @@ * Failure: FALSE (NTE_BAD_ALGID) */ static BOOL build_hash_signature(BYTE *pbSignature, DWORD dwLen, ALG_ID aiAlgid, - CONST BYTE *abHashValue, DWORD dwHashLen, DWORD dwFlags) + const BYTE *abHashValue, DWORD dwHashLen, DWORD dwFlags) { /* These prefixes are meant to be concatenated with hash values of the * respective kind to form a PKCS #7 DigestInfo. */ static const struct tagOIDDescriptor { ALG_ID aiAlgid; DWORD dwLen; - CONST BYTE abOID[19]; + const BYTE abOID[19]; } aOIDDescriptor[] = { { CALG_MD2, 18, { 0x30, 0x20, 0x30, 0x0c, 0x06, 0x08, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x02, 0x02, 0x05, 0x00, 0x04, 0x10 } }, @@ -1529,7 +1532,8 @@ * Success: TRUE * Failure: FALSE */ -static BOOL tls1_p(HCRYPTHASH hHMAC, CONST PCRYPT_DATA_BLOB pblobSeed, PBYTE pbBuffer, DWORD dwBufferLen) +static BOOL tls1_p(HCRYPTHASH hHMAC, const PCRYPT_DATA_BLOB pblobSeed, BYTE *pbBuffer, + DWORD dwBufferLen) { CRYPTHASH *pHMAC; BYTE abAi[RSAENH_MAX_HASH_SIZE]; @@ -1587,8 +1591,8 @@ * Success: TRUE * Failure: FALSE */ -static BOOL tls1_prf(HCRYPTPROV hProv, HCRYPTPROV hSecret, CONST PCRYPT_DATA_BLOB pblobLabel, - CONST PCRYPT_DATA_BLOB pblobSeed, PBYTE pbBuffer, DWORD dwBufferLen) +static BOOL tls1_prf(HCRYPTPROV hProv, HCRYPTPROV hSecret, const PCRYPT_DATA_BLOB pblobLabel, + const PCRYPT_DATA_BLOB pblobSeed, BYTE *pbBuffer, DWORD dwBufferLen) { HMAC_INFO hmacInfo = { 0, NULL, 0, NULL, 0 }; HCRYPTHASH hHMAC = (HCRYPTHASH)INVALID_HANDLE_VALUE; @@ -1656,7 +1660,7 @@ * Success: TRUE * Failure: FALSE (NTE_BAD_LEN, too much data to pad) */ -static BOOL pad_data(CONST BYTE *abData, DWORD dwDataLen, BYTE *abBuffer, DWORD dwBufferLen, +static BOOL pad_data(const BYTE *abData, DWORD dwDataLen, BYTE *abBuffer, DWORD dwBufferLen, DWORD dwFlags) { DWORD i; @@ -1697,7 +1701,7 @@ * Success: TRUE * Failure: FALSE, (NTE_BAD_DATA, no valid PKCS1 padding or buffer too small) */ -static BOOL unpad_data(CONST BYTE *abData, DWORD dwDataLen, BYTE *abBuffer, DWORD *dwBufferLen, +static BOOL unpad_data(const BYTE *abData, DWORD dwDataLen, BYTE *abBuffer, DWORD *dwBufferLen, DWORD dwFlags) { DWORD i; @@ -2721,13 +2725,13 @@ * Success: TRUE. * Failure: FALSE. */ -static BOOL import_private_key(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDataLen, +static BOOL import_private_key(HCRYPTPROV hProv, const BYTE *pbData, DWORD dwDataLen, DWORD dwFlags, BOOL fStoreKey, HCRYPTKEY *phKey) { KEYCONTAINER *pKeyContainer; CRYPTKEY *pCryptKey; - CONST BLOBHEADER *pBlobHeader = (CONST BLOBHEADER*)pbData; - CONST RSAPUBKEY *pRSAPubKey = (CONST RSAPUBKEY*)(pBlobHeader+1); + const BLOBHEADER *pBlobHeader = (const BLOBHEADER*)pbData; + const RSAPUBKEY *pRSAPubKey = (const RSAPUBKEY*)(pBlobHeader+1); BOOL ret; if (dwFlags & CRYPT_IPSEC_HMAC_KEY) @@ -2771,7 +2775,7 @@ *phKey = new_key(hProv, pBlobHeader->aiKeyAlg, MAKELONG(0,pRSAPubKey->bitlen), &pCryptKey); if (*phKey == (HCRYPTKEY)INVALID_HANDLE_VALUE) return FALSE; setup_key(pCryptKey); - ret = import_private_key_impl((CONST BYTE*)(pRSAPubKey+1), &pCryptKey->context, + ret = import_private_key_impl((const BYTE*)(pRSAPubKey+1), &pCryptKey->context, pRSAPubKey->bitlen/8, dwDataLen, pRSAPubKey->pubexp); if (ret) { if (dwFlags & CRYPT_EXPORTABLE) @@ -2818,13 +2822,13 @@ * Success: TRUE. * Failure: FALSE. */ -static BOOL import_public_key(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDataLen, +static BOOL import_public_key(HCRYPTPROV hProv, const BYTE *pbData, DWORD dwDataLen, DWORD dwFlags, BOOL fStoreKey, HCRYPTKEY *phKey) { KEYCONTAINER *pKeyContainer; CRYPTKEY *pCryptKey; - CONST BLOBHEADER *pBlobHeader = (CONST BLOBHEADER*)pbData; - CONST RSAPUBKEY *pRSAPubKey = (CONST RSAPUBKEY*)(pBlobHeader+1); + const BLOBHEADER *pBlobHeader = (const BLOBHEADER*)pbData; + const RSAPUBKEY *pRSAPubKey = (const RSAPUBKEY*)(pBlobHeader+1); ALG_ID algID; BOOL ret; @@ -2856,7 +2860,7 @@ *phKey = new_key(hProv, algID, MAKELONG(0,pRSAPubKey->bitlen), &pCryptKey); if (*phKey == (HCRYPTKEY)INVALID_HANDLE_VALUE) return FALSE; setup_key(pCryptKey); - ret = import_public_key_impl((CONST BYTE*)(pRSAPubKey+1), &pCryptKey->context, + ret = import_public_key_impl((const BYTE*)(pRSAPubKey+1), &pCryptKey->context, pRSAPubKey->bitlen >> 3, pRSAPubKey->pubexp); if (ret) { if (dwFlags & CRYPT_EXPORTABLE) @@ -2897,14 +2901,13 @@ * Success: TRUE. * Failure: FALSE. */ -static BOOL import_symmetric_key(HCRYPTPROV hProv, CONST BYTE *pbData, - DWORD dwDataLen, HCRYPTKEY hPubKey, - DWORD dwFlags, HCRYPTKEY *phKey) +static BOOL import_symmetric_key(HCRYPTPROV hProv, const BYTE *pbData, DWORD dwDataLen, + HCRYPTKEY hPubKey, DWORD dwFlags, HCRYPTKEY *phKey) { CRYPTKEY *pCryptKey, *pPubKey; - CONST BLOBHEADER *pBlobHeader = (CONST BLOBHEADER*)pbData; - CONST ALG_ID *pAlgid = (CONST ALG_ID*)(pBlobHeader+1); - CONST BYTE *pbKeyStream = (CONST BYTE*)(pAlgid + 1); + const BLOBHEADER *pBlobHeader = (const BLOBHEADER*)pbData; + const ALG_ID *pAlgid = (const ALG_ID*)(pBlobHeader+1); + const BYTE *pbKeyStream = (const BYTE*)(pAlgid + 1); BYTE *pbDecrypted; DWORD dwKeyLen; @@ -2974,14 +2977,13 @@ * Success: TRUE. * Failure: FALSE. */ -static BOOL import_plaintext_key(HCRYPTPROV hProv, CONST BYTE *pbData, - DWORD dwDataLen, DWORD dwFlags, - HCRYPTKEY *phKey) +static BOOL import_plaintext_key(HCRYPTPROV hProv, const BYTE *pbData, DWORD dwDataLen, + DWORD dwFlags, HCRYPTKEY *phKey) { CRYPTKEY *pCryptKey; - CONST BLOBHEADER *pBlobHeader = (CONST BLOBHEADER*)pbData; - CONST DWORD *pKeyLen = (CONST DWORD *)(pBlobHeader + 1); - CONST BYTE *pbKeyStream = (CONST BYTE*)(pKeyLen + 1); + const BLOBHEADER *pBlobHeader = (const BLOBHEADER*)pbData; + const DWORD *pKeyLen = (const DWORD *)(pBlobHeader + 1); + const BYTE *pbKeyStream = (const BYTE*)(pKeyLen + 1); if (dwDataLen < sizeof(BLOBHEADER)+sizeof(DWORD)+*pKeyLen) { @@ -3053,12 +3055,11 @@ * Success: TRUE. * Failure: FALSE. */ -static BOOL import_key(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDataLen, - HCRYPTKEY hPubKey, DWORD dwFlags, BOOL fStoreKey, - HCRYPTKEY *phKey) +static BOOL import_key(HCRYPTPROV hProv, const BYTE *pbData, DWORD dwDataLen, HCRYPTKEY hPubKey, + DWORD dwFlags, BOOL fStoreKey, HCRYPTKEY *phKey) { KEYCONTAINER *pKeyContainer; - CONST BLOBHEADER *pBlobHeader = (CONST BLOBHEADER*)pbData; + const BLOBHEADER *pBlobHeader = (const BLOBHEADER*)pbData; if (!lookup_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER, (OBJECTHDR**)&pKeyContainer)) @@ -3124,7 +3125,7 @@ * Success: TRUE. * Failure: FALSE. */ -BOOL WINAPI RSAENH_CPImportKey(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDataLen, +BOOL WINAPI RSAENH_CPImportKey(HCRYPTPROV hProv, const BYTE *pbData, DWORD dwDataLen, HCRYPTKEY hPubKey, DWORD dwFlags, HCRYPTKEY *phKey) { TRACE("(hProv=%08lx, pbData=%p, dwDataLen=%d, hPubKey=%08lx, dwFlags=%08x, phKey=%p)\n", @@ -3321,11 +3322,11 @@ switch (dwParam) { case HP_ALGID: - return copy_param(pbData, pdwDataLen, (CONST BYTE*)&pCryptHash->aiAlgid, + return copy_param(pbData, pdwDataLen, (const BYTE*)&pCryptHash->aiAlgid, sizeof(ALG_ID)); case HP_HASHSIZE: - return copy_param(pbData, pdwDataLen, (CONST BYTE*)&pCryptHash->dwHashSize, + return copy_param(pbData, pdwDataLen, (const BYTE*)&pCryptHash->dwHashSize, sizeof(DWORD)); case HP_HASHVAL: @@ -3619,37 +3620,37 @@ case KP_PADDING: dwValue = PKCS5_PADDING; - return copy_param(pbData, pdwDataLen, (CONST BYTE*)&dwValue, sizeof(DWORD)); + return copy_param(pbData, pdwDataLen, (const BYTE*)&dwValue, sizeof(DWORD)); case KP_KEYLEN: dwValue = pCryptKey->dwKeyLen << 3; - return copy_param(pbData, pdwDataLen, (CONST BYTE*)&dwValue, sizeof(DWORD)); - + return copy_param(pbData, pdwDataLen, (const BYTE*)&dwValue, sizeof(DWORD)); + case KP_EFFECTIVE_KEYLEN: if (pCryptKey->dwEffectiveKeyLen) dwValue = pCryptKey->dwEffectiveKeyLen; else dwValue = pCryptKey->dwKeyLen << 3; - return copy_param(pbData, pdwDataLen, (CONST BYTE*)&dwValue, sizeof(DWORD)); + return copy_param(pbData, pdwDataLen, (const BYTE*)&dwValue, sizeof(DWORD)); case KP_BLOCKLEN: dwValue = pCryptKey->dwBlockLen << 3; - return copy_param(pbData, pdwDataLen, (CONST BYTE*)&dwValue, sizeof(DWORD)); - + return copy_param(pbData, pdwDataLen, (const BYTE*)&dwValue, sizeof(DWORD)); + case KP_MODE: - return copy_param(pbData, pdwDataLen, (CONST BYTE*)&pCryptKey->dwMode, sizeof(DWORD)); + return copy_param(pbData, pdwDataLen, (const BYTE*)&pCryptKey->dwMode, sizeof(DWORD)); case KP_MODE_BITS: - return copy_param(pbData, pdwDataLen, (CONST BYTE*)&pCryptKey->dwModeBits, + return copy_param(pbData, pdwDataLen, (const BYTE*)&pCryptKey->dwModeBits, sizeof(DWORD)); - + case KP_PERMISSIONS: - return copy_param(pbData, pdwDataLen, (CONST BYTE*)&pCryptKey->dwPermissions, + return copy_param(pbData, pdwDataLen, (const BYTE*)&pCryptKey->dwPermissions, sizeof(DWORD)); case KP_ALGID: - return copy_param(pbData, pdwDataLen, (CONST BYTE*)&pCryptKey->aiAlgid, sizeof(DWORD)); - + return copy_param(pbData, pdwDataLen, (const BYTE*)&pCryptKey->aiAlgid, sizeof(DWORD)); + default: SetLastError(NTE_BAD_TYPE); return FALSE; @@ -3678,6 +3679,7 @@ * - PP_SIG_KEYSIZE_INC: RSA signature keywidth granularity in bits. * - PP_KEYX_KEYSIZE_INC: RSA key-exchange keywidth granularity in bits. * - PP_ENUMALGS{_EX}: Query provider capabilities. + * - PP_KEYSET_SEC_DESCR: Retrieve security descriptor on container. */ BOOL WINAPI RSAENH_CPGetProvParam(HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, DWORD *pdwDataLen, DWORD dwFlags) @@ -3692,7 +3694,7 @@ * Returning this BLOB seems to satisfy IE. The marked 0x00 seem * to be 'don't care's. If you know anything more specific about * this provider parameter, please report to wine-devel(a)winehq.org */ - static CONST BYTE abWTF[96] = { + static const BYTE abWTF[96] = { 0xb0, 0x25, 0x63, 0x86, 0x9c, 0xab, 0xb6, 0x37, 0xe8, 0x82, /**/0x00,/**/ 0x72, 0x06, 0xb2, /**/0x00,/**/ 0x3b, 0x60, 0x35, /**/0x00,/**/ 0x3b, 0x88, 0xce, /**/0x00,/**/ 0x82, @@ -3727,42 +3729,42 @@ { case PP_CONTAINER: case PP_UNIQUE_CONTAINER:/* MSDN says we can return the same value as PP_CONTAINER */ - return copy_param(pbData, pdwDataLen, (CONST BYTE*)pKeyContainer->szName, + return copy_param(pbData, pdwDataLen, (const BYTE*)pKeyContainer->szName, strlen(pKeyContainer->szName)+1); case PP_NAME: - return copy_param(pbData, pdwDataLen, (CONST BYTE*)pKeyContainer->szProvName, + return copy_param(pbData, pdwDataLen, (const BYTE*)pKeyContainer->szProvName, strlen(pKeyContainer->szProvName)+1); case PP_PROVTYPE: dwTemp = PROV_RSA_FULL; - return copy_param(pbData, pdwDataLen, (CONST BYTE*)&dwTemp, sizeof(dwTemp)); + return copy_param(pbData, pdwDataLen, (const BYTE*)&dwTemp, sizeof(dwTemp)); case PP_KEYSPEC: dwTemp = AT_SIGNATURE | AT_KEYEXCHANGE; - return copy_param(pbData, pdwDataLen, (CONST BYTE*)&dwTemp, sizeof(dwTemp)); + return copy_param(pbData, pdwDataLen, (const BYTE*)&dwTemp, sizeof(dwTemp)); case PP_KEYSET_TYPE: dwTemp = pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET; - return copy_param(pbData, pdwDataLen, (CONST BYTE*)&dwTemp, sizeof(dwTemp)); + return copy_param(pbData, pdwDataLen, (const BYTE*)&dwTemp, sizeof(dwTemp)); case PP_KEYSTORAGE: dwTemp = CRYPT_SEC_DESCR; - return copy_param(pbData, pdwDataLen, (CONST BYTE*)&dwTemp, sizeof(dwTemp)); + return copy_param(pbData, pdwDataLen, (const BYTE*)&dwTemp, sizeof(dwTemp)); case PP_SIG_KEYSIZE_INC: case PP_KEYX_KEYSIZE_INC: dwTemp = 8; - return copy_param(pbData, pdwDataLen, (CONST BYTE*)&dwTemp, sizeof(dwTemp)); + return copy_param(pbData, pdwDataLen, (const BYTE*)&dwTemp, sizeof(dwTemp)); case PP_IMPTYPE: dwTemp = CRYPT_IMPL_SOFTWARE; - return copy_param(pbData, pdwDataLen, (CONST BYTE*)&dwTemp, sizeof(dwTemp)); + return copy_param(pbData, pdwDataLen, (const BYTE*)&dwTemp, sizeof(dwTemp)); case PP_VERSION: dwTemp = 0x00000200; - return copy_param(pbData, pdwDataLen, (CONST BYTE*)&dwTemp, sizeof(dwTemp)); - + return copy_param(pbData, pdwDataLen, (const BYTE*)&dwTemp, sizeof(dwTemp)); + case PP_ENUMCONTAINERS: if ((dwFlags & CRYPT_FIRST) == CRYPT_FIRST) pKeyContainer->dwEnumContainersCtr = 0; @@ -3771,7 +3773,7 @@ return TRUE; } - if (!open_container_key("", dwFlags, &hKey)) + if (!open_container_key("", dwFlags, KEY_READ, &hKey)) { SetLastError(ERROR_NO_MORE_ITEMS); return FALSE; @@ -3821,22 +3823,50 @@ memcpy(provEnumalgs.szName, aProvEnumAlgsEx [pKeyContainer->dwPersonality][pKeyContainer->dwEnumAlgsCtr].szName, 20*sizeof(CHAR)); - - return copy_param(pbData, pdwDataLen, (CONST BYTE*)&provEnumalgs, + + return copy_param(pbData, pdwDataLen, (const BYTE*)&provEnumalgs, sizeof(PROV_ENUMALGS)); } else { if (pbData && (*pdwDataLen >= sizeof(PROV_ENUMALGS_EX))) pKeyContainer->dwEnumAlgsCtr = ((dwFlags & CRYPT_FIRST) == CRYPT_FIRST) ? 0 : pKeyContainer->dwEnumAlgsCtr+1; - + return copy_param(pbData, pdwDataLen, - (CONST BYTE*)&aProvEnumAlgsEx + (const BYTE*)&aProvEnumAlgsEx [pKeyContainer->dwPersonality][pKeyContainer->dwEnumAlgsCtr], sizeof(PROV_ENUMALGS_EX)); } case PP_CRYPT_COUNT_KEY_USE: /* Asked for by IE About dialog */ return copy_param(pbData, pdwDataLen, abWTF, sizeof(abWTF)); + + case PP_KEYSET_SEC_DESCR: + { + SECURITY_DESCRIPTOR *sd; + DWORD err, len, flags = (pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET); + + if (!open_container_key(pKeyContainer->szName, flags, KEY_READ, &hKey)) + { + SetLastError(NTE_BAD_KEYSET); + return FALSE; + } + + err = GetSecurityInfo(hKey, SE_REGISTRY_KEY, dwFlags, NULL, NULL, NULL, NULL, (void **)&sd); + RegCloseKey(hKey); + if (err) + { + SetLastError(err); + return FALSE; + } + + len = GetSecurityDescriptorLength(sd); + if (*pdwDataLen >= len) memcpy(pbData, sd, len); + else SetLastError(ERROR_INSUFFICIENT_BUFFER); + *pdwDataLen = len; + + LocalFree(sd); + return TRUE; + } default: /* MSDN: Unknown parameter number in dwParam */ @@ -4080,7 +4110,7 @@ * The actual hash value is queried with CPGetHashParam, which will finalize * the hash. Updating a finalized hash will fail with a last error NTE_BAD_HASH_STATE. */ -BOOL WINAPI RSAENH_CPHashData(HCRYPTPROV hProv, HCRYPTHASH hHash, CONST BYTE *pbData, +BOOL WINAPI RSAENH_CPHashData(HCRYPTPROV hProv, HCRYPTHASH hHash, const BYTE *pbData, DWORD dwDataLen, DWORD dwFlags) { CRYPTHASH *pCryptHash; @@ -4088,7 +4118,7 @@ TRACE("(hProv=%08lx, hHash=%08lx, pbData=%p, dwDataLen=%d, dwFlags=%08x)\n", hProv, hHash, pbData, dwDataLen, dwFlags); - if (dwFlags) + if (dwFlags & ~CRYPT_USERDATA) { SetLastError(NTE_BAD_FLAGS); return FALSE; @@ -4313,8 +4343,56 @@ */ BOOL WINAPI RSAENH_CPSetProvParam(HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, DWORD dwFlags) { - FIXME("(stub)\n"); - return FALSE; + KEYCONTAINER *pKeyContainer; + HKEY hKey; + + TRACE("(hProv=%08lx, dwParam=%08x, pbData=%p, dwFlags=%08x)\n", hProv, dwParam, pbData, dwFlags); + + if (!lookup_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER, (OBJECTHDR **)&pKeyContainer)) + { + SetLastError(NTE_BAD_UID); + return FALSE; + } + + switch (dwParam) + { + case PP_KEYSET_SEC_DESCR: + { + SECURITY_DESCRIPTOR *sd = (SECURITY_DESCRIPTOR *)pbData; + DWORD err, flags = (pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET); + BOOL def, present; + REGSAM access = WRITE_DAC | WRITE_OWNER | ACCESS_SYSTEM_SECURITY; + PSID owner = NULL, group = NULL; + PACL dacl = NULL, sacl = NULL; + + if (!open_container_key(pKeyContainer->szName, flags, access, &hKey)) + { + SetLastError(NTE_BAD_KEYSET); + return FALSE; + } + + if ((dwFlags & OWNER_SECURITY_INFORMATION && !GetSecurityDescriptorOwner(sd, &owner, &def)) || + (dwFlags & GROUP_SECURITY_INFORMATION && !GetSecurityDescriptorGroup(sd, &group, &def)) || + (dwFlags & DACL_SECURITY_INFORMATION && !GetSecurityDescriptorDacl(sd, &present, &dacl, &def)) || + (dwFlags & SACL_SECURITY_INFORMATION && !GetSecurityDescriptorSacl(sd, &present, &sacl, &def))) + { + RegCloseKey(hKey); + return FALSE; + } + + err = SetSecurityInfo(hKey, SE_REGISTRY_KEY, dwFlags, owner, group, dacl, sacl); + RegCloseKey(hKey); + if (err) + { + SetLastError(err); + return FALSE; + } + return TRUE; + } + default: + FIXME("unimplemented parameter %08x\n", dwParam); + return FALSE; + } } /****************************************************************************** @@ -4378,7 +4456,7 @@ *pdwSigLen = pCryptKey->dwKeyLen; if (sDescription) { - if (!RSAENH_CPHashData(hProv, hHash, (CONST BYTE*)sDescription, + if (!RSAENH_CPHashData(hProv, hHash, (const BYTE*)sDescription, (DWORD)lstrlenW(sDescription)*sizeof(WCHAR), 0)) { goto out; @@ -4420,7 +4498,7 @@ * Success: TRUE (Signature is valid) * Failure: FALSE (GetLastError() == NTE_BAD_SIGNATURE, if signature is invalid) */ -BOOL WINAPI RSAENH_CPVerifySignature(HCRYPTPROV hProv, HCRYPTHASH hHash, CONST BYTE *pbSignature, +BOOL WINAPI RSAENH_CPVerifySignature(HCRYPTPROV hProv, HCRYPTHASH hHash, const BYTE *pbSignature, DWORD dwSigLen, HCRYPTKEY hPubKey, LPCWSTR sDescription, DWORD dwFlags) { @@ -4469,7 +4547,7 @@ } if (sDescription) { - if (!RSAENH_CPHashData(hProv, hHash, (CONST BYTE*)sDescription, + if (!RSAENH_CPHashData(hProv, hHash, (const BYTE*)sDescription, (DWORD)lstrlenW(sDescription)*sizeof(WCHAR), 0)) { return FALSE; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Apr 19 18:11:58 2014 @@ -167,7 +167,7 @@ reactos/dll/win32/riched32 # Synced to Wine-1.7.1 reactos/dll/win32/rpcrt4 # Synced to Wine-1.7.1 reactos/dll/win32/rsabase # Synced to Wine-1.7.1 -reactos/dll/win32/rsaenh # Synced to Wine-1.7.1 +reactos/dll/win32/rsaenh # Synced to Wine-1.7.17 reactos/dll/win32/sccbase # Synced to Wine-1.7.1 reactos/dll/win32/schannel # Synced to Wine-1.7.1 reactos/dll/win32/scrrun # Synced to Wine-1.7.1

10 years, 5 months

[akhaldi] 62812: [PSDK] * Add missing CRYPT_USERDATA definition.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Apr 19 18:06:05 2014 New Revision: 62812 URL: http://svn.reactos.org/svn/reactos?rev=62812&view=rev Log: [PSDK] * Add missing CRYPT_USERDATA definition. Modified: trunk/reactos/include/psdk/wincrypt.h Modified: trunk/reactos/include/psdk/wincrypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincrypt.h?re… ============================================================================== --- trunk/reactos/include/psdk/wincrypt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wincrypt.h [iso-8859-1] Sat Apr 19 18:06:05 2014 @@ -4027,6 +4027,8 @@ #define EXPORT_PRIVATE_KEYS 0x00000004 #define PKCS12_EXPORT_RESERVED_MASK 0xffff0000 +#define CRYPT_USERDATA 0x00000001 + /* function declarations */ /* advapi32.dll */ WINADVAPI

10 years, 5 months

[akhaldi] 62811: [D3D8][D3D9][DDRAW][DXGI][QEDIT][WINED3D] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Apr 19 17:30:00 2014 New Revision: 62811 URL: http://svn.reactos.org/svn/reactos?rev=62811&view=rev Log: [D3D8][D3D9][DDRAW][DXGI][QEDIT][WINED3D] * Sync with Wine 1.7.17. CORE-8080 Added: trunk/reactos/dll/directx/wine/ddraw/ddraw_classes.rgs (with props) Removed: trunk/reactos/dll/directx/wine/ddraw/ddraw.rgs Modified: trunk/reactos/dll/directx/wine/d3d8/buffer.c trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h trunk/reactos/dll/directx/wine/d3d8/device.c trunk/reactos/dll/directx/wine/d3d8/directx.c trunk/reactos/dll/directx/wine/d3d8/surface.c trunk/reactos/dll/directx/wine/d3d8/texture.c trunk/reactos/dll/directx/wine/d3d8/volume.c trunk/reactos/dll/directx/wine/d3d9/buffer.c trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h trunk/reactos/dll/directx/wine/d3d9/device.c trunk/reactos/dll/directx/wine/d3d9/directx.c trunk/reactos/dll/directx/wine/d3d9/query.c trunk/reactos/dll/directx/wine/d3d9/surface.c trunk/reactos/dll/directx/wine/d3d9/texture.c trunk/reactos/dll/directx/wine/d3d9/volume.c trunk/reactos/dll/directx/wine/ddraw/ddraw.c trunk/reactos/dll/directx/wine/ddraw/ddraw.rc trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h trunk/reactos/dll/directx/wine/ddraw/device.c trunk/reactos/dll/directx/wine/ddraw/main.c trunk/reactos/dll/directx/wine/ddraw/surface.c trunk/reactos/dll/directx/wine/ddraw/utils.c trunk/reactos/dll/directx/wine/ddraw/vertexbuffer.c trunk/reactos/dll/directx/wine/ddraw/viewport.c trunk/reactos/dll/directx/wine/dxgi/adapter.c trunk/reactos/dll/directx/wine/dxgi/dxgi.spec trunk/reactos/dll/directx/wine/dxgi/dxgi_main.c trunk/reactos/dll/directx/wine/dxgi/dxgi_private.h trunk/reactos/dll/directx/wine/dxgi/factory.c trunk/reactos/dll/directx/wine/dxgi/guid.c trunk/reactos/dll/directx/wine/dxgi/output.c trunk/reactos/dll/directx/wine/dxgi/surface.c trunk/reactos/dll/directx/wine/qedit/CMakeLists.txt trunk/reactos/dll/directx/wine/qedit/qedit_classes.idl trunk/reactos/dll/directx/wine/qedit/samplegrabber.c trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c trunk/reactos/dll/directx/wine/wined3d/buffer.c trunk/reactos/dll/directx/wine/wined3d/context.c trunk/reactos/dll/directx/wine/wined3d/cs.c trunk/reactos/dll/directx/wine/wined3d/device.c trunk/reactos/dll/directx/wine/wined3d/directx.c trunk/reactos/dll/directx/wine/wined3d/query.c trunk/reactos/dll/directx/wine/wined3d/resource.c trunk/reactos/dll/directx/wine/wined3d/surface.c trunk/reactos/dll/directx/wine/wined3d/utils.c trunk/reactos/dll/directx/wine/wined3d/wined3d.spec trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h trunk/reactos/include/reactos/wine/wgl_driver.h trunk/reactos/include/reactos/wine/wined3d.h trunk/reactos/include/reactos/wine/winedxgi.idl trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/wine/d3d8/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/buff… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devi… Modified: trunk/reactos/dll/directx/wine/d3d8/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/dire… Modified: trunk/reactos/dll/directx/wine/d3d8/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/surf… Modified: trunk/reactos/dll/directx/wine/d3d8/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/text… Modified: trunk/reactos/dll/directx/wine/d3d8/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… Modified: trunk/reactos/dll/directx/wine/d3d9/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/buff… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devi… Modified: trunk/reactos/dll/directx/wine/d3d9/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/dire… Modified: trunk/reactos/dll/directx/wine/d3d9/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/quer… Modified: trunk/reactos/dll/directx/wine/d3d9/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/surf… Modified: trunk/reactos/dll/directx/wine/d3d9/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/text… Modified: trunk/reactos/dll/directx/wine/d3d9/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Removed: trunk/reactos/dll/directx/wine/ddraw/ddraw.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Added: trunk/reactos/dll/directx/wine/ddraw/ddraw_classes.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/dev… Modified: trunk/reactos/dll/directx/wine/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/mai… Modified: trunk/reactos/dll/directx/wine/ddraw/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/sur… Modified: trunk/reactos/dll/directx/wine/ddraw/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/uti… Modified: trunk/reactos/dll/directx/wine/ddraw/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ver… Modified: trunk/reactos/dll/directx/wine/ddraw/viewport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/vie… Modified: trunk/reactos/dll/directx/wine/dxgi/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/adap… Modified: trunk/reactos/dll/directx/wine/dxgi/dxgi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/dxgi… Modified: trunk/reactos/dll/directx/wine/dxgi/dxgi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/dxgi… Modified: trunk/reactos/dll/directx/wine/dxgi/dxgi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/dxgi… Modified: trunk/reactos/dll/directx/wine/dxgi/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/fact… Modified: trunk/reactos/dll/directx/wine/dxgi/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/guid… Modified: trunk/reactos/dll/directx/wine/dxgi/output.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/outp… Modified: trunk/reactos/dll/directx/wine/dxgi/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/surf… Modified: trunk/reactos/dll/directx/wine/qedit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/CMa… Modified: trunk/reactos/dll/directx/wine/qedit/qedit_classes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/qed… Modified: trunk/reactos/dll/directx/wine/qedit/samplegrabber.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/sam… Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/cs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/q… Modified: trunk/reactos/dll/directx/wine/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/r… Modified: trunk/reactos/dll/directx/wine/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/u… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/include/reactos/wine/wgl_driver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wgl_d… Modified: trunk/reactos/include/reactos/wine/wined3d.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined… Modified: trunk/reactos/include/reactos/wine/winedxgi.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

10 years, 5 months

[akhaldi] 62810: [QUARTZ_WINETEST] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Apr 19 16:28:22 2014 New Revision: 62810 URL: http://svn.reactos.org/svn/reactos?rev=62810&view=rev Log: [QUARTZ_WINETEST] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/rostests/winetests/quartz/CMakeLists.txt trunk/rostests/winetests/quartz/avisplitter.c trunk/rostests/winetests/quartz/dsoundrender.c trunk/rostests/winetests/quartz/filtergraph.c trunk/rostests/winetests/quartz/filtermapper.c trunk/rostests/winetests/quartz/videorenderer.c Modified: trunk/rostests/winetests/quartz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/CMakeLis… ============================================================================== --- trunk/rostests/winetests/quartz/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/CMakeLists.txt [iso-8859-1] Sat Apr 19 16:28:22 2014 @@ -15,5 +15,8 @@ target_link_libraries(quartz_winetest uuid) add_dependencies(quartz_winetest quartz_test_idlheader) set_module_type(quartz_winetest win32cui) -add_importlibs(quartz_winetest ole32 oleaut32 advapi32 msvcrt kernel32 ntdll) +add_importlibs(quartz_winetest ole32 oleaut32 advapi32 msvcrt kernel32) +if(MSVC) + add_importlibs(quartz_winetest ntdll) +endif() add_cd_file(TARGET quartz_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/quartz/avisplitter.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/avisplit… ============================================================================== --- trunk/rostests/winetests/quartz/avisplitter.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/avisplitter.c [iso-8859-1] Sat Apr 19 16:28:22 2014 @@ -57,7 +57,7 @@ return threads; } -static int create_avisplitter(void) +static BOOL create_avisplitter(void) { HRESULT hr; @@ -128,7 +128,7 @@ ULONG ref; HRESULT hr; - IUnknown_QueryInterface(pAviSplitter, &IID_IBaseFilter, (void *)&base); + IUnknown_QueryInterface(pAviSplitter, &IID_IBaseFilter, (void **)&base); if (base == NULL) { /* test_query_interface handles this case */ Modified: trunk/rostests/winetests/quartz/dsoundrender.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/dsoundre… ============================================================================== --- trunk/rostests/winetests/quartz/dsoundrender.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/dsoundrender.c [iso-8859-1] Sat Apr 19 16:28:22 2014 @@ -39,7 +39,7 @@ static IUnknown *pDSRender = NULL; -static int create_dsound_renderer(void) +static BOOL create_dsound_renderer(void) { HRESULT hr; @@ -179,7 +179,7 @@ ULONG ref; HRESULT hr; - IUnknown_QueryInterface(pDSRender, &IID_IBaseFilter, (void *)&base); + IUnknown_QueryInterface(pDSRender, &IID_IBaseFilter, (void **)&base); if (base == NULL) { /* test_query_interface handles this case */ Modified: trunk/rostests/winetests/quartz/filtergraph.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/filtergr… ============================================================================== --- trunk/rostests/winetests/quartz/filtergraph.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/filtergraph.c [iso-8859-1] Sat Apr 19 16:28:22 2014 @@ -1094,7 +1094,6 @@ pTestFilter->IBaseFilter_iface.lpVtbl = &TestFilter_Vtbl; pTestFilter->refCount = 1; InitializeCriticalSection(&pTestFilter->csFilter); - pTestFilter->csFilter.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": TestFilterImpl.csFilter"); pTestFilter->state = State_Stopped; ZeroMemory(&pTestFilter->filterInfo, sizeof(FILTER_INFO)); @@ -1149,7 +1148,6 @@ } } CoTaskMemFree(pTestFilter->ppPins); - pTestFilter->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&pTestFilter->csFilter); CoTaskMemFree(pTestFilter); @@ -1213,7 +1211,6 @@ CoTaskMemFree(This->ppPins); - This->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csFilter); CoTaskMemFree(This); @@ -1559,9 +1556,10 @@ static const WCHAR wszFilterInstanceName4[] = {'T', 'e', 's', 't', 'f', 'i', 'l', 't', 'e', 'r', 'I', 'n', 's', 't', 'a', 'n', 'c', 'e', '4', 0 }; - /* Test which renderer of two already added to the graph will be chosen (one is "exact" match, other is - "wildcard" match. Seems to very by order in which filters are added to the graph, thus indicating - no preference given to exact match. */ + /* Test which renderer of two already added to the graph will be chosen + * (one is "exact" match, other is "wildcard" match. Seems to depend + * on the order in which filters are added to the graph, thus indicating + * no preference given to exact match. */ hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (LPVOID*)&pgraph2); ok(hr == S_OK, "CoCreateInstance failed with %08x\n", hr); if (!pgraph2) return; @@ -1643,7 +1641,7 @@ ok(hr == E_POINTER, "IFilterGraph2_Disconnect failed. Expected E_POINTER, received %08x\n", hr); get_connected_filter_name(ptestfilter, ConnectedFilterName2); - ok(lstrcmp(ConnectedFilterName1, ConnectedFilterName2), + ok(strcmp(ConnectedFilterName1, ConnectedFilterName2), "expected connected filters to be different but got %s both times\n", ConnectedFilterName1); IFilterGraph2_Release(pgraph2); @@ -1699,7 +1697,7 @@ ok(hr == S_OK, "IFilterGraph2_Render failed with %08x\n", hr); get_connected_filter_name(ptestfilter, ConnectedFilterName1); - ok(!lstrcmp(ConnectedFilterName1, "TestfilterInstance3") || !lstrcmp(ConnectedFilterName1, "TestfilterInstance2"), + ok(!strcmp(ConnectedFilterName1, "TestfilterInstance3") || !strcmp(ConnectedFilterName1, "TestfilterInstance2"), "unexpected connected filter: %s\n", ConnectedFilterName1); IFilterGraph2_Release(pgraph2); @@ -1751,9 +1749,9 @@ ok(hr == S_OK, "IFilterGraph2_Render failed with %08x\n", hr); get_connected_filter_name(ptestfilter, ConnectedFilterName2); - ok(!lstrcmp(ConnectedFilterName2, "TestfilterInstance3") || !lstrcmp(ConnectedFilterName2, "TestfilterInstance2"), + ok(!strcmp(ConnectedFilterName2, "TestfilterInstance3") || !strcmp(ConnectedFilterName2, "TestfilterInstance2"), "unexpected connected filter: %s\n", ConnectedFilterName2); - ok(lstrcmp(ConnectedFilterName1, ConnectedFilterName2), + ok(strcmp(ConnectedFilterName1, ConnectedFilterName2), "expected connected filters to be different but got %s both times\n", ConnectedFilterName1); IFilterGraph2_Release(pgraph2); @@ -1847,7 +1845,7 @@ ok(hr == S_OK, "IFilterGraph2_Render failed with %08x\n", hr); get_connected_filter_name(ptestfilter, ConnectedFilterName1); - ok(!lstrcmp(ConnectedFilterName1, "TestfilterInstance3"), + ok(!strcmp(ConnectedFilterName1, "TestfilterInstance3"), "unexpected connected filter: %s\n", ConnectedFilterName1); } Modified: trunk/rostests/winetests/quartz/filtermapper.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/filterma… ============================================================================== --- trunk/rostests/winetests/quartz/filtermapper.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/filtermapper.c [iso-8859-1] Sat Apr 19 16:28:22 2014 @@ -233,7 +233,7 @@ ok(hr == S_OK, "CoCreateInstance failed with %x\n", hr); if (FAILED(hr)) goto out; - hr = IFilterMapper2_QueryInterface(pMapper2, &IID_IFilterMapper, (LPVOID)&pMapper); + hr = IFilterMapper2_QueryInterface(pMapper2, &IID_IFilterMapper, (void **)&pMapper); ok(hr == S_OK, "IFilterMapper2_QueryInterface failed with %x\n", hr); if (FAILED(hr)) goto out; Modified: trunk/rostests/winetests/quartz/videorenderer.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/videoren… ============================================================================== --- trunk/rostests/winetests/quartz/videorenderer.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/videorenderer.c [iso-8859-1] Sat Apr 19 16:28:22 2014 @@ -110,7 +110,7 @@ ULONG ref; HRESULT hr; - IUnknown_QueryInterface(pVideoRenderer, &IID_IBaseFilter, (void *)&base); + IUnknown_QueryInterface(pVideoRenderer, &IID_IBaseFilter, (void **)&base); if (base == NULL) { /* test_query_interface handles this case */

10 years, 5 months

[akhaldi] 62809: [AMSTREAM][QUARTZ][STRMBASE] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Apr 19 16:26:49 2014 New Revision: 62809 URL: http://svn.reactos.org/svn/reactos?rev=62809&view=rev Log: [AMSTREAM][QUARTZ][STRMBASE] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/directx/wine/amstream/amstream_classes.idl trunk/reactos/dll/directx/wine/amstream/mediastreamfilter.c trunk/reactos/dll/directx/wine/quartz/avisplit.c trunk/reactos/dll/directx/wine/quartz/control_tlb.idl trunk/reactos/dll/directx/wine/quartz/filesource.c trunk/reactos/dll/directx/wine/quartz/filtergraph.c trunk/reactos/dll/directx/wine/quartz/main.c trunk/reactos/dll/directx/wine/quartz/parser.c trunk/reactos/dll/directx/wine/quartz/pin.c trunk/reactos/dll/directx/wine/quartz/quartz_private.h trunk/reactos/dll/directx/wine/quartz/quartz_strmif.idl trunk/reactos/dll/directx/wine/quartz/quartz_strmif.rgs trunk/reactos/dll/directx/wine/quartz/regsvr.c trunk/reactos/dll/directx/wine/quartz/videorenderer.c trunk/reactos/dll/directx/wine/quartz/vmr9.c trunk/reactos/include/reactos/wine/strmbase.h trunk/reactos/lib/3rdparty/strmbase/dllfunc.c trunk/reactos/lib/3rdparty/strmbase/filter.c trunk/reactos/lib/3rdparty/strmbase/pin.c trunk/reactos/lib/3rdparty/strmbase/pospass.c trunk/reactos/lib/3rdparty/strmbase/qualitycontrol.c trunk/reactos/lib/3rdparty/strmbase/renderer.c trunk/reactos/lib/3rdparty/strmbase/transform.c trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/wine/amstream/amstream_classes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/amstream/… Modified: trunk/reactos/dll/directx/wine/amstream/mediastreamfilter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/amstream/… Modified: trunk/reactos/dll/directx/wine/quartz/avisplit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/av… Modified: trunk/reactos/dll/directx/wine/quartz/control_tlb.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/co… Modified: trunk/reactos/dll/directx/wine/quartz/filesource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi… Modified: trunk/reactos/dll/directx/wine/quartz/filtergraph.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi… Modified: trunk/reactos/dll/directx/wine/quartz/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/ma… Modified: trunk/reactos/dll/directx/wine/quartz/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/pa… Modified: trunk/reactos/dll/directx/wine/quartz/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/pi… Modified: trunk/reactos/dll/directx/wine/quartz/quartz_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/qu… Modified: trunk/reactos/dll/directx/wine/quartz/quartz_strmif.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/qu… Modified: trunk/reactos/dll/directx/wine/quartz/quartz_strmif.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/qu… Modified: trunk/reactos/dll/directx/wine/quartz/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/re… Modified: trunk/reactos/dll/directx/wine/quartz/videorenderer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/vi… Modified: trunk/reactos/dll/directx/wine/quartz/vmr9.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/vm… Modified: trunk/reactos/include/reactos/wine/strmbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/strmb… Modified: trunk/reactos/lib/3rdparty/strmbase/dllfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/dllf… Modified: trunk/reactos/lib/3rdparty/strmbase/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/filt… Modified: trunk/reactos/lib/3rdparty/strmbase/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/pin.… Modified: trunk/reactos/lib/3rdparty/strmbase/pospass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/posp… Modified: trunk/reactos/lib/3rdparty/strmbase/qualitycontrol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/qual… Modified: trunk/reactos/lib/3rdparty/strmbase/renderer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/rend… Modified: trunk/reactos/lib/3rdparty/strmbase/transform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/tran… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

10 years, 5 months

← Newer
1
...
25
26
27
28
29
30
31
...
50
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 April 2014