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

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

Aug. 18, 2015

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 Aug. 18, 2015

Aug. 18, 2015

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 Aug. 18, 2015

Aug. 18, 2015

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 Aug. 18, 2015

Aug. 18, 2015

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

Aaryaman Vasishta : d3drm: Change signature of d3drm_device_create.
by Alexandre Julliard Aug. 18, 2015

Aug. 18, 2015

Module: wine Branch: master Commit: f421e78bc5c5b4aa2733142621e694046d30d2d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f421e78bc5c5b4aa273314262… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Fri Aug 7 03:35:51 2015 +0530 d3drm: Change signature of d3drm_device_create. --- dlls/d3drm/d3drm.c | 126 +++++++++++++++++++++++++++++++++++++++------ dlls/d3drm/d3drm_private.h | 7 ++- dlls/d3drm/device.c | 25 ++++++--- 3 files changed, 136 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f421e78bc5c5b4aa27331…

1 0

Andrey Gusev : Assorted spelling and typos fixes.
by Alexandre Julliard Aug. 18, 2015

Aug. 18, 2015

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

Aaryaman Vasishta : d3drm: Implement IDirect3DRMDevice*:: GetDirect3DDevice.
by Alexandre Julliard Aug. 18, 2015

Aug. 18, 2015

Module: wine Branch: master Commit: 0041c560048ff9b851d3ad4418f4b093ea5be5ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=0041c560048ff9b851d3ad441… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Fri Aug 7 03:35:54 2015 +0530 d3drm: Implement IDirect3DRMDevice*::GetDirect3DDevice. --- dlls/d3drm/device.c | 10 +++++++++- dlls/d3drm/tests/d3drm.c | 26 ++++++++------------------ 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 1ea4695..4d08e6e 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -1273,7 +1273,15 @@ static D3DRMTEXTUREQUALITY WINAPI d3drm_device3_GetTextureQuality(IDirect3DRMDev static HRESULT WINAPI d3drm_device3_GetDirect3DDevice(IDirect3DRMDevice3 *iface, IDirect3DDevice **d3d_device) { - FIXME("iface %p, d3d_device %p stub!\n", iface, d3d_device); + struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface); + TRACE("iface %p, d3d_device %p!\n", iface, d3d_device); + + if (device->device) + { + *d3d_device = device->device; + IDirect3DDevice_AddRef(*d3d_device); + return D3DRM_OK; + } return E_NOTIMPL; } diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 0e99229..93a8b73 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2012,9 +2012,7 @@ static void test_create_device_from_clipper1(void) /* Fetch immediate mode device in order to access render target */ hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3ddevice1); - todo_wine ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr); - if (FAILED(hr)) - goto cleanup; + ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr); hr = IDirect3DDevice_QueryInterface(d3ddevice1, &IID_IDirectDrawSurface, (void **)&surface); ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr); @@ -2088,7 +2086,7 @@ static void test_create_device_from_clipper1(void) ref2 = get_refcount((IUnknown *)d3drm1); ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", ref1, ref2); cref2 = get_refcount((IUnknown *)clipper); - todo_wine ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %u, cref2 = %u.\n", cref1, cref2); + ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %u, cref2 = %u.\n", cref1, cref2); /* Test if render target format follows the screen format */ hr = IDirectDraw_GetDisplayMode(ddraw, &desc); @@ -2104,9 +2102,7 @@ static void test_create_device_from_clipper1(void) ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice interface (hr = %x).\n", hr); hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3ddevice1); - todo_wine ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr); - if (FAILED(hr)) - goto cleanup; + ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr); hr = IDirect3DDevice_QueryInterface(d3ddevice1, &IID_IDirectDrawSurface, (void **)&surface); ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr); @@ -2120,20 +2116,14 @@ static void test_create_device_from_clipper1(void) hr = IDirectDraw2_RestoreDisplayMode(ddraw); ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr); -cleanup: if (ds) IDirectDrawSurface_Release(ds); - if (surface) - IDirectDrawSurface_Release(surface); - if (d3ddevice1) - IDirect3DDevice_Release(d3ddevice1); + IDirectDrawSurface_Release(surface); + IDirect3DDevice_Release(d3ddevice1); IDirect3DRMDevice_Release(device1); - if (d3drm1) - IDirect3DRM_Release(d3drm1); - if (clipper) - IDirectDrawClipper_Release(clipper); - if (ddraw) - IDirectDraw_Release(ddraw); + IDirect3DRM_Release(d3drm1); + IDirectDrawClipper_Release(clipper); + IDirectDraw_Release(ddraw); DestroyWindow(window); }

1 0

Hugh McMaster : uninstaller: Output Unicode program names in CLI mode.
by Alexandre Julliard Aug. 18, 2015

Aug. 18, 2015

Module: wine Branch: master Commit: 4335c464c358d15024e76c918efb7721ff0d9cce URL: http://source.winehq.org/git/wine.git/?a=commit;h=4335c464c358d15024e76c918… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 17 18:39:41 2015 +1000 uninstaller: Output Unicode program names in CLI mode. --- programs/uninstaller/main.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index 50efdcd..899337d 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -21,7 +21,6 @@ * */ -#include <stdio.h> #include <string.h> #include <windows.h> #include <shlwapi.h> @@ -92,30 +91,27 @@ static void __cdecl output_message(unsigned int id, ...) __ms_va_end(va_args); } +static void __cdecl output_array(WCHAR *fmt, ...) +{ + __ms_va_list va_args; + + __ms_va_start(va_args, fmt); + output_formatstring(fmt, va_args); + __ms_va_end(va_args); +} + /** * Used to output program list when used with --list */ static void ListUninstallPrograms(void) { unsigned int i; - int lenDescr, lenKey; - char *descr; - char *key; + static WCHAR fmtW[] = {'%','1','|','|','|','%','2','\n',0}; FetchUninstallInformation(); for (i=0; i < numentries; i++) - { - lenDescr = WideCharToMultiByte(CP_UNIXCP, 0, entries[i].descr, -1, NULL, 0, NULL, NULL); - lenKey = WideCharToMultiByte(CP_UNIXCP, 0, entries[i].key, -1, NULL, 0, NULL, NULL); - descr = HeapAlloc(GetProcessHeap(), 0, lenDescr); - key = HeapAlloc(GetProcessHeap(), 0, lenKey); - WideCharToMultiByte(CP_UNIXCP, 0, entries[i].descr, -1, descr, lenDescr, NULL, NULL); - WideCharToMultiByte(CP_UNIXCP, 0, entries[i].key, -1, key, lenKey, NULL, NULL); - printf("%s|||%s\n", key, descr); - HeapFree(GetProcessHeap(), 0, descr); - HeapFree(GetProcessHeap(), 0, key); - } + output_array(fmtW, entries[i].key, entries[i].descr); }

1 0

Nikolay Sivov : dwrite: Implement font style resolution from name strings.
by Alexandre Julliard Aug. 18, 2015

Aug. 18, 2015

Module: wine Branch: master Commit: 5185906006c077f84d86274112cd287d3591c5b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5185906006c077f84d8627411… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 18 07:40:27 2015 +0300 dwrite: Implement font style resolution from name strings. --- dlls/dwrite/font.c | 271 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 236 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5185906006c077f84d862…

1 0

Sebastian Lackner : vcomp: Implement OpenMP regular locking functions.
by Alexandre Julliard Aug. 18, 2015

Aug. 18, 2015

Module: wine Branch: master Commit: 146df7dab17b7417ebe3ba6ae5677b45c19c5bfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=146df7dab17b7417ebe3ba6ae… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Aug 18 06:57:58 2015 +0200 vcomp: Implement OpenMP regular locking functions. Native OpenMP also immediately terminates the process (without exception) when calling omp_set_lock while holding the lock from the same thread. --- dlls/vcomp/main.c | 35 +++++++++++++++++++++++++++++++++++ dlls/vcomp/tests/vcomp.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/vcomp/vcomp.spec | 6 +++--- dlls/vcomp100/vcomp100.spec | 6 +++--- dlls/vcomp110/vcomp110.spec | 6 +++--- dlls/vcomp90/vcomp90.spec | 6 +++--- 6 files changed, 88 insertions(+), 12 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 487d55c..d442155 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -1045,6 +1045,12 @@ static void destroy_critsect(CRITICAL_SECTION *critsect) HeapFree(GetProcessHeap(), 0, critsect); } +static BOOL critsect_is_locked(CRITICAL_SECTION *critsect) +{ + return critsect->OwningThread == ULongToHandle(GetCurrentThreadId()) && + critsect->RecursionCount; +} + void CDECL omp_init_lock(omp_lock_t *lock) { TRACE("(%p)\n", lock); @@ -1057,6 +1063,35 @@ void CDECL omp_destroy_lock(omp_lock_t *lock) destroy_critsect(*lock); } +void CDECL omp_set_lock(omp_lock_t *lock) +{ + TRACE("(%p)\n", lock); + + if (critsect_is_locked(*lock)) + { + ERR("omp_set_lock called while holding lock %p\n", *lock); + ExitProcess(1); + } + + EnterCriticalSection(*lock); +} + +void CDECL omp_unset_lock(omp_lock_t *lock) +{ + TRACE("(%p)\n", lock); + LeaveCriticalSection(*lock); +} + +int CDECL omp_test_lock(omp_lock_t *lock) +{ + TRACE("(%p)\n", lock); + + if (critsect_is_locked(*lock)) + return 0; + + return TryEnterCriticalSection(*lock); +} + void CDECL omp_set_nest_lock(omp_nest_lock_t *lock) { TRACE("(%p)\n", lock); diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index b064554..83125e1 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -82,10 +82,13 @@ static int (CDECL *pomp_get_thread_num)(void); static int (CDECL *pomp_in_parallel)(void); static void (CDECL *pomp_init_lock)(omp_lock_t *lock); static void (CDECL *pomp_init_nest_lock)(omp_nest_lock_t *lock); +static void (CDECL *pomp_set_lock)(omp_lock_t *lock); static void (CDECL *pomp_set_nest_lock)(omp_nest_lock_t *lock); static void (CDECL *pomp_set_nested)(int nested); static void (CDECL *pomp_set_num_threads)(int num_threads); +static int (CDECL *pomp_test_lock)(omp_lock_t *lock); static int (CDECL *pomp_test_nest_lock)(omp_nest_lock_t *lock); +static void (CDECL *pomp_unset_lock)(omp_lock_t *lock); static void (CDECL *pomp_unset_nest_lock)(omp_nest_lock_t *lock); #define VCOMP_DYNAMIC_FLAGS_STATIC 0x01 @@ -268,10 +271,13 @@ static BOOL init_vcomp(void) VCOMP_GET_PROC(omp_in_parallel); VCOMP_GET_PROC(omp_init_lock); VCOMP_GET_PROC(omp_init_nest_lock); + VCOMP_GET_PROC(omp_set_lock); VCOMP_GET_PROC(omp_set_nest_lock); VCOMP_GET_PROC(omp_set_nested); VCOMP_GET_PROC(omp_set_num_threads); + VCOMP_GET_PROC(omp_test_lock); VCOMP_GET_PROC(omp_test_nest_lock); + VCOMP_GET_PROC(omp_unset_lock); VCOMP_GET_PROC(omp_unset_nest_lock); return TRUE; @@ -1302,6 +1308,40 @@ static void test_vcomp_flush(void) p_vcomp_flush(); } +static void test_omp_init_lock(void) +{ + omp_lock_t lock; + int ret; + + pomp_init_lock(&lock); + + /* test omp_set_lock */ + pomp_set_lock(&lock); + pomp_unset_lock(&lock); + + /* test omp_test_lock */ + ret = pomp_test_lock(&lock); + ok(ret == 1, "expected ret == 1, got %d\n", ret); + ret = pomp_test_lock(&lock); + ok(ret == 0, "expected ret == 0, got %d\n", ret); + pomp_unset_lock(&lock); + + /* test with EnterCriticalSection */ + EnterCriticalSection(lock); + ret = pomp_test_lock(&lock); + todo_wine + ok(ret == 1, "expected ret == 1, got %d\n", ret); + if (ret) + { + ret = pomp_test_lock(&lock); + ok(ret == 0, "expected ret == 0, got %d\n", ret); + pomp_unset_lock(&lock); + } + LeaveCriticalSection(lock); + + pomp_destroy_lock(&lock); +} + static void test_omp_init_nest_lock(void) { omp_nest_lock_t lock; @@ -1462,6 +1502,7 @@ START_TEST(vcomp) test_vcomp_single_begin(); test_vcomp_enter_critsect(); test_vcomp_flush(); + test_omp_init_lock(); test_omp_init_nest_lock(); test_atomic_integer32(); test_atomic_float(); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index 4c89879..52b929f 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -102,11 +102,11 @@ @ cdecl omp_init_lock(ptr) @ cdecl omp_init_nest_lock(ptr) omp_init_lock @ cdecl omp_set_dynamic(long) -@ stub omp_set_lock +@ cdecl omp_set_lock(ptr) @ cdecl omp_set_nest_lock(ptr) @ cdecl omp_set_nested(long) @ cdecl omp_set_num_threads(long) -@ stub omp_test_lock +@ cdecl omp_test_lock(ptr) @ cdecl omp_test_nest_lock(ptr) -@ stub omp_unset_lock +@ cdecl omp_unset_lock(ptr) @ cdecl omp_unset_nest_lock(ptr) diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index 9021b10..4b646eb 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -102,11 +102,11 @@ @ cdecl omp_init_lock(ptr) vcomp.omp_init_lock @ cdecl omp_init_nest_lock(ptr) vcomp.omp_init_nest_lock @ cdecl omp_set_dynamic(long) vcomp.omp_set_dynamic -@ stub omp_set_lock +@ cdecl omp_set_lock(ptr) vcomp.omp_set_lock @ cdecl omp_set_nest_lock(ptr) vcomp.omp_set_nest_lock @ cdecl omp_set_nested(long) vcomp.omp_set_nested @ cdecl omp_set_num_threads(long) vcomp.omp_set_num_threads -@ stub omp_test_lock +@ cdecl omp_test_lock(ptr) vcomp.omp_test_lock @ cdecl omp_test_nest_lock(ptr) vcomp.omp_test_nest_lock -@ stub omp_unset_lock +@ cdecl omp_unset_lock(ptr) vcomp.omp_unset_lock @ cdecl omp_unset_nest_lock(ptr) vcomp.omp_unset_nest_lock diff --git a/dlls/vcomp110/vcomp110.spec b/dlls/vcomp110/vcomp110.spec index 4f7503f..1ee7fba 100644 --- a/dlls/vcomp110/vcomp110.spec +++ b/dlls/vcomp110/vcomp110.spec @@ -103,11 +103,11 @@ @ cdecl omp_init_lock(ptr) vcomp.omp_init_lock @ cdecl omp_init_nest_lock(ptr) vcomp.omp_init_nest_lock @ cdecl omp_set_dynamic(long) vcomp.omp_set_dynamic -@ stub omp_set_lock +@ cdecl omp_set_lock(ptr) vcomp.omp_set_lock @ cdecl omp_set_nest_lock(ptr) vcomp.omp_set_nest_lock @ cdecl omp_set_nested(long) vcomp.omp_set_nested @ cdecl omp_set_num_threads(long) vcomp.omp_set_num_threads -@ stub omp_test_lock +@ cdecl omp_test_lock(ptr) vcomp.omp_test_lock @ cdecl omp_test_nest_lock(ptr) vcomp.omp_test_nest_lock -@ stub omp_unset_lock +@ cdecl omp_unset_lock(ptr) vcomp.omp_unset_lock @ cdecl omp_unset_nest_lock(ptr) vcomp.omp_unset_nest_lock diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index 9021b10..4b646eb 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -102,11 +102,11 @@ @ cdecl omp_init_lock(ptr) vcomp.omp_init_lock @ cdecl omp_init_nest_lock(ptr) vcomp.omp_init_nest_lock @ cdecl omp_set_dynamic(long) vcomp.omp_set_dynamic -@ stub omp_set_lock +@ cdecl omp_set_lock(ptr) vcomp.omp_set_lock @ cdecl omp_set_nest_lock(ptr) vcomp.omp_set_nest_lock @ cdecl omp_set_nested(long) vcomp.omp_set_nested @ cdecl omp_set_num_threads(long) vcomp.omp_set_num_threads -@ stub omp_test_lock +@ cdecl omp_test_lock(ptr) vcomp.omp_test_lock @ cdecl omp_test_nest_lock(ptr) vcomp.omp_test_nest_lock -@ stub omp_unset_lock +@ cdecl omp_unset_lock(ptr) vcomp.omp_unset_lock @ cdecl omp_unset_nest_lock(ptr) vcomp.omp_unset_nest_lock

1 0