November 2017 - Wine-commits

Alex Henrie : wevtapi: Add EvtQuery stub.
by Alexandre Julliard 28 Nov '17

28 Nov '17

Module: wine Branch: master Commit: a3ea8b6c12d3fac9cfbbc2a8d60a31c7b9ede913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3ea8b6c12d3fac9cfbbc2a8d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 28 09:58:48 2017 -0700 wevtapi: Add EvtQuery stub. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wevtapi/main.c | 6 ++++++ dlls/wevtapi/wevtapi.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index aa23c77..e4cf995 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -86,6 +86,12 @@ EVT_HANDLE WINAPI EvtOpenChannelConfig(EVT_HANDLE Session, LPCWSTR ChannelPath, return NULL; } +EVT_HANDLE WINAPI EvtQuery(EVT_HANDLE session, const WCHAR *path, const WCHAR *query, DWORD flags) +{ + FIXME("(%p %s %s %u) stub\n", session, debugstr_w(path), debugstr_w(query), flags); + return NULL; +} + BOOL WINAPI EvtClose(EVT_HANDLE handle) { FIXME("(%p) stub\n", handle); diff --git a/dlls/wevtapi/wevtapi.spec b/dlls/wevtapi/wevtapi.spec index 149fe25..fef3ec0 100644 --- a/dlls/wevtapi/wevtapi.spec +++ b/dlls/wevtapi/wevtapi.spec @@ -36,7 +36,7 @@ @ stub EvtOpenPublisherEnum @ stub EvtOpenPublisherMetadata @ stub EvtOpenSession -@ stub EvtQuery +@ stdcall EvtQuery(ptr wstr wstr long) @ stub EvtRender @ stub EvtSaveChannelConfig @ stub EvtSeek

1 0

Alex Henrie : wevtapi: Add EvtOpenSession stub.
by Alexandre Julliard 28 Nov '17

28 Nov '17

Module: wine Branch: master Commit: d91cf685e1fadf90c5103393a2ea0bef1ed78a46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d91cf685e1fadf90c5103393a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 28 09:58:49 2017 -0700 wevtapi: Add EvtOpenSession stub. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wevtapi/main.c | 6 ++++++ dlls/wevtapi/wevtapi.spec | 2 +- include/winevt.h | 4 ++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index e4cf995..50696ba 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -44,6 +44,12 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } +EVT_HANDLE WINAPI EvtOpenSession(EVT_LOGIN_CLASS login_class, void *login, DWORD timeout, DWORD flags) +{ + FIXME("(%u %p %u %u) stub\n", login_class, login, timeout, flags); + return NULL; +} + BOOL WINAPI EvtGetChannelConfigProperty(EVT_HANDLE ChannelConfig, EVT_CHANNEL_CONFIG_PROPERTY_ID PropertyId, DWORD Flags, diff --git a/dlls/wevtapi/wevtapi.spec b/dlls/wevtapi/wevtapi.spec index fef3ec0..070fd09 100644 --- a/dlls/wevtapi/wevtapi.spec +++ b/dlls/wevtapi/wevtapi.spec @@ -35,7 +35,7 @@ @ stub EvtOpenLog @ stub EvtOpenPublisherEnum @ stub EvtOpenPublisherMetadata -@ stub EvtOpenSession +@ stdcall EvtOpenSession(long ptr long long) @ stdcall EvtQuery(ptr wstr wstr long) @ stub EvtRender @ stub EvtSaveChannelConfig diff --git a/include/winevt.h b/include/winevt.h index 53ffe44..6d2ef1a 100644 --- a/include/winevt.h +++ b/include/winevt.h @@ -53,6 +53,10 @@ typedef enum _EVT_CHANNEL_CONFIG_PROPERTY_ID { EvtChannelConfigPropertyIdEND } EVT_CHANNEL_CONFIG_PROPERTY_ID; +typedef enum _EVT_LOGIN_CLASS { + EvtRpcLogin = 1 +} EVT_LOGIN_CLASS; + typedef enum _EVT_SUBSCRIBE_NOTIFY_ACTION { EvtSubscribeActionError = 0, EvtSubscribeActionDeliver

1 0

Alex Henrie : wevtapi: Add EvtNextChannelPath stub.
by Alexandre Julliard 28 Nov '17

28 Nov '17

Module: wine Branch: master Commit: a061af820f4da9c8fa4dd375c0c3e87524f9bdc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a061af820f4da9c8fa4dd375c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 28 09:58:50 2017 -0700 wevtapi: Add EvtNextChannelPath stub. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wevtapi/main.c | 6 ++++++ dlls/wevtapi/wevtapi.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index 50696ba..0dfe522 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -86,6 +86,12 @@ EVT_HANDLE WINAPI EvtOpenChannelEnum(EVT_HANDLE session, DWORD flags) return NULL; } +BOOL WINAPI EvtNextChannelPath(EVT_HANDLE channel_enum, DWORD buffer_len, WCHAR *buffer, DWORD *used) +{ + FIXME("(%p %u %p %p) stub\n", channel_enum, buffer_len, buffer, used); + return FALSE; +} + EVT_HANDLE WINAPI EvtOpenChannelConfig(EVT_HANDLE Session, LPCWSTR ChannelPath, DWORD Flags) { FIXME("(%p %s %u) stub\n", Session, debugstr_w(ChannelPath), Flags); diff --git a/dlls/wevtapi/wevtapi.spec b/dlls/wevtapi/wevtapi.spec index 070fd09..9f3edbf 100644 --- a/dlls/wevtapi/wevtapi.spec +++ b/dlls/wevtapi/wevtapi.spec @@ -26,7 +26,7 @@ @ stub EvtIntSysprepCleanup @ stub EvtIntWriteXmlEventToLocalLogfile @ stub EvtNext -@ stub EvtNextChannelPath +@ stdcall EvtNextChannelPath(ptr long ptr ptr) @ stub EvtNextEventMetadata @ stub EvtNextPublisherId @ stdcall EvtOpenChannelConfig(ptr wstr long)

1 0

Alex Henrie : wevtapi: Add EvtOpenLog stub.
by Alexandre Julliard 28 Nov '17

28 Nov '17

Module: wine Branch: master Commit: ed46a3268c2b5c088133df0e2266f7cabecc6221 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed46a3268c2b5c088133df0e2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 28 09:58:51 2017 -0700 wevtapi: Add EvtOpenLog stub. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wevtapi/main.c | 6 ++++++ dlls/wevtapi/wevtapi.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index 0dfe522..5b9949b 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -50,6 +50,12 @@ EVT_HANDLE WINAPI EvtOpenSession(EVT_LOGIN_CLASS login_class, void *login, DWORD return NULL; } +EVT_HANDLE WINAPI EvtOpenLog(EVT_HANDLE session, const WCHAR *path, DWORD flags) +{ + FIXME("(%p %s %u) stub\n", session, debugstr_w(path), flags); + return NULL; +} + BOOL WINAPI EvtGetChannelConfigProperty(EVT_HANDLE ChannelConfig, EVT_CHANNEL_CONFIG_PROPERTY_ID PropertyId, DWORD Flags, diff --git a/dlls/wevtapi/wevtapi.spec b/dlls/wevtapi/wevtapi.spec index 9f3edbf..e2bec57 100644 --- a/dlls/wevtapi/wevtapi.spec +++ b/dlls/wevtapi/wevtapi.spec @@ -32,7 +32,7 @@ @ stdcall EvtOpenChannelConfig(ptr wstr long) @ stdcall EvtOpenChannelEnum(ptr long) @ stub EvtOpenEventMetadataEnum -@ stub EvtOpenLog +@ stdcall EvtOpenLog(ptr wstr long) @ stub EvtOpenPublisherEnum @ stub EvtOpenPublisherMetadata @ stdcall EvtOpenSession(long ptr long long)

1 0

Alexandre Julliard : kernel32: Don' t return a parent locale for neutral locales in GetLocaleInfoEx.
by Alexandre Julliard 28 Nov '17

28 Nov '17

Module: wine Branch: master Commit: c63a08586f19af7e6a65a064696743f648006fcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c63a08586f19af7e6a65a0646… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 28 19:36:16 2017 +0100 kernel32: Don't return a parent locale for neutral locales in GetLocaleInfoEx. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 20 +++++++++++++------- dlls/kernel32/tests/locale.c | 8 ++++++++ 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 53bd8a4..e4c323e 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1807,16 +1807,22 @@ INT WINAPI GetLocaleInfoEx(LPCWSTR locale, LCTYPE info, LPWSTR buffer, INT len) if (!lcid) return 0; /* special handling for neutral locale names */ - if (info == LOCALE_SNAME && locale && strlenW(locale) == 2) + if (locale && strlenW(locale) == 2) { - if (len && len < 3) + switch (info) { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return 0; + case LOCALE_SNAME: + if (len && len < 3) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + if (len) strcpyW(buffer, locale); + return 3; + case LOCALE_SPARENT: + if (len) buffer[0] = 0; + return 1; } - - if (len) strcpyW(buffer, locale); - return 3; } return GetLocaleInfoW(lcid, info, buffer, len); diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 97ed6fa..2af4946 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4483,6 +4483,14 @@ static void test_GetLocaleInfoEx(void) ok(ret == lstrlenW(bufferW)+1, "got %d\n", ret); ok(!lstrcmpW(bufferW, enuW), "got %s\n", wine_dbgstr_w(bufferW)); + ret = pGetLocaleInfoEx(enusW, LOCALE_SPARENT, bufferW, sizeof(bufferW)/sizeof(WCHAR)); + ok(ret == lstrlenW(bufferW)+1, "got %d\n", ret); + ok(!lstrcmpW(bufferW, enW), "got %s\n", wine_dbgstr_w(bufferW)); + + ret = pGetLocaleInfoEx(enW, LOCALE_SPARENT, bufferW, sizeof(bufferW)/sizeof(WCHAR)); + ok(ret == 1, "got %d\n", ret); + ok(!bufferW[0], "got %s\n", wine_dbgstr_w(bufferW)); + ret = pGetLocaleInfoEx(enW, LOCALE_SCOUNTRY, bufferW, sizeof(bufferW)/sizeof(WCHAR)); ok(ret == lstrlenW(bufferW)+1, "got %d\n", ret); if ((PRIMARYLANGID(LANGIDFROMLCID(GetSystemDefaultLCID())) != LANG_ENGLISH) ||

1 0

Sergio Gómez Del Real : ole32/tests: Add some tests for testing metafiles.
by Alexandre Julliard 28 Nov '17

28 Nov '17

Module: wine Branch: master Commit: 0f0e2173e739407c435ed43db5f5de3b1be4f279 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f0e2173e739407c435ed43db… Author: Sergio Gómez Del Real <sergio.g.delreal(a)gmail.com> Date: Tue Nov 28 13:01:05 2017 -0500 ole32/tests: Add some tests for testing metafiles. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/ole2.c | 158 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 157 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index a72985e..59a0fe1 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -229,6 +229,24 @@ static void create_bitmap( STGMEDIUM *med ) med->pUnkForRelease = NULL; } +static void create_mfpict(STGMEDIUM *med) +{ + METAFILEPICT *mf; + HDC hdc = CreateMetaFileW(NULL); + + Rectangle(hdc, 0, 0, 100, 200); + + med->tymed = TYMED_MFPICT; + U(med)->hMetaFilePict = GlobalAlloc(GMEM_MOVEABLE, sizeof(METAFILEPICT)); + mf = GlobalLock(U(med)->hMetaFilePict); + mf->mm = MM_ANISOTROPIC; + mf->xExt = 100; + mf->yExt = 200; + mf->hMF = CloseMetaFile(hdc); + GlobalUnlock(U(med)->hMetaFilePict); + med->pUnkForRelease = NULL; +} + static HRESULT WINAPI OleObject_QueryInterface(IOleObject *iface, REFIID riid, void **ppv) { CHECK_EXPECTED_METHOD("OleObject_QueryInterface"); @@ -3939,7 +3957,7 @@ static void check_storage_contents(IStorage *stg, const struct storage_def *stg_ int clipformat = -1; PresentationDataHeader header; char name[32]; - BYTE data[256]; + BYTE data[1024]; memset(&header, 0, sizeof(header)); @@ -4074,6 +4092,143 @@ static IStorage *create_storage_from_def(const struct storage_def *stg_def) return stg; } +static const BYTE mf_rec[] = +{ + 0xd7, 0xcd, 0xc6, 0x9a, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x16, 0x00, 0x2d, 0x00, 0x40, 0x02, + 0x00, 0x00, 0x00, 0x00, 0x6a, 0x55 +}; + +static void get_stgdef(struct storage_def *stg_def, CLIPFORMAT cf, STGMEDIUM *stg_med, int stm_idx) +{ + BYTE *data; + int data_size; + METAFILEPICT *mfpict; + + switch (cf) + { + case CF_METAFILEPICT: + mfpict = GlobalLock(U(stg_med)->hMetaFilePict); + data_size = GetMetaFileBitsEx(mfpict->hMF, 0, NULL); + if (!strcmp(stg_def->stream[stm_idx].name, "CONTENTS")) + { + data = HeapAlloc(GetProcessHeap(), 0, data_size + sizeof(mf_rec)); + memcpy(data, mf_rec, sizeof(mf_rec)); + GetMetaFileBitsEx(mfpict->hMF, data_size, data + sizeof(mf_rec)); + data_size += sizeof(mf_rec); + } + else + { + data = HeapAlloc(GetProcessHeap(), 0, data_size); + GetMetaFileBitsEx(mfpict->hMF, data_size, data); + } + GlobalUnlock(U(stg_med)->hMetaFilePict); + stg_def->stream[stm_idx].data_size = data_size; + stg_def->stream[stm_idx].data = data; + break; + } +} + +static void get_stgmedium(CLIPFORMAT cfFormat, STGMEDIUM *stgmedium) +{ + switch (cfFormat) + { + case CF_METAFILEPICT: + create_mfpict(stgmedium); + break; + default: + ok(0, "cf %x not implemented\n", cfFormat); + } +} + +#define MAX_FMTS 5 +static void test_data_cache_save_data(void) +{ + HRESULT hr; + STGMEDIUM stgmed; + ILockBytes *ilb; + IStorage *doc; + IOleCache2 *cache; + IPersistStorage *persist; + int enumerated_streams, matched_streams, i; + DWORD dummy; + struct tests_data_cache + { + FORMATETC fmts[MAX_FMTS]; + int num_fmts, num_set; + const CLSID *clsid; + struct storage_def stg_def; + }; + + static struct tests_data_cache *pdata, data[] = + { + { + { + { CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, + }, + 1, 1, &CLSID_WineTest, + { + &CLSID_WineTest, 1, { { "\2OlePres000", CF_METAFILEPICT, DVASPECT_CONTENT, 0, NULL, 0 } } + } + }, + { + { + { 0 } + } + } + }; + + /* test _Save after caching directly through _Cache + _SetData */ + for (pdata = data; pdata->clsid != NULL; pdata++) + { + hr = CreateDataCache(NULL, pdata->clsid, &IID_IOleCache2, (void **)&cache); + ok(hr == S_OK, "unexpected %#x\n", hr); + + for (i = 0; i < pdata->num_fmts; i++) + { + hr = IOleCache2_Cache(cache, &pdata->fmts[i], 0, &dummy); + ok(SUCCEEDED(hr), "unexpected %#x\n", hr); + if (i < pdata->num_set) + { + get_stgmedium(pdata->fmts[i].cfFormat, &stgmed); + get_stgdef(&pdata->stg_def, pdata->fmts[i].cfFormat, &stgmed, i); + hr = IOleCache2_SetData(cache, &pdata->fmts[i], &stgmed, TRUE); + ok(hr == S_OK, "unexpected %#x\n", hr); + } + } + + /* create Storage in memory where we'll save cache */ + hr = CreateILockBytesOnHGlobal(0, TRUE, &ilb); + ok(hr == S_OK, "unexpected %#x\n", hr); + hr = StgCreateDocfileOnILockBytes(ilb, STGM_CREATE | STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &doc); + ok(hr == S_OK, "unexpected %#x\n", hr); + ILockBytes_Release(ilb); + hr = IStorage_SetClass(doc, pdata->clsid); + ok(hr == S_OK, "unexpected %#x\n", hr); + + hr = IOleCache2_QueryInterface(cache, &IID_IPersistStorage, (void **)&persist); + ok(hr == S_OK, "unexpected %#x\n", hr); + + /* cache entries are dirty. test saving them to stg */ + trace("IPersistStorage_Save:\n"); + hr = IPersistStorage_Save(persist, doc, FALSE); + ok(hr == S_OK, "unexpected %#x\n", hr); + + check_storage_contents(doc, &pdata->stg_def, &enumerated_streams, &matched_streams); + ok(enumerated_streams == matched_streams, "enumerated %d != matched %d\n", + enumerated_streams, matched_streams); + ok(enumerated_streams == pdata->stg_def.stream_count, "created %d != def streams %d\n", + enumerated_streams, pdata->stg_def.stream_count); + + for (i = 0; i < pdata->num_set; i++) + HeapFree(GetProcessHeap(), 0, (void *)pdata->stg_def.stream[i].data); + + IPersistStorage_Release(persist); + IStorage_Release(doc); + IOleCache2_Release(cache); + } +} + static void test_data_cache_contents(void) { HRESULT hr; @@ -4199,6 +4354,7 @@ START_TEST(ole2) test_OleDraw(); test_OleDoAutoConvert(); test_data_cache_save(); + test_data_cache_save_data(); test_data_cache_contents(); CoUninitialize();

1 0

Sergio Gómez Del Real : ole32: Add DIB saving in data cache, and relevant tests.
by Alexandre Julliard 28 Nov '17

28 Nov '17

Module: wine Branch: master Commit: 51c8fa65740ce9b3c041493fba052500d0f82e7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=51c8fa65740ce9b3c041493fb… Author: Sergio Gómez Del Real <sergio.g.delreal(a)gmail.com> Date: Tue Nov 28 13:01:06 2017 -0500 ole32: Add DIB saving in data cache, and relevant tests. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 49 ++++++++++++++++++++++++++++++++++++++++++------- dlls/ole32/tests/ole2.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 0256957..da7a536 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -838,6 +838,29 @@ static HRESULT DataCacheEntry_Save(DataCacheEntry *cache_entry, IStorage *storag } break; } + case CF_DIB: + { + header.dwSize = GlobalSize(cache_entry->stgmedium.u.hGlobal); + if (header.dwSize) + { + const BITMAPINFO *bmi = GlobalLock(cache_entry->stgmedium.u.hGlobal); + /* Size in units of 0.01mm (ie. MM_HIMETRIC) */ + if (bmi->bmiHeader.biXPelsPerMeter != 0 && bmi->bmiHeader.biYPelsPerMeter != 0) + { + header.dwObjectExtentX = MulDiv( bmi->bmiHeader.biWidth, 100000, bmi->bmiHeader.biXPelsPerMeter ); + header.dwObjectExtentY = MulDiv( bmi->bmiHeader.biHeight, 100000, bmi->bmiHeader.biYPelsPerMeter ); + } + else + { + HDC hdc = GetDC(0); + header.dwObjectExtentX = MulDiv( bmi->bmiHeader.biWidth, 2540, GetDeviceCaps(hdc, LOGPIXELSX) ); + header.dwObjectExtentY = MulDiv( bmi->bmiHeader.biHeight, 2540, GetDeviceCaps(hdc, LOGPIXELSY) ); + ReleaseDC(0, hdc); + } + GlobalUnlock(cache_entry->stgmedium.u.hGlobal); + } + break; + } default: break; } @@ -866,20 +889,32 @@ static HRESULT DataCacheEntry_Save(DataCacheEntry *cache_entry, IStorage *storag IStream_Release(pres_stream); return DV_E_STGMEDIUM; } - data = HeapAlloc(GetProcessHeap(), 0, header.dwSize); - GetMetaFileBitsEx(mfpict->hMF, header.dwSize, data); - GlobalUnlock(cache_entry->stgmedium.u.hMetaFilePict); + if (header.dwSize) + { + data = HeapAlloc(GetProcessHeap(), 0, header.dwSize); + GetMetaFileBitsEx(mfpict->hMF, header.dwSize, data); + GlobalUnlock(cache_entry->stgmedium.u.hMetaFilePict); + if (data) + { + hr = IStream_Write(pres_stream, data, header.dwSize, NULL); + HeapFree(GetProcessHeap(), 0, data); + } + } } break; } + case CF_DIB: + { + data = GlobalLock(cache_entry->stgmedium.u.hGlobal); + if (header.dwSize) + hr = IStream_Write(pres_stream, data, header.dwSize, NULL); + GlobalUnlock(cache_entry->stgmedium.u.hGlobal); + break; + } default: break; } - if (data) - hr = IStream_Write(pres_stream, data, header.dwSize, NULL); - HeapFree(GetProcessHeap(), 0, data); - IStream_Release(pres_stream); return hr; } diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 59a0fe1..88ad207 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -4092,6 +4092,12 @@ static IStorage *create_storage_from_def(const struct storage_def *stg_def) return stg; } +static const BYTE dib_inf[] = +{ + 0x42, 0x4d, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x36, 0x00, 0x00, 0x00 +}; + static const BYTE mf_rec[] = { 0xd7, 0xcd, 0xc6, 0x9a, 0x00, 0x00, 0x00, 0x00, @@ -4107,6 +4113,23 @@ static void get_stgdef(struct storage_def *stg_def, CLIPFORMAT cf, STGMEDIUM *st switch (cf) { + case CF_DIB: + data_size = sizeof(dib); + if (!strcmp(stg_def->stream[stm_idx].name, "CONTENTS")) + { + data_size += sizeof(dib_inf); + data = HeapAlloc(GetProcessHeap(), 0, data_size); + memcpy(data, dib_inf, sizeof(dib_inf)); + memcpy(data + sizeof(dib_inf), dib, sizeof(dib)); + } + else + { + data = HeapAlloc(GetProcessHeap(), 0, data_size); + memcpy(data, dib, sizeof(dib)); + } + stg_def->stream[stm_idx].data = data; + stg_def->stream[stm_idx].data_size = data_size; + break; case CF_METAFILEPICT: mfpict = GlobalLock(U(stg_med)->hMetaFilePict); data_size = GetMetaFileBitsEx(mfpict->hMF, 0, NULL); @@ -4133,6 +4156,9 @@ static void get_stgmedium(CLIPFORMAT cfFormat, STGMEDIUM *stgmedium) { switch (cfFormat) { + case CF_DIB: + create_dib(stgmedium); + break; case CF_METAFILEPICT: create_mfpict(stgmedium); break; @@ -4164,6 +4190,15 @@ static void test_data_cache_save_data(void) { { { + { CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, + }, + 1, 1, &CLSID_WineTest, + { + &CLSID_WineTest, 1, { { "\2OlePres000", CF_DIB, DVASPECT_CONTENT, 0, NULL, 0 } } + } + }, + { + { { CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, }, 1, 1, &CLSID_WineTest,

1 0

Piotr Caban : msvcp90: Use correct locale in basic_ios:: narrow and basic_ios::widen.
by Alexandre Julliard 28 Nov '17

28 Nov '17

Module: wine Branch: master Commit: 53bab55d303dd8ee8ce696b94c47718feb7bc3d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53bab55d303dd8ee8ce696b94… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 28 19:13:43 2017 +0100 msvcp90: Use correct locale in basic_ios::narrow and basic_ios::widen. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 8 ++++---- dlls/msvcp90/tests/ios.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 9ae9e65..3f85997 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -5880,7 +5880,7 @@ DEFINE_THISCALL_WRAPPER(basic_ios_char_narrow, 12) char __thiscall basic_ios_char_narrow(basic_ios_char *this, char ch, char def) { TRACE("(%p %c %c)\n", this, ch, def); - return ctype_char_narrow_ch(ctype_char_use_facet(IOS_LOCALE(this->strbuf)), ch, def); + return ctype_char_narrow_ch(ctype_char_use_facet(IOS_LOCALE(&this->base)), ch, def); } /* ?rdbuf@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAEPAV?$basic_streambuf(a)DU?$char_traits(a)D@std@@@2(a)PAV32@@Z */ @@ -5953,7 +5953,7 @@ DEFINE_THISCALL_WRAPPER(basic_ios_char_widen, 8) char __thiscall basic_ios_char_widen(basic_ios_char *this, char ch) { TRACE("(%p %c)\n", this, ch); - return ctype_char_widen_ch(ctype_char_use_facet(IOS_LOCALE(this->strbuf)), ch); + return ctype_char_widen_ch(ctype_char_use_facet(IOS_LOCALE(&this->base)), ch); } /* ?swap@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAEXAAV12@@Z */ @@ -6161,7 +6161,7 @@ DEFINE_THISCALL_WRAPPER(basic_ios_wchar_narrow, 12) char __thiscall basic_ios_wchar_narrow(basic_ios_wchar *this, wchar_t ch, char def) { TRACE("(%p %c %c)\n", this, ch, def); - return ctype_wchar_narrow_ch(ctype_wchar_use_facet(IOS_LOCALE(this->strbuf)), ch, def); + return ctype_wchar_narrow_ch(ctype_wchar_use_facet(IOS_LOCALE(&this->base)), ch, def); } /* ?rdbuf@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QAEPAV?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@2(a)PAV32@@Z */ @@ -6248,7 +6248,7 @@ DEFINE_THISCALL_WRAPPER(basic_ios_wchar_widen, 8) wchar_t __thiscall basic_ios_wchar_widen(basic_ios_wchar *this, char ch) { TRACE("(%p %c)\n", this, ch); - return ctype_wchar_widen_ch(ctype_wchar_use_facet(IOS_LOCALE(this->strbuf)), ch); + return ctype_wchar_widen_ch(ctype_wchar_use_facet(IOS_LOCALE(&this->base)), ch); } /* ?swap@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QAEXAAV12@@Z */ diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index 90fa6b1..5dcb1d4 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -496,10 +496,14 @@ static basic_ostream_wchar* (*__thiscall p_basic_ostream_short_print_ushort)(bas /* basic_ios */ static locale* (*__thiscall p_basic_ios_char_imbue)(basic_ios_char*, locale*, const locale*); +static basic_ios_char* (*__thiscall p_basic_ios_char_ctor)(basic_ios_char*); +static char (*__thiscall p_basic_ios_char_widen)(basic_ios_char*, char); +static void (*__thiscall p_basic_ios_char_dtor)(basic_ios_char*); static locale* (*__thiscall p_basic_ios_wchar_imbue)(basic_ios_wchar*, locale*, const locale*); /* ios_base */ +static void (*__thiscall p_ios_base__Init)(ios_base*); static IOSB_iostate (*__thiscall p_ios_base_rdstate)(const ios_base*); static IOSB_fmtflags (*__thiscall p_ios_base_setf_mask)(ios_base*, IOSB_fmtflags, IOSB_fmtflags); static void (*__thiscall p_ios_base_unsetf)(ios_base*, IOSB_fmtflags); @@ -724,6 +728,8 @@ static BOOL init(void) SET(p_basic_ostream_char_print_complex_ldouble, "??$?6ODU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEBV?$complex(a)O@0@@Z"); + SET(p_ios_base__Init, + "?_Init(a)ios_base@std@@IEAAXXZ"); SET(p_ios_base_rdstate, "?rdstate(a)ios_base@std@@QEBAHXZ"); SET(p_ios_base_setf_mask, @@ -735,6 +741,12 @@ static BOOL init(void) SET(p_basic_ios_char_imbue, "?imbue@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QEAA?AVlocale(a)2@AEBV32@@Z"); + SET(p_basic_ios_char_ctor, + "??0?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@IEAA(a)XZ"); + SET(p_basic_ios_char_widen, + "?widen@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QEBADD(a)Z"); + SET(p_basic_ios_char_dtor, + "??1?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@UEAA(a)XZ"); SET(p_basic_ios_wchar_imbue, "?imbue@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QEAA?AVlocale(a)2@AEBV32@@Z"); @@ -856,6 +868,8 @@ static BOOL init(void) SET(p_basic_ostream_char_print_complex_ldouble, "??$?6ODU?$char_traits(a)D@std@@@std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$complex(a)O@0@@Z"); + SET(p_ios_base__Init, + "?_Init(a)ios_base@std@@IAAXXZ"); SET(p_ios_base_rdstate, "?rdstate(a)ios_base@std@@QBAHXZ"); SET(p_ios_base_setf_mask, @@ -867,6 +881,12 @@ static BOOL init(void) SET(p_basic_ios_char_imbue, "?imbue@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAA?AVlocale(a)2@ABV32@@Z"); + SET(p_basic_ios_char_ctor, + "??0?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@IAA(a)XZ"); + SET(p_basic_ios_char_widen, + "?widen@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QBADD(a)Z"); + SET(p_basic_ios_char_dtor, + "??1?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@UAA(a)XZ"); SET(p_basic_ios_wchar_imbue, "?imbue@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QAA?AVlocale(a)2@ABV32@@Z"); @@ -987,6 +1007,8 @@ static BOOL init(void) SET(p_basic_ostream_char_print_complex_ldouble, "??$?6ODU?$char_traits(a)D@std@@@std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$complex(a)O@0@@Z"); + SET(p_ios_base__Init, + "?_Init(a)ios_base@std@@IAEXXZ"); SET(p_ios_base_rdstate, "?rdstate(a)ios_base@std@@QBEHXZ"); SET(p_ios_base_setf_mask, @@ -998,6 +1020,12 @@ static BOOL init(void) SET(p_basic_ios_char_imbue, "?imbue@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAE?AVlocale(a)2@ABV32@@Z"); + SET(p_basic_ios_char_ctor, + "??0?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@IAE(a)XZ"); + SET(p_basic_ios_char_widen, + "?widen@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QBEDD(a)Z"); + SET(p_basic_ios_char_dtor, + "??1?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@UAE(a)XZ"); SET(p_basic_ios_wchar_imbue, "?imbue@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QAE?AVlocale(a)2@ABV32@@Z"); @@ -2331,6 +2359,20 @@ static void test_istream_read_complex_double(void) } } +static void test_basic_ios(void) +{ + basic_ios_char bi; + char c; + + call_func1(p_basic_ios_char_ctor, &bi); + call_func1(p_ios_base__Init, &bi.base); + + c = (UINT_PTR)call_func2(p_basic_ios_char_widen, &bi, 'a'); + ok(c == 'a', "basic_ios::widen('a') returned %x\n", c); + + call_func1(p_basic_ios_char_dtor, &bi); +} + START_TEST(ios) { if(!init()) @@ -2356,6 +2398,7 @@ START_TEST(ios) test_ostream_print_complex_double(); test_ostream_print_complex_ldouble(); test_istream_read_complex_double(); + test_basic_ios(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n");

1 0

Piotr Caban : msvcrt: Set errno when close() is called on already closed fd.
by Alexandre Julliard 28 Nov '17

28 Nov '17

Module: wine Branch: master Commit: 67926ec8c344db4250f1e74a5943d0b8a536e950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67926ec8c344db4250f1e74a5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 28 19:48:33 2017 +0100 msvcrt: Set errno when close() is called on already closed fd. Based on a patch by Olly Betts. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/tests/file.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 5eaee2b..1e662e9 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1051,7 +1051,7 @@ int CDECL MSVCRT__close(int fd) if (fd == MSVCRT_NO_CONSOLE_FD) { *MSVCRT__errno() = MSVCRT_EBADF; ret = -1; - } else if (!(info->wxflag & WX_OPEN)) { + } else if (!MSVCRT_CHECK_PMT_ERR(info->wxflag & WX_OPEN, MSVCRT_EBADF)) { ret = -1; } else if (fd == MSVCRT_STDOUT_FILENO && info->handle == get_ioinfo_nolock(MSVCRT_STDERR_FILENO)->handle) { diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 99ceb97..00f5e7e 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -2466,6 +2466,12 @@ static void test_close(void) ok(!GetHandleInformation(h, &flags), "GetHandleInformation succeeded\n"); ok(close(fd2), "close(fd2) succeeded\n"); + /* test close on already closed fd */ + errno = 0xdeadbeef; + ret1 = close(fd1); + ok(ret1 == -1, "close(fd1) succeeded\n"); + ok(errno == 9, "errno = %d\n", errno); + /* test close on stdout and stderr that use the same handle */ h = CreateFileA("fdopen.tst", GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL);

1 0

Fabian Maurer : gdi32: In AddFaceToList allow fonts with long names and add tests.
by Alexandre Julliard 28 Nov '17

28 Nov '17

Module: wine Branch: master Commit: 6f790606c0befdf5c683d4a20789470c43b6f6a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f790606c0befdf5c683d4a20… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Nov 26 14:33:17 2017 +0100 gdi32: In AddFaceToList allow fonts with long names and add tests. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 45 +++++++++++-------------- dlls/gdi32/tests/Makefile.in | 1 + dlls/gdi32/tests/font.c | 54 ++++++++++++++++++++++++++++++ dlls/gdi32/tests/resource.rc | 3 ++ dlls/gdi32/tests/wine_longname.sfd | 66 +++++++++++++++++++++++++++++++++++++ dlls/gdi32/tests/wine_longname.ttf | Bin 0 -> 2216 bytes 6 files changed, 143 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6f790606c0befdf5c683d…

1 0