wine-commits March 2017

wine-commits@winehq.org

2 participants
717 discussions

Hans Leidekker : advapi32/tests: Initialize input parameters (Valgrind).
by Alexandre Julliard 24 Mar '17

24 Mar '17

Module: wine Branch: master Commit: 5786705ab88ade53c75557783d3279c75a819d78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5786705ab88ade53c75557783… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 24 15:49:23 2017 +0100 advapi32/tests: Initialize input parameters (Valgrind). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 82f5015..eb9ab67 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -771,11 +771,10 @@ cleanup: static void test_query_value_ex(void) { - DWORD ret; - DWORD size; - DWORD type; + DWORD ret, size, type; BYTE buffer[10]; - + + size = sizeof(buffer); ret = RegQueryValueExA(hkey_main, "TP1_SZ", NULL, &type, NULL, &size); ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); ok(size == strlen(sTestpath1) + 1, "(%d,%d)\n", (DWORD)strlen(sTestpath1) + 1, size); @@ -1832,7 +1831,7 @@ static void test_reg_query_info(void) ok(classbufferW[0] == 0x5555, "classbufferW[0] = 0x%x\n", classbufferW[0]); /* empty key */ - sdlen = 0; + sdlen = classlen =0; ret = RegQueryInfoKeyA(subkey, NULL, &classlen, NULL, &subkeys, &maxsubkeylen, &maxclasslen, &values, &maxvaluenamelen, &maxvaluelen, &sdlen, &lastwrite); ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); ok(classlen == strlen(subkey_class), "classlen = %u\n", classlen); @@ -1846,7 +1845,7 @@ static void test_reg_query_info(void) ok(lastwrite.dwLowDateTime != 0, "lastwrite.dwLowDateTime = %u\n", lastwrite.dwLowDateTime); ok(lastwrite.dwHighDateTime != 0, "lastwrite.dwHighDateTime = %u\n", lastwrite.dwHighDateTime); - sdlen = 0; + sdlen = classlen = 0; ret = RegQueryInfoKeyW(subkey, NULL, &classlen, NULL, &subkeys, &maxsubkeylen, &maxclasslen, &values, &maxvaluenamelen, &maxvaluelen, &sdlen, &lastwrite); ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); ok(classlen == strlen(subkey_class), "classlen = %u\n", classlen); @@ -1867,7 +1866,7 @@ static void test_reg_query_info(void) ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); /* with subkey & default value */ - sdlen = 0; + sdlen = classlen = 0; ret = RegQueryInfoKeyA(subkey, NULL, &classlen, NULL, &subkeys, &maxsubkeylen, &maxclasslen, &values, &maxvaluenamelen, &maxvaluelen, &sdlen, &lastwrite); ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); ok(classlen == strlen(subkey_class), "classlen = %u\n", classlen); @@ -1881,7 +1880,7 @@ static void test_reg_query_info(void) ok(lastwrite.dwLowDateTime != 0, "lastwrite.dwLowDateTime = %u\n", lastwrite.dwLowDateTime); ok(lastwrite.dwHighDateTime != 0, "lastwrite.dwHighDateTime = %u\n", lastwrite.dwHighDateTime); - sdlen = 0; + sdlen = classlen = 0; ret = RegQueryInfoKeyW(subkey, NULL, &classlen, NULL, &subkeys, &maxsubkeylen, &maxclasslen, &values, &maxvaluenamelen, &maxvaluelen, &sdlen, &lastwrite); ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); ok(classlen == strlen(subkey_class), "classlen = %u\n", classlen); @@ -1902,12 +1901,14 @@ static void test_reg_query_info(void) ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); /* with named value */ + classlen = 0; ret = RegQueryInfoKeyA(subkey, NULL, &classlen, NULL, &subkeys, &maxsubkeylen, &maxclasslen, &values, &maxvaluenamelen, &maxvaluelen, &sdlen, &lastwrite); ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); ok(values == 3, "values = %u\n", values); ok(maxvaluenamelen == strlen("value one"), "maxvaluenamelen = %u\n", maxvaluenamelen); ok(maxvaluelen == sizeof("second value data") * sizeof(WCHAR), "maxvaluelen = %u\n", maxvaluelen); + classlen = 0; ret = RegQueryInfoKeyW(subkey, NULL, &classlen, NULL, &subkeys, &maxsubkeylen, &maxclasslen, &values, &maxvaluenamelen, &maxvaluelen, &sdlen, &lastwrite); ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); ok(values == 3, "values = %u\n", values);

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

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 : 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 : 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

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@Concurrency@@YAPAXI@Z */ -/* ?Alloc@Concurrency@@YAPEAX_K@Z */ -void * CDECL Concurrency_Alloc(MSVCRT_size_t size) -{ - void *p = MSVCRT_malloc(size); - FIXME("(%ld) returning %p\n", size, p); - return p; -} - -/* ?Free@Concurrency@@YAXPAX@Z */ -/* ?Free@Concurrency@@YAXPEAX@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@Concurrency@@YAPAXI@Z */ +/* ?Alloc@Concurrency@@YAPEAX_K@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@Concurrency@@YAXPAX@Z */ +/* ?Free@Concurrency@@YAXPEAX@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

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@std@@YAXPEBD@Z(str) _Xruntime_error @ stub -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX@Z @ stub -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX@Z -@ stub -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0@Z -@ stub -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0@Z +@ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0@Z(ptr ptr) msvcr120.?__ExceptionPtrCompare@@YA_NPBX0@Z +@ cdecl -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0@Z(ptr ptr) msvcr120.?__ExceptionPtrCompare@@YA_NPEBX0@Z @ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX@Z(ptr ptr) msvcr120.?__ExceptionPtrCopy@@YAXPAXPBX@Z @ cdecl -arch=win64 ?__ExceptionPtrCopy@@YAXPEAXPEBX@Z(ptr ptr) msvcr120.?__ExceptionPtrCopy@@YAXPEAXPEBX@Z @ cdecl -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1@Z(ptr ptr ptr) msvcr120.?__ExceptionPtrCopyException@@YAXPAXPBX1@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@_SpinCount@details@Concurrency@@SAIXZ() SpinCount__Value @ stub -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX@Z @ stub -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX@Z -@ stub -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0@Z -@ stub -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0@Z +@ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0@Z(ptr ptr) __ExceptionPtrCompare +@ cdecl -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0@Z(ptr ptr) __ExceptionPtrCompare @ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX@Z(ptr ptr) __ExceptionPtrCopy @ cdecl -arch=win64 ?__ExceptionPtrCopy@@YAXPEAXPEBX@Z(ptr ptr) __ExceptionPtrCopy @ cdecl -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1@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@_Context@details@Concurrency@@SAXXZ @ stub -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX@Z @ stub -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX@Z -@ stub -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0@Z -@ stub -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0@Z +@ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0@Z(ptr ptr) __ExceptionPtrCompare +@ cdecl -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0@Z(ptr ptr) __ExceptionPtrCompare @ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX@Z(ptr ptr) __ExceptionPtrCopy @ cdecl -arch=win64 ?__ExceptionPtrCopy@@YAXPEAXPEBX@Z(ptr ptr) __ExceptionPtrCopy @ cdecl -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1@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@_Context@details@Concurrency@@SAXXZ @ stub -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX@Z @ stub -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX@Z -@ stub -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0@Z -@ stub -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0@Z +@ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0@Z(ptr ptr) __ExceptionPtrCompare +@ cdecl -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0@Z(ptr ptr) __ExceptionPtrCompare @ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX@Z(ptr ptr) __ExceptionPtrCopy @ cdecl -arch=win64 ?__ExceptionPtrCopy@@YAXPEAXPEBX@Z(ptr ptr) __ExceptionPtrCopy @ cdecl -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1@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@_Context@details@Concurrency@@SAXXZ @ stub -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX@Z @ stub -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX@Z -@ stub -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0@Z -@ stub -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0@Z +@ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0@Z(ptr ptr) msvcr120.?__ExceptionPtrCompare@@YA_NPBX0@Z +@ cdecl -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0@Z(ptr ptr) msvcr120.?__ExceptionPtrCompare@@YA_NPEBX0@Z @ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX@Z(ptr ptr) msvcr120.?__ExceptionPtrCopy@@YAXPAXPBX@Z @ cdecl -arch=win64 ?__ExceptionPtrCopy@@YAXPEAXPEBX@Z(ptr ptr) msvcr120.?__ExceptionPtrCopy@@YAXPEAXPEBX@Z @ cdecl -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1@Z(ptr ptr ptr) msvcr120.?__ExceptionPtrCopyException@@YAXPAXPBX1@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 : msvcp100: Improve is_current_task_group_canceling function stub.
by Alexandre Julliard 24 Mar '17

24 Mar '17

Module: wine Branch: master Commit: 7ec727b31c98802a7e9ab1cfbae9e3539a279c2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ec727b31c98802a7e9ab1cfb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 24 12:45:10 2017 +0100 msvcp100: Improve is_current_task_group_canceling function stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 2 +- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp90/misc.c | 10 ++++------ dlls/msvcp90/msvcp90.h | 4 ++++ dlls/msvcp90/msvcp_main.c | 10 +++++++++- 7 files changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 6841678..7042598 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2068,7 +2068,7 @@ @ extern ?is_bounded@_Num_base@std@@2_NB std_Num_base_is_bounded @ extern ?is_bounded@_Num_float_base@std@@2_NB std_Num_float_base_is_bounded @ extern ?is_bounded@_Num_int_base@std@@2_NB std_Num_int_base_is_bounded -@ cdecl ?is_current_task_group_canceling@Concurrency@@YA_NXZ(ptr) is_current_task_group_canceling +@ cdecl ?is_current_task_group_canceling@Concurrency@@YA_NXZ() is_current_task_group_canceling @ extern ?is_exact@_Num_base@std@@2_NB std_Num_base_is_exact @ extern ?is_exact@_Num_float_base@std@@2_NB std_Num_float_base_is_exact @ extern ?is_exact@_Num_int_base@std@@2_NB std_Num_int_base_is_exact diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 602cb2b..52524c5 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -2832,7 +2832,7 @@ @ cdecl -arch=arm ?is@?$ctype@_W@std@@QBA_NF_W@Z(ptr long long) ctype_wchar_is_ch @ thiscall -arch=i386 ?is@?$ctype@_W@std@@QBE_NF_W@Z(ptr long long) ctype_wchar_is_ch @ cdecl -arch=win64 ?is@?$ctype@_W@std@@QEBA_NF_W@Z(ptr long long) ctype_wchar_is_ch -@ cdecl ?is_current_task_group_canceling@Concurrency@@YA_NXZ(ptr) is_current_task_group_canceling +@ cdecl ?is_current_task_group_canceling@Concurrency@@YA_NXZ() is_current_task_group_canceling @ stub ?is_task_cancellation_requested@Concurrency@@YA_NXZ @ cdecl -arch=arm ?isfx@?$basic_istream@DU?$char_traits@D@std@@@std@@QAAXXZ(ptr) basic_istream_char_isfx @ thiscall -arch=i386 ?isfx@?$basic_istream@DU?$char_traits@D@std@@@std@@QAEXXZ(ptr) basic_istream_char_isfx diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index a839575..173728a 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -2774,7 +2774,7 @@ @ cdecl -arch=arm ?is@?$ctype@_W@std@@QBA_NF_W@Z(ptr long long) ctype_wchar_is_ch @ thiscall -arch=i386 ?is@?$ctype@_W@std@@QBE_NF_W@Z(ptr long long) ctype_wchar_is_ch @ cdecl -arch=win64 ?is@?$ctype@_W@std@@QEBA_NF_W@Z(ptr long long) ctype_wchar_is_ch -@ cdecl ?is_current_task_group_canceling@Concurrency@@YA_NXZ(ptr) is_current_task_group_canceling +@ cdecl ?is_current_task_group_canceling@Concurrency@@YA_NXZ() is_current_task_group_canceling @ cdecl -arch=arm ?isfx@?$basic_istream@DU?$char_traits@D@std@@@std@@QAAXXZ(ptr) basic_istream_char_isfx @ thiscall -arch=i386 ?isfx@?$basic_istream@DU?$char_traits@D@std@@@std@@QAEXXZ(ptr) basic_istream_char_isfx @ cdecl -arch=win64 ?isfx@?$basic_istream@DU?$char_traits@D@std@@@std@@QEAAXXZ(ptr) basic_istream_char_isfx diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 6bc6e5a..8a03b41 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -2774,7 +2774,7 @@ @ cdecl -arch=arm ?is@?$ctype@_W@std@@QBA_NF_W@Z(ptr long long) msvcp120.?is@?$ctype@_W@std@@QBA_NF_W@Z @ thiscall -arch=i386 ?is@?$ctype@_W@std@@QBE_NF_W@Z(ptr long long) msvcp120.?is@?$ctype@_W@std@@QBE_NF_W@Z @ cdecl -arch=win64 ?is@?$ctype@_W@std@@QEBA_NF_W@Z(ptr long long) msvcp120.?is@?$ctype@_W@std@@QEBA_NF_W@Z -@ cdecl ?is_current_task_group_canceling@Concurrency@@YA_NXZ(ptr) msvcp120.?is_current_task_group_canceling@Concurrency@@YA_NXZ +@ cdecl ?is_current_task_group_canceling@Concurrency@@YA_NXZ() msvcp120.?is_current_task_group_canceling@Concurrency@@YA_NXZ @ cdecl -arch=arm ?isfx@?$basic_istream@DU?$char_traits@D@std@@@std@@QAAXXZ(ptr) msvcp120.?isfx@?$basic_istream@DU?$char_traits@D@std@@@std@@QAAXXZ @ thiscall -arch=i386 ?isfx@?$basic_istream@DU?$char_traits@D@std@@@std@@QAEXXZ(ptr) msvcp120.?isfx@?$basic_istream@DU?$char_traits@D@std@@@std@@QAEXXZ @ cdecl -arch=win64 ?isfx@?$basic_istream@DU?$char_traits@D@std@@@std@@QEAAXXZ(ptr) msvcp120.?isfx@?$basic_istream@DU?$char_traits@D@std@@@std@@QEAAXXZ diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 81a6f81..fa5ac1d 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1400,15 +1400,13 @@ void __cdecl _Unlock_shared_ptr_spin_lock(void) } #endif +#if _MSVCP_VER >= 100 /* ?is_current_task_group_canceling@Concurrency@@YA_NXZ */ -MSVCP_bool __cdecl is_current_task_group_canceling(void *this) +MSVCP_bool __cdecl is_current_task_group_canceling(void) { - static int once; - - if (!once++) - FIXME("(%p) stub\n", this); - return FALSE; + return Context_IsCurrentTaskCollectionCanceling(); } +#endif #if _MSVCP_VER >= 140 typedef struct { diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 86b787b..d751186 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -72,6 +72,10 @@ extern void (__thiscall *critical_section_unlock)(critical_section*); extern MSVCP_bool (__thiscall *critical_section_trylock)(critical_section*); #endif +#if _MSVCP_VER >= 100 +extern MSVCP_bool (__cdecl *Context_IsCurrentTaskCollectionCanceling)(void); +#endif + /* basic_string<char, char_traits<char>, allocator<char>> */ typedef struct { diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index 377ae01..3898c9d 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -68,6 +68,10 @@ void (__thiscall *critical_section_unlock)(critical_section*); MSVCP_bool (__thiscall *critical_section_trylock)(critical_section*); #endif +#if _MSVCP_VER >= 100 +MSVCP_bool (__cdecl *Context_IsCurrentTaskCollectionCanceling)(void); +#endif + #define VERSION_STRING(ver) #ver #if _MSVCP_VER >= 140 #define MSVCRT_NAME(ver) "ucrtbase.dll" @@ -133,7 +137,7 @@ int __cdecl sprintf(char *buf, const char *fmt, ...) static void init_cxx_funcs(void) { HMODULE hmod = GetModuleHandleA( MSVCRT_NAME(_MSVCP_VER) ); -#if _MSVCP_VER >= 110 +#if _MSVCP_VER >= 100 HMODULE hcon = hmod; #endif @@ -187,6 +191,10 @@ static void init_cxx_funcs(void) #endif } #endif /* _MSVCP_VER >= 110 */ + +#if _MSVCP_VER >= 100 + Context_IsCurrentTaskCollectionCanceling = (void*)GetProcAddress(hcon, "?IsCurrentTaskCollectionCanceling@Context@Concurrency@@SA_NXZ"); +#endif } BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)

1 0

Nikolay Sivov : readme: Update Russian translation.
by Alexandre Julliard 24 Mar '17

24 Mar '17

Module: wine Branch: master Commit: 159d3642e147694c3596d96a0646249e2146a2c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=159d3642e147694c3596d96a0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 24 09:08:25 2017 +0300 readme: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- documentation/README.ru | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/documentation/README.ru b/documentation/README.ru index c228fc6..616737e 100644 --- a/documentation/README.ru +++ b/documentation/README.ru @@ -13,11 +13,10 @@ GNU LGPL, файл LICENSE содержит информацию по лицен 2. БЫСТРЫЙ СТАРТ -Каждый раз, когда вы компилируете исходный код, рекомендуется использовать -Wine Installer для компоновки и установки Wine. В каталоге, содержащем -исходный код Wine (в нём находится этот файл), введите: +В каталоге, содержащем исходный код Wine, выполните: -./tools/wineinstall +./configure +make Запустите программу с помощью команды «wine имя_программы». Источники дополнительной информации перечислены в конце этого файла. Ознакомьтесь с @@ -47,7 +46,7 @@ Solaris: Лучше всего компоновать Wine инструментами GNU (gcc, gas, и т.д.). Внимание: установка gas *НЕ* гарантирует что gcc будет его использовать. Необходимо перекомпилировать gcc после - установки gas или создать ссылку на cc, как и на ld в инструментах gnu. (?) + установки gas или создать ссылку на cc, как и на ld в инструментах gnu. NetBSD: Убедитесь что, параметры USER_LDT, SYSVSHM, SYSVSEM и SYSVMSG @@ -70,7 +69,7 @@ Mac OS X: Разумеется, вам необходим «make» (лучше всего использовать GNU make). - Вам также понадобятся flex (версии 2.5 или старше) и bison. + Вам также понадобятся flex версии 2.5.33 или более новой и bison. Поддержка дополнительных библиотек: Конфигурационный скрипт выведет список дополнительных библиотек, которые не были @@ -86,30 +85,20 @@ Mac OS X: 4. КОМПИЛЯЦИЯ -Если вы не хотите использовать wineinstall, введите следующие команды -для компоновки Wine: +Для компиляции, выполните: ./configure -make depend make -Это скомпонует программу «wine», библиотеки и бинарные файлы, +В результате вы получите программу «wine», библиотеки и бинарные файлы, необходимые для работы Wine. -Программа «wine» будет загружать и выполнять программы Windows. +Программа «wine» нужна для загрузки и выполнения программ Windows. Библиотека «libwine» («Winelib») может быть использована для компилирования и компоновки исходного кода Windows под Unix. Для вывода конфигурационных настроек введите ./configure --help. -Для обновления до нового релиза используя патч, сначала перейдите в -корневой каталог релиза (он содержит README файл). -Затем введите «make clean» и пропачьте релиз: - - bunzip2 -c patch-file | patch -p1 - -где «patch-file» - имя файла с патчем (что-то вроде -wine-1.0.x.diff.bz2). Затем введите «./configure», и после этого -«make depend && make». +За дополнительной информацией обратитесь к https://wiki.winehq.org/Building_Wine 5. УСТАНОВКА @@ -169,8 +158,9 @@ IRC: Онлайн помощь доступна на канале #WineHQ на Git: Текущие разработки Wine доступны через Git. Смотрите http://www.winehq.org/site/git для дополнительной информации. -Если вы что-то добавили или исправили ошибку, пришлите патч (в формате 'diff -u') -на wine-patches(a)winehq.org для его включения в следующий релиз. +Если вы что-то добавили или исправили ошибку, пожалуйста отправьте патч +(предпочтительно сгенерированный с помощью git-format-patch) на wine-patches(a)winehq.org +для его включения в следующий релиз. -- Alexandre Julliard

1 0

Francois Gouget : ddraw: Make ddraw_surface_release_iface() static.
by Alexandre Julliard 24 Mar '17

24 Mar '17

Module: wine Branch: master Commit: b7d0b4d8a6f7199e73b5e225ad6440614fb74161 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7d0b4d8a6f7199e73b5e225a… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 24 03:43:45 2017 +0100 ddraw: Make ddraw_surface_release_iface() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 1 - dlls/ddraw/surface.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 7d640f7..38ae28a7 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -215,7 +215,6 @@ struct wined3d_rendertarget_view *ddraw_surface_get_rendertarget_view(struct ddr void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; -ULONG ddraw_surface_release_iface(struct ddraw_surface *This) DECLSPEC_HIDDEN; HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, const RECT *rect, BOOL read) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 247fb86..4c84783 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -529,7 +529,7 @@ static void ddraw_surface_cleanup(struct ddraw_surface *surface) wined3d_texture_decref(surface->wined3d_texture); } -ULONG ddraw_surface_release_iface(struct ddraw_surface *This) +static ULONG ddraw_surface_release_iface(struct ddraw_surface *This) { ULONG iface_count;

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2017