April 2018 - Wine-Commits - list.winehq.org

Jacek Caban : windowscodecs: Store bitmap patterns in bitmap decoder info object.
by Alexandre Julliard April 2, 2018

April 2, 2018

Module: wine Branch: master Commit: 9db1206547fdc2d5ca316be9dd5e8802ea3ac630 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9db1206547fdc2d5ca316be9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 2 20:49:12 2018 +0200 windowscodecs: Store bitmap patterns in bitmap decoder info object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/info.c | 211 +++++++++++++++++++++++++++------------------- 1 file changed, 126 insertions(+), 85 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index fadefba..92d8f78 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -34,6 +34,7 @@ #include "wine/unicode.h" #include "wine/list.h" #include "wine/rbtree.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); @@ -214,6 +215,9 @@ static HRESULT ComponentInfo_GetGuidList(HKEY classkey, LPCWSTR subkeyname, typedef struct { ComponentInfo base; HKEY classkey; + WICBitmapPattern *patterns; + UINT pattern_count; + UINT patterns_size; } BitmapDecoderInfo; static inline BitmapDecoderInfo *impl_from_IWICBitmapDecoderInfo(IWICBitmapDecoderInfo *iface) @@ -266,6 +270,7 @@ static ULONG WINAPI BitmapDecoderInfo_Release(IWICBitmapDecoderInfo *iface) if (ref == 0) { RegCloseKey(This->classkey); + heap_free(This->patterns); HeapFree(GetProcessHeap(), 0, This); } @@ -450,96 +455,20 @@ static HRESULT WINAPI BitmapDecoderInfo_GetPatterns(IWICBitmapDecoderInfo *iface UINT cbSizePatterns, WICBitmapPattern *pPatterns, UINT *pcPatterns, UINT *pcbPatternsActual) { BitmapDecoderInfo *This = impl_from_IWICBitmapDecoderInfo(iface); - UINT pattern_count=0, patterns_size=0; - WCHAR subkeyname[11]; - LONG res; - HKEY patternskey, patternkey; - static const WCHAR uintformatW[] = {'%','u',0}; - static const WCHAR patternsW[] = {'P','a','t','t','e','r','n','s',0}; - static const WCHAR positionW[] = {'P','o','s','i','t','i','o','n',0}; - static const WCHAR lengthW[] = {'L','e','n','g','t','h',0}; - static const WCHAR patternW[] = {'P','a','t','t','e','r','n',0}; - static const WCHAR maskW[] = {'M','a','s','k',0}; - static const WCHAR endofstreamW[] = {'E','n','d','O','f','S','t','r','e','a','m',0}; - HRESULT hr=S_OK; - UINT i; - BYTE *bPatterns=(BYTE*)pPatterns; - DWORD length, valuesize; TRACE("(%p,%i,%p,%p,%p)\n", iface, cbSizePatterns, pPatterns, pcPatterns, pcbPatternsActual); - res = RegOpenKeyExW(This->classkey, patternsW, 0, KEY_READ, &patternskey); - if (res != ERROR_SUCCESS) return HRESULT_FROM_WIN32(res); - - res = RegQueryInfoKeyW(patternskey, NULL, NULL, NULL, &pattern_count, NULL, NULL, NULL, NULL, NULL, NULL, NULL); - if (res == ERROR_SUCCESS) - { - patterns_size = pattern_count * sizeof(WICBitmapPattern); - - for (i=0; i<pattern_count; i++) - { - snprintfW(subkeyname, 11, uintformatW, i); - res = RegOpenKeyExW(patternskey, subkeyname, 0, KEY_READ, &patternkey); - if (res == ERROR_SUCCESS) - { - valuesize = sizeof(ULONG); - res = RegGetValueW(patternkey, NULL, lengthW, RRF_RT_DWORD, NULL, - &length, &valuesize); - patterns_size += length*2; - - if ((cbSizePatterns >= patterns_size) && (res == ERROR_SUCCESS)) - { - pPatterns[i].Length = length; - - pPatterns[i].EndOfStream = 0; - valuesize = sizeof(BOOL); - RegGetValueW(patternkey, NULL, endofstreamW, RRF_RT_DWORD, NULL, - &pPatterns[i].EndOfStream, &valuesize); + if (!pcPatterns || !pcbPatternsActual) return E_INVALIDARG; - pPatterns[i].Position.QuadPart = 0; - valuesize = sizeof(ULARGE_INTEGER); - res = RegGetValueW(patternkey, NULL, positionW, RRF_RT_DWORD|RRF_RT_QWORD, NULL, - &pPatterns[i].Position, &valuesize); - - if (res == ERROR_SUCCESS) - { - pPatterns[i].Pattern = bPatterns+patterns_size-length*2; - valuesize = length; - res = RegGetValueW(patternkey, NULL, patternW, RRF_RT_REG_BINARY, NULL, - pPatterns[i].Pattern, &valuesize); - } - - if (res == ERROR_SUCCESS) - { - pPatterns[i].Mask = bPatterns+patterns_size-length; - valuesize = length; - res = RegGetValueW(patternkey, NULL, maskW, RRF_RT_REG_BINARY, NULL, - pPatterns[i].Mask, &valuesize); - } - } - - RegCloseKey(patternkey); - } - if (res != ERROR_SUCCESS) - { - hr = HRESULT_FROM_WIN32(res); - break; - } - } - } - else hr = HRESULT_FROM_WIN32(res); - - RegCloseKey(patternskey); - - if (hr == S_OK) + *pcPatterns = This->pattern_count; + *pcbPatternsActual = This->patterns_size; + if (pPatterns) { - *pcPatterns = pattern_count; - *pcbPatternsActual = patterns_size; - if (pPatterns && cbSizePatterns < patterns_size) - hr = WINCODEC_ERR_INSUFFICIENTBUFFER; + if (This->patterns_size && cbSizePatterns < This->patterns_size) + return WINCODEC_ERR_INSUFFICIENTBUFFER; + memcpy(pPatterns, This->patterns, This->patterns_size); } - - return hr; + return S_OK; } static HRESULT WINAPI BitmapDecoderInfo_MatchesPattern(IWICBitmapDecoderInfo *iface, @@ -658,11 +587,121 @@ static const IWICBitmapDecoderInfoVtbl BitmapDecoderInfo_Vtbl = { BitmapDecoderInfo_CreateInstance }; +static void read_bitmap_patterns(BitmapDecoderInfo *info) +{ + UINT pattern_count=0, patterns_size=0; + WCHAR subkeyname[11]; + LONG res; + HKEY patternskey, patternkey; + static const WCHAR uintformatW[] = {'%','u',0}; + static const WCHAR patternsW[] = {'P','a','t','t','e','r','n','s',0}; + static const WCHAR positionW[] = {'P','o','s','i','t','i','o','n',0}; + static const WCHAR lengthW[] = {'L','e','n','g','t','h',0}; + static const WCHAR patternW[] = {'P','a','t','t','e','r','n',0}; + static const WCHAR maskW[] = {'M','a','s','k',0}; + static const WCHAR endofstreamW[] = {'E','n','d','O','f','S','t','r','e','a','m',0}; + UINT i; + WICBitmapPattern *patterns; + BYTE *patterns_ptr; + DWORD length, valuesize; + + res = RegOpenKeyExW(info->classkey, patternsW, 0, KEY_READ, &patternskey); + if (res != ERROR_SUCCESS) return; + + res = RegQueryInfoKeyW(patternskey, NULL, NULL, NULL, &pattern_count, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + if (res != ERROR_SUCCESS) + { + RegCloseKey(patternskey); + return; + } + + patterns_size = pattern_count * sizeof(WICBitmapPattern); + patterns = heap_alloc(patterns_size); + if (!patterns) + { + RegCloseKey(patternskey); + return; + } + + for (i=0; res == ERROR_SUCCESS && i < pattern_count; i++) + { + snprintfW(subkeyname, 11, uintformatW, i); + res = RegOpenKeyExW(patternskey, subkeyname, 0, KEY_READ, &patternkey); + if (res != ERROR_SUCCESS) break; + + valuesize = sizeof(ULONG); + res = RegGetValueW(patternkey, NULL, lengthW, RRF_RT_DWORD, NULL, &length, &valuesize); + if (res == ERROR_SUCCESS) + { + patterns_size += length*2; + patterns[i].Length = length; + + valuesize = sizeof(BOOL); + res = RegGetValueW(patternkey, NULL, endofstreamW, RRF_RT_DWORD, NULL, + &patterns[i].EndOfStream, &valuesize); + if (res) patterns[i].EndOfStream = 0; + + patterns[i].Position.QuadPart = 0; + valuesize = sizeof(ULARGE_INTEGER); + res = RegGetValueW(patternkey, NULL, positionW, RRF_RT_DWORD|RRF_RT_QWORD, NULL, + &patterns[i].Position, &valuesize); + } + + RegCloseKey(patternkey); + } + + if (res != ERROR_SUCCESS || !(patterns_ptr = heap_realloc(patterns, patterns_size))) + { + heap_free(patterns); + RegCloseKey(patternskey); + return; + } + patterns = (WICBitmapPattern*)patterns_ptr; + patterns_ptr += pattern_count * sizeof(*patterns); + + for (i=0; res == ERROR_SUCCESS && i < pattern_count; i++) + { + snprintfW(subkeyname, 11, uintformatW, i); + res = RegOpenKeyExW(patternskey, subkeyname, 0, KEY_READ, &patternkey); + if (res != ERROR_SUCCESS) break; + + length = patterns[i].Length; + patterns[i].Pattern = patterns_ptr; + valuesize = length; + res = RegGetValueW(patternkey, NULL, patternW, RRF_RT_REG_BINARY, NULL, + patterns[i].Pattern, &valuesize); + patterns_ptr += length; + + if (res == ERROR_SUCCESS) + { + patterns[i].Mask = patterns_ptr; + valuesize = length; + res = RegGetValueW(patternkey, NULL, maskW, RRF_RT_REG_BINARY, NULL, + patterns[i].Mask, &valuesize); + patterns_ptr += length; + } + + RegCloseKey(patternkey); + } + + RegCloseKey(patternskey); + + if (res != ERROR_SUCCESS) + { + heap_free(patterns); + return; + } + + info->pattern_count = pattern_count; + info->patterns_size = patterns_size; + info->patterns = patterns; +} + static HRESULT BitmapDecoderInfo_Constructor(HKEY classkey, REFCLSID clsid, ComponentInfo **ret) { BitmapDecoderInfo *This; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(BitmapDecoderInfo)); + This = heap_alloc_zero(sizeof(BitmapDecoderInfo)); if (!This) { RegCloseKey(classkey); @@ -674,6 +713,8 @@ static HRESULT BitmapDecoderInfo_Constructor(HKEY classkey, REFCLSID clsid, Comp This->classkey = classkey; This->base.clsid = *clsid; + read_bitmap_patterns(This); + *ret = &This->base; return S_OK; }

1 0

Tim Wanders : setupapi: Return CR_NO_SUCH_DEVNODE from CM_Get_Parent stub.
by Alexandre Julliard April 2, 2018

April 2, 2018

Module: wine Branch: master Commit: 074345edd6147a44b1311780c073f13d8114b726 URL: https://source.winehq.org/git/wine.git/?a=commit;h=074345edd6147a44b1311780… Author: Tim Wanders <timwanders241(a)gmail.com> Date: Sun Apr 1 21:48:49 2018 +0000 setupapi: Return CR_NO_SUCH_DEVNODE from CM_Get_Parent stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/stubs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 990974d..7c3413a 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -180,8 +180,9 @@ CONFIGRET WINAPI CM_Get_Device_ID_List_SizeW( PULONG pulLen, PCWSTR pszFilter, DWORD WINAPI CM_Get_Parent(PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags) { FIXME("%p 0x%08x 0x%08x stub\n", pdnDevInst, dnDevInst, ulFlags); - *pdnDevInst = dnDevInst; - return CR_SUCCESS; + if(pdnDevInst) + *pdnDevInst = 0; + return CR_NO_SUCH_DEVNODE; } /***********************************************************************

1 0

Nikolay Sivov : user32/static: Use correct brush color for centered image background.
by Alexandre Julliard April 2, 2018

April 2, 2018

Module: wine Branch: master Commit: 927956db67544d84da6dc27922bb64ebd31f64aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=927956db67544d84da6dc279… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 2 16:35:44 2018 +0300 user32/static: Use correct brush color for centered image background. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/static.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/dlls/user32/static.c b/dlls/user32/static.c index 11b04fc..1f7c031 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -18,11 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * Notes: - * - Windows XP introduced new behavior: The background of centered - * icons and bitmaps is painted differently. This is only done if - * a manifest is present. - * Because it has not yet been decided how to implement the two - * different modes in Wine, only the Windows XP mode is implemented. * - Controls with SS_SIMPLE but without SS_NOPREFIX: * The text should not be changed. Windows doesn't clear the * client rectangle, so the new text must be larger than the old one. @@ -737,10 +732,9 @@ static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style ) { HDC hMemDC; HBITMAP hBitmap, oldbitmap; - HBRUSH hbrush; /* message is still sent, even if the returned brush is not used */ - hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); + STATIC_SendWmCtlColorStatic(hwnd, hdc); if ((hBitmap = (HBITMAP)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET )) && (GetObjectType(hBitmap) == OBJ_BITMAP) @@ -748,26 +742,23 @@ static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style ) { BITMAP bm; RECT rcClient; - LOGBRUSH brush; GetObjectW(hBitmap, sizeof(bm), &bm); oldbitmap = SelectObject(hMemDC, hBitmap); - /* Set the background color for monochrome bitmaps - to the color of the background brush */ - if (GetObjectW( hbrush, sizeof(brush), &brush )) - { - if (brush.lbStyle == BS_SOLID) - SetBkColor(hdc, brush.lbColor); - } GetClientRect(hwnd, &rcClient); if (style & SS_CENTERIMAGE) { - FillRect( hdc, &rcClient, hbrush ); + HBRUSH hbrush = CreateSolidBrush(GetPixel(hMemDC, 0, 0)); + + FillRect(hdc, &rcClient, hbrush); + rcClient.left = (rcClient.right - rcClient.left)/2 - bm.bmWidth/2; rcClient.top = (rcClient.bottom - rcClient.top)/2 - bm.bmHeight/2; rcClient.right = rcClient.left + bm.bmWidth; rcClient.bottom = rcClient.top + bm.bmHeight; + + DeleteObject(hbrush); } StretchBlt(hdc, rcClient.left, rcClient.top, rcClient.right - rcClient.left, rcClient.bottom - rcClient.top, hMemDC,

1 0

Nikolay Sivov : wincodecs: Add a helper for GetDecoderInfo().
by Alexandre Julliard April 2, 2018

April 2, 2018

Module: wine Branch: master Commit: aaea92198d7bb1211ea5951a6c38294b4fc12096 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaea92198d7bb1211ea5951a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 1 11:49:12 2018 +0300 wincodecs: Add a helper for GetDecoderInfo(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/bmpdecode.c | 13 +------------ dlls/windowscodecs/gifformat.c | 13 +------------ dlls/windowscodecs/icoformat.c | 13 +------------ dlls/windowscodecs/info.c | 16 ++++++++++++++++ dlls/windowscodecs/jpegformat.c | 13 +------------ dlls/windowscodecs/pngformat.c | 13 +------------ dlls/windowscodecs/tgaformat.c | 13 +------------ dlls/windowscodecs/tiffformat.c | 13 +------------ dlls/windowscodecs/wincodecs_private.h | 1 + 9 files changed, 24 insertions(+), 84 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index 2bcb81e..4109bad 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -1068,20 +1068,9 @@ static HRESULT WINAPI BmpDecoder_GetContainerFormat(IWICBitmapDecoder *iface, static HRESULT WINAPI BmpDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, IWICBitmapDecoderInfo **ppIDecoderInfo) { - HRESULT hr; - IWICComponentInfo *compinfo; - TRACE("(%p,%p)\n", iface, ppIDecoderInfo); - hr = CreateComponentInfo(&CLSID_WICBmpDecoder, &compinfo); - if (FAILED(hr)) return hr; - - hr = IWICComponentInfo_QueryInterface(compinfo, &IID_IWICBitmapDecoderInfo, - (void**)ppIDecoderInfo); - - IWICComponentInfo_Release(compinfo); - - return hr; + return get_decoder_info(&CLSID_WICBmpDecoder, ppIDecoderInfo); } static HRESULT WINAPI BmpDecoder_CopyPalette(IWICBitmapDecoder *iface, diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index f63a7f3..0eb1d80 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -1170,20 +1170,9 @@ static HRESULT WINAPI GifDecoder_GetContainerFormat(IWICBitmapDecoder *iface, static HRESULT WINAPI GifDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, IWICBitmapDecoderInfo **ppIDecoderInfo) { - HRESULT hr; - IWICComponentInfo *compinfo; - TRACE("(%p,%p)\n", iface, ppIDecoderInfo); - hr = CreateComponentInfo(&CLSID_WICGifDecoder, &compinfo); - if (FAILED(hr)) return hr; - - hr = IWICComponentInfo_QueryInterface(compinfo, &IID_IWICBitmapDecoderInfo, - (void**)ppIDecoderInfo); - - IWICComponentInfo_Release(compinfo); - - return hr; + return get_decoder_info(&CLSID_WICGifDecoder, ppIDecoderInfo); } static HRESULT WINAPI GifDecoder_CopyPalette(IWICBitmapDecoder *iface, IWICPalette *palette) diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index 1b1c792..5e38ee0 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -556,20 +556,9 @@ static HRESULT WINAPI IcoDecoder_GetContainerFormat(IWICBitmapDecoder *iface, static HRESULT WINAPI IcoDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, IWICBitmapDecoderInfo **ppIDecoderInfo) { - HRESULT hr; - IWICComponentInfo *compinfo; - TRACE("(%p,%p)\n", iface, ppIDecoderInfo); - hr = CreateComponentInfo(&CLSID_WICIcoDecoder, &compinfo); - if (FAILED(hr)) return hr; - - hr = IWICComponentInfo_QueryInterface(compinfo, &IID_IWICBitmapDecoderInfo, - (void**)ppIDecoderInfo); - - IWICComponentInfo_Release(compinfo); - - return hr; + return get_decoder_info(&CLSID_WICIcoDecoder, ppIDecoderInfo); } static HRESULT WINAPI IcoDecoder_CopyPalette(IWICBitmapDecoder *iface, diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 6114eef..fadefba 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -2029,6 +2029,22 @@ void ReleaseComponentInfos(void) IWICComponentInfo_Release(&info->IWICComponentInfo_iface); } +HRESULT get_decoder_info(const CLSID *clsid, IWICBitmapDecoderInfo **info) +{ + IWICComponentInfo *compinfo; + HRESULT hr; + + hr = CreateComponentInfo(clsid, &compinfo); + if (FAILED(hr)) return hr; + + hr = IWICComponentInfo_QueryInterface(compinfo, &IID_IWICBitmapDecoderInfo, + (void **)info); + + IWICComponentInfo_Release(compinfo); + + return hr; +} + typedef struct { IEnumUnknown IEnumUnknown_iface; LONG ref; diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 27cd880..f05663f 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -398,20 +398,9 @@ static HRESULT WINAPI JpegDecoder_GetContainerFormat(IWICBitmapDecoder *iface, static HRESULT WINAPI JpegDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, IWICBitmapDecoderInfo **ppIDecoderInfo) { - HRESULT hr; - IWICComponentInfo *compinfo; - TRACE("(%p,%p)\n", iface, ppIDecoderInfo); - hr = CreateComponentInfo(&CLSID_WICJpegDecoder, &compinfo); - if (FAILED(hr)) return hr; - - hr = IWICComponentInfo_QueryInterface(compinfo, &IID_IWICBitmapDecoderInfo, - (void**)ppIDecoderInfo); - - IWICComponentInfo_Release(compinfo); - - return hr; + return get_decoder_info(&CLSID_WICJpegDecoder, ppIDecoderInfo); } static HRESULT WINAPI JpegDecoder_CopyPalette(IWICBitmapDecoder *iface, diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 26b5fd5..fd0d197 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -829,20 +829,9 @@ static HRESULT WINAPI PngDecoder_GetContainerFormat(IWICBitmapDecoder *iface, static HRESULT WINAPI PngDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, IWICBitmapDecoderInfo **ppIDecoderInfo) { - HRESULT hr; - IWICComponentInfo *compinfo; - TRACE("(%p,%p)\n", iface, ppIDecoderInfo); - hr = CreateComponentInfo(&CLSID_WICPngDecoder, &compinfo); - if (FAILED(hr)) return hr; - - hr = IWICComponentInfo_QueryInterface(compinfo, &IID_IWICBitmapDecoderInfo, - (void**)ppIDecoderInfo); - - IWICComponentInfo_Release(compinfo); - - return hr; + return get_decoder_info(&CLSID_WICPngDecoder, ppIDecoderInfo); } static HRESULT WINAPI PngDecoder_CopyPalette(IWICBitmapDecoder *iface, diff --git a/dlls/windowscodecs/tgaformat.c b/dlls/windowscodecs/tgaformat.c index ec7fa23..b3d9aea 100644 --- a/dlls/windowscodecs/tgaformat.c +++ b/dlls/windowscodecs/tgaformat.c @@ -360,20 +360,9 @@ static HRESULT WINAPI TgaDecoder_GetContainerFormat(IWICBitmapDecoder *iface, static HRESULT WINAPI TgaDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, IWICBitmapDecoderInfo **ppIDecoderInfo) { - HRESULT hr; - IWICComponentInfo *compinfo; - TRACE("(%p,%p)\n", iface, ppIDecoderInfo); - hr = CreateComponentInfo(&CLSID_WineTgaDecoder, &compinfo); - if (FAILED(hr)) return hr; - - hr = IWICComponentInfo_QueryInterface(compinfo, &IID_IWICBitmapDecoderInfo, - (void**)ppIDecoderInfo); - - IWICComponentInfo_Release(compinfo); - - return hr; + return get_decoder_info(&CLSID_WineTgaDecoder, ppIDecoderInfo); } static HRESULT WINAPI TgaDecoder_CopyPalette(IWICBitmapDecoder *iface, diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 6fe3f19..2b2f84f 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -672,20 +672,9 @@ static HRESULT WINAPI TiffDecoder_GetContainerFormat(IWICBitmapDecoder *iface, static HRESULT WINAPI TiffDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, IWICBitmapDecoderInfo **ppIDecoderInfo) { - HRESULT hr; - IWICComponentInfo *compinfo; - TRACE("(%p,%p)\n", iface, ppIDecoderInfo); - hr = CreateComponentInfo(&CLSID_WICTiffDecoder, &compinfo); - if (FAILED(hr)) return hr; - - hr = IWICComponentInfo_QueryInterface(compinfo, &IID_IWICBitmapDecoderInfo, - (void**)ppIDecoderInfo); - - IWICComponentInfo_Release(compinfo); - - return hr; + return get_decoder_info(&CLSID_WICTiffDecoder, ppIDecoderInfo); } static HRESULT WINAPI TiffDecoder_CopyPalette(IWICBitmapDecoder *iface, diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 037bde2..b29fc1f 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -126,6 +126,7 @@ extern HRESULT CreatePropertyBag2(const PROPBAG2 *options, UINT count, extern HRESULT CreateComponentInfo(REFCLSID clsid, IWICComponentInfo **ppIInfo) DECLSPEC_HIDDEN; extern void ReleaseComponentInfos(void) DECLSPEC_HIDDEN; extern HRESULT CreateComponentEnumerator(DWORD componentTypes, DWORD options, IEnumUnknown **ppIEnumUnknown) DECLSPEC_HIDDEN; +extern HRESULT get_decoder_info(REFCLSID clsid, IWICBitmapDecoderInfo **info) DECLSPEC_HIDDEN; typedef struct BmpDecoder BmpDecoder;

1 0

Louis Lenders : kernel32: Improve stub for SetThreadUILanguage.
by Alexandre Julliard April 2, 2018

April 2, 2018

Module: wine Branch: master Commit: e0f9ff9eb003211ce4fa436b7398851f06e46293 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0f9ff9eb003211ce4fa436b… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sat Mar 31 11:26:24 2018 +0200 kernel32: Improve stub for SetThreadUILanguage. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 6 +++++- dlls/kernel32/tests/locale.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index c5eeabf..5a6ff35 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2821,7 +2821,11 @@ BOOL WINAPI SetThreadLocale( LCID lcid ) LANGID WINAPI SetThreadUILanguage( LANGID langid ) { TRACE("(0x%04x) stub - returning success\n", langid); - return langid; + + if (!langid) + return GetThreadUILanguage(); + else + return langid; } /****************************************************************************** diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 12769f7..a99763d 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -5459,7 +5459,7 @@ static void test_SetThreadUILanguage(void) } res = pSetThreadUILanguage(0); - todo_wine ok(res == pGetThreadUILanguage(), "expected %d got %d\n", pGetThreadUILanguage(), res); + ok(res == pGetThreadUILanguage(), "expected %d got %d\n", pGetThreadUILanguage(), res); res = pSetThreadUILanguage(MAKELANGID(LANG_DUTCH, SUBLANG_DUTCH_BELGIAN)); ok(res == MAKELANGID(LANG_DUTCH, SUBLANG_DUTCH_BELGIAN),

1 0

Jacek Caban : windowscodecs: Store metadata container patterns in meatadata reader info object.
by Alexandre Julliard April 2, 2018

April 2, 2018

Module: wine Branch: master Commit: 8be7a1057e6579bacfc83f62e89f34ac30d94eea URL: https://source.winehq.org/git/wine.git/?a=commit;h=8be7a1057e6579bacfc83f62… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 2 20:49:33 2018 +0200 windowscodecs: Store metadata container patterns in meatadata reader info object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/info.c | 262 ++++++++++++++++++++++++++++------------------ 1 file changed, 162 insertions(+), 100 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8be7a1057e6579bacfc8…

1 0

Alexandre Julliard : ntdll: Add support for loading IL-only dlls.
by Alexandre Julliard April 2, 2018

April 2, 2018

Module: wine Branch: master Commit: 52e09e823e2a2b65f1f993145c0a65ab1d84713d URL: https://source.winehq.org/git/wine.git/?a=commit;h=52e09e823e2a2b65f1f99314… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 2 18:11:51 2018 +0200 ntdll: Add support for loading IL-only dlls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index fe5ce9d..1a3dd80 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -956,7 +956,10 @@ static NTSTATUS fixup_imports_ilonly( WINE_MODREF *wm, LPCWSTR load_path, void * if ((exports = RtlImageDirectoryEntryToData( imp->ldr.BaseAddress, TRUE, IMAGE_DIRECTORY_ENTRY_EXPORT, &exp_size ))) - proc = find_named_export( imp->ldr.BaseAddress, exports, exp_size, "_CorExeMain", -1, load_path ); + { + const char *name = (wm->ldr.Flags & LDR_IMAGE_IS_DLL) ? "_CorDllMain" : "_CorExeMain"; + proc = find_named_export( imp->ldr.BaseAddress, exports, exp_size, name, -1, load_path ); + } if (!proc) return STATUS_PROCEDURE_NOT_FOUND; *entry = proc; return STATUS_SUCCESS; @@ -1929,7 +1932,11 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, ((nt->FileHeader.Characteristics & IMAGE_FILE_DLL) || nt->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_NATIVE)) { - if ((status = fixup_imports( wm, load_path )) != STATUS_SUCCESS) + if (wm->ldr.Flags & LDR_COR_ILONLY) + status = fixup_imports_ilonly( wm, load_path, &wm->ldr.EntryPoint ); + else + status = fixup_imports( wm, load_path ); + if (status != STATUS_SUCCESS) { /* the module has only be inserted in the load & memory order lists */ RemoveEntryList(&wm->ldr.InLoadOrderModuleList);

1 0

Louis Lenders : kernel32: Add stub for RequestDeviceWakeup.
by Alexandre Julliard April 2, 2018

April 2, 2018

Module: wine Branch: master Commit: b1fa1e9a6da4abb161245b33f7350577d321a277 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1fa1e9a6da4abb161245b33… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sun Apr 1 11:06:29 2018 +0200 kernel32: Add stub for RequestDeviceWakeup. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/powermgnt.c | 10 ++++++++++ include/winbase.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 445b84f..4a92913 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1271,12 +1271,12 @@ @ stdcall ReplaceFile(wstr wstr wstr long ptr ptr) ReplaceFileW @ stdcall ReplaceFileA(str str str long ptr ptr) @ stdcall ReplaceFileW(wstr wstr wstr long ptr ptr) -@ stub RequestDeviceWakeup # @ stub RemoveDirectoryTransactedA # @ stub RemoveDirectoryTransactedW @ stdcall RemoveDllDirectory(ptr) # @ stub RemoveSecureMemoryCacheCallback # @ stub ReplacePartitionUnit +@ stdcall RequestDeviceWakeup(long) @ stdcall RequestWakeupLatency(long) @ stdcall ResetEvent(long) @ stdcall ResetWriteWatch(ptr long) diff --git a/dlls/kernel32/powermgnt.c b/dlls/kernel32/powermgnt.c index b5bd0d9..81e43b4 100644 --- a/dlls/kernel32/powermgnt.c +++ b/dlls/kernel32/powermgnt.c @@ -73,6 +73,16 @@ BOOL WINAPI RequestWakeupLatency(LATENCY_TIME latency) } /*********************************************************************** + * RequestDeviceWakeup (KERNEL32.@) + */ +BOOL WINAPI RequestDeviceWakeup(HANDLE device) +{ + FIXME("(%p): stub\n", device); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * SetSystemPowerState (KERNEL32.@) */ BOOL WINAPI SetSystemPowerState(BOOL suspend_or_hibernate, diff --git a/include/winbase.h b/include/winbase.h index e31ebca..02e4194 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2521,6 +2521,7 @@ WINBASEAPI BOOL WINAPI RemoveDirectoryW(LPCWSTR); #define RemoveDirectory WINELIB_NAME_AW(RemoveDirectory) WINADVAPI BOOL WINAPI ReportEventA(HANDLE,WORD,WORD,DWORD,PSID,WORD,DWORD,LPCSTR *,LPVOID); WINADVAPI BOOL WINAPI ReportEventW(HANDLE,WORD,WORD,DWORD,PSID,WORD,DWORD,LPCWSTR *,LPVOID); +WINBASEAPI BOOL WINAPI RequestDeviceWakeup(HANDLE); WINBASEAPI BOOL WINAPI RequestWakeupLatency(LATENCY_TIME latency); #define ReportEvent WINELIB_NAME_AW(ReportEvent) WINBASEAPI BOOL WINAPI ResetEvent(HANDLE);

1 0

Nikolay Sivov : comctl32/static: Remove some misleading comments.
by Alexandre Julliard April 2, 2018

April 2, 2018

Module: wine Branch: master Commit: 64ecb3648ec5f900989829cef9d9cf2381800dd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64ecb3648ec5f900989829ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 2 16:37:32 2018 +0300 comctl32/static: Remove some misleading comments. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/static.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/comctl32/static.c b/dlls/comctl32/static.c index d9e2fe3..5cc02ce 100644 --- a/dlls/comctl32/static.c +++ b/dlls/comctl32/static.c @@ -18,11 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * Notes: - * - Windows XP introduced new behavior: The background of centered - * icons and bitmaps is painted differently. This is only done if - * a manifest is present. - * Because it has not yet been decided how to implement the two - * different modes in Wine, only the Windows XP mode is implemented. * - Controls with SS_SIMPLE but without SS_NOPREFIX: * The text should not be changed. Windows doesn't clear the * client rectangle, so the new text must be larger than the old one. @@ -701,7 +696,6 @@ static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style ) HBITMAP hBitmap, oldbitmap; HBRUSH hbrush; - /* message is still sent, even if the returned brush is not used */ hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); if ((hBitmap = (HBITMAP)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET ))

1 0

Jacek Caban : windowscodecs: Store container formats in metadata component info object.
by Alexandre Julliard April 2, 2018

April 2, 2018

Module: wine Branch: master Commit: f5cdbc21ccb29e4575e8da99325edb26e23d2ffb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5cdbc21ccb29e4575e8da99… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 2 20:49:24 2018 +0200 windowscodecs: Store container formats in metadata component info object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/info.c | 50 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 99034c0..2cec8dc 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -1502,6 +1502,8 @@ typedef struct { ComponentInfo base; HKEY classkey; + GUID *container_formats; + UINT container_count; } MetadataReaderInfo; static inline MetadataReaderInfo *impl_from_IWICMetadataReaderInfo(IWICMetadataReaderInfo *iface) @@ -1554,6 +1556,7 @@ static ULONG WINAPI MetadataReaderInfo_Release(IWICMetadataReaderInfo *iface) if (!ref) { RegCloseKey(This->classkey); + heap_free(This->container_formats); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -1654,10 +1657,20 @@ static HRESULT WINAPI MetadataReaderInfo_GetContainerFormats(IWICMetadataReaderI UINT length, GUID *formats, UINT *actual_length) { MetadataReaderInfo *This = impl_from_IWICMetadataReaderInfo(iface); + TRACE("(%p,%u,%p,%p)\n", iface, length, formats, actual_length); - return ComponentInfo_GetGuidList(This->classkey, containers_keyname, length, - formats, actual_length); + if (!actual_length) + return E_INVALIDARG; + + *actual_length = This->container_count; + if (formats) + { + if (This->container_count && length < This->container_count) + return WINCODEC_ERR_INSUFFICIENTBUFFER; + memcpy(formats, This->container_formats, This->container_count); + } + return S_OK; } static HRESULT WINAPI MetadataReaderInfo_GetDeviceManufacturer(IWICMetadataReaderInfo *iface, @@ -1915,11 +1928,36 @@ static const IWICMetadataReaderInfoVtbl MetadataReaderInfo_Vtbl = { MetadataReaderInfo_CreateInstance }; +static BOOL read_metadata_info(MetadataReaderInfo *info) +{ + UINT format_count; + GUID *formats; + HRESULT hr; + + hr = ComponentInfo_GetGuidList(info->classkey, containers_keyname, 0, NULL, &format_count); + if (FAILED(hr)) return TRUE; + + formats = heap_calloc(format_count, sizeof(*formats)); + if (!formats) return FALSE; + + hr = ComponentInfo_GetGuidList(info->classkey, containers_keyname, format_count, formats, + &format_count); + if (FAILED(hr)) + { + heap_free(formats); + return FALSE; + } + + info->container_formats = formats; + info->container_count = format_count; + return TRUE; +} + static HRESULT MetadataReaderInfo_Constructor(HKEY classkey, REFCLSID clsid, ComponentInfo **info) { MetadataReaderInfo *This; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = heap_alloc_zero(sizeof(*This)); if (!This) { RegCloseKey(classkey); @@ -1931,6 +1969,12 @@ static HRESULT MetadataReaderInfo_Constructor(HKEY classkey, REFCLSID clsid, Com This->classkey = classkey; This->base.clsid = *clsid; + if (!read_metadata_info(This)) + { + IWICComponentInfo_Release(&This->base.IWICComponentInfo_iface); + return WINCODEC_ERR_COMPONENTNOTFOUND; + } + *info = &This->base; return S_OK; }

1 0