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

Jacek Caban : textstor.idl: Added missing GXFPF_* constants.
by Alexandre Julliard April 16, 2015

April 16, 2015

Module: wine Branch: master Commit: 86adba0651701c60e1d19cb13d2d75b942a1d802 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86adba0651701c60e1d19cb13… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 15 15:24:27 2015 +0200 textstor.idl: Added missing GXFPF_* constants. --- include/textstor.idl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/textstor.idl b/include/textstor.idl index 7bd5289..e79443d 100644 --- a/include/textstor.idl +++ b/include/textstor.idl @@ -66,6 +66,9 @@ const DWORD TS_IAS_QUERYONLY = 0x2; const DWORD TS_ST_CORRECTION = 0x1; +const DWORD GXFPF_ROUND_NEAREST = 0x1; +const DWORD GXFPF_NEAREST = 0x2; + typedef [uuid(05fcf85b-5e9c-4c3e-ab71-29471d4f38e7)] enum { TS_AE_NONE, TS_AE_START, TS_AE_END } TsActiveSelEnd; typedef [uuid(033b0df0-f193-4170-b47b-141afc247878)] enum { TS_RT_PLAIN, TS_RT_HIDDEN, TS_RT_OPAQUE } TsRunType; typedef [uuid(ef3457d9-8446-49a7-a9e6-b50d9d5f3fd9)] GUID TS_ATTRID;

1 0

Bruno Jesus : iphlpapi: Stub more IP_ADAPTER_UNICAST_ADDRESS fields in GetAdaptersAddresses.
by Alexandre Julliard April 16, 2015

April 16, 2015

Module: wine Branch: master Commit: 9c20f9bca6996acc2ee1ddd4eece36123da498cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c20f9bca6996acc2ee1ddd4e… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Apr 16 01:25:44 2015 -0300 iphlpapi: Stub more IP_ADAPTER_UNICAST_ADDRESS fields in GetAdaptersAddresses. --- dlls/iphlpapi/iphlpapi_main.c | 40 ++++++++++++++++++++++++++++++++++------ dlls/iphlpapi/tests/iphlpapi.c | 3 --- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 513cbce..3eaefab 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -784,6 +784,31 @@ static PMIB_IPFORWARDROW findIPv4Gateway(DWORD index, return row; } +static void fill_unicast_addr_data(IP_ADAPTER_ADDRESSES *aa, IP_ADAPTER_UNICAST_ADDRESS *ua) +{ + /* Actually this information should be read somewhere from the system + * but it doesn't matter much for the bugs found so far. + * This information is required for DirectPlay8 games. */ + if (aa->IfType != IF_TYPE_SOFTWARE_LOOPBACK) + { + ua->PrefixOrigin = IpPrefixOriginDhcp; + ua->SuffixOrigin = IpSuffixOriginDhcp; + } + else + { + ua->PrefixOrigin = IpPrefixOriginManual; + ua->SuffixOrigin = IpSuffixOriginManual; + } + + /* The address is not duplicated in the network */ + ua->DadState = IpDadStatePreferred; + + /* Some address life time values, required even for non-dhcp addresses */ + ua->ValidLifetime = 60000; + ua->PreferredLifetime = 60000; + ua->LeaseLifetime = 60000; +} + static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index, IP_ADAPTER_ADDRESSES *aa, ULONG *size) { @@ -884,6 +909,13 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index TRACE("%s: %d IPv4 addresses, %d IPv6 addresses:\n", name, num_v4addrs, num_v6addrs); + + buflen = MAX_INTERFACE_PHYSADDR; + getInterfacePhysicalByIndex(index, &buflen, aa->PhysicalAddress, &type); + aa->PhysicalAddressLength = buflen; + aa->IfType = typeFromMibType(type); + aa->ConnectionType = connectionTypeFromMibType(type); + if (num_v4_gateways) { PMIB_IPFORWARDROW adapterRow; @@ -930,6 +962,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index sa->sin_port = 0; TRACE("IPv4 %d/%d: %s\n", i + 1, num_v4addrs, debugstr_ipv4(&sa->sin_addr.S_un.S_addr, addr_buf)); + fill_unicast_addr_data(aa, ua); ptr += ua->u.s.Length + ua->Address.iSockaddrLength; if (i < num_v4addrs - 1) @@ -967,6 +1000,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index memcpy(sa, v6addrs[i].lpSockaddr, sizeof(*sa)); TRACE("IPv6 %d/%d: %s\n", i + 1, num_v6addrs, debugstr_ipv6(sa, addr_buf)); + fill_unicast_addr_data(aa, ua); ptr += ua->u.s.Length + ua->Address.iSockaddrLength; if (i < num_v6addrs - 1) @@ -1071,12 +1105,6 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index } } - buflen = MAX_INTERFACE_PHYSADDR; - getInterfacePhysicalByIndex(index, &buflen, aa->PhysicalAddress, &type); - aa->PhysicalAddressLength = buflen; - aa->IfType = typeFromMibType(type); - aa->ConnectionType = connectionTypeFromMibType(type); - getInterfaceMtuByName(name, &aa->Mtu); getInterfaceStatusByName(name, &status); diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 377aadf..58fb843 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1360,10 +1360,8 @@ static void test_GetAdaptersAddresses(void) ua = aa->FirstUnicastAddress; while (ua) { -todo_wine ok(ua->PrefixOrigin != IpPrefixOriginOther, "bad address config value %d\n", ua->PrefixOrigin); -todo_wine ok(ua->SuffixOrigin != IpSuffixOriginOther, "bad address config value %d\n", ua->PrefixOrigin); /* Address configured manually or from DHCP server? */ @@ -1375,7 +1373,6 @@ todo_wine ok(ua->LeaseLifetime, "expected non-zero\n"); } /* Is the address ok in the network (not duplicated)? */ -todo_wine ok(ua->DadState != IpDadStateInvalid && ua->DadState != IpDadStateDuplicate, "bad address duplication value %d\n", ua->DadState); trace("\tLength: %u\n", S(U(*ua)).Length);

1 0

Nikolay Sivov : wshom.ocx/tests: Fix a BSTR leak (Valgrind).
by Alexandre Julliard April 16, 2015

April 16, 2015

Module: wine Branch: master Commit: f44707cb110404e02be2e55a8fe41d675ef656f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f44707cb110404e02be2e55a8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 15 07:44:19 2015 +0300 wshom.ocx/tests: Fix a BSTR leak (Valgrind). --- dlls/wshom.ocx/tests/wshom.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index ad0e0be..9591c5c 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -406,6 +406,7 @@ static void test_registry(void) hr = IWshShell3_RegRead(sh3, name, &value); ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&value) == (VT_ARRAY|VT_VARIANT), "got 0x%x\n", V_VT(&value)); + SysFreeString(name); dim = SafeArrayGetDim(V_ARRAY(&value)); ok(dim == 1, "got %u\n", dim);

1 0

Bruno Jesus : iphlpapi/tests: Add more test_GetAdaptersAddresses tests.
by Alexandre Julliard April 16, 2015

April 16, 2015

Module: wine Branch: master Commit: a49668e8bc0c07a8ac4cf05c1dc54b028e82d94d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a49668e8bc0c07a8ac4cf05c1… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Apr 16 01:23:26 2015 -0300 iphlpapi/tests: Add more test_GetAdaptersAddresses tests. --- dlls/iphlpapi/tests/iphlpapi.c | 90 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 79 insertions(+), 11 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 14bbc5d..5160063 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -129,6 +129,16 @@ static const char *ntoa( DWORD ip ) return buffer; } +static inline const char* debugstr_longlong(ULONGLONG ll) +{ + static char string[17]; + if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) + sprintf(string, "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll); + else + sprintf(string, "%lx", (unsigned long)ll); + return string; +} + /* still-to-be-tested 98-only functions: GetUniDirectionalAdapterInfo @@ -1298,7 +1308,7 @@ static void testWin2KFunctions(void) static void test_GetAdaptersAddresses(void) { - ULONG ret, size; + ULONG ret, size, osize, i; IP_ADAPTER_ADDRESSES *aa, *ptr; IP_ADAPTER_UNICAST_ADDRESS *ua; @@ -1320,16 +1330,29 @@ static void test_GetAdaptersAddresses(void) ptr = HeapAlloc(GetProcessHeap(), 0, size); ret = pGetAdaptersAddresses(AF_UNSPEC, 0, NULL, ptr, &size); ok(!ret, "expected ERROR_SUCCESS got %u\n", ret); + HeapFree(GetProcessHeap(), 0, ptr); + + /* higher size must not be changed to lower size */ + size *= 2; + osize = size; + ptr = HeapAlloc(GetProcessHeap(), 0, osize); + ret = pGetAdaptersAddresses(AF_UNSPEC, 0, NULL, ptr, &osize); + ok(!ret, "expected ERROR_SUCCESS got %u\n", ret); +todo_wine + ok(osize == size, "expected %d, got %d\n", size, osize); for (aa = ptr; !ret && aa; aa = aa->Next) { + char temp[128]; + + ok(S(U(*aa)).Length == sizeof(IP_ADAPTER_ADDRESSES_LH) || + S(U(*aa)).Length == sizeof(IP_ADAPTER_ADDRESSES_XP), + "Unknown structure size of %u bytes\n", S(U(*aa)).Length); ok(aa->DnsSuffix != NULL, "DnsSuffix is not a valid pointer\n"); ok(aa->Description != NULL, "Description is not a valid pointer\n"); ok(aa->FriendlyName != NULL, "FriendlyName is not a valid pointer\n"); - if (winetest_debug <= 1) - continue; - + trace("\n"); trace("Length: %u\n", S(U(*aa)).Length); trace("IfIndex: %u\n", S(U(*aa)).IfIndex); trace("Next: %p\n", aa->Next); @@ -1338,6 +1361,24 @@ static void test_GetAdaptersAddresses(void) ua = aa->FirstUnicastAddress; while (ua) { +todo_wine + ok(ua->PrefixOrigin != IpPrefixOriginOther, + "bad address config value %d\n", ua->PrefixOrigin); +todo_wine + ok(ua->SuffixOrigin != IpSuffixOriginOther, + "bad address config value %d\n", ua->PrefixOrigin); + /* Address configured manually or from DHCP server? */ + if (ua->PrefixOrigin == IpPrefixOriginManual || + ua->PrefixOrigin == IpPrefixOriginDhcp) + { + ok(ua->ValidLifetime, "expected non-zero value\n"); + ok(ua->PreferredLifetime, "expected non-zero value\n"); + ok(ua->LeaseLifetime, "expected non-zero\n"); + } + /* Is the address ok in the network (not duplicated)? */ +todo_wine + ok(ua->DadState != IpDadStateInvalid && ua->DadState != IpDadStateDuplicate, + "bad address duplication value %d\n", ua->DadState); trace("\tLength: %u\n", S(U(*ua)).Length); trace("\tFlags: 0x%08x\n", S(U(*ua)).Flags); trace("\tNext: %p\n", ua->Next); @@ -1346,24 +1387,51 @@ static void test_GetAdaptersAddresses(void) trace("\tPrefixOrigin: %u\n", ua->PrefixOrigin); trace("\tSuffixOrigin: %u\n", ua->SuffixOrigin); trace("\tDadState: %u\n", ua->DadState); - trace("\tValidLifetime: 0x%08x\n", ua->ValidLifetime); - trace("\tPreferredLifetime: 0x%08x\n", ua->PreferredLifetime); - trace("\tLeaseLifetime: 0x%08x\n", ua->LeaseLifetime); + trace("\tValidLifetime: %u seconds\n", ua->ValidLifetime); + trace("\tPreferredLifetime: %u seconds\n", ua->PreferredLifetime); + trace("\tLeaseLifetime: %u seconds\n", ua->LeaseLifetime); trace("\n"); ua = ua->Next; } trace("FirstAnycastAddress: %p\n", aa->FirstAnycastAddress); trace("FirstMulticastAddress: %p\n", aa->FirstMulticastAddress); trace("FirstDnsServerAddress: %p\n", aa->FirstDnsServerAddress); - trace("DnsSuffix: %p\n", aa->DnsSuffix); - trace("Description: %p\n", aa->Description); - trace("FriendlyName: %p\n", aa->FriendlyName); - trace("PhysicalAddress: %02x\n", aa->PhysicalAddress[0]); + trace("DnsSuffix: %s %p\n", wine_dbgstr_w(aa->DnsSuffix), aa->DnsSuffix); + trace("Description: %s %p\n", wine_dbgstr_w(aa->Description), aa->Description); + trace("FriendlyName: %s %p\n", wine_dbgstr_w(aa->FriendlyName), aa->FriendlyName); trace("PhysicalAddressLength: %u\n", aa->PhysicalAddressLength); + for (i = 0; i < aa->PhysicalAddressLength; i++) + sprintf(temp + i * 3, "%02X-", aa->PhysicalAddress[i]); + temp[i ? i * 3 - 1 : 0] = '\0'; + trace("PhysicalAddress: %s\n", temp); trace("Flags: 0x%08x\n", aa->Flags); trace("Mtu: %u\n", aa->Mtu); trace("IfType: %u\n", aa->IfType); trace("OperStatus: %u\n", aa->OperStatus); + trace("Ipv6IfIndex: %u\n", aa->Ipv6IfIndex); + for (i = 0, temp[0] = '\0'; i < sizeof(aa->ZoneIndices) / sizeof(aa->ZoneIndices[0]); i++) + sprintf(temp + strlen(temp), "%d ", aa->ZoneIndices[i]); + trace("ZoneIndices: %s\n", temp); + trace("FirstPrefix: %p\n", aa->FirstPrefix); + + if (S(U(*aa)).Length < sizeof(IP_ADAPTER_ADDRESSES_LH)) continue; + trace("TransmitLinkSpeed: %s\n", debugstr_longlong(aa->TransmitLinkSpeed)); + trace("ReceiveLinkSpeed: %s\n", debugstr_longlong(aa->ReceiveLinkSpeed)); + trace("FirstWinsServerAddress:%p\n", aa->FirstWinsServerAddress); + trace("FirstGatewayAddress: %p\n", aa->FirstGatewayAddress); + trace("Ipv4Metric: %u\n", aa->Ipv4Metric); + trace("Ipv6Metric: %u\n", aa->Ipv6Metric); + trace("Luid: %p\n", &aa->Luid); + trace("Dhcpv4Server: %p\n", &aa->Dhcpv4Server); + trace("CompartmentId: %u\n", aa->CompartmentId); + trace("NetworkGuid: %s\n", wine_dbgstr_guid((GUID*) &aa->NetworkGuid)); + trace("ConnectionType: %u\n", aa->ConnectionType); + trace("TunnelType: %u\n", aa->TunnelType); + trace("Dhcpv6Server: %p\n", &aa->Dhcpv6Server); + trace("Dhcpv6ClientDuidLength:%u\n", aa->Dhcpv6ClientDuidLength); + trace("Dhcpv6ClientDuid: %p\n", aa->Dhcpv6ClientDuid); + trace("Dhcpv6Iaid: %u\n", aa->Dhcpv6Iaid); + trace("FirstDnsSuffix: %p\n", aa->FirstDnsSuffix); trace("\n"); } HeapFree(GetProcessHeap(), 0, ptr);

1 0

Nikolay Sivov : rpcss: Fix a protseq string leak (Valgrind).
by Alexandre Julliard April 16, 2015

April 16, 2015

Module: wine Branch: master Commit: d0c8654d10ef8a7826f01ee92e572b5c5a26bae1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0c8654d10ef8a7826f01ee92… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 15 07:35:57 2015 +0300 rpcss: Fix a protseq string leak (Valgrind). --- programs/rpcss/epmp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/rpcss/epmp.c b/programs/rpcss/epmp.c index cebde56..2eb6039 100644 --- a/programs/rpcss/epmp.c +++ b/programs/rpcss/epmp.c @@ -252,6 +252,8 @@ void __cdecl ept_map(handle_t h, } LeaveCriticalSection(&csEpm); + + I_RpcFree(protseq); } void __cdecl ept_lookup_handle_free(handle_t h,

1 0

Henri Verbeet : wined3d: Properly handle WINED3DSIH_DP2 in the GLSL shader backend.
by Alexandre Julliard April 15, 2015

April 15, 2015

Module: wine Branch: master Commit: aad0ab8101a1a0596916114919e585a190313b3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=aad0ab8101a1a059691611491… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 15 11:07:12 2015 +0200 wined3d: Properly handle WINED3DSIH_DP2 in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e1867bf..b1a0f85 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2665,13 +2665,13 @@ static void shader_glsl_dot(const struct wined3d_shader_instruction *ins) dst_write_mask = shader_glsl_append_dst(buffer, ins); dst_size = shader_glsl_get_write_mask_size(dst_write_mask); - /* dp3 works on vec3, dp4 on vec4 */ + /* dp4 works on vec4, dp3 on vec3, etc. */ if (ins->handler_idx == WINED3DSIH_DP4) - { src_write_mask = WINED3DSP_WRITEMASK_ALL; - } else { + else if (ins->handler_idx == WINED3DSIH_DP3) src_write_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; - } + else + src_write_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1; shader_glsl_add_src_param(ins, &ins->src[0], src_write_mask, &src0_param); shader_glsl_add_src_param(ins, &ins->src[1], src_write_mask, &src1_param);

1 0

Stefan Dösinger : wined3d: Handle color key dirtification in wined3d_cs_exec_set_texture.
by Alexandre Julliard April 15, 2015

April 15, 2015

Module: wine Branch: master Commit: 382fa588a91b6c55a64d230257f9920dee7546f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=382fa588a91b6c55a64d23025… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 14 11:16:22 2015 +0200 wined3d: Handle color key dirtification in wined3d_cs_exec_set_texture. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/ati_fragment_shader.c | 1 + dlls/wined3d/cs.c | 13 +++++++++++++ dlls/wined3d/glsl_shader.c | 7 +++++++ dlls/wined3d/nvidia_texture_shader.c | 1 + dlls/wined3d/state.c | 24 +++--------------------- dlls/wined3d/utils.c | 2 ++ dlls/wined3d/wined3d_private.h | 7 ++++++- 8 files changed, 34 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=382fa588a91b6c55a64d2…

1 0

Mark Harmstone : uxtheme: Resize source image if destination smaller than margins.
by Alexandre Julliard April 15, 2015

April 15, 2015

Module: wine Branch: master Commit: 2b650fa6db522ae5deb0d09310c0a595a6e3e910 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b650fa6db522ae5deb0d0931… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Apr 14 22:12:01 2015 +0100 uxtheme: Resize source image if destination smaller than margins. --- dlls/uxtheme/draw.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 8a9397d..a7f80fd 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -663,9 +663,9 @@ static HRESULT UXTHEME_DrawImageBackground(HTHEME hTheme, HDC hdc, int iPartId, const DTBGOPTS *pOptions) { HRESULT hr = S_OK; - HBITMAP bmpSrc; + HBITMAP bmpSrc, bmpSrcResized = NULL; HGDIOBJ oldSrc; - HDC hdcSrc; + HDC hdcSrc, hdcOrigSrc = NULL; RECT rcSrc; RECT rcDst; POINT dstSize; @@ -729,6 +729,34 @@ static HRESULT UXTHEME_DrawImageBackground(HTHEME hTheme, HDC hdc, int iPartId, GetThemeMargins(hTheme, hdc, iPartId, iStateId, TMT_SIZINGMARGINS, NULL, &sm); + /* Resize source image if destination smaller than margins */ + if (sm.cyTopHeight + sm.cyBottomHeight > dstSize.y || sm.cxLeftWidth + sm.cxRightWidth > dstSize.x) { + if (sm.cyTopHeight + sm.cyBottomHeight > dstSize.y) { + sm.cyTopHeight = MulDiv(sm.cyTopHeight, dstSize.y, srcSize.y); + sm.cyBottomHeight = dstSize.y - sm.cyTopHeight; + srcSize.y = dstSize.y; + } + + if (sm.cxLeftWidth + sm.cxRightWidth > dstSize.x) { + sm.cxLeftWidth = MulDiv(sm.cxLeftWidth, dstSize.x, srcSize.x); + sm.cxRightWidth = dstSize.x - sm.cxLeftWidth; + srcSize.x = dstSize.x; + } + + hdcOrigSrc = hdcSrc; + hdcSrc = CreateCompatibleDC(NULL); + bmpSrcResized = CreateBitmap(srcSize.x, srcSize.y, 1, 32, NULL); + SelectObject(hdcSrc, bmpSrcResized); + + UXTHEME_StretchBlt(hdcSrc, 0, 0, srcSize.x, srcSize.y, hdcOrigSrc, rcSrc.left, rcSrc.top, + rcSrc.right - rcSrc.left, rcSrc.bottom - rcSrc.top, transparent, transparentcolor); + + rcSrc.left = 0; + rcSrc.top = 0; + rcSrc.right = srcSize.x; + rcSrc.bottom = srcSize.y; + } + hdcDst = hdc; OffsetViewportOrgEx(hdcDst, rcDst.left, rcDst.top, &org); @@ -833,6 +861,8 @@ draw_error: } SelectObject(hdcSrc, oldSrc); DeleteDC(hdcSrc); + if (bmpSrcResized) DeleteObject(bmpSrcResized); + if (hdcOrigSrc) DeleteDC(hdcOrigSrc); CopyRect(pRect, &rcDst); return hr; }

1 0

Andrew Eikum : winecfg: Use a listview for speaker configuration.
by Alexandre Julliard April 15, 2015

April 15, 2015

Module: wine Branch: master Commit: e17f4fd2f814a2a651c229ead4f86ab25130fe06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e17f4fd2f814a2a651c229ead… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Apr 14 14:01:46 2015 -0500 winecfg: Use a listview for speaker configuration. --- po/ar.po | 220 +++++++++++++++++++++----------------------- po/bg.po | 219 +++++++++++++++++++++---------------------- po/ca.po | 220 +++++++++++++++++++++----------------------- po/cs.po | 220 +++++++++++++++++++++----------------------- po/da.po | 220 +++++++++++++++++++++----------------------- po/de.po | 218 +++++++++++++++++++++---------------------- po/el.po | 218 +++++++++++++++++++++---------------------- po/en.po | 218 +++++++++++++++++++++---------------------- po/en_US.po | 218 +++++++++++++++++++++---------------------- po/eo.po | 220 +++++++++++++++++++++----------------------- po/es.po | 220 +++++++++++++++++++++----------------------- po/fa.po | 218 +++++++++++++++++++++---------------------- po/fi.po | 218 +++++++++++++++++++++---------------------- po/fr.po | 218 +++++++++++++++++++++---------------------- po/he.po | 218 +++++++++++++++++++++---------------------- po/hi.po | 218 +++++++++++++++++++++---------------------- po/hr.po | 220 +++++++++++++++++++++----------------------- po/hu.po | 220 +++++++++++++++++++++----------------------- po/it.po | 220 +++++++++++++++++++++----------------------- po/ja.po | 218 +++++++++++++++++++++---------------------- po/ko.po | 220 +++++++++++++++++++++----------------------- po/lt.po | 218 +++++++++++++++++++++---------------------- po/ml.po | 218 +++++++++++++++++++++---------------------- po/nb_NO.po | 220 +++++++++++++++++++++----------------------- po/nl.po | 220 +++++++++++++++++++++----------------------- po/or.po | 218 +++++++++++++++++++++---------------------- po/pa.po | 218 +++++++++++++++++++++---------------------- po/pl.po | 220 +++++++++++++++++++++----------------------- po/pt_BR.po | 220 +++++++++++++++++++++----------------------- po/pt_PT.po | 220 +++++++++++++++++++++----------------------- po/rm.po | 218 +++++++++++++++++++++---------------------- po/ro.po | 220 +++++++++++++++++++++----------------------- po/ru.po | 218 +++++++++++++++++++++---------------------- po/sk.po | 220 +++++++++++++++++++++----------------------- po/sl.po | 220 +++++++++++++++++++++----------------------- po/sr_RS(a)cyrillic.po | 218 +++++++++++++++++++++---------------------- po/sr_RS(a)latin.po | 220 +++++++++++++++++++++----------------------- po/sv.po | 220 +++++++++++++++++++++----------------------- po/te.po | 218 +++++++++++++++++++++---------------------- po/th.po | 218 +++++++++++++++++++++---------------------- po/tr.po | 220 +++++++++++++++++++++----------------------- po/uk.po | 218 +++++++++++++++++++++---------------------- po/wa.po | 218 +++++++++++++++++++++---------------------- po/wine.pot | 218 +++++++++++++++++++++---------------------- po/zh_CN.po | 220 +++++++++++++++++++++----------------------- po/zh_TW.po | 220 +++++++++++++++++++++----------------------- programs/winecfg/audio.c | 105 +++++++++++++++------ programs/winecfg/resource.h | 4 +- programs/winecfg/winecfg.rc | 12 ++- 49 files changed, 5010 insertions(+), 5186 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e17f4fd2f814a2a651c22…

1 0

Henri Verbeet : d2d1: Take the world transform into account when calculating the bitmap brush texcoord transform.
by Alexandre Julliard April 15, 2015

April 15, 2015

Module: wine Branch: master Commit: a7b2f5e88983ee89bbfcd94a017a7f8df51457d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7b2f5e88983ee89bbfcd94a0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 15 11:07:13 2015 +0200 d2d1: Take the world transform into account when calculating the bitmap brush texcoord transform. --- dlls/d2d1/render_target.c | 65 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 44 insertions(+), 21 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index fe7b947..269e764 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -32,6 +32,18 @@ struct d2d_draw_text_layout_ctx D2D1_DRAW_TEXT_OPTIONS options; }; +static void d2d_matrix_multiply(D2D_MATRIX_3X2_F *a, const D2D_MATRIX_3X2_F *b) +{ + D2D_MATRIX_3X2_F tmp = *a; + + a->_11 = tmp._11 * b->_11 + tmp._12 * b->_21; + a->_12 = tmp._11 * b->_12 + tmp._12 * b->_22; + a->_21 = tmp._21 * b->_11 + tmp._22 * b->_21; + a->_22 = tmp._21 * b->_12 + tmp._22 * b->_22; + a->_31 = tmp._31 * b->_11 + tmp._32 * b->_21 + b->_31; + a->_32 = tmp._31 * b->_12 + tmp._32 * b->_22 + b->_32; +} + static void d2d_point_transform(D2D1_POINT_2F *dst, const D2D1_MATRIX_3X2_F *matrix, float x, float y) { dst->x = x * matrix->_11 + y * matrix->_21 + matrix->_31; @@ -543,7 +555,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar { float _11, _21, _31, pad0; float _12, _22, _32, pad1; - } transform, transform_inverse; + } transform; TRACE("iface %p, rect %p, brush %p.\n", iface, rect, brush); @@ -598,38 +610,49 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar if (brush_impl->type == D2D_BRUSH_TYPE_BITMAP) { struct d2d_bitmap *bitmap = brush_impl->u.bitmap.bitmap; - float rt_scale, rt_bitmap_scale, d; + D2D_MATRIX_3X2_F w, b; + float dpi_scale, d; ps = render_target->rect_bitmap_ps; + /* Scale for dpi. */ + w = render_target->drawing_state.transform; + dpi_scale = render_target->dpi_x / 96.0f; + w._11 *= dpi_scale; + w._21 *= dpi_scale; + w._31 *= dpi_scale; + dpi_scale = render_target->dpi_y / 96.0f; + w._12 *= dpi_scale; + w._22 *= dpi_scale; + w._32 *= dpi_scale; + /* Scale for bitmap size and dpi. */ - rt_scale = render_target->dpi_x / 96.0f; - rt_bitmap_scale = bitmap->pixel_size.width * (bitmap->dpi_x / 96.0f) * rt_scale; - transform._11 = brush_impl->transform._11 * rt_bitmap_scale; - transform._21 = brush_impl->transform._21 * rt_bitmap_scale; - transform._31 = brush_impl->transform._31 * rt_scale; - rt_scale = render_target->dpi_y / 96.0f; - rt_bitmap_scale = bitmap->pixel_size.height * (bitmap->dpi_y / 96.0f) * rt_scale; - transform._12 = brush_impl->transform._12 * rt_bitmap_scale; - transform._22 = brush_impl->transform._22 * rt_bitmap_scale; - transform._32 = brush_impl->transform._32 * rt_scale; + b = brush_impl->transform; + dpi_scale = bitmap->pixel_size.width * (bitmap->dpi_x / 96.0f); + b._11 *= dpi_scale; + b._21 *= dpi_scale; + dpi_scale = bitmap->pixel_size.height * (bitmap->dpi_y / 96.0f); + b._12 *= dpi_scale; + b._22 *= dpi_scale; + + d2d_matrix_multiply(&b, &w); /* Invert the matrix. (Because the matrix is applied to the sampling * coordinates. I.e., to scale the bitmap by 2 we need to divide the * coordinates by 2.) */ - d = transform._11 * transform._22 - transform._21 * transform._12; + d = b._11 * b._22 - b._21 * b._12; if (d != 0.0f) { - transform_inverse._11 = transform._22 / d; - transform_inverse._21 = -transform._21 / d; - transform_inverse._31 = (transform._21 * transform._32 - transform._31 * transform._22) / d; - transform_inverse._12 = -transform._12 / d; - transform_inverse._22 = transform._11 / d; - transform_inverse._32 = -(transform._11 * transform._32 - transform._31 * transform._12) / d; + transform._11 = b._22 / d; + transform._21 = -b._21 / d; + transform._31 = (b._21 * b._32 - b._31 * b._22) / d; + transform._12 = -b._12 / d; + transform._22 = b._11 / d; + transform._32 = -(b._11 * b._32 - b._31 * b._12) / d; } - buffer_desc.ByteWidth = sizeof(transform_inverse); - buffer_data.pSysMem = &transform_inverse; + buffer_desc.ByteWidth = sizeof(transform); + buffer_data.pSysMem = &transform; } else {

1 0

Stefan Dösinger : wined3d: Call arbfp_blit_surface and ffp_blit_blit_surface through the blit interfaces.
by Alexandre Julliard April 15, 2015

April 15, 2015

Module: wine Branch: master Commit: 27209c69a90bce2acd80937bd5bae0da0e9a01d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27209c69a90bce2acd80937bd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 14 11:16:26 2015 +0200 wined3d: Call arbfp_blit_surface and ffp_blit_blit_surface through the blit interfaces. --- dlls/wined3d/arb_program_shader.c | 5 ++--- dlls/wined3d/surface.c | 32 +++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 10 ++++------ 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ef7f6ff..797c204 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7870,7 +7870,7 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, } } -HRESULT arbfp_blit_surface(struct wined3d_device *device, DWORD filter, +static void arbfp_blit_surface(struct wined3d_device *device, DWORD filter, struct wined3d_surface *src_surface, const RECT *src_rect_in, struct wined3d_surface *dst_surface, const RECT *dst_rect_in, const struct wined3d_color_key *color_key) @@ -7923,8 +7923,6 @@ HRESULT arbfp_blit_surface(struct wined3d_device *device, DWORD filter, surface_validate_location(dst_surface, dst_surface->container->resource.draw_binding); surface_invalidate_location(dst_surface, ~dst_surface->container->resource.draw_binding); - - return WINED3D_OK; } static HRESULT arbfp_blit_color_fill(struct wined3d_device *device, struct wined3d_surface *dst_surface, @@ -7949,4 +7947,5 @@ const struct blit_shader arbfp_blit = { arbfp_blit_supported, arbfp_blit_color_fill, arbfp_blit_depth_fill, + arbfp_blit_surface, }; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 54a632d..2838004 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4409,6 +4409,7 @@ const struct blit_shader ffp_blit = { ffp_blit_supported, ffp_blit_color_fill, ffp_blit_depth_fill, + ffp_blit_blit_surface, }; static HRESULT cpu_blit_alloc(struct wined3d_device *device) @@ -5046,6 +5047,15 @@ static HRESULT cpu_blit_depth_fill(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } +static void cpu_blit_blit_surface(struct wined3d_device *device, DWORD filter, + struct wined3d_surface *src_surface, const RECT *src_rect, + struct wined3d_surface *dst_surface, const RECT *dst_rect, + const struct wined3d_color_key *color_key) +{ + /* FIXME: Remove error returns from surface_blt_cpu. */ + ERR("Blit method not implemented by cpu_blit.\n"); +} + const struct blit_shader cpu_blit = { cpu_blit_alloc, cpu_blit_free, @@ -5054,6 +5064,7 @@ const struct blit_shader cpu_blit = { cpu_blit_supported, cpu_blit_color_fill, cpu_blit_depth_fill, + cpu_blit_blit_surface, }; HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect_in, @@ -5253,6 +5264,8 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC } else { + const struct blit_shader *blitter; + /* In principle this would apply to depth blits as well, but we don't * implement those in the CPU blitter at the moment. */ if ((dst_surface->locations & dst_surface->resource.map_binding) @@ -5354,23 +5367,12 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC return WINED3D_OK; } - if (arbfp_blit.blit_supported(&device->adapter->gl_info, &device->adapter->d3d_info, blit_op, + blitter = wined3d_select_blitter(&device->adapter->gl_info, &device->adapter->d3d_info, blit_op, &src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format, - &dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format)) - { - TRACE("Using arbfp blit.\n"); - - if (SUCCEEDED(arbfp_blit_surface(device, filter, src_surface, &src_rect, - dst_surface, &dst_rect, color_key))) - return WINED3D_OK; - } - - if (ffp_blit.blit_supported(&device->adapter->gl_info, &device->adapter->d3d_info, blit_op, - &src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format, - &dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format)) + &dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format); + if (blitter) { - TRACE("Using FFP blit.\n"); - ffp_blit_blit_surface(device, filter, src_surface, &src_rect, dst_surface, &dst_rect, color_key); + blitter->blit_surface(device, filter, src_surface, &src_rect, dst_surface, &dst_rect, color_key); return WINED3D_OK; } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index df74268..acac299 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1351,6 +1351,10 @@ struct blit_shader const RECT *dst_rect, const struct wined3d_color *color); HRESULT (*depth_fill)(struct wined3d_device *device, struct wined3d_surface *surface, const RECT *rect, float depth); + void (*blit_surface)(struct wined3d_device *device, DWORD filter, + struct wined3d_surface *src_surface, const RECT *src_rect, + struct wined3d_surface *dst_surface, const RECT *dst_rect, + const struct wined3d_color_key *color_key); }; extern const struct blit_shader ffp_blit DECLSPEC_HIDDEN; @@ -1363,12 +1367,6 @@ const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *g const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) DECLSPEC_HIDDEN; -/* Temporary blit_shader helper functions */ -HRESULT arbfp_blit_surface(struct wined3d_device *device, DWORD filter, - struct wined3d_surface *src_surface, const RECT *src_rect, - struct wined3d_surface *dst_surface, const RECT *dst_rect, - const struct wined3d_color_key *color_key) DECLSPEC_HIDDEN; - struct wined3d_context *context_acquire(const struct wined3d_device *device, struct wined3d_surface *target) DECLSPEC_HIDDEN; void context_alloc_event_query(struct wined3d_context *context,

1 0

Stefan Dösinger : wined3d: Move fixed function draw blits out of surface_blt_special.
by Alexandre Julliard April 15, 2015

April 15, 2015

Module: wine Branch: master Commit: 6b455e74a07d6c32c6969f77a698ef1e06202eb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b455e74a07d6c32c6969f77a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 14 11:16:25 2015 +0200 wined3d: Move fixed function draw blits out of surface_blt_special. --- dlls/wined3d/surface.c | 100 ++++++++++++++++++++++--------------------------- 1 file changed, 44 insertions(+), 56 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5094af3..54a632d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3462,8 +3462,6 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE { struct wined3d_device *device = dst_surface->resource.device; const struct wined3d_surface *rt = wined3d_rendertarget_view_get_surface(device->fb.render_targets[0]); - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; struct wined3d_swapchain *src_swapchain, *dst_swapchain; TRACE("dst_surface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, blt_fx %p, filter %s.\n", @@ -3584,57 +3582,6 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE return WINED3D_OK; } - else if (src_surface) - { - /* Blit from offscreen surface to render target */ - struct wined3d_color_key old_blt_key = src_surface->container->async.src_blt_color_key; - DWORD old_color_key_flags = src_surface->container->async.color_key_flags; - - TRACE("Blt from surface %p to rendertarget %p\n", src_surface, dst_surface); - - if (!device->blitter->blit_supported(gl_info, d3d_info, WINED3D_BLIT_OP_COLOR_BLIT, - src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format, - dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format)) - { - FIXME("Unsupported blit operation falling back to software\n"); - return WINED3DERR_INVALIDCALL; - } - - /* Color keying: Check if we have to do a color keyed blt, - * and if not check if a color key is activated. - * - * Just modify the color keying parameters in the surface and restore them afterwards - * The surface keeps track of the color key last used to load the opengl surface. - * PreLoad will catch the change to the flags and color key and reload if necessary. - */ - if (flags & WINEDDBLT_KEYSRC) - { - /* Use color key from surface */ - } - else if (flags & WINEDDBLT_KEYSRCOVERRIDE) - { - /* Use color key from DDBltFx */ - wined3d_texture_set_color_key(src_surface->container, WINED3D_CKEY_SRC_BLT, &DDBltFx->ddckSrcColorkey); - } - else - { - /* Do not use color key */ - wined3d_texture_set_color_key(src_surface->container, WINED3D_CKEY_SRC_BLT, NULL); - } - - surface_blt_to_drawable(device, filter, - flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE | WINEDDBLT_ALPHATEST), - src_surface, src_rect, dst_surface, dst_rect); - - /* Restore the color key parameters */ - wined3d_texture_set_color_key(src_surface->container, WINED3D_CKEY_SRC_BLT, - (old_color_key_flags & WINED3D_CKEY_SRC_BLT) ? &old_blt_key : NULL); - - surface_validate_location(dst_surface, dst_surface->container->resource.draw_binding); - surface_invalidate_location(dst_surface, ~dst_surface->container->resource.draw_binding); - - return WINED3D_OK; - } /* Default: Fall back to the generic blt. Not an error, a TRACE is enough */ TRACE("Didn't find any usable render target setup for hw blit, falling back to software\n"); @@ -4324,6 +4271,12 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) { + if (src_pool == WINED3D_POOL_SYSTEM_MEM || dst_pool == WINED3D_POOL_SYSTEM_MEM) + { + TRACE("Source or destination is in system memory.\n"); + return FALSE; + } + switch (blit_op) { case WINED3D_BLIT_OP_COLOR_BLIT_CKEY: @@ -4350,12 +4303,14 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, return FALSE; } + if (!(dst_usage & WINED3DUSAGE_RENDERTARGET)) + { + TRACE("Can only blit to render targets.\n"); + return FALSE; + } return TRUE; case WINED3D_BLIT_OP_COLOR_FILL: - if (dst_pool == WINED3D_POOL_SYSTEM_MEM) - return FALSE; - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { if (!((dst_format->flags & WINED3DFMT_FLAG_FBO_ATTACHABLE) || (dst_usage & WINED3DUSAGE_RENDERTARGET))) @@ -4422,6 +4377,30 @@ static HRESULT ffp_blit_depth_fill(struct wined3d_device *device, struct wined3d return WINED3D_OK; } +static void ffp_blit_blit_surface(struct wined3d_device *device, DWORD filter, + struct wined3d_surface *src_surface, const RECT *src_rect, + struct wined3d_surface *dst_surface, const RECT *dst_rect, + const struct wined3d_color_key *color_key) +{ + /* Blit from offscreen surface to render target */ + struct wined3d_color_key old_blt_key = src_surface->container->async.src_blt_color_key; + DWORD old_color_key_flags = src_surface->container->async.color_key_flags; + + TRACE("Blt from surface %p to rendertarget %p\n", src_surface, dst_surface); + + wined3d_texture_set_color_key(src_surface->container, WINED3D_CKEY_SRC_BLT, color_key); + + surface_blt_to_drawable(device, filter, + !!color_key, src_surface, src_rect, dst_surface, dst_rect); + + /* Restore the color key parameters */ + wined3d_texture_set_color_key(src_surface->container, WINED3D_CKEY_SRC_BLT, + (old_color_key_flags & WINED3D_CKEY_SRC_BLT) ? &old_blt_key : NULL); + + surface_validate_location(dst_surface, dst_surface->container->resource.draw_binding); + surface_invalidate_location(dst_surface, ~dst_surface->container->resource.draw_binding); +} + const struct blit_shader ffp_blit = { ffp_blit_alloc, ffp_blit_free, @@ -5385,6 +5364,15 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC dst_surface, &dst_rect, color_key))) return WINED3D_OK; } + + if (ffp_blit.blit_supported(&device->adapter->gl_info, &device->adapter->d3d_info, blit_op, + &src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format, + &dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format)) + { + TRACE("Using FFP blit.\n"); + ffp_blit_blit_surface(device, filter, src_surface, &src_rect, dst_surface, &dst_rect, color_key); + return WINED3D_OK; + } } }

1 0

Stefan Dösinger : wined3d: Implement color keying in the ARB fixed function pipeline.
by Alexandre Julliard April 15, 2015

April 15, 2015

Module: wine Branch: master Commit: f84d741cb3e639018e757d2f86c23117dca7d749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f84d741cb3e639018e757d2f8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 14 11:16:24 2015 +0200 wined3d: Implement color keying in the ARB fixed function pipeline. --- dlls/wined3d/arb_program_shader.c | 104 +++++++++++++++++++++++++++++++++----- 1 file changed, 90 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index b9b5541..ef7f6ff 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5762,7 +5762,8 @@ const struct wined3d_shader_backend_ops arb_program_shader_backend = /* ARB_fragment_program fixed function pipeline replacement definitions */ #define ARB_FFP_CONST_TFACTOR 0 -#define ARB_FFP_CONST_SPECULAR_ENABLE ((ARB_FFP_CONST_TFACTOR) + 1) +#define ARB_FFP_CONST_COLOR_KEY ((ARB_FFP_CONST_TFACTOR) + 1) +#define ARB_FFP_CONST_SPECULAR_ENABLE ((ARB_FFP_CONST_COLOR_KEY) + 1) #define ARB_FFP_CONST_CONSTANT(i) ((ARB_FFP_CONST_SPECULAR_ENABLE) + 1 + i) #define ARB_FFP_CONST_BUMPMAT(i) ((ARB_FFP_CONST_CONSTANT(7)) + 1 + i) #define ARB_FFP_CONST_LUMINANCE(i) ((ARB_FFP_CONST_BUMPMAT(7)) + 1 + i) @@ -5841,7 +5842,8 @@ static void arbfp_free(struct wined3d_device *device) static void arbfp_get_caps(const struct wined3d_gl_info *gl_info, struct fragment_caps *caps) { caps->wined3d_caps = WINED3D_FRAGMENT_CAP_PROJ_CONTROL - | WINED3D_FRAGMENT_CAP_SRGB_WRITE; + | WINED3D_FRAGMENT_CAP_SRGB_WRITE + | WINED3D_FRAGMENT_CAP_COLOR_KEY; caps->PrimitiveMiscCaps = WINED3DPMISCCAPS_TSSARGTEMP; caps->TextureOpCaps = WINED3DTEXOPCAPS_DISABLE | WINED3DTEXOPCAPS_SELECTARG1 | @@ -5995,6 +5997,66 @@ static void tex_bumpenvlum_arbfp(struct wined3d_context *context, checkGLcall("glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARB_FFP_CONST_LUMINANCE(stage), param)"); } +static void alpha_test_arbfp(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + int glParm; + float ref; + + TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); + + if (state->render_states[WINED3D_RS_ALPHATESTENABLE]) + { + gl_info->gl_ops.gl.p_glEnable(GL_ALPHA_TEST); + checkGLcall("glEnable GL_ALPHA_TEST"); + } + else + { + gl_info->gl_ops.gl.p_glDisable(GL_ALPHA_TEST); + checkGLcall("glDisable GL_ALPHA_TEST"); + return; + } + + ref = ((float)state->render_states[WINED3D_RS_ALPHAREF]) / 255.0f; + glParm = wined3d_gl_compare_func(state->render_states[WINED3D_RS_ALPHAFUNC]); + + if (glParm) + { + gl_info->gl_ops.gl.p_glAlphaFunc(glParm, ref); + checkGLcall("glAlphaFunc"); + } +} + +static void color_key_arbfp(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +{ + struct wined3d_device *device = context->swapchain->device; + const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_color float_key; + const struct wined3d_texture *texture = state->textures[0]; + + if (!texture) + return; + + /* Don't load the parameter if we're using an arbfp pixel shader, + * otherwise we'll overwrite application provided constants. */ + if (device->shader_backend == &arb_program_shader_backend) + { + struct shader_arb_priv *priv; + + if (use_ps(state)) + return; + + priv = device->shader_priv; + priv->pshader_const_dirty[ARB_FFP_CONST_COLOR_KEY] = 1; + priv->highest_dirty_ps_const = max(priv->highest_dirty_ps_const, ARB_FFP_CONST_COLOR_KEY + 1); + } + + wined3d_format_convert_color_to_float(texture->resource.format, NULL, + texture->async.src_blt_color_key.color_space_high_value, &float_key); + GL_EXTCALL(glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARB_FFP_CONST_COLOR_KEY, &float_key.r)); + checkGLcall("glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARB_FFP_CONST_COLOR_KEY, &float_key.r)"); +} + static const char *get_argreg(struct wined3d_shader_buffer *buffer, DWORD argnum, unsigned int stage, DWORD arg) { const char *ret; @@ -6237,6 +6299,20 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con GLint pos; BOOL custom_linear_fog = FALSE; + if (!shader_buffer_init(&buffer)) + { + ERR("Failed to initialize shader buffer.\n"); + return 0; + } + + shader_addline(&buffer, "!!ARBfp1.0\n"); + + if (settings->color_key_enabled) + { + shader_addline(&buffer, "PARAM color_key = program.env[%u];\n", ARB_FFP_CONST_COLOR_KEY); + tex_read[0] = TRUE; + } + /* Find out which textures are read */ for (stage = 0; stage < MAX_TEXTURES; ++stage) { @@ -6296,15 +6372,6 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con } lowest_disabled_stage = stage; - /* Shader header */ - if (!shader_buffer_init(&buffer)) - { - ERR("Failed to initialize shader buffer.\n"); - return 0; - } - - shader_addline(&buffer, "!!ARBfp1.0\n"); - switch (settings->fog) { case WINED3D_FFP_PS_FOG_OFF: break; @@ -6423,6 +6490,14 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con settings->op[stage].color_fixup); } + if (settings->color_key_enabled) + { + shader_addline(&buffer, "SUB TMP, tex0, color_key;\n"); + shader_addline(&buffer, "DP4 TMP.b, TMP, TMP;\n"); + shader_addline(&buffer, "SGE TMP, -TMP.b, 0.0;\n"); + shader_addline(&buffer, "KIL -TMP;\n"); + } + /* Generate the main shader */ for (stage = 0; stage < MAX_TEXTURES; ++stage) { @@ -6543,6 +6618,7 @@ static void fragment_prog_arbfp(struct wined3d_context *context, const struct wi } state_texfactor_arbfp(context, state, STATE_RENDER(WINED3D_RS_TEXTUREFACTOR)); state_arb_specularenable(context, state, STATE_RENDER(WINED3D_RS_SPECULARENABLE)); + color_key_arbfp(context, state, STATE_COLOR_KEY); } else if (use_pshader) { @@ -6782,9 +6858,9 @@ static const struct StateEntryTemplate arbfp_fragmentstate_template[] = {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), fragment_prog_arbfp }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_ALPHAFUNC), { STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_ALPHAREF), { STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), NULL }, WINED3D_GL_EXT_NONE }, - {STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), { STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), state_alpha_test }, WINED3D_GL_EXT_NONE }, - {STATE_RENDER(WINED3D_RS_COLORKEYENABLE), { STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), NULL }, WINED3D_GL_EXT_NONE }, - {STATE_COLOR_KEY, { STATE_COLOR_KEY, state_nop }, WINED3D_GL_EXT_NONE }, + {STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), { STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), alpha_test_arbfp }, WINED3D_GL_EXT_NONE }, + {STATE_RENDER(WINED3D_RS_COLORKEYENABLE), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_COLOR_KEY, { STATE_COLOR_KEY, color_key_arbfp }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGENABLE), { STATE_RENDER(WINED3D_RS_FOGENABLE), state_arbfp_fog }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGTABLEMODE), { STATE_RENDER(WINED3D_RS_FOGENABLE), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGVERTEXMODE), { STATE_RENDER(WINED3D_RS_FOGENABLE), NULL }, WINED3D_GL_EXT_NONE },

1 0

Andrew Eikum : dsound/tests: Don't perform ALAW test on secondary buffers.
by Alexandre Julliard April 15, 2015

April 15, 2015

Module: wine Branch: master Commit: 582b54329db0b3854d8d490c4543a2cf493910d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=582b54329db0b3854d8d490c4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Apr 14 14:10:49 2015 -0500 dsound/tests: Don't perform ALAW test on secondary buffers. win2k supports it, winxp gives one error, vista+ gives another. This isn't interesting behavior to test. --- dlls/dsound/tests/dsound.c | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 59763aa..78364ed 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1391,25 +1391,27 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I ok(wfx.nAvgBytesPerSec == 44100 * 4 + 1, "%s: avgbytes: %u\n", testname, wfx.nAvgBytesPerSec); IDirectSoundBuffer_Release(got_buf); - wfx.wFormatTag = WAVE_FORMAT_ALAW; - wfx.nChannels = 2; - wfx.nSamplesPerSec = 44100; - wfx.wBitsPerSample = 16; - wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; - wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; - rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); - ok(buf ? rc == S_OK : (rc == E_NOTIMPL || rc == DSERR_INVALIDCALL /* winxp */), "%s: SetFormat: %08x\n", testname, rc); - - if(got_buf){ - rc = IDirectSoundBuffer_GetFormat(got_buf, &wfx, sizeof(wfx), NULL); - ok(rc == S_OK, "%s: GetFormat: %08x\n", testname, rc); - ok(wfx.wFormatTag == WAVE_FORMAT_ALAW, "%s: format: 0x%x\n", testname, wfx.wFormatTag); - ok(wfx.nChannels == 2, "%s: channels: %u\n", testname, wfx.nChannels); - ok(wfx.nSamplesPerSec == 44100, "%s: rate: %u\n", testname, wfx.nSamplesPerSec); - ok(wfx.wBitsPerSample == 16, "%s: bps: %u\n", testname, wfx.wBitsPerSample); - ok(wfx.nBlockAlign == 4, "%s: blockalign: %u\n", testname, wfx.nBlockAlign); - ok(wfx.nAvgBytesPerSec == 44100 * 4, "%s: avgbytes: %u\n", testname, wfx.nAvgBytesPerSec); - IDirectSoundBuffer_Release(got_buf); + if(buf){ + wfx.wFormatTag = WAVE_FORMAT_ALAW; + wfx.nChannels = 2; + wfx.nSamplesPerSec = 44100; + wfx.wBitsPerSample = 16; + wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; + wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; + rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); + ok(rc == S_OK, "%s: SetFormat: %08x\n", testname, rc); + + if(got_buf){ + rc = IDirectSoundBuffer_GetFormat(got_buf, &wfx, sizeof(wfx), NULL); + ok(rc == S_OK, "%s: GetFormat: %08x\n", testname, rc); + ok(wfx.wFormatTag == WAVE_FORMAT_ALAW, "%s: format: 0x%x\n", testname, wfx.wFormatTag); + ok(wfx.nChannels == 2, "%s: channels: %u\n", testname, wfx.nChannels); + ok(wfx.nSamplesPerSec == 44100, "%s: rate: %u\n", testname, wfx.nSamplesPerSec); + ok(wfx.wBitsPerSample == 16, "%s: bps: %u\n", testname, wfx.wBitsPerSample); + ok(wfx.nBlockAlign == 4, "%s: blockalign: %u\n", testname, wfx.nBlockAlign); + ok(wfx.nAvgBytesPerSec == 44100 * 4, "%s: avgbytes: %u\n", testname, wfx.nAvgBytesPerSec); + IDirectSoundBuffer_Release(got_buf); + } } if(!gotdx8){

1 0

Henri Verbeet : d2d1: Add opacity support to bitmap brushes.
by Alexandre Julliard April 15, 2015

April 15, 2015

Module: wine Branch: master Commit: 2af8e243ac7e6358cf836718dee47267896e1bcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2af8e243ac7e6358cf836718d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 15 11:07:14 2015 +0200 d2d1: Add opacity support to bitmap brushes. --- dlls/d2d1/render_target.c | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 269e764..cdf82bf 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -650,6 +650,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar transform._22 = b._11 / d; transform._32 = -(b._11 * b._32 - b._31 * b._12) / d; } + transform.pad1 = brush_impl->opacity; buffer_desc.ByteWidth = sizeof(transform); buffer_data.pSysMem = &transform; @@ -1396,27 +1397,39 @@ HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, { #if 0 float3x2 transform; + float opacity; + SamplerState s; Texture2D t; float4 main(float4 position : SV_POSITION) : SV_Target { - return t.Sample(s, mul(float3(position.xy, 1.0), transform)); + float2 texcoord; + float4 ret; + + texcoord.x = position.x * transform._11 + position.y * transform._21 + transform._31; + texcoord.y = position.x * transform._12 + position.y * transform._22 + transform._32; + ret = t.Sample(s, texcoord); + ret.a *= opacity; + + return ret; } #endif - 0x43425844, 0x20fce5be, 0x138fa37f, 0x9554f03f, 0x3dbe9c02, 0x00000001, 0x00000184, 0x00000003, + 0x43425844, 0x9a5f9280, 0xa5351c23, 0x15d6e760, 0xce35bcc3, 0x00000001, 0x000001d0, 0x00000003, 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, - 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x000000e8, 0x00000040, - 0x0000003a, 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x0300005a, 0x00106000, 0x00000000, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000134, 0x00000040, + 0x0000004d, 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x0300005a, 0x00106000, 0x00000000, 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001, - 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000002, 0x05000036, 0x00100032, 0x00000000, - 0x00101046, 0x00000000, 0x05000036, 0x00100042, 0x00000000, 0x00004001, 0x3f800000, 0x08000010, - 0x00100012, 0x00000001, 0x00100246, 0x00000000, 0x00208246, 0x00000000, 0x00000000, 0x08000010, - 0x00100022, 0x00000001, 0x00100246, 0x00000000, 0x00208246, 0x00000000, 0x00000001, 0x09000045, - 0x001020f2, 0x00000000, 0x00100046, 0x00000001, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, - 0x0100003e, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0800000f, 0x00100012, 0x00000000, + 0x00101046, 0x00000000, 0x00208046, 0x00000000, 0x00000000, 0x08000000, 0x00100012, 0x00000000, + 0x0010000a, 0x00000000, 0x0020802a, 0x00000000, 0x00000000, 0x0800000f, 0x00100042, 0x00000000, + 0x00101046, 0x00000000, 0x00208046, 0x00000000, 0x00000001, 0x08000000, 0x00100022, 0x00000000, + 0x0010002a, 0x00000000, 0x0020802a, 0x00000000, 0x00000001, 0x09000045, 0x001000f2, 0x00000000, + 0x00100046, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x08000038, 0x00102082, + 0x00000000, 0x0010003a, 0x00000000, 0x0020803a, 0x00000000, 0x00000001, 0x05000036, 0x00102072, + 0x00000000, 0x00100246, 0x00000000, 0x0100003e, }; static const struct {

1 0

Henri Verbeet : wined3d: Use the display format if WINED3DFMT_UNKNOWN is passed as backbuffer format for windowed mode resets.
by Alexandre Julliard April 15, 2015

April 15, 2015

Module: wine Branch: master Commit: dc53f6c2e6b55e1489eb84243fe07e7e9842a0a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc53f6c2e6b55e1489eb84243… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 15 11:07:10 2015 +0200 wined3d: Use the display format if WINED3DFMT_UNKNOWN is passed as backbuffer format for windowed mode resets. --- dlls/d3d9/tests/d3d9ex.c | 4 ++-- dlls/d3d9/tests/device.c | 4 ++-- dlls/wined3d/device.c | 13 ++++++++++--- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 6118ce9..0a7fe90 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -1064,7 +1064,7 @@ static void test_reset(void) ok(d3dpp.BackBufferWidth == 200, "Got unexpected BackBufferWidth %u.\n", d3dpp.BackBufferWidth); ok(d3dpp.BackBufferHeight == 150, "Got unexpected BackBufferHeight %u.\n", d3dpp.BackBufferHeight); - todo_wine ok(d3dpp.BackBufferFormat == d3ddm.Format, "Got unexpected BackBufferFormat %#x, expected %#x.\n", + ok(d3dpp.BackBufferFormat == d3ddm.Format, "Got unexpected BackBufferFormat %#x, expected %#x.\n", d3dpp.BackBufferFormat, d3ddm.Format); ok(d3dpp.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", d3dpp.BackBufferCount); ok(!d3dpp.MultiSampleType, "Got unexpected MultiSampleType %u.\n", d3dpp.MultiSampleType); @@ -1100,7 +1100,7 @@ static void test_reset(void) ok(SUCCEEDED(hr), "Failed to get present parameters, hr %#x.\n", hr); ok(d3dpp.BackBufferWidth == 200, "Got unexpected backbuffer width %u.\n", d3dpp.BackBufferWidth); ok(d3dpp.BackBufferHeight == 150, "Got unexpected backbuffer height %u.\n", d3dpp.BackBufferHeight); - todo_wine ok(d3dpp.BackBufferFormat == d3ddm.Format, "Got unexpected BackBufferFormat %#x, expected %#x.\n", + ok(d3dpp.BackBufferFormat == d3ddm.Format, "Got unexpected BackBufferFormat %#x, expected %#x.\n", d3dpp.BackBufferFormat, d3ddm.Format); ok(d3dpp.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", d3dpp.BackBufferCount); ok(!d3dpp.MultiSampleType, "Got unexpected MultiSampleType %u.\n", d3dpp.MultiSampleType); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 174fc13..4d48ea8 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1869,7 +1869,7 @@ static void test_reset(void) ok(d3dpp.BackBufferWidth == 200, "Got unexpected BackBufferWidth %u.\n", d3dpp.BackBufferWidth); ok(d3dpp.BackBufferHeight == 150, "Got unexpected BackBufferHeight %u.\n", d3dpp.BackBufferHeight); - todo_wine ok(d3dpp.BackBufferFormat == d3ddm.Format, "Got unexpected BackBufferFormat %#x, expected %#x.\n", + ok(d3dpp.BackBufferFormat == d3ddm.Format, "Got unexpected BackBufferFormat %#x, expected %#x.\n", d3dpp.BackBufferFormat, d3ddm.Format); ok(d3dpp.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", d3dpp.BackBufferCount); ok(!d3dpp.MultiSampleType, "Got unexpected MultiSampleType %u.\n", d3dpp.MultiSampleType); @@ -1904,7 +1904,7 @@ static void test_reset(void) ok(SUCCEEDED(hr), "Failed to get present parameters, hr %#x.\n", hr); ok(d3dpp.BackBufferWidth == 200, "Got unexpected BackBufferWidth %u.\n", d3dpp.BackBufferWidth); ok(d3dpp.BackBufferHeight == 150, "Got unexpected BackBufferHeight %u.\n", d3dpp.BackBufferHeight); - todo_wine ok(d3dpp.BackBufferFormat == d3ddm.Format, "Got unexpected BackBufferFormat %#x, expected %#x.\n", + ok(d3dpp.BackBufferFormat == d3ddm.Format, "Got unexpected BackBufferFormat %#x, expected %#x.\n", d3dpp.BackBufferFormat, d3ddm.Format); ok(d3dpp.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", d3dpp.BackBufferCount); ok(!d3dpp.MultiSampleType, "Got unexpected MultiSampleType %u.\n", d3dpp.MultiSampleType); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 870e384..20a0e23 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4331,6 +4331,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode, wined3d_device_reset_cb callback, BOOL reset_state) { + enum wined3d_format_id backbuffer_format = swapchain_desc->backbuffer_format; struct wined3d_resource *resource, *cursor; struct wined3d_swapchain *swapchain; struct wined3d_display_mode m; @@ -4492,10 +4493,16 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, update_desc = TRUE; } - if (swapchain_desc->backbuffer_format != WINED3DFMT_UNKNOWN - && swapchain_desc->backbuffer_format != swapchain->desc.backbuffer_format) + if (backbuffer_format == WINED3DFMT_UNKNOWN) { - swapchain->desc.backbuffer_format = swapchain_desc->backbuffer_format; + if (!swapchain_desc->windowed) + return WINED3DERR_INVALIDCALL; + backbuffer_format = swapchain->original_mode.format_id; + } + + if (backbuffer_format != swapchain->desc.backbuffer_format) + { + swapchain->desc.backbuffer_format = backbuffer_format; update_desc = TRUE; }

1 0

Stefan Dösinger : wined3d: Use finer grained colorkey state invalidation.
by Alexandre Julliard April 15, 2015

April 15, 2015

Module: wine Branch: master Commit: 483d9550c49a0b6fc5cebe916ebfd07f415c35ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=483d9550c49a0b6fc5cebe916… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 14 11:16:23 2015 +0200 wined3d: Use finer grained colorkey state invalidation. --- dlls/wined3d/cs.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 8271634..d66850a 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -913,6 +913,13 @@ static void wined3d_cs_exec_set_color_key(struct wined3d_cs *cs, const void *dat break; case WINED3D_CKEY_SRC_BLT: + if (texture == cs->state.textures[0]) + { + device_invalidate_state(cs->device, STATE_COLOR_KEY); + if (!(texture->async.color_key_flags & WINED3D_CKEY_SRC_BLT)) + device_invalidate_state(cs->device, STATE_RENDER(WINED3D_RS_COLORKEYENABLE)); + } + texture->async.src_blt_color_key = op->color_key; texture->async.color_key_flags |= WINED3D_CKEY_SRC_BLT; break; @@ -936,6 +943,9 @@ static void wined3d_cs_exec_set_color_key(struct wined3d_cs *cs, const void *dat break; case WINED3D_CKEY_SRC_BLT: + if (texture == cs->state.textures[0] && texture->async.color_key_flags & WINED3D_CKEY_SRC_BLT) + device_invalidate_state(cs->device, STATE_RENDER(WINED3D_RS_COLORKEYENABLE)); + texture->async.color_key_flags &= ~WINED3D_CKEY_SRC_BLT; break; @@ -944,9 +954,6 @@ static void wined3d_cs_exec_set_color_key(struct wined3d_cs *cs, const void *dat break; } } - - if (texture->resource.bind_count && op->flags & WINED3D_CKEY_SRC_BLT) - device_invalidate_state(cs->device, STATE_RENDER(WINED3D_RS_COLORKEYENABLE)); } void wined3d_cs_emit_set_color_key(struct wined3d_cs *cs, struct wined3d_texture *texture,

1 0

Henri Verbeet : wined3d: Bind sampler objects to the correct texture stage.
by Alexandre Julliard April 15, 2015

April 15, 2015

Module: wine Branch: master Commit: a37099e132eb803ec8820df174cbbde4445885d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a37099e132eb803ec8820df17… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 15 11:07:11 2015 +0200 wined3d: Bind sampler objects to the correct texture stage. On current hardware this generally only makes a difference for vertex textures. This fixes a regression introduced by commit c6232e1d111ae8929c53c02211cde4a9777311fd. --- dlls/wined3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 39b0256..7efbf3d 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3717,7 +3717,7 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state if (sampler) { - GL_EXTCALL(glBindSampler(sampler_idx, sampler->name)); + GL_EXTCALL(glBindSampler(mapped_stage, sampler->name)); checkGLcall("glBindSampler"); } }

1 0

Andrew Eikum : shell32: Add more knownfolders.
by Alexandre Julliard April 14, 2015

April 14, 2015

Module: wine Branch: master Commit: 80428310610a667fe8c106fd199251015b1548d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80428310610a667fe8c106fd1… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Apr 13 08:21:17 2015 -0500 shell32: Add more knownfolders. --- dlls/shell32/shellpath.c | 411 ++++++++++++++++++++++++++++++++++++++--- dlls/shell32/tests/shellpath.c | 61 +++--- 2 files changed, 415 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=80428310610a667fe8c10…

1 0

Hugh McMaster : wineconsole: Do not truncate argument strings larger than 256 bytes.
by Alexandre Julliard April 14, 2015

April 14, 2015

Module: wine Branch: master Commit: 0516d969ebffa93f1317a9dbf6e4c1a1af457a59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0516d969ebffa93f1317a9dbf… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Apr 8 16:08:08 2015 +1000 wineconsole: Do not truncate argument strings larger than 256 bytes. --- programs/wineconsole/wineconsole.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 3c2faf5..ed5f816 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -830,13 +830,24 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmdLine, INT nCmdSh break; case from_process_name: { - WCHAR buffer[256]; + int len; + WCHAR *buffer; - MultiByteToWideChar(CP_ACP, 0, wci.ptr, -1, buffer, sizeof(buffer) / sizeof(buffer[0])); + len = MultiByteToWideChar(CP_ACP, 0, wci.ptr, -1, NULL, 0); + + buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!buffer) + return 0; + + MultiByteToWideChar(CP_ACP, 0, wci.ptr, -1, buffer, len); if (!(data = WINECON_Init(hInst, GetCurrentProcessId(), buffer, wci.backend, nCmdShow))) + { + HeapFree(GetProcessHeap(), 0, buffer); return 0; + } ret = WINECON_Spawn(data, buffer); + HeapFree(GetProcessHeap(), 0, buffer); if (!ret) { WINECON_Delete(data);

1 0

Henri Verbeet : d3d8: Update the BackBufferCount after a successful reset.
by Alexandre Julliard April 14, 2015

April 14, 2015

Module: wine Branch: master Commit: 69047ed4f7e2b0799f639691b30ac4ad5059b06f URL: http://source.winehq.org/git/wine.git/?a=commit;h=69047ed4f7e2b0799f639691b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 14 10:16:03 2015 +0200 d3d8: Update the BackBufferCount after a successful reset. --- dlls/d3d8/device.c | 1 + dlls/d3d8/tests/device.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 464aced..10c2103 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -670,6 +670,7 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, if (SUCCEEDED(hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, NULL, reset_enum_callback, TRUE))) { + present_parameters->BackBufferCount = swapchain_desc.backbuffer_count; wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); device->device_state = D3D8_DEVICE_STATE_OK; } diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 92ec3d0..64c2911 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1359,7 +1359,7 @@ static void test_reset(void) ok(!d3dpp.BackBufferHeight, "Got unexpected BackBufferHeight %u.\n", d3dpp.BackBufferHeight); ok(d3dpp.BackBufferFormat == d3ddm.Format, "Got unexpected BackBufferFormat %#x, expected %#x.\n", d3dpp.BackBufferFormat, d3ddm.Format); - todo_wine ok(d3dpp.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", d3dpp.BackBufferCount); + ok(d3dpp.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", d3dpp.BackBufferCount); ok(!d3dpp.MultiSampleType, "Got unexpected MultiSampleType %u.\n", d3dpp.MultiSampleType); ok(d3dpp.SwapEffect == D3DSWAPEFFECT_DISCARD, "Got unexpected SwapEffect %#x.\n", d3dpp.SwapEffect); ok(!d3dpp.hDeviceWindow, "Got unexpected hDeviceWindow %p.\n", d3dpp.hDeviceWindow);

1 0

Igor Kotrasinski : dsound: Fix conning formula to correctly interpolate volume.
by Alexandre Julliard April 14, 2015

April 14, 2015

Module: wine Branch: master Commit: 65e19a096d911a0a7ee2329d2c8f110fb0008f5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=65e19a096d911a0a7ee2329d2… Author: Igor Kotrasinski <ikk_pl(a)yahoo.co.uk> Date: Sat Apr 11 15:44:14 2015 +0000 dsound: Fix conning formula to correctly interpolate volume. --- dlls/dsound/sound3d.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index ffd4d45..5eb02a6 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -242,7 +242,7 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) if (flAngle > dwOutsideConeAngle) flAngle = dwOutsideConeAngle; /* this probably isn't the right thing, but it's ok for the time being */ - lVolume += ((dsb->ds3db_ds3db.lConeOutsideVolume)/((dwOutsideConeAngle) - (dwInsideConeAngle))) * flAngle; + lVolume += ((flAngle - dwInsideConeAngle)/(dwOutsideConeAngle - dwInsideConeAngle)) * dsb->ds3db_ds3db.lConeOutsideVolume; } TRACE("conning: Angle = %f deg; InsideConeAngle(/2) = %d deg; OutsideConeAngle(/2) = %d deg; ConeOutsideVolume = %d => adjusting volume to %f\n", flAngle, dsb->ds3db_ds3db.dwInsideConeAngle/2, dsb->ds3db_ds3db.dwOutsideConeAngle/2, dsb->ds3db_ds3db.lConeOutsideVolume, lVolume);

1 0

Henri Verbeet : d3d9: Update the backbuffer D3DPRESENT_PARAMETERS after a successful reset.
by Alexandre Julliard April 14, 2015

April 14, 2015

Module: wine Branch: master Commit: 3ccac1a71f1650456b389408486f212c4635d919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ccac1a71f1650456b3894084… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 14 10:16:02 2015 +0200 d3d9: Update the backbuffer D3DPRESENT_PARAMETERS after a successful reset. --- dlls/d3d9/device.c | 13 +++++++++++++ dlls/d3d9/tests/d3d9ex.c | 6 +++--- dlls/d3d9/tests/device.c | 6 +++--- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 97c71bb..0b1a77a 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -667,9 +667,22 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters); if (SUCCEEDED(hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, mode ? &wined3d_mode : NULL, reset_enum_callback, !device->d3d_parent->extended))) + { + struct wined3d_swapchain *wined3d_swapchain; + + wined3d_swapchain = wined3d_device_get_swapchain(device->wined3d_device, 0); + wined3d_swapchain_get_desc(wined3d_swapchain, &swapchain_desc); + present_parameters->BackBufferWidth = swapchain_desc.backbuffer_width; + present_parameters->BackBufferHeight = swapchain_desc.backbuffer_height; + present_parameters->BackBufferFormat = d3dformat_from_wined3dformat(swapchain_desc.backbuffer_format); + present_parameters->BackBufferCount = swapchain_desc.backbuffer_count; + device->device_state = D3D9_DEVICE_STATE_OK; + } else if (!device->d3d_parent->extended) + { device->device_state = D3D9_DEVICE_STATE_NOT_RESET; + } wined3d_mutex_unlock(); diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index bd956b6..6118ce9 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -1062,11 +1062,11 @@ static void test_reset(void) hr = IDirect3DDevice9Ex_TestCooperativeLevel(device); ok(hr == D3D_OK, "Got unexpected cooperative level %#x.\n", hr); - todo_wine ok(d3dpp.BackBufferWidth == 200, "Got unexpected BackBufferWidth %u.\n", d3dpp.BackBufferWidth); - todo_wine ok(d3dpp.BackBufferHeight == 150, "Got unexpected BackBufferHeight %u.\n", d3dpp.BackBufferHeight); + ok(d3dpp.BackBufferWidth == 200, "Got unexpected BackBufferWidth %u.\n", d3dpp.BackBufferWidth); + ok(d3dpp.BackBufferHeight == 150, "Got unexpected BackBufferHeight %u.\n", d3dpp.BackBufferHeight); todo_wine ok(d3dpp.BackBufferFormat == d3ddm.Format, "Got unexpected BackBufferFormat %#x, expected %#x.\n", d3dpp.BackBufferFormat, d3ddm.Format); - todo_wine ok(d3dpp.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", d3dpp.BackBufferCount); + ok(d3dpp.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", d3dpp.BackBufferCount); ok(!d3dpp.MultiSampleType, "Got unexpected MultiSampleType %u.\n", d3dpp.MultiSampleType); ok(!d3dpp.MultiSampleQuality, "Got unexpected MultiSampleQuality %u.\n", d3dpp.MultiSampleQuality); ok(d3dpp.SwapEffect == D3DSWAPEFFECT_DISCARD, "Got unexpected SwapEffect %#x.\n", d3dpp.SwapEffect); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 9ecbae0..174fc13 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1867,11 +1867,11 @@ static void test_reset(void) hr = IDirect3DDevice9_TestCooperativeLevel(device1); ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after a successful reset returned %#x\n", hr); - todo_wine ok(d3dpp.BackBufferWidth == 200, "Got unexpected BackBufferWidth %u.\n", d3dpp.BackBufferWidth); - todo_wine ok(d3dpp.BackBufferHeight == 150, "Got unexpected BackBufferHeight %u.\n", d3dpp.BackBufferHeight); + ok(d3dpp.BackBufferWidth == 200, "Got unexpected BackBufferWidth %u.\n", d3dpp.BackBufferWidth); + ok(d3dpp.BackBufferHeight == 150, "Got unexpected BackBufferHeight %u.\n", d3dpp.BackBufferHeight); todo_wine ok(d3dpp.BackBufferFormat == d3ddm.Format, "Got unexpected BackBufferFormat %#x, expected %#x.\n", d3dpp.BackBufferFormat, d3ddm.Format); - todo_wine ok(d3dpp.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", d3dpp.BackBufferCount); + ok(d3dpp.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", d3dpp.BackBufferCount); ok(!d3dpp.MultiSampleType, "Got unexpected MultiSampleType %u.\n", d3dpp.MultiSampleType); ok(!d3dpp.MultiSampleQuality, "Got unexpected MultiSampleQuality %u.\n", d3dpp.MultiSampleQuality); ok(d3dpp.SwapEffect == D3DSWAPEFFECT_DISCARD, "Got unexpected SwapEffect %#x.\n", d3dpp.SwapEffect);

1 0

Sebastian Lackner : ws2_32: Add a missing call to release_sock_fd.
by Alexandre Julliard April 14, 2015

April 14, 2015

Module: wine Branch: master Commit: ea371a2446eb6befa2954fe5a6428da0e562aa6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea371a2446eb6befa2954fe5a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 14 07:37:50 2015 +0200 ws2_32: Add a missing call to release_sock_fd. --- dlls/ws2_32/socket.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2fd2ce1..95ea83c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3091,6 +3091,7 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n if (ret <= 0) { SetLastError(ret == -1 ? wsaErrno() : WSAEINVAL); + release_sock_fd( s, fd ); return FALSE; }

1 0

Bruno Jesus : ws2_32: Convert EBADF errno to ENOTSOCK.
by Alexandre Julliard April 14, 2015

April 14, 2015

Module: wine Branch: master Commit: b69eb168161fcb4397cfa8c10b99a0b00279c354 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b69eb168161fcb4397cfa8c10… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Apr 14 02:02:51 2015 -0300 ws2_32: Convert EBADF errno to ENOTSOCK. --- dlls/ws2_32/socket.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index bfcc755..2fd2ce1 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -863,7 +863,6 @@ static UINT sock_get_error( int err ) switch(err) { case EINTR: return WSAEINTR; - case EBADF: return WSAEBADF; case EPERM: case EACCES: return WSAEACCES; case EFAULT: return WSAEFAULT; @@ -872,6 +871,7 @@ static UINT sock_get_error( int err ) case EWOULDBLOCK: return WSAEWOULDBLOCK; case EINPROGRESS: return WSAEINPROGRESS; case EALREADY: return WSAEALREADY; + case EBADF: case ENOTSOCK: return WSAENOTSOCK; case EDESTADDRREQ: return WSAEDESTADDRREQ; case EMSGSIZE: return WSAEMSGSIZE; @@ -2901,9 +2901,6 @@ int WINAPI WS_bind(SOCKET s, const struct WS_sockaddr* name, int namelen) errno = loc_errno; switch (errno) { - case EBADF: - SetLastError(WSAENOTSOCK); - break; case EADDRNOTAVAIL: SetLastError(WSAEINVAL); break; @@ -3360,7 +3357,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, convert_sockopt(&level, &optname); if (getsockopt(fd, level, optname, optval, (socklen_t *)optlen) != 0 ) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } release_sock_fd( s, fd ); @@ -3370,7 +3367,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return SOCKET_ERROR; if (getsockopt(fd, SOL_SOCKET, SO_ACCEPTCONN, optval, (socklen_t *)optlen) != 0 ) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } else @@ -3467,7 +3464,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, if (getsockopt(fd, SOL_SOCKET, SO_LINGER, &lingval, &len) != 0 ) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } else @@ -3519,7 +3516,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return SOCKET_ERROR; if (getsockopt(fd, SOL_SOCKET, SO_ERROR, optval, (socklen_t *)optlen) != 0 ) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } release_sock_fd( s, fd ); @@ -3565,7 +3562,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, } else if (getsockopt(fd, SOL_SOCKET, SO_LINGER, &lingval, &len) != 0) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } else @@ -3643,7 +3640,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, convert_sockopt(&level, &optname); if (getsockopt(fd, level, optname, &tv, &len) != 0 ) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } else @@ -3668,7 +3665,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, if (getsockopt(fd, SOL_SOCKET, SO_TYPE, optval, (socklen_t *)optlen) != 0 ) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } else @@ -3829,7 +3826,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, convert_sockopt(&level, &optname); if (getsockopt(fd, level, optname, optval, (socklen_t *)optlen) != 0 ) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } release_sock_fd( s, fd ); @@ -3863,7 +3860,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, convert_sockopt(&level, &optname); if (getsockopt(fd, level, optname, optval, (socklen_t *)optlen) != 0 ) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } release_sock_fd( s, fd ); @@ -3898,7 +3895,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, convert_sockopt(&level, &optname); if (getsockopt(fd, level, optname, optval, (socklen_t *)optlen) != 0 ) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } release_sock_fd( s, fd ); @@ -4164,7 +4161,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID } if ((fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; if (ioctl(fd, FIONREAD, out_buff ) == -1) - status = (errno == EBADF) ? WSAENOTSOCK : wsaErrno(); + status = wsaErrno(); release_sock_fd( s, fd ); break; } @@ -4182,7 +4179,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID /* SO_OOBINLINE sockets must always return TRUE to SIOCATMARK */ if ((getsockopt(fd, SOL_SOCKET, SO_OOBINLINE, &oob, &oobsize ) == -1) || (!oob && ioctl(fd, SIOCATMARK, &atmark ) == -1)) - status = (errno == EBADF) ? WSAENOTSOCK : wsaErrno(); + status = wsaErrno(); else { /* The SIOCATMARK value read from ioctl() is reversed

1 0