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

[PATCH 4/9] float.h: Add __fpe_flt_rounds declaration.
by Jacek Caban March 19, 2020

March 19, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/float.h | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH 3/9] ctype.h: Add more declarations.
by Jacek Caban March 19, 2020

March 19, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/corecrt_wctype.h | 3 +++ include/msvcrt/ctype.h | 2 ++ 2 files changed, 5 insertions(+)

1 0

[PATCH 2/9] corecrt_startup.h: Add more declarations.
by Jacek Caban March 19, 2020

March 19, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/corecrt_startup.h | 8 ++++++++ 1 file changed, 8 insertions(+)

1 0

[PATCH 1/9] include: Add fenv.h header.
by Jacek Caban March 19, 2020

March 19, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/fenv.h | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 include/msvcrt/fenv.h

1 0

[PATCH v2 1/6] quartz/vmr9: Zero-initialize the VMR9PresentationInfo struct.
by Zebediah Figura March 19, 2020

March 19, 2020

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/quartz/vmr9.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index e7a588e28a0..d1110572303 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -262,10 +262,10 @@ static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMedi { struct quartz_vmr *This = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); const HANDLE events[2] = {This->run_event, This->renderer.flush_event}; + VMR9PresentationInfo info = {}; LPBYTE pbSrcStream = NULL; long cbSrcStream = 0; REFERENCE_TIME tStart, tStop; - VMR9PresentationInfo info; HRESULT hr; TRACE("%p %p\n", iface, pSample); -- 2.25.1

3 7

[PATCH 1/5] mfplat: Fix scanline pointer returned with Lock2D().
by Nikolay Sivov March 19, 2020

March 19, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/buffer.c | 2 +- dlls/mfplat/tests/mfplat.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 71bae4c42f..7206cf6d5a 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -340,7 +340,7 @@ static HRESULT memory_2d_buffer_lock(struct memory_buffer *buffer, BYTE **scanli else { ++buffer->_2d.locks; - *scanline0 = buffer->data; + *scanline0 = buffer->_2d.scanline0; *pitch = buffer->_2d.pitch; if (buffer_start) *buffer_start = buffer->data; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 8e9bf8102a..497c451f72 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -4694,7 +4694,7 @@ static void test_MFCreate2DMediaBuffer(void) IMF2DBuffer2 *_2dbuffer2; IMF2DBuffer *_2dbuffer; IMFMediaBuffer *buffer; - int i, pitch; + int i, pitch, pitch2; HRESULT hr; BOOL ret; @@ -4898,6 +4898,12 @@ static void test_MFCreate2DMediaBuffer(void) hr = IMF2DBuffer_Lock2D(_2dbuffer, &data, &pitch); ok(hr == S_OK, "Failed to lock buffer, hr %#x.\n", hr); + + hr = IMF2DBuffer_GetScanline0AndPitch(_2dbuffer, &data2, &pitch2); + ok(hr == S_OK, "Failed to get scanline, hr %#x.\n", hr); + ok(data2 == data, "Unexpected data pointer.\n"); + ok(pitch == pitch2, "Unexpected pitch.\n"); + hr = IMF2DBuffer_Unlock2D(_2dbuffer); ok(hr == S_OK, "Failed to unlock buffer, hr %#x.\n", hr); -- 2.25.1

1 4

[PATCH 1/2] comctl32/imagelist: Implement IImageList::GetItemFlags().
by Nikolay Sivov March 19, 2020

March 19, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/imagelist.c | 67 ++++++++++++--------------------- dlls/comctl32/tests/imagelist.c | 26 ++++++++++++- include/commoncontrols.idl | 3 +- 3 files changed, 51 insertions(+), 45 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 14a17c2717..237719cf7d 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -76,7 +76,7 @@ struct _IMAGELIST HBRUSH hbrBlend50; INT cInitial; UINT uBitsPixel; - char *has_alpha; + DWORD *item_flags; BOOL color_table_set; LONG ref; /* reference count */ @@ -217,7 +217,7 @@ static void add_dib_bits( HIMAGELIST himl, int pos, int count, int width, int he if (has_alpha) { - himl->has_alpha[pos + n] = 1; + himl->item_flags[pos + n] = ILIF_ALPHA; if (mask_info && himl->hbmMask) /* generate the mask from the alpha channel */ { @@ -251,7 +251,7 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, if (!GetObjectW( hbmImage, sizeof(bm), &bm )) return FALSE; /* if either the imagelist or the source bitmap don't have an alpha channel, bail out now */ - if (!himl->has_alpha) return FALSE; + if ((himl->flags & 0xfe) != ILC_COLOR32) return FALSE; if (bm.bmBitsPixel != 32) return FALSE; SelectObject( hdc, hbmImage ); @@ -368,17 +368,8 @@ IMAGELIST_InternalExpandBitmaps(HIMAGELIST himl, INT nImageCount) himl->hbmMask = hbmNewBitmap; } - if (himl->has_alpha) - { - char *new_alpha = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, himl->has_alpha, nNewCount ); - if (new_alpha) himl->has_alpha = new_alpha; - else - { - heap_free( himl->has_alpha ); - himl->has_alpha = NULL; - } - } - + himl->item_flags = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, himl->item_flags, + nNewCount * sizeof(*himl->item_flags)); himl->cMaxImage = nNewCount; DeleteDC (hdcBitmap); @@ -844,10 +835,7 @@ ImageList_Create (INT cx, INT cy, UINT flags, else himl->hbmMask = 0; - if (ilc == ILC_COLOR32) - himl->has_alpha = heap_alloc_zero( himl->cMaxImage ); - else - himl->has_alpha = NULL; + himl->item_flags = heap_alloc_zero( himl->cMaxImage * sizeof(*himl->item_flags) ); /* create blending brushes */ hbmTemp = CreateBitmap (8, 8, 1, 1, aBitBlend25); @@ -1433,7 +1421,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) oldImageFg = SetTextColor( hImageDC, RGB( 0, 0, 0 ) ); oldImageBk = SetBkColor( hImageDC, RGB( 0xff, 0xff, 0xff ) ); - has_alpha = (himl->has_alpha && himl->has_alpha[pimldp->i]); + has_alpha = himl->item_flags[pimldp->i] & ILIF_ALPHA; if (!bMask && (has_alpha || (fState & ILS_ALPHA) || (fState & ILS_SATURATE))) { COLORREF colour, blend_col = CLR_NONE; @@ -1632,8 +1620,7 @@ ImageList_Duplicate (HIMAGELIST himlSrc) himlSrc->hdcMask, 0, 0, SRCCOPY); himlDst->cCurImage = himlSrc->cCurImage; - if (himlSrc->has_alpha && himlDst->has_alpha) - memcpy( himlDst->has_alpha, himlSrc->has_alpha, himlDst->cCurImage ); + memcpy( himlDst->item_flags, himlSrc->item_flags, himlDst->cCurImage * sizeof(*himlDst->item_flags) ); } return himlDst; } @@ -2300,7 +2287,7 @@ HIMAGELIST WINAPI ImageList_Read(IStream *pstm) } else mask_info = NULL; - if (himl->has_alpha && image_info->bmiHeader.biBitCount == 32) + if ((himl->flags & 0xfe) == ILC_COLOR32 && image_info->bmiHeader.biBitCount == 32) { DWORD *ptr = image_bits; BYTE *mask_ptr = mask_bits; @@ -2396,11 +2383,8 @@ ImageList_Remove (HIMAGELIST himl, INT i) for (nCount = 0; nCount < MAX_OVERLAYIMAGE; nCount++) himl->nOvlIdx[nCount] = -1; - if (himl->has_alpha) - { - heap_free( himl->has_alpha ); - himl->has_alpha = heap_alloc_zero( himl->cMaxImage ); - } + heap_free( himl->item_flags ); + himl->item_flags = heap_alloc_zero( himl->cMaxImage * sizeof(*himl->item_flags) ); hbmNewImage = ImageList_CreateImage(himl->hdcImage, himl, himl->cMaxImage); SelectObject (himl->hdcImage, hbmNewImage); @@ -2615,7 +2599,7 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon) himl->cCurImage++; } - if (himl->has_alpha && GetIconInfo (hBestFitIcon, &ii)) + if ((himl->flags & 0xfe) == ILC_COLOR32 && GetIconInfo (hBestFitIcon, &ii)) { HDC hdcImage = CreateCompatibleDC( 0 ); GetObjectW (ii.hbmMask, sizeof(BITMAP), &bmp); @@ -2940,16 +2924,8 @@ ImageList_SetImageCount (HIMAGELIST himl, UINT iImageCount) DeleteDC (hdcBitmap); - if (himl->has_alpha) - { - char *new_alpha = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, himl->has_alpha, nNewCount ); - if (new_alpha) himl->has_alpha = new_alpha; - else - { - heap_free( himl->has_alpha ); - himl->has_alpha = NULL; - } - } + himl->item_flags = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, himl->item_flags, + nNewCount * sizeof(*himl->item_flags)); /* Update max image count and current image count */ himl->cMaxImage = nNewCount; @@ -3292,7 +3268,7 @@ static ULONG WINAPI ImageListImpl_Release(IImageList2 *iface) if (This->hbrBlend50) DeleteObject (This->hbrBlend50); This->IImageList2_iface.lpVtbl = NULL; - heap_free(This->has_alpha); + heap_free(This->item_flags); heap_free(This); } @@ -3626,11 +3602,16 @@ static HRESULT WINAPI ImageListImpl_GetDragImage(IImageList2 *iface, POINT *ppt, return ret; } -static HRESULT WINAPI ImageListImpl_GetItemFlags(IImageList2 *iface, int i, - DWORD *dwFlags) +static HRESULT WINAPI ImageListImpl_GetItemFlags(IImageList2 *iface, int i, DWORD *flags) { - FIXME("STUB: %p %d %p\n", iface, i, dwFlags); - return E_NOTIMPL; + HIMAGELIST This = impl_from_IImageList2(iface); + + if (i < 0 || i >= This->cCurImage) + return E_INVALIDARG; + + *flags = This->item_flags[i]; + + return S_OK; } static HRESULT WINAPI ImageListImpl_GetOverlayImage(IImageList2 *iface, int iOverlay, diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 984ca053c8..427ce1a84c 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1502,6 +1502,9 @@ static void test_ImageList_DrawIndirect(void) UINT32 *bits = 0; UINT32 maskBits = 0x00000000, inverseMaskBits = 0xFFFFFFFF; int bpp, broken_value; + IImageList *imgl; + DWORD flags; + HRESULT hr; BITMAPINFO bitmapInfo = {{sizeof(BITMAPINFOHEADER), 2, 1, 1, 32, BI_RGB, 0, 0, 0, 0, 0}}; @@ -1524,6 +1527,9 @@ static void test_ImageList_DrawIndirect(void) ok(himl != 0, "ImageList_Create failed\n"); if(!himl) goto cleanup; + hr = pHIMAGELIST_QueryInterface(himl, &IID_IImageList, (void **) &imgl); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + /* Add a no-alpha image */ hbmImage = create_test_bitmap(hdcDst, 2, 1, 32, bits_image); if(!hbmImage) goto cleanup; @@ -1532,6 +1538,16 @@ static void test_ImageList_DrawIndirect(void) ok(iImage != -1, "ImageList_Add failed\n"); if(iImage == -1) goto cleanup; + hr = IImageList_GetItemFlags(imgl, 1000, &flags); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IImageList_GetItemFlags(imgl, 1000, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IImageList_GetItemFlags(imgl, iImage, &flags); + ok(hr == S_OK, "Failed to get item flags, hr %#x.\n", hr); + ok(!flags, "Unexpected flags %#x.\n", flags); + /* Add an alpha image */ hbmAlphaImage = create_test_bitmap(hdcDst, 2, 1, 32, bits_alpha); if(!hbmAlphaImage) goto cleanup; @@ -1540,6 +1556,10 @@ static void test_ImageList_DrawIndirect(void) ok(iAlphaImage != -1, "ImageList_Add failed\n"); if(iAlphaImage == -1) goto cleanup; + hr = IImageList_GetItemFlags(imgl, iAlphaImage, &flags); + ok(hr == S_OK, "Failed to get item flags, hr %#x.\n", hr); + ok(flags & ILIF_ALPHA, "Unexpected flags %#x.\n", flags); + /* Add a transparent alpha image */ hbmTransparentImage = create_test_bitmap(hdcDst, 2, 1, 32, bits_transparent); if(!hbmTransparentImage) goto cleanup; @@ -1548,6 +1568,10 @@ static void test_ImageList_DrawIndirect(void) ok(iTransparentImage != -1, "ImageList_Add failed\n"); if(iTransparentImage == -1) goto cleanup; + hr = IImageList_GetItemFlags(imgl, iTransparentImage, &flags); + ok(hr == S_OK, "Failed to get item flags, hr %#x.\n", hr); + ok(flags & ILIF_ALPHA, "Unexpected flags %#x.\n", flags); + /* 32-bit Tests */ bitmapInfo.bmiHeader.biBitCount = 32; hbmDst = CreateDIBSection(hdcDst, &bitmapInfo, DIB_RGB_COLORS, (void**)&bits, NULL, 0); @@ -1713,7 +1737,7 @@ static void test_iimagelist(void) if (!himl) return; - hr = (pHIMAGELIST_QueryInterface)(himl, &IID_IImageList, (void **) &imgl); + hr = pHIMAGELIST_QueryInterface(himl, &IID_IImageList, (void **) &imgl); ok(SUCCEEDED(hr), "HIMAGELIST_QueryInterface failed, hr=%x\n", hr); if (hr == S_OK) diff --git a/include/commoncontrols.idl b/include/commoncontrols.idl index 8cfcb56309..407274994e 100644 --- a/include/commoncontrols.idl +++ b/include/commoncontrols.idl @@ -63,7 +63,8 @@ cpp_quote("#endif") cpp_quote("HRESULT WINAPI ImageList_CoCreateInstance(REFCLSID,const IUnknown *, REFIID,void **);") -const UINT ILIF_ALPHA = 1; +cpp_quote("#define ILIF_ALPHA 0x00000001") +cpp_quote("#define ILIF_LOWQUALITY 0x00000002") [ uuid(46eb5926-582e-4017-9fdf-e8998daa0950), -- 2.25.1

1 1

[PATCH 5/5] d3d9: Report d3d9 adapter ordinal in d3d9_device_GetCreationParameters().
by Zhiyi Zhang March 19, 2020

March 19, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d9/device.c | 1 + dlls/d3d9/tests/device.c | 51 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 4ac38c0e89..61cb505d77 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -778,6 +778,7 @@ static HRESULT WINAPI d3d9_device_GetCreationParameters(IDirect3DDevice9Ex *ifac (struct wined3d_device_creation_parameters *)parameters); wined3d_mutex_unlock(); + parameters->AdapterOrdinal = device->adapter_ordinal; return D3D_OK; } diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 16f42216cf..9943ec6791 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -13610,6 +13610,56 @@ static void test_shader_validator(void) todo_wine ok(!refcount, "Validator has %u references left.\n", refcount); } +static void test_creation_parameters(void) +{ + unsigned int adapter_idx, adapter_count; + D3DDEVICE_CREATION_PARAMETERS params; + struct device_desc device_desc; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + HWND window; + HRESULT hr; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + device_desc.device_window = window; + device_desc.width = 640; + device_desc.height = 480; + device_desc.flags = 0; + + adapter_count = IDirect3D9_GetAdapterCount(d3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + device_desc.adapter_ordinal = adapter_idx; + if (!(device = create_device(d3d, window, &device_desc))) + { + skip("Adapter %u: Failed to create a D3D device.\n", adapter_idx); + break; + } + + memset(&params, 0, sizeof(params)); + hr = IDirect3DDevice9_GetCreationParameters(device, &params); + ok(hr == D3D_OK, "Adapter %u: GetCreationParameters failed, hr %#x.\n", adapter_idx, hr); + ok(params.AdapterOrdinal == adapter_idx, "Adapter %u: Got unexpected adapter ordinal %u.\n", + adapter_idx, params.AdapterOrdinal); + ok(params.DeviceType == D3DDEVTYPE_HAL, "Adapter %u: Expect device type %#x, got %#x.\n", + adapter_idx, D3DDEVTYPE_HAL, params.DeviceType); + ok(params.hFocusWindow == window, "Adapter %u: Expect focus window %p, got %p.\n", + adapter_idx, window, params.hFocusWindow); + ok(params.BehaviorFlags == D3DCREATE_HARDWARE_VERTEXPROCESSING, + "Adapter %u: Expect behavior flags %#lx, got %#x.\n", adapter_idx, + D3DCREATE_HARDWARE_VERTEXPROCESSING, params.BehaviorFlags); + + IDirect3DDevice9_Release(device); + } + + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d9_handle = GetModuleHandleA("d3d9.dll"); @@ -13742,6 +13792,7 @@ START_TEST(device) test_get_display_mode(); test_multi_adapter(); test_shader_validator(); + test_creation_parameters(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); } -- 2.20.1

2 1

[PATCH] shell32/tests: Don't use randomized paths in the shlexec test.
by Francois Gouget March 19, 2020

March 19, 2020

In case of a failure it is necessary to show the path that was passed to ShellExecute(). That means the paths must not be randomized so as not to prevent the TestBot from detecting new failures. Note that because of the registry modifications one cannot run two instances of the test concurrently anyway. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- As a side effect this drops the ".tmp" extension but I don't think that makes a difference. dlls/shell32/tests/shlexec.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index eec1a63d383..f6f384bbe00 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2693,7 +2693,13 @@ static void init_test(void) strcpy(filename, "c:\\"); else GetTempPathA(sizeof(filename), filename); - GetTempFileNameA(filename, "wt", 0, tmpdir); + + /* In case of a failure it is necessary to show the path that was passed to + * ShellExecute(). That means the paths must not be randomized so as not to + * prevent the TestBot from detecting new failures. + */ + strcpy(tmpdir, filename); + strcat(tmpdir, "\\wtShlexecDir"); GetLongPathNameA(tmpdir, tmpdir, sizeof(tmpdir)); DeleteFileA( tmpdir ); rc = CreateDirectoryA( tmpdir, NULL ); @@ -2701,8 +2707,8 @@ static void init_test(void) /* Set %TMPDIR% for the tests */ SetEnvironmentVariableA("TMPDIR", tmpdir); - rc = GetTempFileNameA(tmpdir, "wt", 0, child_file); - ok(rc != 0, "got %d\n", rc); + strcpy(child_file, tmpdir); + strcat(child_file, "\\wtShlexecFile"); init_event(child_file); /* Set up the test files */ -- 2.20.1

2 1

[PATCH] tools: Only update protocol version if something changed.
by Rémi Bernon March 19, 2020

March 19, 2020

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- As the patches sent should not include the generated bits I'm calling make_requests from my local makefiles. The protocol version then gets updated although most of the time nothing changed and it makes ccache less efficient on sources that include server_protocol.h. tools/make_requests | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/tools/make_requests b/tools/make_requests index 8c5ada0f212..35001b80dab 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -406,10 +406,23 @@ print SERVER_PROT " struct reply_header reply_header;\n"; foreach my $req (@requests) { print SERVER_PROT " struct ${req}_reply ${req}_reply;\n"; } print SERVER_PROT "};\n\n"; -printf SERVER_PROT "#define SERVER_PROTOCOL_VERSION %d\n\n", $protocol + 1; +print SERVER_PROT "/* ### protocol_version begin ### */\n\n"; +printf SERVER_PROT "#define SERVER_PROTOCOL_VERSION %d\n\n", $protocol; +print SERVER_PROT "/* ### protocol_version end ### */\n\n"; print SERVER_PROT "#endif /* __WINE_WINE_SERVER_PROTOCOL_H */\n"; close SERVER_PROT; -update_file( "include/wine/server_protocol.h" ); + +if (update_file( "include/wine/server_protocol.h" )) +{ + my @version_lines = (); + + push @version_lines, sprintf( "#define SERVER_PROTOCOL_VERSION %d\n", $protocol + 1 ); + + replace_in_file( "include/wine/server_protocol.h", + "### protocol_version begin ###", + "### protocol_version end ###", + @version_lines ); +} ### Output the dumping function tables -- 2.26.0.rc2

1 0