August 2015 - Wine-commits - list.winehq.org

Aaryaman Vasishta : d3drm: Implement IDirect3DRM{2-3}:: CreateDeviceFromSurface.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: 27f7174d71e906a883d8f2578ca686dcd2cf96d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27f7174d71e906a883d8f2578… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Fri Aug 7 03:35:58 2015 +0530 d3drm: Implement IDirect3DRM{2-3}::CreateDeviceFromSurface. --- dlls/d3drm/d3drm.c | 37 ++++++++++--- dlls/d3drm/tests/d3drm.c | 138 ++++++++++++++++++++--------------------------- 2 files changed, 86 insertions(+), 89 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=27f7174d71e906a883d8f…

1 0

Daniel Lehman : msxml3: Fix crash when merging Text nodes.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: 1f7fb03ee9f45217e6fea452c203ba625401d8ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f7fb03ee9f45217e6fea452c… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Aug 12 12:46:44 2015 -0700 msxml3: Fix crash when merging Text nodes. --- dlls/msxml3/node.c | 4 +-- dlls/msxml3/tests/domdoc.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 90b5bde..f8d7761 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -496,7 +496,7 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT refcount = xmlnode_get_inst_cnt(node_obj); if (refcount) xmldoc_add_refs(before_node_obj->node->doc, refcount); - xmlAddPrevSibling(before_node_obj->node, node_obj->node); + node_obj->node = xmlAddPrevSibling(before_node_obj->node, node_obj->node); if (refcount) xmldoc_release_refs(doc, refcount); node_obj->parent = This->parent; } @@ -508,7 +508,7 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT if (refcount) xmldoc_add_refs(This->node->doc, refcount); /* xmlAddChild doesn't unlink node from previous parent */ xmlUnlinkNode(node_obj->node); - xmlAddChild(This->node, node_obj->node); + node_obj->node = xmlAddChild(This->node, node_obj->node); if (refcount) xmldoc_release_refs(doc, refcount); node_obj->parent = This->iface; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index df71b49..ff6783b 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -11935,6 +11935,71 @@ static void test_url(void) IXMLDOMDocument_Release(doc); } +static void test_merging_text(void) +{ + IXMLDOMText *nodetext; + IXMLDOMText *newtext; + IXMLDOMElement *root; + IXMLDOMDocument *doc; + IXMLDOMNode *first; + HRESULT hr; + VARIANT v; + BSTR str; + int i; + + doc = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &root); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode*)root, NULL); + EXPECT_HR(hr, S_OK); + + /* test xmlAddChild */ + for (i = 0; i < 10; i++) + { + str = SysAllocString(szstr1); + hr = IXMLDOMDocument_createTextNode(doc, str, &nodetext); + SysFreeString(str); + EXPECT_HR(hr, S_OK); + + newtext = NULL; + hr = IXMLDOMElement_appendChild(root, (IXMLDOMNode*)nodetext, (IXMLDOMNode**)&newtext); + EXPECT_HR(hr, S_OK); + ok(nodetext == newtext, "expected %p, got %p\n", nodetext, newtext); + + IXMLDOMText_Release(newtext); + IXMLDOMText_Release(nodetext); + } + + /* test xmlAddPrevSibling */ + hr = IXMLDOMElement_get_firstChild(root, &first); + EXPECT_HR(hr, S_OK); + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = (IUnknown*)first; + for (i = 0; i < 10; i++) + { + str = SysAllocString(szstr2); + hr = IXMLDOMDocument_createTextNode(doc, str, &nodetext); + SysFreeString(str); + EXPECT_HR(hr, S_OK); + + newtext = NULL; + hr = IXMLDOMElement_insertBefore(root, (IXMLDOMNode*)nodetext, v, (IXMLDOMNode**)&newtext); + EXPECT_HR(hr, S_OK); + ok(nodetext == newtext, "expected %p, got %p\n", nodetext, newtext); + + IXMLDOMText_Release(newtext); + IXMLDOMText_Release(nodetext); + } + + IXMLDOMNode_Release(first); + IXMLDOMElement_Release(root); + IXMLDOMDocument_Release(doc); + + free_bstrs(); +} + START_TEST(domdoc) { HRESULT hr; @@ -12014,6 +12079,7 @@ START_TEST(domdoc) test_namedmap_newenum(); test_xmlns_attribute(); test_url(); + test_merging_text(); test_xsltemplate(); test_xsltext();

1 0

Andrey Gusev : Assorted spelling and typos fixes.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: 5cdcd4493fba65aca4d6b0865399660e27c0b980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cdcd4493fba65aca4d6b0865… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Aug 17 16:11:55 2015 +0300 Assorted spelling and typos fixes. --- dlls/kernel32/time.c | 2 +- dlls/mshtml/tests/dom.c | 2 +- dlls/mshtml/tests/script.c | 6 +++--- dlls/msvcrt/tests/time.c | 4 ++-- dlls/ntdll/tests/exception.c | 2 +- dlls/ole32/marshal.c | 2 +- dlls/ole32/tests/marshal.c | 2 +- dlls/ole32/tests/moniker.c | 2 +- dlls/ole32/tests/ole2.c | 8 ++++---- dlls/oleaut32/tests/tmarshal.c | 2 +- dlls/qcap/tests/smartteefilter.c | 2 +- dlls/quartz/tests/filtermapper.c | 2 +- dlls/riched20/tests/richole.c | 2 +- dlls/scrrun/tests/dictionary.c | 4 ++-- dlls/windowscodecs/tiffformat.c | 2 +- dlls/wined3d/arb_program_shader.c | 2 +- include/mapidefs.h | 2 +- programs/cmd/builtins.c | 2 +- tools/c2man.pl | 4 ++-- tools/wmc/mcl.c | 2 +- 20 files changed, 28 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5cdcd4493fba65aca4d6b…

1 0

Hans Leidekker : iphlpapi: Use WS_AF_INET instead of AF_INET where appropriate.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: d5a1e47a457660a532c27f91c2ec5a8dab897a67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5a1e47a457660a532c27f91c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 18 09:40:58 2015 +0200 iphlpapi: Use WS_AF_INET instead of AF_INET where appropriate. --- dlls/iphlpapi/iphlpapi_main.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 2efabd3..cac702c 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -311,7 +311,7 @@ static char *debugstr_ipv6(const struct WS_sockaddr_in6 *sin, char *buf) return buf; } -static BOOL map_address_6to4( SOCKADDR_IN6 *addr6, SOCKADDR_IN *addr4 ) +static BOOL map_address_6to4( const SOCKADDR_IN6 *addr6, SOCKADDR_IN *addr4 ) { ULONG i; @@ -322,7 +322,7 @@ static BOOL map_address_6to4( SOCKADDR_IN6 *addr6, SOCKADDR_IN *addr4 ) if (addr6->sin6_addr.u.Word[5] != 0xffff) return FALSE; - addr4->sin_family = AF_INET; + addr4->sin_family = WS_AF_INET; addr4->sin_port = addr6->sin6_port; addr4->sin_addr.S_un.S_addr = addr6->sin6_addr.u.Word[6] << 16 | addr6->sin6_addr.u.Word[7]; memset( &addr4->sin_zero, 0, sizeof(addr4->sin_zero) ); @@ -330,7 +330,7 @@ static BOOL map_address_6to4( SOCKADDR_IN6 *addr6, SOCKADDR_IN *addr4 ) return TRUE; } -static BOOL find_src_address( MIB_IPADDRTABLE *table, SOCKADDR_IN *dst, SOCKADDR_IN6 *src ) +static BOOL find_src_address( MIB_IPADDRTABLE *table, const SOCKADDR_IN *dst, SOCKADDR_IN6 *src ) { MIB_IPFORWARDROW row; DWORD i, j; @@ -1022,7 +1022,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index gw->u.s.Length = sizeof(IP_ADAPTER_GATEWAY_ADDRESS); ptr += sizeof(IP_ADAPTER_GATEWAY_ADDRESS); sin = (PSOCKADDR_IN)ptr; - sin->sin_family = AF_INET; + sin->sin_family = WS_AF_INET; sin->sin_port = 0; memcpy(&sin->sin_addr, &adapterRow->dwForwardNextHop, sizeof(DWORD)); @@ -1528,7 +1528,7 @@ DWORD WINAPI GetBestInterface(IPAddr dwDestAddr, PDWORD pdwBestIfIndex) { struct WS_sockaddr_in sa_in; memset(&sa_in, 0, sizeof(sa_in)); - sa_in.sin_family = AF_INET; + sa_in.sin_family = WS_AF_INET; sa_in.sin_addr.S_un.S_addr = dwDestAddr; return GetBestInterfaceEx((struct WS_sockaddr *)&sa_in, pdwBestIfIndex); } @@ -1556,7 +1556,7 @@ DWORD WINAPI GetBestInterfaceEx(struct WS_sockaddr *pDestAddr, PDWORD pdwBestIfI else { MIB_IPFORWARDROW ipRow; - if (pDestAddr->sa_family == AF_INET) { + if (pDestAddr->sa_family == WS_AF_INET) { ret = GetBestRoute(((struct WS_sockaddr_in *)pDestAddr)->sin_addr.S_un.S_addr, 0, &ipRow); if (ret == ERROR_SUCCESS) *pdwBestIfIndex = ipRow.dwForwardIfIndex; @@ -2296,7 +2296,7 @@ BOOL WINAPI GetRTTAndHopCount(IPAddr DestIpAddress, PULONG HopCount, ULONG MaxHo DWORD WINAPI GetTcpTable(PMIB_TCPTABLE pTcpTable, PDWORD pdwSize, BOOL bOrder) { TRACE("pTcpTable %p, pdwSize %p, bOrder %d\n", pTcpTable, pdwSize, bOrder); - return GetExtendedTcpTable(pTcpTable, pdwSize, bOrder, AF_INET, TCP_TABLE_BASIC_ALL, 0); + return GetExtendedTcpTable(pTcpTable, pdwSize, bOrder, WS_AF_INET, TCP_TABLE_BASIC_ALL, 0); } /****************************************************************** @@ -2313,7 +2313,7 @@ DWORD WINAPI GetExtendedTcpTable(PVOID pTcpTable, PDWORD pdwSize, BOOL bOrder, if (!pdwSize) return ERROR_INVALID_PARAMETER; - if (ulAf != AF_INET) + if (ulAf != WS_AF_INET) { FIXME("ulAf = %u not supported\n", ulAf); return ERROR_NOT_SUPPORTED; @@ -2361,7 +2361,7 @@ DWORD WINAPI GetExtendedTcpTable(PVOID pTcpTable, PDWORD pdwSize, BOOL bOrder, */ DWORD WINAPI GetUdpTable(PMIB_UDPTABLE pUdpTable, PDWORD pdwSize, BOOL bOrder) { - return GetExtendedUdpTable(pUdpTable, pdwSize, bOrder, AF_INET, UDP_TABLE_BASIC, 0); + return GetExtendedUdpTable(pUdpTable, pdwSize, bOrder, WS_AF_INET, UDP_TABLE_BASIC, 0); } /****************************************************************** @@ -2378,7 +2378,7 @@ DWORD WINAPI GetExtendedUdpTable(PVOID pUdpTable, PDWORD pdwSize, BOOL bOrder, if (!pdwSize) return ERROR_INVALID_PARAMETER; - if (ulAf != AF_INET) + if (ulAf != WS_AF_INET) { FIXME("ulAf = %u not supported\n", ulAf); return ERROR_NOT_SUPPORTED;

1 0

Hans Leidekker : iphlpapi: Implement GetIfTable2.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: ad9ba6a029b03e6fd805bd18fe272bb694481a6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad9ba6a029b03e6fd805bd18f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 18 09:41:23 2015 +0200 iphlpapi: Implement GetIfTable2. --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/iphlpapi/tests/iphlpapi.c | 21 +++++++++++++++++++++ include/netioapi.h | 6 ++++++ 4 files changed, 65 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 50ea35b..4be42fe 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -91,7 +91,7 @@ @ stub GetIfEntryFromStack #@ stub GetIfStackTable @ stdcall GetIfTable( ptr ptr long ) -#@ stub GetIfTable2 +@ stdcall GetIfTable2( ptr ) #@ stub GetIfTable2Ex @ stub GetIfTableFromStack @ stub GetIgmpList diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index cac702c..90dcda3 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1828,6 +1828,43 @@ DWORD WINAPI GetIfTable(PMIB_IFTABLE pIfTable, PULONG pdwSize, BOOL bOrder) return ret; } +/****************************************************************** + * GetIfTable2 (IPHLPAPI.@) + */ +DWORD WINAPI GetIfTable2( MIB_IF_TABLE2 **table ) +{ + DWORD i, nb_interfaces, size = sizeof(MIB_IF_TABLE2); + InterfaceIndexTable *index_table; + MIB_IF_TABLE2 *ret; + + TRACE( "table %p\n", table ); + + if (!table) return ERROR_INVALID_PARAMETER; + + if ((nb_interfaces = get_interface_indices( FALSE, NULL )) > 1) + size += (nb_interfaces - 1) * sizeof(MIB_IF_ROW2); + + if (!(ret = HeapAlloc( GetProcessHeap(), 0, size ))) return ERROR_OUTOFMEMORY; + + get_interface_indices( FALSE, &index_table ); + if (!index_table) + { + HeapFree( GetProcessHeap(), 0, ret ); + return ERROR_OUTOFMEMORY; + } + + ret->NumEntries = 0; + for (i = 0; i < index_table->numIndexes; i++) + { + ret->Table[i].InterfaceIndex = index_table->indexes[i]; + GetIfEntry2( &ret->Table[i] ); + ret->NumEntries++; + } + + HeapFree( GetProcessHeap(), 0, index_table ); + *table = ret; + return NO_ERROR; +} /****************************************************************** * GetInterfaceInfo (IPHLPAPI.@) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 6553581..92653ed5 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -56,6 +56,7 @@ static DWORD (WINAPI *pGetIfEntry)(PMIB_IFROW); static DWORD (WINAPI *pGetIfEntry2)(PMIB_IF_ROW2); static DWORD (WINAPI *pGetFriendlyIfIndex)(DWORD); static DWORD (WINAPI *pGetIfTable)(PMIB_IFTABLE,PULONG,BOOL); +static DWORD (WINAPI *pGetIfTable2)(PMIB_IF_TABLE2*); static DWORD (WINAPI *pGetIpForwardTable)(PMIB_IPFORWARDTABLE,PULONG,BOOL); static DWORD (WINAPI *pGetIpNetTable)(PMIB_IPNETTABLE,PULONG,BOOL); static DWORD (WINAPI *pGetInterfaceInfo)(PIP_INTERFACE_INFO,PULONG); @@ -102,6 +103,7 @@ static void loadIPHlpApi(void) pGetIfEntry2 = (void *)GetProcAddress(hLibrary, "GetIfEntry2"); pGetFriendlyIfIndex = (void *)GetProcAddress(hLibrary, "GetFriendlyIfIndex"); pGetIfTable = (void *)GetProcAddress(hLibrary, "GetIfTable"); + pGetIfTable2 = (void *)GetProcAddress(hLibrary, "GetIfTable2"); pGetIpForwardTable = (void *)GetProcAddress(hLibrary, "GetIpForwardTable"); pGetIpNetTable = (void *)GetProcAddress(hLibrary, "GetIpNetTable"); pGetInterfaceInfo = (void *)GetProcAddress(hLibrary, "GetInterfaceInfo"); @@ -1868,6 +1870,24 @@ static void test_GetIfEntry2(void) ok( row.InterfaceIndex == index, "got %u\n", index ); } +static void test_GetIfTable2(void) +{ + DWORD ret; + MIB_IF_TABLE2 *table; + + if (!pGetIfTable2) + { + win_skip( "GetIfTable2 not available\n" ); + return; + } + + table = NULL; + ret = pGetIfTable2( &table ); + ok( ret == NO_ERROR, "got %u\n", ret ); + ok( table != NULL, "table not set\n" ); + pFreeMibTable( table ); +} + START_TEST(iphlpapi) { @@ -1890,6 +1910,7 @@ START_TEST(iphlpapi) test_CreateSortedAddressPairs(); test_interface_identifier_conversion(); test_GetIfEntry2(); + test_GetIfTable2(); freeIPHlpApi(); } } diff --git a/include/netioapi.h b/include/netioapi.h index 894dbc5..0357431 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -76,6 +76,12 @@ typedef struct _MIB_IF_ROW2 ULONG64 OutQLen; } MIB_IF_ROW2, *PMIB_IF_ROW2; +typedef struct _MIB_IF_TABLE2 +{ + ULONG NumEntries; + MIB_IF_ROW2 Table[1]; +} MIB_IF_TABLE2, *PMIB_IF_TABLE2; + DWORD WINAPI ConvertInterfaceGuidToLuid(const GUID*,NET_LUID*); DWORD WINAPI ConvertInterfaceIndexToLuid(NET_IFINDEX,NET_LUID*); DWORD WINAPI ConvertInterfaceLuidToGuid(const NET_LUID*,GUID*);

1 0

Hans Leidekker : msi: Only remove environment strings that were added on install.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: 99dfc15e72cc456e565b3139b32e6f9b908f6609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99dfc15e72cc456e565b3139b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 18 10:21:29 2015 +0200 msi: Only remove environment strings that were added on install. --- dlls/msi/action.c | 63 ++++++++++++++++++++++++++++++++++++++----- dlls/msi/tests/action.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 126 insertions(+), 8 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index c0ab23d..0fe7d38 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7103,8 +7103,8 @@ static UINT ITERATE_RemoveEnvironmentString( MSIRECORD *rec, LPVOID param ) { MSIPACKAGE *package = param; LPCWSTR name, value, component; - LPWSTR deformatted = NULL; - DWORD flags; + WCHAR *p, *q, *deformatted = NULL, *new_value = NULL; + DWORD flags, type, size, len, len_value = 0, len_new_value; HKEY env; MSICOMPONENT *comp; MSIRECORD *uirow; @@ -7141,7 +7141,20 @@ static UINT ITERATE_RemoveEnvironmentString( MSIRECORD *rec, LPVOID param ) if (value && !deformat_string( package, value, &deformatted )) return ERROR_OUTOFMEMORY; - value = deformatted; + if ((value = deformatted)) + { + if (flags & ENV_MOD_PREFIX) + { + p = strchrW( value, ';' ); + len_value = p - value; + } + else if (flags & ENV_MOD_APPEND) + { + value = strchrW( value, ';' ) + 1; + len_value = strlenW( value ); + } + else len_value = strlenW( value ); + } r = open_env_key( flags, &env ); if (r != ERROR_SUCCESS) @@ -7153,13 +7166,48 @@ static UINT ITERATE_RemoveEnvironmentString( MSIRECORD *rec, LPVOID param ) if (flags & ENV_MOD_MACHINE) action |= 0x20000000; - TRACE("Removing %s\n", debugstr_w(name)); + size = 0; + type = REG_SZ; + res = RegQueryValueExW( env, name, NULL, &type, NULL, &size ); + if (res != ERROR_SUCCESS || (type != REG_SZ && type != REG_EXPAND_SZ)) + goto done; + + if (!(new_value = msi_alloc( size ))) goto done; - res = RegDeleteValueW( env, name ); + res = RegQueryValueExW( env, name, NULL, &type, (BYTE *)new_value, &size ); if (res != ERROR_SUCCESS) + goto done; + + len_new_value = size / sizeof(WCHAR) - 1; + p = q = new_value; + for (;;) { - WARN("Failed to delete value %s (%d)\n", debugstr_w(name), res); - r = ERROR_SUCCESS; + while (*q && *q != ';') q++; + len = q - p; + if (value && len == len_value && !memcmp( value, p, len * sizeof(WCHAR) )) + { + if (*q == ';') q++; + memmove( p, q, (len_new_value - (q - new_value) + 1) * sizeof(WCHAR) ); + break; + } + if (!*q) break; + p = ++q; + } + + if (!new_value[0] || !value) + { + TRACE("removing %s\n", debugstr_w(name)); + res = RegDeleteValueW( env, name ); + if (res != ERROR_SUCCESS) + WARN("failed to delete value %s (%d)\n", debugstr_w(name), res); + } + else + { + TRACE("setting %s to %s\n", debugstr_w(name), debugstr_w(new_value)); + size = (strlenW( new_value ) + 1) * sizeof(WCHAR); + res = RegSetValueExW( env, name, 0, type, (BYTE *)new_value, size ); + if (res != ERROR_SUCCESS) + WARN("failed to set %s to %s (%d)\n", debugstr_w(name), debugstr_w(new_value), res); } done: @@ -7172,6 +7220,7 @@ done: if (env) RegCloseKey( env ); msi_free( deformatted ); + msi_free( new_value ); return r; } diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 60562f1..9512410 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -1205,7 +1205,13 @@ static const char res_environment_dat[] = "var2\t=+-MSITESTVAR2\t1\tenvvar\n" "var3\t=MSITESTVAR3\t1\tenvvar\n" "var4\t=-MSITESTVAR4\t\tenvvar\n" - "var5\t=MSITESTVAR5\t\tenvvar\n"; + "var5\t=MSITESTVAR5\t\tenvvar\n" + "Var6\t-MSITESTVAR6\t1;[~]\tenvvar\n" + "Var7\t-MSITESTVAR7\t[~];1\tenvvar\n" + "Var8\t-MSITESTVAR8\t1;[~]\tenvvar\n" + "Var9\t-MSITESTVAR9\t[~];1\tenvvar\n" + "Var10\t-MSITESTVAR10\t1\tenvvar\n" + "Var11\t-MSITESTVAR11\t2\tenvvar\n"; static const char res_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" @@ -6192,6 +6198,12 @@ static void test_remove_env_strings(void) RegSetValueExA(key, "MSITESTVAR3", 0, REG_SZ, (const BYTE *)"1", 2); RegSetValueExA(key, "MSITESTVAR4", 0, REG_SZ, (const BYTE *)"1", 2); RegSetValueExA(key, "MSITESTVAR5", 0, REG_SZ, (const BYTE *)"1", 2); + RegSetValueExA(key, "MSITESTVAR6", 0, REG_SZ, (const BYTE *)"1;2", 4); + RegSetValueExA(key, "MSITESTVAR7", 0, REG_SZ, (const BYTE *)"1;2", 4); + RegSetValueExA(key, "MSITESTVAR8", 0, REG_SZ, (const BYTE *)"2;1;0", 6); + RegSetValueExA(key, "MSITESTVAR9", 0, REG_SZ, (const BYTE *)"0;1;2", 6); + RegSetValueExA(key, "MSITESTVAR10", 0, REG_SZ, (const BYTE *)"1", 2); + RegSetValueExA(key, "MSITESTVAR11", 0, REG_SZ, (const BYTE *)"1", 2); RegCloseKey(key); @@ -6281,6 +6293,57 @@ static void test_remove_env_strings(void) ok(!lstrcmpA(buffer, "1"), "expected \"1\", got \"%s\"\n", buffer); RegDeleteValueA(key, "MSITESTVAR5"); + type = REG_NONE; + buffer[0] = 0; + size = sizeof(buffer); + res = RegQueryValueExA(key, "MSITESTVAR6", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(type == REG_SZ, "expected REG_SZ, got %u\n", type); + ok(!lstrcmpA(buffer, "2"), "expected \"2\", got \"%s\"\n", buffer); + RegDeleteValueA(key, "MSITESTVAR6"); + + type = REG_NONE; + buffer[0] = 0; + size = sizeof(buffer); + res = RegQueryValueExA(key, "MSITESTVAR7", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(type == REG_SZ, "expected REG_SZ, got %u\n", type); + ok(!lstrcmpA(buffer, "2"), "expected \"2\", got \"%s\"\n", buffer); + RegDeleteValueA(key, "MSITESTVAR7"); + + type = REG_NONE; + buffer[0] = 0; + size = sizeof(buffer); + res = RegQueryValueExA(key, "MSITESTVAR8", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(type == REG_SZ, "expected REG_SZ, got %u\n", type); + ok(!lstrcmpA(buffer, "2;0"), "expected \"2;0\", got \"%s\"\n", buffer); + RegDeleteValueA(key, "MSITESTVAR8"); + + type = REG_NONE; + buffer[0] = 0; + size = sizeof(buffer); + res = RegQueryValueExA(key, "MSITESTVAR9", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(type == REG_SZ, "expected REG_SZ, got %u\n", type); + ok(!lstrcmpA(buffer, "0;2"), "expected \"0;2\", got \"%s\"\n", buffer); + RegDeleteValueA(key, "MSITESTVAR9"); + + type = REG_NONE; + buffer[0] = 0; + size = sizeof(buffer); + res = RegQueryValueExA(key, "MSITESTVAR10", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + + type = REG_NONE; + buffer[0] = 0; + size = sizeof(buffer); + res = RegQueryValueExA(key, "MSITESTVAR11", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(type == REG_SZ, "expected REG_SZ, got %u\n", type); + ok(!lstrcmpA(buffer, "1"), "expected \"1\", got \"%s\"\n", buffer); + RegDeleteValueA(key, "MSITESTVAR11"); + ok(!delete_pf("msitest\\envvar.txt", TRUE), "file not removed\n"); ok(!delete_pf("msitest", FALSE), "directory not removed\n"); @@ -6290,6 +6353,12 @@ error: RegDeleteValueA(key, "MSITESTVAR3"); RegDeleteValueA(key, "MSITESTVAR4"); RegDeleteValueA(key, "MSITESTVAR5"); + RegDeleteValueA(key, "MSITESTVAR6"); + RegDeleteValueA(key, "MSITESTVAR7"); + RegDeleteValueA(key, "MSITESTVAR8"); + RegDeleteValueA(key, "MSITESTVAR9"); + RegDeleteValueA(key, "MSITESTVAR10"); + RegDeleteValueA(key, "MSITESTVAR11"); RegCloseKey(key); DeleteFileA("msitest\\envvar.txt");

1 0

Michael Müller : winhttp: Raw request headers need to be terminated with double \r\n.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: d2890778f944e2567b0828cfd46636c72f979b37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2890778f944e2567b0828cfd… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Aug 18 07:56:39 2015 +0200 winhttp: Raw request headers need to be terminated with double \r\n. --- dlls/winhttp/request.c | 14 ++++++++------ dlls/winhttp/tests/winhttp.c | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 607b502..498df2b 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -672,11 +672,8 @@ static BOOL query_headers( request_t *request, DWORD level, LPCWSTR name, LPVOID if (!(p = headers)) return FALSE; for (len = 0; *p; p++) if (*p != '\r') len++; - if (!buffer || (len + 1) * sizeof(WCHAR) > *buflen) - { - len++; + if (!buffer || len * sizeof(WCHAR) > *buflen) set_last_error( ERROR_INSUFFICIENT_BUFFER ); - } else { for (p = headers, q = buffer; *p; p++, q++) @@ -688,8 +685,8 @@ static BOOL query_headers( request_t *request, DWORD level, LPCWSTR name, LPVOID p++; /* skip '\n' */ } } - *q = 0; TRACE("returning data: %s\n", debugstr_wn(buffer, len)); + if (len) len--; ret = TRUE; } *buflen = len * sizeof(WCHAR); @@ -2155,7 +2152,7 @@ static BOOL read_reply( request_t *request ) buflen = MAX_REPLY_LEN; if (!read_line( request, buffer, &buflen )) return TRUE; - if (!*buffer) break; + if (!*buffer) buflen = 1; while (len - offset < buflen + crlf_len) { @@ -2164,6 +2161,11 @@ static BOOL read_reply( request_t *request ) if (!(tmp = heap_realloc( raw_headers, len * sizeof(WCHAR) ))) return FALSE; request->raw_headers = raw_headers = tmp; } + if (!*buffer) + { + memcpy( raw_headers + offset, crlf, sizeof(crlf) ); + break; + } MultiByteToWideChar( CP_ACP, 0, buffer, buflen, raw_headers + offset, buflen ); if (!(header = parse_header( raw_headers + offset ))) break; diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index cb462bb..d2f7671 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2126,8 +2126,11 @@ static DWORD CALLBACK server_thread(LPVOID param) static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path) { + static const WCHAR test_header_end_clrf[] = {'\r','\n','\r','\n',0}; + static const WCHAR test_header_end_raw[] = {0,0}; HINTERNET ses, con, req; char buffer[0x100]; + WCHAR buffer2[0x100]; DWORD count, status, size, error, supported, first, target; BOOL ret; @@ -2162,6 +2165,21 @@ static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path) ok(first == 0xdeadbeef, "got %x\n", first); ok(target == 0xdeadbeef, "got %x\n", target); + size = sizeof(buffer2); + memset(buffer2, 0, sizeof(buffer2)); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_RAW_HEADERS_CRLF, NULL, buffer2, &size, NULL); + ok(ret, "failed to query for raw headers: %u\n", GetLastError()); + ok(!memcmp(buffer2 + lstrlenW(buffer2) - 4, test_header_end_clrf, sizeof(test_header_end_clrf)), + "WinHttpQueryHeaders returned invalid end of header string\n"); + + size = sizeof(buffer2); + memset(buffer2, 0, sizeof(buffer2)); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_RAW_HEADERS, NULL, buffer2, &size, NULL); + ok(ret, "failed to query for raw headers: %u\n", GetLastError()); + ok(!memcmp(buffer2 + (size / sizeof(WCHAR)) - 1, test_header_end_raw, sizeof(test_header_end_raw)), + "WinHttpQueryHeaders returned invalid end of header string\n"); + ok(buffer2[(size / sizeof(WCHAR)) - 2] != 0, "returned string has too many NULL characters\n"); + count = 0; memset(buffer, 0, sizeof(buffer)); ret = WinHttpReadData(req, buffer, sizeof buffer, &count);

1 0

Alexandre Julliard : server: Store modification time as a key comment to avoid losing precision.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: 1baf01fc2475c508b6464bc735483a7e25c915f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1baf01fc2475c508b6464bc73… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 18 18:11:32 2015 +0900 server: Store modification time as a key comment to avoid losing precision. --- server/registry.c | 49 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 8 deletions(-) diff --git a/server/registry.c b/server/registry.c index 43527df..7f7a7b1 100644 --- a/server/registry.c +++ b/server/registry.c @@ -265,6 +265,7 @@ static void save_subkeys( const struct key *key, const struct key *base, FILE *f fprintf( f, "\n[" ); if (key != base) dump_path( key, base, f ); fprintf( f, "] %u\n", (unsigned int)((key->modif - ticks_1601_to_1970) / TICKS_PER_SEC) ); + fprintf( f, "#time=%x%08x\n", (unsigned int)(key->modif >> 32), (unsigned int)key->modif ); if (key->class) { fprintf( f, "#class=\"" ); @@ -1341,14 +1342,13 @@ static int get_data_type( const char *buffer, int *type, int *parse_type ) } /* load and create a key from the input file */ -static struct key *load_key( struct key *base, const char *buffer, - int prefix_len, struct file_load_info *info ) +static struct key *load_key( struct key *base, const char *buffer, int prefix_len, + struct file_load_info *info, timeout_t *modif ) { WCHAR *p; struct unicode_str name; int res; unsigned int mod; - timeout_t modif = current_time; data_size_t len; if (!get_file_tmp_space( info, strlen(buffer) * sizeof(WCHAR) )) return NULL; @@ -1360,7 +1360,9 @@ static struct key *load_key( struct key *base, const char *buffer, return NULL; } if (sscanf( buffer + res, " %u", &mod ) == 1) - modif = (timeout_t)mod * TICKS_PER_SEC + ticks_1601_to_1970; + *modif = (timeout_t)mod * TICKS_PER_SEC + ticks_1601_to_1970; + else + *modif = current_time; p = info->tmp; while (prefix_len && *p) { if (*p++ == '\\') prefix_len--; } @@ -1377,7 +1379,17 @@ static struct key *load_key( struct key *base, const char *buffer, } name.str = p; name.len = len - (p - info->tmp + 1) * sizeof(WCHAR); - return create_key_recursive( base, &name, modif ); + return create_key_recursive( base, &name, 0 ); +} + +/* update the modification time of a key (and its parents) after it has been loaded from a file */ +static void update_key_time( struct key *key, timeout_t modif ) +{ + while (key && !key->modif) + { + key->modif = modif; + key = key->parent; + } } /* load a global option from the input file */ @@ -1415,6 +1427,18 @@ static int load_key_option( struct key *key, const char *buffer, struct file_loa const char *p; data_size_t len; + if (!strncmp( buffer, "#time=", 6 )) + { + timeout_t modif = 0; + for (p = buffer + 6; *p; p++) + { + if (*p >= '0' && *p <= '9') modif = (modif << 4) | (*p - '0'); + else if (*p >= 'A' && *p <= 'F') modif = (modif << 4) | (*p - 'A' + 10); + else if (*p >= 'a' && *p <= 'f') modif = (modif << 4) | (*p - 'a' + 10); + else break; + } + update_key_time( key, modif ); + } if (!strncmp( buffer, "#class=", 7 )) { p = buffer + 7; @@ -1589,6 +1613,7 @@ static void load_keys( struct key *key, const char *filename, FILE *f, int prefi { struct key *subkey = NULL; struct file_load_info info; + timeout_t modif = current_time; char *p; info.filename = filename; @@ -1617,9 +1642,13 @@ static void load_keys( struct key *key, const char *filename, FILE *f, int prefi switch(*p) { case '[': /* new key */ - if (subkey) release_object( subkey ); + if (subkey) + { + update_key_time( subkey, modif ); + release_object( subkey ); + } if (prefix_len == -1) prefix_len = get_prefix_len( key, p + 1, &info ); - if (!(subkey = load_key( key, p + 1, prefix_len, &info ))) + if (!(subkey = load_key( key, p + 1, prefix_len, &info, &modif ))) file_read_error( "Error creating key", &info ); break; case '@': /* default value */ @@ -1641,7 +1670,11 @@ static void load_keys( struct key *key, const char *filename, FILE *f, int prefi } done: - if (subkey) release_object( subkey ); + if (subkey) + { + update_key_time( subkey, modif ); + release_object( subkey ); + } free( info.buffer ); free( info.tmp ); }

1 0

Sebastian Lackner : vcomp: Implement stub for _vcomp_flush and add tests.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: ce18a733043b188e0de6963d087c9a560279ff17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce18a733043b188e0de6963d0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Aug 18 06:53:13 2015 +0200 vcomp: Implement stub for _vcomp_flush and add tests. --- dlls/vcomp/main.c | 5 +++++ dlls/vcomp/tests/vcomp.c | 10 ++++++++++ dlls/vcomp/vcomp.spec | 2 +- dlls/vcomp100/vcomp100.spec | 2 +- dlls/vcomp110/vcomp110.spec | 2 +- dlls/vcomp90/vcomp90.spec | 2 +- 6 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 8143020..74aaf78 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -501,6 +501,11 @@ void CDECL omp_set_num_threads(int num_threads) vcomp_num_threads = num_threads; } +void CDECL _vcomp_flush(void) +{ + TRACE("(): stub\n"); +} + void CDECL _vcomp_barrier(void) { struct vcomp_team_data *team_data = vcomp_init_thread_data()->team; diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 32a8619..b2f8fc4 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -52,6 +52,7 @@ static void (CDECL *p_vcomp_atomic_sub_r8)(double *dest, double val); static void (CDECL *p_vcomp_atomic_xor_i4)(int *dest, int val); static void (CDECL *p_vcomp_barrier)(void); static void (CDECL *p_vcomp_enter_critsect)(CRITICAL_SECTION **critsect); +static void (CDECL *p_vcomp_flush)(void); static void (CDECL *p_vcomp_for_dynamic_init)(unsigned int flags, unsigned int first, unsigned int last, int step, unsigned int chunksize); static int (CDECL *p_vcomp_for_dynamic_next)(unsigned int *begin, unsigned int *end); @@ -233,6 +234,7 @@ static BOOL init_vcomp(void) VCOMP_GET_PROC(_vcomp_atomic_xor_i4); VCOMP_GET_PROC(_vcomp_barrier); VCOMP_GET_PROC(_vcomp_enter_critsect); + VCOMP_GET_PROC(_vcomp_flush); VCOMP_GET_PROC(_vcomp_for_dynamic_init); VCOMP_GET_PROC(_vcomp_for_dynamic_next); VCOMP_GET_PROC(_vcomp_for_static_end); @@ -1276,6 +1278,13 @@ static void test_vcomp_enter_critsect(void) pomp_set_num_threads(max_threads); } +static void test_vcomp_flush(void) +{ + p_vcomp_flush(); + p_vcomp_flush(); + p_vcomp_flush(); +} + static void test_atomic_integer32(void) { struct @@ -1395,6 +1404,7 @@ START_TEST(vcomp) test_vcomp_master_begin(); test_vcomp_single_begin(); test_vcomp_enter_critsect(); + test_vcomp_flush(); test_atomic_integer32(); test_atomic_float(); test_atomic_double(); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index 55b699f..40110d2 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -54,7 +54,7 @@ @ stub _vcomp_copyprivate_broadcast @ stub _vcomp_copyprivate_receive @ cdecl _vcomp_enter_critsect(ptr) -@ stub _vcomp_flush +@ cdecl _vcomp_flush() @ cdecl _vcomp_for_dynamic_init(long long long long long) @ stub _vcomp_for_dynamic_init_i8 @ cdecl _vcomp_for_dynamic_next(ptr ptr) diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index 7bf6238..1974f7e 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -54,7 +54,7 @@ @ stub _vcomp_copyprivate_broadcast @ stub _vcomp_copyprivate_receive @ cdecl _vcomp_enter_critsect(ptr) vcomp._vcomp_enter_critsect -@ stub _vcomp_flush +@ cdecl _vcomp_flush() vcomp._vcomp_flush @ cdecl _vcomp_for_dynamic_init(long long long long long) vcomp._vcomp_for_dynamic_init @ stub _vcomp_for_dynamic_init_i8 @ cdecl _vcomp_for_dynamic_next(ptr ptr) vcomp._vcomp_for_dynamic_next diff --git a/dlls/vcomp110/vcomp110.spec b/dlls/vcomp110/vcomp110.spec index c84e44c..d1b27ed 100644 --- a/dlls/vcomp110/vcomp110.spec +++ b/dlls/vcomp110/vcomp110.spec @@ -55,7 +55,7 @@ @ stub _vcomp_copyprivate_broadcast @ stub _vcomp_copyprivate_receive @ cdecl _vcomp_enter_critsect(ptr) vcomp._vcomp_enter_critsect -@ stub _vcomp_flush +@ cdecl _vcomp_flush() vcomp._vcomp_flush @ cdecl _vcomp_for_dynamic_init(long long long long long) vcomp._vcomp_for_dynamic_init @ stub _vcomp_for_dynamic_init_i8 @ cdecl _vcomp_for_dynamic_next(ptr ptr) vcomp._vcomp_for_dynamic_next diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index 7bf6238..1974f7e 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -54,7 +54,7 @@ @ stub _vcomp_copyprivate_broadcast @ stub _vcomp_copyprivate_receive @ cdecl _vcomp_enter_critsect(ptr) vcomp._vcomp_enter_critsect -@ stub _vcomp_flush +@ cdecl _vcomp_flush() vcomp._vcomp_flush @ cdecl _vcomp_for_dynamic_init(long long long long long) vcomp._vcomp_for_dynamic_init @ stub _vcomp_for_dynamic_init_i8 @ cdecl _vcomp_for_dynamic_next(ptr ptr) vcomp._vcomp_for_dynamic_next

1 0

Sebastian Lackner : vcomp: Implement omp_init_lock and omp_destroy_lock.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: a283d14b3d96af634833b1afbe2286cc70ef6fbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a283d14b3d96af634833b1afb… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Aug 18 06:54:27 2015 +0200 vcomp: Implement omp_init_lock and omp_destroy_lock. --- dlls/vcomp/main.c | 55 ++++++++++++++++++++++++++++++++------------- dlls/vcomp/vcomp.spec | 4 ++-- dlls/vcomp100/vcomp100.spec | 4 ++-- dlls/vcomp110/vcomp110.spec | 4 ++-- dlls/vcomp90/vcomp90.spec | 4 ++-- 5 files changed, 47 insertions(+), 24 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 74aaf78..81e3bc8 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -34,6 +34,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(vcomp); +typedef CRITICAL_SECTION *omp_lock_t; +typedef CRITICAL_SECTION *omp_nest_lock_t; + static struct list vcomp_idle_threads = LIST_INIT(vcomp_idle_threads); static DWORD vcomp_context_tls = TLS_OUT_OF_INDEXES; static HMODULE vcomp_module; @@ -1020,29 +1023,49 @@ void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) __ms_va_end(team_data.valist); } +static CRITICAL_SECTION *alloc_critsect(void) +{ + CRITICAL_SECTION *critsect; + if (!(critsect = HeapAlloc(GetProcessHeap(), 0, sizeof(*critsect)))) + { + ERR("could not allocate critical section\n"); + ExitProcess(1); + } + + InitializeCriticalSection(critsect); + critsect->DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": critsect"); + return critsect; +} + +static void destroy_critsect(CRITICAL_SECTION *critsect) +{ + if (!critsect) return; + critsect->DebugInfo->Spare[0] = 0; + DeleteCriticalSection(critsect); + HeapFree(GetProcessHeap(), 0, critsect); +} + +void CDECL omp_init_lock(omp_lock_t *lock) +{ + TRACE("(%p)\n", lock); + *lock = alloc_critsect(); +} + +void CDECL omp_destroy_lock(omp_lock_t *lock) +{ + TRACE("(%p)\n", lock); + destroy_critsect(*lock); +} + void CDECL _vcomp_enter_critsect(CRITICAL_SECTION **critsect) { TRACE("(%p)\n", critsect); if (!*critsect) { - CRITICAL_SECTION *new_critsect; - if (!(new_critsect = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_critsect)))) - { - ERR("could not allocate critical section\n"); - ExitProcess(1); - } - - InitializeCriticalSection(new_critsect); - new_critsect->DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": critsect"); - + CRITICAL_SECTION *new_critsect = alloc_critsect(); if (interlocked_cmpxchg_ptr((void **)critsect, new_critsect, NULL) != NULL) - { - /* someone beat us to it */ - new_critsect->DebugInfo->Spare[0] = 0; - DeleteCriticalSection(new_critsect); - HeapFree(GetProcessHeap(), 0, new_critsect); - } + destroy_critsect(new_critsect); /* someone beat us to it */ } EnterCriticalSection(*critsect); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index 40110d2..e078af9 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -88,7 +88,7 @@ @ cdecl _vcomp_set_num_threads(long) @ cdecl _vcomp_single_begin(long) @ cdecl _vcomp_single_end() -@ stub omp_destroy_lock +@ cdecl omp_destroy_lock(ptr) @ stub omp_destroy_nest_lock @ cdecl omp_get_dynamic() @ cdecl omp_get_max_threads() @@ -99,7 +99,7 @@ @ stub omp_get_wtick @ cdecl omp_get_wtime() @ cdecl omp_in_parallel() -@ stub omp_init_lock +@ cdecl omp_init_lock(ptr) @ stub omp_init_nest_lock @ cdecl omp_set_dynamic(long) @ stub omp_set_lock diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index 1974f7e..017f49e 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -88,7 +88,7 @@ @ cdecl _vcomp_set_num_threads(long) vcomp._vcomp_set_num_threads @ cdecl _vcomp_single_begin(long) vcomp._vcomp_single_begin @ cdecl _vcomp_single_end() vcomp._vcomp_single_end -@ stub omp_destroy_lock +@ cdecl omp_destroy_lock(ptr) vcomp.omp_destroy_lock @ stub omp_destroy_nest_lock @ cdecl omp_get_dynamic() vcomp.omp_get_dynamic @ cdecl omp_get_max_threads() vcomp.omp_get_max_threads @@ -99,7 +99,7 @@ @ stub omp_get_wtick @ cdecl omp_get_wtime() vcomp.omp_get_wtime @ cdecl omp_in_parallel() vcomp.omp_in_parallel -@ stub omp_init_lock +@ cdecl omp_init_lock(ptr) vcomp.omp_init_lock @ stub omp_init_nest_lock @ cdecl omp_set_dynamic(long) vcomp.omp_set_dynamic @ stub omp_set_lock diff --git a/dlls/vcomp110/vcomp110.spec b/dlls/vcomp110/vcomp110.spec index d1b27ed..a7be1d9 100644 --- a/dlls/vcomp110/vcomp110.spec +++ b/dlls/vcomp110/vcomp110.spec @@ -89,7 +89,7 @@ @ cdecl _vcomp_set_num_threads(long) vcomp._vcomp_set_num_threads @ cdecl _vcomp_single_begin(long) vcomp._vcomp_single_begin @ cdecl _vcomp_single_end() vcomp._vcomp_single_end -@ stub omp_destroy_lock +@ cdecl omp_destroy_lock(ptr) vcomp.omp_destroy_lock @ stub omp_destroy_nest_lock @ cdecl omp_get_dynamic() vcomp.omp_get_dynamic @ cdecl omp_get_max_threads() vcomp.omp_get_max_threads @@ -100,7 +100,7 @@ @ stub omp_get_wtick @ cdecl omp_get_wtime() vcomp.omp_get_wtime @ cdecl omp_in_parallel() vcomp.omp_in_parallel -@ stub omp_init_lock +@ cdecl omp_init_lock(ptr) vcomp.omp_init_lock @ stub omp_init_nest_lock @ cdecl omp_set_dynamic(long) vcomp.omp_set_dynamic @ stub omp_set_lock diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index 1974f7e..017f49e 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -88,7 +88,7 @@ @ cdecl _vcomp_set_num_threads(long) vcomp._vcomp_set_num_threads @ cdecl _vcomp_single_begin(long) vcomp._vcomp_single_begin @ cdecl _vcomp_single_end() vcomp._vcomp_single_end -@ stub omp_destroy_lock +@ cdecl omp_destroy_lock(ptr) vcomp.omp_destroy_lock @ stub omp_destroy_nest_lock @ cdecl omp_get_dynamic() vcomp.omp_get_dynamic @ cdecl omp_get_max_threads() vcomp.omp_get_max_threads @@ -99,7 +99,7 @@ @ stub omp_get_wtick @ cdecl omp_get_wtime() vcomp.omp_get_wtime @ cdecl omp_in_parallel() vcomp.omp_in_parallel -@ stub omp_init_lock +@ cdecl omp_init_lock(ptr) vcomp.omp_init_lock @ stub omp_init_nest_lock @ cdecl omp_set_dynamic(long) vcomp.omp_set_dynamic @ stub omp_set_lock

1 0