- wine-devel - winehq.org

[PATCH 1/2] oleaut32: Move rendering a bitmap to a separate helper.
by Dmitry Timoshkov 12 Jul '18

12 Jul '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/olepicture.c | 103 +++++++++++++++++++++++-------------- 1 file changed, 64 insertions(+), 39 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index a2a54bdcd2..36fd7c21a9 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -610,6 +610,55 @@ static HRESULT WINAPI OLEPictureImpl_get_Height(IPicture *iface, return S_OK; } +static void render_masked_bitmap(OLEPictureImpl *This, HDC hdc, + LONG x, LONG y, LONG cx, LONG cy, OLE_XPOS_HIMETRIC xSrc, OLE_YPOS_HIMETRIC ySrc, + OLE_XSIZE_HIMETRIC cxSrc, OLE_YSIZE_HIMETRIC cySrc, HBITMAP hbmMask, HBITMAP hbmXor) +{ + HBITMAP hbmpOld; + HDC hdcBmp; + + /* Set a mapping mode that maps bitmap pixels into HIMETRIC units. + * NB y-axis gets flipped + */ + + hdcBmp = CreateCompatibleDC(0); + SetMapMode(hdcBmp, MM_ANISOTROPIC); + SetWindowOrgEx(hdcBmp, 0, 0, NULL); + SetWindowExtEx(hdcBmp, This->himetricWidth, This->himetricHeight, NULL); + SetViewportOrgEx(hdcBmp, 0, This->origHeight, NULL); + SetViewportExtEx(hdcBmp, This->origWidth, -This->origHeight, NULL); + + if (hbmMask) + { + HDC hdcMask = CreateCompatibleDC(0); + HBITMAP hOldbm = SelectObject(hdcMask, hbmMask); + + hbmpOld = SelectObject(hdcBmp, hbmXor); + + SetMapMode(hdcMask, MM_ANISOTROPIC); + SetWindowOrgEx(hdcMask, 0, 0, NULL); + SetWindowExtEx(hdcMask, This->himetricWidth, This->himetricHeight, NULL); + SetViewportOrgEx(hdcMask, 0, This->origHeight, NULL); + SetViewportExtEx(hdcMask, This->origWidth, -This->origHeight, NULL); + + SetBkColor(hdc, RGB(255, 255, 255)); + SetTextColor(hdc, RGB(0, 0, 0)); + StretchBlt(hdc, x, y, cx, cy, hdcMask, xSrc, ySrc, cxSrc, cySrc, SRCAND); + StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCPAINT); + + SelectObject(hdcMask, hOldbm); + DeleteDC(hdcMask); + } + else + { + hbmpOld = SelectObject(hdcBmp, hbmXor); + StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCCOPY); + } + + SelectObject(hdcBmp, hbmpOld); + DeleteDC(hdcBmp); +} + /************************************************************************ * OLEPictureImpl_Render */ @@ -643,48 +692,24 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc, /* nothing to do */ return S_OK; case PICTYPE_BITMAP: - { - HBITMAP hbmpOld; - HDC hdcBmp; - - /* Set a mapping mode that maps bitmap pixels into HIMETRIC units. - NB y-axis gets flipped */ - - hdcBmp = CreateCompatibleDC(0); - SetMapMode(hdcBmp, MM_ANISOTROPIC); - SetWindowOrgEx(hdcBmp, 0, 0, NULL); - SetWindowExtEx(hdcBmp, This->himetricWidth, This->himetricHeight, NULL); - SetViewportOrgEx(hdcBmp, 0, This->origHeight, NULL); - SetViewportExtEx(hdcBmp, This->origWidth, -This->origHeight, NULL); - - if (This->hbmMask) { - HDC hdcMask = CreateCompatibleDC(0); - HBITMAP hOldbm = SelectObject(hdcMask, This->hbmMask); - - hbmpOld = SelectObject(hdcBmp, This->hbmXor); - - SetMapMode(hdcMask, MM_ANISOTROPIC); - SetWindowOrgEx(hdcMask, 0, 0, NULL); - SetWindowExtEx(hdcMask, This->himetricWidth, This->himetricHeight, NULL); - SetViewportOrgEx(hdcMask, 0, This->origHeight, NULL); - SetViewportExtEx(hdcMask, This->origWidth, -This->origHeight, NULL); - - SetBkColor(hdc, RGB(255, 255, 255)); - SetTextColor(hdc, RGB(0, 0, 0)); - StretchBlt(hdc, x, y, cx, cy, hdcMask, xSrc, ySrc, cxSrc, cySrc, SRCAND); - StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCPAINT); - - SelectObject(hdcMask, hOldbm); - DeleteDC(hdcMask); - } else { - hbmpOld = SelectObject(hdcBmp, This->desc.u.bmp.hbitmap); - StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCCOPY); - } + { + HBITMAP hbmMask, hbmXor; - SelectObject(hdcBmp, hbmpOld); - DeleteDC(hdcBmp); + if (This->hbmMask) + { + hbmMask = This->hbmMask; + hbmXor = This->hbmXor; + } + else + { + hbmMask = 0; + hbmXor = This->desc.u.bmp.hbitmap; } + + render_masked_bitmap(This, hdc, x, y, cx, cy, xSrc, ySrc, cxSrc, cySrc, hbmMask, hbmXor); break; + } + case PICTYPE_ICON: FIXME("Not quite correct implementation of rendering icons...\n"); DrawIconEx(hdc, x, y, This->desc.u.icon.hicon, cx, cy, 0, NULL, DI_NORMAL); -- 2.17.1

1 0

[PATCH v8 1/9] ntdll/tests: Skip map protection tests when access is denied
by Alex Henrie 11 Jul '18

11 Jul '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntdll/tests/info.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 6c93c3cd58..b18f0d39d9 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1789,6 +1789,10 @@ static void test_mapprotection(void) } ok( (status == STATUS_SUCCESS) || (status == STATUS_INVALID_INFO_CLASS), "Expected STATUS_SUCCESS, got %08x\n", status); status = pNtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &flags, sizeof(flags) ); + if (status == STATUS_ACCESS_DENIED) { + skip("Access to set ProcessExecuteFlags denied\n"); + return; + } ok( (status == STATUS_SUCCESS) || (status == STATUS_INVALID_INFO_CLASS), "Expected STATUS_SUCCESS, got %08x\n", status); size.u.LowPart = 0x2000; -- 2.17.1

3 17

[PATCH 2/2] dmime: Reimplement the track form parser
by Michael Stefaniuc 11 Jul '18

11 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/segment.c | 239 +++++++++++++-------------------------------------- 1 file changed, 60 insertions(+), 179 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 48fd6438e1..dc460690f6 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -22,7 +22,6 @@ #include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime); -WINE_DECLARE_DEBUG_CHANNEL(dmfile); /***************************************************************************** * IDirectMusicSegmentImpl implementation @@ -622,195 +621,77 @@ static const IDirectMusicObjectVtbl dmobject_vtbl = { }; /* IDirectMusicSegment8Impl IPersistStream part: */ -static HRESULT load_track(IDirectMusicSegment8Impl *This, IStream *pClonedStream, - IDirectMusicTrack **ppTrack, DMUS_IO_TRACK_HEADER *pTrack_hdr) -{ - HRESULT hr = E_FAIL; - IPersistStream* pPersistStream = NULL; - - hr = CoCreateInstance (&pTrack_hdr->guidClassID, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack, (LPVOID*) ppTrack); - if (FAILED(hr)) { - ERR(": could not create object\n"); - return hr; - } - /* acquire PersistStream interface */ - hr = IDirectMusicTrack_QueryInterface (*ppTrack, &IID_IPersistStream, (LPVOID*) &pPersistStream); - if (FAILED(hr)) { - ERR(": could not acquire IPersistStream\n"); - return hr; - } - /* load */ - hr = IPersistStream_Load (pPersistStream, pClonedStream); - if (FAILED(hr)) { - ERR(": failed to load object\n"); - return hr; - } - - /* release all loading-related stuff */ - IPersistStream_Release (pPersistStream); - - hr = IDirectMusicSegment8_InsertTrack(&This->IDirectMusicSegment8_iface, *ppTrack, - pTrack_hdr->dwGroup); /* at dsPosition */ - if (FAILED(hr)) { - ERR(": could not insert track\n"); - return hr; - } - - return S_OK; -} - -static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, DWORD size, IStream *pStm) +static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, IStream *stream, + const struct chunk_entry *riff) { - HRESULT hr = E_FAIL; - DMUS_PRIVATE_CHUNK Chunk; - DWORD StreamSize, StreamCount, ListSize[3]; - LARGE_INTEGER liMove; /* used when skipping chunks */ - - DMUS_IO_TRACK_HEADER track_hdr; - DMUS_IO_TRACK_EXTRAS_HEADER track_xhdr; - IDirectMusicTrack* pTrack = NULL; - - StreamSize = size - sizeof(FOURCC); - StreamCount = 0; + struct chunk_entry chunk = {.parent = riff}; + IDirectMusicTrack *track = NULL; + IPersistStream *ps = NULL; + IStream *clone; + DMUS_IO_TRACK_HEADER thdr; + HRESULT hr; - do { - IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - StreamCount += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - - switch (Chunk.fccID) { - case DMUS_FOURCC_TRACK_CHUNK: { - TRACE_(dmfile)(": track chunk\n"); - IStream_Read (pStm, &track_hdr, sizeof(DMUS_IO_TRACK_HEADER), NULL); - TRACE_(dmfile)(" - class: %s\n", debugstr_guid (&track_hdr.guidClassID)); - TRACE_(dmfile)(" - dwGroup: %d\n", track_hdr.dwGroup); - TRACE_(dmfile)(" - ckid: %s\n", debugstr_fourcc (track_hdr.ckid)); - TRACE_(dmfile)(" - fccType: %s\n", debugstr_fourcc (track_hdr.fccType)); - break; - } - case DMUS_FOURCC_TRACK_EXTRAS_CHUNK: { - TRACE_(dmfile)(": track extras chunk\n"); - IStream_Read (pStm, &track_xhdr, sizeof(DMUS_IO_TRACK_EXTRAS_HEADER), NULL); - break; - } + TRACE("Parsing track form in %p: %s\n", stream, debugstr_chunk(riff)); - case DMUS_FOURCC_COMMANDTRACK_CHUNK: { - TRACE_(dmfile)(": COMMANDTRACK track\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; + /* First chunk must be the track header */ + if (FAILED(hr = stream_get_chunk(stream, &chunk))) + return hr; + if (chunk.id != DMUS_FOURCC_TRACK_CHUNK) + return DMUS_E_TRACK_HDR_NOT_FIRST_CK; + if (FAILED(hr = stream_chunk_get_data(stream, &chunk, &thdr, sizeof(thdr)))) + return hr; + TRACE("Found DMUS_IO_TRACK_HEADER\n"); + TRACE("\tclass: %s\n", debugstr_guid (&thdr.guidClassID)); + TRACE("\tdwGroup: %d\n", thdr.dwGroup); + TRACE("\tckid: %s\n", debugstr_fourcc (thdr.ckid)); + TRACE("\tfccType: %s\n", debugstr_fourcc (thdr.fccType)); + + if (!!thdr.ckid == !!thdr.fccType) { + WARN("One and only one of the ckid (%s) and fccType (%s) need to be set\n", + debugstr_fourcc(thdr.ckid), debugstr_fourcc(thdr.fccType)); + return DMUS_E_INVALID_TRACK_HDR; } - case FOURCC_LIST: { - IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": LIST chunk of type %s", debugstr_fourcc(Chunk.fccID)); - ListSize[0] = Chunk.dwSize - sizeof(FOURCC); - if (Chunk.fccID == track_hdr.fccType && 0 == track_hdr.ckid) { - LPSTREAM pClonedStream = NULL; - - TRACE_(dmfile)(": TRACK list\n"); - - IStream_Clone (pStm, &pClonedStream); - - liMove.QuadPart = 0; - liMove.QuadPart -= sizeof(FOURCC) + (sizeof(FOURCC)+sizeof(DWORD)); - IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL); - - hr = load_track(This, pClonedStream, &pTrack, &track_hdr); - if (FAILED(hr)) { - ERR(": could not load track\n"); - return hr; - } - IStream_Release (pClonedStream); - - IDirectMusicTrack_Release(pTrack); pTrack = NULL; /* now we can release at as it inserted */ - - liMove.QuadPart = ListSize[0]; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - - } else { - TRACE_(dmfile)(": unknown (skipping)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - } - break; - } + /* Optional chunks */ + while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) { + if ((thdr.ckid && chunk.id == thdr.ckid) || + (!thdr.ckid && (chunk.id == FOURCC_LIST || chunk.id == FOURCC_RIFF) && + chunk.type == thdr.fccType)) + break; - case FOURCC_RIFF: { - IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": RIFF chunk of type %s\n", debugstr_fourcc(Chunk.fccID)); - - ListSize[0] = Chunk.dwSize - sizeof(FOURCC); - - if (Chunk.fccID == track_hdr.fccType && 0 == track_hdr.ckid) { - LPSTREAM pClonedStream = NULL; - - TRACE_(dmfile)(": TRACK RIFF\n"); - - IStream_Clone (pStm, &pClonedStream); - - liMove.QuadPart = 0; - liMove.QuadPart -= sizeof(FOURCC) + (sizeof(FOURCC)+sizeof(DWORD)); - IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL); - - hr = load_track(This, pClonedStream, &pTrack, &track_hdr); - if (FAILED(hr)) { - ERR(": could not load track\n"); - return hr; - } - IStream_Release (pClonedStream); - - IDirectMusicTrack_Release(pTrack); pTrack = NULL; /* now we can release at as it inserted */ - - /** now safe move the cursor */ - liMove.QuadPart = ListSize[0]; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - - } else { - TRACE_(dmfile)(": unknown RIFF fmt (skipping)\n"); - liMove.QuadPart = ListSize[0]; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - } - break; + if (chunk.id == DMUS_FOURCC_TRACK_EXTRAS_CHUNK) + FIXME("DMUS_IO_TRACK_EXTRAS_HEADER chunk not handled\n"); } + if (hr != S_OK) + return hr == S_FALSE ? DMUS_E_TRACK_NOT_FOUND : hr; - default: { - if (0 == track_hdr.fccType && Chunk.fccID == track_hdr.ckid) { - LPSTREAM pClonedStream = NULL; - - TRACE_(dmfile)(": TRACK solo\n"); - - IStream_Clone (pStm, &pClonedStream); - - liMove.QuadPart = 0; - liMove.QuadPart -= (sizeof(FOURCC) + sizeof(DWORD)); - IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL); + /* Some DirectMusicTrack implementation expect the stream to start with their data chunk */ + if (FAILED(hr = IStream_Clone(stream, &clone))) + return hr; + stream_reset_chunk_start(clone, &chunk); - hr = load_track(This, pClonedStream, &pTrack, &track_hdr); - if (FAILED(hr)) { - ERR(": could not load track\n"); - return hr; - } - IStream_Release (pClonedStream); - - IDirectMusicTrack_Release(pTrack); pTrack = NULL; /* now we can release at as it inserted */ + /* Load the track */ + hr = CoCreateInstance(&thdr.guidClassID, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack, + (void **)&track); + if (FAILED(hr)) + goto done; + hr = IDirectMusicTrack_QueryInterface(track, &IID_IPersistStream, (void **)&ps); + if (FAILED(hr)) + goto done; + hr = IPersistStream_Load(ps, clone); + if (FAILED(hr)) + goto done; - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); + hr = IDirectMusicSegment8_InsertTrack(&This->IDirectMusicSegment8_iface, track, thdr.dwGroup); - break; - } +done: + if (ps) + IPersistStream_Release(ps); + if (track) + IDirectMusicTrack_Release(track); + IStream_Release(clone); - TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - TRACE_(dmfile)(": StreamCount[0] = %d < StreamSize[0] = %d\n", StreamCount, StreamSize); - } while (StreamCount < StreamSize); - - return S_OK; + return hr; } static HRESULT parse_track_list(IDirectMusicSegment8Impl *This, IStream *stream, @@ -823,7 +704,7 @@ static HRESULT parse_track_list(IDirectMusicSegment8Impl *This, IStream *stream, while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) if (chunk.id == FOURCC_RIFF && chunk.type == DMUS_FOURCC_TRACK_FORM) - hr = parse_track_form(This, chunk.size, stream); + hr = parse_track_form(This, stream, &chunk); return SUCCEEDED(hr) ? S_OK : hr; } -- 2.14.4

1 0

[PATCH 1/2] dmime: Simplify the track list parser
by Michael Stefaniuc 11 Jul '18

11 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/segment.c | 63 ++++++++++------------------------------------------ 1 file changed, 12 insertions(+), 51 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 77c94f173d..48fd6438e1 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -659,8 +659,7 @@ static HRESULT load_track(IDirectMusicSegment8Impl *This, IStream *pClonedStream return S_OK; } -static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, DMUS_PRIVATE_CHUNK *pChunk, - IStream *pStm) +static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, DWORD size, IStream *pStm) { HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; @@ -671,12 +670,7 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, DMUS_PRIVATE_CHU DMUS_IO_TRACK_EXTRAS_HEADER track_xhdr; IDirectMusicTrack* pTrack = NULL; - if (pChunk->fccID != DMUS_FOURCC_TRACK_FORM) { - ERR_(dmfile)(": %s chunk should be a TRACK form\n", debugstr_fourcc (pChunk->fccID)); - return E_FAIL; - } - - StreamSize = pChunk->dwSize - sizeof(FOURCC); + StreamSize = size - sizeof(FOURCC); StreamCount = 0; do { @@ -819,52 +813,19 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, DMUS_PRIVATE_CHU return S_OK; } -static HRESULT parse_track_list(IDirectMusicSegment8Impl *This, DWORD StreamSize, IStream *pStm) +static HRESULT parse_track_list(IDirectMusicSegment8Impl *This, IStream *stream, + const struct chunk_entry *trkl) { - HRESULT hr = E_FAIL; - DMUS_PRIVATE_CHUNK Chunk; - DWORD ListSize[3], ListCount[3]; - LARGE_INTEGER liMove; /* used when skipping chunks */ + struct chunk_entry chunk = {.parent = trkl}; + HRESULT hr; - ListSize[0] = StreamSize - sizeof(FOURCC); - ListCount[0] = 0; + TRACE("Parsing track list in %p: %s\n", stream, debugstr_chunk(trkl)); - do { - IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - switch (Chunk.fccID) { - case FOURCC_RIFF: { - IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": RIFF chunk of type %s", debugstr_fourcc(Chunk.fccID)); - StreamSize = Chunk.dwSize - sizeof(FOURCC); - switch (Chunk.fccID) { - case DMUS_FOURCC_TRACK_FORM: { - TRACE_(dmfile)(": TRACK form\n"); - hr = parse_track_form(This, &Chunk, pStm); - if (FAILED(hr)) return hr; - break; - } - default: { - TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n"); - liMove.QuadPart = StreamSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - break; - } - default: { - TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); - } while (ListCount[0] < ListSize[0]); + while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) + if (chunk.id == FOURCC_RIFF && chunk.type == DMUS_FOURCC_TRACK_FORM) + hr = parse_track_form(This, chunk.size, stream); - return S_OK; + return SUCCEEDED(hr) ? S_OK : hr; } static inline void dump_segment_header(DMUS_IO_SEGMENT_HEADER *h, DWORD size) @@ -920,7 +881,7 @@ static HRESULT parse_segment_form(IDirectMusicSegment8Impl *This, IStream *strea break; case FOURCC_LIST: if (chunk.type == DMUS_FOURCC_TRACK_LIST) - if (FAILED(hr = parse_track_list(This, chunk.size, stream))) + if (FAILED(hr = parse_track_list(This, stream, &chunk))) return hr; break; case FOURCC_RIFF: -- 2.14.4

1 0

[PATCH] pdh: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 11 Jul '18

11 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/pdh/pdh_main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index fb131bd354..b648d8b8e6 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -210,7 +210,7 @@ static const struct source counter_sources[] = static BOOL is_local_machine( const WCHAR *name, DWORD len ) { WCHAR buf[MAX_COMPUTERNAME_LENGTH + 1]; - DWORD buflen = sizeof(buf) / sizeof(buf[0]); + DWORD buflen = ARRAY_SIZE(buf); if (!GetComputerNameW( buf, &buflen )) return FALSE; return len == buflen && !memicmpW( name, buf, buflen ); @@ -274,7 +274,7 @@ PDH_STATUS WINAPI PdhAddCounterW( PDH_HQUERY hquery, LPCWSTR path, } *hcounter = NULL; - for (i = 0; i < sizeof(counter_sources) / sizeof(counter_sources[0]); i++) + for (i = 0; i < ARRAY_SIZE(counter_sources); i++) { if (pdh_match_path( counter_sources[i].path, path )) { @@ -867,7 +867,7 @@ PDH_STATUS WINAPI PdhLookupPerfIndexByNameW( LPCWSTR machine, LPCWSTR name, LPDW FIXME("remote machine not supported\n"); return PDH_CSTATUS_NO_MACHINE; } - for (i = 0; i < sizeof(counter_sources) / sizeof(counter_sources[0]); i++) + for (i = 0; i < ARRAY_SIZE(counter_sources); i++) { if (pdh_match_path( counter_sources[i].path, name )) { @@ -886,7 +886,7 @@ PDH_STATUS WINAPI PdhLookupPerfNameByIndexA( LPCSTR machine, DWORD index, LPSTR PDH_STATUS ret; WCHAR *machineW = NULL; WCHAR bufferW[PDH_MAX_COUNTER_NAME]; - DWORD sizeW = sizeof(bufferW) / sizeof(WCHAR); + DWORD sizeW = ARRAY_SIZE(bufferW); TRACE("%s %d %p %p\n", debugstr_a(machine), index, buffer, size); @@ -925,7 +925,7 @@ PDH_STATUS WINAPI PdhLookupPerfNameByIndexW( LPCWSTR machine, DWORD index, LPWST if (!buffer || !size) return PDH_INVALID_ARGUMENT; if (!index) return ERROR_SUCCESS; - for (i = 0; i < sizeof(counter_sources) / sizeof(counter_sources[0]); i++) + for (i = 0; i < ARRAY_SIZE(counter_sources); i++) { if (counter_sources[i].index == index) { @@ -1077,7 +1077,7 @@ PDH_STATUS WINAPI PdhValidatePathW( LPCWSTR path ) if ((ret = validate_path( path ))) return ret; - for (i = 0; i < sizeof(counter_sources) / sizeof(counter_sources[0]); i++) + for (i = 0; i < ARRAY_SIZE(counter_sources); i++) if (pdh_match_path( counter_sources[i].path, path )) return ERROR_SUCCESS; return PDH_CSTATUS_NO_COUNTER; -- 2.14.4

1 0

[PATCH] mlang: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 11 Jul '18

11 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mlang/mlang.c | 76 +++++++++++++++++++++++++++--------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index bada104a36..fc162522af 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -494,35 +494,35 @@ static const struct mlang_data SCRIPT_ID sid; } mlang_data[] = { - { "Arabic",1256,sizeof(arabic_cp)/sizeof(arabic_cp[0]),arabic_cp, + { "Arabic", 1256, ARRAY_SIZE(arabic_cp), arabic_cp, "Simplified Arabic Fixed","Simplified Arabic", sidArabic }, - { "Baltic",1257,sizeof(baltic_cp)/sizeof(baltic_cp[0]),baltic_cp, + { "Baltic", 1257, ARRAY_SIZE(baltic_cp), baltic_cp, "Courier New","Arial", sidAsciiLatin }, - { "Chinese Simplified",936,sizeof(chinese_simplified_cp)/sizeof(chinese_simplified_cp[0]),chinese_simplified_cp, + { "Chinese Simplified", 936, ARRAY_SIZE(chinese_simplified_cp), chinese_simplified_cp, "Simsun","Simsun", sidHan }, - { "Chinese Traditional",950,sizeof(chinese_traditional_cp)/sizeof(chinese_traditional_cp[0]),chinese_traditional_cp, + { "Chinese Traditional", 950, ARRAY_SIZE(chinese_traditional_cp), chinese_traditional_cp, "MingLiu","New MingLiu", sidBopomofo }, - { "Central European",1250,sizeof(central_european_cp)/sizeof(central_european_cp[0]),central_european_cp, + { "Central European", 1250, ARRAY_SIZE(central_european_cp), central_european_cp, "Courier New","Arial", sidAsciiLatin }, - { "Cyrillic",1251,sizeof(cyrillic_cp)/sizeof(cyrillic_cp[0]),cyrillic_cp, + { "Cyrillic", 1251, ARRAY_SIZE(cyrillic_cp), cyrillic_cp, "Courier New","Arial", sidCyrillic }, - { "Greek",1253,sizeof(greek_cp)/sizeof(greek_cp[0]),greek_cp, + { "Greek", 1253, ARRAY_SIZE(greek_cp), greek_cp, "Courier New","Arial", sidGreek }, - { "Hebrew",1255,sizeof(hebrew_cp)/sizeof(hebrew_cp[0]),hebrew_cp, + { "Hebrew", 1255, ARRAY_SIZE(hebrew_cp), hebrew_cp, "Miriam Fixed","David", sidHebrew }, - { "Japanese",932,sizeof(japanese_cp)/sizeof(japanese_cp[0]),japanese_cp, + { "Japanese", 932, ARRAY_SIZE(japanese_cp), japanese_cp, "MS Gothic","MS PGothic", sidKana }, - { "Korean",949,sizeof(korean_cp)/sizeof(korean_cp[0]),korean_cp, + { "Korean", 949, ARRAY_SIZE(korean_cp), korean_cp, "GulimChe","Gulim", sidHangul }, - { "Thai",874,sizeof(thai_cp)/sizeof(thai_cp[0]),thai_cp, + { "Thai", 874, ARRAY_SIZE(thai_cp), thai_cp, "Tahoma","Tahoma", sidThai }, - { "Turkish",1254,sizeof(turkish_cp)/sizeof(turkish_cp[0]),turkish_cp, + { "Turkish", 1254, ARRAY_SIZE(turkish_cp), turkish_cp, "Courier New","Arial", sidAsciiLatin }, - { "Vietnamese",1258,sizeof(vietnamese_cp)/sizeof(vietnamese_cp[0]),vietnamese_cp, + { "Vietnamese", 1258, ARRAY_SIZE(vietnamese_cp), vietnamese_cp, "Courier New","Arial", sidAsciiLatin }, - { "Western European",1252,sizeof(western_cp)/sizeof(western_cp[0]),western_cp, + { "Western European", 1252, ARRAY_SIZE(western_cp), western_cp, "Courier New","Arial", sidAsciiLatin }, - { "Unicode",CP_UNICODE,sizeof(unicode_cp)/sizeof(unicode_cp[0]),unicode_cp, + { "Unicode", CP_UNICODE, ARRAY_SIZE(unicode_cp), unicode_cp, "Courier New","Arial" } }; @@ -1163,7 +1163,7 @@ static HRESULT GetFamilyCodePage( if (!puiFamilyCodePage) return S_FALSE; - for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) + for (i = 0; i < ARRAY_SIZE(mlang_data); i++) { for (n = 0; n < mlang_data[i].number_of_cp; n++) { @@ -1560,13 +1560,13 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) && ! IsEqualGUID( &IID_IUnknown, iid) ) return E_NOINTERFACE; - for (i=0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) + for (i = 0; i < ARRAY_SIZE(object_creation); i++) { if (IsEqualGUID(object_creation[i].clsid, rclsid)) break; } - if (i == sizeof(object_creation)/sizeof(object_creation[0])) + if (i == ARRAY_SIZE(object_creation)) { FIXME("%s: no class found.\n", debugstr_guid(rclsid)); return CLASS_E_CLASSNOTAVAILABLE; @@ -1767,7 +1767,7 @@ static HRESULT EnumCodePage_create( MLang_impl* mlang, DWORD grfFlags, ecp->ref = 1; ecp->pos = 0; ecp->total = 0; - for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) + for (i = 0; i < ARRAY_SIZE(mlang_data); i++) { for (n = 0; n < mlang_data[i].number_of_cp; n++) { @@ -1780,7 +1780,7 @@ static HRESULT EnumCodePage_create( MLang_impl* mlang, DWORD grfFlags, sizeof(MIMECPINFO) * ecp->total); cpinfo = ecp->cpinfo; - for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) + for (i = 0; i < ARRAY_SIZE(mlang_data); i++) { for (n = 0; n < mlang_data[i].number_of_cp; n++) { @@ -1944,7 +1944,7 @@ static HRESULT EnumScript_create( MLang_impl* mlang, DWORD dwFlags, es->ref = 1; es->pos = 0; /* do not enumerate unicode flavours */ - es->total = sizeof(mlang_data)/sizeof(mlang_data[0]) - 1; + es->total = ARRAY_SIZE(mlang_data) - 1; es->script_info = HeapAlloc(GetProcessHeap(), 0, sizeof(SCRIPTINFO) * es->total); for (i = 0; i < es->total; i++) @@ -2140,7 +2140,7 @@ static HRESULT WINAPI fnIMultiLanguage_GetCodePageInfo( TRACE("%p, %u, %p\n", This, uiCodePage, pCodePageInfo); - for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) + for (i = 0; i < ARRAY_SIZE(mlang_data); i++) { for (n = 0; n < mlang_data[i].number_of_cp; n++) { @@ -2669,18 +2669,18 @@ static void fill_cp_info(const struct mlang_data *ml_data, UINT index, MIMECPINF mime_cp_info->uiCodePage = ml_data->mime_cp_info[index].cp; mime_cp_info->uiFamilyCodePage = ml_data->family_codepage; MultiByteToWideChar(CP_ACP, 0, ml_data->mime_cp_info[index].description, -1, - mime_cp_info->wszDescription, sizeof(mime_cp_info->wszDescription)/sizeof(WCHAR)); + mime_cp_info->wszDescription, ARRAY_SIZE(mime_cp_info->wszDescription)); MultiByteToWideChar(CP_ACP, 0, ml_data->mime_cp_info[index].web_charset, -1, - mime_cp_info->wszWebCharset, sizeof(mime_cp_info->wszWebCharset)/sizeof(WCHAR)); + mime_cp_info->wszWebCharset, ARRAY_SIZE(mime_cp_info->wszWebCharset)); MultiByteToWideChar(CP_ACP, 0, ml_data->mime_cp_info[index].header_charset, -1, - mime_cp_info->wszHeaderCharset, sizeof(mime_cp_info->wszHeaderCharset)/sizeof(WCHAR)); + mime_cp_info->wszHeaderCharset, ARRAY_SIZE(mime_cp_info->wszHeaderCharset)); MultiByteToWideChar(CP_ACP, 0, ml_data->mime_cp_info[index].body_charset, -1, - mime_cp_info->wszBodyCharset, sizeof(mime_cp_info->wszBodyCharset)/sizeof(WCHAR)); + mime_cp_info->wszBodyCharset, ARRAY_SIZE(mime_cp_info->wszBodyCharset)); MultiByteToWideChar(CP_ACP, 0, ml_data->fixed_font, -1, - mime_cp_info->wszFixedWidthFont, sizeof(mime_cp_info->wszFixedWidthFont)/sizeof(WCHAR)); + mime_cp_info->wszFixedWidthFont, ARRAY_SIZE(mime_cp_info->wszFixedWidthFont)); MultiByteToWideChar(CP_ACP, 0, ml_data->proportional_font, -1, - mime_cp_info->wszProportionalFont, sizeof(mime_cp_info->wszProportionalFont)/sizeof(WCHAR)); + mime_cp_info->wszProportionalFont, ARRAY_SIZE(mime_cp_info->wszProportionalFont)); TRACE("%08x %u %u %s %s %s %s %s %s %d\n", mime_cp_info->dwFlags, mime_cp_info->uiCodePage, @@ -2705,7 +2705,7 @@ static HRESULT WINAPI fnIMultiLanguage3_GetCodePageInfo( TRACE("%p, %u, %04x, %p\n", This, uiCodePage, LangId, pCodePageInfo); - for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) + for (i = 0; i < ARRAY_SIZE(mlang_data); i++) { for (n = 0; n < mlang_data[i].number_of_cp; n++) { @@ -2753,7 +2753,7 @@ static HRESULT WINAPI fnIMultiLanguage3_GetCharsetInfo( if (!pCharsetInfo) return E_FAIL; - for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) + for (i = 0; i < ARRAY_SIZE(mlang_data); i++) { for (n = 0; n < mlang_data[i].number_of_cp; n++) { @@ -2782,7 +2782,7 @@ static HRESULT WINAPI fnIMultiLanguage3_GetCharsetInfo( * them in our database as a primary (web_charset) encoding this loop * does an attempt to 'approximate' charset name by header_charset. */ - for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) + for (i = 0; i < ARRAY_SIZE(mlang_data); i++) { for (n = 0; n < mlang_data[i].number_of_cp; n++) { @@ -3120,7 +3120,7 @@ static HRESULT WINAPI fnIMultiLanguage3_GetCodePageDescription( unsigned int i,n; TRACE ("%u, %04x, %p, %d\n", uiCodePage, lcid, lpWideCharStr, cchWideChar); - for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) + for (i = 0; i < ARRAY_SIZE(mlang_data); i++) { for (n = 0; n < mlang_data[i].number_of_cp; n++) { @@ -3198,7 +3198,7 @@ static HRESULT WINAPI fnIMultiLanguage3_ValidateCodePageEx( return S_OK; /* check for mlang supported code pages */ - for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) + for (i = 0; i < ARRAY_SIZE(mlang_data); i++) { UINT n; for (n = 0; n < mlang_data[i].number_of_cp; n++) @@ -3339,7 +3339,7 @@ static HRESULT WINAPI fnIMLangFontLink2_GetCharCodePages( IMLangFontLink2* iface *ret_codepages = 0; - for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) + for (i = 0; i < ARRAY_SIZE(mlang_data); i++) { BOOL used_dc; CHAR buf; @@ -3559,7 +3559,7 @@ static HRESULT WINAPI fnIMLangFontLink2_GetScriptFontInfo(IMLangFontLink2* This, if (!dwFlags) dwFlags = SCRIPTCONTF_PROPORTIONAL_FONT; - for (i = 0, j = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) + for (i = 0, j = 0; i < ARRAY_SIZE(mlang_data); i++) { if (sid == mlang_data[i].sid) { @@ -3595,7 +3595,7 @@ static HRESULT WINAPI fnIMLangFontLink2_CodePageToScriptID(IMLangFontLink2* This if (uiCodePage == CP_UNICODE) return E_FAIL; - for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) + for (i = 0; i < ARRAY_SIZE(mlang_data); i++) { if (uiCodePage == mlang_data[i].family_codepage) { @@ -3884,11 +3884,11 @@ static HRESULT MultiLanguage_create(IUnknown *pUnkOuter, LPVOID *ppObj) mlang->IMLangLineBreakConsole_iface.lpVtbl = &IMLangLineBreakConsole_vtbl; mlang->total_cp = 0; - for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) + for (i = 0; i < ARRAY_SIZE(mlang_data); i++) mlang->total_cp += mlang_data[i].number_of_cp; /* do not enumerate unicode flavours */ - mlang->total_scripts = sizeof(mlang_data)/sizeof(mlang_data[0]) - 1; + mlang->total_scripts = ARRAY_SIZE(mlang_data) - 1; mlang->ref = 1; *ppObj = &mlang->IMultiLanguage_iface; -- 2.14.4

1 0

[PATCH] atl: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 11 Jul '18

11 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/atl/atl30.c | 2 +- dlls/atl/atl_ax.c | 2 +- dlls/atl/registrar.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/atl/atl30.c b/dlls/atl/atl30.c index d89cf064bc..61386b8831 100644 --- a/dlls/atl/atl30.c +++ b/dlls/atl/atl30.c @@ -374,7 +374,7 @@ ATOM WINAPI AtlModuleRegisterWndClassInfoW(_ATL_MODULEW *pm, _ATL_WNDCLASSINFOW if (!wci->m_wc.lpszClassName) { static const WCHAR szFormat[] = {'A','T','L','%','0','8','l','x',0}; - snprintfW(wci->m_szAutoName, sizeof(wci->m_szAutoName)/sizeof(WCHAR), szFormat, (UINT_PTR)wci); + snprintfW(wci->m_szAutoName, ARRAY_SIZE(wci->m_szAutoName), szFormat, (UINT_PTR)wci); TRACE("auto-generated class name %s\n", debugstr_w(wci->m_szAutoName)); wci->m_wc.lpszClassName = wci->m_szAutoName; } diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index aeda139b54..ff627ccddb 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -1268,7 +1268,7 @@ static LPDLGTEMPLATEW AX_ConvertDialogTemplate(LPCDLGTEMPLATEW src_tmpl) if ( GET_WORD(tmp) == '{' ) /* all this mess created because of this line */ { static const WCHAR AtlAxWin[] = {'A','t','l','A','x','W','i','n', 0}; - PUT_BLOCK(AtlAxWin, sizeof(AtlAxWin)/sizeof(WCHAR)); + PUT_BLOCK(AtlAxWin, ARRAY_SIZE(AtlAxWin)); PUT_BLOCK(tmp, strlenW(tmp)+1); } else PUT_BLOCK(tmp, src-tmp); diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 96fcb0eac3..b717afef74 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -394,11 +394,11 @@ static HRESULT do_process_root_key(LPCOLESTR data, BOOL do_register) hres = DISP_E_EXCEPTION; break; } - for(i=0; i<sizeof(root_keys)/sizeof(root_keys[0]); i++) { + for(i=0; i<ARRAY_SIZE(root_keys); i++) { if(!lstrcmpiW(buf.str, root_keys[i].name)) break; } - if(i == sizeof(root_keys)/sizeof(root_keys[0])) { + if(i == ARRAY_SIZE(root_keys)) { WARN("Wrong root key name: %s\n", debugstr_w(buf.str)); hres = DISP_E_EXCEPTION; break; -- 2.14.4

1 0

[PATCH 3/3] mshtml: Expose window.performance property to scripts.
by Jacek Caban 11 Jul '18

11 Jul '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlwindow.c | 3 +-- dlls/mshtml/tests/documentmode.js | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-)

1 0

[PATCH 2/3] mshtml: Add IHTMLPerformance::timing property implementation.
by Jacek Caban 11 Jul '18

11 Jul '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/omnavigator.c | 388 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 387 insertions(+), 2 deletions(-)

1 0

[PATCH 1/3] mshtml: Add IHTMLPerformance::navigation property implementation.
by Jacek Caban 11 Jul '18

11 Jul '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/omnavigator.c | 176 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 175 insertions(+), 2 deletions(-)

1 0

[PATCH 4/4] [v2] winmm: Support TIME_MIDI position in MIDI stream.
by Akihiro Sagawa 11 Jul '18

11 Jul '18

In v2, Remove awkward goto statement, duplicate TIME_MS code fragment instead. Andrew, as an alternative, do you prefer the following way? --- redo: switch (lpMMT->wType) { : : : /* fall through to alternative format */ case TIME_MS: lpMMT->u.ms = midistream_get_playing_position(lpMidiStrm); break; default: lpMMT->wType = TIME_MS; goto redo; } --- Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/midi.c | 4 ++-- dlls/winmm/winmm.c | 21 ++++++++++++++++++--- 2 files changed, 20 insertions(+), 5 deletions(-)

2 1

[PATCH 3/4] winmm: Make TIME_TICKS position continuous. (rebased)
by Akihiro Sagawa 11 Jul '18

11 Jul '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/midi.c | 2 +- dlls/winmm/winmm.c | 28 ++++++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 3 deletions(-)

2 1

[PATCH 2/4] winmm/tests: Add more MIDI stream position tests. (resend)
by Akihiro Sagawa 11 Jul '18

11 Jul '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/midi.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)

2 1

[PATCH 1/4] winmm: Use microsecond unit in MIDI stream position variable to simplify the code.
by Akihiro Sagawa 11 Jul '18

11 Jul '18

Andrew, thanks for reviewing. Since 32-bit variable overflows after approximately 70 minutes, we use 64-bit variable for this purpose. `remainder' member is removed. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/winmm.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-)

2 1

[PATCH 1/2 v3] mscoree: add stub for CorIsLatestSvc to hint user at broken .NET installation
by Louis Lenders 11 Jul '18

11 Jul '18

v3: removed a test and make last remaining test succeed This function can be called in case of a broken .NET installation. See also https://bugs.winehq.org/show_bug.cgi?id=31688 Hopefully this stub will reduce amount of invalid bugreports in bugzilla about this issue Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/mscoree/mscoree.spec | 2 +- dlls/mscoree/mscoree_main.c | 10 ++++++++++ dlls/mscoree/tests/mscoree.c | 7 ++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index 3715b7c79d..ec4668bc3c 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -25,7 +25,7 @@ @ stub CorDllMainWorker @ stdcall CorExitProcess(long) @ stub CorGetSvc -@ stub CorIsLatestSvc +@ stdcall CorIsLatestSvc(ptr ptr) @ stub CorMarkThreadInThreadPool @ stub CorTickleSvc @ stdcall CreateConfigStream(wstr ptr) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 9561405608..f3ea417f9e 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -309,6 +309,16 @@ HRESULT WINAPI GetCORVersion(LPWSTR pbuffer, DWORD cchBuffer, DWORD *dwLength) return ret; } +HRESULT WINAPI CorIsLatestSvc(int *unk1, int *unk2) +{ + FIXME("%p, %p stub: If this function is called, it is likely the result of a broken .NET installation!\n", unk1, unk2); + + if (!unk1 || !unk2) + return E_POINTER; + + return S_OK; +} + HRESULT WINAPI GetRequestedRuntimeInfo(LPCWSTR pExe, LPCWSTR pwszVersion, LPCWSTR pConfigurationFile, DWORD startupFlags, DWORD runtimeInfoFlags, LPWSTR pDirectory, DWORD dwDirectory, DWORD *dwDirectoryLength, LPWSTR pVersion, DWORD cchBuffer, DWORD *dwlength) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 63517dc79b..dd4724dc76 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -35,6 +35,7 @@ static const WCHAR v4_0[] = {'v','4','.','0','.','3','0','3','1','9',0}; static HMODULE hmscoree; static HRESULT (WINAPI *pGetCORVersion)(LPWSTR, DWORD, DWORD*); +static HRESULT (WINAPI *pCorIsLatestSvc)(INT*, INT*); static HRESULT (WINAPI *pGetCORSystemDirectory)(LPWSTR, DWORD, DWORD*); static HRESULT (WINAPI *pGetRequestedRuntimeInfo)(LPCWSTR, LPCWSTR, LPCWSTR, DWORD, DWORD, LPWSTR, DWORD, DWORD*, LPWSTR, DWORD, DWORD*); static HRESULT (WINAPI *pLoadLibraryShim)(LPCWSTR, LPCWSTR, LPVOID, HMODULE*); @@ -55,6 +56,7 @@ static BOOL init_functionpointers(void) } pGetCORVersion = (void *)GetProcAddress(hmscoree, "GetCORVersion"); + pCorIsLatestSvc = (void *)GetProcAddress(hmscoree, "CorIsLatestSvc"); pGetCORSystemDirectory = (void *)GetProcAddress(hmscoree, "GetCORSystemDirectory"); pGetRequestedRuntimeInfo = (void *)GetProcAddress(hmscoree, "GetRequestedRuntimeInfo"); pLoadLibraryShim = (void *)GetProcAddress(hmscoree, "LoadLibraryShim"); @@ -63,7 +65,7 @@ static BOOL init_functionpointers(void) pCLRCreateInstance = (void *)GetProcAddress(hmscoree, "CLRCreateInstance"); if (!pGetCORVersion || !pGetCORSystemDirectory || !pGetRequestedRuntimeInfo || !pLoadLibraryShim || - !pCreateInterface || !pCLRCreateInstance + !pCreateInterface || !pCLRCreateInstance || !pCorIsLatestSvc ) { win_skip("functions not available\n"); @@ -289,6 +291,9 @@ static void test_versioninfo(void) hr = pGetRequestedRuntimeInfo( NULL, v2_0_0, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); ok(!winetest_strcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); + + hr = pCorIsLatestSvc(NULL, NULL); + ok(hr == E_POINTER, "CorIsLatestSvc returned %08x\n", hr); } static void test_loadlibraryshim(void) -- 2.17.1

4 7

[PATCH] inetcpl.cpl: Add support for setting automatic proxy configuration
by Piotr Caban 11 Jul '18

11 Jul '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/inetcpl.cpl/connections.c | 149 +++++++++++++++++++++++++++++++++++------ dlls/inetcpl.cpl/inetcpl.h | 9 ++- dlls/inetcpl.cpl/inetcpl.rc | 17 +++-- 3 files changed, 145 insertions(+), 30 deletions(-)

1 0

[PATCH] ntdll: Check context is NULL in NtGetContextThread.
by Johannes Brandstätter 11 Jul '18

11 Jul '18

Crash Bandicoot N. Sane Trilogy calls NtGetContextThread with the context being set to NULL which leads to a crash. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45428 Signed-off-by: Johannes Brandstätter <jbrandst(a)2ds.eu> --- dlls/ntdll/signal_x86_64.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)

1 0

winebus.sys: Device reports coming in too fast, last report not read yet
by Kai Krakow 11 Jul '18

11 Jul '18

Hello! I'm currently exploring the massive amounts of the following error messages I see when using my xbox controller: 002b:err:hid_report:process_hid_report Device reports coming in too fast, last report not read yet! 002b:err:hid_report:process_hid_report Device reports coming in too fast, last report not read yet! 002b:err:hid_report:process_hid_report Device reports coming in too fast, last report not read yet! [...] The code that generates this looks a bit problematic to me. First, it's definitely loosing HID reports here. I wonder if this also explains why my controller rarely sees missing button presses. But the issue seen here seems to mostly result from the controller generating lots and lots of axis events. So my first thought was: Hey, if there's a buffer overrun issue then why not just replace axis reports in the buffer with the most current report for the same axes so we do not easily overwrite button reports. But looking at the code I found that there is no buffering at all. It just unconditionally overwrites the last report (writing that error message if that report was not read yet), and then continues to a while loop I do not understand at all. @@@ void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) > if (!ext->last_report_read) > ERR_(hid_report)("Device reports coming in too fast, last report not read yet!\n"); > memcpy(ext->last_report, report, length); > ext->last_report_size = length; > ext->last_report_read = FALSE; > while ((entry = RemoveHeadList(&ext->irp_queue)) != &ext->irp_queue) > { > IO_STACK_LOCATION *irpsp; > TRACE_(hid_report)("Processing Request\n"); > irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry); > irpsp = IoGetCurrentIrpStackLocation(irp); > irp->IoStatus.u.Status = deliver_last_report(ext, > irpsp->Parameters.DeviceIoControl.OutputBufferLength, > irp->UserBuffer, &irp->IoStatus.Information); > ext->last_report_read = TRUE; > IoCompleteRequest(irp, IO_NO_INCREMENT); > } Why doesn't the while loop run before replacing the last report so it has a chance to deliver the buffered report before overwriting it? Of course the while loop would still be needed after replacing the report so it would make sense to put it into a helper. Second, I also wonder: Doesn't the while loop potentially run more than one loop? Wouldn't it then deliver just the same last report multiple times? Where is the point in this? This would also conflict with my idea of trying to deliver the last report again before replacing it, doesn't it? What's the IRP queue anyway? Is it part of a consumer or producer? Thus, my current understanding it that first, it looses reports, and second, it duplicates reports if it lost some before. I see that process_hid_report() is called from the lower SDL layers in my case. Does it make sense to handle buffering there? Apparently, process_hid_report() doesn't return a result, so there's no feedback whether the HID report could deliver the report or not. Would it make sense to return the result of ext->last_report_read? That way, the SDL layer could buffer the report itself and maybe implement some logic to reduce the amount of axis reports generated. For axis reports from the joysticks, it doesn't matter if we overwrite reports as axis position is reported as an absolute value. So we could keep one buffer per axis and keep track of whether it was delivered or not, then retry next time. But this should probably go into some thread which keeps on trying to process such buffered hid reports. Thanks, Kai

2 1

Wine staging 3.12 release
by Alistair Leslie-Hughes 11 Jul '18

11 Jul '18

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary of the past few weeks * Rebased to current wine 3.12 (990 patches are applied to wine vanilla) * Reviewed and upstreamed patches. Updated * wintab32 patchset. Added * [45382] wined3d: Stop the Sting demo crashing * [39402] xaudio2: Add support for WMA format. WMA currently only support on distro's with ffmpeg 4 but we will be looking at supporting older versions of ffmpeg in a future release. Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game: Claybook, Just Cause 3 * Test your favorite applications. * Steal staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

2 2

[PATCH] include: Avoid redefining the DWRITE_GLYPH_RUN_DESCRIPTION typedef.
by Henri Verbeet 11 Jul '18

11 Jul '18

Based on a patch by Alistair. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/dwrite.idl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/dwrite.idl b/include/dwrite.idl index e6ab2b7ead4..bfb2c1b37d5 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -404,14 +404,18 @@ struct DWRITE_GLYPH_RUN UINT32 bidiLevel; }; -typedef struct DWRITE_GLYPH_RUN_DESCRIPTION +cpp_quote("#ifndef __d2d1_1_h__") +typedef struct DWRITE_GLYPH_RUN_DESCRIPTION DWRITE_GLYPH_RUN_DESCRIPTION; +cpp_quote("#endif /* __d2d1_1_h__ */") + +struct DWRITE_GLYPH_RUN_DESCRIPTION { WCHAR const* localeName; WCHAR const* string; UINT32 stringLength; UINT16 const* clusterMap; UINT32 textPosition; -} DWRITE_GLYPH_RUN_DESCRIPTION; +}; typedef struct DWRITE_UNDERLINE { -- 2.11.0

1 0

[PATCH v3] comctl32/imagelist: fix ImageList_Read
by Denis Malikov 11 Jul '18

11 Jul '18

Fix for versions x600 and x620 and pointer calculation for mixing image and mask bits. Tested on *.reg files extracted from: - XP/2003 key HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\TrayNotify; - Vista/7 key HKEY_CLASSES_ROOT\Local Settings\Software\Microsoft\Windows\CurrentVersion\TrayNotify Signed-off-by: Denis Malikov <mdn40000(a)mail.ru> --- dlls/comctl32/imagelist.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index a08d60752e..be901462a0 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2267,7 +2267,9 @@ HIMAGELIST WINAPI ImageList_Read(IStream *pstm) return NULL; if (ilHead.usMagic != (('L' << 8) | 'I')) return NULL; - if (ilHead.usVersion != 0x101) /* probably version? */ + if (ilHead.usVersion != 0x101 && + ilHead.usVersion != 0x600 && /* XP/2003 version */ + ilHead.usVersion != 0x620) /* Vista/7 version */ return NULL; TRACE("cx %u, cy %u, flags 0x%04x, cCurImage %u, cMaxImage %u\n", @@ -2296,23 +2298,25 @@ HIMAGELIST WINAPI ImageList_Read(IStream *pstm) { DWORD *ptr = image_bits; BYTE *mask_ptr = mask_bits; - int stride = himl->cy * image_info->bmiHeader.biWidth; + int stride = himl->cy * (ilHead.usVersion != 0x101 ? himl->cx : image_info->bmiHeader.biWidth); + int image_step = ilHead.usVersion != 0x101 ? 1 : TILE_COUNT; + int mask_step = ilHead.usVersion != 0x101 ? 4 : 8; if (image_info->bmiHeader.biHeight > 0) /* bottom-up */ { ptr += image_info->bmiHeader.biHeight * image_info->bmiHeader.biWidth - stride; - mask_ptr += (image_info->bmiHeader.biHeight * image_info->bmiHeader.biWidth - stride) / 8; + mask_ptr += (image_info->bmiHeader.biHeight * image_info->bmiHeader.biWidth - stride) / mask_step; stride = -stride; image_info->bmiHeader.biHeight = himl->cy; } else image_info->bmiHeader.biHeight = -himl->cy; - for (i = 0; i < ilHead.cCurImage; i += TILE_COUNT) + for (i = 0; i < ilHead.cCurImage; i += image_step) { - add_dib_bits( himl, i, min( ilHead.cCurImage - i, TILE_COUNT ), + add_dib_bits( himl, i, min( ilHead.cCurImage - i, image_step ), himl->cx, himl->cy, image_info, mask_info, ptr, mask_ptr ); ptr += stride; - mask_ptr += stride / 8; + mask_ptr += stride / mask_step; } } else -- 2.16.2.windows.1

2 4

[PATCH 2/2] msvcp120: Test values returned by _Concurrent_vector_base_v4::_Internal_clear
by Piotr Caban 11 Jul '18

11 Jul '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp120/tests/msvcp120.c | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[PATCH 1/2] msvcp120: Fix concurrent_vector_int_dtor helper
by Piotr Caban 11 Jul '18

11 Jul '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp120/tests/msvcp120.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)

1 0

[PATCH] kernel32: Always start debugger on WinSta0
by André Hentschel 11 Jul '18

11 Jul '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/kernel32/except.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index de244fc..5f2166e 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -304,6 +304,7 @@ static BOOL start_debugger(PEXCEPTION_POINTERS epointers, HANDLE hEvent) TRACE("Starting debugger %s\n", debugstr_a(cmdline)); memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); + startup.lpDesktop = (char *)"WinSta0"; startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = SW_SHOWNORMAL; ret = CreateProcessA(NULL, cmdline, NULL, NULL, TRUE, 0, env, NULL, &startup, &info); -- 2.7.4

2 2

[PATCH] testbot/LibvirtTool: Only power off the VM if needed for the revert.
by Francois Gouget 11 Jul '18

11 Jul '18

Reverting from a powered off state is sometimes ten times longer than reverting from the current state. But Libvirt/QEmu is buggy and fails to revert if the VM configuration changes. So try the revert first and, if it fails (which is fast), power off + re-revert the VM. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 91fe05358..3805c2bcf 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -411,19 +411,25 @@ sub Revert() } $CurrentStatus = "reverting"; - # Some QEmu/KVM versions are buggy and cannot revert a running VM - Debug(Elapsed($Start), " Powering off the VM\n"); + # Revert the VM (and power it on if necessary) my $Domain = $VM->GetDomain(); - my $ErrMessage = $Domain->PowerOff(); + Debug(Elapsed($Start), " Reverting $VMKey to ", $VM->IdleSnapshot, "\n"); + my $ErrMessage = $Domain->RevertToSnapshot(); if (defined $ErrMessage) { - LogMsg "Could not power off $VMKey: $ErrMessage\n"; - LogMsg "Trying the revert anyway...\n"; - } + # Libvirt/QEmu is buggy and cannot revert a running VM from one hardware + # configuration to another. So try again after powering off the VM, though + # this can be much slower. + Debug(Elapsed($Start), " Powering off the VM\n"); + $ErrMessage = $Domain->PowerOff(); + if (defined $ErrMessage) + { + FatalError("Could not power off $VMKey: $ErrMessage\n"); + } - # Revert the VM (and power it on if necessary) - Debug(Elapsed($Start), " Reverting $VMKey to ", $VM->IdleSnapshot, "\n"); - $ErrMessage = $Domain->RevertToSnapshot(); + Debug(Elapsed($Start), " Reverting $VMKey to ", $VM->IdleSnapshot, "... again\n"); + $ErrMessage = $Domain->RevertToSnapshot(); + } if (defined $ErrMessage) { FatalError("Could not revert $VMKey to ". $VM->IdleSnapshot .": $ErrMessage\n"); -- 2.18.0

1 0

[PATCH] testbot: Remove support for the old Step files locations.
by Francois Gouget 11 Jul '18

11 Jul '18

It is no longer needed now that all the existing Jobs follow the new conventions. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Steps.pm | 5 ----- testbot/lib/WineTestBot/StepsTasks.pm | 5 ----- 2 files changed, 10 deletions(-) diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 71e04471d..0159314f9 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -154,11 +154,6 @@ sub GetFullFileName($) return undef if (!defined $self->FileName); my ($JobId, $StepNo) = @{$self->GetMasterKey()}; - # FIXME: Remove legacy support once no such job remains (so after - # $JobPurgeDays). - my $LegacyPath = "$DataDir/jobs/$JobId/$StepNo/" . $self->FileName; - return $LegacyPath if (-f $LegacyPath); - my $Path = "$DataDir/jobs/$JobId/"; $Path .= $self->PreviousNo ."/" if ($self->PreviousNo); return $Path . $self->FileName; diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 05854bca7..470ce4e87 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -47,11 +47,6 @@ sub GetFullFileName($) return undef if (!defined $self->FileName); my ($JobId, $_StepTaskId) = @{$self->GetMasterKey()}; - # FIXME: Remove legacy support once no such job remains (so after - # $JobPurgeDays). - my $LegacyPath = "$DataDir/jobs/$JobId/". $self->StepNo ."/". $self->FileName; - return $LegacyPath if (-f $LegacyPath); - my $Path = "$DataDir/jobs/$JobId/"; $Path .= $self->PreviousNo ."/" if ($self->PreviousNo); return $Path . $self->FileName; -- 2.18.0

1 0

[PATCH] testbot: Remove the Step::InStaging field.
by Francois Gouget 11 Jul '18

11 Jul '18

It has been replaced by the new Job-based staging mechanism and is not needed anymore. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Updating the database is not absolutely necessary but getting rid of the InStaging is the whole point of this patch. So it's highly recommended to update the database. Either way the web server and TestBot Engine should be restarted. testbot/bin/CheckForWinetestUpdate.pl | 3 --- testbot/ddl/update38.sql | 4 +++ testbot/ddl/winetestbot.sql | 1 - testbot/doc/winetestbot-schema.dia | 23 ---------------- testbot/lib/WineTestBot/Engine/Scheduler.pm | 2 -- testbot/lib/WineTestBot/Patches.pm | 3 --- testbot/lib/WineTestBot/Steps.pm | 29 --------------------- testbot/lib/WineTestBot/StepsTasks.pm | 17 +----------- testbot/web/Submit.pl | 3 --- 9 files changed, 5 insertions(+), 80 deletions(-) create mode 100644 testbot/ddl/update38.sql diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index a570a1b80..df5a326f5 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -207,7 +207,6 @@ sub AddJob($$$) $NewStep->Type("suite"); $NewStep->FileName($LatestBaseName); $NewStep->FileType($Bits == 64 ? "exe64" : "exe32"); - $NewStep->InStaging(!1); # Add a task for each VM my $Tasks = $NewStep->Tasks; @@ -276,7 +275,6 @@ sub AddReconfigJob($) my $BuildStep = $Steps->Add(); $BuildStep->Type("reconfig"); $BuildStep->FileType("none"); - $BuildStep->InStaging(!1); # And a task for each VM my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); @@ -309,7 +307,6 @@ sub AddReconfigJob($) $NewStep->PreviousNo($BuildStep->No); $NewStep->Type("suite"); $NewStep->FileType("none"); - $NewStep->InStaging(!1); foreach my $VMKey (@$SortedKeys) { diff --git a/testbot/ddl/update38.sql b/testbot/ddl/update38.sql new file mode 100644 index 000000000..56f7d1171 --- /dev/null +++ b/testbot/ddl/update38.sql @@ -0,0 +1,4 @@ +USE winetestbot; + +ALTER TABLE Steps + DROP InStaging; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 12b5dea1a..a6adea820 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -134,7 +134,6 @@ CREATE TABLE Steps Status ENUM('queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled', 'skipped') NOT NULL, FileName VARCHAR(100) NULL, FileType ENUM('none', 'exe32', 'exe64', 'patchdlls', 'patchprograms') NOT NULL, - InStaging ENUM('Y', 'N') NOT NULL, DebugLevel INT(2) NOT NULL, ReportSuccessfulTests ENUM('Y', 'N') NOT NULL, PRIMARY KEY (JobId, No), diff --git a/testbot/doc/winetestbot-schema.dia b/testbot/doc/winetestbot-schema.dia index 0dbc7f985..d3efcb8d8 100644 --- a/testbot/doc/winetestbot-schema.dia +++ b/testbot/doc/winetestbot-schema.dia @@ -1875,29 +1875,6 @@ <dia:string>##</dia:string> </dia:attribute> </dia:composite> - <dia:composite type="table_attribute"> - <dia:attribute name="name"> - <dia:string>#InStaging#</dia:string> - </dia:attribute> - <dia:attribute name="type"> - <dia:string>#BOOL#</dia:string> - </dia:attribute> - <dia:attribute name="comment"> - <dia:string>##</dia:string> - </dia:attribute> - <dia:attribute name="primary_key"> - <dia:boolean val="false"/> - </dia:attribute> - <dia:attribute name="nullable"> - <dia:boolean val="false"/> - </dia:attribute> - <dia:attribute name="unique"> - <dia:boolean val="false"/> - </dia:attribute> - <dia:attribute name="default_value"> - <dia:string>##</dia:string> - </dia:attribute> - </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> <dia:string>#DebugLevel#</dia:string> diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index 3ed86e28d..4d944c9fd 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -572,8 +572,6 @@ sub _ScheduleTasks($) my $Previous = ""; # Avoid undefined values for hash indices if (!$Step->PreviousNo) { - # The first step may need to get files from the staging area - $Step->HandleStaging() if ($Step->Status eq "queued"); $StepRank = 0; $StepVMs{$Step} = []; } diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index cafd54d46..2d553fed3 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -182,7 +182,6 @@ sub Submit($$$) my $BuildStep = $NewJob->Steps->Add(); $BuildStep->FileName("patch.diff"); $BuildStep->FileType("patchdlls"); - $BuildStep->InStaging(!1); $BuildStep->Type("build"); $BuildStep->DebugLevel(0); @@ -220,7 +219,6 @@ sub Submit($$$) $FileName .= "64" if ($Bits eq "64"); $NewStep->FileName("$FileName.exe"); $NewStep->FileType("exe$Bits"); - $NewStep->InStaging(!1); # And a task for each VM my $Tasks = $NewStep->Tasks; @@ -248,7 +246,6 @@ sub Submit($$$) my $NewStep = $NewJob->Steps->Add(); $NewStep->FileName("patch.diff"); $NewStep->FileType("patchdlls"); - $NewStep->InStaging(!1); $NewStep->DebugLevel(0); # And a task for each VM diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 0159314f9..cb2c6eeb7 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -90,7 +90,6 @@ sub InitializeNew($$) $self->Status("queued"); $self->Type("single"); $self->FileType("none"); - $self->InStaging(1); $self->DebugLevel(1); $self->ReportSuccessfulTests(!1); @@ -159,33 +158,6 @@ sub GetFullFileName($) return $Path . $self->FileName; } -sub HandleStaging($$) -{ - my ($self) = @_; - - # Always at least create the step's directory - my $StepDir = $self->CreateDir(); - return undef if (! $self->InStaging); - - my $FileName = $self->FileName; - if ($FileName !~ m/^[0-9a-z-]+_(.*)$/) - { - return "Can't split staging filename"; - } - my $BaseName = $1; - $self->FileName($BaseName); - my $StagingFileName = "$DataDir/staging/$FileName"; - if (!move($StagingFileName, $self->GetFullFileName())) - { - return "Could not move the staging file: $!"; - } - - $self->InStaging(!1); - my ($ErrProperty, $ErrMessage) = $self->Save(); - - return $ErrMessage; -} - sub UpdateStatus($$) { my ($self, $Skip) = @_; @@ -261,7 +233,6 @@ my @PropertyDescriptors = ( CreateEnumPropertyDescriptor("Type", "Step type", !1, 1, ['suite', 'single', 'build', 'reconfig']), CreateBasicPropertyDescriptor("FileName", "File name", !1, !1, "A", 100), CreateEnumPropertyDescriptor("FileType", "File type", !1, 1, ['none', 'exe32', 'exe64', 'patchdlls', 'patchprograms']), - CreateBasicPropertyDescriptor("InStaging", "File is in staging area", !1, 1, "B", 1), CreateBasicPropertyDescriptor("DebugLevel", "Debug level (WINETEST_DEBUG)", !1, 1, "N", 2), CreateBasicPropertyDescriptor("ReportSuccessfulTests", "Report successful tests (WINETEST_REPORT_SUCCESS)", !1, 1, "B", 1), CreateDetailrefPropertyDescriptor("Tasks", "Tasks", !1, !1, \&CreateTasks), diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 470ce4e87..4675194e6 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -140,22 +140,7 @@ sub _initialize($$) $StepTask->Status($Task->Status); $StepTask->VM($Task->VM); $StepTask->Timeout($Task->Timeout); - if ($Step->InStaging) - { - my $FileName = $Step->FileName; - if ($FileName =~ m/^[\da-fA-F]+ (.*)$/) - { - $StepTask->FileName("$1"); - } - else - { - $StepTask->FileName("unknown"); - } - } - else - { - $StepTask->FileName($Step->FileName); - } + $StepTask->FileName($Step->FileName); $StepTask->FileType($Step->FileType); $StepTask->CmdLineArg($Task->CmdLineArg); $StepTask->Started($Task->Started); diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index cb6a1246f..e207d78ba 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -801,7 +801,6 @@ sub OnSubmit($) $BuildStep = $Steps->Add(); $BuildStep->FileName($BaseName); $BuildStep->FileType($FileType); - $BuildStep->InStaging(!1); $BuildStep->Type("build"); $BuildStep->DebugLevel(0); @@ -836,7 +835,6 @@ sub OnSubmit($) { $TestStep->FileName($BaseName); } - $TestStep->InStaging(!1); $TestStep->FileType("exe$Bits"); $TestStep->Type("single"); $TestStep->DebugLevel($self->GetParam("DebugLevel")); @@ -874,7 +872,6 @@ sub OnSubmit($) my $WineStep = $Steps->Add(); $WineStep->FileName($BaseName); $WineStep->FileType($FileType); - $WineStep->InStaging(!1); $WineStep->Type("build"); $WineStep->DebugLevel($self->GetParam("DebugLevel")); $WineStep->ReportSuccessfulTests(defined($self->GetParam("ReportSuccessfulTests"))); -- 2.18.0

1 0

[PATCH] testbot/WineSendLog: Print a message for non-mailing list jobs.
by Francois Gouget 11 Jul '18

11 Jul '18

WineSendLog exits early for these. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineSendLog.pl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 29da4a04d..f095bce8d 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -426,7 +426,11 @@ EOF close(SENDMAIL); # This is all for jobs submitted from the website - return if (!defined $Job->Patch); + if (!defined $Job->Patch) + { + Debug("Not a mailing list patch -> all done.\n"); + return; + } # # Build a job summary with only the new errors -- 2.18.0

1 0

[PATCH] testbot/web: Hightlight the winediag and X errors.
by Francois Gouget 11 Jul '18

11 Jul '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 8 +++++++- testbot/web/WineTestBot.css | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 0ef9609e7..5e6407b49 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -431,7 +431,13 @@ sub GetLogLineCategory($) { return "error"; } - if ($Line =~ /^BotError:/) + if ($Line =~ /:winediag:/) + { + return "diag"; + } + if ($Line =~ /^BotError:/ or + $Line =~ /^X Error of failed request: / or + $Line =~ / opcode of failed request: /) { return "boterror"; } diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index ae2038290..9656254e0 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -378,6 +378,7 @@ pre .log-todo { color: #d08000; } .log-error { color: red; } .log-boterror { color: #cc0052; } +.log-diag { color: #e56300; } a.title { color:inherit; text-decoration: none; } -- 2.18.0

1 0

[PATCH] testbot/LibvirtTool: Remove the duplicate units after the elapsed time.
by Francois Gouget 11 Jul '18

11 Jul '18

The string returned by PrettyElapsed() already includes the time unit since it's needed for durations over 1 minute to be readable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 3805c2bcf..e6742f4c3 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -344,7 +344,7 @@ sub Monitor() return 1 if (ChangeStatus("offline", "off", "done")); NotifyAdministrator("The $VMKey VM is working again", "The $VMKey VM started working again after ". - PrettyElapsed($Start) ." seconds."); + PrettyElapsed($Start) ."."); return 0; } } @@ -489,6 +489,6 @@ else Error("Unsupported action $Action!\n"); $Rc = 1; } -LogMsg "$Action on $VMKey completed in ", PrettyElapsed($Start), " s\n"; +LogMsg "$Action on $VMKey completed in ", PrettyElapsed($Start), "\n"; exit $Rc; -- 2.18.0

1 0

[PATCH 1/4] msi: Avoid starting the RPC server more than once for a given package.
by Zebediah Figura 11 Jul '18

11 Jul '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/custom.c | 48 ++++++++++++++++++++++-------------------------- dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 2 ++ 3 files changed, 25 insertions(+), 26 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 3798e81..87c921e 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -572,16 +572,15 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid) return r; } -static DWORD WINAPI DllThread( LPVOID arg ) +static DWORD WINAPI custom_client_thread(void *arg) { static const WCHAR msiexecW[] = {'\\','m','s','i','e','x','e','c','.','e','x','e',0}; static const WCHAR argsW[] = {' ','-','E','m','b','e','d','d','i','n','g',' ',0}; - msi_custom_action_info *info; + msi_custom_action_info *info = arg; PROCESS_INFORMATION pi = {0}; STARTUPINFOW si = {0}; WCHAR buffer[MAX_PATH], cmdline[MAX_PATH + 60]; RPC_STATUS status; - GUID *guid = arg; void *cookie; BOOL wow64; DWORD arch; @@ -592,24 +591,28 @@ static DWORD WINAPI DllThread( LPVOID arg ) CoInitializeEx(NULL, COINIT_MULTITHREADED); /* needed to marshal streams */ - status = RpcServerUseProtseqEpW(ncalrpcW, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, endpoint_lrpcW, NULL); - if (status != RPC_S_OK) + if (!info->package->rpc_server_started) { - ERR("RpcServerUseProtseqEp failed: %#x\n", status); - return status; + status = RpcServerUseProtseqEpW(ncalrpcW, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, + endpoint_lrpcW, NULL); + if (status != RPC_S_OK) + { + ERR("RpcServerUseProtseqEp failed: %#x\n", status); + return status; + } + + status = RpcServerRegisterIfEx(s_IWineMsiRemote_v0_0_s_ifspec, NULL, NULL, + RPC_IF_AUTOLISTEN, RPC_C_LISTEN_MAX_CALLS_DEFAULT, NULL); + if (status != RPC_S_OK) + { + ERR("RpcServerRegisterIfEx failed: %#x\n", status); + return status; + } + + info->package->rpc_server_started = 1; } - status = RpcServerRegisterIfEx(s_IWineMsiRemote_v0_0_s_ifspec, NULL, NULL, - RPC_IF_AUTOLISTEN, RPC_C_LISTEN_MAX_CALLS_DEFAULT, NULL); - if (status != RPC_S_OK) - { - ERR("RpcServerRegisterIfEx failed: %#x\n", status); - return status; - } - - info = find_action_by_guid(guid); ret = GetBinaryTypeW(info->source, &arch); - release_custom_action_data(info); if (sizeof(void *) == 8 && ret && arch == SCS_32BIT_BINARY) GetSystemWow64DirectoryW(buffer, MAX_PATH - sizeof(msiexecW)/sizeof(WCHAR)); @@ -618,7 +621,7 @@ static DWORD WINAPI DllThread( LPVOID arg ) strcatW(buffer, msiexecW); strcpyW(cmdline, buffer); strcatW(cmdline, argsW); - StringFromGUID2(guid, cmdline + strlenW(cmdline), 39); + StringFromGUID2(&info->guid, cmdline + strlenW(cmdline), 39); if (IsWow64Process(GetCurrentProcess(), &wow64) && wow64 && arch == SCS_64BIT_BINARY) { @@ -634,13 +637,6 @@ static DWORD WINAPI DllThread( LPVOID arg ) CloseHandle(pi.hProcess); CloseHandle(pi.hThread); - status = RpcServerUnregisterIf(s_IWineMsiRemote_v0_0_s_ifspec, NULL, FALSE); - if (status != RPC_S_OK) - { - ERR("RpcServerUnregisterIf failed: %#x\n", status); - return status; - } - CoUninitialize(); TRACE("custom action (%x) returned %i\n", GetCurrentThreadId(), rc ); @@ -671,7 +667,7 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll( list_add_tail( &msi_pending_custom_actions, &info->entry ); LeaveCriticalSection( &msi_custom_action_cs ); - info->handle = CreateThread( NULL, 0, DllThread, &info->guid, 0, NULL ); + info->handle = CreateThread(NULL, 0, custom_client_thread, info, 0, NULL); if (!info->handle) { /* release both references */ diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index e05846f..060fd7e 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -449,6 +449,7 @@ typedef struct tagMSIPACKAGE unsigned char need_reboot_at_end : 1; unsigned char need_reboot_now : 1; unsigned char need_rollback : 1; + unsigned char rpc_server_started : 1; } MSIPACKAGE; typedef struct tagMSIPREVIEW diff --git a/dlls/msi/package.c b/dlls/msi/package.c index d6f22d0..9569c4f 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -342,6 +342,8 @@ static void MSI_FreePackage( MSIOBJECTHDR *arg) msiobj_release( &package->db->hdr ); free_package_structures(package); CloseHandle( package->log_file ); + if (package->rpc_server_started) + RpcServerUnregisterIf(s_IWineMsiRemote_v0_0_s_ifspec, NULL, FALSE); if (package->delete_on_close) DeleteFileW( package->localfile ); msi_free( package->localfile ); -- 2.7.4

3 8

[PATCH] crypt32: Fix key buffer leak (Coverity)
by Nikolay Sivov 11 Jul '18

11 Jul '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/crypt32/cert.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 1667b42b0b..4a7a1fe157 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2553,6 +2553,7 @@ static BOOL CNG_ImportECCPubKey(CERT_PUBLIC_KEY_INFO *pubKeyInfo, BCRYPT_KEY_HAN memcpy(ecckey + 1, pubKeyInfo->PublicKey.pbData + 1, pubKeyInfo->PublicKey.cbData - 1); status = BCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, key, (BYTE*)ecckey, ecckey_len, 0); + CryptMemFree(ecckey); done: if (alg) BCryptCloseAlgorithmProvider(alg, 0); -- 2.18.0

1 0

[PATCH 2/2] ntdll/tests: Add tests for RtlIpv6AddressToString and RtlIpv6AddressToStringEx.
by Alistair Leslie-Hughes 11 Jul '18

11 Jul '18

From: Mark Jansen <learn0more(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/tests/rtl.c | 246 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 246 insertions(+) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index e51b9ca18f..921e09b468 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -90,6 +90,8 @@ static CHAR * (WINAPI *pRtlIpv4AddressToStringA)(const IN_ADDR *, LPSTR); static NTSTATUS (WINAPI *pRtlIpv4AddressToStringExA)(const IN_ADDR *, USHORT, LPSTR, PULONG); static NTSTATUS (WINAPI *pRtlIpv4StringToAddressA)(PCSTR, BOOLEAN, PCSTR *, IN_ADDR *); static NTSTATUS (WINAPI *pRtlIpv4StringToAddressExA)(PCSTR, BOOLEAN, IN_ADDR *, PUSHORT); +static CHAR * (WINAPI *pRtlIpv6AddressToStringA)(struct in6_addr *, PSTR); +static NTSTATUS (WINAPI *pRtlIpv6AddressToStringExA)(struct in6_addr *, ULONG, USHORT, PCHAR, PULONG); static NTSTATUS (WINAPI *pRtlIpv6StringToAddressA)(PCSTR, PCSTR *, struct in6_addr *); static NTSTATUS (WINAPI *pRtlIpv6StringToAddressW)(PCWSTR, PCWSTR *, struct in6_addr *); static NTSTATUS (WINAPI *pRtlIpv6StringToAddressExA)(PCSTR, struct in6_addr *, PULONG, PUSHORT); @@ -159,6 +161,8 @@ static void InitFunctionPtrs(void) pRtlIpv4AddressToStringExA = (void *)GetProcAddress(hntdll, "RtlIpv4AddressToStringExA"); pRtlIpv4StringToAddressA = (void *)GetProcAddress(hntdll, "RtlIpv4StringToAddressA"); pRtlIpv4StringToAddressExA = (void *)GetProcAddress(hntdll, "RtlIpv4StringToAddressExA"); + pRtlIpv6AddressToStringA = (void *)GetProcAddress(hntdll, "RtlIpv6AddressToStringA"); + pRtlIpv6AddressToStringExA = (void *)GetProcAddress(hntdll, "RtlIpv6AddressToStringExA"); pRtlIpv6StringToAddressA = (void *)GetProcAddress(hntdll, "RtlIpv6StringToAddressA"); pRtlIpv6StringToAddressW = (void *)GetProcAddress(hntdll, "RtlIpv6StringToAddressW"); pRtlIpv6StringToAddressExA = (void *)GetProcAddress(hntdll, "RtlIpv6StringToAddressExA"); @@ -1824,6 +1828,246 @@ static void init_ip6(IN6_ADDR* addr, const int src[8]) } } +static void test_RtlIpv6AddressToString(void) +{ + CHAR buffer[50]; + LPCSTR result; + IN6_ADDR ip; + DWORD_PTR len; + struct + { + PCSTR address; + int ip[8]; + } tests[] = + { + /* ipv4 addresses & ISATAP addresses */ + { "::13.1.68.3", { 0, 0, 0, 0, 0, 0, 0x10d, 0x344 } }, + { "::ffff:13.1.68.3", { 0, 0, 0, 0, 0, 0xffff, 0x10d, 0x344 } }, + { "::feff:d01:4403", { 0, 0, 0, 0, 0, 0xfffe, 0x10d, 0x344 } }, + { "::fffe:d01:4403", { 0, 0, 0, 0, 0, 0xfeff, 0x10d, 0x344 } }, + { "::100:d01:4403", { 0, 0, 0, 0, 0, 1, 0x10d, 0x344 } }, + { "::1:d01:4403", { 0, 0, 0, 0, 0, 0x100, 0x10d, 0x344 } }, + { "::ffff:0:4403", { 0, 0, 0, 0, 0, 0xffff, 0, 0x344 } }, + { "::ffff:13.1.0.0", { 0, 0, 0, 0, 0, 0xffff, 0x10d, 0 } }, + { "::ffff:0:0", { 0, 0, 0, 0, 0, 0xffff, 0, 0 } }, + { "::ffff:0:13.1.68.3", { 0, 0, 0, 0, 0xffff, 0, 0x10d, 0x344 } }, + { "::ffff:ffff:d01:4403", { 0, 0, 0, 0, 0xffff, 0xffff, 0x10d, 0x344 } }, + { "::ffff:0:0:d01:4403", { 0, 0, 0, 0xffff, 0, 0, 0x10d, 0x344 } }, + { "::ffff:255.255.255.255", { 0, 0, 0, 0, 0, 0xffff, 0xffff, 0xffff } }, + { "::ffff:129.144.52.38", { 0, 0, 0, 0, 0, 0xffff, 0x9081, 0x2634 } }, + { "::5efe:129.144.52.38", { 0, 0, 0, 0, 0, 0xfe5e, 0x9081, 0x2634 } }, + { "1111:2222:3333:4444:0:5efe:129.144.52.38", { 0x1111, 0x2222, 0x3333, 0x4444, 0, 0xfe5e, 0x9081, 0x2634 } }, + { "1111:2222:3333::5efe:129.144.52.38", { 0x1111, 0x2222, 0x3333, 0, 0, 0xfe5e, 0x9081, 0x2634 } }, + { "1111:2222::5efe:129.144.52.38", { 0x1111, 0x2222, 0, 0, 0, 0xfe5e, 0x9081, 0x2634 } }, + { "1111::5efe:129.144.52.38", { 0x1111, 0, 0, 0, 0, 0xfe5e, 0x9081, 0x2634 } }, + { "::200:5efe:129.144.52.38", { 0, 0, 0, 0, 2, 0xfe5e, 0x9081, 0x2634 } }, + { "::100:5efe:8190:3426", { 0, 0, 0, 0, 1, 0xfe5e, 0x9081, 0x2634 } }, + /* 'normal' addresses */ + { "::1", { 0, 0, 0, 0, 0, 0, 0, 0x100 } }, + { "0:1:2:3:4:5:6:7", { 0, 0x100, 0x200, 0x300, 0x400, 0x500, 0x600, 0x700 } }, + { "1080::8:800:200c:417a", { 0x8010, 0, 0, 0, 0x800, 0x8, 0x0c20, 0x7a41 } }, + { "1111:2222:3333:4444:5555:6666:7b7b:7b7b", { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7b7b, 0x7b7b } }, + { "1111:2222:3333:4444:5555:6666:7777:8888", { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0x8888 } }, + { "1111:2222:3333:4444:5555:6666::", { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0, 0 } }, + { "1111:2222:3333:4444:5555:6666:0:8888", { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0, 0x8888 } }, + { "1111:2222:3333:4444:5555::", { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0 } }, + { "1111:2222:3333:4444:5555:0:7b7b:7b7b", { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0x7b7b, 0x7b7b } }, + { "1111:2222:3333:4444:5555:0:7777:8888", { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0x7777, 0x8888 } }, + { "1111:2222:3333:4444:5555::8888", { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0x8888 } }, + { "1111::", { 0x1111, 0, 0, 0, 0, 0, 0, 0 } }, + { "1111::7b7b:7b7b", { 0x1111, 0, 0, 0, 0, 0, 0x7b7b, 0x7b7b } }, + { "1111:0:3333:4444:5555:6666:7b7b:7b7b", { 0x1111, 0, 0x3333, 0x4444, 0x5555, 0x6666, 0x7b7b, 0x7b7b } }, + { "1111:0:3333:4444:5555:6666:7777:8888", { 0x1111, 0, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0x8888 } }, + { "1111::4444:5555:6666:7b7b:7b7b", { 0x1111, 0, 0, 0x4444, 0x5555, 0x6666, 0x7b7b, 0x7b7b } }, + { "1111::4444:5555:6666:7777:8888", { 0x1111, 0, 0, 0x4444, 0x5555, 0x6666, 0x7777, 0x8888 } }, + { "1111::5555:6666:7b7b:7b7b", { 0x1111, 0, 0, 0, 0x5555, 0x6666, 0x7b7b, 0x7b7b } }, + { "1111::5555:6666:7777:8888", { 0x1111, 0, 0, 0, 0x5555, 0x6666, 0x7777, 0x8888 } }, + { "1111::6666:7b7b:7b7b", { 0x1111, 0, 0, 0, 0, 0x6666, 0x7b7b, 0x7b7b } }, + { "1111::6666:7777:8888", { 0x1111, 0, 0, 0, 0, 0x6666, 0x7777, 0x8888 } }, + { "1111::7777:8888", { 0x1111, 0, 0, 0, 0, 0, 0x7777, 0x8888 } }, + { "1111::8888", { 0x1111, 0, 0, 0, 0, 0, 0, 0x8888 } }, + { "1:2:3:4:5:6:102:304", { 0x100, 0x200, 0x300, 0x400, 0x500, 0x600, 0x201, 0x403 } }, + { "1:2:3:4:5:6:7:8", { 0x100, 0x200, 0x300, 0x400, 0x500, 0x600, 0x700, 0x800 } }, + { "1:2:3:4:5:6::", { 0x100, 0x200, 0x300, 0x400, 0x500, 0x600, 0, 0 } }, + { "1:2:3:4:5:6:0:8", { 0x100, 0x200, 0x300, 0x400, 0x500, 0x600, 0, 0x800 } }, + { "2001:0:1234::c1c0:abcd:876", { 0x120, 0, 0x3412, 0, 0, 0xc0c1, 0xcdab, 0x7608 } }, + { "2001:0:4136:e378:8000:63bf:3fff:fdd2", { 0x120, 0, 0x3641, 0x78e3, 0x80, 0xbf63, 0xff3f, 0xd2fd } }, + { "2001:db8::1428:57ab", { 0x120, 0xb80d, 0, 0, 0, 0, 0x2814, 0xab57 } }, + { "2001:db8:1234:ffff:ffff:ffff:ffff:ffff", { 0x120, 0xb80d, 0x3412, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff } }, + { "2001:0:ce49:7601:2cad:dfff:7c94:fffe", { 0x120, 0, 0x49ce, 0x176, 0xad2c, 0xffdf, 0x947c, 0xfeff } }, + { "2001:db8:85a3::8a2e:370:7334", { 0x120, 0xb80d, 0xa385, 0, 0, 0x2e8a, 0x7003, 0x3473 } }, + { "3ffe:b00::1:0:0:a", { 0xfe3f, 0xb, 0, 0, 0x100, 0, 0, 0xa00 } }, + { "::a:b:c:d:e", { 0, 0, 0, 0xa00, 0xb00, 0xc00, 0xd00, 0xe00 } }, + { "::123.123.123.123", { 0, 0, 0, 0, 0, 0, 0x7b7b, 0x7b7b } }, + { "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", { 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff } }, + { "1111:2222:3333:4444:5555:6666:7777:1", { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0x100 } }, + { "1111:2222:3333:4444:5555:6666:7777:8888", { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0x8888 } }, + { "1111:2222::", { 0x1111, 0x2222, 0, 0, 0, 0, 0, 0 } }, + { "1111::3333:4444:5555:6666:7777", { 0x1111, 0, 0, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777 } }, + { "1111:2222::", { 0x1111, 0x2222, 0, 0, 0, 0, 0, 0 } }, + { "1111::3333", { 0x1111, 0, 0, 0, 0, 0, 0, 0x3333 } }, + { "2001:0:1234::c1c0:abcd:876", { 0x120, 0, 0x3412, 0, 0, 0xc0c1, 0xcdab, 0x7608 } }, + { "2001::ffd3", { 0x120, 0, 0, 0, 0, 0, 0, 0xd3ff } }, + }; + const size_t testcount = sizeof(tests) / sizeof(tests[0]); + unsigned int i; + + if (!pRtlIpv6AddressToStringA) + { + skip("RtlIpv6AddressToStringA not available\n"); + return; + } + + memset(buffer, '#', sizeof(buffer)); + buffer[sizeof(buffer)-1] = 0; + memset(&ip, 0, sizeof(ip)); + result = pRtlIpv6AddressToStringA(&ip, buffer); + + len = strlen(buffer); + ok(result == (buffer + len) && !strcmp(buffer, "::"), + "got %p with '%s' (expected %p with '::')\n", result, buffer, buffer + len); + + result = pRtlIpv6AddressToStringA(&ip, NULL); + ok(result == (LPCSTR)~0 || broken(result == (LPCSTR)len) /* WinXP / Win2k3 */, + "got %p, expected %p\n", result, (LPCSTR)~0); + + for (i = 0; i < testcount; i++) + { + init_ip6(&ip, tests[i].ip); + memset(buffer, '#', sizeof(buffer)); + buffer[sizeof(buffer)-1] = 0; + + result = pRtlIpv6AddressToStringA(&ip, buffer); + len = strlen(buffer); + ok(result == (buffer + len) && !strcmp(buffer, tests[i].address), + "got %p with '%s' (expected %p with '%s')\n", result, buffer, buffer + len, tests[i].address); + + ok(buffer[45] == 0 || broken(buffer[45] != 0) /* WinXP / Win2k3 */, + "expected data at buffer[45] to always be NULL\n"); + ok(buffer[46] == '#', "expected data at buffer[46] not to change\n"); + } +} + +static void test_RtlIpv6AddressToStringEx(void) +{ + CHAR buffer[70]; + NTSTATUS res; + IN6_ADDR ip; + ULONG len; + struct + { + PCSTR address; + ULONG scopeid; + USHORT port; + int ip[8]; + } tests[] = + { + /* ipv4 addresses & ISATAP addresses */ + { "::13.1.68.3", 0, 0, { 0, 0, 0, 0, 0, 0, 0x10d, 0x344 } }, + { "::13.1.68.3%1", 1, 0, { 0, 0, 0, 0, 0, 0, 0x10d, 0x344 } }, + { "::13.1.68.3%4294949819", 0xffffbbbb, 0, { 0, 0, 0, 0, 0, 0, 0x10d, 0x344 } }, + { "[::13.1.68.3%4294949819]:65518", 0xffffbbbb, 0xeeff, { 0, 0, 0, 0, 0, 0, 0x10d, 0x344 } }, + { "[::13.1.68.3%4294949819]:256", 0xffffbbbb, 1, { 0, 0, 0, 0, 0, 0, 0x10d, 0x344 } }, + { "[::13.1.68.3]:256", 0, 1, { 0, 0, 0, 0, 0, 0, 0x10d, 0x344 } }, + + { "::1:d01:4403", 0, 0, { 0, 0, 0, 0, 0, 0x100, 0x10d, 0x344 } }, + { "::1:d01:4403%1", 1, 0, { 0, 0, 0, 0, 0, 0x100, 0x10d, 0x344 } }, + { "::1:d01:4403%4294949819", 0xffffbbbb, 0, { 0, 0, 0, 0, 0, 0x100, 0x10d, 0x344 } }, + { "[::1:d01:4403%4294949819]:65518", 0xffffbbbb, 0xeeff, { 0, 0, 0, 0, 0, 0x100, 0x10d, 0x344 } }, + { "[::1:d01:4403%4294949819]:256", 0xffffbbbb, 1, { 0, 0, 0, 0, 0, 0x100, 0x10d, 0x344 } }, + { "[::1:d01:4403]:256", 0, 1, { 0, 0, 0, 0, 0, 0x100, 0x10d, 0x344 } }, + + { "1111:2222:3333:4444:0:5efe:129.144.52.38", 0, 0, { 0x1111, 0x2222, 0x3333, 0x4444, 0, 0xfe5e, 0x9081, 0x2634 } }, + { "1111:2222:3333:4444:0:5efe:129.144.52.38%1", 1, 0, { 0x1111, 0x2222, 0x3333, 0x4444, 0, 0xfe5e, 0x9081, 0x2634 } }, + { "1111:2222:3333:4444:0:5efe:129.144.52.38%4294949819", 0xffffbbbb, 0, { 0x1111, 0x2222, 0x3333, 0x4444, 0, 0xfe5e, 0x9081, 0x2634 } }, + { "[1111:2222:3333:4444:0:5efe:129.144.52.38%4294949819]:65518",0xffffbbbb, 0xeeff, { 0x1111, 0x2222, 0x3333, 0x4444, 0, 0xfe5e, 0x9081, 0x2634 } }, + { "[1111:2222:3333:4444:0:5efe:129.144.52.38%4294949819]:256", 0xffffbbbb, 1, { 0x1111, 0x2222, 0x3333, 0x4444, 0, 0xfe5e, 0x9081, 0x2634 } }, + { "[1111:2222:3333:4444:0:5efe:129.144.52.38]:256", 0, 1, { 0x1111, 0x2222, 0x3333, 0x4444, 0, 0xfe5e, 0x9081, 0x2634 } }, + + { "::1", 0, 0, { 0, 0, 0, 0, 0, 0, 0, 0x100 } }, + { "::1%1", 1, 0, { 0, 0, 0, 0, 0, 0, 0, 0x100 } }, + { "::1%4294949819", 0xffffbbbb, 0, { 0, 0, 0, 0, 0, 0, 0, 0x100 } }, + { "[::1%4294949819]:65518", 0xffffbbbb, 0xeeff, { 0, 0, 0, 0, 0, 0, 0, 0x100 } }, + { "[::1%4294949819]:256", 0xffffbbbb, 1, { 0, 0, 0, 0, 0, 0, 0, 0x100 } }, + { "[::1]:256", 0, 1, { 0, 0, 0, 0, 0, 0, 0, 0x100 } }, + + { "1111:2222:3333:4444:5555:6666:7b7b:7b7b", 0, 0, { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7b7b, 0x7b7b } }, + { "1111:2222:3333:4444:5555:6666:7b7b:7b7b%1", 1, 0, { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7b7b, 0x7b7b } }, + { "1111:2222:3333:4444:5555:6666:7b7b:7b7b%4294949819", 0xffffbbbb, 0, { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7b7b, 0x7b7b } }, + { "[1111:2222:3333:4444:5555:6666:7b7b:7b7b%4294949819]:65518", 0xffffbbbb, 0xeeff, { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7b7b, 0x7b7b } }, + { "[1111:2222:3333:4444:5555:6666:7b7b:7b7b%4294949819]:256", 0xffffbbbb, 1, { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7b7b, 0x7b7b } }, + { "[1111:2222:3333:4444:5555:6666:7b7b:7b7b]:256", 0, 1, { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7b7b, 0x7b7b } }, + + { "1111::", 0, 0, { 0x1111, 0, 0, 0, 0, 0, 0, 0 } }, + { "1111::%1", 1, 0, { 0x1111, 0, 0, 0, 0, 0, 0, 0 } }, + { "1111::%4294949819", 0xffffbbbb, 0, { 0x1111, 0, 0, 0, 0, 0, 0, 0 } }, + { "[1111::%4294949819]:65518", 0xffffbbbb, 0xeeff, { 0x1111, 0, 0, 0, 0, 0, 0, 0 } }, + { "[1111::%4294949819]:256", 0xffffbbbb, 1, { 0x1111, 0, 0, 0, 0, 0, 0, 0 } }, + { "[1111::]:256", 0, 1, { 0x1111, 0, 0, 0, 0, 0, 0, 0 } }, + + { "2001::ffd3", 0, 0, { 0x120, 0, 0, 0, 0, 0, 0, 0xd3ff } }, + { "2001::ffd3%1", 1, 0, { 0x120, 0, 0, 0, 0, 0, 0, 0xd3ff } }, + { "2001::ffd3%4294949819", 0xffffbbbb, 0, { 0x120, 0, 0, 0, 0, 0, 0, 0xd3ff } }, + { "[2001::ffd3%4294949819]:65518", 0xffffbbbb, 0xeeff, { 0x120, 0, 0, 0, 0, 0, 0, 0xd3ff } }, + { "[2001::ffd3%4294949819]:256", 0xffffbbbb, 1, { 0x120, 0, 0, 0, 0, 0, 0, 0xd3ff } }, + { "[2001::ffd3]:256", 0, 1, { 0x120, 0, 0, 0, 0, 0, 0, 0xd3ff } }, + }; + const size_t testcount = sizeof(tests) / sizeof(tests[0]); + unsigned int i; + + if (!pRtlIpv6AddressToStringExA) + { + skip("RtlIpv6AddressToStringExA not available\n"); + return; + } + + memset(buffer, '#', sizeof(buffer)); + buffer[sizeof(buffer)-1] = 0; + memset(&ip, 0, sizeof(ip)); + len = sizeof(buffer); + res = pRtlIpv6AddressToStringExA(&ip, 0, 0, buffer, &len); + + ok(res == STATUS_SUCCESS, "[validate] res = 0x%08x, expected STATUS_SUCCESS\n", res); + ok(len == 3 && !strcmp(buffer, "::"), + "got len %d with '%s' (expected 3 with '::')\n", len, buffer); + + memset(buffer, '#', sizeof(buffer)); + buffer[sizeof(buffer)-1] = 0; + + len = sizeof(buffer); + res = pRtlIpv6AddressToStringExA(NULL, 0, 0, buffer, &len); + ok(res == STATUS_INVALID_PARAMETER, "[null ip] res = 0x%08x, expected STATUS_INVALID_PARAMETER\n", res); + + len = sizeof(buffer); + res = pRtlIpv6AddressToStringExA(&ip, 0, 0, NULL, &len); + ok(res == STATUS_INVALID_PARAMETER, "[null buffer] res = 0x%08x, expected STATUS_INVALID_PARAMETER\n", res); + + res = pRtlIpv6AddressToStringExA(&ip, 0, 0, buffer, NULL); + ok(res == STATUS_INVALID_PARAMETER, "[null length] res = 0x%08x, expected STATUS_INVALID_PARAMETER\n", res); + + len = 2; + memset(buffer, '#', sizeof(buffer)); + buffer[sizeof(buffer)-1] = 0; + res = pRtlIpv6AddressToStringExA(&ip, 0, 0, buffer, &len); + ok(res == STATUS_INVALID_PARAMETER, "[null length] res = 0x%08x, expected STATUS_INVALID_PARAMETER\n", res); + ok(buffer[0] == '#', "got first char %c (expected '#')\n", buffer[0]); + ok(len == 3, "got len %d (expected len 3)\n", len); + + for (i = 0; i < testcount; i++) + { + init_ip6(&ip, tests[i].ip); + len = sizeof(buffer); + memset(buffer, '#', sizeof(buffer)); + buffer[sizeof(buffer)-1] = 0; + + res = pRtlIpv6AddressToStringExA(&ip, tests[i].scopeid, tests[i].port, buffer, &len); + + ok(res == STATUS_SUCCESS, "[validate] res = 0x%08x, expected STATUS_SUCCESS\n", res); + ok(len == (strlen(tests[i].address) + 1) && !strcmp(buffer, tests[i].address), + "got len %d with '%s' (expected %d with '%s')\n", len, buffer, (int)strlen(tests[i].address), tests[i].address); + } +} + static void compare_RtlIpv6StringToAddressW(PCSTR name_a, int terminator_offset_a, const struct in6_addr *addr_a, NTSTATUS res_a) { @@ -3444,6 +3688,8 @@ START_TEST(rtl) test_RtlIpv4AddressToStringEx(); test_RtlIpv4StringToAddress(); test_RtlIpv4StringToAddressEx(); + test_RtlIpv6AddressToString(); + test_RtlIpv6AddressToStringEx(); test_RtlIpv6StringToAddress(); test_RtlIpv6StringToAddressEx(); test_LdrAddRefDll(); -- 2.18.0

1 0

[PATCH 1/2] ntdll/tests: Tests for RtlIpv4StringToAddressEx
by Alistair Leslie-Hughes 11 Jul '18

11 Jul '18

From: Mark Jansen <learn0more+wine(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/tests/rtl.c | 284 +++++++++++++++++++++++++++++++++++------ 1 file changed, 246 insertions(+), 38 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index e13c139202..e51b9ca18f 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -89,6 +89,7 @@ static IMAGE_BASE_RELOCATION *(WINAPI *pLdrProcessRelocationBlock)(void*,UINT,US static CHAR * (WINAPI *pRtlIpv4AddressToStringA)(const IN_ADDR *, LPSTR); static NTSTATUS (WINAPI *pRtlIpv4AddressToStringExA)(const IN_ADDR *, USHORT, LPSTR, PULONG); static NTSTATUS (WINAPI *pRtlIpv4StringToAddressA)(PCSTR, BOOLEAN, PCSTR *, IN_ADDR *); +static NTSTATUS (WINAPI *pRtlIpv4StringToAddressExA)(PCSTR, BOOLEAN, IN_ADDR *, PUSHORT); static NTSTATUS (WINAPI *pRtlIpv6StringToAddressA)(PCSTR, PCSTR *, struct in6_addr *); static NTSTATUS (WINAPI *pRtlIpv6StringToAddressW)(PCWSTR, PCWSTR *, struct in6_addr *); static NTSTATUS (WINAPI *pRtlIpv6StringToAddressExA)(PCSTR, struct in6_addr *, PULONG, PUSHORT); @@ -157,6 +158,7 @@ static void InitFunctionPtrs(void) pRtlIpv4AddressToStringA = (void *)GetProcAddress(hntdll, "RtlIpv4AddressToStringA"); pRtlIpv4AddressToStringExA = (void *)GetProcAddress(hntdll, "RtlIpv4AddressToStringExA"); pRtlIpv4StringToAddressA = (void *)GetProcAddress(hntdll, "RtlIpv4StringToAddressA"); + pRtlIpv4StringToAddressExA = (void *)GetProcAddress(hntdll, "RtlIpv4StringToAddressExA"); pRtlIpv6StringToAddressA = (void *)GetProcAddress(hntdll, "RtlIpv6StringToAddressA"); pRtlIpv6StringToAddressW = (void *)GetProcAddress(hntdll, "RtlIpv6StringToAddressW"); pRtlIpv6StringToAddressExA = (void *)GetProcAddress(hntdll, "RtlIpv6StringToAddressExA"); @@ -1154,6 +1156,102 @@ static void test_RtlIpv4AddressToStringEx(void) res, size, buffer); } +static struct +{ + PCSTR address; + NTSTATUS res; + int terminator_offset; + int ip[4]; + enum { normal_4, strict_diff_4 = 1, ex_fail_4 = 2 } flags; + NTSTATUS res_strict; + int terminator_offset_strict; + int ip_strict[4]; +} ipv4_tests[] = +{ + { "", STATUS_INVALID_PARAMETER, 0, { -1 } }, + { " ", STATUS_INVALID_PARAMETER, 0, { -1 } }, + { "1.1.1.1", STATUS_SUCCESS, 7, { 1, 1, 1, 1 } }, + { "0.0.0.0", STATUS_SUCCESS, 7, { 0, 0, 0, 0 } }, + { "255.255.255.255", STATUS_SUCCESS, 15, { 255, 255, 255, 255 } }, + { "255.255.255.255:123", STATUS_SUCCESS, 15, { 255, 255, 255, 255 } }, + { "255.255.255.256", STATUS_INVALID_PARAMETER, 15, { -1 } }, + { "255.255.255.4294967295", STATUS_INVALID_PARAMETER, 22, { -1 } }, + { "255.255.255.4294967296", STATUS_INVALID_PARAMETER, 21, { -1 } }, + { "255.255.255.4294967297", STATUS_INVALID_PARAMETER, 21, { -1 } }, + { "a", STATUS_INVALID_PARAMETER, 0, { -1 } }, + { "1.1.1.0xaA", STATUS_SUCCESS, 10, { 1, 1, 1, 170 }, strict_diff_4, + STATUS_INVALID_PARAMETER, 8, { -1 } }, + { "1.1.1.0XaA", STATUS_SUCCESS, 10, { 1, 1, 1, 170 }, strict_diff_4, + STATUS_INVALID_PARAMETER, 8, { -1 } }, + { "1.1.1.0x", STATUS_INVALID_PARAMETER, 8, { -1 } }, + { "1.1.1.0xff", STATUS_SUCCESS, 10, { 1, 1, 1, 255 }, strict_diff_4, + STATUS_INVALID_PARAMETER, 8, { -1 } }, + { "1.1.1.0x100", STATUS_INVALID_PARAMETER, 11, { -1 }, strict_diff_4, + STATUS_INVALID_PARAMETER, 8, { -1 } }, + { "1.1.1.0xffffffff", STATUS_INVALID_PARAMETER, 16, { -1 }, strict_diff_4, + STATUS_INVALID_PARAMETER, 8, { -1 } }, + { "1.1.1.0x100000000", STATUS_INVALID_PARAMETER, 16, { -1, 0, 0, 0 }, strict_diff_4, + STATUS_INVALID_PARAMETER, 8, { -1 } }, + { "1.1.1.010", STATUS_SUCCESS, 9, { 1, 1, 1, 8 }, strict_diff_4, + STATUS_INVALID_PARAMETER, 7, { -1 } }, + { "1.1.1.00", STATUS_SUCCESS, 8, { 1, 1, 1, 0 }, strict_diff_4, + STATUS_INVALID_PARAMETER, 7, { -1 } }, + { "1.1.1.007", STATUS_SUCCESS, 9, { 1, 1, 1, 7 }, strict_diff_4, + STATUS_INVALID_PARAMETER, 7, { -1 } }, + { "1.1.1.08", STATUS_INVALID_PARAMETER, 7, { -1 } }, + { "1.1.1.008", STATUS_SUCCESS, 8, { 1, 1, 1, 0 }, strict_diff_4 | ex_fail_4, + STATUS_INVALID_PARAMETER, 7, { -1 } }, + { "1.1.1.0a", STATUS_SUCCESS, 7, { 1, 1, 1, 0 }, ex_fail_4 }, + { "1.1.1.0o10", STATUS_SUCCESS, 7, { 1, 1, 1, 0 }, ex_fail_4 }, + { "1.1.1.0b10", STATUS_SUCCESS, 7, { 1, 1, 1, 0 }, ex_fail_4 }, + { "1.1.1.-2", STATUS_INVALID_PARAMETER, 6, { -1 } }, + { "1", STATUS_SUCCESS, 1, { 0, 0, 0, 1 }, strict_diff_4, + STATUS_INVALID_PARAMETER, 1, { -1 } }, + { "-1", STATUS_INVALID_PARAMETER, 0, { -1 } }, + { "203569230", STATUS_SUCCESS, 9, { 12, 34, 56, 78 }, strict_diff_4, + STATUS_INVALID_PARAMETER, 9, { -1 } }, + { "1.223756", STATUS_SUCCESS, 8, { 1, 3, 106, 12 }, strict_diff_4, + STATUS_INVALID_PARAMETER, 8, { -1 } }, + { "3.4.756", STATUS_SUCCESS, 7, { 3, 4, 2, 244 }, strict_diff_4, + STATUS_INVALID_PARAMETER, 7, { -1 } }, + { "3.4.756.1", STATUS_INVALID_PARAMETER, 9, { -1 } }, + { "3.4.65536", STATUS_INVALID_PARAMETER, 9, { -1 } }, + { "3.4.5.6.7", STATUS_INVALID_PARAMETER, 7, { -1 } }, + { "3.4.5.+6", STATUS_INVALID_PARAMETER, 6, { -1 } }, + { " 3.4.5.6", STATUS_INVALID_PARAMETER, 0, { -1 } }, + { "\t3.4.5.6", STATUS_INVALID_PARAMETER, 0, { -1 } }, + { "3.4.5.6 ", STATUS_SUCCESS, 7, { 3, 4, 5, 6 }, ex_fail_4 }, + { "3. 4.5.6", STATUS_INVALID_PARAMETER, 2, { -1 } }, + { ".", STATUS_INVALID_PARAMETER, 1, { -1 } }, + { "..", STATUS_INVALID_PARAMETER, 1, { -1 } }, + { "1.", STATUS_INVALID_PARAMETER, 2, { -1 } }, + { "1..", STATUS_INVALID_PARAMETER, 3, { -1 } }, + { ".1", STATUS_INVALID_PARAMETER, 1, { -1 } }, + { ".1.", STATUS_INVALID_PARAMETER, 1, { -1 } }, + { ".1.2.3", STATUS_INVALID_PARAMETER, 1, { -1 } }, + { "0.1.2.3", STATUS_SUCCESS, 7, { 0, 1, 2, 3 } }, + { "0.1.2.3.", STATUS_INVALID_PARAMETER, 7, { -1 } }, + { "[0.1.2.3]", STATUS_INVALID_PARAMETER, 0, { -1 } }, + { "::1", STATUS_INVALID_PARAMETER, 0, { -1 } }, + { ":1", STATUS_INVALID_PARAMETER, 0, { -1 } }, +}; +const unsigned int ipv4_testcount = sizeof(ipv4_tests) / sizeof(ipv4_tests[0]); + +static void init_ip4(IN_ADDR* addr, const int src[4]) +{ + if (!src || src[0] == -1) + { + addr->S_un.S_addr = 0xabababab; + } + else + { + addr->S_un.S_un_b.s_b1 = src[0]; + addr->S_un.S_un_b.s_b2 = src[1]; + addr->S_un.S_un_b.s_b3 = src[2]; + addr->S_un.S_un_b.s_b4 = src[3]; + } +} + static void test_RtlIpv4StringToAddress(void) { NTSTATUS res; @@ -1267,65 +1365,174 @@ static void test_RtlIpv4StringToAddress(void) */ } - for (i = 0; i < testcount; i++) + for (i = 0; i < ipv4_testcount; i++) { /* non-strict */ terminator = &dummy; ip.S_un.S_addr = 0xabababab; - res = pRtlIpv4StringToAddressA(tests[i].address, FALSE, &terminator, &ip); - ok(res == tests[i].res, + res = pRtlIpv4StringToAddressA(ipv4_tests[i].address, FALSE, &terminator, &ip); + ok(res == ipv4_tests[i].res, "[%s] res = 0x%08x, expected 0x%08x\n", - tests[i].address, res, tests[i].res); - ok(terminator == tests[i].address + tests[i].terminator_offset, + ipv4_tests[i].address, res, ipv4_tests[i].res); + ok(terminator == ipv4_tests[i].address + ipv4_tests[i].terminator_offset, "[%s] terminator = %p, expected %p\n", - tests[i].address, terminator, tests[i].address + tests[i].terminator_offset); - if (tests[i].ip[0] == -1) - expected_ip.S_un.S_addr = 0xabababab; - else - { - expected_ip.S_un.S_un_b.s_b1 = tests[i].ip[0]; - expected_ip.S_un.S_un_b.s_b2 = tests[i].ip[1]; - expected_ip.S_un.S_un_b.s_b3 = tests[i].ip[2]; - expected_ip.S_un.S_un_b.s_b4 = tests[i].ip[3]; - } + ipv4_tests[i].address, terminator, ipv4_tests[i].address + ipv4_tests[i].terminator_offset); + + init_ip4(&expected_ip, ipv4_tests[i].ip); ok(ip.S_un.S_addr == expected_ip.S_un.S_addr, "[%s] ip = %08x, expected %08x\n", - tests[i].address, ip.S_un.S_addr, expected_ip.S_un.S_addr); + ipv4_tests[i].address, ip.S_un.S_addr, expected_ip.S_un.S_addr); - if (!tests[i].strict_is_different) + if (!(ipv4_tests[i].flags & strict_diff_4)) { - tests[i].res_strict = tests[i].res; - tests[i].terminator_offset_strict = tests[i].terminator_offset; - tests[i].ip_strict[0] = tests[i].ip[0]; - tests[i].ip_strict[1] = tests[i].ip[1]; - tests[i].ip_strict[2] = tests[i].ip[2]; - tests[i].ip_strict[3] = tests[i].ip[3]; + ipv4_tests[i].res_strict = ipv4_tests[i].res; + ipv4_tests[i].terminator_offset_strict = ipv4_tests[i].terminator_offset; + ipv4_tests[i].ip_strict[0] = ipv4_tests[i].ip[0]; + ipv4_tests[i].ip_strict[1] = ipv4_tests[i].ip[1]; + ipv4_tests[i].ip_strict[2] = ipv4_tests[i].ip[2]; + ipv4_tests[i].ip_strict[3] = ipv4_tests[i].ip[3]; } /* strict */ terminator = &dummy; ip.S_un.S_addr = 0xabababab; - res = pRtlIpv4StringToAddressA(tests[i].address, TRUE, &terminator, &ip); - ok(res == tests[i].res_strict, + res = pRtlIpv4StringToAddressA(ipv4_tests[i].address, TRUE, &terminator, &ip); + ok(res == ipv4_tests[i].res_strict, "[%s] res = 0x%08x, expected 0x%08x\n", - tests[i].address, res, tests[i].res_strict); - ok(terminator == tests[i].address + tests[i].terminator_offset_strict, + ipv4_tests[i].address, res, ipv4_tests[i].res_strict); + ok(terminator == ipv4_tests[i].address + ipv4_tests[i].terminator_offset_strict, "[%s] terminator = %p, expected %p\n", - tests[i].address, terminator, tests[i].address + tests[i].terminator_offset_strict); - if (tests[i].ip_strict[0] == -1) - expected_ip.S_un.S_addr = 0xabababab; - else - { - expected_ip.S_un.S_un_b.s_b1 = tests[i].ip_strict[0]; - expected_ip.S_un.S_un_b.s_b2 = tests[i].ip_strict[1]; - expected_ip.S_un.S_un_b.s_b3 = tests[i].ip_strict[2]; - expected_ip.S_un.S_un_b.s_b4 = tests[i].ip_strict[3]; - } + ipv4_tests[i].address, terminator, ipv4_tests[i].address + ipv4_tests[i].terminator_offset_strict); + + init_ip4(&expected_ip, ipv4_tests[i].ip_strict); ok(ip.S_un.S_addr == expected_ip.S_un.S_addr, "[%s] ip = %08x, expected %08x\n", - tests[i].address, ip.S_un.S_addr, expected_ip.S_un.S_addr); + ipv4_tests[i].address, ip.S_un.S_addr, expected_ip.S_un.S_addr); } } +static void test_RtlIpv4StringToAddressEx(void) +{ + NTSTATUS res; + IN_ADDR ip, expected_ip; + USHORT port; + static const struct + { + PCSTR address; + NTSTATUS res; + int ip[4]; + USHORT port; + } ipv4_ex_tests[] = + { + { "", STATUS_INVALID_PARAMETER, { -1 }, 0xdead }, + { " ", STATUS_INVALID_PARAMETER, { -1 }, 0xdead }, + { "1.1.1.1:", STATUS_INVALID_PARAMETER, { 1, 1, 1, 1 }, 0xdead }, + { "1.1.1.1+", STATUS_INVALID_PARAMETER, { 1, 1, 1, 1 }, 0xdead }, + { "1.1.1.1:1", STATUS_SUCCESS, { 1, 1, 1, 1 }, 0x100 }, + { "256.1.1.1:1", STATUS_INVALID_PARAMETER, { -1 }, 0xdead }, + { "-1.1.1.1:1", STATUS_INVALID_PARAMETER, { -1 }, 0xdead }, + { "0.0.0.0:0", STATUS_INVALID_PARAMETER, { 0, 0, 0, 0 }, 0xdead }, + { "0.0.0.0:1", STATUS_SUCCESS, { 0, 0, 0, 0 }, 0x100 }, + { "1.2.3.4:65535", STATUS_SUCCESS, { 1, 2, 3, 4 }, 65535 }, + { "1.2.3.4:65536", STATUS_INVALID_PARAMETER, { 1, 2, 3, 4 }, 0xdead }, + { "1.2.3.4:0xffff", STATUS_SUCCESS, { 1, 2, 3, 4 }, 65535 }, + { "1.2.3.4:0XfFfF", STATUS_SUCCESS, { 1, 2, 3, 4 }, 65535 }, + { "1.2.3.4:011064", STATUS_SUCCESS, { 1, 2, 3, 4 }, 0x3412 }, + { "1.2.3.4:1234a", STATUS_INVALID_PARAMETER, { 1, 2, 3, 4 }, 0xdead }, + { "1.2.3.4:1234+", STATUS_INVALID_PARAMETER, { 1, 2, 3, 4 }, 0xdead }, + { "1.2.3.4: 1234", STATUS_INVALID_PARAMETER, { 1, 2, 3, 4 }, 0xdead }, + { "1.2.3.4:\t1234", STATUS_INVALID_PARAMETER, { 1, 2, 3, 4 }, 0xdead }, + }; + const unsigned int ipv4_ex_testcount = sizeof(ipv4_ex_tests) / sizeof(ipv4_ex_tests[0]); + unsigned int i; + BOOLEAN strict; + + if (!pRtlIpv4StringToAddressExA) + { + skip("RtlIpv4StringToAddressEx not available\n"); + return; + } + + /* do not crash, and do not touch the ip / port. */ + ip.S_un.S_addr = 0xabababab; + port = 0xdead; + res = pRtlIpv4StringToAddressExA(NULL, FALSE, &ip, &port); + ok(res == STATUS_INVALID_PARAMETER, "[null address] res = 0x%08x, expected 0x%08x\n", + res, STATUS_INVALID_PARAMETER); + ok(ip.S_un.S_addr == 0xabababab, "RtlIpv4StringToAddressExA should not touch the ip!, ip == %x\n", ip.S_un.S_addr); + ok(port == 0xdead, "RtlIpv4StringToAddressExA should not touch the port!, port == %x\n", port); + + port = 0xdead; + res = pRtlIpv4StringToAddressExA("1.1.1.1", FALSE, NULL, &port); + ok(res == STATUS_INVALID_PARAMETER, "[null ip] res = 0x%08x, expected 0x%08x\n", + res, STATUS_INVALID_PARAMETER); + ok(port == 0xdead, "RtlIpv4StringToAddressExA should not touch the port!, port == %x\n", port); + + ip.S_un.S_addr = 0xabababab; + port = 0xdead; + res = pRtlIpv4StringToAddressExA("1.1.1.1", FALSE, &ip, NULL); + ok(res == STATUS_INVALID_PARAMETER, "[null port] res = 0x%08x, expected 0x%08x\n", + res, STATUS_INVALID_PARAMETER); + ok(ip.S_un.S_addr == 0xabababab, "RtlIpv4StringToAddressExA should not touch the ip!, ip == %x\n", ip.S_un.S_addr); + ok(port == 0xdead, "RtlIpv4StringToAddressExA should not touch the port!, port == %x\n", port); + + /* first we run the non-ex testcases on the ex function */ + for (i = 0; i < ipv4_testcount; i++) + { + NTSTATUS expect_res = (ipv4_tests[i].flags & ex_fail_4) ? STATUS_INVALID_PARAMETER : ipv4_tests[i].res; + + /* non-strict */ + port = 0xdead; + ip.S_un.S_addr = 0xabababab; + res = pRtlIpv4StringToAddressExA(ipv4_tests[i].address, FALSE, &ip, &port); + ok(res == expect_res, "[%s] res = 0x%08x, expected 0x%08x\n", + ipv4_tests[i].address, res, expect_res); + + init_ip4(&expected_ip, ipv4_tests[i].ip); + ok(ip.S_un.S_addr == expected_ip.S_un.S_addr, "[%s] ip = %08x, expected %08x\n", + ipv4_tests[i].address, ip.S_un.S_addr, expected_ip.S_un.S_addr); + + if (!(ipv4_tests[i].flags & strict_diff_4)) + { + ipv4_tests[i].res_strict = ipv4_tests[i].res; + ipv4_tests[i].terminator_offset_strict = ipv4_tests[i].terminator_offset; + ipv4_tests[i].ip_strict[0] = ipv4_tests[i].ip[0]; + ipv4_tests[i].ip_strict[1] = ipv4_tests[i].ip[1]; + ipv4_tests[i].ip_strict[2] = ipv4_tests[i].ip[2]; + ipv4_tests[i].ip_strict[3] = ipv4_tests[i].ip[3]; + } + /* strict */ + expect_res = (ipv4_tests[i].flags & ex_fail_4) ? STATUS_INVALID_PARAMETER : ipv4_tests[i].res_strict; + port = 0xdead; + ip.S_un.S_addr = 0xabababab; + res = pRtlIpv4StringToAddressExA(ipv4_tests[i].address, TRUE, &ip, &port); + ok(res == expect_res, "[%s] res = 0x%08x, expected 0x%08x\n", + ipv4_tests[i].address, res, expect_res); + + init_ip4(&expected_ip, ipv4_tests[i].ip_strict); + ok(ip.S_un.S_addr == expected_ip.S_un.S_addr, "[%s] ip = %08x, expected %08x\n", + ipv4_tests[i].address, ip.S_un.S_addr, expected_ip.S_un.S_addr); + } + + + for (i = 0; i < ipv4_ex_testcount; i++) + { + /* Strict is only relevant for the ip address, so make sure that it does not influence the port */ + for (strict = 0; strict < 2; strict++) + { + ip.S_un.S_addr = 0xabababab; + port = 0xdead; + res = pRtlIpv4StringToAddressExA(ipv4_ex_tests[i].address, strict, &ip, &port); + ok(res == ipv4_ex_tests[i].res, "[%s] res = 0x%08x, expected 0x%08x\n", + ipv4_ex_tests[i].address, res, ipv4_ex_tests[i].res); + + init_ip4(&expected_ip, ipv4_ex_tests[i].ip); + ok(ip.S_un.S_addr == expected_ip.S_un.S_addr, "[%s] ip = %08x, expected %08x\n", + ipv4_ex_tests[i].address, ip.S_un.S_addr, expected_ip.S_un.S_addr); + ok(port == ipv4_ex_tests[i].port, "[%s] port = %u, expected %u\n", + ipv4_ex_tests[i].address, port, ipv4_ex_tests[i].port); + } + } +} /* ipv6 addresses based on the set from https://github.com/beaugunderson/javascript-ipv6/tree/master/test/data */ static const struct @@ -3236,6 +3443,7 @@ START_TEST(rtl) test_RtlIpv4AddressToString(); test_RtlIpv4AddressToStringEx(); test_RtlIpv4StringToAddress(); + test_RtlIpv4StringToAddressEx(); test_RtlIpv6StringToAddress(); test_RtlIpv6StringToAddressEx(); test_LdrAddRefDll(); -- 2.18.0

1 0

[PATCH 7/7] advapi32: Read the configured object list for the performance provider.
by Dmitry Timoshkov 11 Jul '18

11 Jul '18

FIXME: it's not currently used, but the queries should be matched against the configured object lists, and the providers should be loaded and called only in case of a match. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/advapi32/registry.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 3daf53dcc7..a83341fbb4 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1486,6 +1486,7 @@ struct perf_provider { HMODULE perflib; WCHAR linkage[MAX_PATH]; + WCHAR objects[MAX_PATH]; PM_OPEN_PROC *pOpen; PM_CLOSE_PROC *pClose; PM_COLLECT_PROC *pCollect; @@ -1509,6 +1510,7 @@ static void *get_provider_entry(HKEY perf, HMODULE perflib, const char *name) static BOOL load_provider(HKEY root, const WCHAR *name, struct perf_provider *provider) { + static const WCHAR object_listW[] = { 'O','b','j','e','c','t',' ','L','i','s','t',0 }; static const WCHAR performanceW[] = { 'P','e','r','f','o','r','m','a','n','c','e',0 }; static const WCHAR libraryW[] = { 'L','i','b','r','a','r','y',0 }; static const WCHAR linkageW[] = { 'L','i','n','k','a','g','e',0 }; @@ -1541,6 +1543,16 @@ static BOOL load_provider(HKEY root, const WCHAR *name, struct perf_provider *pr if (err != ERROR_SUCCESS) return FALSE; + provider->objects[0] = 0; + len = sizeof(buf) - sizeof(WCHAR); + err = RegQueryValueExW(perf, object_listW, NULL, &type, (BYTE *)buf, &len); + if (err == ERROR_SUCCESS && (type == REG_SZ || type == REG_MULTI_SZ)) + { + memcpy(provider->objects, buf, len); + provider->objects[len / sizeof(WCHAR)] = 0; + TRACE("Object List: %s\n", debugstr_w(provider->objects)); + } + len = sizeof(buf) - sizeof(WCHAR); err = RegQueryValueExW(perf, libraryW, NULL, &type, (BYTE *)buf, &len); if (err != ERROR_SUCCESS || !(type == REG_SZ || type == REG_EXPAND_SZ)) -- 2.17.1

1 0

[PATCH 6/7] advapi32: If the query is not specified the default query is "Global".
by Dmitry Timoshkov 11 Jul '18

11 Jul '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/advapi32/registry.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index ce56b5aad5..3daf53dcc7 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1582,9 +1582,13 @@ error: static DWORD collect_data(struct perf_provider *provider, const WCHAR *query, void **data, DWORD *size, DWORD *obj_count) { + static const WCHAR globalW[] = { 'G','l','o','b','a','l',0 }; WCHAR *linkage = provider->linkage[0] ? provider->linkage : NULL; DWORD err; + if (!query || !query[0]) + query = globalW; + err = provider->pOpen(linkage); if (err != ERROR_SUCCESS) { -- 2.17.1

1 0

[PATCH 5/7] advapi32: Performance providers' Open() expects to see the configured name as its parameter.
by Dmitry Timoshkov 11 Jul '18

11 Jul '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/advapi32/registry.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index ac75e7b577..ce56b5aad5 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1485,6 +1485,7 @@ LONG WINAPI RegSetKeyValueA( HKEY hkey, LPCSTR subkey, LPCSTR name, DWORD type, struct perf_provider { HMODULE perflib; + WCHAR linkage[MAX_PATH]; PM_OPEN_PROC *pOpen; PM_CLOSE_PROC *pClose; PM_COLLECT_PROC *pCollect; @@ -1510,6 +1511,8 @@ static BOOL load_provider(HKEY root, const WCHAR *name, struct perf_provider *pr { static const WCHAR performanceW[] = { 'P','e','r','f','o','r','m','a','n','c','e',0 }; static const WCHAR libraryW[] = { 'L','i','b','r','a','r','y',0 }; + static const WCHAR linkageW[] = { 'L','i','n','k','a','g','e',0 }; + static const WCHAR exportW[] = { 'E','x','p','o','r','t',0 }; WCHAR buf[MAX_PATH], buf2[MAX_PATH]; DWORD err, type, len; HKEY service, perf; @@ -1518,6 +1521,21 @@ static BOOL load_provider(HKEY root, const WCHAR *name, struct perf_provider *pr if (err != ERROR_SUCCESS) return FALSE; + provider->linkage[0] = 0; + err = RegOpenKeyExW(service, linkageW, 0, KEY_READ, &perf); + if (err == ERROR_SUCCESS) + { + len = sizeof(buf) - sizeof(WCHAR); + err = RegQueryValueExW(perf, exportW, NULL, &type, (BYTE *)buf, &len); + if (err == ERROR_SUCCESS && (type == REG_SZ || type == REG_MULTI_SZ)) + { + memcpy(provider->linkage, buf, len); + provider->linkage[len / sizeof(WCHAR)] = 0; + TRACE("Export: %s\n", debugstr_w(provider->linkage)); + } + RegCloseKey(perf); + } + err = RegOpenKeyExW(service, performanceW, 0, KEY_READ, &perf); RegCloseKey(service); if (err != ERROR_SUCCESS) @@ -1564,12 +1582,13 @@ error: static DWORD collect_data(struct perf_provider *provider, const WCHAR *query, void **data, DWORD *size, DWORD *obj_count) { + WCHAR *linkage = provider->linkage[0] ? provider->linkage : NULL; DWORD err; - err = provider->pOpen(NULL); + err = provider->pOpen(linkage); if (err != ERROR_SUCCESS) { - TRACE("Open error %u (%#x)\n", err, err); + TRACE("Open(%s) error %u (%#x)\n", debugstr_w(linkage), err, err); return err; } -- 2.17.1

1 0

[PATCH 3/7] advapi32: Add initial support for querying performance counters data.
by Dmitry Timoshkov 11 Jul '18

11 Jul '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/advapi32/registry.c | 244 ++++++++++++++++++++++++++++++++- dlls/advapi32/tests/registry.c | 17 +-- 2 files changed, 249 insertions(+), 12 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 087d47f772..ac75e7b577 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -2,6 +2,7 @@ * Registry management * * Copyright (C) 1999 Alexandre Julliard + * Copyright (C) 2017 Dmitry Timoshkov * * Based on misc/registry.c code * Copyright (C) 1996 Marcus Meissner @@ -36,6 +37,7 @@ #include "winreg.h" #include "winerror.h" #include "winternl.h" +#include "winperf.h" #include "winuser.h" #include "sddl.h" #include "advapi32_misc.h" @@ -1480,6 +1482,234 @@ LONG WINAPI RegSetKeyValueA( HKEY hkey, LPCSTR subkey, LPCSTR name, DWORD type, return ret; } +struct perf_provider +{ + HMODULE perflib; + PM_OPEN_PROC *pOpen; + PM_CLOSE_PROC *pClose; + PM_COLLECT_PROC *pCollect; +}; + +static void *get_provider_entry(HKEY perf, HMODULE perflib, const char *name) +{ + char buf[MAX_PATH]; + DWORD err, type, len; + + len = sizeof(buf) - 1; + err = RegQueryValueExA(perf, name, NULL, &type, (BYTE *)buf, &len); + if (err != ERROR_SUCCESS || type != REG_SZ) + return NULL; + + buf[len] = 0; + TRACE("Loading function pointer for %s: %s\n", name, debugstr_a(buf)); + + return GetProcAddress(perflib, buf); +} + +static BOOL load_provider(HKEY root, const WCHAR *name, struct perf_provider *provider) +{ + static const WCHAR performanceW[] = { 'P','e','r','f','o','r','m','a','n','c','e',0 }; + static const WCHAR libraryW[] = { 'L','i','b','r','a','r','y',0 }; + WCHAR buf[MAX_PATH], buf2[MAX_PATH]; + DWORD err, type, len; + HKEY service, perf; + + err = RegOpenKeyExW(root, name, 0, KEY_READ, &service); + if (err != ERROR_SUCCESS) + return FALSE; + + err = RegOpenKeyExW(service, performanceW, 0, KEY_READ, &perf); + RegCloseKey(service); + if (err != ERROR_SUCCESS) + return FALSE; + + len = sizeof(buf) - sizeof(WCHAR); + err = RegQueryValueExW(perf, libraryW, NULL, &type, (BYTE *)buf, &len); + if (err != ERROR_SUCCESS || !(type == REG_SZ || type == REG_EXPAND_SZ)) + goto error; + + buf[len / sizeof(WCHAR)] = 0; + if (type == REG_EXPAND_SZ) + { + len = ExpandEnvironmentStringsW(buf, buf2, MAX_PATH); + if (!len || len > MAX_PATH) goto error; + strcpyW(buf, buf2); + } + + if (!(provider->perflib = LoadLibraryW(buf))) + { + WARN("Failed to load %s\n", debugstr_w(buf)); + goto error; + } + + GetModuleFileNameW(provider->perflib, buf, MAX_PATH); + TRACE("Loaded provider %s\n", wine_dbgstr_w(buf)); + + provider->pOpen = get_provider_entry(perf, provider->perflib, "Open"); + provider->pClose = get_provider_entry(perf, provider->perflib, "Close"); + provider->pCollect = get_provider_entry(perf, provider->perflib, "Collect"); + if (provider->pOpen && provider->pClose && provider->pCollect) + { + RegCloseKey(perf); + return TRUE; + } + + TRACE("Provider is missing required exports\n"); + FreeLibrary(provider->perflib); + +error: + RegCloseKey(perf); + return FALSE; +} + +static DWORD collect_data(struct perf_provider *provider, const WCHAR *query, void **data, DWORD *size, DWORD *obj_count) +{ + DWORD err; + + err = provider->pOpen(NULL); + if (err != ERROR_SUCCESS) + { + TRACE("Open error %u (%#x)\n", err, err); + return err; + } + + *obj_count = 0; + err = provider->pCollect((WCHAR *)query, data, size, obj_count); + if (err != ERROR_SUCCESS) + { + TRACE("Collect error %u (%#x)\n", err, err); + *obj_count = 0; + } + + provider->pClose(); + return err; +} + +#define MAX_SERVICE_NAME 260 + +static DWORD query_perf_data(const WCHAR *query, DWORD *type, void *data, DWORD *ret_size) +{ + static const WCHAR SZ_SERVICES_KEY[] = { 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'S','e','r','v','i','c','e','s',0 }; + DWORD err, i, data_size; + HKEY root; + PERF_DATA_BLOCK *pdb; + + if (!ret_size) + return ERROR_INVALID_PARAMETER; + + data_size = *ret_size; + *ret_size = 0; + + if (type) + *type = REG_BINARY; + + if (!data || data_size < sizeof(*pdb)) + return ERROR_MORE_DATA; + + pdb = data; + + pdb->Signature[0] = 'P'; + pdb->Signature[1] = 'E'; + pdb->Signature[2] = 'R'; + pdb->Signature[3] = 'F'; +#ifdef WORDS_BIGENDIAN + pdb->LittleEndian = FALSE; +#else + pdb->LittleEndian = TRUE; +#endif + pdb->Version = PERF_DATA_VERSION; + pdb->Revision = PERF_DATA_REVISION; + pdb->TotalByteLength = 0; + pdb->HeaderLength = sizeof(*pdb); + pdb->NumObjectTypes = 0; + pdb->DefaultObject = 0; + QueryPerformanceCounter(&pdb->PerfTime); + QueryPerformanceFrequency(&pdb->PerfFreq); + + data = pdb + 1; + pdb->SystemNameOffset = sizeof(*pdb); + pdb->SystemNameLength = (data_size - sizeof(*pdb)) / sizeof(WCHAR); + if (!GetComputerNameW(data, &pdb->SystemNameLength)) + return ERROR_MORE_DATA; + + pdb->SystemNameLength++; + pdb->SystemNameLength *= sizeof(WCHAR); + + pdb->HeaderLength += pdb->SystemNameLength; + + /* align to 8 bytes */ + if (pdb->SystemNameLength & 7) + pdb->HeaderLength += 8 - (pdb->SystemNameLength & 7); + + if (data_size < pdb->HeaderLength) + return ERROR_MORE_DATA; + + pdb->TotalByteLength = pdb->HeaderLength; + + data_size -= pdb->HeaderLength; + data = (char *)data + pdb->HeaderLength; + + err = RegOpenKeyExW(HKEY_LOCAL_MACHINE, SZ_SERVICES_KEY, 0, KEY_READ, &root); + if (err != ERROR_SUCCESS) + return err; + + i = 0; + for (;;) + { + DWORD collected_size = data_size, obj_count = 0; + struct perf_provider provider; + WCHAR name[MAX_SERVICE_NAME]; + void *collected_data = data; + + err = RegEnumKeyW(root, i++, name, MAX_SERVICE_NAME); + if (err == ERROR_NO_MORE_ITEMS) + { + err = ERROR_SUCCESS; + break; + } + + if (err != ERROR_SUCCESS) + continue; + + if (!load_provider(root, name, &provider)) + continue; + + err = collect_data(&provider, query, &collected_data, &collected_size, &obj_count); + FreeLibrary(provider.perflib); + + if (err == ERROR_MORE_DATA) + break; + + if (err == ERROR_SUCCESS) + { + PERF_OBJECT_TYPE *obj = (PERF_OBJECT_TYPE *)data; + + TRACE("Collect: obj->TotalByteLength %u, collected_size %u\n", + obj->TotalByteLength, collected_size); + + data_size -= collected_size; + data = collected_data; + + pdb->TotalByteLength += collected_size; + pdb->NumObjectTypes += obj_count; + } + } + + RegCloseKey(root); + + if (err == ERROR_SUCCESS) + { + *ret_size = pdb->TotalByteLength; + + GetSystemTime(&pdb->SystemTime); + GetSystemTimeAsFileTime((FILETIME *)&pdb->PerfTime100nSec); + } + + return err; +} + /****************************************************************************** * RegQueryValueExW [ADVAPI32.@] * @@ -1500,6 +1730,10 @@ LSTATUS WINAPI RegQueryValueExW( HKEY hkey, LPCWSTR name, LPDWORD reserved, LPDW (count && data) ? *count : 0 ); if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER; + + if (hkey == HKEY_PERFORMANCE_DATA) + return query_perf_data(name, type, data, count); + if (!(hkey = get_special_root_hkey( hkey, 0 ))) return ERROR_INVALID_HANDLE; RtlInitUnicodeString( &name_str, name ); @@ -1590,7 +1824,8 @@ LSTATUS WINAPI DECLSPEC_HOTPATCH RegQueryValueExA( HKEY hkey, LPCSTR name, LPDWO hkey, debugstr_a(name), reserved, type, data, count, count ? *count : 0 ); if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER; - if (!(hkey = get_special_root_hkey( hkey, 0 ))) return ERROR_INVALID_HANDLE; + if (hkey != HKEY_PERFORMANCE_DATA && !(hkey = get_special_root_hkey( hkey, 0 ))) + return ERROR_INVALID_HANDLE; if (count) datalen = *count; if (!data && count) *count = 0; @@ -1602,6 +1837,13 @@ LSTATUS WINAPI DECLSPEC_HOTPATCH RegQueryValueExA( HKEY hkey, LPCSTR name, LPDWO if ((status = RtlAnsiStringToUnicodeString( &nameW, &nameA, TRUE ))) return RtlNtStatusToDosError(status); + if (hkey == HKEY_PERFORMANCE_DATA) + { + DWORD ret = query_perf_data( nameW.Buffer, type, data, count ); + RtlFreeUnicodeString( &nameW ); + return ret; + } + status = NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, buffer, sizeof(buffer), &total_size ); if (status && status != STATUS_BUFFER_OVERFLOW) goto done; diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 1573b6c03b..5e3535354c 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3652,10 +3652,10 @@ static void test_RegQueryValueExPerformanceData(void) /* Test with data == NULL */ dwret = RegQueryValueExA( HKEY_PERFORMANCE_DATA, "Global", NULL, NULL, NULL, &cbData ); - todo_wine ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret ); + ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret ); dwret = RegQueryValueExW( HKEY_PERFORMANCE_DATA, globalW, NULL, NULL, NULL, &cbData ); - todo_wine ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret ); + ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret ); /* Test ERROR_MORE_DATA, start with small buffer */ len = 10; @@ -3663,8 +3663,7 @@ static void test_RegQueryValueExPerformanceData(void) cbData = len; type = 0xdeadbeef; dwret = RegQueryValueExA( HKEY_PERFORMANCE_DATA, "Global", NULL, &type, value, &cbData ); - todo_wine ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret ); -todo_wine + ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret ); ok(type == REG_BINARY, "got %u\n", type); while( dwret == ERROR_MORE_DATA && limit) { @@ -3677,14 +3676,13 @@ todo_wine } ok(limit > 0, "too many times ERROR_MORE_DATA returned\n"); - todo_wine ok(dwret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", dwret); -todo_wine + ok(dwret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", dwret); ok(type == REG_BINARY, "got %u\n", type); /* Check returned data */ if (dwret == ERROR_SUCCESS) { - todo_wine ok(len >= sizeof(PERF_DATA_BLOCK), "got size %d\n", len); + ok(len >= sizeof(PERF_DATA_BLOCK), "got size %d\n", len); if (len >= sizeof(PERF_DATA_BLOCK)) { pdb = (PERF_DATA_BLOCK*) value; ok(pdb->Signature[0] == 'P', "expected Signature[0] = 'P', got 0x%x\n", pdb->Signature[0]); @@ -3701,13 +3699,11 @@ todo_wine { cbData = 0xdeadbeef; dwret = RegQueryValueExA(HKEY_PERFORMANCE_DATA, names[i], NULL, NULL, NULL, &cbData); -todo_wine ok(dwret == ERROR_MORE_DATA, "%u/%s: got %u\n", i, names[i], dwret); ok(cbData == 0, "got %u\n", cbData); cbData = 0; dwret = RegQueryValueExA(HKEY_PERFORMANCE_DATA, names[i], NULL, NULL, NULL, &cbData); -todo_wine ok(dwret == ERROR_MORE_DATA, "%u/%s: got %u\n", i, names[i], dwret); ok(cbData == 0, "got %u\n", cbData); @@ -3740,9 +3736,7 @@ todo_wine type = 0xdeadbeef; cbData = sizeof(buf); dwret = RegQueryValueExA(HKEY_PERFORMANCE_DATA, "invalid counter name", NULL, &type, buf, &cbData); -todo_wine ok(dwret == ERROR_SUCCESS, "got %u\n", dwret); -todo_wine ok(type == REG_BINARY, "got %u\n", type); if (dwret == ERROR_SUCCESS) { @@ -3772,6 +3766,7 @@ todo_wine ok(pdb->TotalByteLength == len, "got %u vs %u\n", pdb->TotalByteLength, len); ok(pdb->HeaderLength == pdb->TotalByteLength, "got %u\n", pdb->HeaderLength); ok(pdb->NumObjectTypes == 0, "got %u\n", pdb->NumObjectTypes); +todo_wine ok(pdb->DefaultObject != 0, "got %u\n", pdb->DefaultObject); ok(pdb->SystemTime.wYear == st.wYear, "got %u\n", pdb->SystemTime.wYear); ok(pdb->SystemTime.wMonth == st.wMonth, "got %u\n", pdb->SystemTime.wMonth); -- 2.17.1

1 0

[PATCH 2/7] include: Add more definitions for performance counters.
by Dmitry Timoshkov 11 Jul '18

11 Jul '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- include/winperf.h | 113 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 97 insertions(+), 16 deletions(-) diff --git a/include/winperf.h b/include/winperf.h index dce1a6d648..113bfbae40 100644 --- a/include/winperf.h +++ b/include/winperf.h @@ -67,25 +67,106 @@ #define PERF_DETAIL_EXPERT 300 #define PERF_DETAIL_WIZARD 400 +#include <pshpack8.h> + /* Performance data structure header * returned in answer to HKEY_PERFORMANCE_DATA request */ -typedef struct _PERF_DATA_BLOCK { - WCHAR Signature[4]; - DWORD LittleEndian; - DWORD Version; - DWORD Revision; - DWORD TotalByteLength; - DWORD HeaderLength; - DWORD NumObjectTypes; - DWORD DefaultObject; - SYSTEMTIME SystemTime; - LARGE_INTEGER PerfTime; - LARGE_INTEGER PerfFreq; - LARGE_INTEGER PerfTime100nSec; - DWORD SystemNameLength; - DWORD SystemNameOffset; -} PERF_DATA_BLOCK, *PPERF_DATA_BLOCK, *LPPERF_DATA_BLOCK; +#define PERF_DATA_VERSION 1 +#define PERF_DATA_REVISION 1 + +typedef struct _PERF_DATA_BLOCK +{ + WCHAR Signature[4]; + DWORD LittleEndian; + DWORD Version; + DWORD Revision; + DWORD TotalByteLength; + DWORD HeaderLength; + DWORD NumObjectTypes; + DWORD DefaultObject; + SYSTEMTIME SystemTime; + LARGE_INTEGER PerfTime; + LARGE_INTEGER PerfFreq; + LARGE_INTEGER PerfTime100nSec; + DWORD SystemNameLength; + DWORD SystemNameOffset; +} PERF_DATA_BLOCK, *PPERF_DATA_BLOCK; + +#define PERF_NO_INSTANCES -1 + +typedef struct _PERF_OBJECT_TYPE +{ + DWORD TotalByteLength; + DWORD DefinitionLength; + DWORD HeaderLength; + DWORD ObjectNameTitleIndex; +#ifdef _WIN64 + DWORD ObjectNameTitle; +#else + LPWSTR ObjectNameTitle; +#endif + DWORD ObjectHelpTitleIndex; +#ifdef _WIN64 + DWORD ObjectHelpTitle; +#else + LPWSTR ObjectHelpTitle; +#endif + DWORD DetailLevel; + DWORD NumCounters; + LONG DefaultCounter; + LONG NumInstances; + DWORD CodePage; + LARGE_INTEGER PerfTime; + LARGE_INTEGER PerfFreq; +} PERF_OBJECT_TYPE, *PPERF_OBJECT_TYPE; + +typedef struct _PERF_COUNTER_DEFINITION +{ + DWORD ByteLength; + DWORD CounterNameTitleIndex; +#ifdef _WIN64 + DWORD CounterNameTitle; +#else + LPWSTR CounterNameTitle; +#endif + DWORD CounterHelpTitleIndex; +#ifdef _WIN64 + DWORD CounterHelpTitle; +#else + LPWSTR CounterHelpTitle; +#endif + LONG DefaultScale; + DWORD DetailLevel; + DWORD CounterType; + DWORD CounterSize; + DWORD CounterOffset; +} PERF_COUNTER_DEFINITION, *PPERF_COUNTER_DEFINITION; + +#define PERF_NO_UNIQUE_ID -1 + +typedef struct _PERF_INSTANCE_DEFINITION +{ + DWORD ByteLength; + DWORD ParentObjectTitleIndex; + DWORD ParentObjectInstance; + LONG UniqueID; + DWORD NameOffset; + DWORD NameLength; +} PERF_INSTANCE_DEFINITION, *PPERF_INSTANCE_DEFINITION; + +typedef struct _PERF_COUNTER_BLOCK +{ + DWORD ByteLength; +} PERF_COUNTER_BLOCK, *PPERF_COUNTER_BLOCK; + + +#include <poppack.h> + +typedef DWORD (APIENTRY PM_OPEN_PROC)(LPWSTR); +typedef DWORD (APIENTRY PM_COLLECT_PROC)(LPWSTR,LPVOID *,LPDWORD,LPDWORD); +typedef DWORD (APIENTRY PM_CLOSE_PROC)(void); +typedef DWORD (APIENTRY PM_QUERY_PROC)(LPDWORD,LPVOID *,LPDWORD,LPDWORD); #endif /* _WINPERF_ */ -- 2.17.1

1 0

[PATCH 1/7] advapi32/tests: Add more tests for performance counters.
by Dmitry Timoshkov 11 Jul '18

11 Jul '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/advapi32/tests/registry.c | 196 ++++++++++++++++++++++++++++++++- include/winreg.h | 2 + 2 files changed, 194 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 9d248685ca..1573b6c03b 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3613,35 +3613,73 @@ static void test_RegNotifyChangeKeyValue(void) CloseHandle(event); } +static const char *dbgstr_longlong(ULONGLONG ll) +{ + static char buf[16][64]; + static int idx; + + idx &= 0x0f; + + if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) + sprintf(buf[idx], "0x%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll); + else + sprintf(buf[idx], "0x%08lx", (unsigned long)ll); + + return buf[idx++]; +} + +#define cmp_li(a, b, c) cmp_li_real(a, b, c, __LINE__) +static void cmp_li_real(LARGE_INTEGER *l1, LARGE_INTEGER *l2, LONGLONG slack, int line) +{ + LONGLONG diff = l2->QuadPart - l1->QuadPart; + if (diff < 0) diff = -diff; + ok_(__FILE__, line)(diff <= slack, "values don't match: %s/%s\n", + dbgstr_longlong(l1->QuadPart), dbgstr_longlong(l2->QuadPart)); +} + static void test_RegQueryValueExPerformanceData(void) { - DWORD cbData, len; + static const WCHAR globalW[] = { 'G','l','o','b','a','l',0 }; + static const WCHAR dummyW[5] = { 'd','u','m','m','y' }; + static const char * const names[] = { NULL, "", "Global", "2" "invalid counter name" }; + DWORD cbData, len, i, type; BYTE *value; DWORD dwret; LONG limit = 6; PERF_DATA_BLOCK *pdb; + HKEY hkey; + BYTE buf[256 + sizeof(PERF_DATA_BLOCK)]; /* Test with data == NULL */ dwret = RegQueryValueExA( HKEY_PERFORMANCE_DATA, "Global", NULL, NULL, NULL, &cbData ); todo_wine ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret ); + dwret = RegQueryValueExW( HKEY_PERFORMANCE_DATA, globalW, NULL, NULL, NULL, &cbData ); + todo_wine ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret ); + /* Test ERROR_MORE_DATA, start with small buffer */ len = 10; value = HeapAlloc(GetProcessHeap(), 0, len); cbData = len; - dwret = RegQueryValueExA( HKEY_PERFORMANCE_DATA, "Global", NULL, NULL, value, &cbData ); + type = 0xdeadbeef; + dwret = RegQueryValueExA( HKEY_PERFORMANCE_DATA, "Global", NULL, &type, value, &cbData ); todo_wine ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret ); +todo_wine + ok(type == REG_BINARY, "got %u\n", type); while( dwret == ERROR_MORE_DATA && limit) { len = len * 10; value = HeapReAlloc( GetProcessHeap(), 0, value, len ); cbData = len; - dwret = RegQueryValueExA( HKEY_PERFORMANCE_DATA, "Global", NULL, NULL, value, &cbData ); + type = 0xdeadbeef; + dwret = RegQueryValueExA( HKEY_PERFORMANCE_DATA, "Global", NULL, &type, value, &cbData ); limit--; } ok(limit > 0, "too many times ERROR_MORE_DATA returned\n"); todo_wine ok(dwret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", dwret); +todo_wine + ok(type == REG_BINARY, "got %u\n", type); /* Check returned data */ if (dwret == ERROR_SUCCESS) @@ -3658,8 +3696,158 @@ static void test_RegQueryValueExPerformanceData(void) } HeapFree(GetProcessHeap(), 0, value); -} + for (i = 0; i < sizeof(names)/sizeof(names[0]); i++) + { + cbData = 0xdeadbeef; + dwret = RegQueryValueExA(HKEY_PERFORMANCE_DATA, names[i], NULL, NULL, NULL, &cbData); +todo_wine + ok(dwret == ERROR_MORE_DATA, "%u/%s: got %u\n", i, names[i], dwret); + ok(cbData == 0, "got %u\n", cbData); + + cbData = 0; + dwret = RegQueryValueExA(HKEY_PERFORMANCE_DATA, names[i], NULL, NULL, NULL, &cbData); +todo_wine + ok(dwret == ERROR_MORE_DATA, "%u/%s: got %u\n", i, names[i], dwret); + ok(cbData == 0, "got %u\n", cbData); + + cbData = 0xdeadbeef; + dwret = RegQueryValueExA(HKEY_PERFORMANCE_TEXT, names[i], NULL, NULL, NULL, &cbData); +todo_wine + ok(dwret == ERROR_MORE_DATA, "%u/%s: got %u\n", i, names[i], dwret); + ok(cbData == 0, "got %u\n", cbData); + + cbData = 0; + dwret = RegQueryValueExA(HKEY_PERFORMANCE_TEXT, names[i], NULL, NULL, NULL, &cbData); +todo_wine + ok(dwret == ERROR_MORE_DATA, "%u/%s: got %u\n", i, names[i], dwret); + ok(cbData == 0, "got %u\n", cbData); + + cbData = 0xdeadbeef; + dwret = RegQueryValueExA(HKEY_PERFORMANCE_NLSTEXT, names[i], NULL, NULL, NULL, &cbData); +todo_wine + ok(dwret == ERROR_MORE_DATA, "%u/%s: got %u\n", i, names[i], dwret); + ok(cbData == 0, "got %u\n", cbData); + + cbData = 0; + dwret = RegQueryValueExA(HKEY_PERFORMANCE_NLSTEXT, names[i], NULL, NULL, NULL, &cbData); +todo_wine + ok(dwret == ERROR_MORE_DATA, "%u/%s: got %u\n", i, names[i], dwret); + ok(cbData == 0, "got %u\n", cbData); + } + + memset(buf, 0x77, sizeof(buf)); + type = 0xdeadbeef; + cbData = sizeof(buf); + dwret = RegQueryValueExA(HKEY_PERFORMANCE_DATA, "invalid counter name", NULL, &type, buf, &cbData); +todo_wine + ok(dwret == ERROR_SUCCESS, "got %u\n", dwret); +todo_wine + ok(type == REG_BINARY, "got %u\n", type); + if (dwret == ERROR_SUCCESS) + { + SYSTEMTIME st; + WCHAR sysname[MAX_COMPUTERNAME_LENGTH + 1]; + DWORD sysname_len; + LARGE_INTEGER counter, freq, ftime; + + GetSystemTime(&st); + GetSystemTimeAsFileTime((FILETIME *)&ftime); + QueryPerformanceCounter(&counter); + QueryPerformanceFrequency(&freq); + + sysname_len = MAX_COMPUTERNAME_LENGTH + 1; + GetComputerNameW(sysname, &sysname_len); + + pdb = (PERF_DATA_BLOCK *)buf; + ok(pdb->Signature[0] == 'P', "got '%c'\n", pdb->Signature[0]); + ok(pdb->Signature[1] == 'E', "got '%c'\n", pdb->Signature[1]); + ok(pdb->Signature[2] == 'R', "got '%c'\n", pdb->Signature[2]); + ok(pdb->Signature[3] == 'F', "got '%c'\n", pdb->Signature[3]); + + ok(pdb->LittleEndian == 1, "got %u\n", pdb->LittleEndian); + ok(pdb->Version == 1, "got %u\n", pdb->Version); + ok(pdb->Revision == 1, "got %u\n", pdb->Revision); + len = (sizeof(*pdb) + pdb->SystemNameLength + 7) & ~7; + ok(pdb->TotalByteLength == len, "got %u vs %u\n", pdb->TotalByteLength, len); + ok(pdb->HeaderLength == pdb->TotalByteLength, "got %u\n", pdb->HeaderLength); + ok(pdb->NumObjectTypes == 0, "got %u\n", pdb->NumObjectTypes); + ok(pdb->DefaultObject != 0, "got %u\n", pdb->DefaultObject); + ok(pdb->SystemTime.wYear == st.wYear, "got %u\n", pdb->SystemTime.wYear); + ok(pdb->SystemTime.wMonth == st.wMonth, "got %u\n", pdb->SystemTime.wMonth); + ok(pdb->SystemTime.wDayOfWeek == st.wDayOfWeek, "got %u\n", pdb->SystemTime.wDayOfWeek); + ok(pdb->SystemTime.wDay == st.wDay, "got %u\n", pdb->SystemTime.wDay); + if (U(pdb->PerfTime).LowPart != 0x77777777) /* TestBot is broken */ + cmp_li(&pdb->PerfTime, &counter, freq.QuadPart); + if (U(pdb->PerfFreq).LowPart != 0x77777777) /* TestBot is broken */ + cmp_li(&pdb->PerfFreq, &freq, 0); + cmp_li(&pdb->PerfTime100nSec, &ftime, 200000); /* TestBot needs huge slack value */ + ok(pdb->SystemNameLength == (sysname_len + 1) * sizeof(WCHAR), "expected %u, got %u\n", + (sysname_len + 1) * 2 /*sizeof(WCHAR)*/, pdb->SystemNameLength); + ok(pdb->SystemNameOffset == sizeof(*pdb), "got %u\n", pdb->SystemNameOffset); + ok(!lstrcmpW(sysname, (LPCWSTR)(pdb + 1)), "%s != %s\n", + wine_dbgstr_w(sysname), wine_dbgstr_w((LPCWSTR)(pdb + 1))); + + len = pdb->TotalByteLength - (sizeof(*pdb) + pdb->SystemNameLength); + if (len) + { + BYTE remainder[8], *p; + + memset(remainder, 0x77, sizeof(remainder)); + p = buf + sizeof(*pdb) + pdb->SystemNameLength; + ok(!memcmp(p, remainder, len), "remainder: %02x,%02x...\n", p[0], p[1]); + } + } + + dwret = RegOpenKeyA(HKEY_PERFORMANCE_DATA, NULL, &hkey); +todo_wine + ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret); + + dwret = RegOpenKeyA(HKEY_PERFORMANCE_DATA, "Global", &hkey); +todo_wine + ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret); + + dwret = RegOpenKeyExA(HKEY_PERFORMANCE_DATA, "Global", 0, KEY_READ, &hkey); +todo_wine + ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret); + + dwret = RegQueryValueA(HKEY_PERFORMANCE_DATA, "Global", NULL, (LONG *)&cbData); +todo_wine + ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret); + + dwret = RegSetValueA(HKEY_PERFORMANCE_DATA, "Global", REG_SZ, "dummy", 4); +todo_wine + ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret); + + dwret = RegSetValueExA(HKEY_PERFORMANCE_DATA, "Global", 0, REG_SZ, (const BYTE *)"dummy", 40); +todo_wine + ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret); + + cbData = sizeof(buf); + dwret = RegEnumKeyA(HKEY_PERFORMANCE_DATA, 0, (LPSTR)buf, cbData); +todo_wine + ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret); + + cbData = sizeof(buf); + dwret = RegEnumValueA(HKEY_PERFORMANCE_DATA, 0, (LPSTR)buf, &cbData, NULL, NULL, NULL, NULL); +todo_wine + ok(dwret == ERROR_MORE_DATA, "got %u\n", dwret); +todo_wine + ok(cbData == sizeof(buf), "got %u\n", cbData); + + dwret = RegEnumValueA(HKEY_PERFORMANCE_DATA, 0, NULL, &cbData, NULL, NULL, NULL, NULL); + ok(dwret == ERROR_INVALID_PARAMETER, "got %u\n", dwret); + + if (pRegSetKeyValueW) + { + dwret = pRegSetKeyValueW(HKEY_PERFORMANCE_DATA, NULL, globalW, REG_SZ, dummyW, sizeof(dummyW)); +todo_wine + ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret); + } + + dwret = RegCloseKey(HKEY_PERFORMANCE_DATA); + ok(dwret == ERROR_SUCCESS, "got %u\n", dwret); +} START_TEST(registry) { diff --git a/include/winreg.h b/include/winreg.h index 42b77251ae..ddbd929378 100644 --- a/include/winreg.h +++ b/include/winreg.h @@ -32,6 +32,8 @@ extern "C" { #define HKEY_PERFORMANCE_DATA ((HKEY)(LONG_PTR)(LONG)0x80000004) #define HKEY_CURRENT_CONFIG ((HKEY)(LONG_PTR)(LONG)0x80000005) #define HKEY_DYN_DATA ((HKEY)(LONG_PTR)(LONG)0x80000006) +#define HKEY_PERFORMANCE_TEXT ((HKEY)(LONG_PTR)(LONG)0x80000050) +#define HKEY_PERFORMANCE_NLSTEXT ((HKEY)(LONG_PTR)(LONG)0x80000060) /* * registry provider structs -- 2.17.1

1 0

[PATCH v2] packager: Prefer native version
by André Hentschel 10 Jul '18

10 Jul '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/packager/packager_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/packager/packager_main.c b/dlls/packager/packager_main.c index c1d194e..af1ee22 100644 --- a/dlls/packager/packager_main.c +++ b/dlls/packager/packager_main.c @@ -675,6 +675,8 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) TRACE("(%p, %u, %p)\n", instance, reason, reserved); switch(reason){ + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: g_instance = instance; DisableThreadLibraryCalls(instance); -- 2.7.4

3 4

[PATCH] packager: Prefer native version.
by André Hentschel 10 Jul '18

10 Jul '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/packager/packager_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/packager/packager_main.c b/dlls/packager/packager_main.c index c1d194e..af1ee22 100644 --- a/dlls/packager/packager_main.c +++ b/dlls/packager/packager_main.c @@ -675,6 +675,8 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) TRACE("(%p, %u, %p)\n", instance, reason, reserved); switch(reason){ + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: g_instance = instance; DisableThreadLibraryCalls(instance); -- 2.7.4

1 1

[PATCH 3/8] winedump: Stop prepending every line of information with an offset.
by Dmitry Timoshkov 10 Jul '18

10 Jul '18

This patch makes typelib output consistent with other dumpers. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/winedump/tlb.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index e30761540b..0d8f059c03 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -173,9 +173,6 @@ static int tlb_read_byte(void) static void print_offset(void) { int i; - - printf("%04x: ", offset); - for(i=0; i<indent; i++) printf(" "); } -- 2.17.1

2 1

[PATCH 7/8] winedump: Use common binary dumper for typelib.
by Dmitry Timoshkov 10 Jul '18

10 Jul '18

This is an adapted code from dump.c. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/winedump/tlb.c | 52 +++++++++++++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 15 deletions(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index d2883598d7..5d009fcedb 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -283,25 +283,47 @@ static void print_ctl2(const char *name) printf("\n"); } -static void dump_binary(int n) +static int tlb_isprint(unsigned char c) { - int i; + return c >= 32; +} - for(i = 1; i <= n; i++) { - switch(i & 0x0f) { - case 0: - printf("%02x\n", tlb_read_byte()); - break; - case 1: - print_offset(); - /* fall through */ - default: - printf("%02x ", tlb_read_byte()); +static void dump_binary(int size) +{ + const unsigned char *ptr; + int i, j; + + if (!size) return; + + ptr = tlb_read(size); + if (!ptr) return; + + print_offset(); + printf("%08x: ", offset - size); + + for (i = 0; i < size; i++) + { + printf("%02x%c", ptr[i], (i % 16 == 7) ? '-' : ' '); + if ((i % 16) == 15) + { + printf( " " ); + for (j = 0; j < 16; j++) + printf("%c", tlb_isprint(ptr[i-15+j]) ? ptr[i-15+j] : '.'); + if (i < size-1) + { + printf("\n"); + print_offset(); + printf("%08x: ", offset - size + i + 1); + } } } - - if(n&0x0f) - printf("\n"); + if (i % 16) + { + printf("%*s ", 3 * (16-(i%16)), ""); + for (j = 0; j < i % 16; j++) + printf("%c", tlb_isprint(ptr[i-(i%16)+j]) ? ptr[i-(i%16)+j] : '.'); + } + printf("\n"); } static int dump_msft_varflags(void) -- 2.17.1

2 3

[PATCH 6/8] winedump: Add print_string() helper.
by Dmitry Timoshkov 10 Jul '18

10 Jul '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/winedump/tlb.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index 330fee8fbf..d2883598d7 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -517,11 +517,17 @@ static BOOL dump_msft_namehashtab(seg_t *seg) return TRUE; } -static void dump_string(int len, int align_off) +static void print_string(int len) { printf("\""); fwrite(tlb_read(len), len, 1, stdout); - printf("\" "); + printf("\""); +} + +static void dump_string(int len, int align_off) +{ + print_string(len); + printf(" "); while((len++ + align_off) & 3) printf("\\%2.2x", tlb_read_byte()); } -- 2.17.1

2 1

[PATCH 1/8] winedump: Correctly declare the array of segments.
by Dmitry Timoshkov 10 Jul '18

10 Jul '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/winedump/tlb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index df1ea4b576..5c710360e6 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -109,7 +109,7 @@ typedef struct seg_t { int offset; int length; } seg_t; -static seg_t segdir[]; +static seg_t segdir[15]; enum SEGDIRTYPE { SEGDIR_TYPEINFO, -- 2.17.1

2 3

[PATCH 1/2 v2] mscoree: add stub for CorIsLatestSvc to hint user at broken .NET installation
by Louis Lenders 10 Jul '18

10 Jul '18

v2: add todo_wine to a test. missed that in 1st patch This function can be called in case of a broken .NET installation. See also https://bugs.winehq.org/show_bug.cgi?id=31688 Hopefully this stub will reduce amount of invalid bugreports in bugzilla about this issue Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/mscoree/mscoree.spec | 2 +- dlls/mscoree/mscoree_main.c | 6 ++++++ dlls/mscoree/tests/mscoree.c | 11 ++++++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index 3715b7c79d..ec4668bc3c 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -25,7 +25,7 @@ @ stub CorDllMainWorker @ stdcall CorExitProcess(long) @ stub CorGetSvc -@ stub CorIsLatestSvc +@ stdcall CorIsLatestSvc(ptr ptr) @ stub CorMarkThreadInThreadPool @ stub CorTickleSvc @ stdcall CreateConfigStream(wstr ptr) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 9561405608..519f918223 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -309,6 +309,12 @@ HRESULT WINAPI GetCORVersion(LPWSTR pbuffer, DWORD cchBuffer, DWORD *dwLength) return ret; } +HRESULT WINAPI CorIsLatestSvc(int *unk1, int *unk2) +{ + FIXME("%p, %p stub: If this function is called, it is likely the result of a broken .NET installation!\n", unk1, unk2); + return S_OK; +} + HRESULT WINAPI GetRequestedRuntimeInfo(LPCWSTR pExe, LPCWSTR pwszVersion, LPCWSTR pConfigurationFile, DWORD startupFlags, DWORD runtimeInfoFlags, LPWSTR pDirectory, DWORD dwDirectory, DWORD *dwDirectoryLength, LPWSTR pVersion, DWORD cchBuffer, DWORD *dwlength) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 63517dc79b..952f87b154 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -35,6 +35,7 @@ static const WCHAR v4_0[] = {'v','4','.','0','.','3','0','3','1','9',0}; static HMODULE hmscoree; static HRESULT (WINAPI *pGetCORVersion)(LPWSTR, DWORD, DWORD*); +static HRESULT (WINAPI *pCorIsLatestSvc)(INT*, INT*); static HRESULT (WINAPI *pGetCORSystemDirectory)(LPWSTR, DWORD, DWORD*); static HRESULT (WINAPI *pGetRequestedRuntimeInfo)(LPCWSTR, LPCWSTR, LPCWSTR, DWORD, DWORD, LPWSTR, DWORD, DWORD*, LPWSTR, DWORD, DWORD*); static HRESULT (WINAPI *pLoadLibraryShim)(LPCWSTR, LPCWSTR, LPVOID, HMODULE*); @@ -55,6 +56,7 @@ static BOOL init_functionpointers(void) } pGetCORVersion = (void *)GetProcAddress(hmscoree, "GetCORVersion"); + pCorIsLatestSvc = (void *)GetProcAddress(hmscoree, "CorIsLatestSvc"); pGetCORSystemDirectory = (void *)GetProcAddress(hmscoree, "GetCORSystemDirectory"); pGetRequestedRuntimeInfo = (void *)GetProcAddress(hmscoree, "GetRequestedRuntimeInfo"); pLoadLibraryShim = (void *)GetProcAddress(hmscoree, "LoadLibraryShim"); @@ -63,7 +65,7 @@ static BOOL init_functionpointers(void) pCLRCreateInstance = (void *)GetProcAddress(hmscoree, "CLRCreateInstance"); if (!pGetCORVersion || !pGetCORSystemDirectory || !pGetRequestedRuntimeInfo || !pLoadLibraryShim || - !pCreateInterface || !pCLRCreateInstance + !pCreateInterface || !pCLRCreateInstance || !pCorIsLatestSvc ) { win_skip("functions not available\n"); @@ -175,6 +177,7 @@ static void test_versioninfo(void) WCHAR path[MAX_PATH]; DWORD size, path_len; HRESULT hr; + int unk1,unk2; if (0) /* crashes on <= w2k3 */ { @@ -289,6 +292,12 @@ static void test_versioninfo(void) hr = pGetRequestedRuntimeInfo( NULL, v2_0_0, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); ok(!winetest_strcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); + + hr = pCorIsLatestSvc(NULL, NULL); + todo_wine ok(hr == E_POINTER, "CorIsLatestSvc returned %08x\n", hr); + + hr = pCorIsLatestSvc(&unk1, &unk2); + ok(hr == S_OK, "CorIsLatestSvc returned %08x\n", hr); } static void test_loadlibraryshim(void) -- 2.17.1

2 4

[PATCH 5/8] winedump: Fix version printing.
by Dmitry Timoshkov 10 Jul '18

10 Jul '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/winedump/tlb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index bc19087fc5..330fee8fbf 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -321,10 +321,10 @@ static int dump_msft_varflags(void) static void dump_msft_version(void) { - int version; + unsigned version; print_offset(); version = tlb_read_int(); - printf("version = %d.%d\n", version & 0xff, version >> 16); + printf("version = %u.%u\n", version & 0xffff, version >> 16); } static void dump_msft_header(void) -- 2.17.1

2 1

[PATCH 4/8] winedump: Consistently print hex numbers with leading zeros and 'h' suffix.
by Dmitry Timoshkov 10 Jul '18

10 Jul '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/winedump/tlb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index 0d8f059c03..bc19087fc5 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -204,7 +204,7 @@ static int print_hex(const char *name) { int ret; print_offset(); - printf("%s = %08x\n", name, ret=tlb_read_int()); + printf("%s = %08xh\n", name, ret=tlb_read_int()); return ret; } @@ -219,7 +219,7 @@ static int print_short_hex(const char *name) { int ret; print_offset(); - printf("%s = %xh\n", name, ret=tlb_read_short()); + printf("%s = %04xh\n", name, ret=tlb_read_short()); return ret; } -- 2.17.1

2 1

[PATCH 2/8] winedump: Avoid sign extension in tlb_read_short().
by Dmitry Timoshkov 10 Jul '18

10 Jul '18

tlb_read_byte() already behaves this way. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/winedump/tlb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index 5c710360e6..e30761540b 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -160,7 +160,7 @@ static int tlb_read_int(void) static int tlb_read_short(void) { - const short *ret = tlb_read(sizeof(short)); + const unsigned short *ret = tlb_read(sizeof(short)); return ret ? *ret : -1; } -- 2.17.1

2 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel