February 2018 - Wine-Commits

Józef Kucia : dxguid: Add D3D12 IIDs.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: 9f0eb8442f0245c64664d98133233b35c0f0c76f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f0eb8442f0245c64664d981… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 14 12:35:51 2018 +0100 dxguid: Add D3D12 IIDs. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxguid/dx10guid.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dxguid/dx10guid.c b/dlls/dxguid/dx10guid.c index 1959d00..bd80025 100644 --- a/dlls/dxguid/dx10guid.c +++ b/dlls/dxguid/dx10guid.c @@ -34,6 +34,7 @@ #include "dxgi1_6.h" #include "d3d10_1.h" #include "d3d11_4.h" +#include "d3d12.h" #include "d3dx10.h" #include "d3d10_1shader.h" #include "d3d11shader.h"

1 0

Zebediah Figura : msvfw32: Fix driver enumeration.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: 3396ca87ae34e446be55fda76d7f21fb3e85cf39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3396ca87ae34e446be55fda7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 13 13:00:04 2018 -0600 msvfw32: Fix driver enumeration. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 53 +++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index d49ea74..e071d95 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -223,48 +223,48 @@ static int compare_fourcc(DWORD fcc1, DWORD fcc2) return strncasecmp(fcc_str1, fcc_str2, 4); } -typedef BOOL (*enum_handler_t)(const char*, unsigned int, void*); +typedef BOOL (*enum_handler_t)(const char *name, const char *driver, unsigned int index, void *param); static BOOL enum_drivers(DWORD fccType, enum_handler_t handler, void* param) { - CHAR buf[2048], fccTypeStr[5], *s; + char fccTypeStr[4]; + char name_buf[10]; + char buf[2048]; + DWORD i, cnt = 0, lRet; BOOL result = FALSE; HKEY hKey; fourcc_to_string(fccTypeStr, fccType); - fccTypeStr[4] = '.'; /* first, go through the registry entries */ lRet = RegOpenKeyExA(HKEY_LOCAL_MACHINE, HKLM_DRIVERS32, 0, KEY_QUERY_VALUE, &hKey); if (lRet == ERROR_SUCCESS) { - DWORD name, data, type; i = 0; for (;;) - { - name = 10; - data = sizeof buf - name; - lRet = RegEnumValueA(hKey, i++, buf, &name, 0, &type, (LPBYTE)(buf+name), &data); - if (lRet == ERROR_NO_MORE_ITEMS) break; - if (lRet != ERROR_SUCCESS) continue; - if (fccType && (name != 9 || strncasecmp(buf, fccTypeStr, 5))) continue; - buf[name] = '='; - if ((result = handler(buf, cnt++, param))) break; - } - RegCloseKey( hKey ); + { + DWORD name_len = 10, driver_len = 128; + lRet = RegEnumValueA(hKey, i++, name_buf, &name_len, 0, 0, (BYTE *)buf, &driver_len); + if (lRet == ERROR_NO_MORE_ITEMS) break; + if (name_len != 9 || name_buf[4] != '.') continue; + if (fccType && strncasecmp(name_buf, fccTypeStr, 4)) continue; + if ((result = handler(name_buf, buf, cnt++, param))) break; + } + RegCloseKey( hKey ); } if (result) return result; /* if that didn't work, go through the values in system.ini */ if (GetPrivateProfileSectionA("drivers32", buf, sizeof(buf), "system.ini")) { - for (s = buf; *s; s += strlen(s) + 1) - { - TRACE("got %s\n", s); - if (fccType && (strncasecmp(s, fccTypeStr, 5) || s[9] != '=')) continue; - if ((result = handler(s, cnt++, param))) break; - } + char *s; + for (s = buf; *s; s += strlen(s) + 1) + { + if (s[4] != '.' || s[9] != '=') continue; + if (fccType && strncasecmp(s, fccTypeStr, 4)) continue; + if ((result = handler(s, s + 10, cnt++, param))) break; + } } return result; @@ -294,10 +294,11 @@ DWORD WINAPI VideoForWindowsVersion(void) return 0x040003B6; /* 4.950 */ } -static BOOL ICInfo_enum_handler(const char *drv, unsigned int nr, void *param) +static BOOL ICInfo_enum_handler(const char *name, const char *driver, unsigned int nr, void *param) { ICINFO *lpicinfo = param; - DWORD fccHandler = mmioStringToFOURCCA(drv + 5, 0); + DWORD fccType = mmioStringToFOURCCA(name, 0); + DWORD fccHandler = mmioStringToFOURCCA(name + 5, 0); if (lpicinfo->fccHandler != nr && compare_fourcc(lpicinfo->fccHandler, fccHandler)) return FALSE; @@ -308,7 +309,7 @@ static BOOL ICInfo_enum_handler(const char *drv, unsigned int nr, void *param) lpicinfo->dwVersionICM = ICVERSION; lpicinfo->szName[0] = 0; lpicinfo->szDescription[0] = 0; - MultiByteToWideChar(CP_ACP, 0, drv + 10, -1, lpicinfo->szDriver, + MultiByteToWideChar(CP_ACP, 0, driver, -1, lpicinfo->szDriver, sizeof(lpicinfo->szDriver)/sizeof(WCHAR)); return TRUE; @@ -647,10 +648,10 @@ static HIC try_driver(driver_info_t *info) return 0; } -static BOOL ICLocate_enum_handler(const char *drv, unsigned int nr, void *param) +static BOOL ICLocate_enum_handler(const char *name, const char *driver, unsigned int nr, void *param) { driver_info_t *info = param; - info->fccHandler = mmioStringToFOURCCA(drv + 5, 0); + info->fccHandler = mmioStringToFOURCCA(name + 5, 0); info->hic = try_driver(info); return info->hic != 0; }

1 0

Alexandre Julliard : user32/tests: Reduce window test verbosity.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: f893b03903e9b908916fc963054109820d1fffcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f893b03903e9b908916fc963… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 14 11:00:54 2018 +0100 user32/tests: Reduce window test verbosity. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 271 +++++++++++++++++++++--------------------------- 1 file changed, 121 insertions(+), 150 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f893b03903e9b908916f…

1 0

Hans Leidekker : kerberos: Trace returned flags instead of the context handle in kerberos_SpAcceptLsaModeContext.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: 84cde2b31a5e32921c9416616a1dda4ca8ddaa80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84cde2b31a5e32921c941661… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 14 14:13:07 2018 +0100 kerberos: Trace returned flags instead of the context handle in kerberos_SpAcceptLsaModeContext. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index ea9c687..52cbe05 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -976,7 +976,7 @@ static NTSTATUS NTAPI kerberos_SpAcceptLsaModeContext( LSA_SEC_HANDLE credential SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry, BOOLEAN *mapped_context, SecBuffer *context_data ) { #ifdef SONAME_LIBGSSAPI_KRB5 - OM_uint32 ret, minor_status, ret_flags, expiry_time; + OM_uint32 ret, minor_status, ret_flags = 0, expiry_time; gss_cred_id_t cred_handle; gss_ctx_id_t ctxt_handle; gss_buffer_desc input_token, output_token; @@ -1006,7 +1006,7 @@ static NTSTATUS NTAPI kerberos_SpAcceptLsaModeContext( LSA_SEC_HANDLE credential ret = pgss_accept_sec_context( &minor_status, &ctxt_handle, cred_handle, &input_token, GSS_C_NO_CHANNEL_BINDINGS, &target, NULL, &output_token, &ret_flags, &expiry_time, NULL ); - TRACE( "gss_accept_sec_context returned %08x minor status %08x ctxt_handle %p\n", ret, minor_status, ctxt_handle ); + TRACE( "gss_accept_sec_context returned %08x minor status %08x ret_flags %08x\n", ret, minor_status, ret_flags ); if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); if (ret == GSS_S_COMPLETE || ret == GSS_S_CONTINUE_NEEDED) {

1 0

Józef Kucia : dxgi/tests: Add test for CreateDXGIFactory2().
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: d35a25dfbd9b7dd7d8b9cdc0b158bc7cc6ba8def URL: https://source.winehq.org/git/wine.git/?a=commit;h=d35a25dfbd9b7dd7d8b9cdc0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 14 12:35:48 2018 +0100 dxgi/tests: Add test for CreateDXGIFactory2(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/device.c | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 58c3bba..ee4a22b 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -64,8 +64,6 @@ static HRESULT check_interface_(unsigned int line, void *iface, REFIID iid, "Got hr %#x, expected %#x.\n", hr, expected_hr); if (SUCCEEDED(hr)) IUnknown_Release(out); - else - ok_(__FILE__, line)(!out, "Got unexpected pointer %p.\n", out); return hr; } @@ -2562,7 +2560,7 @@ static void test_create_factory(void) if (!pCreateDXGIFactory1) { - win_skip("CreateDXGIFactory1 not available, skipping tests.\n"); + win_skip("CreateDXGIFactory1 not available.\n"); return; } @@ -2598,6 +2596,33 @@ static void test_create_factory(void) refcount = IUnknown_Release(iface); ok(!refcount, "Factory has %u references left.\n", refcount); } + + if (!pCreateDXGIFactory2) + { + win_skip("CreateDXGIFactory2 not available.\n"); + return; + } + + hr = pCreateDXGIFactory2(0, &IID_IDXGIFactory3, (void **)&iface); + ok(hr == S_OK, "Failed to create factory, hr %#x.\n", hr); + check_interface(iface, &IID_IDXGIFactory, TRUE, FALSE); + check_interface(iface, &IID_IDXGIFactory1, TRUE, FALSE); + check_interface(iface, &IID_IDXGIFactory2, TRUE, FALSE); + check_interface(iface, &IID_IDXGIFactory3, TRUE, FALSE); + /* Not available on all Windows versions. */ + check_interface(iface, &IID_IDXGIFactory4, TRUE, TRUE); + todo_wine check_interface(iface, &IID_IDXGIFactory5, TRUE, TRUE); + refcount = IUnknown_Release(iface); + ok(!refcount, "Factory has %u references left.\n", refcount); + + hr = pCreateDXGIFactory2(0, &IID_IDXGIFactory, (void **)&iface); + ok(hr == S_OK, "Failed to create factory, hr %#x.\n", hr); + check_interface(iface, &IID_IDXGIFactory, TRUE, FALSE); + check_interface(iface, &IID_IDXGIFactory1, TRUE, FALSE); + check_interface(iface, &IID_IDXGIFactory2, TRUE, FALSE); + check_interface(iface, &IID_IDXGIFactory3, TRUE, FALSE); + refcount = IUnknown_Release(iface); + ok(!refcount, "Factory has %u references left.\n", refcount); } static void test_private_data(void)

1 0

Zebediah Figura : msvfw32: Set fccType in ICInfo().
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: 2068b95abaaac0ee5ddd38fca5dcb259533e4766 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2068b95abaaac0ee5ddd38fc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 13 13:00:05 2018 -0600 msvfw32: Set fccType in ICInfo(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 1 + dlls/msvfw32/tests/msvfw.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index e071d95..5dc99a4 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -303,6 +303,7 @@ static BOOL ICInfo_enum_handler(const char *name, const char *driver, unsigned i if (lpicinfo->fccHandler != nr && compare_fourcc(lpicinfo->fccHandler, fccHandler)) return FALSE; + lpicinfo->fccType = fccType; lpicinfo->fccHandler = fccHandler; lpicinfo->dwFlags = 0; lpicinfo->dwVersion = 0; diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index c6fe0f2..beeca9f 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -294,6 +294,7 @@ static void test_ICInfo(void) for (i = found = 0; ICInfo(0, i, &info); i++) { trace("Codec name: %s, fccHandler: 0x%08x\n", wine_dbgstr_w(info.szName), info.fccHandler); + ok(info.fccType, "expected nonzero fccType\n"); ok(ICInfo(info.fccType, info.fccHandler, &info2), "ICInfo failed on fcc 0x%08x\n", info.fccHandler); @@ -308,6 +309,11 @@ static void test_ICInfo(void) "ICInfo failed on fcc 0x%08x\n", info.fccHandler); } ok(found != 0, "expected at least one codec\n"); + + memset(&info, 0, sizeof(info)); + ok(!ICInfo(ICTYPE_VIDEO, mmioFOURCC('f','a','k','e'), &info), "expected failure\n"); + ok(info.fccType == ICTYPE_VIDEO, "got 0x%08x\n", info.fccType); + ok(info.fccHandler == mmioFOURCC('f','a','k','e'), "got 0x%08x\n", info.fccHandler); } START_TEST(msvfw)

1 0

Hans Leidekker : secur32: Forward to either Kerberos or NTLM from the Negotiate provider.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: 63b9fb354250a035bdc115ecfda01584741161ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=63b9fb354250a035bdc115ec… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 14 14:13:08 2018 +0100 secur32: Forward to either Kerberos or NTLM from the Negotiate provider. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/negotiate.c | 351 ++++++++++++++++++++++++++++++----------- dlls/secur32/tests/negotiate.c | 3 - 2 files changed, 256 insertions(+), 98 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=63b9fb354250a035bdc1…

1 0

Alexandre Julliard : iphlpapi/tests: Reduce window test verbosity.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: 5c78657bfbb8c793d71d13207e065562de5f75b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c78657bfbb8c793d71d1320… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 14 11:33:51 2018 +0100 iphlpapi/tests: Reduce window test verbosity. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 87 +++++++++--------------------------------- 1 file changed, 19 insertions(+), 68 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 6397742..873612d 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1423,12 +1423,13 @@ static void test_GetAdaptersAddresses(void) ok(aa->Description != NULL, "Description is not a valid pointer\n"); ok(aa->FriendlyName != NULL, "FriendlyName is not a valid pointer\n"); - trace("\n"); - trace("Length: %u\n", S(U(*aa)).Length); - trace("IfIndex: %u\n", S(U(*aa)).IfIndex); - trace("Next: %p\n", aa->Next); - trace("AdapterName: %s\n", aa->AdapterName); - trace("FirstUnicastAddress: %p\n", aa->FirstUnicastAddress); + for (i = 0; i < aa->PhysicalAddressLength; i++) + sprintf(temp + i * 3, "%02X-", aa->PhysicalAddress[i]); + temp[i ? i * 3 - 1 : 0] = '\0'; + trace("idx %u name %s %s dns %s descr %s phys %s mtu %u flags %08x type %u\n", + S(U(*aa)).IfIndex, aa->AdapterName, + wine_dbgstr_w(aa->FriendlyName), wine_dbgstr_w(aa->DnsSuffix), + wine_dbgstr_w(aa->Description), temp, aa->Mtu, aa->Flags, aa->IfType ); ua = aa->FirstUnicastAddress; while (ua) { @@ -1450,79 +1451,29 @@ static void test_GetAdaptersAddresses(void) /* Is the address ok in the network (not duplicated)? */ 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); - trace("\tAddress.lpSockaddr: %p\n", ua->Address.lpSockaddr); - trace("\tAddress.iSockaddrLength: %d\n", ua->Address.iSockaddrLength); - trace("\tPrefixOrigin: %u\n", ua->PrefixOrigin); - trace("\tSuffixOrigin: %u\n", ua->SuffixOrigin); - trace("\tDadState: %u\n", ua->DadState); - trace("\tValidLifetime: %u seconds\n", ua->ValidLifetime); - trace("\tPreferredLifetime: %u seconds\n", ua->PreferredLifetime); - trace("\tLeaseLifetime: %u seconds\n", ua->LeaseLifetime); - if (S(U(*ua)).Length < sizeof(IP_ADAPTER_UNICAST_ADDRESS_LH)) - { - trace("\n"); - ua = ua->Next; - continue; - } - trace("\tOnLinkPrefixLength: %u\n", ua->OnLinkPrefixLength); - trace("\n"); + trace(" flags %08x origin %u/%u state %u lifetime %u/%u/%u prefix %u\n", + S(U(*ua)).Flags, ua->PrefixOrigin, ua->SuffixOrigin, ua->DadState, + ua->ValidLifetime, ua->PreferredLifetime, ua->LeaseLifetime, + S(U(*ua)).Length < sizeof(IP_ADAPTER_UNICAST_ADDRESS_LH) ? 0 : ua->OnLinkPrefixLength); ua = ua->Next; } - trace("FirstAnycastAddress: %p\n", aa->FirstAnycastAddress); - trace("FirstMulticastAddress: %p\n", aa->FirstMulticastAddress); - trace("FirstDnsServerAddress: %p\n", aa->FirstDnsServerAddress); - 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); + trace("status %u index %u zone %s\n", aa->OperStatus, aa->Ipv6IfIndex, temp ); prefix = aa->FirstPrefix; while (prefix) { - trace("\tLength: %u\n", S(U(*prefix)).Length); - trace("\tFlags: 0x%08x\n", S(U(*prefix)).Flags); - trace("\tNext: %p\n", prefix->Next); - trace("\tAddress.lpSockaddr: %p\n", prefix->Address.lpSockaddr); - trace("\tAddress.iSockaddrLength: %d\n", prefix->Address.iSockaddrLength); - trace("\tPrefixLength: %u\n", prefix->PrefixLength); - trace("\n"); + trace( " prefix %u/%u flags %08x\n", prefix->Address.iSockaddrLength, + prefix->PrefixLength, S(U(*prefix)).Flags ); prefix = prefix->Next; } if (S(U(*aa)).Length < sizeof(IP_ADAPTER_ADDRESSES_LH)) continue; - trace("TransmitLinkSpeed: %s\n", wine_dbgstr_longlong(aa->TransmitLinkSpeed)); - trace("ReceiveLinkSpeed: %s\n", wine_dbgstr_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"); + trace("speed %s/%s metrics %u/%u guid %s type %u/%u\n", + wine_dbgstr_longlong(aa->TransmitLinkSpeed), + wine_dbgstr_longlong(aa->ReceiveLinkSpeed), + aa->Ipv4Metric, aa->Ipv6Metric, wine_dbgstr_guid((GUID*) &aa->NetworkGuid), + aa->ConnectionType, aa->TunnelType); if (pConvertInterfaceLuidToGuid) {

1 0

Alexandre Julliard : user32/tests: Remove workarounds for older Windows versions.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: 692b118f450911f0b849d34c1b902ee65f81b7c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=692b118f450911f0b849d34c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 14 11:12:36 2018 +0100 user32/tests: Remove workarounds for older Windows versions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 380 ++++++++++++++++-------------------------------- 1 file changed, 128 insertions(+), 252 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=692b118f450911f0b849…

1 0

Henri Verbeet : wined3d: Use the global memory allocation helpers.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: f08342f5737c2bb3f965059f930e5d9a25ff6268 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f08342f5737c2bb3f965059f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 14 10:27:59 2018 +0330 wined3d: Use the global memory allocation helpers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 136 ++++++++++++++++++----------------- dlls/wined3d/ati_fragment_shader.c | 18 ++--- dlls/wined3d/buffer.c | 29 ++++---- dlls/wined3d/context.c | 68 +++++++++--------- dlls/wined3d/cs.c | 32 ++++----- dlls/wined3d/device.c | 42 +++++------ dlls/wined3d/directx.c | 37 +++++----- dlls/wined3d/glsl_shader.c | 144 ++++++++++++++++++------------------- dlls/wined3d/palette.c | 7 +- dlls/wined3d/query.c | 32 ++++----- dlls/wined3d/resource.c | 4 +- dlls/wined3d/sampler.c | 4 +- dlls/wined3d/shader.c | 138 ++++++++++++++++++----------------- dlls/wined3d/shader_sm1.c | 6 +- dlls/wined3d/shader_sm4.c | 8 +-- dlls/wined3d/state.c | 23 +++--- dlls/wined3d/stateblock.c | 11 ++- dlls/wined3d/surface.c | 36 +++++----- dlls/wined3d/swapchain.c | 22 +++--- dlls/wined3d/texture.c | 26 +++---- dlls/wined3d/utils.c | 8 +-- dlls/wined3d/vertexdeclaration.c | 19 +++-- dlls/wined3d/view.c | 18 ++--- dlls/wined3d/wined3d_main.c | 16 ++--- dlls/wined3d/wined3d_private.h | 8 +-- 25 files changed, 439 insertions(+), 453 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f08342f5737c2bb3f965…

1 0

Józef Kucia : dxgi: Implement IDXGIFactory5.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: cd29ee158a4f21c0245a6b2e471cd46a4dba9f43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd29ee158a4f21c0245a6b2e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 14 12:35:49 2018 +0100 dxgi: Implement IDXGIFactory5. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/adapter.c | 6 +-- dlls/dxgi/device.c | 2 +- dlls/dxgi/dxgi_private.h | 4 +- dlls/dxgi/factory.c | 107 ++++++++++++++++++++++++++-------------------- dlls/dxgi/tests/device.c | 4 +- include/wine/winedxgi.idl | 2 +- 6 files changed, 70 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cd29ee158a4f21c0245a…

1 0

Henri Verbeet : wined3d: Get rid of the WINED3D_SWAP_EFFECT_FLIP fixme in swapchain_gl_present().
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: 16e54c80c8e9eb4f1eb4fcfca04faf187d97acd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16e54c80c8e9eb4f1eb4fcfc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 14 10:27:57 2018 +0330 wined3d: Get rid of the WINED3D_SWAP_EFFECT_FLIP fixme in swapchain_gl_present(). I think this works about as well as it's going to. There may be a theoretical issue that GDI draws to the window should end up in the backbuffer after a flip, but I don't think we have tests showing that to actually be the case, and generally speaking I'm not all that worried about it. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 60b8613..fb89099 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -469,14 +469,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, } if (swapchain->render_to_fbo) - { - static unsigned int once; - - if (swapchain->desc.swap_effect == WINED3D_SWAP_EFFECT_FLIP && !once++) - FIXME("WINED3D_SWAP_EFFECT_FLIP not implemented.\n"); - swapchain_blit(swapchain, context, src_rect, dst_rect); - } if (swapchain->num_contexts > 1) gl_info->gl_ops.gl.p_glFinish();

1 0

Nikolay Sivov : comctl32/tests: Use existing macros for control class names.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: 69d90522065ecc34ef2244ca00d57eece7952375 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69d90522065ecc34ef2244ca… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 14 08:33:50 2018 +0300 comctl32/tests: Use existing macros for control class names. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/button.c | 2 +- dlls/comctl32/tests/combo.c | 6 +++--- dlls/comctl32/tests/static.c | 3 ++- dlls/comctl32/tests/status.c | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 96b8bea..47aee3f 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -454,7 +454,7 @@ static HWND create_button(DWORD style, HWND parent) style |= WS_CHILD|BS_NOTIFY; menuid = (HMENU)ID_BUTTON; } - hwnd = CreateWindowExA(0, "Button", "test", style, 0, 0, 50, 14, parent, menuid, 0, NULL); + hwnd = CreateWindowExA(0, WC_BUTTONA, "test", style, 0, 0, 50, 14, parent, menuid, 0, NULL); ok(hwnd != NULL, "failed to create a button, 0x%08x, %p\n", style, parent); pSetWindowSubclass(hwnd, button_subclass_proc, 0, 0); return hwnd; diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index da2ded2..b045739 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -507,7 +507,7 @@ static BOOL init(void) wc.lpfnWndProc = ComboExTestWndProc; RegisterClassA(&wc); - hMainWnd = CreateWindowA("static", "Test", WS_OVERLAPPEDWINDOW, 10, 10, 300, 300, NULL, NULL, NULL, 0); + hMainWnd = CreateWindowA(WC_STATICA, "Test", WS_OVERLAPPEDWINDOW, 10, 10, 300, 300, NULL, NULL, NULL, 0); ShowWindow(hMainWnd, SW_SHOW); hComboExParentWnd = CreateWindowExA(0, ComboExTestClass, "ComboEx test", WS_OVERLAPPEDWINDOW|WS_VISIBLE, @@ -606,7 +606,7 @@ static void test_comboex_get_set_item(void) static HWND create_combobox(DWORD style) { - return CreateWindowA("ComboBox", "Combo", WS_VISIBLE|WS_CHILD|style, 5, 5, 100, 100, hMainWnd, (HMENU)COMBO_ID, NULL, 0); + return CreateWindowA(WC_COMBOBOXA, "Combo", WS_VISIBLE|WS_CHILD|style, 5, 5, 100, 100, hMainWnd, (HMENU)COMBO_ID, NULL, 0); } static int font_height(HFONT hFont) @@ -1035,7 +1035,7 @@ static void test_combo_editselection_focus(DWORD style) get_combobox_info(hCombo, &cbInfo); hEdit = cbInfo.hwndItem; - hButton = CreateWindowA("Button", "OK", WS_VISIBLE|WS_CHILD|BS_DEFPUSHBUTTON, + hButton = CreateWindowA(WC_BUTTONA, "OK", WS_VISIBLE|WS_CHILD|BS_DEFPUSHBUTTON, 5, 50, 100, 20, hMainWnd, NULL, (HINSTANCE)GetWindowLongPtrA(hMainWnd, GWLP_HINSTANCE), NULL); diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index 890fcf5..a65e352 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -23,6 +23,7 @@ #define STRICT #define WIN32_LEAN_AND_MEAN #include <windows.h> +#include "commctrl.h" #include "wine/test.h" @@ -53,7 +54,7 @@ static void flush_events(void) static HWND create_static(DWORD style) { - return CreateWindowA("static", "Test", WS_VISIBLE|WS_CHILD|style, 5, 5, 100, 100, hMainWnd, (HMENU)CTRL_ID, NULL, 0); + return CreateWindowA(WC_STATICA, "Test", WS_VISIBLE|WS_CHILD|style, 5, 5, 100, 100, hMainWnd, (HMENU)CTRL_ID, NULL, 0); } static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index f2fe1ab..2308974 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -607,7 +607,7 @@ START_TEST(status) iccex.dwICC = ICC_BAR_CLASSES; pInitCommonControlsEx(&iccex); - g_hMainWnd = CreateWindowExA(0, "static", "", WS_OVERLAPPEDWINDOW, + g_hMainWnd = CreateWindowExA(0, WC_STATICA, "", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, 672+2*GetSystemMetrics(SM_CXSIZEFRAME), 226+GetSystemMetrics(SM_CYCAPTION)+2*GetSystemMetrics(SM_CYSIZEFRAME), NULL, NULL, GetModuleHandleA(NULL), 0);

1 0

Nikolay Sivov : uxtheme: Properly initialize text drawing options.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: ce50a7ff4df919aedd037cecf15c484c14f10d41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce50a7ff4df919aedd037cec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 14 08:39:21 2018 +0300 uxtheme: Properly initialize text drawing options. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/draw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index e917dd1..d07d075 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -1636,7 +1636,7 @@ HRESULT WINAPI DrawThemeText(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, LPCWSTR pszText, int iCharCount, DWORD flags, DWORD flags2, const RECT *pRect) { - DTTOPTS opts; + DTTOPTS opts = { 0 }; RECT rt; TRACE("%d %d\n", iPartId, iStateId);

1 0

Henri Verbeet : wined3d: Do not implicitly set WINED3D_RESOURCE_ACCESS_MAP for dynamic resources.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: 02dc04bcc94306f06c6eb2915bef795efa32d7b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02dc04bcc94306f06c6eb291… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 14 10:27:56 2018 +0330 wined3d: Do not implicitly set WINED3D_RESOURCE_ACCESS_MAP for dynamic resources. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 4 ++-- dlls/d3d8/d3d8_private.h | 4 +++- dlls/d3d8/device.c | 6 +++--- dlls/d3d8/texture.c | 6 +++--- dlls/d3d9/buffer.c | 4 ++-- dlls/d3d9/d3d9_private.h | 4 +++- dlls/d3d9/device.c | 6 +++--- dlls/d3d9/texture.c | 6 +++--- dlls/ddraw/device.c | 4 ++-- dlls/ddraw/executebuffer.c | 2 +- dlls/wined3d/resource.c | 2 -- 11 files changed, 25 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02dc04bcc94306f06c6e…

1 0

Henri Verbeet : wined3d: Rename WINED3D_SWAP_EFFECT_FLIP to WINED3D_SWAP_EFFECT_SEQUENTIAL.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: 4e37d1c01d8c4161f6081ee022ca32b0f44514b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e37d1c01d8c4161f6081ee0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 14 10:27:58 2018 +0330 wined3d: Rename WINED3D_SWAP_EFFECT_FLIP to WINED3D_SWAP_EFFECT_SEQUENTIAL. For consistency with DXGI. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/wined3d.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ed7445e..70b94f5 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -506,7 +506,7 @@ enum wined3d_patch_edge_style enum wined3d_swap_effect { WINED3D_SWAP_EFFECT_DISCARD = 1, - WINED3D_SWAP_EFFECT_FLIP = 2, + WINED3D_SWAP_EFFECT_SEQUENTIAL = 2, WINED3D_SWAP_EFFECT_COPY = 3, WINED3D_SWAP_EFFECT_COPY_VSYNC = 4, };

1 0

Nikolay Sivov : comctl32/listbox: Merge theming logic.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: 0f98b0bb298e033ba5db3f883f1bd05f0dc11102 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f98b0bb298e033ba5db3f88… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 14 08:35:19 2018 +0300 comctl32/listbox: Merge theming logic. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/Makefile.in | 1 - dlls/comctl32/listbox.c | 53 ++++++++++++++++++- dlls/comctl32/theme_listbox.c | 116 ------------------------------------------ dlls/comctl32/theming.c | 9 ---- 4 files changed, 52 insertions(+), 127 deletions(-) diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in index 25d5e67..4816784 100644 --- a/dlls/comctl32/Makefile.in +++ b/dlls/comctl32/Makefile.in @@ -37,7 +37,6 @@ C_SRCS = \ tab.c \ taskdialog.c \ theme_dialog.c \ - theme_listbox.c \ theme_scrollbar.c \ theming.c \ toolbar.c \ diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 7a16500..3184e20 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2,6 +2,7 @@ * Listbox controls * * Copyright 1996 Alexandre Julliard + * Copyright 2005 Frank Richter * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -30,6 +31,8 @@ #include "wingdi.h" #include "winuser.h" #include "commctrl.h" +#include "uxtheme.h" +#include "vssym32.h" #include "wine/unicode.h" #include "wine/exception.h" #include "wine/debug.h" @@ -1072,6 +1075,38 @@ static LRESULT LISTBOX_Paint( LB_DESCR *descr, HDC hdc ) return 0; } +static void LISTBOX_NCPaint( LB_DESCR *descr, HRGN region ) +{ + DWORD exstyle = GetWindowLongW( descr->self, GWL_EXSTYLE); + HTHEME theme = GetWindowTheme( descr->self ); + HRGN cliprgn = region; + int cxEdge, cyEdge; + HDC hdc; + RECT r; + + if (!theme || !(exstyle & WS_EX_CLIENTEDGE)) + return; + + cxEdge = GetSystemMetrics(SM_CXEDGE), + cyEdge = GetSystemMetrics(SM_CYEDGE); + + GetWindowRect(descr->self, &r); + + /* New clipping region passed to default proc to exclude border */ + cliprgn = CreateRectRgn(r.left + cxEdge, r.top + cyEdge, + r.right - cxEdge, r.bottom - cyEdge); + if (region != (HRGN)1) + CombineRgn(cliprgn, cliprgn, region, RGN_AND); + OffsetRect(&r, -r.left, -r.top); + + hdc = GetDCEx(descr->self, region, DCX_WINDOW|DCX_INTERSECTRGN); + OffsetRect(&r, -r.left, -r.top); + + if (IsThemeBackgroundPartiallyTransparent (theme, 0, 0)) + DrawThemeParentBackground(descr->self, hdc, &r); + DrawThemeBackground (theme, hdc, 0, 0, &r, 0); + ReleaseDC(descr->self, hdc); +} /*********************************************************************** * LISTBOX_InvalidateItems @@ -2500,6 +2535,8 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc ) } } + OpenThemeData( descr->self, WC_LISTBOXW ); + TRACE("owner: %p, style: %08x, width: %d, height: %d\n", descr->owner, descr->style, descr->width, descr->height); return TRUE; } @@ -2510,6 +2547,8 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc ) */ static BOOL LISTBOX_Destroy( LB_DESCR *descr ) { + HTHEME theme = GetWindowTheme( descr->self ); + CloseThemeData( theme ); LISTBOX_ResetContent( descr ); SetWindowLongPtrW( descr->self, 0, 0 ); HeapFree( GetProcessHeap(), 0, descr ); @@ -2523,7 +2562,8 @@ static BOOL LISTBOX_Destroy( LB_DESCR *descr ) static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { LB_DESCR *descr = (LB_DESCR *)GetWindowLongPtrW( hwnd, 0 ); - LPHEADCOMBO lphc = 0; + HEADCOMBO *lphc = NULL; + HTHEME theme; LRESULT ret; if (!descr) @@ -2833,6 +2873,11 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam, if( !wParam ) EndPaint( descr->self, &ps ); } return ret; + + case WM_NCPAINT: + LISTBOX_NCPaint( descr, (HRGN)wParam ); + break; + case WM_SIZE: LISTBOX_UpdateSize( descr ); return 0; @@ -2983,6 +3028,12 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam, if (lphc) return 0; break; + case WM_THEMECHANGED: + theme = GetWindowTheme( hwnd ); + CloseThemeData( theme ); + OpenThemeData( hwnd, WC_LISTBOXW ); + break; + default: if ((msg >= WM_USER) && (msg < 0xc000)) WARN("[%p]: unknown msg %04x wp %08lx lp %08lx\n", diff --git a/dlls/comctl32/theme_listbox.c b/dlls/comctl32/theme_listbox.c deleted file mode 100644 index 9177214..0000000 --- a/dlls/comctl32/theme_listbox.c +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Theming - List box control - * - * Copyright (c) 2005 by Frank Richter - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "uxtheme.h" -#include "vssym32.h" -#include "comctl32.h" -#include "wine/debug.h" - -/* Draw themed border */ -static void nc_paint (HTHEME theme, HWND hwnd, HRGN region) -{ - HRGN cliprgn = region; - DWORD exStyle = GetWindowLongW (hwnd, GWL_EXSTYLE); - if (exStyle & WS_EX_CLIENTEDGE) - { - HDC dc; - RECT r; - int cxEdge = GetSystemMetrics (SM_CXEDGE), - cyEdge = GetSystemMetrics (SM_CYEDGE); - - GetWindowRect(hwnd, &r); - - /* New clipping region passed to default proc to exclude border */ - cliprgn = CreateRectRgn (r.left + cxEdge, r.top + cyEdge, - r.right - cxEdge, r.bottom - cyEdge); - if (region != (HRGN)1) - CombineRgn (cliprgn, cliprgn, region, RGN_AND); - OffsetRect(&r, -r.left, -r.top); - - dc = GetDCEx(hwnd, region, DCX_WINDOW|DCX_INTERSECTRGN); - OffsetRect(&r, -r.left, -r.top); - - if (IsThemeBackgroundPartiallyTransparent (theme, 0, 0)) - DrawThemeParentBackground(hwnd, dc, &r); - DrawThemeBackground (theme, dc, 0, 0, &r, 0); - ReleaseDC(hwnd, dc); - } - - /* Call default proc to get the scrollbars etc. painted */ - DefWindowProcW (hwnd, WM_NCPAINT, (WPARAM)cliprgn, 0); -} - -/********************************************************************** - * The list control subclass window proc. - */ -LRESULT CALLBACK THEMING_ListBoxSubclassProc (HWND hwnd, UINT msg, - WPARAM wParam, LPARAM lParam, - ULONG_PTR dwRefData) -{ - const WCHAR* themeClass = WC_LISTBOXW; - HTHEME theme; - LRESULT result; - - switch (msg) - { - case WM_CREATE: - result = THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); - OpenThemeData( hwnd, themeClass ); - return result; - - case WM_DESTROY: - theme = GetWindowTheme( hwnd ); - CloseThemeData ( theme ); - return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); - - case WM_THEMECHANGED: - theme = GetWindowTheme( hwnd ); - CloseThemeData ( theme ); - OpenThemeData( hwnd, themeClass ); - break; - - case WM_SYSCOLORCHANGE: - theme = GetWindowTheme( hwnd ); - if (!theme) return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); - /* Do nothing. When themed, a WM_THEMECHANGED will be received, too, - * which will do the repaint. */ - break; - - case WM_NCPAINT: - theme = GetWindowTheme( hwnd ); - if (!theme) return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); - nc_paint (theme, hwnd, (HRGN)wParam); - break; - - default: - /* Call old proc */ - return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); - } - return 0; -} diff --git a/dlls/comctl32/theming.c b/dlls/comctl32/theming.c index 0d47489..e9305cc 100644 --- a/dlls/comctl32/theming.c +++ b/dlls/comctl32/theming.c @@ -36,13 +36,10 @@ typedef LRESULT (CALLBACK* THEMING_SUBCLASSPROC)(HWND, UINT, WPARAM, LPARAM, extern LRESULT CALLBACK THEMING_DialogSubclassProc (HWND, UINT, WPARAM, LPARAM, ULONG_PTR) DECLSPEC_HIDDEN; -extern LRESULT CALLBACK THEMING_ListBoxSubclassProc (HWND, UINT, WPARAM, LPARAM, - ULONG_PTR) DECLSPEC_HIDDEN; extern LRESULT CALLBACK THEMING_ScrollbarSubclassProc (HWND, UINT, WPARAM, LPARAM, ULONG_PTR) DECLSPEC_HIDDEN; static const WCHAR dialogClass[] = {'#','3','2','7','7','0',0}; -static const WCHAR comboLboxClass[] = {'C','o','m','b','o','L','b','o','x',0}; static const struct ThemingSubclass { @@ -51,8 +48,6 @@ static const struct ThemingSubclass } subclasses[] = { /* Note: list must be sorted by class name */ {dialogClass, THEMING_DialogSubclassProc}, - {comboLboxClass, THEMING_ListBoxSubclassProc}, - {WC_LISTBOXW, THEMING_ListBoxSubclassProc}, {WC_SCROLLBARW, THEMING_ScrollbarSubclassProc} }; @@ -85,14 +80,10 @@ static LRESULT CALLBACK subclass_proc ## N (HWND wnd, UINT msg, \ MAKE_SUBCLASS_PROC(0) MAKE_SUBCLASS_PROC(1) -MAKE_SUBCLASS_PROC(2) -MAKE_SUBCLASS_PROC(3) static const WNDPROC subclassProcs[NUM_SUBCLASSES] = { subclass_proc0, subclass_proc1, - subclass_proc2, - subclass_proc3, }; /***********************************************************************

1 0

Nikolay Sivov : comctl32: Introduce ListBox control.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: 04fe481d2b080aa156eeb22f2a82f6c329e19c07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04fe481d2b080aa156eeb22f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 14 08:35:18 2018 +0300 comctl32: Introduce ListBox control. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/Makefile.in | 1 + dlls/comctl32/combo.c | 35 - dlls/comctl32/comctl32.h | 44 + dlls/comctl32/commctrl.c | 4 + dlls/comctl32/listbox.c | 3024 ++++++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tests/misc.c | 4 +- dlls/user32/class.c | 2 - 7 files changed, 3076 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=04fe481d2b080aa156ee…

1 0

Nikolay Sivov : comctl32/comboex: Remove child windows subclass on window destruction.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: 6204bbc389dbf762bb7377faae63f8b1dc51c5af URL: https://source.winehq.org/git/wine.git/?a=commit;h=6204bbc389dbf762bb7377fa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 14 08:34:17 2018 +0300 comctl32/comboex: Remove child windows subclass on window destruction. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/comboex.c | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 076a552..3c3714a 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -1502,10 +1502,10 @@ static void COMBOEX_ResetContent (COMBOEX_INFO *infoPtr) static LRESULT COMBOEX_Destroy (COMBOEX_INFO *infoPtr) { if (infoPtr->hwndCombo) - RemoveWindowSubclass(infoPtr->hwndCombo, COMBOEX_ComboWndProc, COMBO_SUBCLASSID); + SetWindowSubclass(infoPtr->hwndCombo, COMBOEX_ComboWndProc, COMBO_SUBCLASSID, 0); if (infoPtr->hwndEdit) - RemoveWindowSubclass(infoPtr->hwndEdit, COMBOEX_EditWndProc, EDIT_SUBCLASSID); + SetWindowSubclass(infoPtr->hwndEdit, COMBOEX_EditWndProc, EDIT_SUBCLASSID, 0); COMBOEX_FreeText (&infoPtr->edit); COMBOEX_ResetContent (infoPtr); @@ -1668,7 +1668,11 @@ COMBOEX_EditWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, TRACE("hwnd=%p msg=%x wparam=%lx lParam=%lx, info_ptr=%p\n", hwnd, uMsg, wParam, lParam, infoPtr); - if (!infoPtr) return 0; + if (uMsg == WM_NCDESTROY) + RemoveWindowSubclass(hwnd, COMBOEX_EditWndProc, EDIT_SUBCLASSID); + + if (!infoPtr) + return DefSubclassProc(hwnd, uMsg, wParam, lParam); switch (uMsg) { @@ -1823,11 +1827,14 @@ COMBOEX_ComboWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, TRACE("hwnd=%p msg=%x wparam=%lx lParam=%lx, info_ptr=%p\n", hwnd, uMsg, wParam, lParam, infoPtr); - if (!infoPtr) return 0; + if (uMsg == WM_NCDESTROY) + RemoveWindowSubclass(hwnd, COMBOEX_ComboWndProc, COMBO_SUBCLASSID); + + if (!infoPtr) + return DefSubclassProc(hwnd, uMsg, wParam, lParam); switch (uMsg) { - case WM_DRAWITEM: /* * The only way this message should come is from the @@ -1835,7 +1842,7 @@ COMBOEX_ComboWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, * that ComboEx knows this is listbox. */ ((DRAWITEMSTRUCT *)lParam)->itemState |= ODS_COMBOEXLBOX; - return DefSubclassProc(hwnd, uMsg, wParam, lParam); + break; case WM_ERASEBKGND: hDC = (HDC) wParam; @@ -1844,7 +1851,7 @@ COMBOEX_ComboWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, TRACE("erasing (%s)\n", wine_dbgstr_rect(&rect)); ExtTextOutW (hDC, 0, 0, ETO_OPAQUE, &rect, 0, 0, 0); SetBkColor (hDC, obkc); - return DefSubclassProc(hwnd, uMsg, wParam, lParam); + break; case WM_SETCURSOR: /* @@ -1858,7 +1865,7 @@ COMBOEX_ComboWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, nmmse.pt.y = 0; nmmse.dwHitInfo = lParam; COMBOEX_Notify (infoPtr, NM_SETCURSOR, (NMHDR *)&nmmse); - return DefSubclassProc(hwnd, uMsg, wParam, lParam); + break; case WM_LBUTTONDOWN: GetClientRect (hwnd, &rect); @@ -1868,15 +1875,15 @@ COMBOEX_ComboWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, pt.x = (short)LOWORD(lParam); pt.y = (short)HIWORD(lParam); if (PtInRect(&rect, pt)) - return DefSubclassProc(hwnd, uMsg, wParam, lParam); + break; infoPtr->flags |= WCBE_MOUSECAPTURED; SetCapture(hwnd); - break; + return 0; case WM_LBUTTONUP: if (!(infoPtr->flags & WCBE_MOUSECAPTURED)) - return DefSubclassProc(hwnd, uMsg, wParam, lParam); + break; ReleaseCapture(); infoPtr->flags &= ~WCBE_MOUSECAPTURED; @@ -1885,7 +1892,7 @@ COMBOEX_ComboWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, } else { SendMessageW(hwnd, CB_SHOWDROPDOWN, TRUE, 0); } - break; + return 0; case WM_MOUSEMOVE: if ( (infoPtr->flags & WCBE_MOUSECAPTURED) && @@ -1894,7 +1901,7 @@ COMBOEX_ComboWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, COMBOEX_NotifyDragBegin(infoPtr, edit_text); infoPtr->flags |= WCBE_MOUSEDRAGGED; } - return DefSubclassProc(hwnd, uMsg, wParam, lParam); + break; case WM_COMMAND: switch (HIWORD(wParam)) { @@ -1975,9 +1982,10 @@ COMBOEX_ComboWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, break; }/* fall through */ default: - return DefSubclassProc(hwnd, uMsg, wParam, lParam); + ; } - return 0; + + return DefSubclassProc(hwnd, uMsg, wParam, lParam); }

1 0

Henri Verbeet : wined3d: Enforce map access on all resources.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: 7772c4fdbf33507b2262da375b465d4c2cbc316d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7772c4fdbf33507b2262da37… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 14 10:27:55 2018 +0330 wined3d: Enforce map access on all resources. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/resource.c | 6 ++++++ dlls/wined3d/texture.c | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index e318888..3b07e0c 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -346,6 +346,12 @@ HRESULT CDECL wined3d_resource_map(struct wined3d_resource *resource, unsigned i TRACE("resource %p, sub_resource_idx %u, map_desc %p, box %s, flags %#x.\n", resource, sub_resource_idx, map_desc, debug_box(box), flags); + if (!(resource->access & WINED3D_RESOURCE_ACCESS_MAP)) + { + WARN("Resource is not mappable.\n"); + return WINED3DERR_INVALIDCALL; + } + flags = wined3d_resource_sanitise_map_flags(resource, flags); wined3d_resource_wait_idle(resource); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index c9210cb..dd6a2dd 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1897,12 +1897,6 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour return WINED3DERR_INVALIDCALL; } - if (!(resource->access & WINED3D_RESOURCE_ACCESS_MAP)) - { - WARN("Trying to map unmappable texture.\n"); - return WINED3DERR_INVALIDCALL; - } - if (texture->flags & WINED3D_TEXTURE_DC_IN_USE) { WARN("DC is in use.\n");

1 0

Alex Henrie : d3dx9: Correctly round constants in D3DXSHMultiply3 implementation.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: 00a352a3765223f9d37e111c13bcab8efa577318 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00a352a3765223f9d37e111c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Feb 5 20:47:08 2018 -0700 d3dx9: Correctly round constants in D3DXSHMultiply3 implementation. The correct constants are given to approximately 64-bit precision in "Code Generation and Factoring for Fast Evaluation of Low-order Spherical Harmonic Products and Squares" (2006) by John Snyder. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/math.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 8f5f5b2..856e987 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -2573,27 +2573,27 @@ FLOAT * WINAPI D3DXSHMultiply3(FLOAT *out, const FLOAT *a, const FLOAT *b) out[0] = 0.28209479f * a[0] * b[0]; - ta = 0.28209479f * a[0] - 0.12615662f * a[6] - 0.21850968f * a[8]; - tb = 0.28209479f * b[0] - 0.12615662f * b[6] - 0.21850968f * b[8]; + ta = 0.28209479f * a[0] - 0.12615663f * a[6] - 0.21850969f * a[8]; + tb = 0.28209479f * b[0] - 0.12615663f * b[6] - 0.21850969f * b[8]; out[1] = ta * b[1] + tb * a[1]; t = a[1] * b[1]; out[0] += 0.28209479f * t; - out[6] = -0.12615662f * t; - out[8] = -0.21850968f * t; + out[6] = -0.12615663f * t; + out[8] = -0.21850969f * t; - ta = 0.21850968f * a[5]; - tb = 0.21850968f * b[5]; + ta = 0.21850969f * a[5]; + tb = 0.21850969f * b[5]; out[1] += ta * b[2] + tb * a[2]; out[2] = ta * b[1] + tb * a[1]; t = a[1] * b[2] +a[2] * b[1]; - out[5] = 0.21850968f * t; + out[5] = 0.21850969f * t; - ta = 0.21850968f * a[4]; - tb = 0.21850968f * b[4]; + ta = 0.21850969f * a[4]; + tb = 0.21850969f * b[4]; out[1] += ta * b[3] + tb * a[3]; out[3] = ta * b[1] + tb * a[1]; t = a[1] * b[3] + a[3] * b[1]; - out[4] = 0.21850968f * t; + out[4] = 0.21850969f * t; ta = 0.28209480f * a[0] + 0.25231326f * a[6]; tb = 0.28209480f * b[0] + 0.25231326f * b[6]; @@ -2629,14 +2629,14 @@ FLOAT * WINAPI D3DXSHMultiply3(FLOAT *out, const FLOAT *a, const FLOAT *b) out[4] += ta * b[5] + tb * a[5]; out[5] += ta * b[4] + tb * a[4]; t = a[4] * b[5] + a[5] * b[4]; - out[7] += 0.15607834f * t; + out[7] += 0.15607835f * t; - ta = 0.28209479f * a[0] + 0.09011186f * a[6] - 0.15607835f * a[8]; - tb = 0.28209479f * b[0] + 0.09011186f * b[6] - 0.15607835f * b[8]; + ta = 0.28209479f * a[0] + 0.09011188f * a[6] - 0.15607835f * a[8]; + tb = 0.28209479f * b[0] + 0.09011188f * b[6] - 0.15607835f * b[8]; out[5] += ta * b[5] + tb * a[5]; t = a[5] * b[5]; out[0] += 0.28209479f * t; - out[6] += 0.09011186f * t; + out[6] += 0.09011188f * t; out[8] -= 0.15607835f * t; ta = 0.28209480f * a[0]; @@ -2646,12 +2646,12 @@ FLOAT * WINAPI D3DXSHMultiply3(FLOAT *out, const FLOAT *a, const FLOAT *b) out[0] += 0.28209480f * t; out[6] += 0.18022376f * t; - ta = 0.28209479f * a[0] + 0.09011186f * a[6] + 0.15607835f * a[8]; - tb = 0.28209479f * b[0] + 0.09011186f * b[6] + 0.15607835f * b[8]; + ta = 0.28209479f * a[0] + 0.09011188f * a[6] + 0.15607835f * a[8]; + tb = 0.28209479f * b[0] + 0.09011188f * b[6] + 0.15607835f * b[8]; out[7] += ta * b[7] + tb * a[7]; t = a[7] * b[7]; out[0] += 0.28209479f * t; - out[6] += 0.09011186f * t; + out[6] += 0.09011188f * t; out[8] += 0.15607835f * t; ta = 0.28209479f * a[0] - 0.18022375f * a[6];

1 0

Alexandre Julliard : kernel32/tests: Add some tests for image flags and CLR images.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: b6ca8fd25dab76708b56150468278e4bde5f9264 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6ca8fd25dab76708b561504… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 13 20:08:49 2018 +0100 kernel32/tests: Add some tests for image flags and CLR images. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 316 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 268 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b6ca8fd25dab76708b56…

1 0

Matteo Bruni : wined3d: Introduce a WINED3DFMT_FLAG_GEN_MIPMAP flag.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: 882742e17aabed5d68c7ec554063b8b95299a7bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=882742e17aabed5d68c7ec55… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 13 15:54:13 2018 +0100 wined3d: Introduce a WINED3DFMT_FLAG_GEN_MIPMAP flag. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 8 ++------ dlls/wined3d/texture.c | 5 ++--- dlls/wined3d/utils.c | 18 ++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c8f42fe..924cc72 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5296,7 +5296,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad const struct wined3d_gl_info *gl_info = &adapter->gl_info; const struct wined3d_format *adapter_format, *format; enum wined3d_gl_resource_type gl_type, gl_type_end; - BOOL mipmap_autogen_supported; + BOOL mipmap_autogen_supported = TRUE; DWORD format_flags = 0; DWORD allowed_usage; @@ -5410,7 +5410,6 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad return WINED3DERR_NOTAVAILABLE; } - mipmap_autogen_supported = gl_info->supported[SGIS_GENERATE_MIPMAP]; for (; gl_type <= gl_type_end; ++gl_type) { if ((format->flags[gl_type] & format_flags) != format_flags) @@ -5440,11 +5439,8 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad return WINED3DERR_NOTAVAILABLE; } - if ((format->flags[gl_type] & (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_FILTERING)) - != (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_FILTERING)) - { + if (!(format->flags[gl_type] & WINED3DFMT_FLAG_GEN_MIPMAP)) mipmap_autogen_supported = FALSE; - } } if ((usage & WINED3DUSAGE_AUTOGENMIPMAP) && !mipmap_autogen_supported) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 3806103..c9210cb 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -386,8 +386,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->flags |= WINED3D_TEXTURE_DISCARD; if (flags & WINED3D_TEXTURE_CREATE_GENERATE_MIPMAPS) { - if (~format->flags[WINED3D_GL_RES_TYPE_TEX_2D] - & (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_FILTERING)) + if (!(texture->resource.format_flags & WINED3DFMT_FLAG_GEN_MIPMAP)) WARN("Format doesn't support mipmaps generation, " "ignoring WINED3D_TEXTURE_CREATE_GENERATE_MIPMAPS flag.\n"); else @@ -2684,7 +2683,7 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct texture->resource.map_binding = WINED3D_LOCATION_BUFFER; } - /* Generate all the surfaces. */ + /* Generate all the sub resources. */ for (i = 0; i < texture->level_count; ++i) { struct wined3d_texture_sub_resource *sub_resource; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 6f7740d..960909f 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3595,6 +3595,23 @@ static BOOL init_typeless_formats(struct wined3d_gl_info *gl_info) return TRUE; } +static void init_format_gen_mipmap_info(struct wined3d_gl_info *gl_info) +{ + unsigned int i, j; + + if (!gl_info->supported[SGIS_GENERATE_MIPMAP] && !gl_info->fbo_ops.glGenerateMipmap) + return; + + for (i = 0; i < gl_info->format_count; ++i) + { + struct wined3d_format *format = &gl_info->formats[i]; + + for (j = 0; j < ARRAY_SIZE(format->flags); ++j) + if (!(~format->flags[j] & (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_FILTERING))) + format->flags[j] |= WINED3DFMT_FLAG_GEN_MIPMAP; + } +} + BOOL wined3d_caps_gl_ctx_test_viewport_subpixel_bits(struct wined3d_caps_gl_ctx *ctx) { static const struct wined3d_color red = {1.0f, 0.0f, 0.0f, 1.0f}; @@ -3783,6 +3800,7 @@ BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter, struct wi init_format_fbo_compat_info(ctx); init_format_filter_info(gl_info, adapter->driver_info.vendor); if (!init_typeless_formats(gl_info)) goto fail; + init_format_gen_mipmap_info(gl_info); init_format_depth_bias_scale(ctx, &adapter->d3d_info); return TRUE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f1f7530..8201536 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4205,6 +4205,7 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3DFMT_FLAG_TEXTURE 0x00080000 #define WINED3DFMT_FLAG_BLOCKS_NO_VERIFY 0x00100000 #define WINED3DFMT_FLAG_INTEGER 0x00200000 +#define WINED3DFMT_FLAG_GEN_MIPMAP 0x00400000 struct wined3d_rational {

1 0

Nikolay Sivov : comctl32/button: Use messages to get control text.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: 65f23a745ad44dee50d451f063943ca80598e3c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65f23a745ad44dee50d451f0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 13 16:19:57 2018 +0300 comctl32/button: Use messages to get control text. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 2f5a5b3..dccddf9 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -223,9 +223,10 @@ static inline void paint_button( HWND hwnd, LONG style, UINT action ) /* retrieve the button text; returned buffer must be freed by caller */ static inline WCHAR *get_button_text( HWND hwnd ) { - static const INT len = 512; + INT len = GetWindowTextLengthW( hwnd ); WCHAR *buffer = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ); - if (buffer) InternalGetWindowText( hwnd, buffer, len + 1 ); + if (buffer) + GetWindowTextW( hwnd, buffer, len + 1 ); return buffer; }

1 0

Alexandre Julliard : include: Add definitions for SECTION_IMAGE_INFORMATION flags.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: 1e036633e8fe54b69cf862794b012c98737c3ea6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e036633e8fe54b69cf86279… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 13 10:37:28 2018 +0100 include: Add definitions for SECTION_IMAGE_INFORMATION flags. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 2 +- include/wine/server_protocol.h | 5 +++++ include/winternl.h | 14 +++++++++++++- server/protocol.def | 5 +++++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 426af01..8e764f7 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -3228,7 +3228,7 @@ NTSTATUS WINAPI NtQuerySection( HANDLE handle, SECTION_INFORMATION_CLASS class, info->DllCharacteristics = image_info.dll_charact; info->Machine = image_info.machine; info->ImageContainsCode = image_info.contains_code; - info->ImageFlags = image_info.image_flags; + info->u.ImageFlags = image_info.image_flags; info->LoaderFlags = image_info.loader_flags; info->ImageFileSize = image_info.file_size; info->CheckSum = image_info.checksum; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index ba9f66f..602fc77 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -701,6 +701,11 @@ typedef struct unsigned int file_size; unsigned int checksum; } pe_image_info_t; +#define IMAGE_FLAGS_ComPlusNativeReady 0x01 +#define IMAGE_FLAGS_ComPlusILOnly 0x02 +#define IMAGE_FLAGS_ImageDynamicallyRelocated 0x04 +#define IMAGE_FLAGS_ImageMappedFlat 0x08 +#define IMAGE_FLAGS_BaseBelow4gb 0x10 struct rawinput_device { diff --git a/include/winternl.h b/include/winternl.h index 2911ff6..ec6850a 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1965,7 +1965,19 @@ typedef struct _SECTION_IMAGE_INFORMATION { USHORT DllCharacteristics; USHORT Machine; BOOLEAN ImageContainsCode; - UCHAR ImageFlags; + union + { + UCHAR ImageFlags; + struct + { + UCHAR ComPlusNativeReady : 1; + UCHAR ComPlusILOnly : 1; + UCHAR ImageDynamicallyRelocated : 1; + UCHAR ImageMappedFlat : 1; + UCHAR BaseBelow4gb : 1; + UCHAR Reserved : 3; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; ULONG LoaderFlags; ULONG ImageFileSize; ULONG CheckSum; diff --git a/server/protocol.def b/server/protocol.def index a21d694..35824ae 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -717,6 +717,11 @@ typedef struct unsigned int file_size; unsigned int checksum; } pe_image_info_t; +#define IMAGE_FLAGS_ComPlusNativeReady 0x01 +#define IMAGE_FLAGS_ComPlusILOnly 0x02 +#define IMAGE_FLAGS_ImageDynamicallyRelocated 0x04 +#define IMAGE_FLAGS_ImageMappedFlat 0x08 +#define IMAGE_FLAGS_BaseBelow4gb 0x10 struct rawinput_device {

1 0