- Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : ntdll: RtlFirstFreeAce only return FALSE on error.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 18ca759234ac7cb00ba37999422dd974d5c7afff URL: https://gitlab.winehq.org/wine/wine/-/commit/18ca759234ac7cb00ba37999422dd9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Feb 8 13:16:52 2021 +1100 ntdll: RtlFirstFreeAce only return FALSE on error. (cherry picked from commit 0cc26c121831be32bb20092398668f4dfd732327) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/sec.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 5c1c9b1fbb0..9cebcb4f58e 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1149,9 +1149,8 @@ BOOLEAN WINAPI RtlFirstFreeAce( return FALSE; ace = (PACE_HEADER)(((BYTE*)ace)+ace->AceSize); } - if ((BYTE *)ace >= (BYTE *)acl + acl->AclSize) - return FALSE; - *x = ace; + if ((BYTE *)ace <= (BYTE *)acl + acl->AclSize) + *x = ace; return TRUE; }

1 0

Alistair Leslie-Hughes : ntdll: Check return parameter before use.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 6d0c0a7ed485fef067e0cdadc2f96bcea6ed674b URL: https://gitlab.winehq.org/wine/wine/-/commit/6d0c0a7ed485fef067e0cdadc2f96b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 3 08:56:39 2021 +1100 ntdll: Check return parameter before use. (cherry picked from commit 0cbfd7ab4cd1b4102bfd6204ff4ed64cca8f5b55) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/sec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index eccfc82ce8c..5c1c9b1fbb0 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1172,6 +1172,8 @@ NTSTATUS WINAPI RtlAddAce( return STATUS_INVALID_PARAMETER; if (!RtlFirstFreeAce(acl,&targetace)) return STATUS_INVALID_PARAMETER; + if (!targetace) + return STATUS_ALLOTTED_SPACE_EXCEEDED; nrofaces=0;ace=acestart; while (((BYTE *)ace - (BYTE *)acestart) < acelen) { nrofaces++;

1 0

Zhiyi Zhang : shell32/tests: Add SHOpenFolderAndSelectItems() tests.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 25a2351bc36c4fcc355bade4738b3e9b69a81bf2 URL: https://gitlab.winehq.org/wine/wine/-/commit/25a2351bc36c4fcc355bade4738b3e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 11 12:19:52 2022 +0800 shell32/tests: Add SHOpenFolderAndSelectItems() tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> (cherry picked from commit 7c60e6233aa7ff1bef8e2db69e685f40547a1bbf) Conflicts: dlls/shell32/tests/shlfolder.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/tests/shlfolder.c | 100 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 29fcd0b7754..c1fdf3699ae 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -83,6 +83,37 @@ static WCHAR *make_wstr(const char *str) return ret; } +static BOOL check_window_exists(const char *name) +{ + HWND window = NULL; + int i; + + for (i = 0; i < 10; i++) + { + if ((window = FindWindowA("ExplorerWClass", name)) + || (window = FindWindowA("CabinetWClass", name))) + { + SendMessageA(window, WM_SYSCOMMAND, SC_CLOSE, 0); + break; + } + + Sleep(100); + } + + if (!window) + return FALSE; + + for (i = 0; i < 10; i++) + { + if (!IsWindow(window)) + break; + + Sleep(100); + } + + return TRUE; +} + static void init_function_pointers(void) { HMODULE hmod; @@ -5360,6 +5391,74 @@ static void test_SHGetSetFolderCustomSettings(void) RemoveDirectoryW(pathW); } +static void test_SHOpenFolderAndSelectItems(void) +{ + PIDLIST_ABSOLUTE folder, items[2]; + HRESULT hr; + + /* NULL folder */ + hr = SHOpenFolderAndSelectItems(NULL, 0, NULL, 0); + todo_wine + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + /* Open and select folder without child items */ + folder = ILCreateFromPathW(L"C:\\Windows\\System32"); + hr = SHOpenFolderAndSelectItems(folder, 0, NULL, 0); + todo_wine + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine + ok(check_window_exists("Windows"), "Failed to create window.\n"); + ILFree(folder); + + /* Open folder and select one child item */ + folder = ILCreateFromPathW(L"C:\\Windows"); + items[0] = ILCreateFromPathW(L"C:\\Windows\\System32"); + hr = SHOpenFolderAndSelectItems(folder, 1, (PCUITEMID_CHILD_ARRAY)items, 0); + todo_wine + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine + ok(check_window_exists("Windows"), "Failed to create window.\n"); + ILFree(items[0]); + ILFree(folder); + + /* Open folder and select two child items */ + folder = ILCreateFromPathW(L"C:\\Windows"); + items[0] = ILCreateFromPathW(L"C:\\Windows\\System32"); + items[1] = ILCreateFromPathW(L"C:\\Windows\\Resources"); + hr = SHOpenFolderAndSelectItems(folder, 2, (PCUITEMID_CHILD_ARRAY)items, 0); + todo_wine + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine + ok(check_window_exists("Windows"), "Failed to create window.\n"); + ILFree(items[1]); + ILFree(items[0]); + ILFree(folder); + + /* Open folder and select one child item with OFASI_EDIT */ + folder = ILCreateFromPathW(L"C:\\Windows"); + items[0] = ILCreateFromPathW(L"C:\\Windows\\System32"); + hr = SHOpenFolderAndSelectItems(folder, 1, (PCUITEMID_CHILD_ARRAY)items, OFASI_EDIT); + todo_wine + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine + ok(check_window_exists("Windows"), "Failed to create window.\n"); + ILFree(items[0]); + ILFree(folder); + + /* Open folder and select two child items and OFASI_EDIT */ + folder = ILCreateFromPathW(L"C:\\Windows"); + items[0] = ILCreateFromPathW(L"C:\\Windows\\System32"); + items[1] = ILCreateFromPathW(L"C:\\Windows\\Resources"); + hr = SHOpenFolderAndSelectItems(folder, 2, (PCUITEMID_CHILD_ARRAY)items, 0); + todo_wine + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine + ok(check_window_exists("Windows"), "Failed to create window.\n"); + ILFree(items[1]); + ILFree(items[0]); + ILFree(folder); +} + START_TEST(shlfolder) { init_function_pointers(); @@ -5404,6 +5503,7 @@ START_TEST(shlfolder) test_GetDefaultSearchGUID(); test_SHLimitInputEdit(); test_SHGetSetFolderCustomSettings(); + test_SHOpenFolderAndSelectItems(); OleUninitialize(); }

1 0

Zhiyi Zhang : include: Add SHOpenFolderAndSelectItems() declaration and flags.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: f25b2e28c15bc89ad04f3085d1150eac2666f359 URL: https://gitlab.winehq.org/wine/wine/-/commit/f25b2e28c15bc89ad04f3085d1150e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 11 12:19:07 2022 +0800 include: Add SHOpenFolderAndSelectItems() declaration and flags. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> (cherry picked from commit f6206bccde6be70e10a6d77fb0b7605056ff18e0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/shlobj.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/shlobj.h b/include/shlobj.h index d30944662f7..8d6eab85eb6 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -96,6 +96,7 @@ BOOL WINAPI SHGetPathFromIDListEx(PCIDLIST_ABSOLUTE,WCHAR*,DWORD,GPFIDL_ INT WINAPI SHHandleUpdateImage(LPCITEMIDLIST); HRESULT WINAPI SHILCreateFromPath(LPCWSTR,LPITEMIDLIST*,DWORD*); HRESULT WINAPI SHLoadOLE(LPARAM); +HRESULT WINAPI SHOpenFolderAndSelectItems(PCIDLIST_ABSOLUTE,UINT,PCUITEMID_CHILD_ARRAY,DWORD); HRESULT WINAPI SHParseDisplayName(LPCWSTR,IBindCtx*,LPITEMIDLIST*,SFGAOF,SFGAOF*); HRESULT WINAPI SHPathPrepareForWriteA(HWND,IUnknown*,LPCSTR,DWORD); HRESULT WINAPI SHPathPrepareForWriteW(HWND,IUnknown*,LPCWSTR,DWORD); @@ -142,6 +143,10 @@ BOOL WINAPI ImportPrivacySettings(LPCWSTR, BOOL*, BOOL*); #define SHOP_FILEPATH 0x02 #define SHOP_VOLUMEGUID 0x04 +/* SHOpenFolderAndSelectItems flags */ +#define OFASI_EDIT 0x0001 +#define OFASI_OPENDESKTOP 0x0002 + BOOL WINAPI SHObjectProperties(HWND,DWORD,LPCWSTR,LPCWSTR); #define PCS_FATAL 0x80000000

1 0

Zhiyi Zhang : shell32: Correct SHOpenFolderAndSelectItems() prototype.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 7f67fe0fcb39d973356a91e1895f8be800601d33 URL: https://gitlab.winehq.org/wine/wine/-/commit/7f67fe0fcb39d973356a91e1895f8b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 11 12:17:51 2022 +0800 shell32: Correct SHOpenFolderAndSelectItems() prototype. The third parameter is of type PCUITEMID_CHILD_ARRAY, not PCUITEMID_CHILD_ARRAY *. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> (cherry picked from commit 7884c142420f96e54b33f8b5cf28ea2ec6ec619b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shlfolder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index 10aafc160c0..b70bfbda4c7 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -612,8 +612,8 @@ HRESULT WINAPI SHCreateLinks( HWND hWnd, LPCSTR lpszDir, LPDATAOBJECT lpDataObje * * Added in XP. */ -HRESULT WINAPI SHOpenFolderAndSelectItems( PCIDLIST_ABSOLUTE pidlFolder, UINT cidl, - PCUITEMID_CHILD_ARRAY *apidl, DWORD flags ) +HRESULT WINAPI SHOpenFolderAndSelectItems(PCIDLIST_ABSOLUTE pidlFolder, UINT cidl, + PCUITEMID_CHILD_ARRAY apidl, DWORD flags) { FIXME("%p %u %p 0x%x: stub\n", pidlFolder, cidl, apidl, flags); return E_NOTIMPL;

1 0

Paul Gofman : msxml3: Use node_get_text() in domelem_get_nodeTypedValue() if no type is present.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 6d098b162a0154f0aa1e87241797afd2eb7773af URL: https://gitlab.winehq.org/wine/wine/-/commit/6d098b162a0154f0aa1e87241797af… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jul 25 15:02:08 2022 -0500 msxml3: Use node_get_text() in domelem_get_nodeTypedValue() if no type is present. (cherry picked from commit 89bbd1327e42e62f7ebd1a2efaeee6dfbdfe20a0) Conflicts: dlls/msxml3/tests/domdoc.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msxml3/element.c | 8 ++++- dlls/msxml3/tests/domdoc.c | 75 ++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 77 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index e1462c47d88..3037a042da5 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -455,7 +455,6 @@ static inline HRESULT variant_from_dt(XDR_DT dt, xmlChar* str, VARIANT* v) switch (dt) { - case DT_INVALID: case DT_STRING: case DT_NMTOKEN: case DT_NMTOKENS: @@ -737,6 +736,13 @@ static HRESULT WINAPI domelem_get_nodeTypedValue( V_VT(v) = VT_NULL; dt = element_get_dt(get_element(This)); + + if (dt == DT_INVALID) + { + if (SUCCEEDED(hr = node_get_text(&This->node, &V_BSTR(v)))) + V_VT(v) = VT_BSTR; + return hr; + } content = xmlNodeGetContent(get_element(This)); hr = variant_from_dt(dt, content, v); xmlFree(content); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index e931c683fb8..ddffd2143d6 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -910,7 +910,11 @@ static const CHAR szTypeValueXML[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" "<root xmlns:dt=\"urn:schemas-microsoft-com:datatypes\">\n" " <string>Wine</string>\n" -" <string2 dt:dt=\"string\">String</string2>\n" +" <string2 dt:dt=\"string\">String </string2>\n" +" <string3> Wine Wine </string3>\n" +" <string4>\nWine Wine\t</string4>\n" +" <string5> </string5>\n" +" <nested><s1> s1 </s1><s2>\ns2 s2\t</s2></nested>\n" " <number dt:dt=\"number\">12.44</number>\n" " <number2 dt:dt=\"NUMbEr\">-3.71e3</number2>\n" " <int dt:dt=\"int\">-13</int>\n" @@ -6855,11 +6859,16 @@ typedef struct _nodetypedvalue_t { const char *name; VARTYPE type; const char *value; /* value in string format */ + BOOL no_type; } nodetypedvalue_t; static const nodetypedvalue_t get_nodetypedvalue[] = { - { "root/string", VT_BSTR, "Wine" }, - { "root/string2", VT_BSTR, "String" }, + { "root/string", VT_BSTR, "Wine", TRUE }, + { "root/string2", VT_BSTR, "String " }, + { "root/string3", VT_BSTR, " Wine Wine ", TRUE }, + { "root/string4", VT_BSTR, "\nWine Wine\t", TRUE }, + { "root/string5", VT_BSTR, "", TRUE }, + { "root/nested", VT_BSTR, " s1 \ns2 s2\t", TRUE }, { "root/number", VT_BSTR, "12.44" }, { "root/number2", VT_BSTR, "-3.71e3" }, { "root/int", VT_I4, "-13" }, @@ -6886,6 +6895,24 @@ static const nodetypedvalue_t get_nodetypedvalue[] = { { 0 } }; +static const char *strip_spaces(const char *str) +{ + static char buf[256]; + const char *p; + + while (isspace(*str)) + ++str; + + p = str + strlen(str); + while (p != str && isspace(p[-1])) + --p; + + memcpy(buf, str, p - str); + buf[p - str] = 0; + + return buf; +} + static void test_nodeTypedValue(void) { const nodetypedvalue_t *entry = get_nodetypedvalue; @@ -7081,8 +7108,46 @@ static void test_nodeTypedValue(void) "expected %s, got %s\n", entry->value, wine_dbgstr_w(V_BSTR(&value))); } else - ok(lstrcmpW( V_BSTR(&value), _bstr_(entry->value)) == 0, - "expected %s, got %s\n", entry->value, wine_dbgstr_w(V_BSTR(&value))); + { + BSTR bstr, expected; + + expected = entry->no_type ? _bstr_(strip_spaces(entry->value)) : _bstr_(entry->value); + ok(!wcscmp( V_BSTR(&value), expected ), "expected %s, got %s\n", + debugstr_w(expected), wine_dbgstr_w(V_BSTR(&value))); + if (entry->no_type) + { + VariantClear( &value ); + + hr = IXMLDOMDocument_get_preserveWhiteSpace(doc, &b); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr ); + ok(b == VARIANT_FALSE, "got %d\n", b); + + hr = IXMLDOMNode_get_text(node, &bstr); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!wcscmp( bstr, expected ), "expected %s, got %s\n", + debugstr_w(expected), wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + hr = IXMLDOMDocument_put_preserveWhiteSpace(doc, VARIANT_TRUE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr ); + + expected = _bstr_(entry->value); + hr = IXMLDOMNode_get_text(node, &bstr); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!wcscmp( bstr, expected ), "expected %s, got %s\n", + debugstr_w(expected), wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + hr = IXMLDOMNode_get_nodeTypedValue(node, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr ); + ok(V_VT(&value) == entry->type, "incorrect type, expected %d, got %d\n", entry->type, V_VT(&value)); + ok(!wcscmp( V_BSTR(&value), expected ), "expected %s, got %s\n", + debugstr_w(expected), wine_dbgstr_w(V_BSTR(&value))); + + hr = IXMLDOMDocument_put_preserveWhiteSpace(doc, VARIANT_FALSE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr ); + } + } VariantClear( &value ); IXMLDOMNode_Release(node);

1 0

Jinoh Kang : riched20: Ensure MEPF_COMPLEX is unset when in password input mode.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 4f52f64efc774cc480176247dc931ae1b806ad05 URL: https://gitlab.winehq.org/wine/wine/-/commit/4f52f64efc774cc480176247dc931a… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Tue Jul 12 02:28:15 2022 +0900 riched20: Ensure MEPF_COMPLEX is unset when in password input mode. Otherwise, Wine may crash while attempting to fetch the script shaping information, which does not exist since shape_para() was not called. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53335 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> (cherry picked from commit f77f12ba3b1dad9ebdcb116c66b137e9103a0d1b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/riched20/wrap.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 9456d54d815..a2747806127 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -835,6 +835,15 @@ static void ME_WrapTextParagraph( ME_TextEditor *editor, ME_Context *c, ME_Parag if (SUCCEEDED( itemize_para( c, para ) )) shape_para( c, para ); } + else + { + /* If the user has just converted a normal rich editor with already + * existing text into a password input, the text may contain paragraphs + * with MEPF_COMPLEX set. Since we don't really shape any paragraphs + * here, we need to ensure that the MEPF_COMPLEX flag is unset. + */ + para->nFlags &= ~MEPF_COMPLEX; + } wc.context = c; wc.para = para;

1 0

Eric Pouech : wldap32: Fix compilation in 32-bit.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 65cd882ae0503c0b3f92f3315a1ab1026365593d URL: https://gitlab.winehq.org/wine/wine/-/commit/65cd882ae0503c0b3f92f3315a1ab1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 4 09:34:49 2022 +0100 wldap32: Fix compilation in 32-bit. 32-bit compilation has been broken by 8db1662d749991a77b8945c752ab024d2d6b1244. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 25946b48148784e8275c1685f6498ab88f553ca3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wldap32/libldap.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/wldap32/libldap.c b/dlls/wldap32/libldap.c index 8872421dabc..592e526ecdc 100644 --- a/dlls/wldap32/libldap.c +++ b/dlls/wldap32/libldap.c @@ -53,7 +53,14 @@ C_ASSERT( sizeof(LDAPSortKeyU) == sizeof(LDAPSortKey) ); C_ASSERT( sizeof(LDAPVLVInfoU) == sizeof(LDAPVLVInfo) ); C_ASSERT( sizeof(LDAPAPIInfoU) == sizeof(LDAPAPIInfo) ); C_ASSERT( sizeof(LDAPAPIFeatureInfoU) == sizeof(LDAPAPIFeatureInfo) ); -C_ASSERT( sizeof(struct timevalU) == sizeof(struct timeval) ); + +static struct timeval *convert_timeval(const struct timevalU *tvu, struct timeval *tv) +{ + if (!tvu) return NULL; + tv->tv_sec = tvu->tv_sec; + tv->tv_usec = tvu->tv_usec; + return tv; +} #define WLDAP32_LBER_ERROR (~0l) @@ -488,8 +495,9 @@ static NTSTATUS wrap_ldap_rename_s( void *args ) static NTSTATUS wrap_ldap_result( void *args ) { struct ldap_result_params *params = args; + struct timeval tv; return ldap_result( params->ld, params->msgid, params->all, - (struct timeval *)params->timeout, (LDAPMessage **)params->result ); + convert_timeval(params->timeout, &tv), (LDAPMessage **)params->result ); } static NTSTATUS wrap_ldap_sasl_bind( void *args ) @@ -555,18 +563,20 @@ static NTSTATUS wrap_ldap_sasl_interactive_bind_s( void *args ) static NTSTATUS wrap_ldap_search_ext( void *args ) { struct ldap_search_ext_params *params = args; + struct timeval tv; return ldap_search_ext( params->ld, params->base, params->scope, params->filter, params->attrs, params->attrsonly, (LDAPControl **)params->serverctrls, - (LDAPControl **)params->clientctrls, (struct timeval *)params->timeout, + (LDAPControl **)params->clientctrls, convert_timeval(params->timeout, &tv), params->sizelimit, (int *)params->msg ); } static NTSTATUS wrap_ldap_search_ext_s( void *args ) { struct ldap_search_ext_s_params *params = args; + struct timeval tv; return ldap_search_ext_s( params->ld, params->base, params->scope, params->filter, params->attrs, params->attrsonly, (LDAPControl **)params->serverctrls, - (LDAPControl **)params->clientctrls, (struct timeval *)params->timeout, + (LDAPControl **)params->clientctrls, convert_timeval(params->timeout, &tv), params->sizelimit, (LDAPMessage **)params->result ); }

1 0

Torge Matthies : msvcr100: Add _StructuredTaskCollection::_Schedule stub.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: b55f3b7a500616745792332443fbee50573dcd2c URL: https://gitlab.winehq.org/wine/wine/-/commit/b55f3b7a500616745792332443fbee… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Mon Jul 4 20:28:56 2022 +0200 msvcr100: Add _StructuredTaskCollection::_Schedule stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47375 Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d31e54d61c16afc8af28b6fd960507f7fd2ac283) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/concrt140/concrt140.spec | 6 +++--- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcrt/concurrency.c | 15 +++++++++++++++ 6 files changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index ad6e90d725c..8474bde4b54 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -594,9 +594,9 @@ @ stub -arch=arm ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QAA?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z @ stub -arch=i386 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QAG?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z @ stub -arch=win64 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QEAA?AW4_TaskCollectionStatus(a)23@PEAV_UnrealizedChore(a)23@@Z -@ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z -@ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z -@ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z +@ cdecl -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule +@ thiscall -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule +@ cdecl -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule @ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z @ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z @ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@PEAVlocation(a)3@@Z diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 19b4cbe96d7..32c1658ebe9 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -363,8 +363,8 @@ @ stub -arch=win64 ?_RunAndWait(a)_StructuredTaskCollection@details(a)Concurrency@@QEAA?AW4_TaskCollectionStatus(a)23@PEAV_UnrealizedChore(a)23@@Z @ stub -arch=win32 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QAG?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z @ stub -arch=win64 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QEAA?AW4_TaskCollectionStatus(a)23@PEAV_UnrealizedChore(a)23@@Z -@ stub -arch=win32 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z -@ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z +@ thiscall -arch=win32 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule +@ cdecl -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule @ stub -arch=win32 ?_Schedule(a)_TaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z @ stub -arch=win64 ?_Schedule(a)_TaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z @ thiscall -arch=win32 ?_SetSpinCount@?$_SpinWait@$00(a)details@Concurrency@@QAEXI(a)Z(ptr long) SpinWait__SetSpinCount diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 64b634b582e..c4cd29a2af7 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -614,9 +614,9 @@ @ stub -arch=arm ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QAA?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z @ stub -arch=i386 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QAG?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z @ stub -arch=win64 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QEAA?AW4_TaskCollectionStatus(a)23@PEAV_UnrealizedChore(a)23@@Z -@ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z -@ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z -@ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z +@ cdecl -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule +@ thiscall -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule +@ cdecl -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule @ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z @ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z @ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@PEAVlocation(a)3@@Z diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 7b6ace9f857..c1362a0f937 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -597,9 +597,9 @@ @ stub -arch=arm ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QAA?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z @ stub -arch=i386 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QAG?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z @ stub -arch=win64 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QEAA?AW4_TaskCollectionStatus(a)23@PEAV_UnrealizedChore(a)23@@Z -@ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z -@ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z -@ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z +@ cdecl -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule +@ thiscall -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule +@ cdecl -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z(ptr ptr) _StructuredTaskCollection__Schedule @ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z @ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z @ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@PEAVlocation(a)3@@Z diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index f5ff30a46e4..55cf9a1e293 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -594,9 +594,9 @@ @ stub -arch=arm ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QAA?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z @ stub -arch=i386 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QAG?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z @ stub -arch=win64 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QEAA?AW4_TaskCollectionStatus(a)23@PEAV_UnrealizedChore(a)23@@Z -@ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z -@ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z -@ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z +@ cdecl -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z(ptr ptr) msvcr120.?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z +@ thiscall -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z(ptr ptr) msvcr120.?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z +@ cdecl -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z(ptr ptr) msvcr120.?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z @ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z @ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z @ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@PEAVlocation(a)3@@Z diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index b6e8c758e47..10d733bfdaf 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -164,6 +164,11 @@ typedef struct yield_func yield_func; } SpinWait; +typedef struct +{ + char dummy; +} _UnrealizedChore; + typedef struct { char dummy; @@ -1770,6 +1775,16 @@ void __thiscall _StructuredTaskCollection_dtor(_StructuredTaskCollection *this) #endif /* _MSVCR_VER >= 120 */ +/* ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z */ +/* ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z */ +/* ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z */ +DEFINE_THISCALL_WRAPPER(_StructuredTaskCollection__Schedule, 8) +void __thiscall _StructuredTaskCollection__Schedule( + _StructuredTaskCollection *this, _UnrealizedChore *chore) +{ + FIXME("(%p %p): stub!\n", this, chore); +} + /* ??0critical_section(a)Concurrency@@QAE(a)XZ */ /* ??0critical_section(a)Concurrency@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(critical_section_ctor, 4)

1 0

Torge Matthies : msvcr120: Add _StructuredTaskCollection::_StructuredTaskCollection_dtor stub.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 8b8d572cd105bcc592eb6552560a8a404c36486b URL: https://gitlab.winehq.org/wine/wine/-/commit/8b8d572cd105bcc592eb6552560a8a… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Mon Jul 4 20:28:53 2022 +0200 msvcr120: Add _StructuredTaskCollection::_StructuredTaskCollection_dtor stub. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ccde147084d64e9a7a96d2b0b383d3b911abd527) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/concrt140/concrt140.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 4 +++- dlls/msvcrt/concurrency.c | 13 +++++++++++++ 4 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 3257d61bb37..ad6e90d725c 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -267,9 +267,9 @@ @ stub -arch=arm ??1_SpinLock(a)details@Concurrency@@QAA(a)XZ @ stub -arch=i386 ??1_SpinLock(a)details@Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1_SpinLock(a)details@Concurrency@@QEAA(a)XZ -@ stub -arch=arm ??1_StructuredTaskCollection(a)details@Concurrency@@QAA(a)XZ -@ stub -arch=i386 ??1_StructuredTaskCollection(a)details@Concurrency@@QAE(a)XZ -@ stub -arch=win64 ??1_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)XZ +@ cdecl -arch=arm ??1_StructuredTaskCollection(a)details@Concurrency@@QAA(a)XZ(ptr) _StructuredTaskCollection_dtor +@ thiscall -arch=i386 ??1_StructuredTaskCollection(a)details@Concurrency@@QAE(a)XZ(ptr) _StructuredTaskCollection_dtor +@ cdecl -arch=win64 ??1_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)XZ(ptr) _StructuredTaskCollection_dtor @ stub -arch=arm ??1_TaskCollection(a)details@Concurrency@@QAA(a)XZ @ stub -arch=i386 ??1_TaskCollection(a)details@Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1_TaskCollection(a)details@Concurrency@@QEAA(a)XZ diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 381f954d8a6..7b6ace9f857 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -290,9 +290,9 @@ @ stub -arch=arm ??1_SpinLock(a)details@Concurrency@@QAA(a)XZ @ stub -arch=i386 ??1_SpinLock(a)details@Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1_SpinLock(a)details@Concurrency@@QEAA(a)XZ -@ stub -arch=arm ??1_StructuredTaskCollection(a)details@Concurrency@@QAA(a)XZ -@ stub -arch=i386 ??1_StructuredTaskCollection(a)details@Concurrency@@QAE(a)XZ -@ stub -arch=win64 ??1_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)XZ +@ cdecl -arch=arm ??1_StructuredTaskCollection(a)details@Concurrency@@QAA(a)XZ(ptr) _StructuredTaskCollection_dtor +@ thiscall -arch=i386 ??1_StructuredTaskCollection(a)details@Concurrency@@QAE(a)XZ(ptr) _StructuredTaskCollection_dtor +@ cdecl -arch=win64 ??1_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)XZ(ptr) _StructuredTaskCollection_dtor @ stub -arch=arm ??1_TaskCollection(a)details@Concurrency@@QAA(a)XZ @ stub -arch=i386 ??1_TaskCollection(a)details@Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1_TaskCollection(a)details@Concurrency@@QEAA(a)XZ diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index eabb304dd6d..f5ff30a46e4 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -288,7 +288,9 @@ @ stub -arch=arm ??1_SpinLock(a)details@Concurrency@@QAA(a)XZ @ stub -arch=i386 ??1_SpinLock(a)details@Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1_SpinLock(a)details@Concurrency@@QEAA(a)XZ -@ stub -arch=i386 ??1_StructuredTaskCollection(a)details@Concurrency@@QAE(a)XZ +@ cdecl -arch=arm ??1_StructuredTaskCollection(a)details@Concurrency@@QAA(a)XZ(ptr) msvcr120.??1_StructuredTaskCollection(a)details@Concurrency@@QAA(a)XZ +@ thiscall -arch=i386 ??1_StructuredTaskCollection(a)details@Concurrency@@QAE(a)XZ(ptr) msvcr120.??1_StructuredTaskCollection(a)details@Concurrency@@QAE(a)XZ +@ cdecl -arch=win64 ??1_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)XZ(ptr) msvcr120.??1_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)XZ @ stub -arch=arm ??1_TaskCollection(a)details@Concurrency@@QAA(a)XZ @ stub -arch=i386 ??1_TaskCollection(a)details@Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1_TaskCollection(a)details@Concurrency@@QEAA(a)XZ diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index d9fb031e9cb..b6e8c758e47 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -1757,6 +1757,19 @@ _StructuredTaskCollection* __thiscall _StructuredTaskCollection_ctor( #endif /* _MSVCR_VER >= 110 */ +#if _MSVCR_VER >= 120 + +/* ??1_StructuredTaskCollection(a)details@Concurrency@@QAA(a)XZ */ +/* ??1_StructuredTaskCollection(a)details@Concurrency@@QAE(a)XZ */ +/* ??1_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(_StructuredTaskCollection_dtor, 4) +void __thiscall _StructuredTaskCollection_dtor(_StructuredTaskCollection *this) +{ + FIXME("(%p): stub!\n", this); +} + +#endif /* _MSVCR_VER >= 120 */ + /* ??0critical_section(a)Concurrency@@QAE(a)XZ */ /* ??0critical_section(a)Concurrency@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(critical_section_ctor, 4)

1 0