January 2018 - Wine-Devel - list.winehq.org

[PATCH 02/10] msvcp100: Add _Concurrent_queue_base_v4::_Internal_throw_exception implementation
by Piotr Caban Jan. 23, 2018

Jan. 23, 2018

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/misc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[PATCH 01/10] msvcp100: Add Concurrency::details::_Concurrent_queue_base_v4 class stub
by Piotr Caban Jan. 23, 2018

Jan. 23, 2018

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/concrt140/concrt140.spec | 40 ++++----- dlls/msvcp100/msvcp100.spec | 32 +++---- dlls/msvcp110/msvcp110.spec | 60 ++++++------- dlls/msvcp120/msvcp120.spec | 60 ++++++------- dlls/msvcp120_app/msvcp120_app.spec | 60 ++++++------- dlls/msvcp90/misc.c | 170 ++++++++++++++++++++++++++++++++++++ 6 files changed, 296 insertions(+), 126 deletions(-)

1 0

[PATCH 1/2] include: Add generic HeapAlloc() wrappers
by Michael Stefaniuc Jan. 23, 2018

Jan. 23, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- I know that Alexandre and Jacek wanted to work on the HeapAlloc wrappers. But I don't remember if I had promised (or not) at the last WineConf to dig up my old patch and polish it up and submit it to serve as a discussion start point. Anyway, here it is with some explanations. The _nofail variants should not "fail" memory allocations and will raise an exception on out of memory conditions. heap_alloc_nofail thus will never return NULL. heap_realloc_nofail can still return NULL but *only* when the alloc size is 0 and thus functions as heap_free. Checking the returned pointer for NULL is not needed when the size != 0. And the "assign to temp pointer to prevent mem leak on failure" workaround is never needed. The _nofail variants should be used only for small allocations that are not application driven. Preferabely the allocation sizes should be known at compile time. Careful when allocating memory for COM and other objects: The main object should not be allocated with the _nofail variants. Subsequent small allocations in the same object could use the _nofail version. heap_alloc_zero was renamed to heap_zalloc to shorten it. Especially heap_alloc_zero_nofail would be too long. Same for heap_realloc_zero. The rename shouldn't be too painful: On a quick grep I found just a handfull of heap_realloc_zero and about 470 heap_alloc_zero. I'm also expecting that a good part of those heap_alloc_zero would be changed anyway to the _nofail variant or to heap_calloc. Also adding "z" in front of the alloc function name is common: The Linux kernel uses kzalloc and $ man -k alloc_zero alloc_zero: nothing appropriate. $ man -k zalloc CRYPTO_secure_zalloc (3ssl) - secure heap storage CRYPTO_zalloc (3ssl) - Memory allocation functions OPENSSL_secure_zalloc (3ssl) - secure heap storage OPENSSL_zalloc (3ssl) - Memory allocation functions heap_realloc variants follow the sane POSIX / C realloc behavior: - Passing size 0 will free the old memory. - Passing NULL as memory pointer will allocate new memory. heap_free() returns void like free(): - No existing use of the heap_free() return value. - There are a few "return HeapFree()" statements but more than half of those are just in heap_free() wrappers. - The rest of "return HeapFree()" are in "destroy object" style functions, mostly in gdi32. Most are internal helpers but I didn't bother tracing them if the return value is needed or not. Added heap_calloc() that matches the calloc behavior and always zeroes the memory. Thus there is no heap_zcalloc(). heap_calloc() (differently named) is already used in the D3D related dlls. I could also immediately make use of it in vbscript. I'm not sure if a heap_calloc_nofail would make sense. Can be added later if there is a real need for it. Now let the bikeshedding begin! include/Makefile.in | 1 + include/wine/heap.h | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+) create mode 100644 include/wine/heap.h diff --git a/include/Makefile.in b/include/Makefile.in index 430c4733af..d107cf7919 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -678,6 +678,7 @@ HEADER_SRCS = \ windowsx.h \ wine/debug.h \ wine/exception.h \ + wine/heap.h \ wine/library.h \ wine/unicode.h \ winerror.h \ diff --git a/include/wine/heap.h b/include/wine/heap.h new file mode 100644 index 0000000000..ec10db67be --- /dev/null +++ b/include/wine/heap.h @@ -0,0 +1,127 @@ +/* + * Wine heap memory allocation wrappers + * + * Copyright 2006 Jacek Caban for CodeWeavers + * Copyright 2013,2018 Michael Stefaniuc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_WINE_HEAP_H +#define __WINE_WINE_HEAP_H + +#include <windef.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/* HeapAlloc wrappers + + * "zalloc" variants + * The returned memory is initialized with zero. + + * "nofail" variants + * The returned pointer is never NULL and an exception is raised in out of memory conditions. + * Use only for small allocations that are not application driven. + * Preferabely the allocation size should be known at compile time. + */ +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(SIZE_T len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_nofail(SIZE_T len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, len); +} + +static inline void * __WINE_ALLOC_SIZE(1) heap_zalloc(SIZE_T len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + +static inline void * __WINE_ALLOC_SIZE(1) heap_zalloc_nofail(SIZE_T len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS | HEAP_ZERO_MEMORY, len); +} + +/* HeapReAlloc wrappers with POSIX / C realloc() behavior: + * Passing size 0 will free the old memory. + * Passing NULL as memory pointer will allocate new memory. + + * "zalloc" variants + * The returned memory is initialized with zero. + + * "nofail" variants + * The returned pointer is NULL only when the size == 0 and the memory is freed, + * Raises an exception in out of memory conditions. + * Use only for small allocations that are not application driven. + * Preferabely the allocation size should be known at compile time. + */ +static inline void * __WINE_ALLOC_SIZE(2) _heap_realloc(void *mem, SIZE_T len, DWORD flags) +{ + if (len) { + if (mem) + return HeapReAlloc(GetProcessHeap(), flags, mem, len); + else + return HeapAlloc(GetProcessHeap(), flags, len); + } else { + HeapFree(GetProcessHeap(), 0, mem); + return NULL; + } +} + +static inline void * __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, SIZE_T len) +{ + return _heap_realloc(mem, len, 0); +} + +static inline void * __WINE_ALLOC_SIZE(2) heap_realloc_nofail(void *mem, SIZE_T len) +{ + return _heap_realloc(mem, len, HEAP_GENERATE_EXCEPTIONS); +} + +static inline void * __WINE_ALLOC_SIZE(2) heap_zrealloc(void *mem, SIZE_T len) +{ + return _heap_realloc(mem, len, HEAP_ZERO_MEMORY); +} + +static inline void * __WINE_ALLOC_SIZE(2) heap_zrealloc_nofail(void *mem, SIZE_T len) +{ + return _heap_realloc(mem, len, HEAP_GENERATE_EXCEPTIONS | HEAP_ZERO_MEMORY); +} + +/* heap_calloc + * calloc() like wrapper that zeroes the returned memory. + */ +static inline void * __WINE_ALLOC_SIZE(2) heap_calloc(SIZE_T count, SIZE_T size) +{ + if (count > ~(SIZE_T)0 / size) + return NULL; + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, count * size); +} + + +static inline void heap_free(void *mem) +{ + HeapFree(GetProcessHeap(), 0, mem); +} + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_WINE_HEAP_H */ -- 2.14.3

3 5

[PATCH 1/4] comctl32/tests: Link to activation context API directly
by Nikolay Sivov Jan. 23, 2018

Jan. 23, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/button.c | 10 ++-------- dlls/comctl32/tests/v6util.h | 43 +++++++------------------------------------ 2 files changed, 9 insertions(+), 44 deletions(-) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 41cf165ad9..441ca581c5 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -54,20 +54,14 @@ struct wndclass_redirect_data /* returned pointer is valid as long as activation context is alive */ static WCHAR* get_versioned_classname(const WCHAR *name) { - BOOL (WINAPI *pFindActCtxSectionStringW)(DWORD,const GUID *,ULONG,LPCWSTR,PACTCTX_SECTION_KEYED_DATA); struct wndclass_redirect_data *wnddata; ACTCTX_SECTION_KEYED_DATA data; BOOL ret; - pFindActCtxSectionStringW = (void*)GetProcAddress(GetModuleHandleA("kernel32"), "FindActCtxSectionStringW"); - memset(&data, 0, sizeof(data)); data.cbSize = sizeof(data); - - ret = pFindActCtxSectionStringW(0, NULL, - ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, - name, &data); - ok(ret, "got %d, error %u\n", ret, GetLastError()); + ret = FindActCtxSectionStringW(0, NULL, ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, name, &data); + ok(ret, "Failed to find class redirection section, error %u\n", GetLastError()); wnddata = (struct wndclass_redirect_data*)data.lpData; return (WCHAR*)((BYTE*)wnddata + wnddata->name_offset); } diff --git a/dlls/comctl32/tests/v6util.h b/dlls/comctl32/tests/v6util.h index 9f5a9c48da..afdc12c65a 100644 --- a/dlls/comctl32/tests/v6util.h +++ b/dlls/comctl32/tests/v6util.h @@ -62,48 +62,19 @@ static const CHAR manifest[] = static void unload_v6_module(ULONG_PTR cookie, HANDLE hCtx) { - HANDLE hKernel32; - BOOL (WINAPI *pDeactivateActCtx)(DWORD, ULONG_PTR); - VOID (WINAPI *pReleaseActCtx)(HANDLE); - - hKernel32 = GetModuleHandleA("kernel32.dll"); - pDeactivateActCtx = (void*)GetProcAddress(hKernel32, "DeactivateActCtx"); - pReleaseActCtx = (void*)GetProcAddress(hKernel32, "ReleaseActCtx"); - if (!pDeactivateActCtx || !pReleaseActCtx) - { - win_skip("Activation contexts unsupported\n"); - return; - } - - pDeactivateActCtx(0, cookie); - pReleaseActCtx(hCtx); + DeactivateActCtx(0, cookie); + ReleaseActCtx(hCtx); DeleteFileA(manifest_name); } static BOOL load_v6_module(ULONG_PTR *pcookie, HANDLE *hCtx) { - HANDLE hKernel32; - HANDLE (WINAPI *pCreateActCtxA)(ACTCTXA*); - BOOL (WINAPI *pActivateActCtx)(HANDLE, ULONG_PTR*); - BOOL (WINAPI *pFindActCtxSectionStringA)(DWORD,const GUID *,ULONG,LPCSTR,PACTCTX_SECTION_KEYED_DATA); - ACTCTX_SECTION_KEYED_DATA data; - + DWORD written; ACTCTXA ctx; - BOOL ret; HANDLE file; - DWORD written; - - hKernel32 = GetModuleHandleA("kernel32.dll"); - pCreateActCtxA = (void*)GetProcAddress(hKernel32, "CreateActCtxA"); - pActivateActCtx = (void*)GetProcAddress(hKernel32, "ActivateActCtx"); - pFindActCtxSectionStringA = (void*)GetProcAddress(hKernel32, "FindActCtxSectionStringA"); - if (!(pCreateActCtxA && pActivateActCtx)) - { - win_skip("Activation contexts unsupported. No version 6 tests possible.\n"); - return FALSE; - } + BOOL ret; /* create manifest */ file = CreateFileA( manifest_name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL ); @@ -131,10 +102,10 @@ static BOOL load_v6_module(ULONG_PTR *pcookie, HANDLE *hCtx) ctx.cbSize = sizeof(ctx); ctx.lpSource = manifest_name; - *hCtx = pCreateActCtxA(&ctx); + *hCtx = CreateActCtxA(&ctx); ok(*hCtx != 0, "Expected context handle\n"); - ret = pActivateActCtx(*hCtx, pcookie); + ret = ActivateActCtx(*hCtx, pcookie); expect(TRUE, ret); if (!ret) @@ -144,7 +115,7 @@ static BOOL load_v6_module(ULONG_PTR *pcookie, HANDLE *hCtx) } data.cbSize = sizeof(data); - ret = pFindActCtxSectionStringA(0, NULL, ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, + ret = FindActCtxSectionStringA(0, NULL, ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, "comctl32.dll", &data); ok(ret, "failed to find comctl32.dll in active context, %u\n", GetLastError()); if (ret) -- 2.15.1

1 3

[PATCH] gdi32: Allocate the bitmap bits during CreateBitmapIndirect() to catch out-of-memory errors.
by Huw Davies Jan. 23, 2018

Jan. 23, 2018

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/bitmap.c | 20 ++++++++++++++++---- dlls/gdi32/dibdrv/dc.c | 7 ------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index c16793d82b..0ae5b20052 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -145,6 +145,8 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) BITMAP bm; BITMAPOBJ *bmpobj; HBITMAP hbitmap; + INT dib_stride; + SIZE_T size; if (!bmp || bmp->bmType) { @@ -194,10 +196,13 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) /* Windows ignores the provided bm.bmWidthBytes */ bm.bmWidthBytes = get_bitmap_stride( bm.bmWidth, bm.bmBitsPixel ); - /* XP doesn't allow creating bitmaps larger than 128 MB */ - if (bm.bmHeight > 128 * 1024 * 1024 / bm.bmWidthBytes) + + dib_stride = get_dib_stride( bm.bmWidth, bm.bmBitsPixel ); + size = dib_stride * bm.bmHeight; + /* Check for overflow (dib_stride itself must be ok because of the constraint on bm.bmWidth above). */ + if (dib_stride != size / bm.bmHeight) { - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + SetLastError( ERROR_INVALID_PARAMETER ); return 0; } @@ -209,10 +214,17 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) } bmpobj->dib.dsBm = bm; - bmpobj->dib.dsBm.bmBits = NULL; + bmpobj->dib.dsBm.bmBits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); + if (!bmpobj->dib.dsBm.bmBits) + { + HeapFree( GetProcessHeap(), 0, bmpobj ); + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return 0; + } if (!(hbitmap = alloc_gdi_handle( bmpobj, OBJ_BITMAP, &bitmap_funcs ))) { + HeapFree( GetProcessHeap(), 0, bmpobj->dib.dsBm.bmBits ); HeapFree( GetProcessHeap(), 0, bmpobj ); return 0; } diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index aee305fda8..2447093921 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -168,13 +168,6 @@ BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp) BITMAPINFO info; get_ddb_bitmapinfo( bmp, &info ); - if (!bmp->dib.dsBm.bmBits) - { - int width_bytes = get_dib_stride( bmp->dib.dsBm.bmWidth, bmp->dib.dsBm.bmBitsPixel ); - bmp->dib.dsBm.bmBits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - bmp->dib.dsBm.bmHeight * width_bytes ); - if (!bmp->dib.dsBm.bmBits) return FALSE; - } init_dib_info_from_bitmapinfo( dib, &info, bmp->dib.dsBm.bmBits ); } else init_dib_info( dib, &bmp->dib.dsBmih, bmp->dib.dsBm.bmWidthBytes, -- 2.12.0

1 0

[PATCH] ole32: Prevent adding additional cache entries to static class caches.
by Sergio Gómez Del Real Jan. 23, 2018

Jan. 23, 2018

Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- dlls/ole32/datacache.c | 4 ++++ dlls/ole32/tests/ole2.c | 23 +++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 4ba08268d7..fa0c857f15 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -2440,6 +2440,10 @@ static HRESULT WINAPI DataCache_Cache( *pdwConnection = cache_entry->id; return CACHE_S_SAMECACHE; } + if (IsEqualCLSID(&This->clsid, &CLSID_Picture_Dib) || + IsEqualCLSID(&This->clsid, &CLSID_Picture_Metafile) || + IsEqualCLSID(&This->clsid, &CLSID_Picture_EnhMetafile)) + return DV_E_FORMATETC; hr = DataCache_CreateEntry(This, &fmt_cpy, advf, FALSE, &cache_entry); diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index fe45c6a73e..a9f68f15ba 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -2426,6 +2426,29 @@ static void test_data_cache_cache(void) IDataObject_Release( data ); IOleCache2_Release( cache ); + + /* tests for a static class cache */ + hr = CreateDataCache( NULL, &CLSID_Picture_Dib, &IID_IOleCache2, (void **)&cache ); + + fmt.cfFormat = CF_DIB; + fmt.dwAspect = DVASPECT_CONTENT; + fmt.tymed = TYMED_HGLOBAL; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == CACHE_S_SAMECACHE, "got %08x\n", hr ); + + /* aspect other than DVASPECT_CONTENT should fail */ + fmt.dwAspect = DVASPECT_THUMBNAIL; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( FAILED(hr), "got %08x\n", hr ); + + /* try caching another clip format */ + fmt.dwAspect = DVASPECT_CONTENT; + fmt.cfFormat = CF_METAFILEPICT; + fmt.tymed = TYMED_MFPICT; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( FAILED(hr), "got %08x\n", hr ); + + IOleCache2_Release( cache ); } /* The CLSID_Picture_ classes automatically create appropriate cache entries */ -- 2.14.1

2 1

[PATCH 3/3] ole32: Prevent adding additional cache entries to static class caches.
by Huw Davies Jan. 23, 2018

Jan. 23, 2018

From: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/datacache.c | 2 ++ dlls/ole32/tests/ole2.c | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 8c5df32f6e..60ddd386ba 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -2453,6 +2453,8 @@ static HRESULT WINAPI DataCache_Cache( return CACHE_S_SAMECACHE; } + if (This->clsid_static) return DV_E_FORMATETC; + hr = DataCache_CreateEntry(This, &fmt_cpy, advf, FALSE, &cache_entry); if (SUCCEEDED(hr)) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 7fcb1aa1e0..d83ca00a66 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -2426,6 +2426,29 @@ static void test_data_cache_cache(void) IDataObject_Release( data ); IOleCache2_Release( cache ); + + /* tests for a static class cache */ + hr = CreateDataCache( NULL, &CLSID_Picture_Dib, &IID_IOleCache2, (void **)&cache ); + + fmt.cfFormat = CF_DIB; + fmt.dwAspect = DVASPECT_CONTENT; + fmt.tymed = TYMED_HGLOBAL; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == CACHE_S_SAMECACHE, "got %08x\n", hr ); + + /* aspect other than DVASPECT_CONTENT should fail */ + fmt.dwAspect = DVASPECT_THUMBNAIL; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( FAILED(hr), "got %08x\n", hr ); + + /* try caching another clip format */ + fmt.dwAspect = DVASPECT_CONTENT; + fmt.cfFormat = CF_METAFILEPICT; + fmt.tymed = TYMED_MFPICT; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( FAILED(hr), "got %08x\n", hr ); + + IOleCache2_Release( cache ); } /* The CLSID_Picture_ classes automatically create appropriate cache entries */ -- 2.12.0

1 0

[PATCH 2/3] ole32: Explicitly enumerate the presentation streams rather than using EnumElements.
by Huw Davies Jan. 23, 2018

Jan. 23, 2018

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/datacache.c | 75 +++++++++++++++++++------------------------------- 1 file changed, 28 insertions(+), 47 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 685abdbb49..8c5df32f6e 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -446,23 +446,6 @@ static void DataCache_FireOnViewChange( } } -/* Helper for DataCacheEntry_OpenPresStream */ -static BOOL DataCache_IsPresentationStream(const STATSTG *elem) -{ - /* The presentation streams have names of the form "\002OlePresXXX", - * where XXX goes from 000 to 999. */ - static const WCHAR OlePres[] = { 2,'O','l','e','P','r','e','s' }; - - LPCWSTR name = elem->pwcsName; - - return (elem->type == STGTY_STREAM) - && (strlenW(name) == 11) - && (strncmpW(name, OlePres, 8) == 0) - && (name[8] >= '0') && (name[8] <= '9') - && (name[9] >= '0') && (name[9] <= '9') - && (name[10] >= '0') && (name[10] <= '9'); -} - static HRESULT read_clipformat(IStream *stream, CLIPFORMAT *clipformat) { DWORD length; @@ -583,6 +566,15 @@ static HRESULT DataCacheEntry_OpenPresStream(DataCacheEntry *cache_entry, IStrea return hr; } +static HRESULT open_pres_stream( IStorage *stg, int stream_number, IStream **stm ) +{ + WCHAR name[] = {2,'O','l','e','P','r','e','s', + '0' + (stream_number / 100) % 10, + '0' + (stream_number / 10) % 10, + '0' + stream_number % 10, 0}; + + return IStorage_OpenStream( stg, name, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, stm ); +} static HRESULT load_mf_pict( DataCacheEntry *cache_entry, IStream *stm ) { @@ -1734,49 +1726,38 @@ static HRESULT add_cache_entry( DataCache *This, const FORMATETC *fmt, DWORD adv return hr; } -static HRESULT parse_pres_streams( DataCache *This, IStorage *stg ) +static HRESULT parse_pres_streams( DataCache *cache, IStorage *stg ) { HRESULT hr; - IEnumSTATSTG *stat_enum; - STATSTG stat; IStream *stm; PresentationDataHeader header; ULONG actual_read; CLIPFORMAT clipformat; FORMATETC fmtetc; + int stream_number = 0; - hr = IStorage_EnumElements( stg, 0, NULL, 0, &stat_enum ); - if (FAILED( hr )) return hr; - - while ((hr = IEnumSTATSTG_Next( stat_enum, 1, &stat, NULL )) == S_OK) + do { - if (DataCache_IsPresentationStream( &stat )) - { - hr = IStorage_OpenStream( stg, stat.pwcsName, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, - 0, &stm ); - if (SUCCEEDED( hr )) - { - hr = read_clipformat( stm, &clipformat ); + hr = open_pres_stream( stg, stream_number, &stm ); + if (FAILED(hr)) break; - if (hr == S_OK) - hr = IStream_Read( stm, &header, sizeof(header), &actual_read ); + hr = read_clipformat( stm, &clipformat ); - if (hr == S_OK && actual_read == sizeof(header)) - { - fmtetc.cfFormat = clipformat; - fmtetc.ptd = NULL; /* FIXME */ - fmtetc.dwAspect = header.dvAspect; - fmtetc.lindex = header.lindex; - fmtetc.tymed = tymed_from_cf( clipformat ); + if (hr == S_OK) hr = IStream_Read( stm, &header, sizeof(header), &actual_read ); - add_cache_entry( This, &fmtetc, header.advf, stm, pres_stream ); - } - IStream_Release( stm ); - } + if (hr == S_OK && actual_read == sizeof(header)) + { + fmtetc.cfFormat = clipformat; + fmtetc.ptd = NULL; /* FIXME */ + fmtetc.dwAspect = header.dvAspect; + fmtetc.lindex = header.lindex; + fmtetc.tymed = tymed_from_cf( clipformat ); + + add_cache_entry( cache, &fmtetc, header.advf, stm, pres_stream ); } - CoTaskMemFree( stat.pwcsName ); - } - IEnumSTATSTG_Release( stat_enum ); + IStream_Release( stm ); + stream_number++; + } while (hr == S_OK); return S_OK; } -- 2.12.0

1 0

[PATCH 1/3] ole32: Only load the contents stream for the static clsids.
by Huw Davies Jan. 23, 2018

Jan. 23, 2018

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/datacache.c | 47 ++++++++++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index e2ff928ba8..685abdbb49 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -162,6 +162,9 @@ struct DataCache IAdviseSink *sinkInterface; CLSID clsid; + /* Is the clsid one of the CLSID_Picture classes */ + BOOL clsid_static; + IStorage *presentationStorage; /* list of cache entries */ @@ -1307,9 +1310,13 @@ static HRESULT create_automatic_entry(DataCache *cache, const CLSID *clsid) while (ptr->clsid) { if (IsEqualCLSID( clsid, ptr->clsid )) + { + cache->clsid_static = TRUE; return DataCache_CreateEntry( cache, &ptr->fmt, 0, TRUE, NULL ); + } ptr++; } + cache->clsid_static = FALSE; return S_OK; } @@ -1776,24 +1783,33 @@ static HRESULT parse_pres_streams( DataCache *This, IStorage *stg ) static const FORMATETC static_dib_fmt = { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }; -static HRESULT parse_contents_stream( DataCache *This, IStorage *stg, IStream *stm ) +static HRESULT parse_contents_stream( DataCache *This, IStorage *stg ) { HRESULT hr; STATSTG stat; const FORMATETC *fmt; + IStream *stm; - hr = IStorage_Stat( stg, &stat, STATFLAG_NONAME ); + hr = IStorage_OpenStream( stg, CONTENTS, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm ); if (FAILED( hr )) return hr; + hr = IStorage_Stat( stg, &stat, STATFLAG_NONAME ); + if (FAILED( hr )) goto done; + if (IsEqualCLSID( &stat.clsid, &CLSID_Picture_Dib )) fmt = &static_dib_fmt; else { FIXME("unsupported format %s\n", debugstr_guid( &stat.clsid )); - return E_FAIL; + hr = E_FAIL; + goto done; } - return add_cache_entry( This, fmt, 0, stm, contents_stream ); + hr = add_cache_entry( This, fmt, 0, stm, contents_stream ); + +done: + IStream_Release( stm ); + return hr; } /************************************************************************ @@ -1804,42 +1820,38 @@ static HRESULT parse_contents_stream( DataCache *This, IStorage *stg, IStream *s * and it will load the presentation information when the * IDataObject_GetData or IViewObject2_Draw methods are called. */ -static HRESULT WINAPI DataCache_Load( IPersistStorage *iface, IStorage *pStg ) +static HRESULT WINAPI DataCache_Load( IPersistStorage *iface, IStorage *stg ) { DataCache *This = impl_from_IPersistStorage(iface); HRESULT hr; - IStream *stm; CLSID clsid; DataCacheEntry *entry, *cursor2; - TRACE("(%p, %p)\n", iface, pStg); + TRACE("(%p, %p)\n", iface, stg); IPersistStorage_HandsOffStorage( iface ); LIST_FOR_EACH_ENTRY_SAFE( entry, cursor2, &This->cache_list, DataCacheEntry, entry ) DataCacheEntry_Destroy( This, entry ); - ReadClassStg( pStg, &clsid ); + ReadClassStg( stg, &clsid ); hr = create_automatic_entry( This, &clsid ); if (FAILED( hr )) return hr; This->clsid = clsid; - hr = IStorage_OpenStream( pStg, CONTENTS, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, - 0, &stm ); - if (SUCCEEDED( hr )) + if (This->clsid_static) { - hr = parse_contents_stream( This, pStg, stm ); - IStream_Release( stm ); + hr = parse_contents_stream( This, stg ); + if (FAILED(hr)) hr = parse_pres_streams( This, stg ); } - - if (FAILED(hr)) - hr = parse_pres_streams( This, pStg ); + else + hr = parse_pres_streams( This, stg ); if (SUCCEEDED( hr )) { This->dirty = FALSE; - This->presentationStorage = pStg; + This->presentationStorage = stg; IStorage_AddRef( This->presentationStorage ); } @@ -2978,6 +2990,7 @@ static DataCache* DataCache_Construct( newObject->sinkAdviseFlag = 0; newObject->sinkInterface = 0; newObject->clsid = CLSID_NULL; + newObject->clsid_static = FALSE; newObject->presentationStorage = NULL; list_init(&newObject->cache_list); newObject->last_cache_id = 2; -- 2.12.0

1 0

[PATCH] iphlpapi: Implement if_indextoname.
by Hans Leidekker Jan. 23, 2018

Jan. 23, 2018

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 10 ++++++++++ dlls/iphlpapi/tests/iphlpapi.c | 45 +++++++++++++++++++++++++++++------------- include/netioapi.h | 2 ++ 4 files changed, 44 insertions(+), 15 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index fee99607b6..b6c9aef2f8 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -159,7 +159,7 @@ @ stdcall IcmpSendEcho2Ex(ptr ptr ptr ptr long long ptr long ptr ptr long long) @ stdcall IcmpSendEcho2(ptr ptr ptr ptr long ptr long ptr ptr long long) @ stdcall IcmpSendEcho(ptr long ptr long ptr ptr long long) -#@ stub if_indextoname +@ stdcall if_indextoname(long ptr) IPHLP_if_indextoname @ stdcall if_nametoindex(str) IPHLP_if_nametoindex #@ stub InitializeIpForwardEntry #@ stub InitializeIpInterfaceEntry diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 5f36d4666d..d31504e5a9 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3237,3 +3237,13 @@ IF_INDEX WINAPI IPHLP_if_nametoindex(const char *name) return 0; } + +/****************************************************************** + * if_indextoname (IPHLPAPI.@) + */ +PCHAR WINAPI IPHLP_if_indextoname(NET_IFINDEX index, PCHAR name) +{ + TRACE("(%u, %p)\n", index, name); + + return getInterfaceNameByIndex(index, name); +} diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index ccaafd728e..f0d19673f4 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -99,6 +99,7 @@ static DWORD (WINAPI *pConvertInterfaceLuidToNameA)(const NET_LUID*,char*,SIZE_T static DWORD (WINAPI *pConvertInterfaceNameToLuidA)(const char*,NET_LUID*); static DWORD (WINAPI *pConvertInterfaceNameToLuidW)(const WCHAR*,NET_LUID*); +static PCHAR (WINAPI *pif_indextoname)(NET_IFINDEX,PCHAR); static NET_IFINDEX (WINAPI *pif_nametoindex)(const char*); static void loadIPHlpApi(void) @@ -151,6 +152,7 @@ static void loadIPHlpApi(void) pConvertInterfaceLuidToNameW = (void *)GetProcAddress(hLibrary, "ConvertInterfaceLuidToNameW"); pConvertInterfaceNameToLuidA = (void *)GetProcAddress(hLibrary, "ConvertInterfaceNameToLuidA"); pConvertInterfaceNameToLuidW = (void *)GetProcAddress(hLibrary, "ConvertInterfaceNameToLuidW"); + pif_indextoname = (void *)GetProcAddress(hLibrary, "if_indextoname"); pif_nametoindex = (void *)GetProcAddress(hLibrary, "if_nametoindex"); } } @@ -1789,7 +1791,7 @@ static void test_interface_identifier_conversion(void) GUID guid; SIZE_T len; WCHAR nameW[IF_MAX_STRING_SIZE + 1]; - char nameA[IF_MAX_STRING_SIZE + 1]; + char nameA[IF_MAX_STRING_SIZE + 1], *name; NET_IFINDEX index, index2; if (!pConvertInterfaceIndexToLuid) @@ -1950,22 +1952,37 @@ static void test_interface_identifier_conversion(void) ok( luid.Info.NetLuidIndex != 0xdead, "index not set\n" ); ok( luid.Info.IfType == IF_TYPE_ETHERNET_CSMACD, "got %u\n", luid.Info.IfType ); - /* if_nametoindex */ - if (pif_nametoindex) + if (!pif_nametoindex || !pif_indextoname) { - index2 = pif_nametoindex( NULL ); - ok( !index2, "Got unexpected index %u\n", index2 ); - index2 = pif_nametoindex( nameA ); - ok( index2 == index, "Got index %u for %s, expected %u\n", index2, nameA, index ); - /* Wargaming.net Game Center passes a GUID-like string. */ - index2 = pif_nametoindex( "{00000001-0000-0000-0000-000000000000}" ); - ok( !index2, "Got unexpected index %u\n", index2 ); - index2 = pif_nametoindex( wine_dbgstr_guid( &guid ) ); - ok( !index2, "Got unexpected index %u for input %s\n", index2, wine_dbgstr_guid( &guid ) ); + skip("if_nametoindex/if_indextoname not supported\n"); + return; } - else + + index2 = pif_nametoindex( NULL ); + ok( !index2, "Got unexpected index %u\n", index2 ); + index2 = pif_nametoindex( nameA ); + ok( index2 == index, "Got index %u for %s, expected %u\n", index2, nameA, index ); + /* Wargaming.net Game Center passes a GUID-like string. */ + index2 = pif_nametoindex( "{00000001-0000-0000-0000-000000000000}" ); + ok( !index2, "Got unexpected index %u\n", index2 ); + index2 = pif_nametoindex( wine_dbgstr_guid( &guid ) ); + ok( !index2, "Got unexpected index %u for input %s\n", index2, wine_dbgstr_guid( &guid ) ); + + name = pif_indextoname( 0, NULL ); + ok( name == NULL, "got %s\n", name ); + + name = pif_indextoname( 0, nameA ); + ok( name == NULL, "got %p\n", name ); + + name = pif_indextoname( ~0u, nameA ); + ok( name == NULL, "got %p\n", name ); + + nameA[0] = 0; + name = pif_indextoname( 1, nameA ); + if (name != NULL) { - skip("if_nametoindex not supported\n"); + ok( name[0], "empty name\n" ); + ok( name == nameA, "got %p\n", name ); } } diff --git a/include/netioapi.h b/include/netioapi.h index 4f5f67171c..109588804a 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -174,5 +174,7 @@ void WINAPI FreeMibTable(void*); DWORD WINAPI GetIfEntry2(MIB_IF_ROW2*); DWORD WINAPI GetIfTable2(MIB_IF_TABLE2**); DWORD WINAPI GetUnicastIpAddressEntry(MIB_UNICASTIPADDRESS_ROW*); +PCHAR WINAPI if_indextoname(NET_IFINDEX,PCHAR); +NET_IFINDEX WINAPI if_nametoindex(PCSTR); #endif /* __WINE_NETIOAPI_H */ -- 2.11.0

1 0