May 2012 - Wine-commits - list.winehq.org

Vincent Povirk : wine.inf: Do not install .NET registry keys and fake dlls.
by Alexandre Julliard 31 May '12

31 May '12

Module: wine Branch: master Commit: 7b54917f28edf84c4d9db2e1a52e4dac67dd7e31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b54917f28edf84c4d9db2e1a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 29 11:05:15 2012 -0500 wine.inf: Do not install .NET registry keys and fake dlls. --- tools/wine.inf.in | 67 ++++++++++++---------------------------------------- 1 files changed, 16 insertions(+), 51 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index d4b53cf..03a748a 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -38,7 +38,6 @@ AddReg=\ ControlPanel,\ CurrentVersion,\ Debugger,\ - Dotnet,\ DirectX,\ Fonts,\ MCI,\ @@ -63,7 +62,6 @@ AddReg=\ ControlPanel,\ CurrentVersion,\ Debugger,\ - Dotnet,\ DirectX,\ Fonts,\ MCI,\ @@ -91,7 +89,6 @@ AddReg=\ CurrentVersion,\ CurrentVersionWow64,\ Debugger,\ - Dotnet,\ DirectX,\ Fonts,\ MCI,\ @@ -114,7 +111,6 @@ AddReg=\ CurrentVersionWow64,\ Debugger,\ DirectX,\ - Dotnet,\ MCI,\ Misc,\ Tapi,\ @@ -514,32 +510,6 @@ HKCU,Control Panel\Desktop\WindowMetrics,SmCaptionHeight,2,"15" HKCU,Control Panel\Desktop\WindowMetrics,SmCaptionWidth,2,"13" HKCU,Control Panel\Mouse,Beep,2,"No" -[DotNet] -HKLM,Software\Microsoft\.NETFramework,"InstallRoot",2,"%10%\Microsoft.NET\Framework\" -HKLM,Software\Microsoft\.NETFramework\policy\v1.0,,16 -HKLM,Software\Microsoft\.NETFramework\policy\v1.1,,16 -HKLM,Software\Microsoft\.NETFramework\policy\v2.0,"50727",2,"50727-50727" -HKLM,Software\Microsoft\.NETFramework\policy\v3.0,,16 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v1.1.4322,Install,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v1.1.4322,SP,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v2.0.50727,Install,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v2.0.50727,SP,0x10003,2 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v2.0.50727,Version,2,2.2.30729 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.0,Install,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.0,SP,0x10003,2 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.0,Version,2,3.2.30729 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.0\Setup,InstallSuccess,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5,Install,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5,SP,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5,Version,2,3.5.30729.01 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5\1033,Install,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Client,Install,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Client,Version,2,4.0.30319 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Client,TargetVersion,2,4.0.0 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Full,Install,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Full,Version,2,4.0.30319 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Full,TargetVersion,2,4.0.0 - [DirectX] HKLM,Software\Microsoft\DirectX,"Version",,"4.09.00.0904" HKLM,Software\Microsoft\DirectX,"InstalledVersion",1,00,00,00,09,00,00,00,00 @@ -696,16 +666,6 @@ HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AA HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},"Locale",2,"*" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},"Version",2,"4,71,1113,0" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{7131646D-CD3C-40F4-97B9-CD9E4E6262EF},,2,".NET Framework" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{7131646D-CD3C-40F4-97B9-CD9E4E6262EF},"ComponentID",2,".NETFramework" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{7131646D-CD3C-40F4-97B9-CD9E4E6262EF},"Locale",2,"" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{7131646D-CD3C-40F4-97B9-CD9E4E6262EF},"Version",2,"2,0,50727,0" - -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{CB2F7EDD-9D1F-43C1-90FC-4F52EAE172A1},,2,".NET Framework" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{CB2F7EDD-9D1F-43C1-90FC-4F52EAE172A1},"ComponentID",2,".NETFramework" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{CB2F7EDD-9D1F-43C1-90FC-4F52EAE172A1},"Locale",2,"" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{CB2F7EDD-9D1F-43C1-90FC-4F52EAE172A1},"Version",2,"1,0,4322,1" - HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},,2,"HTML Help" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"ComponentID",2,"HTMLHelp" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"IsInstalled",2,1 @@ -2537,6 +2497,14 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,iexplore.exe 11,,winetest.exe,- 12,,mountmgr.sys,- +; skip .NET fake dlls in Wine Mono package +11,,aspnet_regiis.exe,- +11,,ngen.exe,- +11,,fusion.dll,- +11,,regsvcs.exe,- +11,,regasm.exe,- +11,,servicemodelreg.exe,- +11,,presentationfontcache.exe,- ; registration order matters for these 11,,msxml.dll 11,,msxml2.dll @@ -2565,6 +2533,14 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,notepad.exe 11,,winetest.exe,- 12,,mountmgr.sys +; skip .NET fake dlls in Wine Mono package +11,,aspnet_regiis.exe,- +11,,ngen.exe,- +11,,fusion.dll,- +11,,regsvcs.exe,- +11,,regasm.exe,- +11,,servicemodelreg.exe,- +11,,presentationfontcache.exe,- ; registration order matters for these 11,,msxml.dll 11,,msxml2.dll @@ -2572,17 +2548,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,msxml4.dll 11,,msxml6.dll 11,,shdocvw.dll -10,Microsoft.NET\Framework\v1.1.4322,aspnet_regiis.exe -10,Microsoft.NET\Framework\v1.1.4322,ngen.exe -10,Microsoft.NET\Framework\v1.1.4322,fusion.dll -10,Microsoft.NET\Framework\v1.1.4322,regsvcs.exe -10,Microsoft.NET\Framework\v2.0.50727,ngen.exe -10,Microsoft.NET\Framework\v2.0.50727,fusion.dll -10,Microsoft.NET\Framework\v2.0.50727,regasm.exe -10,Microsoft.NET\Framework\v3.0\windows communication foundation,servicemodelreg.exe -10,Microsoft.NET\Framework\v3.0\wpf,presentationfontcache.exe -10,Microsoft.NET\Framework\v4.0.30319,ngen.exe -10,Microsoft.NET\Framework\v4.0.30319,fusion.dll 11,gecko\plugin,npmshtml.dll 11,wbem,mofcomp.exe 16422,Internet Explorer,iexplore.exe

1 0

Alexandre Julliard : gdi32: Make sure the bounds are always updated in ExtTextOutW.
by Alexandre Julliard 31 May '12

31 May '12

Module: wine Branch: master Commit: af4871f862a224452e06c1d4c1c465d6dfa54e66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af4871f862a224452e06c1d4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 23 17:49:59 2012 +0200 gdi32: Make sure the bounds are always updated in ExtTextOutW. --- dlls/gdi32/dibdrv/graphics.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 835f7d7..0237acf 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -675,7 +675,7 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, free_clipped_rects( &clipped_rects ); get_clipped_rects( &pdev->dib, NULL, pdev->clip, &clipped_rects ); } - if (!clipped_rects.count) return TRUE; + if (!clipped_rects.count) goto done; text_color = get_pixel_color( pdev, GetTextColor( pdev->dev.hdc ), TRUE ); get_aa_ranges( pdev->dib.funcs->pixel_to_colorref( &pdev->dib, text_color ), ranges ); @@ -712,9 +712,9 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, origin.y += metrics.gmCellIncY; } } - add_clipped_bounds( pdev, &bounds, pdev->clip ); done: + add_clipped_bounds( pdev, &bounds, pdev->clip ); free_clipped_rects( &clipped_rects ); return TRUE; }

1 0

Alexandre Julliard : gdi32: Move DC hook private definitions out of wingdi. h.
by Alexandre Julliard 31 May '12

31 May '12

Module: wine Branch: master Commit: f1bf4ea3fc7386d0aec24d8e735f4595da0d3577 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1bf4ea3fc7386d0aec24d8e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 31 11:44:23 2012 +0200 gdi32: Move DC hook private definitions out of wingdi.h. --- dlls/gdi.exe16/gdi.c | 3 ++- dlls/user32/painting.c | 1 + dlls/user32/sysparams.c | 1 + include/wine/gdi_driver.h | 16 ++++++++++++++++ include/wingdi.h | 19 ------------------- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/gdi.exe16/gdi.c b/dlls/gdi.exe16/gdi.c index 4eff2bc..45c2c78 100644 --- a/dlls/gdi.exe16/gdi.c +++ b/dlls/gdi.exe16/gdi.c @@ -2017,7 +2017,8 @@ DWORD WINAPI GetDCHook16( HDC16 hdc16, FARPROC16 *phookProc ) */ WORD WINAPI SetHookFlags16( HDC16 hdc, WORD flags ) { - return SetHookFlags( HDC_32(hdc), flags ); + FIXME( "%04x %x: not supported\n", hdc, flags ); + return 0; } diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 60252c6..5a3614c 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -36,6 +36,7 @@ #include "win.h" #include "user_private.h" #include "controls.h" +#include "wine/gdi_driver.h" #include "wine/list.h" #include "wine/debug.h" diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 6a80687..fecaeda 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -39,6 +39,7 @@ #include "controls.h" #include "user_private.h" +#include "wine/gdi_driver.h" #include "wine/unicode.h" #include "wine/debug.h" diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index fffc459..5568eaa 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -235,4 +235,20 @@ static inline void push_dc_driver( PHYSDEV *dev, PHYSDEV physdev, const struct g *dev = physdev; } +/* the DC hook support is only exported on Win16, the 32-bit version is a Wine extension */ + +#define DCHC_INVALIDVISRGN 0x0001 +#define DCHC_DELETEDC 0x0002 +#define DCHF_INVALIDATEVISRGN 0x0001 +#define DCHF_VALIDATEVISRGN 0x0002 + +typedef BOOL (CALLBACK *DCHOOKPROC)(HDC,WORD,DWORD_PTR,LPARAM); + +WINGDIAPI DWORD_PTR WINAPI GetDCHook(HDC,DCHOOKPROC*); +WINGDIAPI BOOL WINAPI SetDCHook(HDC,DCHOOKPROC,DWORD_PTR); +WINGDIAPI WORD WINAPI SetHookFlags(HDC,WORD); + +extern void CDECL __wine_make_gdi_object_system( HGDIOBJ handle, BOOL set ); +extern void CDECL __wine_set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect ); + #endif /* __WINE_WINE_GDI_DRIVER_H */ diff --git a/include/wingdi.h b/include/wingdi.h index 2f9fa08..858d3c1 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3785,25 +3785,6 @@ WINGDIAPI BOOL WINAPI wglUseFontOutlinesA(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,I WINGDIAPI BOOL WINAPI wglUseFontOutlinesW(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,INT,LPGLYPHMETRICSFLOAT); #define wglUseFontOutlines WINELIB_NAME_AW(wglUseFontOutlines) -#ifdef __WINESRC__ -/* the DC hook support is only exported on Win16, the 32-bit version is a Wine extension */ - -#define DCHC_INVALIDVISRGN 0x0001 -#define DCHC_DELETEDC 0x0002 -#define DCHF_INVALIDATEVISRGN 0x0001 -#define DCHF_VALIDATEVISRGN 0x0002 - -typedef BOOL (CALLBACK *DCHOOKPROC)(HDC,WORD,DWORD_PTR,LPARAM); - -WINGDIAPI DWORD_PTR WINAPI GetDCHook(HDC,DCHOOKPROC*); -WINGDIAPI BOOL WINAPI SetDCHook(HDC,DCHOOKPROC,DWORD_PTR); -WINGDIAPI WORD WINAPI SetHookFlags(HDC,WORD); - -extern void CDECL __wine_make_gdi_object_system( HGDIOBJ handle, BOOL set ); -extern void CDECL __wine_set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect ); - -#endif /* __WINESRC__ */ - #ifdef __cplusplus } #endif

1 0

Vincent Povirk : windowscodecs: Add tests for IWICMetadataBlockReader on handler classes.
by Alexandre Julliard 31 May '12

31 May '12

Module: wine Branch: master Commit: a6bf3735f28db26f73241f0e422fbeb9941741bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6bf3735f28db26f73241f0e4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 30 14:52:53 2012 -0500 windowscodecs: Add tests for IWICMetadataBlockReader on handler classes. --- dlls/windowscodecs/tests/metadata.c | 43 +++++++++++++++++++++++++++++++++++ include/wincodecsdk.idl | 2 + 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 721b10e..5cde494 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -156,6 +156,7 @@ static void test_metadata_unknown(void) HRESULT hr; IWICMetadataReader *reader; IWICEnumMetadataItem *enumerator; + IWICMetadataBlockReader *blockreader; PROPVARIANT schema, id, value; ULONG items_returned; @@ -197,6 +198,12 @@ static void test_metadata_unknown(void) IWICEnumMetadataItem_Release(enumerator); } + hr = IWICMetadataReader_QueryInterface(reader, &IID_IWICMetadataBlockReader, (void**)&blockreader); + todo_wine ok(hr == E_NOINTERFACE, "QueryInterface failed, hr=%x\n", hr); + + if (SUCCEEDED(hr)) + IWICMetadataBlockReader_Release(blockreader); + IWICMetadataReader_Release(reader); } @@ -335,6 +342,7 @@ static void test_metadata_IFD(void) }; HRESULT hr; IWICMetadataReader *reader; + IWICMetadataBlockReader *blockreader; IWICEnumMetadataItem *enumerator; PROPVARIANT schema, id, value; ULONG items_returned, count, i; @@ -427,6 +435,40 @@ static void test_metadata_IFD(void) hr = IWICMetadataReader_GetValueByIndex(reader, count, &schema, NULL, NULL); ok(hr == E_INVALIDARG, "GetValueByIndex should fail\n"); + hr = IWICMetadataReader_QueryInterface(reader, &IID_IWICMetadataBlockReader, (void**)&blockreader); + ok(hr == E_NOINTERFACE, "QueryInterface failed, hr=%x\n", hr); + + if (SUCCEEDED(hr)) + IWICMetadataBlockReader_Release(blockreader); + + IWICMetadataReader_Release(reader); +} + +static void test_metadata_Exif(void) +{ + HRESULT hr; + IWICMetadataReader *reader; + IWICMetadataBlockReader *blockreader; + UINT count=0; + + hr = CoCreateInstance(&CLSID_WICExifMetadataReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICMetadataReader, (void**)&reader); + todo_wine ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); + if (FAILED(hr)) return; + + hr = IWICMetadataReader_GetCount(reader, NULL); + ok(hr == E_INVALIDARG, "GetCount error %#x\n", hr); + + hr = IWICMetadataReader_GetCount(reader, &count); + ok(hr == S_OK, "GetCount error %#x\n", hr); + ok(count == 0, "unexpected count %u\n", count); + + hr = IWICMetadataReader_QueryInterface(reader, &IID_IWICMetadataBlockReader, (void**)&blockreader); + ok(hr == E_NOINTERFACE, "QueryInterface failed, hr=%x\n", hr); + + if (SUCCEEDED(hr)) + IWICMetadataBlockReader_Release(blockreader); + IWICMetadataReader_Release(reader); } @@ -495,6 +537,7 @@ START_TEST(metadata) test_metadata_unknown(); test_metadata_tEXt(); test_metadata_IFD(); + test_metadata_Exif(); test_create_reader(); CoUninitialize(); diff --git a/include/wincodecsdk.idl b/include/wincodecsdk.idl index 5cca0a5..55e3654 100644 --- a/include/wincodecsdk.idl +++ b/include/wincodecsdk.idl @@ -38,12 +38,14 @@ typedef enum WICMetadataCreationOptions { cpp_quote("DEFINE_GUID(GUID_MetadataFormatUnknown, 0xa45e592f,0x9078,0x4a7c,0xad,0xb5,0x4e,0xdc,0x4f,0xd6,0x1b,0x1f);") cpp_quote("DEFINE_GUID(GUID_MetadataFormatChunktEXt, 0x568d8936,0xc0a9,0x4923,0x90,0x5d,0xdf,0x2b,0x38,0x23,0x8f,0xbc);") cpp_quote("DEFINE_GUID(GUID_MetadataFormatIfd, 0x537396c6,0x2d8a,0x4bb6,0x9b,0xf8,0x2f,0x0a,0x8e,0x2a,0x3a,0xdf);") +cpp_quote("DEFINE_GUID(GUID_MetadataFormatExif, 0x1c3c4f9d,0xb84a,0x467d,0x94,0x93,0x36,0xcf,0xbd,0x59,0xea,0x57);") cpp_quote("DEFINE_GUID(CLSID_WICUnknownMetadataReader, 0x699745c2,0x5066,0x4b82,0xa8,0xe3,0xd4,0x04,0x78,0xdb,0xec,0x8c);") cpp_quote("DEFINE_GUID(CLSID_WICUnknownMetadataWriter, 0xa09cca86,0x27ba,0x4f39,0x90,0x53,0x12,0x1f,0xa4,0xdc,0x08,0xfc);") cpp_quote("DEFINE_GUID(CLSID_WICPngTextMetadataReader, 0x4b59afcc,0xb8c3,0x408a,0xb6,0x70,0x89,0xe5,0xfa,0xb6,0xfd,0xa7);") cpp_quote("DEFINE_GUID(CLSID_WICPngTextMetadataWriter, 0xb5ebafb9,0x253e,0x4a72,0xa7,0x44,0x07,0x62,0xd2,0x68,0x56,0x83);") cpp_quote("DEFINE_GUID(CLSID_WICIfdMetadataReader, 0x8f914656,0x9d0a,0x4eb2,0x90,0x19,0x0b,0xf9,0x6d,0x8a,0x9e,0xe6);") +cpp_quote("DEFINE_GUID(CLSID_WICExifMetadataReader, 0xd9403860,0x297f,0x4a49,0xbf,0x9b,0x77,0x89,0x81,0x50,0xa4,0x42);") [ object,

1 0

Vincent Povirk : Revert "windowscodecs: Add a stubbed out IWICMetadataBlockReader interface.".
by Alexandre Julliard 31 May '12

31 May '12

Module: wine Branch: master Commit: 568233621f03d0f36d8f060f3a41eaa12dbeff32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=568233621f03d0f36d8f060f3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 30 14:55:35 2012 -0500 Revert "windowscodecs: Add a stubbed out IWICMetadataBlockReader interface.". This reverts commit 882c1026a865a703711f2d78235075320b02f48c. --- dlls/windowscodecs/metadatahandler.c | 69 ---------------------------------- dlls/windowscodecs/tests/metadata.c | 2 +- 2 files changed, 1 insertions(+), 70 deletions(-) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index ffe6763..afcff21 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -39,7 +39,6 @@ typedef struct MetadataHandler { IWICMetadataWriter IWICMetadataWriter_iface; LONG ref; IWICPersistStream IWICPersistStream_iface; - IWICMetadataBlockReader IWICMetadataBlockReader_iface; const MetadataHandlerVtbl *vtable; MetadataItem *items; DWORD item_count; @@ -56,11 +55,6 @@ static inline MetadataHandler *impl_from_IWICPersistStream(IWICPersistStream *if return CONTAINING_RECORD(iface, MetadataHandler, IWICPersistStream_iface); } -static inline MetadataHandler *impl_from_IWICMetadataBlockReader(IWICMetadataBlockReader *iface) -{ - return CONTAINING_RECORD(iface, MetadataHandler, IWICMetadataBlockReader_iface); -} - static void MetadataHandler_FreeItems(MetadataHandler *This) { int i; @@ -98,10 +92,6 @@ static HRESULT WINAPI MetadataHandler_QueryInterface(IWICMetadataWriter *iface, { *ppv = &This->IWICPersistStream_iface; } - else if (IsEqualIID(&IID_IWICMetadataBlockReader, iid)) - { - *ppv = &This->IWICMetadataBlockReader_iface; - } else { *ppv = NULL; @@ -327,64 +317,6 @@ static const IWICPersistStreamVtbl MetadataHandler_PersistStream_Vtbl = { MetadataHandler_SaveEx }; -static HRESULT WINAPI MetadataHandler_MetadataBlockReader_QueryInterface(IWICMetadataBlockReader *iface, - REFIID iid, void **ppv) -{ - MetadataHandler *This = impl_from_IWICMetadataBlockReader(iface); - return IWICMetadataWriter_QueryInterface(&This->IWICMetadataWriter_iface, iid, ppv); -} - -static ULONG WINAPI MetadataHandler_MetadataBlockReader_AddRef(IWICMetadataBlockReader *iface) -{ - MetadataHandler *This = impl_from_IWICMetadataBlockReader(iface); - return IWICMetadataWriter_AddRef(&This->IWICMetadataWriter_iface); -} - -static ULONG WINAPI MetadataHandler_MetadataBlockReader_Release(IWICMetadataBlockReader *iface) -{ - MetadataHandler *This = impl_from_IWICMetadataBlockReader(iface); - return IWICMetadataWriter_Release(&This->IWICMetadataWriter_iface); -} - -static HRESULT WINAPI MetadataHandler_MetadataBlockReader_GetContainerFormat( - IWICMetadataBlockReader *iface, GUID *guid) -{ - FIXME("(%p,%p): stub\n", iface, guid); - return E_NOTIMPL; -} - -static HRESULT WINAPI MetadataHandler_MetadataBlockReader_GetCount( - IWICMetadataBlockReader *iface, UINT *count) -{ - FIXME("(%p,%p): stub\n", iface, count); - return E_NOTIMPL; -} - -static HRESULT WINAPI MetadataHandler_MetadataBlockReader_GetReaderByIndex( - IWICMetadataBlockReader *iface, UINT index, IWICMetadataReader **reader) -{ - FIXME("(%p,%u,%p): stub\n", iface, index, reader); - return E_NOTIMPL; -} - -static HRESULT WINAPI MetadataHandler_MetadataBlockReader_GetEnumerator( - IWICMetadataBlockReader *iface, IEnumUnknown **enum_metadata) -{ - FIXME("(%p,%p): stub\n", iface, enum_metadata); - return E_NOTIMPL; -} - -static const IWICMetadataBlockReaderVtbl MetadataHandler_MetadataBlockReader_Vtbl = -{ - MetadataHandler_MetadataBlockReader_QueryInterface, - MetadataHandler_MetadataBlockReader_AddRef, - MetadataHandler_MetadataBlockReader_Release, - MetadataHandler_MetadataBlockReader_GetContainerFormat, - MetadataHandler_MetadataBlockReader_GetCount, - MetadataHandler_MetadataBlockReader_GetReaderByIndex, - MetadataHandler_MetadataBlockReader_GetEnumerator -}; - HRESULT MetadataReader_Create(const MetadataHandlerVtbl *vtable, IUnknown *pUnkOuter, REFIID iid, void** ppv) { MetadataHandler *This; @@ -401,7 +333,6 @@ HRESULT MetadataReader_Create(const MetadataHandlerVtbl *vtable, IUnknown *pUnkO This->IWICMetadataWriter_iface.lpVtbl = &MetadataHandler_Vtbl; This->IWICPersistStream_iface.lpVtbl = &MetadataHandler_PersistStream_Vtbl; - This->IWICMetadataBlockReader_iface.lpVtbl = &MetadataHandler_MetadataBlockReader_Vtbl; This->ref = 1; This->vtable = vtable; This->items = NULL; diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 5cde494..1292bbf 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -199,7 +199,7 @@ static void test_metadata_unknown(void) } hr = IWICMetadataReader_QueryInterface(reader, &IID_IWICMetadataBlockReader, (void**)&blockreader); - todo_wine ok(hr == E_NOINTERFACE, "QueryInterface failed, hr=%x\n", hr); + ok(hr == E_NOINTERFACE, "QueryInterface failed, hr=%x\n", hr); if (SUCCEEDED(hr)) IWICMetadataBlockReader_Release(blockreader);

1 0

Juan Lang : crypt32/tests: Don' t shadow a variable with a variable of a different type.
by Alexandre Julliard 31 May '12

31 May '12

Module: wine Branch: master Commit: 03e409bbd2bdea748e2e2d6b44a63091688bb59c URL: http://source.winehq.org/git/wine.git/?a=commit;h=03e409bbd2bdea748e2e2d6b4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu May 17 15:55:16 2012 -0700 crypt32/tests: Don't shadow a variable with a variable of a different type. --- dlls/crypt32/tests/cert.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 9678053..6e46a57 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2098,7 +2098,6 @@ static void testCreateSelfSignCert(void) if (context) { DWORD size = 0; - PCRYPT_KEY_PROV_INFO info; /* The context must have a key provider info property */ ret = CertGetCertificateContextProperty(context, @@ -2106,24 +2105,25 @@ static void testCreateSelfSignCert(void) ok(ret && size, "Expected non-zero key provider info\n"); if (size) { - info = HeapAlloc(GetProcessHeap(), 0, size); - if (info) + PCRYPT_KEY_PROV_INFO pInfo = HeapAlloc(GetProcessHeap(), 0, size); + + if (pInfo) { ret = CertGetCertificateContextProperty(context, - CERT_KEY_PROV_INFO_PROP_ID, info, &size); + CERT_KEY_PROV_INFO_PROP_ID, pInfo, &size); ok(ret, "CertGetCertificateContextProperty failed: %08x\n", GetLastError()); if (ret) { /* Sanity-check the key provider */ - ok(!lstrcmpW(info->pwszContainerName, cspNameW), + ok(!lstrcmpW(pInfo->pwszContainerName, cspNameW), "Unexpected key container\n"); - ok(!lstrcmpW(info->pwszProvName, MS_DEF_PROV_W), + ok(!lstrcmpW(pInfo->pwszProvName, MS_DEF_PROV_W), "Unexpected provider\n"); - ok(info->dwKeySpec == AT_SIGNATURE, - "Expected AT_SIGNATURE, got %d\n", info->dwKeySpec); + ok(pInfo->dwKeySpec == AT_SIGNATURE, + "Expected AT_SIGNATURE, got %d\n", pInfo->dwKeySpec); } - HeapFree(GetProcessHeap(), 0, info); + HeapFree(GetProcessHeap(), 0, pInfo); } } @@ -2152,7 +2152,6 @@ static void testCreateSelfSignCert(void) if (context) { DWORD size = 0; - PCRYPT_KEY_PROV_INFO info; /* The context must have a key provider info property */ ret = CertGetCertificateContextProperty(context, @@ -2160,24 +2159,25 @@ static void testCreateSelfSignCert(void) ok(ret && size, "Expected non-zero key provider info\n"); if (size) { - info = HeapAlloc(GetProcessHeap(), 0, size); - if (info) + PCRYPT_KEY_PROV_INFO pInfo = HeapAlloc(GetProcessHeap(), 0, size); + + if (pInfo) { ret = CertGetCertificateContextProperty(context, - CERT_KEY_PROV_INFO_PROP_ID, info, &size); + CERT_KEY_PROV_INFO_PROP_ID, pInfo, &size); ok(ret, "CertGetCertificateContextProperty failed: %08x\n", GetLastError()); if (ret) { /* Sanity-check the key provider */ - ok(!lstrcmpW(info->pwszContainerName, cspNameW), + ok(!lstrcmpW(pInfo->pwszContainerName, cspNameW), "Unexpected key container\n"); - ok(!lstrcmpW(info->pwszProvName, MS_DEF_PROV_W), + ok(!lstrcmpW(pInfo->pwszProvName, MS_DEF_PROV_W), "Unexpected provider\n"); - ok(info->dwKeySpec == AT_KEYEXCHANGE, - "Expected AT_KEYEXCHANGE, got %d\n", info->dwKeySpec); + ok(pInfo->dwKeySpec == AT_KEYEXCHANGE, + "Expected AT_KEYEXCHANGE, got %d\n", pInfo->dwKeySpec); } - HeapFree(GetProcessHeap(), 0, info); + HeapFree(GetProcessHeap(), 0, pInfo); } }

1 0

Juan Lang : crypt32/tests: Add more tests of CertCreateSelfSignCertificate and the CERT_KEY_PROV_INFO parameter .
by Alexandre Julliard 31 May '12

31 May '12

Module: wine Branch: master Commit: ecfa9b87a0c552ffc3146b5314e62768f9a8a5c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecfa9b87a0c552ffc3146b531… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri May 18 15:19:31 2012 -0700 crypt32/tests: Add more tests of CertCreateSelfSignCertificate and the CERT_KEY_PROV_INFO parameter. --- dlls/crypt32/tests/cert.c | 71 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 70 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 6e46a57..52d3013 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2138,13 +2138,82 @@ static void testCreateSelfSignCert(void) CRYPT_DELETEKEYSET); ok(ret, "CryptAcquireContext failed: %08x\n", GetLastError()); + /* Do the same test with a CSP, AT_KEYEXCHANGE and key info */ + pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL, + CRYPT_DELETEKEYSET); + ret = pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL, + CRYPT_NEWKEYSET); + ok(ret, "CryptAcquireContext failed: %08x\n", GetLastError()); + ret = CryptGenKey(csp, AT_SIGNATURE, 0, &key); + ok(ret, "CryptGenKey failed: %08x\n", GetLastError()); - /* do the same test with AT_KEYEXCHANGE and key info*/ memset(&info,0,sizeof(info)); info.dwProvType = PROV_RSA_FULL; info.dwKeySpec = AT_KEYEXCHANGE; info.pwszProvName = (LPWSTR) MS_DEF_PROV_W; info.pwszContainerName = cspNameW; + /* This should fail because the CSP doesn't have the specified key. */ + SetLastError(0xdeadbeef); + context = pCertCreateSelfSignCertificate(csp, &name, 0, &info, NULL, NULL, + NULL, NULL); + ok(context == NULL, "expected failure\n"); + if (context != NULL) + CertFreeCertificateContext(context); + else + todo_wine + ok(GetLastError() == NTE_NO_KEY, "expected NTE_NO_KEY, got %08x\n", + GetLastError()); + /* Again, with a CSP, AT_SIGNATURE and key info */ + info.dwKeySpec = AT_SIGNATURE; + SetLastError(0xdeadbeef); + context = pCertCreateSelfSignCertificate(csp, &name, 0, &info, NULL, NULL, + NULL, NULL); + todo_wine + ok(context != NULL, + "CertCreateSelfSignCertificate failed: %08x\n", GetLastError()); + if (context) + { + DWORD size = 0; + + /* The context must have a key provider info property */ + ret = CertGetCertificateContextProperty(context, + CERT_KEY_PROV_INFO_PROP_ID, NULL, &size); + ok(ret && size, "Expected non-zero key provider info\n"); + if (size) + { + PCRYPT_KEY_PROV_INFO pInfo = HeapAlloc(GetProcessHeap(), 0, size); + + if (pInfo) + { + ret = CertGetCertificateContextProperty(context, + CERT_KEY_PROV_INFO_PROP_ID, pInfo, &size); + ok(ret, "CertGetCertificateContextProperty failed: %08x\n", + GetLastError()); + if (ret) + { + /* Sanity-check the key provider */ + ok(!lstrcmpW(pInfo->pwszContainerName, cspNameW), + "Unexpected key container\n"); + ok(!lstrcmpW(pInfo->pwszProvName, MS_DEF_PROV_W), + "Unexpected provider\n"); + ok(pInfo->dwKeySpec == AT_SIGNATURE, + "Expected AT_SIGNATURE, got %d\n", pInfo->dwKeySpec); + } + HeapFree(GetProcessHeap(), 0, pInfo); + } + } + + CertFreeCertificateContext(context); + } + CryptDestroyKey(key); + + CryptReleaseContext(csp, 0); + ret = pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL, + CRYPT_DELETEKEYSET); + ok(ret, "CryptAcquireContext failed: %08x\n", GetLastError()); + + /* Do the same test with no CSP, AT_KEYEXCHANGE and key info */ + info.dwKeySpec = AT_KEYEXCHANGE; context = pCertCreateSelfSignCertificate(0, &name, 0, &info, NULL, NULL, NULL, NULL); ok(context != NULL, "CertCreateSelfSignCertificate failed: %08x\n",

1 0

Juan Lang : crypt32: Don' t fail if HCRYPTPROV and PCRYPT_KEY_PROV_INFO parameters are both non-NULL.
by Alexandre Julliard 31 May '12

31 May '12

Module: wine Branch: master Commit: 6ccdbab6c860546a80c7dd1eab34e8b64bdb8ec6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ccdbab6c860546a80c7dd1ea… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri May 18 15:27:52 2012 -0700 crypt32: Don't fail if HCRYPTPROV and PCRYPT_KEY_PROV_INFO parameters are both non-NULL. --- dlls/crypt32/cert.c | 5 ----- dlls/crypt32/tests/cert.c | 3 +-- 2 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 557a17b..be7d07c 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -3201,11 +3201,6 @@ PCCERT_CONTEXT WINAPI CertCreateSelfSignCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HAN releaseContext = TRUE; } } - else if (pKeyProvInfo) - { - SetLastError(ERROR_INVALID_PARAMETER); - return NULL; - } CryptExportPublicKeyInfo(hProv, dwKeySpec, X509_ASN_ENCODING, NULL, &pubKeySize); diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 52d3013..92a92b5 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2156,11 +2156,11 @@ static void testCreateSelfSignCert(void) SetLastError(0xdeadbeef); context = pCertCreateSelfSignCertificate(csp, &name, 0, &info, NULL, NULL, NULL, NULL); + todo_wine ok(context == NULL, "expected failure\n"); if (context != NULL) CertFreeCertificateContext(context); else - todo_wine ok(GetLastError() == NTE_NO_KEY, "expected NTE_NO_KEY, got %08x\n", GetLastError()); /* Again, with a CSP, AT_SIGNATURE and key info */ @@ -2168,7 +2168,6 @@ static void testCreateSelfSignCert(void) SetLastError(0xdeadbeef); context = pCertCreateSelfSignCertificate(csp, &name, 0, &info, NULL, NULL, NULL, NULL); - todo_wine ok(context != NULL, "CertCreateSelfSignCertificate failed: %08x\n", GetLastError()); if (context)

1 0

Juan Lang : crypt32: Fail earlier if CryptExportPublicKeyInfo fails.
by Alexandre Julliard 31 May '12

31 May '12

Module: wine Branch: master Commit: da53cfc8bb15813fc6870d82aac059d50b95ccac URL: http://source.winehq.org/git/wine.git/?a=commit;h=da53cfc8bb15813fc6870d82a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri May 18 15:29:03 2012 -0700 crypt32: Fail earlier if CryptExportPublicKeyInfo fails. --- dlls/crypt32/cert.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index be7d07c..2d6697c 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -3202,8 +3202,10 @@ PCCERT_CONTEXT WINAPI CertCreateSelfSignCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HAN } } - CryptExportPublicKeyInfo(hProv, dwKeySpec, X509_ASN_ENCODING, NULL, + ret = CryptExportPublicKeyInfo(hProv, dwKeySpec, X509_ASN_ENCODING, NULL, &pubKeySize); + if (!ret) + goto end; pubKey = CryptMemAlloc(pubKeySize); if (pubKey) { @@ -3237,6 +3239,7 @@ PCCERT_CONTEXT WINAPI CertCreateSelfSignCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HAN } CryptMemFree(pubKey); } +end: if (releaseContext) CryptReleaseContext(hProv, 0); return context;

1 0

Juan Lang : crypt32/tests: Add more tests for CertCreateSelfSignCertificate .
by Alexandre Julliard 31 May '12

31 May '12

Module: wine Branch: master Commit: 1a03839bf0b64b62e232bae1f761f5b3b383975d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a03839bf0b64b62e232bae1f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed May 30 13:49:38 2012 -0700 crypt32/tests: Add more tests for CertCreateSelfSignCertificate. --- dlls/crypt32/tests/cert.c | 80 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 80 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 92a92b5..5d95711 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2254,6 +2254,86 @@ static void testCreateSelfSignCert(void) pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL, CRYPT_DELETEKEYSET); + + /* Acquire a CSP and generate an AT_KEYEXCHANGE key in it. */ + pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL, + CRYPT_DELETEKEYSET); + ret = pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL, + CRYPT_NEWKEYSET); + ok(ret, "CryptAcquireContext failed: %08x\n", GetLastError()); + + context = pCertCreateSelfSignCertificate(csp, &name, 0, NULL, NULL, NULL, + NULL, NULL); + ok(!context && GetLastError() == NTE_NO_KEY, + "Expected NTE_NO_KEY, got %08x\n", GetLastError()); + ret = CryptGenKey(csp, AT_KEYEXCHANGE, 0, &key); + ok(ret, "CryptGenKey failed: %08x\n", GetLastError()); + + memset(&info,0,sizeof(info)); + info.dwProvType = PROV_RSA_FULL; + info.dwKeySpec = AT_SIGNATURE; + info.pwszProvName = (LPWSTR) MS_DEF_PROV_W; + info.pwszContainerName = cspNameW; + /* This should fail because the CSP doesn't have the specified key. */ + SetLastError(0xdeadbeef); + context = pCertCreateSelfSignCertificate(csp, &name, 0, &info, NULL, NULL, + NULL, NULL); + todo_wine + ok(context == NULL, "expected failure\n"); + if (context != NULL) + CertFreeCertificateContext(context); + else + ok(GetLastError() == NTE_NO_KEY, "expected NTE_NO_KEY, got %08x\n", + GetLastError()); + /* Again, with a CSP, AT_KEYEXCHANGE and key info. This succeeds because the + * CSP has an AT_KEYEXCHANGE key in it. + */ + info.dwKeySpec = AT_KEYEXCHANGE; + SetLastError(0xdeadbeef); + context = pCertCreateSelfSignCertificate(csp, &name, 0, &info, NULL, NULL, + NULL, NULL); + ok(context != NULL, + "CertCreateSelfSignCertificate failed: %08x\n", GetLastError()); + if (context) + { + DWORD size = 0; + + /* The context must have a key provider info property */ + ret = CertGetCertificateContextProperty(context, + CERT_KEY_PROV_INFO_PROP_ID, NULL, &size); + ok(ret && size, "Expected non-zero key provider info\n"); + if (size) + { + PCRYPT_KEY_PROV_INFO pInfo = HeapAlloc(GetProcessHeap(), 0, size); + + if (pInfo) + { + ret = CertGetCertificateContextProperty(context, + CERT_KEY_PROV_INFO_PROP_ID, pInfo, &size); + ok(ret, "CertGetCertificateContextProperty failed: %08x\n", + GetLastError()); + if (ret) + { + /* Sanity-check the key provider */ + ok(!lstrcmpW(pInfo->pwszContainerName, cspNameW), + "Unexpected key container\n"); + ok(!lstrcmpW(pInfo->pwszProvName, MS_DEF_PROV_W), + "Unexpected provider\n"); + ok(pInfo->dwKeySpec == AT_KEYEXCHANGE, + "Expected AT_KEYEXCHANGE, got %d\n", pInfo->dwKeySpec); + } + HeapFree(GetProcessHeap(), 0, pInfo); + } + } + + CertFreeCertificateContext(context); + } + + CryptReleaseContext(csp, 0); + ret = pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL, + CRYPT_DELETEKEYSET); + ok(ret, "CryptAcquireContext failed: %08x\n", GetLastError()); + } static void testIntendedKeyUsage(void)

1 0