November 2016 - Wine-Commits

Aric Stewart : hidclass.sys: Handle POP and PUSH in device descriptors.
by Alexandre Julliard Nov. 15, 2016

Nov. 15, 2016

Module: wine Branch: master Commit: 3b3b7670ec0a7d3ba207d1588dac2e6d26b51236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b3b7670ec0a7d3ba207d1588… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Nov 14 08:29:20 2016 -0600 hidclass.sys: Handle POP and PUSH in device descriptors. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 50 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 45 insertions(+), 5 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 9a26f0f4..e1c48dd 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -172,6 +172,11 @@ struct collection { struct list collections; }; +struct caps_stack { + struct list entry; + struct caps caps; +}; + static const char* debugstr_usages(struct caps *caps) { if (!caps->IsRange) @@ -458,7 +463,10 @@ static void new_caps(struct caps *caps) caps->usage_count = 0; } -static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int length, unsigned int *feature_index, unsigned int *collection_index, struct collection *collection, struct caps *caps, struct list *features) +static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int length, + unsigned int *feature_index, unsigned int *collection_index, + struct collection *collection, struct caps *caps, + struct list *features, struct list *stack) { unsigned int i; for (i = index; i < length;) @@ -544,7 +552,7 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l parse_collection(bSize, itemVal, subcollection); - i = parse_descriptor(descriptor, i+1, length, feature_index, collection_index, subcollection, caps, features); + i = parse_descriptor(descriptor, i+1, length, feature_index, collection_index, subcollection, caps, features, stack); continue; } case TAG_MAIN_END_COLLECTION: @@ -588,11 +596,30 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l caps->ReportCount = getValue(bSize, itemVal); break; case TAG_GLOBAL_PUSH: - FIXME("Unhandled Push\n"); + { + struct caps_stack *saved = HeapAlloc(GetProcessHeap(), 0, sizeof(*saved)); + saved->caps = *caps; + TRACE("Push\n"); + list_add_tail(stack, &saved->entry); break; + } case TAG_GLOBAL_POP: - FIXME("Unhandled Pop\n"); + { + struct list *tail; + struct caps_stack *saved; + TRACE("Pop\n"); + tail = list_tail(stack); + if (tail) + { + saved = LIST_ENTRY(tail, struct caps_stack, entry); + *caps = saved->caps; + list_remove(tail); + HeapFree(GetProcessHeap(), 0, saved); + } + else + ERR("Pop but no stack!\n"); break; + } default: ERR("Unknown (bTag: 0x%x, bType: 0x%x)\n", bTag, bType); } @@ -1020,6 +1047,7 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) struct caps caps; struct list features; + struct list caps_stack; unsigned int feature_count = 0; unsigned int cidx; @@ -1037,6 +1065,7 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) } list_init(&features); + list_init(&caps_stack); base = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*base)); base->index = 1; @@ -1045,10 +1074,21 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) memset(&caps, 0, sizeof(caps)); cidx = 0; - parse_descriptor(descriptor, 0, length, &feature_count, &cidx, base, &caps, &features); + parse_descriptor(descriptor, 0, length, &feature_count, &cidx, base, &caps, &features, &caps_stack); debug_collection(base); + if (!list_empty(&caps_stack)) + { + struct caps_stack *entry, *cursor; + ERR("%i unpopped device caps on the stack\n", list_count(&caps_stack)); + LIST_FOR_EACH_ENTRY_SAFE(entry, cursor, &caps_stack, struct caps_stack, entry) + { + list_remove(&entry->entry); + HeapFree(GetProcessHeap(), 0, entry); + } + } + cidx = 2; if (feature_count) {

1 0

Aric Stewart : hidclass.sys: Handle descriptors with a usage count less than the report bits.
by Alexandre Julliard Nov. 15, 2016

Nov. 15, 2016

Module: wine Branch: master Commit: 437f7a372205e9218e279abed1f9ad85980c3d49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=437f7a372205e9218e279abed… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Nov 14 07:18:34 2016 -0600 hidclass.sys: Handle descriptors with a usage count less than the report bits. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index e1c48dd..9a80f68 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -752,7 +752,12 @@ static void build_elements(WINE_HID_REPORT *wine_report, struct feature* feature wine_element->caps.value.HasNull = feature->HasNull; wine_element->caps.value.BitSize = feature->caps.BitSize; if (feature->caps.usage_count > 1) - wine_element->caps.value.ReportCount = 1; + { + if (feature->caps.ReportCount > feature->caps.usage_count) + wine_element->caps.value.ReportCount = feature->caps.ReportCount / feature->caps.usage_count; + else + wine_element->caps.value.ReportCount = 1; + } else wine_element->caps.value.ReportCount = feature->caps.ReportCount; wine_element->bitCount = (feature->caps.BitSize * wine_element->caps.value.ReportCount);

1 0

Nikolay Sivov : oledb32: Implement GetCustomErrorObject().
by Alexandre Julliard Nov. 15, 2016

Nov. 15, 2016

Module: wine Branch: master Commit: 333039f318168a7c40c20d6357a4f69899146399 URL: http://source.winehq.org/git/wine.git/?a=commit;h=333039f318168a7c40c20d635… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 15 20:26:49 2016 +0300 oledb32: Implement GetCustomErrorObject(). 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 | 6 ++++++ 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/oledb32/errorinfo.c b/dlls/oledb32/errorinfo.c index 7a1eddf..48db723 100644 --- a/dlls/oledb32/errorinfo.c +++ b/dlls/oledb32/errorinfo.c @@ -42,7 +42,7 @@ struct ErrorEntry { ERRORINFO info; DISPPARAMS dispparams; - IUnknown *unknown; + IUnknown *custom_error; DWORD lookupID; }; @@ -113,8 +113,8 @@ static ULONG WINAPI IErrorInfoImpl_Release(IErrorInfo* iface) for (i = 0; i < This->count; i++) { - if (This->records[i].unknown) - IUnknown_Release(This->records[i].unknown); + if (This->records[i].custom_error) + IUnknown_Release(This->records[i].custom_error); } heap_free(This->records); heap_free(This); @@ -257,9 +257,9 @@ static HRESULT WINAPI errorrec_AddErrorRecord(IErrorRecords *iface, ERRORINFO *p entry->info = *pErrorInfo; if(pdispparams) entry->dispparams = *pdispparams; - entry->unknown = punkCustomError; - if(entry->unknown) - IUnknown_AddRef(entry->unknown); + entry->custom_error = punkCustomError; + if (entry->custom_error) + IUnknown_AddRef(entry->custom_error); entry->lookupID = dwDynamicErrorID; This->count++; @@ -283,21 +283,25 @@ static HRESULT WINAPI errorrec_GetBasicErrorInfo(IErrorRecords *iface, ULONG ind } static HRESULT WINAPI errorrec_GetCustomErrorObject(IErrorRecords *iface, ULONG index, - REFIID riid, IUnknown **ppObject) + REFIID riid, IUnknown **object) { ErrorInfoImpl *This = impl_from_IErrorRecords(iface); - FIXME("(%p)->(%u %s, %p)\n", This, index, debugstr_guid(riid), ppObject); + TRACE("(%p)->(%u %s %p)\n", This, index, debugstr_guid(riid), object); - if (!ppObject) + if (!object) return E_INVALIDARG; - *ppObject = NULL; + *object = NULL; if (index >= This->count) return DB_E_BADRECORDNUM; - return E_NOTIMPL; + index = This->count - index - 1; + if (This->records[index].custom_error) + return IUnknown_QueryInterface(This->records[index].custom_error, riid, (void **)object); + else + return S_OK; } static HRESULT WINAPI errorrec_GetErrorInfo(IErrorRecords *iface, ULONG index, diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 68f9eac..980dacd 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -414,6 +414,12 @@ static void test_errorinfo(void) ok(hr == S_OK, "got %08x\n", hr); ok(cnt == 1, "expected 1 got %d\n", cnt); + /* Record does not contain custom error object. */ + unk2 = (void*)0xdeadbeef; + hr = IErrorRecords_GetCustomErrorObject(errrecs, 0, &IID_IUnknown, &unk2); + ok(hr == S_OK, "got %08x\n", hr); + ok(unk2 == NULL, "Got custom object %p.\n", unk2); + hr = IErrorRecords_AddErrorRecord(errrecs, &info2, 2, NULL, NULL, 0); ok(hr == S_OK, "got %08x\n", hr);

1 0

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

Nov. 15, 2016

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

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

Nov. 15, 2016

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

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

Nov. 15, 2016

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

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

Nov. 15, 2016

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: Use wined3d_device_process_vertices for execute buffers.
by Alexandre Julliard Nov. 15, 2016

Nov. 15, 2016

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

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

Nov. 15, 2016

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

Józef Kucia : wined3d: Add support for WINED3DFMT_R8_SNORM format.
by Alexandre Julliard Nov. 15, 2016

Nov. 15, 2016

Module: wine Branch: master Commit: c859158d649d500c8b21d2550ee84c7d2d9283ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=c859158d649d500c8b21d2550… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 14 17:31:21 2016 +0100 wined3d: Add support for WINED3DFMT_R8_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 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 5530aad..0d90ad3 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -252,6 +252,7 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_R16_FLOAT, WINED3DFMT_R16_TYPELESS, "F"}, {WINED3DFMT_D16_UNORM, WINED3DFMT_R16_TYPELESS, "D"}, {WINED3DFMT_R8_UNORM, WINED3DFMT_R8_TYPELESS, "u"}, + {WINED3DFMT_R8_SNORM, WINED3DFMT_R8_TYPELESS, "i"}, {WINED3DFMT_R8_UINT, WINED3DFMT_R8_TYPELESS, "U"}, {WINED3DFMT_R8_SINT, WINED3DFMT_R8_TYPELESS, "I"}, {WINED3DFMT_BC1_UNORM_SRGB, WINED3DFMT_BC1_TYPELESS, ""}, @@ -1484,6 +1485,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET, EXT_TEXTURE_SNORM, NULL}, + {WINED3DFMT_R8_SNORM, GL_R8_SNORM, GL_R8_SNORM, 0, + GL_RED, GL_BYTE, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_RENDERTARGET, + EXT_TEXTURE_SNORM, NULL}, /* Depth stencil formats */ {WINED3DFMT_D16_LOCKABLE, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0,

1 0