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

[PATCH 1/3] ole32/tests: Simplify implicit MTA tests.
by Zebediah Figura April 9, 2018

April 9, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ole32/tests/compobj.c | 228 +++++++++------------------------------------ 1 file changed, 46 insertions(+), 182 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index f1e0134..0ce941b 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -602,25 +602,6 @@ static void test_StringFromGUID2(void) ok(len == 0, "len: %d (expected 0)\n", len); } -struct info -{ - HANDLE wait, stop; -}; - -static DWORD CALLBACK ole_initialize_thread(LPVOID pv) -{ - HRESULT hr; - struct info *info = pv; - - hr = pCoInitializeEx(NULL, COINIT_MULTITHREADED); - - SetEvent(info->wait); - WaitForSingleObject(info->stop, 10000); - - CoUninitialize(); - return hr; -} - #define test_apt_type(t, q, t_t, t_q) _test_apt_type(t, q, t_t, t_q, __LINE__) static void _test_apt_type(APTTYPE expected_type, APTTYPEQUALIFIER expected_qualifier, BOOL todo_type, BOOL todo_qualifier, int line) @@ -644,10 +625,7 @@ todo_wine_if(todo_qualifier) static void test_CoCreateInstance(void) { HRESULT hr; - HANDLE thread; - DWORD tid, exitcode; IUnknown *pUnk; - struct info info; REFCLSID rclsid = &CLSID_InternetZoneManager; pUnk = (IUnknown *)0xdeadbeef; @@ -682,51 +660,15 @@ static void test_CoCreateInstance(void) hr = CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk); ok(hr == CO_E_NOTINITIALIZED, "CoCreateInstance should have returned CO_E_NOTINITIALIZED instead of 0x%08x\n", hr); - /* show that COM doesn't have to be initialized for multi-threaded apartments if another - thread has already done so */ - - test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); - - info.wait = CreateEventA(NULL, TRUE, FALSE, NULL); - ok(info.wait != NULL, "CreateEvent failed with error %d\n", GetLastError()); - - info.stop = CreateEventA(NULL, TRUE, FALSE, NULL); - ok(info.stop != NULL, "CreateEvent failed with error %d\n", GetLastError()); - - thread = CreateThread(NULL, 0, ole_initialize_thread, &info, 0, &tid); - ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); - - ok( !WaitForSingleObject(info.wait, 10000 ), "wait timed out\n" ); - - test_apt_type(APTTYPE_MTA, APTTYPEQUALIFIER_IMPLICIT_MTA, TRUE, TRUE); - - pUnk = (IUnknown *)0xdeadbeef; - hr = CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk); - ok(hr == S_OK, "CoCreateInstance should have returned S_OK instead of 0x%08x\n", hr); - if (pUnk) IUnknown_Release(pUnk); - - SetEvent(info.stop); - ok( !WaitForSingleObject(thread, 10000), "wait timed out\n" ); - - GetExitCodeThread(thread, &exitcode); - hr = exitcode; - ok(hr == S_OK, "thread should have returned S_OK instead of 0x%08x\n", hr); - - CloseHandle(thread); - CloseHandle(info.wait); - CloseHandle(info.stop); - test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); } static void test_CoGetClassObject(void) { HRESULT hr; - HANDLE thread, handle; - DWORD tid, exitcode; + HANDLE handle; ULONG_PTR cookie; IUnknown *pUnk; - struct info info; REFCLSID rclsid = &CLSID_InternetZoneManager; HKEY hkey; LONG res; @@ -740,45 +682,6 @@ static void test_CoGetClassObject(void) broken(hr == CO_E_NOTINITIALIZED), /* win9x */ "CoGetClassObject should have returned E_INVALIDARG instead of 0x%08x\n", hr); - /* show that COM doesn't have to be initialized for multi-threaded apartments if another - thread has already done so */ - - test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); - - info.wait = CreateEventA(NULL, TRUE, FALSE, NULL); - ok(info.wait != NULL, "CreateEvent failed with error %d\n", GetLastError()); - - info.stop = CreateEventA(NULL, TRUE, FALSE, NULL); - ok(info.stop != NULL, "CreateEvent failed with error %d\n", GetLastError()); - - thread = CreateThread(NULL, 0, ole_initialize_thread, &info, 0, &tid); - ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); - - ok( !WaitForSingleObject(info.wait, 10000), "wait timed out\n" ); - - test_apt_type(APTTYPE_MTA, APTTYPEQUALIFIER_IMPLICIT_MTA, TRUE, TRUE); - - pUnk = (IUnknown *)0xdeadbeef; - hr = CoGetClassObject(rclsid, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&pUnk); - if(hr == REGDB_E_CLASSNOTREG) - skip("IE not installed so can't test CoGetClassObject\n"); - else - { - ok(hr == S_OK, "CoGetClassObject should have returned S_OK instead of 0x%08x\n", hr); - if (pUnk) IUnknown_Release(pUnk); - } - - SetEvent(info.stop); - ok( !WaitForSingleObject(thread, 10000), "wait timed out\n" ); - - GetExitCodeThread(thread, &exitcode); - hr = exitcode; - ok(hr == S_OK, "thread should have returned S_OK instead of 0x%08x\n", hr); - - CloseHandle(thread); - CloseHandle(info.wait); - CloseHandle(info.stop); - test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); if (!pRegOverridePredefKey) @@ -1880,9 +1783,6 @@ static void test_CoGetObjectContext(void) IObjContext *pObjContext; APTTYPE apttype; THDTYPE thdtype; - struct info info; - HANDLE thread; - DWORD tid, exitcode; GUID id, id2; if (!pCoGetObjectContext) @@ -1895,27 +1795,12 @@ static void test_CoGetObjectContext(void) ok(hr == CO_E_NOTINITIALIZED, "CoGetObjectContext should have returned CO_E_NOTINITIALIZED instead of 0x%08x\n", hr); ok(pComThreadingInfo == NULL, "pComThreadingInfo should have been set to NULL\n"); - /* show that COM doesn't have to be initialized for multi-threaded apartments if another - thread has already done so */ - - test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); - - info.wait = CreateEventA(NULL, TRUE, FALSE, NULL); - ok(info.wait != NULL, "CreateEvent failed with error %d\n", GetLastError()); - - info.stop = CreateEventA(NULL, TRUE, FALSE, NULL); - ok(info.stop != NULL, "CreateEvent failed with error %d\n", GetLastError()); - - thread = CreateThread(NULL, 0, ole_initialize_thread, &info, 0, &tid); - ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); - - ok( !WaitForSingleObject(info.wait, 10000), "wait timed out\n" ); + pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); - test_apt_type(APTTYPE_MTA, APTTYPEQUALIFIER_IMPLICIT_MTA, TRUE, TRUE); + test_apt_type(APTTYPE_MAINSTA, APTTYPEQUALIFIER_NONE, FALSE, FALSE); - pComThreadingInfo = NULL; hr = pCoGetObjectContext(&IID_IComThreadingInfo, (void **)&pComThreadingInfo); - ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); + ok_ole_success(hr, "CoGetObjectContext"); threadinginfo2 = NULL; hr = pCoGetObjectContext(&IID_IComThreadingInfo, (void **)&threadinginfo2); @@ -1933,28 +1818,6 @@ static void test_CoGetObjectContext(void) hr = CoGetCurrentLogicalThreadId(&id2); ok(IsEqualGUID(&id, &id2), "got %s, expected %s\n", wine_dbgstr_guid(&id), wine_dbgstr_guid(&id2)); - IComThreadingInfo_Release(pComThreadingInfo); - - SetEvent(info.stop); - ok( !WaitForSingleObject(thread, 10000), "wait timed out\n" ); - - GetExitCodeThread(thread, &exitcode); - hr = exitcode; - ok(hr == S_OK, "thread should have returned S_OK instead of 0x%08x\n", hr); - - CloseHandle(thread); - CloseHandle(info.wait); - CloseHandle(info.stop); - - test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); - - pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); - - test_apt_type(APTTYPE_MAINSTA, APTTYPEQUALIFIER_NONE, FALSE, FALSE); - - hr = pCoGetObjectContext(&IID_IComThreadingInfo, (void **)&pComThreadingInfo); - ok_ole_success(hr, "CoGetObjectContext"); - hr = IComThreadingInfo_GetCurrentApartmentType(pComThreadingInfo, &apttype); ok_ole_success(hr, "IComThreadingInfo_GetCurrentApartmentType"); ok(apttype == APTTYPE_MAINSTA, "apartment type should be APTTYPE_MAINSTA instead of %d\n", apttype); @@ -2118,9 +1981,6 @@ static void test_CoGetContextToken(void) ULONG refs; ULONG_PTR token, token2; IObjContext *ctx; - struct info info; - HANDLE thread; - DWORD tid, exitcode; if (!pCoGetContextToken) { @@ -2133,44 +1993,6 @@ static void test_CoGetContextToken(void) ok(hr == CO_E_NOTINITIALIZED, "Expected CO_E_NOTINITIALIZED, got 0x%08x\n", hr); ok(token == 0xdeadbeef, "Expected 0, got 0x%lx\n", token); - /* show that COM doesn't have to be initialized for multi-threaded apartments if another - thread has already done so */ - - test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); - - info.wait = CreateEventA(NULL, TRUE, FALSE, NULL); - ok(info.wait != NULL, "CreateEvent failed with error %d\n", GetLastError()); - - info.stop = CreateEventA(NULL, TRUE, FALSE, NULL); - ok(info.stop != NULL, "CreateEvent failed with error %d\n", GetLastError()); - - thread = CreateThread(NULL, 0, ole_initialize_thread, &info, 0, &tid); - ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); - - ok( !WaitForSingleObject(info.wait, 10000), "wait timed out\n" ); - - test_apt_type(APTTYPE_MTA, APTTYPEQUALIFIER_IMPLICIT_MTA, TRUE, TRUE); - - token = 0; - hr = pCoGetContextToken(&token); - ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); - - token2 = 0; - hr = pCoGetContextToken(&token2); - ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); - ok(token == token2, "got different token\n"); - - SetEvent(info.stop); - ok( !WaitForSingleObject(thread, 10000), "wait timed out\n" ); - - GetExitCodeThread(thread, &exitcode); - hr = exitcode; - ok(hr == S_OK, "thread should have returned S_OK instead of 0x%08x\n", hr); - - CloseHandle(thread); - CloseHandle(info.wait); - CloseHandle(info.stop); - test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); CoInitialize(NULL); @@ -3874,6 +3696,47 @@ static void init_funcs(void) pReleaseActCtx = (void*)GetProcAddress(hkernel32, "ReleaseActCtx"); } +static DWORD CALLBACK implicit_mta_proc(void *param) +{ + IComThreadingInfo *threading_info; + ULONG_PTR token; + IUnknown *unk; + HRESULT hr; + + test_apt_type(APTTYPE_MTA, APTTYPEQUALIFIER_IMPLICIT_MTA, TRUE, TRUE); + + hr = CoCreateInstance(&CLSID_InternetZoneManager, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); + ok_ole_success(hr, "CoCreateInstance"); + IUnknown_Release(unk); + + hr = CoGetClassObject(&CLSID_InternetZoneManager, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&unk); + ok_ole_success(hr, "CoGetClassObject"); + IUnknown_Release(unk); + + hr = CoGetObjectContext(&IID_IComThreadingInfo, (void **)&threading_info); + ok_ole_success(hr, "CoGetObjectContext"); + IComThreadingInfo_Release(threading_info); + + hr = CoGetContextToken(&token); + ok_ole_success(hr, "CoGetContextToken"); + + return 0; +} + +/* Some COM functions (perhaps even all of them?) can make use of an "implicit" + * multi-threaded apartment created by another thread in the same process. */ +static void test_implicit_mta(void) +{ + HANDLE thread; + + CoInitializeEx(NULL, COINIT_MULTITHREADED); + + thread = CreateThread(NULL, 0, implicit_mta_proc, NULL, 0, NULL); + ok(!WaitForSingleObject(thread, 1000), "wait failed\n"); + + CoUninitialize(); +} + START_TEST(compobj) { init_funcs(); @@ -3923,4 +3786,5 @@ START_TEST(compobj) test_IInitializeSpy(); test_CoGetInstanceFromFile(); test_GlobalOptions(); + test_implicit_mta(); } -- 2.7.4

2 6

[PATCH] msvcrt: Don't increment variables both in the loop header and body (clang)
by André Hentschel April 5, 2018

April 5, 2018

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/msvcrt/mbcs.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 7ca1906..430c2a6 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2011,13 +2011,12 @@ MSVCRT_size_t CDECL _mbsspn(const unsigned char* string, const unsigned char* se { if (_ismbblead(*p)) { - for (q = set; *q; q++) + for (q = set; *q; q += 2) { if (!q[1]) break; if ((*p == *q) && (p[1] == q[1])) break; - q++; } if (!q[0] || !q[1]) break; } @@ -2043,13 +2042,12 @@ unsigned char* CDECL _mbsspnp(const unsigned char* string, const unsigned char* { if (_ismbblead(*p)) { - for (q = set; *q; q++) + for (q = set; *q; q += 2) { if (!q[1]) break; if ((*p == *q) && (p[1] == q[1])) break; - q++; } if (!q[0] || !q[1]) break; } -- 2.7.4

2 1

[PATCH v2 1/5] ole32: Add support for loading enhmetafiles from presentation and contents streams to data cache.
by Sergio Gómez Del Real April 4, 2018

April 4, 2018

Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- dlls/ole32/datacache.c | 185 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 122 insertions(+), 63 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 325a98b33b..799e14a867 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -459,6 +459,45 @@ static void DataCache_FireOnViewChange( } } +/* helper for copying STGMEDIUM of type bitmap, MF, EMF or HGLOBAL. +* does no checking of whether src_stgm has a supported tymed, so this should be +* done in the caller */ +static HRESULT copy_stg_medium(CLIPFORMAT cf, STGMEDIUM *dest_stgm, + const STGMEDIUM *src_stgm) +{ + if (src_stgm->tymed == TYMED_MFPICT) + { + const METAFILEPICT *src_mfpict = GlobalLock(src_stgm->u.hMetaFilePict); + METAFILEPICT *dest_mfpict; + + if (!src_mfpict) + return DV_E_STGMEDIUM; + dest_stgm->u.hMetaFilePict = GlobalAlloc(GMEM_MOVEABLE, sizeof(METAFILEPICT)); + dest_mfpict = GlobalLock(dest_stgm->u.hMetaFilePict); + if (!dest_mfpict) + { + GlobalUnlock(src_stgm->u.hMetaFilePict); + return E_OUTOFMEMORY; + } + *dest_mfpict = *src_mfpict; + dest_mfpict->hMF = CopyMetaFileW(src_mfpict->hMF, NULL); + GlobalUnlock(src_stgm->u.hMetaFilePict); + GlobalUnlock(dest_stgm->u.hMetaFilePict); + } + else if (src_stgm->tymed != TYMED_NULL) + { + dest_stgm->u.hGlobal = OleDuplicateData(src_stgm->u.hGlobal, cf, + GMEM_MOVEABLE); + if (!dest_stgm->u.hGlobal) + return E_OUTOFMEMORY; + } + dest_stgm->tymed = src_stgm->tymed; + dest_stgm->pUnkForRelease = src_stgm->pUnkForRelease; + if (dest_stgm->pUnkForRelease) + IUnknown_AddRef(dest_stgm->pUnkForRelease); + return S_OK; +} + static HRESULT read_clipformat(IStream *stream, CLIPFORMAT *clipformat) { DWORD length; @@ -547,6 +586,30 @@ static HRESULT open_pres_stream( IStorage *stg, int stream_number, IStream **stm return IStorage_OpenStream( stg, name, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, stm ); } +static HRESULT synthesize_emf( HMETAFILEPICT data, STGMEDIUM *med ) +{ + METAFILEPICT *pict; + HRESULT hr = E_FAIL; + UINT size; + void *bits; + + if (!(pict = GlobalLock( data ))) return hr; + + size = GetMetaFileBitsEx( pict->hMF, 0, NULL ); + if ((bits = HeapAlloc( GetProcessHeap(), 0, size ))) + { + GetMetaFileBitsEx( pict->hMF, size, bits ); + med->u.hEnhMetaFile = SetWinMetaFileBits( size, bits, NULL, pict ); + HeapFree( GetProcessHeap(), 0, bits ); + med->tymed = TYMED_ENHMF; + med->pUnkForRelease = NULL; + hr = S_OK; + } + + GlobalUnlock( data ); + return hr; +} + static HRESULT load_mf_pict( DataCacheEntry *cache_entry, IStream *stm ) { HRESULT hr; @@ -701,7 +764,62 @@ fail: GlobalUnlock( hglobal ); GlobalFree( hglobal ); return E_FAIL; +} +static HRESULT load_emf( DataCacheEntry *cache_entry, IStream *stm ) +{ + HRESULT hr; + + if (cache_entry->load_stream_num != STREAM_NUMBER_CONTENTS) + { + STGMEDIUM stgmed; + + hr = load_mf_pict( cache_entry, stm ); + if (SUCCEEDED( hr )) + hr = synthesize_emf( cache_entry->stgmedium.u.hMetaFilePict, &stgmed ); + if (SUCCEEDED( hr )) + { + ReleaseStgMedium( &cache_entry->stgmedium ); + hr = copy_stg_medium( CF_ENHMETAFILE, &cache_entry->stgmedium, &stgmed ); + ReleaseStgMedium( &stgmed ); + } + } + else + { + STATSTG stat; + void *data; + DWORD size_bits; + ULONG read; + + hr = IStream_Stat( stm, &stat, STATFLAG_NONAME ); + + if (SUCCEEDED( hr )) + { + data = HeapAlloc( GetProcessHeap(), 0, stat.cbSize.u.LowPart ); + if (!data) return E_OUTOFMEMORY; + + hr = IStream_Read( stm, data, stat.cbSize.u.LowPart, &read ); + if (hr != S_OK || read != stat.cbSize.u.LowPart) + { + HeapFree( GetProcessHeap(), 0, data ); + return E_FAIL; + } + + size_bits = read - sizeof(DWORD) - sizeof(ENHMETAHEADER); + if (size_bits <= 0) + { + HeapFree( GetProcessHeap(), 0, data ); + return E_FAIL; + } + cache_entry->stgmedium.u.hEnhMetaFile = SetEnhMetaFileBits( size_bits, (BYTE *)data + (read - size_bits) ); + cache_entry->stgmedium.tymed = TYMED_ENHMF; + cache_entry->stgmedium.pUnkForRelease = NULL; + + HeapFree( GetProcessHeap(), 0, data ); + } + } + + return hr; } /************************************************************************ @@ -736,6 +854,10 @@ static HRESULT DataCacheEntry_LoadData(DataCacheEntry *cache_entry, IStorage *st hr = load_dib( cache_entry, stm ); break; + case CF_ENHMETAFILE: + hr = load_emf( cache_entry, stm ); + break; + default: FIXME( "Unimplemented clip format %x\n", cache_entry->fmtetc.cfFormat ); hr = E_NOTIMPL; @@ -1030,45 +1152,6 @@ static HRESULT DataCacheEntry_Save(DataCacheEntry *cache_entry, IStorage *storag return hr; } -/* helper for copying STGMEDIUM of type bitmap, MF, EMF or HGLOBAL. -* does no checking of whether src_stgm has a supported tymed, so this should be -* done in the caller */ -static HRESULT copy_stg_medium(CLIPFORMAT cf, STGMEDIUM *dest_stgm, - const STGMEDIUM *src_stgm) -{ - if (src_stgm->tymed == TYMED_MFPICT) - { - const METAFILEPICT *src_mfpict = GlobalLock(src_stgm->u.hMetaFilePict); - METAFILEPICT *dest_mfpict; - - if (!src_mfpict) - return DV_E_STGMEDIUM; - dest_stgm->u.hMetaFilePict = GlobalAlloc(GMEM_MOVEABLE, sizeof(METAFILEPICT)); - dest_mfpict = GlobalLock(dest_stgm->u.hMetaFilePict); - if (!dest_mfpict) - { - GlobalUnlock(src_stgm->u.hMetaFilePict); - return E_OUTOFMEMORY; - } - *dest_mfpict = *src_mfpict; - dest_mfpict->hMF = CopyMetaFileW(src_mfpict->hMF, NULL); - GlobalUnlock(src_stgm->u.hMetaFilePict); - GlobalUnlock(dest_stgm->u.hMetaFilePict); - } - else if (src_stgm->tymed != TYMED_NULL) - { - dest_stgm->u.hGlobal = OleDuplicateData(src_stgm->u.hGlobal, cf, - GMEM_MOVEABLE); - if (!dest_stgm->u.hGlobal) - return E_OUTOFMEMORY; - } - dest_stgm->tymed = src_stgm->tymed; - dest_stgm->pUnkForRelease = src_stgm->pUnkForRelease; - if (dest_stgm->pUnkForRelease) - IUnknown_AddRef(dest_stgm->pUnkForRelease); - return S_OK; -} - static HRESULT synthesize_dib( HBITMAP bm, STGMEDIUM *med ) { HDC hdc = GetDC( 0 ); @@ -1118,30 +1201,6 @@ static HRESULT synthesize_bitmap( HGLOBAL dib, STGMEDIUM *med ) return hr; } -static HRESULT synthesize_emf( HMETAFILEPICT data, STGMEDIUM *med ) -{ - METAFILEPICT *pict; - HRESULT hr = E_FAIL; - UINT size; - void *bits; - - if (!(pict = GlobalLock( data ))) return hr; - - size = GetMetaFileBitsEx( pict->hMF, 0, NULL ); - if ((bits = HeapAlloc( GetProcessHeap(), 0, size ))) - { - GetMetaFileBitsEx( pict->hMF, size, bits ); - med->u.hEnhMetaFile = SetWinMetaFileBits( size, bits, NULL, pict ); - HeapFree( GetProcessHeap(), 0, bits ); - med->tymed = TYMED_ENHMF; - med->pUnkForRelease = NULL; - hr = S_OK; - } - - GlobalUnlock( data ); - return hr; -} - static HRESULT DataCacheEntry_SetData(DataCacheEntry *cache_entry, const FORMATETC *formatetc, STGMEDIUM *stgmedium, -- 2.14.1

2 11

WineHQ Downtime Notice
by Jeremy Newman April 3, 2018

April 3, 2018

WineHQ will be going down for some maintenance tonight (2018-03-26) starting at 21:00 CDT (-5 GMT). It will be offline for about 20 minutes while we swap out some equipment. The IP address for all WineHQ sites will also be changing. The DNS A records TTL are already down to 5 minutes, so DNS should switch over fairly quickly. We have already moved our primary and secondary DNS servers to the cloud, so they are no longer running directly on our box. I will reply to this message when the upgrades are complete, or if any plans change. -N

4 10

[PATCH] dmime: Call interface methods properly.
by Zebediah Figura April 3, 2018

April 3, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/dmime/audiopath.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index d656058..1aad13b 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -114,7 +114,7 @@ static ULONG WINAPI IDirectMusicAudioPathImpl_Release (IDirectMusicAudioPath *if if (ref == 0) { if (This->pDSBuffer) - IDirectSoundBuffer8_Release(This->pDSBuffer); + IDirectSoundBuffer_Release(This->pDSBuffer); This->pPerf = NULL; HeapFree(GetProcessHeap(), 0, This); } @@ -140,7 +140,7 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_GetObjectInPath (IDirectMusicAud IsEqualIID (iidInterface, &IID_IDirectSoundBuffer) || IsEqualIID (iidInterface, &IID_IDirectSoundBuffer8) || IsEqualIID (iidInterface, &IID_IDirectSound3DBuffer)) { - return IDirectSoundBuffer8_QueryInterface (This->pDSBuffer, iidInterface, ppObject); + return IDirectSoundBuffer_QueryInterface (This->pDSBuffer, iidInterface, ppObject); } WARN("Unsupported interface %s\n", debugstr_dmguid(iidInterface)); @@ -151,7 +151,7 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_GetObjectInPath (IDirectMusicAud case DMUS_PATH_PRIMARY_BUFFER: { if (IsEqualIID (iidInterface, &IID_IDirectSound3DListener)) { - IDirectSoundBuffer8_QueryInterface (This->pPrimary, &IID_IDirectSound3DListener, ppObject); + IDirectSoundBuffer_QueryInterface (This->pPrimary, &IID_IDirectSound3DListener, ppObject); return S_OK; } else { FIXME("bad iid...\n"); -- 2.7.4

4 8

[PATCH] ntdll: Implement _alldvrm() and _aulldvrm().
by Zebediah Figura April 3, 2018

April 3, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Fixes https://bugs.winehq.org/show_bug.cgi?id=42267 Inspired by a patch by Sebastian Lackner. dlls/ntdll/large_int.c | 76 ++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 4 +- dlls/ntdll/tests/large_int.c | 92 ++++++++++++++++++++++++++++++++++++- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 +- 4 files changed, 171 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/large_int.c b/dlls/ntdll/large_int.c index a0d465c..b7d074f 100644 --- a/dlls/ntdll/large_int.c +++ b/dlls/ntdll/large_int.c @@ -627,6 +627,44 @@ LONGLONG WINAPI _allshr( LONGLONG a, LONG b ) } /****************************************************************************** + * _alldvrm (NTDLL.@) + * + * Divide two 64 bit integers. + * + * PARAMS + * a [I] Initial number. + * b [I] Number to divide a by. + * + * RETURNS + * Returns the quotient of a and b in edx:eax. + * Returns the remainder of a and b in ebx:ecx. + */ +__ASM_STDCALL_FUNC( _alldvrm, 16, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl 20(%ebp)\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call _allrem\n\t" + "movl %edx, %ebx\n\t" + "movl %eax, %ecx\n\t" + "pushl %ecx\n\t" + "pushl 20(%ebp)\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call _alldiv\n\t" + "popl %ecx\n\t" + "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret $16" ) + +/****************************************************************************** * _aullrem (NTDLL.@) * * Calculate the remainder after dividing two 64 bit unsigned integers. @@ -660,4 +698,42 @@ ULONGLONG WINAPI _aullshr( ULONGLONG a, LONG b ) return a >> b; } +/****************************************************************************** + * _aulldvrm (NTDLL.@) + * + * Divide two 64 bit unsigned integers. + * + * PARAMS + * a [I] Initial number. + * b [I] Number to divide a by. + * + * RETURNS + * Returns the quotient of a and b in edx:eax. + * Returns the remainder of a and b in ebx:ecx. + */ +__ASM_STDCALL_FUNC( _aulldvrm, 16, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl 20(%ebp)\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call _aullrem\n\t" + "movl %edx, %ebx\n\t" + "movl %eax, %ecx\n\t" + "pushl %ecx\n\t" + "pushl 20(%ebp)\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call _aulldiv\n\t" + "popl %ecx\n\t" + "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret $16" ) + #endif /* __i386__ */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0107932..8744704 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1337,7 +1337,7 @@ @ cdecl -private __iscsymf(long) NTDLL___iscsymf @ cdecl -private __toascii(long) NTDLL___toascii @ stdcall -arch=i386 -ret64 _alldiv(int64 int64) -# @ stub _alldvrm +@ stdcall -arch=i386 -norelay _alldvrm(int64 int64) @ stdcall -arch=i386 -ret64 _allmul(int64 int64) @ stdcall -arch=i386 -norelay _alloca_probe() @ stdcall -arch=i386 -ret64 _allrem(int64 int64) @@ -1345,7 +1345,7 @@ @ stdcall -arch=i386 -ret64 _allshr(int64 long) @ cdecl -private -ret64 _atoi64(str) @ stdcall -arch=i386 -ret64 _aulldiv(int64 int64) -# @ stub _aulldvrm +@ stdcall -arch=i386 -norelay _aulldvrm(int64 int64) @ stdcall -arch=i386 -ret64 _aullrem(int64 int64) @ stdcall -arch=i386 -ret64 _aullshr(int64 long) @ stdcall -private -arch=i386 -norelay _chkstk() diff --git a/dlls/ntdll/tests/large_int.c b/dlls/ntdll/tests/large_int.c index da7afa4..70ea0b0 100644 --- a/dlls/ntdll/tests/large_int.c +++ b/dlls/ntdll/tests/large_int.c @@ -33,7 +33,8 @@ static VOID (WINAPI *pRtlFreeAnsiString)(PSTRING); static NTSTATUS (WINAPI *pRtlInt64ToUnicodeString)(ULONGLONG, ULONG, UNICODE_STRING *); static NTSTATUS (WINAPI *pRtlLargeIntegerToChar)(ULONGLONG *, ULONG, ULONG, PCHAR); static NTSTATUS (WINAPI *pRtlUnicodeStringToAnsiString)(STRING *, const UNICODE_STRING *, BOOLEAN); - +static LONGLONG (WINAPI *p_alldvrm)(LONGLONG, LONGLONG); +static ULONGLONG (WINAPI *p_aulldvrm)(ULONGLONG, ULONGLONG); static void InitFunctionPtrs(void) { @@ -45,6 +46,8 @@ static void InitFunctionPtrs(void) pRtlInt64ToUnicodeString = (void *)GetProcAddress(hntdll, "RtlInt64ToUnicodeString"); pRtlLargeIntegerToChar = (void *)GetProcAddress(hntdll, "RtlLargeIntegerToChar"); pRtlUnicodeStringToAnsiString = (void *)GetProcAddress(hntdll, "RtlUnicodeStringToAnsiString"); + p_alldvrm = (void *)GetProcAddress(hntdll, "_alldvrm"); + p_aulldvrm = (void *)GetProcAddress(hntdll, "_aulldvrm"); } /* if */ } @@ -434,6 +437,90 @@ static void test_RtlLargeIntegerToChar(void) largeint2str[0].base, largeint2str[0].MaximumLength, result, STATUS_ACCESS_VIOLATION); } +#ifdef __i386__ +static LONGLONG _alldvrm_wrapper(LARGE_INTEGER a, LARGE_INTEGER b, LARGE_INTEGER *rem) +{ + /* _alldvrm() divides two LONGLONGs and returns the quotient in edx:eax and + * the remainder in ebx:ecx. */ + + LONGLONG ret; + + __asm__ __volatile__ ( + "pushl %%ebx\n\t" + "pushl %3\n\t" + "pushl %4\n\t" + "pushl %5\n\t" + "pushl %6\n\t" + "call *%7\n\t" + "movl %%ebx, %1\n\t" + "movl %%ecx, %2\n\t" + "popl %%ebx\n\t" + : "=A" (ret), "=r" (rem->HighPart), "=r" (rem->LowPart) + : "ri" (b.HighPart), "ri" (b.LowPart), "ri" (a.HighPart), "ri" (a.LowPart), "m" (p_alldvrm) + : "ebx", "ecx" + ); + + return ret; +} + +static ULONGLONG _aulldvrm_wrapper(ULARGE_INTEGER a, ULARGE_INTEGER b, ULARGE_INTEGER *rem) +{ + ULONGLONG ret; + + __asm__ __volatile__ ( + "pushl %%ebx\n\t" + "pushl %3\n\t" + "pushl %4\n\t" + "pushl %5\n\t" + "pushl %6\n\t" + "call *%7\n\t" + "movl %%ebx, %1\n\t" + "movl %%ecx, %2\n\t" + "popl %%ebx\n\t" + : "=A" (ret), "=r" (rem->HighPart), "=r" (rem->LowPart) + : "ri" (b.HighPart), "ri" (b.LowPart), "ri" (a.HighPart), "ri" (a.LowPart), "m" (p_aulldvrm) + : "ebx", "ecx" + ); + + return ret; +} + +static void test__alldvrm(void) +{ + ULARGE_INTEGER ua, ub, urem; + LARGE_INTEGER a, b, rem; + ULONGLONG uret; + LONGLONG ret; + + /* _alldvrm(0x0123456701234567, 3) */ + a.HighPart = a.LowPart = 0x01234567; + b.QuadPart = 3; + ret = _alldvrm_wrapper(a, b, &rem); + ok(ret == 0x61172255b66c77ULL, "got %x%08x\n", (DWORD)(ret >> 32), (DWORD)ret); + ok(rem.QuadPart == 2, "got %x%08x\n", rem.HighPart, rem.LowPart); + + /* _alldvrm(0x0123456701234567, -3) */ + a.HighPart = a.LowPart = 0x01234567; + b.QuadPart = -3; + ret = _alldvrm_wrapper(a, b, &rem); + ok(ret == 0xff9ee8ddaa499389ULL, "got %x%08x\n", (DWORD)(ret >> 32), (DWORD)ret); + ok(rem.QuadPart == 2, "got %x%08x\n", rem.HighPart, rem.LowPart); + + /* _aulldvrm(0x0123456701234567, 3) */ + ua.HighPart = ua.LowPart = 0x01234567; + ub.QuadPart = 3; + uret = _aulldvrm_wrapper(ua, ub, &urem); + ok(uret == 0x61172255b66c77ULL, "got %x%08x\n", (DWORD)(uret >> 32), (DWORD)uret); + ok(urem.QuadPart == 2, "got %x%08x\n", urem.HighPart, urem.LowPart); + + /* _aulldvrm(0x0123456701234567, -3) */ + ua.HighPart = ua.LowPart = 0x01234567; + ub.QuadPart = -3; + uret = _aulldvrm_wrapper(ua, ub, &urem); + ok(uret == 0, "got %x%08x\n", (DWORD)(uret >> 32), (DWORD)uret); + ok(urem.QuadPart == ua.QuadPart, "got %x%08x\n", urem.HighPart, urem.LowPart); +} +#endif /* __i386__ */ START_TEST(large_int) { @@ -445,4 +532,7 @@ START_TEST(large_int) test_RtlInt64ToUnicodeString(); if (pRtlLargeIntegerToChar) test_RtlLargeIntegerToChar(); +#ifdef __i386__ + test__alldvrm(); +#endif /* __i386__ */ } diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 26afa6f..49f529a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1407,14 +1407,14 @@ @ cdecl -private -arch=i386 _CIsqrt() msvcrt._CIsqrt @ cdecl -private _abnormal_termination() msvcrt._abnormal_termination @ stdcall -private -arch=i386 -ret64 _alldiv(int64 int64) -@ stub _alldvrm +@ stdcall -private -arch=i386 -norelay _alldvrm(int64 int64) @ stdcall -private -arch=i386 -ret64 _allmul(int64 int64) @ stdcall -private -arch=i386 -norelay _alloca_probe() @ stdcall -private -arch=i386 -ret64 _allrem(int64 int64) @ stdcall -private -arch=i386 -ret64 _allshl(int64 long) @ stdcall -private -arch=i386 -ret64 _allshr(int64 long) @ stdcall -private -arch=i386 -ret64 _aulldiv(int64 int64) -@ stub _aulldvrm +@ stdcall -private -arch=i386 -norelay _aulldvrm(int64 int64) @ stdcall -private -arch=i386 -ret64 _aullrem(int64 int64) @ stdcall -private -arch=i386 -ret64 _aullshr(int64 long) @ stdcall -private -arch=i386 -norelay _chkstk() -- 2.7.4

2 2

[PATCH] user32/cursoricon: Fix CreateIcon() bitmap mask handling.
by Zhiyi Zhang April 3, 2018

April 3, 2018

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/cursoricon.c | 80 +++++++++++---------- dlls/user32/tests/cursoricon.c | 160 ++++++++++++++++++++++++++++++++++++----- 2 files changed, 187 insertions(+), 53 deletions(-)

2 3

[PATCH 1/5] wsdapi/tests: Add test for Hello message Any header element.
by Owen Rudge April 3, 2018

April 3, 2018

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/tests/discovery.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-)

2 1

[PATCH] progman: Explicitly use unsigned constants to fix shifting in PUT_SHORT (clang)
by André Hentschel April 3, 2018

April 3, 2018

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- programs/progman/grpfile.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/programs/progman/grpfile.c b/programs/progman/grpfile.c index d49dde3..360a2f9 100644 --- a/programs/progman/grpfile.c +++ b/programs/progman/grpfile.c @@ -564,10 +564,10 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group) PUT_SHORT(buffer, 18, group->iconx); PUT_SHORT(buffer, 20, group->icony); PUT_SHORT(buffer, 22, Title); - PUT_SHORT(buffer, 24, 0x0020); /* unknown */ - PUT_SHORT(buffer, 26, 0x0020); /* unknown */ - PUT_SHORT(buffer, 28, 0x0108); /* unknown */ - PUT_SHORT(buffer, 30, 0x0000); /* unknown */ + PUT_SHORT(buffer, 24, 0x0020u); /* unknown */ + PUT_SHORT(buffer, 26, 0x0020u); /* unknown */ + PUT_SHORT(buffer, 28, 0x0108u); /* unknown */ + PUT_SHORT(buffer, 30, 0x0000u); /* unknown */ PUT_SHORT(buffer, 32, NumProg); if ((UINT)HFILE_ERROR == GRPFILE_WriteWithChecksum(file, buffer, 34)) return FALSE; @@ -609,7 +609,7 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group) PUT_SHORT(buffer, 0, program->x); PUT_SHORT(buffer, 2, program->y); PUT_SHORT(buffer, 4, program->nIconIndex); - PUT_SHORT(buffer, 6, 0x048c); /* unknown */ + PUT_SHORT(buffer, 6, 0x048cu); /* unknown */ PUT_SHORT(buffer, 8, sizeXor); PUT_SHORT(buffer, 10, sizeAnd * 8); PUT_SHORT(buffer, 12, CurrIcon); @@ -664,9 +664,9 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group) if (need_extension) { /* write `PMCC' extension */ - PUT_SHORT(buffer, 0, 0x8000); - PUT_SHORT(buffer, 2, 0xffff); - PUT_SHORT(buffer, 4, 0x000a); + PUT_SHORT(buffer, 0, 0x8000u); + PUT_SHORT(buffer, 2, 0xffffu); + PUT_SHORT(buffer, 4, 0x000au); buffer[6] = 'P', buffer[7] = 'M'; buffer[8] = 'C', buffer[9] = 'C'; if ((UINT)HFILE_ERROR == GRPFILE_WriteWithChecksum(file, buffer, 10)) @@ -682,7 +682,7 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group) /* Working directory */ if (lpszWorkDir[0]) { - PUT_SHORT(buffer, 0, 0x8101); + PUT_SHORT(buffer, 0, 0x8101u); PUT_SHORT(buffer, 2, seqnum); PUT_SHORT(buffer, 4, 7 + strlen(lpszWorkDir)); if ((UINT)HFILE_ERROR == GRPFILE_WriteWithChecksum(file, buffer, 6) || @@ -693,9 +693,9 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group) /* Hot key */ if (program->nHotKey) { - PUT_SHORT(buffer, 0, 0x8102); + PUT_SHORT(buffer, 0, 0x8102u); PUT_SHORT(buffer, 2, seqnum); - PUT_SHORT(buffer, 4, 8); + PUT_SHORT(buffer, 4, 8u); PUT_SHORT(buffer, 6, program->nHotKey); if ((UINT)HFILE_ERROR == GRPFILE_WriteWithChecksum(file, buffer, 8)) return FALSE; } @@ -703,9 +703,9 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group) /* Show command */ if (program->nCmdShow) { - PUT_SHORT(buffer, 0, 0x8103); + PUT_SHORT(buffer, 0, 0x8103u); PUT_SHORT(buffer, 2, seqnum); - PUT_SHORT(buffer, 4, 8); + PUT_SHORT(buffer, 4, 8u); PUT_SHORT(buffer, 6, program->nCmdShow); if ((UINT)HFILE_ERROR == GRPFILE_WriteWithChecksum(file, buffer, 8)) return FALSE; } @@ -715,9 +715,9 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group) } /* Write `End' extension */ - PUT_SHORT(buffer, 0, 0xffff); - PUT_SHORT(buffer, 2, 0xffff); - PUT_SHORT(buffer, 4, 0x0000); + PUT_SHORT(buffer, 0, 0xffffu); + PUT_SHORT(buffer, 2, 0xffffu); + PUT_SHORT(buffer, 4, 0x0000u); if ((UINT)HFILE_ERROR == GRPFILE_WriteWithChecksum(file, buffer, 6)) return FALSE; } -- 2.7.4

2 1

[PATCH] user32: Add support for PNG icons.
by Dmitry Timoshkov April 2, 2018

April 2, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/Makefile.in | 1 + dlls/user32/cursoricon.c | 337 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 334 insertions(+), 4 deletions(-) diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index 246c424155..931a715763 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -2,6 +2,7 @@ EXTRADEFS = -D_USER32_ -D_WINABLE_ MODULE = user32.dll IMPORTLIB = user32 IMPORTS = gdi32 version advapi32 +EXTRAINCL = $(PNG_CFLAGS) DELAYIMPORTS = imm32 usp10 C_SRCS = \ diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 8e272f09ce..1cb46050d4 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -6,6 +6,8 @@ * 1997 Alex Korobka * 1998 Turchanov Sergey * 2007 Henri Verbeet + * Copyright 2009 Vincent Povirk for CodeWeavers + * Copyright 2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -29,6 +31,9 @@ #include <stdarg.h> #include <string.h> #include <stdlib.h> +#ifdef HAVE_PNG_H +#include <png.h> +#endif #include "windef.h" #include "winbase.h" @@ -43,11 +48,17 @@ #include "wine/list.h" #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/library.h" WINE_DEFAULT_DEBUG_CHANNEL(cursor); WINE_DECLARE_DEBUG_CHANNEL(icon); WINE_DECLARE_DEBUG_CHANNEL(resource); +#define RIFF_FOURCC( c0, c1, c2, c3 ) \ + ( (DWORD)(BYTE)(c0) | ( (DWORD)(BYTE)(c1) << 8 ) | \ + ( (DWORD)(BYTE)(c2) << 16 ) | ( (DWORD)(BYTE)(c3) << 24 ) ) +#define PNG_SIGN RIFF_FOURCC(0x89,'P','N','G') + static struct list icon_cache = LIST_INIT( icon_cache ); /********************************************************************** @@ -108,6 +119,307 @@ static int get_display_bpp(void) return ret; } +#ifdef SONAME_LIBPNG + +static void *libpng_handle; +#define MAKE_FUNCPTR(f) static typeof(f) * p##f +MAKE_FUNCPTR(png_create_read_struct); +MAKE_FUNCPTR(png_create_info_struct); +MAKE_FUNCPTR(png_destroy_read_struct); +MAKE_FUNCPTR(png_error); +MAKE_FUNCPTR(png_get_bit_depth); +MAKE_FUNCPTR(png_get_color_type); +MAKE_FUNCPTR(png_get_error_ptr); +MAKE_FUNCPTR(png_get_image_height); +MAKE_FUNCPTR(png_get_image_width); +MAKE_FUNCPTR(png_get_io_ptr); +MAKE_FUNCPTR(png_read_image); +MAKE_FUNCPTR(png_read_info); +MAKE_FUNCPTR(png_read_update_info); +MAKE_FUNCPTR(png_set_bgr); +MAKE_FUNCPTR(png_set_crc_action); +MAKE_FUNCPTR(png_set_error_fn); +MAKE_FUNCPTR(png_set_expand); +MAKE_FUNCPTR(png_set_gray_to_rgb); +MAKE_FUNCPTR(png_set_read_fn); +#undef MAKE_FUNCPTR + +static BOOL load_libpng(void) +{ + USER_Lock(); + + if (!libpng_handle && (libpng_handle = wine_dlopen(SONAME_LIBPNG, RTLD_NOW, NULL, 0)) != NULL) + { +#define LOAD_FUNCPTR(f) \ + if ((p##f = wine_dlsym(libpng_handle, #f, NULL, 0)) == NULL) \ + { \ + libpng_handle = NULL; \ + USER_Unlock(); \ + return FALSE; \ + } + LOAD_FUNCPTR(png_create_read_struct); + LOAD_FUNCPTR(png_create_info_struct); + LOAD_FUNCPTR(png_destroy_read_struct); + LOAD_FUNCPTR(png_error); + LOAD_FUNCPTR(png_get_bit_depth); + LOAD_FUNCPTR(png_get_color_type); + LOAD_FUNCPTR(png_get_error_ptr); + LOAD_FUNCPTR(png_get_image_height); + LOAD_FUNCPTR(png_get_image_width); + LOAD_FUNCPTR(png_get_io_ptr); + LOAD_FUNCPTR(png_read_image); + LOAD_FUNCPTR(png_read_info); + LOAD_FUNCPTR(png_read_update_info); + LOAD_FUNCPTR(png_set_bgr); + LOAD_FUNCPTR(png_set_crc_action); + LOAD_FUNCPTR(png_set_error_fn); + LOAD_FUNCPTR(png_set_expand); + LOAD_FUNCPTR(png_set_gray_to_rgb); + LOAD_FUNCPTR(png_set_read_fn); +#undef LOAD_FUNCPTR + } + + USER_Unlock(); + return TRUE; +} + +static void user_error_fn(png_structp png_ptr, png_const_charp error_message) +{ + jmp_buf *pjmpbuf; + + /* This uses setjmp/longjmp just like the default. We can't use the + * default because there's no way to access the jmp buffer in the png_struct + * that works in 1.2 and 1.4 and allows us to dynamically load libpng. */ + WARN("PNG error: %s\n", debugstr_a(error_message)); + pjmpbuf = ppng_get_error_ptr(png_ptr); + longjmp(*pjmpbuf, 1); +} + +static void user_warning_fn(png_structp png_ptr, png_const_charp warning_message) +{ + WARN("PNG warning: %s\n", debugstr_a(warning_message)); +} + +struct png_wrapper +{ + png_structp png_ptr; + png_infop info_ptr; + int width, height, bpp; + const char *buffer; + int size, pos; +}; + +static void user_read_data(png_structp png_ptr, png_bytep data, png_size_t length) +{ + struct png_wrapper *png = ppng_get_io_ptr(png_ptr); + + if (png->size - png->pos >= length) + { + memcpy(data, png->buffer + png->pos, length); + png->pos += length; + } + else + { + ppng_error(png->png_ptr, "failed to read PNG data"); + } +} + +static BOOL create_png_decoder(struct png_wrapper *png) +{ + jmp_buf jmpbuf; + int color_type, bit_depth; + + if (!load_libpng()) return FALSE; + + /* initialize libpng */ + png->png_ptr = ppng_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + if (!png->png_ptr) return FALSE; + + png->info_ptr = ppng_create_info_struct(png->png_ptr); + if (!png->info_ptr) + { + ppng_destroy_read_struct(&png->png_ptr, NULL, NULL); + return FALSE; + } + + /* set up setjmp/longjmp error handling */ + if (setjmp(jmpbuf)) + { + ppng_destroy_read_struct(&png->png_ptr, &png->info_ptr, NULL); + return FALSE; + } + + ppng_set_error_fn(png->png_ptr, jmpbuf, user_error_fn, user_warning_fn); + ppng_set_crc_action(png->png_ptr, PNG_CRC_QUIET_USE, PNG_CRC_QUIET_USE); + + /* set up custom i/o handling */ + ppng_set_read_fn(png->png_ptr, png, user_read_data); + + /* read the header */ + ppng_read_info(png->png_ptr, png->info_ptr); + + color_type = ppng_get_color_type(png->png_ptr, png->info_ptr); + bit_depth = ppng_get_bit_depth(png->png_ptr, png->info_ptr); + + /* expand grayscale image data to rgb */ + if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) + ppng_set_gray_to_rgb(png->png_ptr); + + /* expand palette image data to rgb */ + if (color_type == PNG_COLOR_TYPE_PALETTE || bit_depth < 8) + ppng_set_expand(png->png_ptr); + + /* update color type information */ + ppng_read_update_info(png->png_ptr, png->info_ptr); + + color_type = ppng_get_color_type(png->png_ptr, png->info_ptr); + bit_depth = ppng_get_bit_depth(png->png_ptr, png->info_ptr); + + png->bpp = 0; + + switch (color_type) + { + case PNG_COLOR_TYPE_RGB: + if (bit_depth == 8) + png->bpp = 24; + break; + + case PNG_COLOR_TYPE_RGB_ALPHA: + if (bit_depth == 8) + { + ppng_set_bgr(png->png_ptr); + png->bpp = 32; + } + break; + + default: + break; + } + + if (!png->bpp) + { + FIXME("unsupported PNG color format %d, %d bpp\n", color_type, bit_depth); + ppng_destroy_read_struct(&png->png_ptr, &png->info_ptr, NULL); + return FALSE; + } + + png->width = ppng_get_image_width(png->png_ptr, png->info_ptr); + png->height = ppng_get_image_height(png->png_ptr, png->info_ptr); + + return TRUE; +} + +static void destroy_png_decoder(struct png_wrapper *png) +{ + ppng_destroy_read_struct(&png->png_ptr, &png->info_ptr, NULL); +} + +static BOOL get_png_info(const void *png_data, DWORD size, int *width, int *height, int *bpp) +{ + static const char png_sig[8] = { 0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a }; + struct png_wrapper png; + + if (size < sizeof(png_sig) || memcmp(png_data, png_sig, sizeof(png_sig)) != 0) + return FALSE; + + png.buffer = png_data; + png.size = size; + png.pos = 0; + + if (!create_png_decoder(&png)) return FALSE; + + *width = png.width; + *height = png.height; + *bpp = png.bpp; + + destroy_png_decoder(&png); + return TRUE; +} + +static BITMAPINFO *load_png(const char *png_data, DWORD *size) +{ + static const char png_sig[8] = { 0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a }; + struct png_wrapper png; + png_bytep *row_pointers; + int rowbytes, image_size, mask_size = 0, i; + BITMAPINFO *info; + unsigned char *image_data; + + if (*size < sizeof(png_sig) || memcmp(png_data, png_sig, sizeof(png_sig)) != 0) + return NULL; + + png.buffer = png_data; + png.size = *size; + png.pos = 0; + + if (!create_png_decoder(&png)) return NULL; + + rowbytes = (png.width * png.bpp + 7) / 8; + image_size = png.height * rowbytes; + if (png.bpp != 32) /* add a mask if there is no alpha */ + mask_size = (png.width + 7) / 8 * png.height; + + info = HeapAlloc(GetProcessHeap(), 0, sizeof(BITMAPINFOHEADER) + image_size + mask_size); + if (!info) + { + destroy_png_decoder(&png); + return NULL; + } + + image_data = (unsigned char *)info + sizeof(BITMAPINFOHEADER); + memset(image_data + image_size, 0, mask_size); + + row_pointers = HeapAlloc(GetProcessHeap(), 0, png.height * sizeof(png_bytep)); + if (!row_pointers) + { + HeapFree(GetProcessHeap(), 0, info); + destroy_png_decoder(&png); + return NULL; + } + + /* upside down */ + for (i = 0; i < png.height; i++) + row_pointers[i] = image_data + (png.height - i - 1) * rowbytes; + + ppng_read_image(png.png_ptr, row_pointers); + + HeapFree(GetProcessHeap(), 0, row_pointers); + + info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info->bmiHeader.biWidth = png.width; + info->bmiHeader.biHeight = png.height * 2; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = png.bpp; + info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biSizeImage = image_size; + info->bmiHeader.biXPelsPerMeter = 0; + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrUsed = 0; + info->bmiHeader.biClrImportant = 0; + + *size = sizeof(BITMAPINFOHEADER) + image_size + mask_size; + + destroy_png_decoder(&png); + + return info; +} + +#else /* SONAME_LIBPNG */ + +static BOOL get_png_info(const void *png_data, DWORD size, int *width, int *height, int *bpp) +{ + ERR("Trying to load PNG icon, but PNG support is not compiled in.\n"); + return FALSE; +} + +static BITMAPINFO *load_png( const char *png, DWORD *max_size ) +{ + ERR("Trying to load PNG icon, but PNG support is not compiled in.\n"); + return NULL; +} + +#endif + static HICON alloc_icon_handle( BOOL is_ani, UINT num_steps ) { struct cursoricon_object *obj; @@ -523,6 +835,8 @@ static int CURSORICON_FindBestIcon( LPCVOID dir, DWORD size, fnGetCIEntry get_en /* Find Best Colors for Best Fit */ for ( i = 0; get_entry( dir, size, i, &cx, &cy, &bits ); i++ ) { + TRACE("entry %d: %d x %d, %d bpp\n", i, cx, cy, bits); + if(abs(width - cx) == iXDiff && abs(height - cy) == iYDiff) { iTempColorDiff = abs(depth - bits); @@ -680,6 +994,10 @@ static BOOL CURSORICON_GetFileEntry( LPCVOID dir, DWORD size, int n, entry = &filedir->idEntries[n]; if (entry->dwDIBOffset > size - sizeof(info->biSize)) return FALSE; info = (const BITMAPINFOHEADER *)((const char *)dir + entry->dwDIBOffset); + + if (info->biSize == PNG_SIGN) + return get_png_info(info, size, width, height, bits); + if (info->biSize != sizeof(BITMAPCOREHEADER)) { if ((const char *)(info + 1) - (const char *)dir > size) return FALSE; @@ -824,6 +1142,21 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE /* Check bitmap header */ + if (bmi->bmiHeader.biSize == PNG_SIGN) + { + BITMAPINFO *bmi_png; + + bmi_png = load_png( (const char *)bmi, &maxsize ); + if (bmi_png) + { + hObj = create_icon_from_bmi( bmi_png, maxsize, module, resname, + rsrc, hotspot, bIcon, width, height, cFlag ); + HeapFree( GetProcessHeap(), 0, bmi_png ); + return hObj; + } + return 0; + } + if (maxsize < sizeof(BITMAPCOREHEADER)) { WARN( "invalid size %u\n", maxsize ); @@ -1001,10 +1334,6 @@ done: /********************************************************************** * .ANI cursor support */ -#define RIFF_FOURCC( c0, c1, c2, c3 ) \ - ( (DWORD)(BYTE)(c0) | ( (DWORD)(BYTE)(c1) << 8 ) | \ - ( (DWORD)(BYTE)(c2) << 16 ) | ( (DWORD)(BYTE)(c3) << 24 ) ) - #define ANI_RIFF_ID RIFF_FOURCC('R', 'I', 'F', 'F') #define ANI_LIST_ID RIFF_FOURCC('L', 'I', 'S', 'T') #define ANI_ACON_ID RIFF_FOURCC('A', 'C', 'O', 'N') -- 2.16.2

2 3