March 2017 - Wine-commits - list.winehq.org

Can Taşan : kernel32: Add Unicode character for Turkish lira.
by Alexandre Julliard 24 Mar '17

24 Mar '17

Module: wine Branch: master Commit: 42ed54b5d8e67aeb647d5a4fc8af7c8962285c7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=42ed54b5d8e67aeb647d5a4fc… Author: Can Taşan <betax34(a)hotmail.com> Date: Fri Mar 24 21:17:23 2017 +0100 kernel32: Add Unicode character for Turkish lira. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/trk.nls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/nls/trk.nls b/dlls/kernel32/nls/trk.nls index 3c50fe5..fad46a3 100644 --- a/dlls/kernel32/nls/trk.nls +++ b/dlls/kernel32/nls/trk.nls @@ -87,7 +87,7 @@ STRINGTABLE LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT LOCALE_SABBREVMONTHNAME12 "Ara" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Turkey" - LOCALE_SCURRENCY "TL" + LOCALE_SCURRENCY "₺" LOCALE_SDATE "." LOCALE_SDAYNAME1 "Pazartesi" LOCALE_SDAYNAME2 "Salı"

1 0

Piotr Caban : msvcrt: Add __ExceptionPtrCompare implementation.
by Alexandre Julliard 24 Mar '17

24 Mar '17

Module: wine Branch: master Commit: cf7f632b31965b1f8ff6a4a69369326c4f146492 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf7f632b31965b1f8ff6a4a69… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 24 12:45:14 2017 +0100 msvcrt: Add __ExceptionPtrCompare implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 4 ++-- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcrt/cpp.c | 5 +++++ 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index a587c66..ecf2b26 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1691,8 +1691,8 @@ @ cdecl -arch=win64 ?_Xruntime_error(a)std@@YAXPEBD(a)Z(str) _Xruntime_error @ stub -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z @ stub -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z -@ stub -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z -@ stub -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCompare@@YA_NPBX0(a)Z +@ cdecl -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCompare@@YA_NPEBX0(a)Z @ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCopy@@YAXPAXPBX(a)Z @ cdecl -arch=win64 ?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z @ cdecl -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z(ptr ptr ptr) msvcr120.?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 06dd749..4b54ab1 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -410,8 +410,8 @@ @ cdecl ?_Value(a)_SpinCount@details(a)Concurrency@@SAIXZ() SpinCount__Value @ stub -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z @ stub -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z -@ stub -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z -@ stub -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z(ptr ptr) __ExceptionPtrCompare +@ cdecl -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z(ptr ptr) __ExceptionPtrCompare @ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z(ptr ptr) __ExceptionPtrCopy @ cdecl -arch=win64 ?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z(ptr ptr) __ExceptionPtrCopy @ cdecl -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z(ptr ptr ptr) __ExceptionPtrCopyException diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index b9826cf..9526502 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -688,8 +688,8 @@ @ stub ?_Yield(a)_Context@details(a)Concurrency@@SAXXZ @ stub -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z @ stub -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z -@ stub -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z -@ stub -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z(ptr ptr) __ExceptionPtrCompare +@ cdecl -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z(ptr ptr) __ExceptionPtrCompare @ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z(ptr ptr) __ExceptionPtrCopy @ cdecl -arch=win64 ?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z(ptr ptr) __ExceptionPtrCopy @ cdecl -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z(ptr ptr ptr) __ExceptionPtrCopyException diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index d8b1e2a..4f9fbec 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -670,8 +670,8 @@ @ stub ?_Yield(a)_Context@details(a)Concurrency@@SAXXZ @ stub -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z @ stub -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z -@ stub -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z -@ stub -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z(ptr ptr) __ExceptionPtrCompare +@ cdecl -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z(ptr ptr) __ExceptionPtrCompare @ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z(ptr ptr) __ExceptionPtrCopy @ cdecl -arch=win64 ?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z(ptr ptr) __ExceptionPtrCopy @ cdecl -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z(ptr ptr ptr) __ExceptionPtrCopyException diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index b01f469..313d37c 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -666,8 +666,8 @@ @ stub ?_Yield(a)_Context@details(a)Concurrency@@SAXXZ @ stub -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z @ stub -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z -@ stub -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z -@ stub -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCompare@@YA_NPBX0(a)Z +@ cdecl -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCompare@@YA_NPEBX0(a)Z @ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCopy@@YAXPAXPBX(a)Z @ cdecl -arch=win64 ?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z @ cdecl -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z(ptr ptr ptr) msvcr120.?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index e86df53..b5e21d9 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1671,6 +1671,11 @@ void __cdecl __ExceptionPtrCopyException(exception_ptr *ep, } #endif +MSVCRT_bool __cdecl __ExceptionPtrCompare(const exception_ptr *ep1, const exception_ptr *ep2) +{ + return ep1->rec == ep2->rec; +} + void* __cdecl __AdjustPointer(void *obj, const this_ptr_offsets *off) { return get_this_pointer(off, obj);

1 0

Piotr Caban : msvcrt: Implement caching in Concurrency::Alloc.
by Alexandre Julliard 24 Mar '17

24 Mar '17

Module: wine Branch: master Commit: c5d733e1ac84375402f7bc8d762e0a4e905eb1af URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5d733e1ac84375402f7bc8d7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 24 12:45:21 2017 +0100 msvcrt: Implement caching in Concurrency::Alloc. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/heap.c | 17 ---------- dlls/msvcrt/scheduler.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 17 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index ba07bb0..3ae2599 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -864,20 +864,3 @@ void msvcrt_destroy_heap(void) if(sb_heap) HeapDestroy(sb_heap); } - -/* ?Alloc(a)Concurrency@@YAPAXI(a)Z */ -/* ?Alloc(a)Concurrency@@YAPEAX_K(a)Z */ -void * CDECL Concurrency_Alloc(MSVCRT_size_t size) -{ - void *p = MSVCRT_malloc(size); - FIXME("(%ld) returning %p\n", size, p); - return p; -} - -/* ?Free(a)Concurrency@@YAXPAX(a)Z */ -/* ?Free(a)Concurrency@@YAXPEAX(a)Z */ -void CDECL Concurrency_Free(void* mem) -{ - FIXME("(%p) stub\n", mem); - MSVCRT_free(mem); -} diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index 1ab7906..84566cf 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -64,9 +64,21 @@ typedef struct { #define call_Context_dtor(this, flags) CALL_VTBL_FUNC(this, 20, \ Context*, (Context*, unsigned int), (this, flags)) +union allocator_cache_entry { + struct _free { + int depth; + union allocator_cache_entry *next; + } free; + struct _alloc { + int bucket; + char mem[1]; + } alloc; +}; + typedef struct { Context context; unsigned int id; + union allocator_cache_entry *allocator_cache[8]; } ExternalContextBase; extern const vtable_ptr MSVCRT_ExternalContextBase_vtable; static void ExternalContextBase_ctor(ExternalContextBase*); @@ -205,6 +217,16 @@ MSVCRT_bool __thiscall ExternalContextBase_IsSynchronouslyBlocked(const External static void ExternalContextBase_dtor(ExternalContextBase *this) { + union allocator_cache_entry *next, *cur; + int i; + + /* TODO: move the allocator cache to scheduler so it can be reused */ + for(i=0; i<sizeof(this->allocator_cache)/sizeof(this->allocator_cache[0]); i++) { + for(cur = this->allocator_cache[i]; cur; cur=next) { + next = cur->free.next; + MSVCRT_operator_delete(cur); + } + } } DEFINE_THISCALL_WRAPPER(ExternalContextBase_vector_dtor, 8) @@ -230,8 +252,72 @@ Context* __thiscall ExternalContextBase_vector_dtor(ExternalContextBase *this, u static void ExternalContextBase_ctor(ExternalContextBase *this) { TRACE("(%p)->()\n", this); + this->context.vtable = &MSVCRT_ExternalContextBase_vtable; this->id = InterlockedIncrement(&context_id); + memset(this->allocator_cache, 0, sizeof(this->allocator_cache)); +} + +/* ?Alloc(a)Concurrency@@YAPAXI(a)Z */ +/* ?Alloc(a)Concurrency@@YAPEAX_K(a)Z */ +void * CDECL Concurrency_Alloc(MSVCRT_size_t size) +{ + ExternalContextBase *context = (ExternalContextBase*)get_current_context(); + union allocator_cache_entry *p; + + size += FIELD_OFFSET(union allocator_cache_entry, alloc.mem); + if (size < sizeof(*p)) + size = sizeof(*p); + + if (context->context.vtable != &MSVCRT_ExternalContextBase_vtable) { + p = MSVCRT_operator_new(size); + p->alloc.bucket = -1; + }else { + int i; + + C_ASSERT(sizeof(union allocator_cache_entry) <= 1 << 4); + for(i=0; i<sizeof(context->allocator_cache)/sizeof(context->allocator_cache[0]); i++) + if (1 << (i+4) >= size) break; + + if(i==sizeof(context->allocator_cache)/sizeof(context->allocator_cache[0])) { + p = MSVCRT_operator_new(size); + p->alloc.bucket = -1; + }else if (context->allocator_cache[i]) { + p = context->allocator_cache[i]; + context->allocator_cache[i] = p->free.next; + p->alloc.bucket = i; + }else { + p = MSVCRT_operator_new(1 << (i+4)); + p->alloc.bucket = i; + } + } + + TRACE("(%ld) returning %p\n", size, p->alloc.mem); + return p->alloc.mem; +} + +/* ?Free(a)Concurrency@@YAXPAX(a)Z */ +/* ?Free(a)Concurrency@@YAXPEAX(a)Z */ +void CDECL Concurrency_Free(void* mem) +{ + union allocator_cache_entry *p = (union allocator_cache_entry*)((char*)mem-FIELD_OFFSET(union allocator_cache_entry, alloc.mem)); + ExternalContextBase *context = (ExternalContextBase*)get_current_context(); + int bucket = p->alloc.bucket; + + TRACE("(%p)\n", mem); + + if (context->context.vtable != &MSVCRT_ExternalContextBase_vtable) { + MSVCRT_operator_delete(p); + }else { + if(bucket >= 0 && bucket < sizeof(context->allocator_cache)/sizeof(context->allocator_cache[0]) && + (!context->allocator_cache[bucket] || context->allocator_cache[bucket]->free.depth < 20)) { + p->free.next = context->allocator_cache[bucket]; + p->free.depth = p->free.next ? p->free.next->free.depth+1 : 0; + context->allocator_cache[bucket] = p; + }else { + MSVCRT_operator_delete(p); + } + } } extern const vtable_ptr MSVCRT_type_info_vtable;

1 0

Hans Leidekker : winhttp: Fix a memory leak in insert_header (Valgrind).
by Alexandre Julliard 24 Mar '17

24 Mar '17

Module: wine Branch: master Commit: 08603e565bca3a64cf70b46b2b8cd8412fda37b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08603e565bca3a64cf70b46b2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 24 15:49:19 2017 +0100 winhttp: Fix a memory leak in insert_header (Valgrind). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index b2b72c7..3cdb6ab 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -368,25 +368,21 @@ static int get_header_index( request_t *request, LPCWSTR field, int requested_in static BOOL insert_header( request_t *request, header_t *header ) { - DWORD count; + DWORD count = request->num_headers + 1; header_t *hdrs; - count = request->num_headers + 1; - if (count > 1) + if (request->headers) hdrs = heap_realloc_zero( request->headers, sizeof(header_t) * count ); else - hdrs = heap_alloc_zero( sizeof(header_t) * count ); - - if (hdrs) - { - request->headers = hdrs; - request->headers[count - 1].field = strdupW( header->field ); - request->headers[count - 1].value = strdupW( header->value ); - request->headers[count - 1].is_request = header->is_request; - request->num_headers++; - return TRUE; - } - return FALSE; + hdrs = heap_alloc_zero( sizeof(header_t) ); + if (!hdrs) return FALSE; + + request->headers = hdrs; + request->headers[count - 1].field = strdupW( header->field ); + request->headers[count - 1].value = strdupW( header->value ); + request->headers[count - 1].is_request = header->is_request; + request->num_headers = count; + return TRUE; } static BOOL delete_header( request_t *request, DWORD index )

1 0

Hans Leidekker : wbemprox: Also free data for tables that don' t have a fill function (Valgrind).
by Alexandre Julliard 24 Mar '17

24 Mar '17

Module: wine Branch: master Commit: 66e3c97ca79f2dba590d281cfb4e04face345617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66e3c97ca79f2dba590d281cf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 24 15:49:20 2017 +0100 wbemprox: Also free data for tables that don't have a fill function (Valgrind). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/table.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index 273b8cb..ad56e0c 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -334,6 +334,7 @@ void free_table( struct table *table ) TRACE("destroying %p\n", table); heap_free( (WCHAR *)table->name ); free_columns( (struct column *)table->columns, table->num_cols ); + heap_free( table->data ); list_remove( &table->entry ); heap_free( table ); }

1 0

Hans Leidekker : advpack: Don't trace the contents of an output buffer ( Valgrind).
by Alexandre Julliard 24 Mar '17

24 Mar '17

Module: wine Branch: master Commit: c0b37037f5f00d2f68036ddeaf58aac3b7e5497f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0b37037f5f00d2f68036ddea… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 24 15:49:21 2017 +0100 advpack: Don't trace the contents of an output buffer (Valgrind). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advpack/advpack.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 2469f7b..d2ce60e 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -763,9 +763,9 @@ HRESULT WINAPI TranslateInfStringExA(HINF hInf, LPCSTR pszInfFilename, HRESULT res; DWORD len = 0; - TRACE("(%p, %s, %s, %s, %s, %d, %p, %p)\n", hInf, debugstr_a(pszInfFilename), + TRACE("(%p, %s, %s, %s, %p, %d, %p, %p)\n", hInf, debugstr_a(pszInfFilename), debugstr_a(pszTranslateSection), debugstr_a(pszTranslateKey), - debugstr_a(pszBuffer), dwBufferSize, pdwRequiredSize, pvReserved); + pszBuffer, dwBufferSize, pdwRequiredSize, pvReserved); if (!pszInfFilename || !pszTranslateSection || !pszTranslateKey || !pdwRequiredSize) @@ -843,9 +843,9 @@ HRESULT WINAPI TranslateInfStringExW(HINF hInf, LPCWSTR pszInfFilename, LPWSTR pszBuffer, DWORD dwBufferSize, PDWORD pdwRequiredSize, PVOID pvReserved) { - TRACE("(%p, %s, %s, %s, %s, %d, %p, %p)\n", hInf, debugstr_w(pszInfFilename), + TRACE("(%p, %s, %s, %s, %p, %d, %p, %p)\n", hInf, debugstr_w(pszInfFilename), debugstr_w(pszTranslateSection), debugstr_w(pszTranslateKey), - debugstr_w(pszBuffer), dwBufferSize, pdwRequiredSize, pvReserved); + pszBuffer, dwBufferSize, pdwRequiredSize, pvReserved); if (!hInf || !pszInfFilename || !pszTranslateSection || !pszTranslateKey) return E_INVALIDARG;

1 0

Hans Leidekker : advapi32/tests: Fix a memory leak (Valgrind).
by Alexandre Julliard 24 Mar '17

24 Mar '17

Module: wine Branch: master Commit: fbec6c540aaa6b6452abf8226e80787ab95e5cf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbec6c540aaa6b6452abf8226… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 24 15:49:22 2017 +0100 advapi32/tests: Fix a memory leak (Valgrind). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/crypt.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 84a54a1..13671eb 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -255,6 +255,9 @@ static void test_incorrect_api_usage(void) ok (result, "%d\n", GetLastError()); if (!result) return; + result = pCryptDestroyKey(hKey); + ok (result, "%d\n", GetLastError()); + result = pCryptGenKey(hProv, CALG_RC4, 0, &hKey2); ok (result, "%d\n", GetLastError()); if (!result) return;

1 0

Paul Gofman : d3dx9: Fix a warning output in preshader.
by Alexandre Julliard 24 Mar '17

24 Mar '17

Module: wine Branch: master Commit: 3b99567192f30475b415c748f5e57b427fb67e10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b99567192f30475b415c748f… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Mar 23 18:06:57 2017 +0300 d3dx9: Fix a warning output in preshader. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index b650f33..9aedc99 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -1088,16 +1088,11 @@ static HRESULT init_set_constants(struct d3dx_const_tab *const_tab, ID3DXConstan return ret; } -static double exec_get_arg(struct d3dx_regstore *rs, const struct d3dx_pres_ins *ins, - const struct d3dx_pres_operand *opr, unsigned int comp) +static double exec_get_arg(struct d3dx_regstore *rs, const struct d3dx_pres_operand *opr, unsigned int comp) { if (!regstore_is_val_set_reg(rs, opr->table, (opr->offset + comp) / table_info[opr->table].reg_component_count)) - { - WARN("Using uninitialized input "); - dump_arg(rs, opr, comp); - TRACE(".\n"); - dump_ins(rs, ins); - } + WARN("Using uninitialized input, table %u, offset %u.\n", opr->table, opr->offset + comp); + return regstore_get_double(rs, opr->table, opr->offset + comp); } @@ -1130,7 +1125,7 @@ static HRESULT execute_preshader(struct d3dx_preshader *pres) } for (k = 0; k < oi->input_count; ++k) for (j = 0; j < ins->component_count; ++j) - args[k * ins->component_count + j] = exec_get_arg(&pres->regs, ins, &ins->inputs[k], + args[k * ins->component_count + j] = exec_get_arg(&pres->regs, &ins->inputs[k], ins->scalar_op && !k ? 0 : j); res = oi->func(args, ins->component_count); @@ -1142,7 +1137,7 @@ static HRESULT execute_preshader(struct d3dx_preshader *pres) for (j = 0; j < ins->component_count; ++j) { for (k = 0; k < oi->input_count; ++k) - args[k] = exec_get_arg(&pres->regs, ins, &ins->inputs[k], ins->scalar_op && !k ? 0 : j); + args[k] = exec_get_arg(&pres->regs, &ins->inputs[k], ins->scalar_op && !k ? 0 : j); res = oi->func(args, ins->component_count); exec_set_arg(&pres->regs, &ins->output, j, res); }

1 0

Henri Verbeet : winex11: Use GLX_OML_sync_control to synchronise buffer swaps with X11DRV_FLUSH_GL_DRAWABLE requests.
by Alexandre Julliard 24 Mar '17

24 Mar '17

Module: wine Branch: master Commit: e75bc6228ebcbdc1a3877a6ac6954611dedf8a71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e75bc6228ebcbdc1a3877a6ac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 23 23:58:10 2017 +0100 winex11: Use GLX_OML_sync_control to synchronise buffer swaps with X11DRV_FLUSH_GL_DRAWABLE requests. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/init.c | 3 --- dlls/winex11.drv/opengl.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index af2fd92..7efd603 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -375,9 +375,6 @@ static INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d RECT rect = physDev->dc_rect; OffsetRect( &rect, -physDev->dc_rect.left, -physDev->dc_rect.top ); - /* The GL drawable may be lagged behind if we don't flush first, so - * flush the display make sure we copy up-to-date data */ - XFlush( gdi_display ); XSetFunction( gdi_display, physDev->gc, GXcopy ); XCopyArea( gdi_display, data->gl_drawable, physDev->drawable, physDev->gc, 0, 0, rect.right, rect.bottom, diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 76cc3cc..28f033d 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -418,6 +418,12 @@ static const char *(*pglXQueryCurrentRendererStringMESA)(int attribute); static Bool (*pglXQueryRendererIntegerMESA)(Display *dpy, int screen, int renderer, int attribute, unsigned int *value); static const char *(*pglXQueryRendererStringMESA)(Display *dpy, int screen, int renderer, int attribute); +/* OpenML GLX Extensions */ +static Bool (*pglXWaitForSbcOML)( Display *dpy, GLXDrawable drawable, + INT64 target_sbc, INT64 *ust, INT64 *msc, INT64 *sbc ); +static INT64 (*pglXSwapBuffersMscOML)( Display *dpy, GLXDrawable drawable, + INT64 target_msc, INT64 divisor, INT64 remainder ); + /* Standard OpenGL */ static void (*pglFinish)(void); static void (*pglFlush)(void); @@ -750,6 +756,12 @@ static BOOL WINAPI init_opengl( INIT_ONCE *once, void *param, void **context ) pglXQueryRendererStringMESA = pglXGetProcAddressARB( (const GLubyte *)"glXQueryRendererStringMESA" ); } + if (has_extension( WineGLInfo.glxExtensions, "GLX_OML_sync_control" )) + { + pglXWaitForSbcOML = pglXGetProcAddressARB( (const GLubyte *)"glXWaitForSbcOML" ); + pglXSwapBuffersMscOML = pglXGetProcAddressARB( (const GLubyte *)"glXSwapBuffersMscOML" ); + } + X11DRV_WineGL_LoadExtensions(); init_pixel_formats( gdi_display ); return TRUE; @@ -3298,6 +3310,7 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc ) struct x11drv_escape_flush_gl_drawable escape; struct gl_drawable *gl; struct wgl_context *ctx = NtCurrentTeb()->glContext; + INT64 ust, msc, sbc, target_sbc = 0; TRACE("(%p)\n", hdc); @@ -3330,6 +3343,12 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc ) gl->rect.right - gl->rect.left, gl->rect.bottom - gl->rect.top ); break; } + if (pglXSwapBuffersMscOML) + { + pglFlush(); + target_sbc = pglXSwapBuffersMscOML( gdi_display, gl->drawable, 0, 0, 0 ); + break; + } pglXSwapBuffers(gdi_display, gl->drawable); break; case DC_GL_CHILD_WIN: @@ -3337,10 +3356,19 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc ) escape.gl_drawable = gl->window; /* fall through */ default: + if (pglXSwapBuffersMscOML) + { + pglFlush(); + target_sbc = pglXSwapBuffersMscOML( gdi_display, gl->drawable, 0, 0, 0 ); + break; + } pglXSwapBuffers(gdi_display, gl->drawable); break; } + if (escape.gl_drawable && pglXWaitForSbcOML) + pglXWaitForSbcOML( gdi_display, gl->drawable, target_sbc, &ust, &msc, &sbc ); + release_gl_drawable( gl ); if (escape.gl_drawable) ExtEscape( ctx->hdc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL );

1 0

Henri Verbeet : usp10: Avoid LPWSTR.
by Alexandre Julliard 24 Mar '17

24 Mar '17

Module: wine Branch: master Commit: a204e589b5123182323ceba6850c4b674cd3ebb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a204e589b5123182323ceba68… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 23 22:49:40 2017 +0100 usp10: Avoid LPWSTR. And cleanup a few style issues along the way. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/indic.c | 3 ++- dlls/usp10/shape.c | 51 ++++++++++++++++++++++++++------------------- dlls/usp10/usp10.c | 7 +++++-- dlls/usp10/usp10_internal.h | 6 ++++-- 4 files changed, 40 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a204e589b5123182323ce…

1 0