November 2016 - Wine-commits

Józef Kucia : wined3d: Add support for WINED3DFMT_R16G16B16A16_SNORM format.
by Alexandre Julliard 15 Nov '16

15 Nov '16

Module: wine Branch: master Commit: 2015cbf955210cfb898fc942137451314f6d19a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2015cbf955210cfb898fc9421… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 14 17:31:22 2016 +0100 wined3d: Add support for WINED3DFMT_R16G16B16A16_SNORM format. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0d90ad3..6d23388 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1480,6 +1480,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_BUMPMAP, EXT_TEXTURE_SNORM, NULL}, + {WINED3DFMT_R16G16B16A16_SNORM, GL_RGBA16_SNORM, GL_RGBA16_SNORM, 0, + GL_RGBA, GL_SHORT, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_RENDERTARGET, + EXT_TEXTURE_SNORM, NULL}, {WINED3DFMT_R16_SNORM, GL_R16_SNORM, GL_R16_SNORM, 0, GL_RED, GL_SHORT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING

1 0

Stefan Dösinger : ddraw: Use wined3d_device_process_vertices for execute buffers.
by Alexandre Julliard 15 Nov '16

15 Nov '16

Module: wine Branch: master Commit: 0d91d86bbab13b42bd39f142548fe8e0280fe0cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d91d86bbab13b42bd39f1425… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Nov 13 15:12:44 2016 -0600 ddraw: Use wined3d_device_process_vertices for execute buffers. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 4 +- dlls/ddraw/executebuffer.c | 172 ++++++++++++++++----------------------------- 2 files changed, 60 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0d91d86bbab13b42bd39f…

1 0

Stefan Dösinger : ddraw: Avoid redundant index buffer discards.
by Alexandre Julliard 15 Nov '16

15 Nov '16

Module: wine Branch: master Commit: 72eab6f214a0f2c24bb9c30e54ac9e034c403713 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72eab6f214a0f2c24bb9c30e5… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Nov 13 15:12:45 2016 -0600 ddraw: Avoid redundant index buffer discards. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/executebuffer.c | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 721415c..2f8737b 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -523,7 +523,7 @@ struct d3d_execute_buffer D3DEXECUTEDATA data; /* This buffer will store the transformed vertices */ - unsigned int index_size; + unsigned int index_size, index_pos; unsigned int vertex_size; struct wined3d_buffer *src_vertex_buffer, *dst_vertex_buffer, *index_buffer; diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 1603e70..3ed18f1 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -96,6 +96,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, case D3DOP_TRIANGLE: { WORD *indices; + unsigned int index_pos = buffer->index_pos; TRACE("TRIANGLE (%d)\n", count); if (!count) @@ -116,12 +117,17 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, if (buffer->index_buffer) wined3d_buffer_decref(buffer->index_buffer); buffer->index_buffer = new_buffer; + index_pos = 0; + } + else if (buffer->index_size - count * 3 < index_pos) + { + index_pos = 0; } - box.left = 0; - box.right = count * 3 * sizeof(*indices); + box.left = index_pos * sizeof(*indices); + box.right = (index_pos + count * 3) * sizeof(*indices); hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->index_buffer), 0, - &map_desc, &box, WINED3D_MAP_DISCARD); + &map_desc, &box, index_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); if (FAILED(hr)) return hr; indices = map_desc.data; @@ -165,8 +171,11 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, ddraw_find_decl(device->ddraw, D3DFVF_TLVERTEX)); wined3d_device_set_index_buffer(device->wined3d_device, buffer->index_buffer, WINED3DFMT_R16_UINT, 0); wined3d_device_set_primitive_type(device->wined3d_device, WINED3D_PT_TRIANGLELIST); - wined3d_device_draw_indexed_primitive(device->wined3d_device, 0, count * 3); - } break; + wined3d_device_draw_indexed_primitive(device->wined3d_device, index_pos, count * 3); + + buffer->index_pos = index_pos + count * 3; + break; + } case D3DOP_MATRIXLOAD: WARN("MATRIXLOAD-s (%d)\n", count);

1 0

Stefan Dösinger : ddraw: Avoid redundant src vertex buffer discards.
by Alexandre Julliard 15 Nov '16

15 Nov '16

Module: wine Branch: master Commit: 15fc10a728c58bb407d2fca2c2829940f75aa41c URL: http://source.winehq.org/git/wine.git/?a=commit;h=15fc10a728c58bb407d2fca2c… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Nov 13 15:12:46 2016 -0600 ddraw: Avoid redundant src vertex buffer discards. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/executebuffer.c | 23 ++++++++++++++++------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 2f8737b..fe4603b 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -524,7 +524,7 @@ struct d3d_execute_buffer /* This buffer will store the transformed vertices */ unsigned int index_size, index_pos; - unsigned int vertex_size; + unsigned int vertex_size, src_vertex_pos; struct wined3d_buffer *src_vertex_buffer, *dst_vertex_buffer, *index_buffer; /* This flags is set to TRUE if we allocated ourselves the diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 3ed18f1..44751b9 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -285,7 +285,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, case D3DPROCESSVERTICES_TRANSFORMLIGHT: case D3DPROCESSVERTICES_TRANSFORM: wined3d_device_set_stream_source(device->wined3d_device, 0, - buffer->src_vertex_buffer, 0, sizeof(D3DVERTEX)); + buffer->src_vertex_buffer, buffer->src_vertex_pos, sizeof(D3DVERTEX)); if (op == D3DPROCESSVERTICES_TRANSFORMLIGHT) { wined3d_device_set_vertex_declaration(device->wined3d_device, @@ -306,8 +306,8 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, break; case D3DPROCESSVERTICES_COPY: - box.left = ci->wStart * sizeof(D3DTLVERTEX); - box.right = (ci->wStart + ci->dwCount) * sizeof(D3DTLVERTEX); + box.left = (buffer->src_vertex_pos + ci->wStart) * sizeof(D3DTLVERTEX); + box.right = box.left + ci->dwCount * sizeof(D3DTLVERTEX); box.top = box.front = 0; box.bottom = box.back = 1; wined3d_device_copy_sub_resource_region(device->wined3d_device, @@ -559,6 +559,9 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * TRACE("iface %p, data %p.\n", iface, data); + /* Skip past previous vertex data. */ + buffer->src_vertex_pos += buffer->data.dwVertexCount; + if (buffer->vertex_size < data->dwVertexCount) { unsigned int new_size = max(data->dwVertexCount, buffer->vertex_size * 2); @@ -587,18 +590,24 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * buffer->src_vertex_buffer = src_buffer; buffer->dst_vertex_buffer = dst_buffer; buffer->vertex_size = new_size; + buffer->src_vertex_pos = 0; + } + else if (buffer->vertex_size - data->dwVertexCount < buffer->src_vertex_pos) + { + buffer->src_vertex_pos = 0; } if (data->dwVertexCount) { - box.left = 0; - box.right = data->dwVertexCount * sizeof(D3DVERTEX); + box.left = buffer->src_vertex_pos * sizeof(D3DVERTEX); + box.right = box.left + data->dwVertexCount * sizeof(D3DVERTEX); hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->src_vertex_buffer), 0, - &map_desc, &box, WINED3D_MAP_DISCARD); + &map_desc, &box, buffer->src_vertex_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); if (FAILED(hr)) return hr; - memcpy(map_desc.data, ((BYTE *)buffer->desc.lpData) + data->dwVertexOffset, box.right); + memcpy(map_desc.data, ((BYTE *)buffer->desc.lpData) + data->dwVertexOffset, + data->dwVertexCount * sizeof(D3DVERTEX)); wined3d_resource_unmap(wined3d_buffer_get_resource(buffer->src_vertex_buffer), 0); }

1 0

Stefan Dösinger : ddraw: Implement executebuffer point and line draws.
by Alexandre Julliard 15 Nov '16

15 Nov '16

Module: wine Branch: master Commit: 59c4d8581d3fe576f86f03a2532a0cf975abeebb URL: http://source.winehq.org/git/wine.git/?a=commit;h=59c4d8581d3fe576f86f03a25… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Nov 13 15:12:47 2016 -0600 ddraw: Implement executebuffer point and line draws. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/executebuffer.c | 70 +++++++++++++++++++++++++++++++--------------- 1 file changed, 48 insertions(+), 22 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 44751b9..09226cd 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -53,7 +53,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, { DWORD is = buffer->data.dwInstructionOffset; char *instr = (char *)buffer->desc.lpData + is; - unsigned int i; + unsigned int i, primitive_size; struct wined3d_map_desc map_desc; struct wined3d_box box = {0}; HRESULT hr; @@ -81,31 +81,51 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, count = current->wCount; size = current->bSize; instr += sizeof(D3DINSTRUCTION); - - switch (current->bOpcode) { - case D3DOP_POINT: { - WARN("POINT-s (%d)\n", count); - instr += count * size; - } break; + primitive_size = 0; - case D3DOP_LINE: { - WARN("LINE-s (%d)\n", count); - instr += count * size; - } break; + switch (current->bOpcode) + { + case D3DOP_POINT: + { + const D3DPOINT *p = (D3DPOINT *)instr; + wined3d_device_set_primitive_type(device->wined3d_device, WINED3D_PT_POINTLIST); + wined3d_device_set_stream_source(device->wined3d_device, 0, + buffer->dst_vertex_buffer, 0, sizeof(D3DTLVERTEX)); + wined3d_device_set_vertex_declaration(device->wined3d_device, + ddraw_find_decl(device->ddraw, D3DFVF_TLVERTEX)); + for (i = 0; i < count; ++i) + wined3d_device_draw_primitive(device->wined3d_device, p[i].wFirst, p[i].wCount); + + instr += sizeof(*p) * count; + break; + } + + case D3DOP_LINE: + primitive_size = 2; + wined3d_device_set_primitive_type(device->wined3d_device, WINED3D_PT_LINELIST); + /* Drop through. */ case D3DOP_TRIANGLE: { WORD *indices; - unsigned int index_pos = buffer->index_pos; + unsigned int index_pos = buffer->index_pos, index_count; TRACE("TRIANGLE (%d)\n", count); if (!count) break; - if (buffer->index_size < count * 3) + if (!primitive_size) + { + wined3d_device_set_primitive_type(device->wined3d_device, WINED3D_PT_TRIANGLELIST); + primitive_size = 3; + } + + index_count = count * primitive_size; + + if (buffer->index_size < index_count) { struct wined3d_buffer *new_buffer; - unsigned int new_size = max(buffer->index_size * 2, count * 3); + unsigned int new_size = max(buffer->index_size * 2, index_count); hr = wined3d_buffer_create_ib(device->wined3d_device, new_size * sizeof(*indices), WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, WINED3D_POOL_DEFAULT, @@ -119,13 +139,13 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, buffer->index_buffer = new_buffer; index_pos = 0; } - else if (buffer->index_size - count * 3 < index_pos) + else if (buffer->index_size - index_count < index_pos) { index_pos = 0; } box.left = index_pos * sizeof(*indices); - box.right = (index_pos + count * 3) * sizeof(*indices); + box.right = (index_pos + index_count) * sizeof(*indices); hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->index_buffer), 0, &map_desc, &box, index_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); if (FAILED(hr)) @@ -157,9 +177,16 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, TRACE("STARTFLAT(%u) ", ci->wFlags); TRACE("\n"); } - indices[(i * 3) ] = ci->u1.v1; - indices[(i * 3) + 1] = ci->u2.v2; - indices[(i * 3) + 2] = ci->u3.v3; + + switch (primitive_size) + { + case 3: + indices[(i * primitive_size) + 2] = ci->u3.v3; + /* Drop through. */ + case 2: + indices[(i * primitive_size) + 1] = ci->u2.v2; + indices[(i * primitive_size) ] = ci->u1.v1; + } instr += size; } @@ -170,10 +197,9 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, wined3d_device_set_vertex_declaration(device->wined3d_device, ddraw_find_decl(device->ddraw, D3DFVF_TLVERTEX)); wined3d_device_set_index_buffer(device->wined3d_device, buffer->index_buffer, WINED3DFMT_R16_UINT, 0); - wined3d_device_set_primitive_type(device->wined3d_device, WINED3D_PT_TRIANGLELIST); - wined3d_device_draw_indexed_primitive(device->wined3d_device, index_pos, count * 3); + wined3d_device_draw_indexed_primitive(device->wined3d_device, index_pos, index_count); - buffer->index_pos = index_pos + count * 3; + buffer->index_pos = index_pos + index_count; break; }

1 0

Erich E. Hoover : user32/tests: Fix an inconsistent test case in clearing the clipboard.
by Alexandre Julliard 15 Nov '16

15 Nov '16

Module: wine Branch: master Commit: f9b878101e1c44588cea32f74ca74c0ad2c4b75c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9b878101e1c44588cea32f74… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Sat Nov 12 16:26:45 2016 -0700 user32/tests: Fix an inconsistent test case in clearing the clipboard. Depending on our clipboard polling we can get an additional clipboard update during the clipboard clear test. This change forces a consistent state when starting the test, which stops the additional window message from possibly occurring. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index b132dfe..45b5222 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14054,6 +14054,7 @@ static void test_clipboard_viewers(void) trace("clipbd viewers: hWnd1=%p, hWnd2=%p, hWnd3=%p\n", hWnd1, hWnd2, hWnd3); assert(hWnd1 && hWnd2 && hWnd3); + CountClipboardFormats(); /* Ensure that we do not have an X11 update to the clipboard */ flush_sequence(); /* Test getting the clipboard viewer and setting the viewer to NULL. */

1 0

Carlo Bramini : winhttp: Use return value of sprintf() instead of calling strlen() and simplify code.
by Alexandre Julliard 15 Nov '16

15 Nov '16

Module: wine Branch: master Commit: 613e23976e01d126b0c4dd1de5b83d70fd392a39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=613e23976e01d126b0c4dd1de… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Sat Nov 12 10:47:00 2016 +0100 winhttp: Use return value of sprintf() instead of calling strlen() and simplify code. Signed-off-by: Carlo Bramini <carlo_bramini(a)users.sourceforge.net> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/url.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 26969cd..e7bb2a5 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -400,8 +400,7 @@ static BOOL calc_length( URL_COMPONENTS *uc, DWORD flags, LPDWORD len ) { WCHAR port[sizeof("65535")]; - sprintfW( port, formatW, uc->nPort ); - *len += strlenW( port ); + *len += sprintfW( port, formatW, uc->nPort ); *len += 1; /* ":" */ } if (uc->lpszUrlPath && *uc->lpszUrlPath != '/') *len += 1; /* '/' */ @@ -497,15 +496,10 @@ BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDW if (!uses_default_port( scheme, uc->nPort )) { - WCHAR port[sizeof("65535")]; - - sprintfW( port, formatW, uc->nPort ); *url = ':'; url++; - len = strlenW( port ); - memcpy( url, port, len * sizeof(WCHAR) ); - url += len; + url += sprintfW( url, formatW, uc->nPort ); } /* add slash between hostname and path if necessary */

1 0

Donat Enikeev : crypt32/tests: Fix regression on Win7 with unprivileged run.
by Alexandre Julliard 15 Nov '16

15 Nov '16

Module: wine Branch: master Commit: 20ea59b1489d05625af363b6d32edf18c3eff7ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=20ea59b1489d05625af363b6d… Author: Donat Enikeev <donat(a)enikeev.net> Date: Tue Nov 15 00:18:26 2016 +0300 crypt32/tests: Fix regression on Win7 with unprivileged run. Signed-off-by: Donat Enikeev <donat(a)enikeev.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/store.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 03fc927..132a9da 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -415,7 +415,15 @@ static void testRegStoreSavedCerts(void) cert1 = CertCreateCertificateContext(X509_ASN_ENCODING, bigCert, sizeof(bigCert)); ok (cert1 != NULL, "Create cert context failed at %d, %x\n", i, GetLastError()); ret = CertAddCertificateContextToStore(store, cert1, CERT_STORE_ADD_REPLACE_EXISTING, NULL); - ok (ret, "Adding to the store failed at %d, %x\n", i, GetLastError()); + /* Addittional skip per Win7, it allows opening HKLM store, but disallows adding certs */ + err = GetLastError(); + if (!ret) + { + ok (err == ERROR_ACCESS_DENIED, "Failed to add certificate to store at %d (%08x)\n", i, err); + skip("Insufficient privileges for the test %d\n", i); + continue; + } + ok (ret, "Adding to the store failed at %d, %x\n", i, err); CertFreeCertificateContext(cert1); CertCloseStore(store, 0); @@ -1517,7 +1525,7 @@ static void testFileStore(void) if (!GetTempFileNameW(szDot, szPrefix, 0, filename)) return; - + DeleteFileW(filename); file = CreateFileW(filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); @@ -2430,12 +2438,12 @@ static void testAddSerialized(void) ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError()); /* With a bad context type */ - ret = CertAddSerializedElementToStore(store, buf, sizeof(buf), 0, 0, + ret = CertAddSerializedElementToStore(store, buf, sizeof(buf), 0, 0, CERT_STORE_CRL_CONTEXT_FLAG, NULL, NULL); ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError()); ret = CertAddSerializedElementToStore(store, buf, - sizeof(struct CertPropIDHeader) + sizeof(bigCert), 0, 0, + sizeof(struct CertPropIDHeader) + sizeof(bigCert), 0, 0, CERT_STORE_CRL_CONTEXT_FLAG, NULL, NULL); ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError()); @@ -2446,12 +2454,12 @@ static void testAddSerialized(void) "Expected E_INVALIDARG, got %08x\n", GetLastError()); /* Bad unknown field, good type */ hdr->unknown1 = 2; - ret = CertAddSerializedElementToStore(store, buf, sizeof(buf), 0, 0, + ret = CertAddSerializedElementToStore(store, buf, sizeof(buf), 0, 0, CERT_STORE_CERTIFICATE_CONTEXT_FLAG, NULL, NULL); ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND got %08x\n", GetLastError()); ret = CertAddSerializedElementToStore(store, buf, - sizeof(struct CertPropIDHeader) + sizeof(bigCert), 0, 0, + sizeof(struct CertPropIDHeader) + sizeof(bigCert), 0, 0, CERT_STORE_CERTIFICATE_CONTEXT_FLAG, NULL, NULL); ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND got %08x\n", GetLastError()); @@ -2463,11 +2471,11 @@ static void testAddSerialized(void) /* Most everything okay, but bad add disposition */ hdr->unknown1 = 1; /* This crashes - ret = CertAddSerializedElementToStore(store, buf, sizeof(buf), 0, 0, + ret = CertAddSerializedElementToStore(store, buf, sizeof(buf), 0, 0, CERT_STORE_CERTIFICATE_CONTEXT_FLAG, NULL, NULL); * as does this ret = CertAddSerializedElementToStore(store, buf, - sizeof(struct CertPropIDHeader) + sizeof(bigCert), 0, 0, + sizeof(struct CertPropIDHeader) + sizeof(bigCert), 0, 0, CERT_STORE_CERTIFICATE_CONTEXT_FLAG, NULL, NULL); */ /* Everything okay, but buffer's too big */

1 0

Nikolay Sivov : oledb32: Use growing array to store error records.
by Alexandre Julliard 15 Nov '16

15 Nov '16

Module: wine Branch: master Commit: 4a3054e445e86472a3e4b5d12a2718708c863df0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a3054e445e86472a3e4b5d12… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 15 20:26:47 2016 +0300 oledb32: Use growing array to store error records. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/errorinfo.c | 65 ++++++++++++++++++++++++++++---------------- dlls/oledb32/oledb_private.h | 5 ++++ 2 files changed, 47 insertions(+), 23 deletions(-) diff --git a/dlls/oledb32/errorinfo.c b/dlls/oledb32/errorinfo.c index 4a56b46..0875d82 100644 --- a/dlls/oledb32/errorinfo.c +++ b/dlls/oledb32/errorinfo.c @@ -40,7 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(oledb); struct ErrorEntry { - struct list entry; ERRORINFO info; DISPPARAMS dispparams; IUnknown *unknown; @@ -53,7 +52,9 @@ typedef struct ErrorInfoImpl IErrorRecords IErrorRecords_iface; LONG ref; - struct list errors; + struct ErrorEntry *records; + unsigned int allocated; + unsigned int count; } ErrorInfoImpl; static inline ErrorInfoImpl *impl_from_IErrorInfo( IErrorInfo *iface ) @@ -103,20 +104,19 @@ static ULONG WINAPI IErrorInfoImpl_Release(IErrorInfo* iface) { ErrorInfoImpl *This = impl_from_IErrorInfo(iface); ULONG ref = InterlockedDecrement(&This->ref); - struct ErrorEntry *cursor, *cursor2; TRACE("(%p)->%u\n",This,ref+1); if (!ref) { - LIST_FOR_EACH_ENTRY_SAFE(cursor, cursor2, &This->errors, struct ErrorEntry, entry) - { - list_remove(&cursor->entry); - if(cursor->unknown) - IUnknown_Release(cursor->unknown); + unsigned int i; - heap_free(cursor); + for (i = 0; i < This->count; i++) + { + if (This->records[i].unknown) + IUnknown_Release(This->records[i].unknown); } + heap_free(This->records); heap_free(This); } return ref; @@ -233,10 +233,27 @@ static HRESULT WINAPI errorrec_AddErrorRecord(IErrorRecords *iface, ERRORINFO *p if(!pErrorInfo) return E_INVALIDARG; - entry = heap_alloc(sizeof(*entry)); - if(!entry) - return E_OUTOFMEMORY; + if (!This->records) + { + const unsigned int initial_size = 16; + if (!(This->records = heap_alloc(initial_size * sizeof(*This->records)))) + return E_OUTOFMEMORY; + + This->allocated = initial_size; + } + else if (This->count == This->allocated) + { + struct ErrorEntry *new_ptr; + + new_ptr = heap_realloc(This->records, 2 * This->allocated * sizeof(*This->records)); + if (!new_ptr) + return E_OUTOFMEMORY; + + This->records = new_ptr; + This->allocated *= 2; + } + entry = This->records + This->count; entry->info = *pErrorInfo; if(pdispparams) entry->dispparams = *pdispparams; @@ -245,7 +262,7 @@ static HRESULT WINAPI errorrec_AddErrorRecord(IErrorRecords *iface, ERRORINFO *p IUnknown_AddRef(entry->unknown); entry->lookupID = dwDynamicErrorID; - list_add_head(&This->errors, &entry->entry); + This->count++; return S_OK; } @@ -260,7 +277,7 @@ static HRESULT WINAPI errorrec_GetBasicErrorInfo(IErrorRecords *iface, ULONG ulR if(!pErrorInfo) return E_INVALIDARG; - if(ulRecordNum > list_count(&This->errors)) + if(ulRecordNum > This->count) return DB_E_BADRECORDNUM; return E_NOTIMPL; @@ -278,7 +295,7 @@ static HRESULT WINAPI errorrec_GetCustomErrorObject(IErrorRecords *iface, ULONG *ppObject = NULL; - if(ulRecordNum > list_count(&This->errors)) + if(ulRecordNum > This->count) return DB_E_BADRECORDNUM; return E_NOTIMPL; @@ -294,7 +311,7 @@ static HRESULT WINAPI errorrec_GetErrorInfo(IErrorRecords *iface, ULONG ulRecord if (!ppErrorInfo) return E_INVALIDARG; - if(ulRecordNum > list_count(&This->errors)) + if(ulRecordNum > This->count) return DB_E_BADRECORDNUM; return E_NOTIMPL; @@ -310,24 +327,24 @@ static HRESULT WINAPI errorrec_GetErrorParameters(IErrorRecords *iface, ULONG ul if (!pdispparams) return E_INVALIDARG; - if(ulRecordNum > list_count(&This->errors)) + if(ulRecordNum > This->count) return DB_E_BADRECORDNUM; return E_NOTIMPL; } -static HRESULT WINAPI errorrec_GetRecordCount(IErrorRecords *iface, ULONG *records) +static HRESULT WINAPI errorrec_GetRecordCount(IErrorRecords *iface, ULONG *count) { ErrorInfoImpl *This = impl_from_IErrorRecords(iface); - TRACE("(%p)->(%p)\n", This, records); + TRACE("(%p)->(%p)\n", This, count); - if(!records) + if(!count) return E_INVALIDARG; - *records = list_count(&This->errors); + *count = This->count; - TRACE("<--(%d)\n", *records); + TRACE("<--(%u)\n", *count); return S_OK; } @@ -362,7 +379,9 @@ HRESULT create_error_info(IUnknown *outer, void **obj) This->IErrorRecords_iface.lpVtbl = &ErrorRecordsVtbl; This->ref = 1; - list_init(&This->errors); + This->records = NULL; + This->allocated = 0; + This->count = 0; *obj = &This->IErrorInfo_iface; diff --git a/dlls/oledb32/oledb_private.h b/dlls/oledb32/oledb_private.h index 1422b0b..8b1a40f 100644 --- a/dlls/oledb32/oledb_private.h +++ b/dlls/oledb32/oledb_private.h @@ -33,6 +33,11 @@ static inline void *heap_alloc_zero(size_t len) return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); } +static inline void *heap_realloc(void *mem, size_t len) +{ + return HeapReAlloc(GetProcessHeap(), 0, mem, len); +} + static inline void *heap_realloc_zero(void *mem, size_t len) { return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len);

1 0

Nikolay Sivov : oledb32: IErrorRecords uses 0-based index to access record info.
by Alexandre Julliard 15 Nov '16

15 Nov '16

Module: wine Branch: master Commit: 41984c62a608745e7fa149e949dd50da9a806afa URL: http://source.winehq.org/git/wine.git/?a=commit;h=41984c62a608745e7fa149e94… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 15 20:26:48 2016 +0300 oledb32: IErrorRecords uses 0-based index to access record info. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/errorinfo.c | 26 ++++++++++++-------------- dlls/oledb32/tests/database.c | 21 +++++++++++++++++++-- 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/dlls/oledb32/errorinfo.c b/dlls/oledb32/errorinfo.c index 0875d82..7a1eddf 100644 --- a/dlls/oledb32/errorinfo.c +++ b/dlls/oledb32/errorinfo.c @@ -267,67 +267,65 @@ static HRESULT WINAPI errorrec_AddErrorRecord(IErrorRecords *iface, ERRORINFO *p return S_OK; } -static HRESULT WINAPI errorrec_GetBasicErrorInfo(IErrorRecords *iface, ULONG ulRecordNum, - ERRORINFO *pErrorInfo) +static HRESULT WINAPI errorrec_GetBasicErrorInfo(IErrorRecords *iface, ULONG index, ERRORINFO *pErrorInfo) { ErrorInfoImpl *This = impl_from_IErrorRecords(iface); - FIXME("(%p)->(%d %p)\n", This, ulRecordNum, pErrorInfo); + FIXME("(%p)->(%u %p)\n", This, index, pErrorInfo); if(!pErrorInfo) return E_INVALIDARG; - if(ulRecordNum > This->count) + if (index >= This->count) return DB_E_BADRECORDNUM; return E_NOTIMPL; } -static HRESULT WINAPI errorrec_GetCustomErrorObject(IErrorRecords *iface, ULONG ulRecordNum, +static HRESULT WINAPI errorrec_GetCustomErrorObject(IErrorRecords *iface, ULONG index, REFIID riid, IUnknown **ppObject) { ErrorInfoImpl *This = impl_from_IErrorRecords(iface); - FIXME("(%p)->(%d %s, %p)\n", This, ulRecordNum, debugstr_guid(riid), ppObject); + FIXME("(%p)->(%u %s, %p)\n", This, index, debugstr_guid(riid), ppObject); if (!ppObject) return E_INVALIDARG; *ppObject = NULL; - if(ulRecordNum > This->count) + if (index >= This->count) return DB_E_BADRECORDNUM; return E_NOTIMPL; } -static HRESULT WINAPI errorrec_GetErrorInfo(IErrorRecords *iface, ULONG ulRecordNum, +static HRESULT WINAPI errorrec_GetErrorInfo(IErrorRecords *iface, ULONG index, LCID lcid, IErrorInfo **ppErrorInfo) { ErrorInfoImpl *This = impl_from_IErrorRecords(iface); - FIXME("(%p)->(%d %d, %p)\n", This, ulRecordNum, lcid, ppErrorInfo); + FIXME("(%p)->(%u %d, %p)\n", This, index, lcid, ppErrorInfo); if (!ppErrorInfo) return E_INVALIDARG; - if(ulRecordNum > This->count) + if (index >= This->count) return DB_E_BADRECORDNUM; return E_NOTIMPL; } -static HRESULT WINAPI errorrec_GetErrorParameters(IErrorRecords *iface, ULONG ulRecordNum, - DISPPARAMS *pdispparams) +static HRESULT WINAPI errorrec_GetErrorParameters(IErrorRecords *iface, ULONG index, DISPPARAMS *pdispparams) { ErrorInfoImpl *This = impl_from_IErrorRecords(iface); - FIXME("(%p)->(%d %p)\n", This, ulRecordNum, pdispparams); + FIXME("(%p)->(%u %p)\n", This, index, pdispparams); if (!pdispparams) return E_INVALIDARG; - if(ulRecordNum > This->count) + if (index >= This->count) return DB_E_BADRECORDNUM; return E_NOTIMPL; diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 217fb4a..68f9eac 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -318,9 +318,10 @@ static void test_errorinfo(void) { ICreateErrorInfo *createerror; ERRORINFO info, info2, info3; - IErrorInfo *errorinfo; + IErrorInfo *errorinfo, *errorinfo2; IErrorRecords *errrecs; - IUnknown *unk = NULL; + IUnknown *unk = NULL, *unk2; + DISPPARAMS dispparams; DWORD context; ULONG cnt = 0; HRESULT hr; @@ -381,6 +382,22 @@ static void test_errorinfo(void) hr = IUnknown_QueryInterface(unk, &IID_IErrorRecords, (void**)&errrecs); ok(hr == S_OK, "got %08x\n", hr); + hr = IErrorRecords_GetRecordCount(errrecs, &cnt); + ok(hr == S_OK, "got %08x\n", hr); + ok(cnt == 0, "Got unexpected record count %u\n", cnt); + + hr = IErrorRecords_GetBasicErrorInfo(errrecs, 0, &info3); + ok(hr == DB_E_BADRECORDNUM, "got %08x\n", hr); + + hr = IErrorRecords_GetCustomErrorObject(errrecs, 0, &IID_IUnknown, &unk2); + ok(hr == DB_E_BADRECORDNUM, "got %08x\n", hr); + + hr = IErrorRecords_GetErrorInfo(errrecs, 0, 0, &errorinfo2); + ok(hr == DB_E_BADRECORDNUM, "got %08x\n", hr); + + hr = IErrorRecords_GetErrorParameters(errrecs, 0, &dispparams); + ok(hr == DB_E_BADRECORDNUM, "got %08x\n", hr); + memset(&info, 0, sizeof(ERRORINFO)); info.dwMinor = 1; memset(&info2, 0, sizeof(ERRORINFO));

1 0