October 2016 - Wine-Commits

Piotr Caban : msvcrt: Add support for $$B datatype description format in unDName.
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: fe94dc9fe50d26ad9ab569c298c92dbd4466fc1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe94dc9fe50d26ad9ab569c29… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 20 22:01:23 2016 +0100 msvcrt: Add support for $$B datatype description format in unDName. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6ac2acc34f266e2e59e1d1dd2de0f299e750ee01) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/tests/cpp.c | 2 ++ dlls/msvcrt/undname.c | 32 +++++++++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 73011b0..18fe78e 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1326,6 +1326,8 @@ static void test_demangle(void) /* 129 */ {"??$run(a)XVTask_Render_Preview@@@QtConcurrent@@YA?AV?$QFuture(a)X@@PEAVTask_Render_Preview@@P82(a)EAAXXZ@Z", "class QFuture<void> __cdecl QtConcurrent::run<void,class Task_Render_Preview>(class Task_Render_Preview * __ptr64,void (__cdecl Task_Render_Preview::*)(void) __ptr64)", "??$run(a)XVTask_Render_Preview@@@QtConcurrent@@YA?AV?$QFuture(a)X@@PEAVTask_Render_Preview@@P82(a)EAAXXZ@Z"}, +/* 130 */ {"??_E?$TStrArray@$$BY0BAA(a)D$0BA@@@UAEPAXI(a)Z", + "public: virtual void * __thiscall TStrArray<char [256],16>::`vector deleting destructor'(unsigned int)"}, }; int i, num_test = (sizeof(test)/sizeof(test[0])); char* name; diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index dd5e599..48ead68 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -992,7 +992,37 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, } break; case '$': - if (*sym->current == 'C') + if (*sym->current == 'B') + { + unsigned mark = sym->stack.num; + struct datatype_t sub_ct; + const char* arr = NULL; + sym->current++; + + /* multidimensional arrays */ + if (*sym->current == 'Y') + { + const char* n1; + int num; + + sym->current++; + if (!(n1 = get_number(sym))) goto done; + num = atoi(n1); + + while (num--) + arr = str_printf(sym, "%s[%s]", arr, get_number(sym)); + } + + if (!demangle_datatype(sym, &sub_ct, pmt_ref, FALSE)) goto done; + + if (arr) + ct->left = str_printf(sym, "%s %s", sub_ct.left, arr); + else + ct->left = sub_ct.left; + ct->right = sub_ct.right; + sym->stack.num = mark; + } + else if (*sym->current == 'C') { const char *ptr, *ptr_modif;

1 0

Sebastian Lackner : services: Start SERVICE_FILE_SYSTEM_DRIVER services with winedevice.
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: 3515f70c19ca73d7552813dd9c60dcc805d20069 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3515f70c19ca73d7552813dd9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Feb 16 06:02:30 2016 +0100 services: Start SERVICE_FILE_SYSTEM_DRIVER services with winedevice. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 94fb7c3b8bdb8e713dd229ad78621f91916240ab) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/services/services.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/services/services.c b/programs/services/services.c index 1335837..53a3846 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -631,7 +631,8 @@ static DWORD get_service_binary_path(const struct service_entry *service_entry, ExpandEnvironmentStringsW(service_entry->config.lpBinaryPathName, *path, size); - if (service_entry->config.dwServiceType == SERVICE_KERNEL_DRIVER) + if (service_entry->config.dwServiceType == SERVICE_KERNEL_DRIVER || + service_entry->config.dwServiceType == SERVICE_FILE_SYSTEM_DRIVER) { static const WCHAR winedeviceW[] = {'\\','w','i','n','e','d','e','v','i','c','e','.','e','x','e',' ',0}; WCHAR system_dir[MAX_PATH];

1 0

Sebastian Lackner : ntdll: Skip unused import descriptors when loading libraries.
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: 9c9a758d5c9b729590484bf52aab930faa214f25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c9a758d5c9b729590484bf52… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Feb 10 17:38:28 2016 +0100 ntdll: Skip unused import descriptors when loading libraries. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b89f88841e38e0adc0cd6f35e6e62b00ba19ec41) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/loader.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index cb9a4e2..3e45690 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -564,7 +564,7 @@ static FARPROC find_named_export( HMODULE module, const IMAGE_EXPORT_DIRECTORY * * Import the dll specified by the given import descriptor. * The loader_section must be locked while calling this function. */ -static WINE_MODREF *import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LPCWSTR load_path ) +static BOOL import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LPCWSTR load_path, WINE_MODREF **pwm ) { NTSTATUS status; WINE_MODREF *wmImp; @@ -586,6 +586,13 @@ static WINE_MODREF *import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *d else import_list = thunk_list; + if (!import_list->u1.Ordinal) + { + WARN( "Skipping unused import %s\n", name ); + *pwm = NULL; + return TRUE; + } + while (len && name[len-1] == ' ') len--; /* remove trailing spaces */ if (len * sizeof(WCHAR) < sizeof(buffer)) @@ -597,7 +604,7 @@ static WINE_MODREF *import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *d else /* need to allocate a larger buffer */ { WCHAR *ptr = RtlAllocateHeap( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ); - if (!ptr) return NULL; + if (!ptr) return FALSE; ascii_to_unicode( ptr, name, len ); ptr[len] = 0; status = load_dll( load_path, ptr, 0, &wmImp ); @@ -612,7 +619,7 @@ static WINE_MODREF *import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *d else ERR("Loading library %s (which is needed by %s) failed (error %x).\n", name, debugstr_w(current_modref->ldr.FullDllName.Buffer), status); - return NULL; + return FALSE; } /* unprotect the import address table since it can be located in @@ -693,7 +700,8 @@ static WINE_MODREF *import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *d done: /* restore old protection of the import address table */ NtProtectVirtualMemory( NtCurrentProcess(), &protect_base, &protect_size, protect_old, &protect_old ); - return wmImp; + *pwm = wmImp; + return TRUE; } @@ -901,8 +909,11 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) status = STATUS_SUCCESS; for (i = 0; i < nb_imports; i++) { - if (!(wm->deps[i] = import_dll( wm->ldr.BaseAddress, &imports[i], load_path ))) + if (!import_dll( wm->ldr.BaseAddress, &imports[i], load_path, &wm->deps[i] )) + { + wm->deps[i] = NULL; status = STATUS_DLL_NOT_FOUND; + } } current_modref = prev; if (wm->ldr.ActivationContext) RtlDeactivateActivationContext( 0, cookie );

1 0

Nikolay Sivov : msxml3: Fix cloneNode() for document nodes.
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: b34e43dfa6a81d57b96fdf749be08e05554f961d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b34e43dfa6a81d57b96fdf749… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 30 11:47:11 2015 +0300 msxml3: Fix cloneNode() for document nodes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 02e0e122a56fa33d7738c059f34a3638bd6dc9fb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msxml3/domdoc.c | 31 +++++++++++++++++++++++++---- dlls/msxml3/tests/domdoc.c | 49 +++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 71 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index e9f2504..3643219 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1244,8 +1244,31 @@ static HRESULT WINAPI domdoc_cloneNode( IXMLDOMNode** outNode) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); + xmlNodePtr clone; + TRACE("(%p)->(%d %p)\n", This, deep, outNode); - return node_clone( &This->node, deep, outNode ); + + if (!outNode) + return E_INVALIDARG; + + *outNode = NULL; + + clone = xmlCopyNode((xmlNodePtr)get_doc(This), deep ? 1 : 2); + if (!clone) + return E_FAIL; + + clone->doc->_private = create_priv(); + xmldoc_add_orphan(clone->doc, clone); + xmldoc_add_ref(clone->doc); + + priv_from_xmlDocPtr(clone->doc)->properties = copy_properties(This->properties); + if (!(*outNode = (IXMLDOMNode*)create_domdoc(clone))) + { + xmldoc_release(clone->doc); + return E_FAIL; + } + + return S_OK; } @@ -3640,16 +3663,16 @@ HRESULT DOMDocument_create(MSXML_VERSION version, void **ppObj) IUnknown* create_domdoc( xmlNodePtr document ) { - void* pObj = NULL; + IUnknown *obj = NULL; HRESULT hr; TRACE("(%p)\n", document); - hr = get_domdoc_from_xmldoc((xmlDocPtr)document, (IXMLDOMDocument3**)&pObj); + hr = get_domdoc_from_xmldoc((xmlDocPtr)document, (IXMLDOMDocument3**)&obj); if (FAILED(hr)) return NULL; - return pObj; + return obj; } #else diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 1926f50..816f4e3 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4822,7 +4822,8 @@ if (0) static void test_cloneNode(void ) { - IXMLDOMDocument *doc, *doc2; + IXMLDOMDocument2 *doc, *doc_clone; + IXMLDOMDocument *doc2; VARIANT_BOOL b; IXMLDOMNodeList *pList; IXMLDOMNamedNodeMap *mapAttr; @@ -4831,14 +4832,52 @@ static void test_cloneNode(void ) IXMLDOMNode *node, *attr; IXMLDOMNode *node_clone; IXMLDOMNode *node_first; + VARIANT v; HRESULT hr; - doc = create_document(&IID_IXMLDOMDocument); + doc = create_document(&IID_IXMLDOMDocument2); - ole_check(IXMLDOMDocument_loadXML(doc, _bstr_(complete4A), &b)); + hr = IXMLDOMDocument2_loadXML(doc, _bstr_(complete4A), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); ok(b == VARIANT_TRUE, "failed to load XML string\n"); - hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("lc/pr"), &node); + hr = IXMLDOMDocument2_getProperty(doc, _bstr_("SelectionLanguage"), &v); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(V_BSTR(&v), _bstr_("XSLPattern")), "got prop value %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_BSTR(&v) = _bstr_("XPath"); + V_VT(&v) = VT_BSTR; + hr = IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionLanguage"), v); + ok(hr == S_OK, "got 0x%08x\n", hr); + VariantClear(&v); + + /* clone document node */ + hr = IXMLDOMDocument2_cloneNode(doc, VARIANT_TRUE, &node); + ok( hr == S_OK, "ret %08x\n", hr ); + ok( node != NULL, "node %p\n", node ); + + hr = IXMLDOMNode_get_childNodes(node, &pList); + ok( hr == S_OK, "ret %08x\n", hr ); + length = 0; + hr = IXMLDOMNodeList_get_length(pList, &length); + ok( hr == S_OK, "ret %08x\n", hr ); + ok(length == 2, "got %d\n", length); + IXMLDOMNodeList_Release(pList); + + hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMDocument2, (void**)&doc_clone); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* cloned document inherits properties */ + hr = IXMLDOMDocument2_getProperty(doc_clone, _bstr_("SelectionLanguage"), &v); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(V_BSTR(&v), _bstr_("XPath")), "got prop value %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + IXMLDOMDocument2_Release(doc_clone); + IXMLDOMNode_Release(node); + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("lc/pr"), &node); ok( hr == S_OK, "ret %08x\n", hr ); ok( node != NULL, "node %p\n", node ); @@ -4926,7 +4965,7 @@ static void test_cloneNode(void ) IXMLDOMNode_Release(node_clone); IXMLDOMNode_Release(node); - IXMLDOMDocument_Release(doc); + IXMLDOMDocument2_Release(doc); free_bstrs(); }

1 0

Nikolay Sivov : advapi32: Make RegOpenCurrentUser() return real key handles for current SID.
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: 152cf6e7a0c79f25f6a00b4e1ed3c44e57239c34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=152cf6e7a0c79f25f6a00b4e1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 28 01:18:00 2015 +0300 advapi32: Make RegOpenCurrentUser() return real key handles for current SID. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 62d3309a725fb27f0c606800b43e29be69f4bcea) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/registry.c | 48 +++++++++++++++++++++++++++++++++++++++++- dlls/advapi32/tests/registry.c | 13 ++++++++++++ 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 0b40a8d..e894294 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -37,6 +37,7 @@ #include "winerror.h" #include "winternl.h" #include "winuser.h" +#include "sddl.h" #include "advapi32_misc.h" #include "wine/unicode.h" @@ -623,6 +624,21 @@ LSTATUS WINAPI RegOpenKeyA( HKEY hkey, LPCSTR name, PHKEY retkey ) return RegOpenKeyExA( hkey, name, 0, MAXIMUM_ALLOWED, retkey ); } +static WCHAR *get_thread_token_user_sid(HANDLE token) +{ + WCHAR *sidstring = NULL; + TOKEN_USER *info; + DWORD len = 0; + + GetTokenInformation(token, TokenUser, NULL, 0, &len); + + info = heap_alloc(len); + if (GetTokenInformation(token, TokenUser, info, len, &len)) + ConvertSidToStringSidW(info->User.Sid, &sidstring); + heap_free(info); + + return sidstring; +} /****************************************************************************** * RegOpenCurrentUser [ADVAPI32.@] @@ -646,7 +662,37 @@ LSTATUS WINAPI RegOpenKeyA( HKEY hkey, LPCSTR name, PHKEY retkey ) */ LSTATUS WINAPI RegOpenCurrentUser( REGSAM access, PHKEY retkey ) { - return RegOpenKeyExA( HKEY_CURRENT_USER, "", 0, access, retkey ); + WCHAR *sidstring = NULL; + HANDLE threadtoken; + LSTATUS ret; + + /* get current user SID */ + if (OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, FALSE, &threadtoken)) + { + sidstring = get_thread_token_user_sid(threadtoken); + CloseHandle(threadtoken); + } + + if (!sidstring) + { + ImpersonateSelf(SecurityIdentification); + if (OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, FALSE, &threadtoken)) + { + sidstring = get_thread_token_user_sid(threadtoken); + CloseHandle(threadtoken); + } + RevertToSelf(); + } + + if (sidstring) + { + ret = RegOpenKeyExW( HKEY_USERS, sidstring, 0, access, retkey ); + LocalFree(sidstring); + } + else + ret = RegOpenKeyExA( HKEY_CURRENT_USER, "", 0, access, retkey ); + + return ret; } diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index b798129..2741b5f 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3300,6 +3300,18 @@ static void test_delete_key_value(void) RegCloseKey(subkey); } +static void test_RegOpenCurrentUser(void) +{ + HKEY key; + LONG ret; + + key = HKEY_CURRENT_USER; + ret = RegOpenCurrentUser(KEY_READ, &key); + ok(!ret, "got %d, error %d\n", ret, GetLastError()); + ok(key != HKEY_CURRENT_USER, "got %p\n", key); + RegCloseKey(key); +} + START_TEST(registry) { /* Load pointers for functions that are not available in all Windows versions */ @@ -3332,6 +3344,7 @@ START_TEST(registry) test_deleted_key(); test_delete_value(); test_delete_key_value(); + test_RegOpenCurrentUser(); /* cleanup */ delete_key( hkey_main );

1 0

Andrey Melnikov : gdi32: Handle NULL filename in GetICMProfileA().
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: 0ad53eeecea1a1c5306d1ff38154b46a51f0e59b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ad53eeecea1a1c5306d1ff38… Author: Andrey Melnikov <temnota.am(a)gmail.com> Date: Mon Dec 21 12:22:41 2015 +0300 gdi32: Handle NULL filename in GetICMProfileA(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Andrey Melnikov <temnota.am(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d4d304f4365134a6aec0fad18989e3c5f1950fe1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/icm.c | 9 ++++++++- dlls/gdi32/tests/icm.c | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/icm.c b/dlls/gdi32/icm.c index d3a345d..9d0e2f6 100644 --- a/dlls/gdi32/icm.c +++ b/dlls/gdi32/icm.c @@ -116,11 +116,18 @@ BOOL WINAPI GetICMProfileA(HDC hdc, LPDWORD size, LPSTR filename) TRACE("%p, %p, %p\n", hdc, size, filename); - if (!hdc || !size || !filename) return FALSE; + if (!hdc || !size) return FALSE; if (GetICMProfileW(hdc, &buflen, filenameW)) { int len = WideCharToMultiByte(CP_ACP, 0, filenameW, -1, NULL, 0, NULL, NULL); + + if (!filename) + { + *size = len; + return FALSE; + } + if (*size >= len) { WideCharToMultiByte(CP_ACP, 0, filenameW, -1, filename, *size, NULL, NULL); diff --git a/dlls/gdi32/tests/icm.c b/dlls/gdi32/tests/icm.c index 764d0d2..6208090 100644 --- a/dlls/gdi32/tests/icm.c +++ b/dlls/gdi32/tests/icm.c @@ -55,7 +55,6 @@ static void test_GetICMProfileA( HDC dc ) size = 0; ret = GetICMProfileA( dc, &size, NULL ); ok( !ret, "GetICMProfileA succeeded\n" ); -todo_wine ok( size > 0, "got %u\n", size ); size = MAX_PATH;

1 0

Piotr Caban : msvcrt: Add support for member function pointers demangling in unDName function.
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: e10558ecddc30f42d581e1b58f1ff328b7e64071 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e10558ecddc30f42d581e1b58… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 20 22:01:12 2016 +0100 msvcrt: Add support for member function pointers demangling in unDName function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 112ad7fc8766b7b09d5026db19f2e826a9c83d9a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/tests/cpp.c | 3 +++ dlls/msvcrt/undname.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index c331db1..73011b0 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1323,6 +1323,9 @@ static void test_demangle(void) /* 128 */ {"??Xstd@@YAAEAV?$complex(a)M@0(a)AEAV10@AEBV10@@Z", "class std::complex<float> & std::operator*=(class std::complex<float> &,class std::complex<float> const &)", "??Xstd@@YAAEAV?$complex(a)M@0(a)AEAV10@AEBV10@@Z", 2}, +/* 129 */ {"??$run(a)XVTask_Render_Preview@@@QtConcurrent@@YA?AV?$QFuture(a)X@@PEAVTask_Render_Preview@@P82(a)EAAXXZ@Z", + "class QFuture<void> __cdecl QtConcurrent::run<void,class Task_Render_Preview>(class Task_Render_Preview * __ptr64,void (__cdecl Task_Render_Preview::*)(void) __ptr64)", + "??$run(a)XVTask_Render_Preview@@@QtConcurrent@@YA?AV?$QFuture(a)X@@PEAVTask_Render_Preview@@P82(a)EAAXXZ@Z"}, }; int i, num_test = (sizeof(test)/sizeof(test[0])); char* name; diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 5972320..dd5e599 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -859,14 +859,55 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, case 'P': /* Pointer */ if (isdigit(*sym->current)) { - /* FIXME: P6 = Function pointer, others who knows.. */ - if (*sym->current++ == '6') + /* FIXME: + * P6 = Function pointer + * P8 = Member function pointer + * others who knows.. */ + if (*sym->current == '8') { char* args = NULL; const char* call_conv; const char* exported; struct datatype_t sub_ct; unsigned mark = sym->stack.num; + const char* class; + const char* modifier; + const char* ptr_modif; + + sym->current++; + + if (!(class = get_class_name(sym))) + goto done; + if (!get_modifier(sym, &modifier, &ptr_modif)) + goto done; + if (modifier) + modifier = str_printf(sym, "%s %s", modifier, ptr_modif); + else if(ptr_modif[0]) + modifier = str_printf(sym, " %s", ptr_modif); + if (!get_calling_convention(*sym->current++, + &call_conv, &exported, + sym->flags & ~UNDNAME_NO_ALLOCATION_LANGUAGE)) + goto done; + if (!demangle_datatype(sym, &sub_ct, pmt_ref, FALSE)) + goto done; + + args = get_args(sym, pmt_ref, TRUE, '(', ')'); + if (!args) goto done; + sym->stack.num = mark; + + ct->left = str_printf(sym, "%s%s (%s %s::*", + sub_ct.left, sub_ct.right, call_conv, class); + ct->right = str_printf(sym, ")%s%s", args, modifier); + } + else if (*sym->current == '6') + { + char* args = NULL; + const char* call_conv; + const char* exported; + struct datatype_t sub_ct; + unsigned mark = sym->stack.num; + + sym->current++; if (!get_calling_convention(*sym->current++, &call_conv, &exported,

1 0

Piotr Caban : msvcr120: Add _set_FMA3_enable stub.
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: 2adb7d6c936159cbe65dcdd58b53c2b69547b22c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2adb7d6c936159cbe65dcdd58… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 18 21:08:29 2016 +0100 msvcr120: Add _set_FMA3_enable stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 68fedc12681ecacc714c01e9a34266ef70e8d6ec) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcrt/math.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 129ba27..b2eff02 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1639,7 +1639,7 @@ @ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) @ stdcall -arch=i386 _seh_longjmp_unwind(ptr) @ cdecl -arch=i386 _set_SSE2_enable(long) MSVCRT__set_SSE2_enable -@ stub -arch=win64 _set_FMA3_enable +@ cdecl -arch=win64 _set_FMA3_enable(long) MSVCRT__set_FMA3_enable @ cdecl _set_abort_behavior(long long) MSVCRT__set_abort_behavior @ cdecl _set_controlfp(long long) @ cdecl _set_doserrno(long) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 557bcec..51bb99c 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -73,6 +73,17 @@ int CDECL MSVCRT__set_SSE2_enable(int flag) return sse2_enabled; } +#ifdef _WIN64 +/********************************************************************* + * _set_FMA3_enable (MSVCR120.@) + */ +int CDECL MSVCRT__set_FMA3_enable(int flag) +{ + FIXME("(%x) stub\n", flag); + return 0; +} +#endif + #if defined(__x86_64__) || defined(__arm__) || _MSVCR_VER>=120 /*********************************************************************

1 0

Pierre Schweitzer : mpr: Add support for REG_EXPAND_SZ for providers path.
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: 97585fed061bb7ce0eb2e292da6a88b7348070c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97585fed061bb7ce0eb2e292d… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Mon Jan 25 08:17:48 2016 +0100 mpr: Add support for REG_EXPAND_SZ for providers path. Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 80eb2fa08eb21ba9504438493fa66097ed03faf5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mpr/wnet.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index dd34969..f130de0 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -133,11 +133,17 @@ static void _tryLoadProvider(PCWSTR provider) DWORD type, size = sizeof(providerPath); if (RegQueryValueExW(hKey, szProviderPath, NULL, &type, - (LPBYTE)providerPath, &size) == ERROR_SUCCESS && type == REG_SZ) + (LPBYTE)providerPath, &size) == ERROR_SUCCESS && (type == REG_SZ || type == REG_EXPAND_SZ)) { static const WCHAR szProviderName[] = { 'N','a','m','e',0 }; PWSTR name = NULL; - + + if (type == REG_EXPAND_SZ) + { + WCHAR path[MAX_PATH]; + if (ExpandEnvironmentStringsW(providerPath, path, MAX_PATH)) lstrcpyW( providerPath, path ); + } + size = 0; RegQueryValueExW(hKey, szProviderName, NULL, NULL, NULL, &size); if (size)

1 0

Thomas Faller : dde: Fix use-after-free.
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: 0350c24a4f7dfa54ac48c9c536c45ce7e5dc974c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0350c24a4f7dfa54ac48c9c53… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Tue Jan 12 22:06:30 2016 +0100 dde: Fix use-after-free. Signed-off-by: Thomas Faller <tfaller1(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4e7a7d01ffd1bbbb07acfe08ebf74046ad1f9d9a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/dde_client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index 633331d..989131c 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -778,7 +778,7 @@ static WDML_QUEUE_STATE WDML_HandlePokeReply(WDML_CONV* pConv, MSG* msg, WDML_XA GlobalDeleteAtom(uiHi); if (ack) *ack = uiLo; - GlobalFree(pXAct->hMem); + pXAct->hMem = GlobalFree(pXAct->hMem); pXAct->hDdeData = (HDDEDATA)TRUE; return TRUE;

1 0