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

Huw Davies : wineps: Fix top-down dib pattern brushes.
by Alexandre Julliard May 17, 2012

May 17, 2012

Module: wine Branch: master Commit: c5697ff4b106cb08ea74ce6f7f94651fdf6ddc5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5697ff4b106cb08ea74ce6f7… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 17 14:42:12 2012 +0100 wineps: Fix top-down dib pattern brushes. --- dlls/wineps.drv/ps.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 4a391cc..2e7597a 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -20,6 +20,7 @@ #include <ctype.h> #include <stdio.h> +#include <stdlib.h> #include <string.h> #include <stdarg.h> #include <locale.h> @@ -889,7 +890,7 @@ BOOL PSDRV_WriteDIBPatternDict(PHYSDEV dev, const BITMAPINFO *bmi, BYTE *bits, U " %d %d scale\n mypat image\n end\n }\n>>\n matrix makepattern setpattern\n"; PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); char *buf, *ptr; - INT w, h, x, y, w_mult, h_mult; + INT w, h, x, y, w_mult, h_mult, abs_height = abs( bmi->bmiHeader.biHeight ); COLORREF map[2]; TRACE( "size %dx%dx%d\n", @@ -901,7 +902,7 @@ BOOL PSDRV_WriteDIBPatternDict(PHYSDEV dev, const BITMAPINFO *bmi, BYTE *bits, U } w = bmi->bmiHeader.biWidth & ~0x7; - h = bmi->bmiHeader.biHeight & ~0x7; + h = abs_height & ~0x7; buf = HeapAlloc( GetProcessHeap(), 0, sizeof(do_pattern) + 100 ); ptr = buf; @@ -913,7 +914,7 @@ BOOL PSDRV_WriteDIBPatternDict(PHYSDEV dev, const BITMAPINFO *bmi, BYTE *bits, U } } PSDRV_WriteSpool(dev, mypat, sizeof(mypat) - 1); - PSDRV_WriteImageDict(dev, 1, 8, 8, buf, FALSE); + PSDRV_WriteImageDict(dev, 1, 8, 8, buf, bmi->bmiHeader.biHeight < 0); PSDRV_WriteSpool(dev, "def\n", 4); PSDRV_WriteIndexColorSpaceBegin(dev, 1);

1 0

Piotr Caban : comctl32: Don't make separator on first position hot.
by Alexandre Julliard May 17, 2012

May 17, 2012

Module: wine Branch: master Commit: 99ff5683f3333f390417ed4c28dcf65b0a56ad6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=99ff5683f3333f390417ed4c2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 17 12:22:55 2012 +0200 comctl32: Don't make separator on first position hot. --- dlls/comctl32/toolbar.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 9807745..da13aa2 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5485,7 +5485,7 @@ TOOLBAR_LButtonDown (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) ScreenToClient(infoPtr->hwndSelf, &pt); nHit = TOOLBAR_InternalHitTest(infoPtr, &pt, &button); if (!infoPtr->bAnchor || button) - TOOLBAR_SetHotItemEx(infoPtr, nHit, HICF_MOUSE | HICF_LMOUSE); + TOOLBAR_SetHotItemEx(infoPtr, button ? nHit : TOOLBAR_NOWHERE, HICF_MOUSE | HICF_LMOUSE); /* remove any left mouse button down or double-click messages * so that we can get a toggle effect on the button */ @@ -5503,7 +5503,7 @@ TOOLBAR_LButtonDown (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) btnPtr->fsState |= TBSTATE_PRESSED; - TOOLBAR_SetHotItemEx(infoPtr, nHit, HICF_MOUSE | HICF_LMOUSE); + TOOLBAR_SetHotItemEx(infoPtr, button ? nHit : TOOLBAR_NOWHERE, HICF_MOUSE | HICF_LMOUSE); if (btnPtr->fsState & TBSTATE_ENABLED) InvalidateRect(infoPtr->hwndSelf, &btnPtr->rect, TRUE); @@ -5559,7 +5559,7 @@ TOOLBAR_LButtonUp (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) nHit = TOOLBAR_InternalHitTest (infoPtr, &pt, &button); if (!infoPtr->bAnchor || button) - TOOLBAR_SetHotItemEx(infoPtr, nHit, HICF_MOUSE | HICF_LMOUSE); + TOOLBAR_SetHotItemEx(infoPtr, button ? nHit : TOOLBAR_NOWHERE, HICF_MOUSE | HICF_LMOUSE); if (infoPtr->nButtonDrag >= 0) { RECT rcClient; @@ -5619,7 +5619,7 @@ TOOLBAR_LButtonUp (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) } /* button under cursor changed so need to re-set hot item */ - TOOLBAR_SetHotItemEx(infoPtr, nHit, HICF_MOUSE | HICF_LMOUSE); + TOOLBAR_SetHotItemEx(infoPtr, button ? nHit : TOOLBAR_NOWHERE, HICF_MOUSE | HICF_LMOUSE); infoPtr->nButtonDrag = -1; TOOLBAR_SendNotify(&hdr, infoPtr, TBN_TOOLBARCHANGE); @@ -5849,7 +5849,7 @@ TOOLBAR_MouseMove (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) if (((infoPtr->dwStyle & TBSTYLE_FLAT) || GetWindowTheme (infoPtr->hwndSelf)) && (!infoPtr->bAnchor || button)) - TOOLBAR_SetHotItemEx(infoPtr, nHit, HICF_MOUSE); + TOOLBAR_SetHotItemEx(infoPtr, button ? nHit : TOOLBAR_NOWHERE, HICF_MOUSE); if (infoPtr->nOldHit != nHit) {

1 0

Vincent Povirk : windowscodecs: Add wrapper functions for IWICComponentFactory methods.
by Alexandre Julliard May 17, 2012

May 17, 2012

Module: wine Branch: master Commit: 6e2da125fdadfabcf37da86c0a6af57eea2ae5c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e2da125fdadfabcf37da86c0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 8 13:10:38 2012 -0500 windowscodecs: Add wrapper functions for IWICComponentFactory methods. --- dlls/windowscodecs/proxy.c | 12 ++++++++++++ dlls/windowscodecs/windowscodecs.spec | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c index 8e6ff4a..1b298db 100644 --- a/dlls/windowscodecs/proxy.c +++ b/dlls/windowscodecs/proxy.c @@ -305,6 +305,18 @@ HRESULT WINAPI IWICColorContext_InitializeFromMemory_Proxy_W(IWICColorContext *i return IWICColorContext_InitializeFromMemory(iface, pbBuffer, cbBufferSize); } +HRESULT WINAPI IWICComponentFactory_CreateMetadataWriterFromReader_Proxy_W(IWICComponentFactory *iface, + IWICMetadataReader *pIReader, const GUID *pguidVendor, IWICMetadataWriter **ppIWriter) +{ + return IWICComponentFactory_CreateMetadataWriterFromReader(iface, pIReader, pguidVendor, ppIWriter); +} + +HRESULT WINAPI IWICComponentFactory_CreateQueryWriterFromBlockWriter_Proxy_W(IWICComponentFactory *iface, + IWICMetadataBlockWriter *pIBlockWriter, IWICMetadataQueryWriter **ppIQueryWriter) +{ + return IWICComponentFactory_CreateQueryWriterFromBlockWriter(iface, pIBlockWriter, ppIQueryWriter); +} + HRESULT WINAPI IWICComponentInfo_GetCLSID_Proxy_W(IWICComponentInfo *iface, CLSID *pclsid) { diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index 80782f1..bd5b94c 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -53,8 +53,8 @@ @ stdcall IWICBitmap_SetPalette_Proxy(ptr ptr) IWICBitmap_SetPalette_Proxy_W @ stdcall IWICBitmap_SetResolution_Proxy(ptr double double) IWICBitmap_SetResolution_Proxy_W @ stdcall IWICColorContext_InitializeFromMemory_Proxy(ptr ptr long) IWICColorContext_InitializeFromMemory_Proxy_W -@ stub IWICComponentFactory_CreateMetadataWriterFromReader_Proxy -@ stub IWICComponentFactory_CreateQueryWriterFromBlockWriter_Proxy +@ stdcall IWICComponentFactory_CreateMetadataWriterFromReader_Proxy(ptr ptr ptr ptr) IWICComponentFactory_CreateMetadataWriterFromReader_Proxy_W +@ stdcall IWICComponentFactory_CreateQueryWriterFromBlockWriter_Proxy(ptr ptr ptr) IWICComponentFactory_CreateQueryWriterFromBlockWriter_Proxy_W @ stdcall IWICComponentInfo_GetAuthor_Proxy(ptr long ptr ptr) IWICComponentInfo_GetAuthor_Proxy_W @ stdcall IWICComponentInfo_GetCLSID_Proxy(ptr ptr) IWICComponentInfo_GetCLSID_Proxy_W @ stdcall IWICComponentInfo_GetFriendlyName_Proxy(ptr long ptr ptr) IWICComponentInfo_GetFriendlyName_Proxy_W

1 0

Dmitry Timoshkov : gdiplus: Save total and current frame in the image structure.
by Alexandre Julliard May 17, 2012

May 17, 2012

Module: wine Branch: master Commit: 007d642e53b4ddc4ea75aba26fc35936b67fbc3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=007d642e53b4ddc4ea75aba26… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 16 23:33:48 2012 +0900 gdiplus: Save total and current frame in the image structure. --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/image.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index df66903..753a162 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -266,6 +266,7 @@ struct GpImage{ ImageType type; GUID format; UINT flags; + UINT frame_count, current_frame; UINT palette_flags; UINT palette_count; UINT palette_size; diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index ba8b979..c6a72b4 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1767,6 +1767,8 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, (*bitmap)->image.type = ImageTypeBitmap; memcpy(&(*bitmap)->image.format, &ImageFormatMemoryBMP, sizeof(GUID)); (*bitmap)->image.flags = ImageFlagsNone; + (*bitmap)->image.frame_count = 1; + (*bitmap)->image.current_frame = 0; (*bitmap)->image.palette_flags = 0; (*bitmap)->image.palette_count = 0; (*bitmap)->image.palette_size = 0; @@ -2591,7 +2593,7 @@ static GpStatus decode_image_wic(IStream* stream, REFCLSID clsid, GpImage **imag WICPixelFormatGUID wic_format; PixelFormat gdip_format=0; int i; - UINT width, height; + UINT width, height, frame_count; BitmapData lockeddata; WICRect wrc; HRESULT initresult; @@ -2604,7 +2606,11 @@ static GpStatus decode_image_wic(IStream* stream, REFCLSID clsid, GpImage **imag hr = IWICBitmapDecoder_Initialize(decoder, (IStream*)stream, WICDecodeMetadataCacheOnLoad); if (SUCCEEDED(hr)) + { + IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); + /* FIXME: set current frame */ hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + } if (SUCCEEDED(hr)) /* got frame */ { @@ -2696,6 +2702,8 @@ end: { /* Native GDI+ used to be smarter, but since Win7 it just sets these flags. */ bitmap->image.flags |= ImageFlagsReadOnly|ImageFlagsHasRealPixelSize|ImageFlagsHasRealDPI|ImageFlagsColorSpaceRGB; + bitmap->image.frame_count = frame_count; + bitmap->image.current_frame = 0; } return status; @@ -2765,6 +2773,8 @@ static GpStatus decode_image_olepicture_metafile(IStream* stream, REFCLSID clsid (*image)->type = ImageTypeMetafile; (*image)->picture = pic; (*image)->flags = ImageFlagsNone; + (*image)->frame_count = 1; + (*image)->current_frame = 0; (*image)->palette_flags = 0; (*image)->palette_count = 0; (*image)->palette_size = 0;

1 0

Alex Henrie : kernel32: Avoid calling MultiByteToWideChar with invalid parameters.
by Alexandre Julliard May 17, 2012

May 17, 2012

Module: wine Branch: master Commit: 92b4979b3312f0d3a308c2c0a259fa0153612019 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92b4979b3312f0d3a308c2c0a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed May 16 19:24:07 2012 -0600 kernel32: Avoid calling MultiByteToWideChar with invalid parameters. --- dlls/kernel32/locale.c | 57 +++++++++++++++++++++++++++++++---------------- 1 files changed, 37 insertions(+), 20 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index b506f15..380c616 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2867,34 +2867,51 @@ INT WINAPI CompareStringA(LCID lcid, DWORD style, if (!(style & LOCALE_USE_CP_ACP)) locale_cp = get_lcid_codepage( lcid ); - len1W = MultiByteToWideChar(locale_cp, 0, str1, len1, buf1W, 130); - if (len1W) - str1W = buf1W; - else + if (len1) { - len1W = MultiByteToWideChar(locale_cp, 0, str1, len1, NULL, 0); - str1W = HeapAlloc(GetProcessHeap(), 0, len1W * sizeof(WCHAR)); - if (!str1W) + len1W = MultiByteToWideChar(locale_cp, 0, str1, len1, buf1W, 130); + if (len1W) + str1W = buf1W; + else { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return 0; + len1W = MultiByteToWideChar(locale_cp, 0, str1, len1, NULL, 0); + str1W = HeapAlloc(GetProcessHeap(), 0, len1W * sizeof(WCHAR)); + if (!str1W) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + MultiByteToWideChar(locale_cp, 0, str1, len1, str1W, len1W); } - MultiByteToWideChar(locale_cp, 0, str1, len1, str1W, len1W); } - len2W = MultiByteToWideChar(locale_cp, 0, str2, len2, buf2W, 130); - if (len2W) - str2W = buf2W; else { - len2W = MultiByteToWideChar(locale_cp, 0, str2, len2, NULL, 0); - str2W = HeapAlloc(GetProcessHeap(), 0, len2W * sizeof(WCHAR)); - if (!str2W) + len1W = 0; + str1W = buf1W; + } + + if (len2) + { + len2W = MultiByteToWideChar(locale_cp, 0, str2, len2, buf2W, 130); + if (len2W) + str2W = buf2W; + else { - if (str1W != buf1W) HeapFree(GetProcessHeap(), 0, str1W); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return 0; + len2W = MultiByteToWideChar(locale_cp, 0, str2, len2, NULL, 0); + str2W = HeapAlloc(GetProcessHeap(), 0, len2W * sizeof(WCHAR)); + if (!str2W) + { + if (str1W != buf1W) HeapFree(GetProcessHeap(), 0, str1W); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + MultiByteToWideChar(locale_cp, 0, str2, len2, str2W, len2W); } - MultiByteToWideChar(locale_cp, 0, str2, len2, str2W, len2W); + } + else + { + len2W = 0; + str2W = buf2W; } ret = CompareStringW(lcid, style, str1W, len1W, str2W, len2W);

1 0

Hans Leidekker : msi: Add support for version 4.0 of the .NET runtime.
by Alexandre Julliard May 17, 2012

May 17, 2012

Module: wine Branch: master Commit: 35b95942449394f6a69b9f39b5f1fc7de16ddba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35b95942449394f6a69b9f39b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 17 10:17:50 2012 +0200 msi: Add support for version 4.0 of the .NET runtime. --- dlls/msi/assembly.c | 33 +++++++++++++++++++++++++++------ dlls/msi/msipriv.h | 1 + 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index b8fabb7..d384003 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -34,11 +34,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); static HRESULT (WINAPI *pCreateAssemblyCacheNet10)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pCreateAssemblyCacheNet11)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pCreateAssemblyCacheNet20)( IAssemblyCache **, DWORD ); +static HRESULT (WINAPI *pCreateAssemblyCacheNet40)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pCreateAssemblyCacheSxs)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pLoadLibraryShim)( LPCWSTR, LPCWSTR, LPVOID, HMODULE * ); static HRESULT (WINAPI *pGetFileVersion)( LPCWSTR, LPWSTR, DWORD, DWORD * ); -static HMODULE hfusion10, hfusion11, hfusion20, hmscoree, hsxs; +static HMODULE hfusion10, hfusion11, hfusion20, hfusion40, hmscoree, hsxs; static BOOL init_function_pointers( void ) { @@ -46,8 +47,10 @@ static BOOL init_function_pointers( void ) static const WCHAR szVersion10[] = {'v','1','.','0','.','3','7','0','5',0}; static const WCHAR szVersion11[] = {'v','1','.','1','.','4','3','2','2',0}; static const WCHAR szVersion20[] = {'v','2','.','0','.','5','0','7','2','7',0}; + static const WCHAR szVersion40[] = {'v','4','.','0','.','3','0','3','1','9',0}; - if (pCreateAssemblyCacheNet10 || pCreateAssemblyCacheNet11 || pCreateAssemblyCacheNet20) return TRUE; + if (pCreateAssemblyCacheNet10 || pCreateAssemblyCacheNet11 || pCreateAssemblyCacheNet20 || + pCreateAssemblyCacheNet40 ) return TRUE; if (!(hmscoree = LoadLibraryA( "mscoree.dll" ))) return FALSE; pGetFileVersion = (void *)GetProcAddress( hmscoree, "GetFileVersion" ); /* missing from v1.0.3705 */ @@ -62,7 +65,11 @@ static BOOL init_function_pointers( void ) if (!pLoadLibraryShim( szFusion, szVersion20, NULL, &hfusion20 )) pCreateAssemblyCacheNet20 = (void *)GetProcAddress( hfusion20, "CreateAssemblyCache" ); - if (!pCreateAssemblyCacheNet10 && !pCreateAssemblyCacheNet11 && !pCreateAssemblyCacheNet20) goto error; + if (!pLoadLibraryShim( szFusion, szVersion40, NULL, &hfusion40 )) + pCreateAssemblyCacheNet40 = (void *)GetProcAddress( hfusion40, "CreateAssemblyCache" ); + + if (!pCreateAssemblyCacheNet10 && !pCreateAssemblyCacheNet11 && !pCreateAssemblyCacheNet20 + && !pCreateAssemblyCacheNet40) goto error; if (!(hsxs = LoadLibraryA( "sxs.dll" ))) goto error; if (!(pCreateAssemblyCacheSxs = (void *)GetProcAddress( hsxs, "CreateAssemblyCache" ))) goto error; @@ -72,9 +79,11 @@ error: pCreateAssemblyCacheNet10 = NULL; pCreateAssemblyCacheNet11 = NULL; pCreateAssemblyCacheNet20 = NULL; + pCreateAssemblyCacheNet40 = NULL; FreeLibrary( hfusion10 ); FreeLibrary( hfusion11 ); FreeLibrary( hfusion20 ); + FreeLibrary( hfusion40 ); FreeLibrary( hmscoree ); return FALSE; } @@ -84,16 +93,19 @@ BOOL msi_init_assembly_caches( MSIPACKAGE *package ) if (!init_function_pointers()) return FALSE; if (package->cache_net[CLR_VERSION_V10] || package->cache_net[CLR_VERSION_V11] || - package->cache_net[CLR_VERSION_V20]) return TRUE; + package->cache_net[CLR_VERSION_V20] || + package->cache_net[CLR_VERSION_V40]) return TRUE; if (pCreateAssemblyCacheSxs( &package->cache_sxs, 0 ) != S_OK) return FALSE; if (pCreateAssemblyCacheNet10) pCreateAssemblyCacheNet10( &package->cache_net[CLR_VERSION_V10], 0 ); if (pCreateAssemblyCacheNet11) pCreateAssemblyCacheNet11( &package->cache_net[CLR_VERSION_V11], 0 ); if (pCreateAssemblyCacheNet20) pCreateAssemblyCacheNet20( &package->cache_net[CLR_VERSION_V20], 0 ); + if (pCreateAssemblyCacheNet40) pCreateAssemblyCacheNet40( &package->cache_net[CLR_VERSION_V40], 0 ); if (package->cache_net[CLR_VERSION_V10] || package->cache_net[CLR_VERSION_V11] || - package->cache_net[CLR_VERSION_V20]) + package->cache_net[CLR_VERSION_V20] || + package->cache_net[CLR_VERSION_V40]) { return TRUE; } @@ -112,6 +124,11 @@ BOOL msi_init_assembly_caches( MSIPACKAGE *package ) IAssemblyCache_Release( package->cache_net[CLR_VERSION_V20] ); package->cache_net[CLR_VERSION_V20] = NULL; } + if (package->cache_net[CLR_VERSION_V40]) + { + IAssemblyCache_Release( package->cache_net[CLR_VERSION_V40] ); + package->cache_net[CLR_VERSION_V40] = NULL; + } IAssemblyCache_Release( package->cache_sxs ); package->cache_sxs = NULL; return FALSE; @@ -137,9 +154,11 @@ void msi_destroy_assembly_caches( MSIPACKAGE *package ) pCreateAssemblyCacheNet10 = NULL; pCreateAssemblyCacheNet11 = NULL; pCreateAssemblyCacheNet20 = NULL; + pCreateAssemblyCacheNet40 = NULL; FreeLibrary( hfusion10 ); FreeLibrary( hfusion11 ); FreeLibrary( hfusion20 ); + FreeLibrary( hfusion40 ); FreeLibrary( hmscoree ); FreeLibrary( hsxs ); } @@ -274,13 +293,15 @@ static BOOL is_assembly_installed( IAssemblyCache *cache, const WCHAR *display_n static const WCHAR clr_version_v10[] = {'v','1','.','0','.','3','7','0','5',0}; static const WCHAR clr_version_v11[] = {'v','1','.','1','.','4','3','2','2',0}; static const WCHAR clr_version_v20[] = {'v','2','.','0','.','5','0','7','2','7',0}; +static const WCHAR clr_version_v40[] = {'v','4','.','0','.','3','0','3','1','9',0}; static const WCHAR clr_version_unknown[] = {'u','n','k','n','o','w','n',0}; static const WCHAR *clr_version[] = { clr_version_v10, clr_version_v11, - clr_version_v20 + clr_version_v20, + clr_version_v40 }; static const WCHAR *get_clr_version_str( enum clr_version version ) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index bc9e596..605ee8d 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -347,6 +347,7 @@ enum clr_version CLR_VERSION_V10, CLR_VERSION_V11, CLR_VERSION_V20, + CLR_VERSION_V40, CLR_VERSION_MAX };

1 0

Hans Leidekker : msi: Break out of the loop as soon as the assembly is detected in msi_load_assembly .
by Alexandre Julliard May 17, 2012

May 17, 2012

Module: wine Branch: master Commit: 11daa6aad516e044e96e426c5b89ef26445ffd3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=11daa6aad516e044e96e426c5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 17 10:17:16 2012 +0200 msi: Break out of the loop as soon as the assembly is detected in msi_load_assembly. --- dlls/msi/assembly.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index 712bb23..c188d55 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -347,6 +347,7 @@ MSIASSEMBLY *msi_load_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) { TRACE("runtime version %s\n", debugstr_w(get_clr_version_str( i ))); a->installed = TRUE; + break; } } }

1 0

Vincent Povirk : windowscodecs: Add wrapper functions for IWICMetadataBlockReader methods.
by Alexandre Julliard May 17, 2012

May 17, 2012

Module: wine Branch: master Commit: 157c92de227440cd86581b49c723dedd01027173 URL: http://source.winehq.org/git/wine.git/?a=commit;h=157c92de227440cd86581b49c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 8 13:06:59 2012 -0500 windowscodecs: Add wrapper functions for IWICMetadataBlockReader methods. --- dlls/windowscodecs/proxy.c | 13 +++++++++++++ dlls/windowscodecs/windowscodecs.spec | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c index 6115198..8e6ff4a 100644 --- a/dlls/windowscodecs/proxy.c +++ b/dlls/windowscodecs/proxy.c @@ -29,6 +29,7 @@ #include "winbase.h" #include "objbase.h" #include "wincodec.h" +#include "wincodecsdk.h" #include "wincodecs_private.h" @@ -499,6 +500,18 @@ HRESULT WINAPI IWICImagingFactory_CreateStream_Proxy_W(IWICImagingFactory *pFact return IWICImagingFactory_CreateStream(pFactory, ppIWICStream); } +HRESULT WINAPI IWICMetadataBlockReader_GetCount_Proxy_W(IWICMetadataBlockReader *iface, + UINT *pcCount) +{ + return IWICMetadataBlockReader_GetCount(iface, pcCount); +} + +HRESULT WINAPI IWICMetadataBlockReader_GetReaderByIndex_Proxy_W(IWICMetadataBlockReader *iface, + UINT nIndex, IWICMetadataReader **ppIMetadataReader) +{ + return IWICMetadataBlockReader_GetReaderByIndex(iface, nIndex, ppIMetadataReader); +} + HRESULT WINAPI IWICMetadataQueryReader_GetContainerFormat_Proxy_W(IWICMetadataQueryReader *iface, GUID *pguidContainerFormat) { diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index 259ff06..80782f1 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -83,8 +83,8 @@ @ stdcall IWICImagingFactory_CreateQueryWriterFromReader_Proxy(ptr ptr ptr ptr) IWICImagingFactory_CreateQueryWriterFromReader_Proxy_W @ stdcall IWICImagingFactory_CreateQueryWriter_Proxy(ptr ptr ptr ptr) IWICImagingFactory_CreateQueryWriter_Proxy_W @ stdcall IWICImagingFactory_CreateStream_Proxy(ptr ptr) IWICImagingFactory_CreateStream_Proxy_W -@ stub IWICMetadataBlockReader_GetCount_Proxy -@ stub IWICMetadataBlockReader_GetReaderByIndex_Proxy +@ stdcall IWICMetadataBlockReader_GetCount_Proxy(ptr ptr) IWICMetadataBlockReader_GetCount_Proxy_W +@ stdcall IWICMetadataBlockReader_GetReaderByIndex_Proxy(ptr long ptr) IWICMetadataBlockReader_GetReaderByIndex_Proxy_W @ stdcall IWICMetadataQueryReader_GetContainerFormat_Proxy(ptr ptr) IWICMetadataQueryReader_GetContainerFormat_Proxy_W @ stdcall IWICMetadataQueryReader_GetEnumerator_Proxy(ptr ptr) IWICMetadataQueryReader_GetEnumerator_Proxy_W @ stdcall IWICMetadataQueryReader_GetLocation_Proxy(ptr long ptr ptr) IWICMetadataQueryReader_GetLocation_Proxy_W

1 0

Dmitry Timoshkov : gdiplus: Implement GdipImageGetFrameCount.
by Alexandre Julliard May 17, 2012

May 17, 2012

Module: wine Branch: master Commit: eeee536ad6027086302b18bfc628c00c1894fccb URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeee536ad6027086302b18bfc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 16 23:33:55 2012 +0900 gdiplus: Implement GdipImageGetFrameCount. --- dlls/gdiplus/image.c | 17 +++++++++-------- dlls/gdiplus/tests/image.c | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index c6a72b4..ce04c72 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2456,23 +2456,24 @@ static struct image_format_dimension image_format_dimensions[] = {NULL} }; -/* FIXME: Need to handle multi-framed images */ GpStatus WINGDIPAPI GdipImageGetFrameCount(GpImage *image, GDIPCONST GUID* dimensionID, UINT* count) { - static int calls; - TRACE("(%p,%s,%p)\n", image, debugstr_guid(dimensionID), count); if(!image || !count) return InvalidParameter; - if(!(calls++)) - FIXME("returning frame count of 1\n"); - - *count = 1; + if (!dimensionID || + IsEqualGUID(dimensionID, &image->format) || + IsEqualGUID(dimensionID, &FrameDimensionPage) || + IsEqualGUID(dimensionID, &FrameDimensionTime)) + { + *count = image->frame_count; + return Ok; + } - return Ok; + return InvalidParameter; } GpStatus WINGDIPAPI GdipImageGetFrameDimensionsCount(GpImage *image, diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index b6262d1..e22d45a 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -2298,7 +2298,7 @@ static void test_multiframegif(void) count = 12345; stat = GdipImageGetFrameCount((GpImage*)bmp, &dimension, &count); expect(Ok, stat); - todo_wine expect(2, count); + expect(2, count); /* SelectActiveFrame overwrites our current data */ stat = GdipImageSelectActiveFrame((GpImage*)bmp, &dimension, 1);

1 0

Vincent Povirk : appwiz.cpl: Move dialog template id to addon_info_t.
by Alexandre Julliard May 17, 2012

May 17, 2012

Module: wine Branch: master Commit: ad7279a5a605ac738d5712105739f1d2fd802fa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad7279a5a605ac738d5712105… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 17 09:19:10 2012 -0500 appwiz.cpl: Move dialog template id to addon_info_t. --- dlls/appwiz.cpl/addons.c | 6 ++++-- dlls/appwiz.cpl/appwiz.rc | 2 +- dlls/appwiz.cpl/res.h | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 1cff5c4..ab70ed1 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -72,6 +72,7 @@ typedef struct { const char *config_key; const char *url_config_key; const char *dir_config_key; + LPCWSTR dialog_template; } addon_info_t; static const addon_info_t addons_info[] = { @@ -80,7 +81,8 @@ static const addon_info_t addons_info[] = { "wine_gecko-" GECKO_VERSION "-" ARCH_STRING ".msi", "gecko", GECKO_SHA, - "MSHTML", "GeckoUrl", "GeckoCabDir" + "MSHTML", "GeckoUrl", "GeckoCabDir", + MAKEINTRESOURCEW(ID_DWL_GECKO_DIALOG) } }; @@ -571,7 +573,7 @@ BOOL install_addon(addon_t addon_type) if(!install_from_registered_dir() && !install_from_default_dir() && (url = get_url())) - DialogBoxW(hInst, MAKEINTRESOURCEW(ID_DWL_DIALOG), 0, installer_proc); + DialogBoxW(hInst, addon->dialog_template, 0, installer_proc); heap_free(url); url = NULL; diff --git a/dlls/appwiz.cpl/appwiz.rc b/dlls/appwiz.cpl/appwiz.rc index 8107212..af41d6a 100644 --- a/dlls/appwiz.cpl/appwiz.rc +++ b/dlls/appwiz.cpl/appwiz.rc @@ -92,7 +92,7 @@ FONT 8, "MS Shell Dlg" CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 100, 105, 150, 8 } -ID_DWL_DIALOG DIALOG 0, 0, 260, 95 +ID_DWL_GECKO_DIALOG DIALOG 0, 0, 260, 95 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Wine Gecko Installer" FONT 8, "MS Shell Dlg" diff --git a/dlls/appwiz.cpl/res.h b/dlls/appwiz.cpl/res.h index 7dfbf1f..96cd62d 100644 --- a/dlls/appwiz.cpl/res.h +++ b/dlls/appwiz.cpl/res.h @@ -45,7 +45,7 @@ #define IDC_INFO_COMMENTS 1107 #define IDC_INFO_LABEL 1108 -#define ID_DWL_DIALOG 1200 +#define ID_DWL_GECKO_DIALOG 1200 #define ID_DWL_PROGRESS 1201 #define ID_DWL_INSTALL 1202 #define ID_DWL_STATUS 1203

1 0