wine-commits February 2018

wine-commits@winehq.org

2 participants
804 discussions

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

14 Feb '18

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

Hans Leidekker : secur32: Use the global memory allocation helpers.
by Alexandre Julliard 14 Feb '18

14 Feb '18

Module: wine Branch: master Commit: f0db56775e4231821404b416428b3865c24bd0de URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0db56775e4231821404b416… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 14 14:13:09 2018 +0100 secur32: Use the global memory allocation helpers. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/dispatcher.c | 15 +- dlls/secur32/lsa.c | 50 ++--- dlls/secur32/negotiate.c | 48 ++--- dlls/secur32/ntlm.c | 460 +++++++++++++++++------------------------ dlls/secur32/schannel.c | 55 +++-- dlls/secur32/schannel_macosx.c | 6 +- dlls/secur32/secur32.c | 43 ++-- dlls/secur32/secur32_priv.h | 1 + dlls/secur32/thunks.c | 16 +- dlls/secur32/util.c | 12 +- dlls/secur32/wrapper.c | 10 +- 11 files changed, 311 insertions(+), 405 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f0db56775e4231821404…

1 0

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

14 Feb '18

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

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

14 Feb '18

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

Hans Leidekker : kerberos: ISC_REQ_USE_DCE_STYLE is supported.
by Alexandre Julliard 14 Feb '18

14 Feb '18

Module: wine Branch: master Commit: ab43b7cb2493cf57255a8f5c7d034676aaec6eaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab43b7cb2493cf57255a8f5c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 14 14:13:06 2018 +0100 kerberos: ISC_REQ_USE_DCE_STYLE is supported. 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 767a86e..ea9c687 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -902,8 +902,8 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, { #ifdef SONAME_LIBGSSAPI_KRB5 static const ULONG supported = ISC_REQ_CONFIDENTIALITY | ISC_REQ_INTEGRITY | ISC_REQ_SEQUENCE_DETECT | - ISC_REQ_REPLAY_DETECT | ISC_REQ_MUTUAL_AUTH; - OM_uint32 ret, minor_status, ret_flags, expiry_time, req_flags = flags_isc_req_to_gss( context_req ); + ISC_REQ_REPLAY_DETECT | ISC_REQ_MUTUAL_AUTH | ISC_REQ_USE_DCE_STYLE; + OM_uint32 ret, minor_status, ret_flags = 0, expiry_time, req_flags = flags_isc_req_to_gss( context_req ); gss_cred_id_t cred_handle; gss_ctx_id_t ctxt_handle; gss_buffer_desc input_token, output_token;

1 0

Alexandre Julliard : iphlpapi/tests: Reduce window test verbosity.
by Alexandre Julliard 14 Feb '18

14 Feb '18

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 14 Feb '18

14 Feb '18

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

Alexandre Julliard : user32/tests: Reduce window test verbosity.
by Alexandre Julliard 14 Feb '18

14 Feb '18

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

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

14 Feb '18

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

Zebediah Figura : msvfw32: Fix driver enumeration.
by Alexandre Julliard 14 Feb '18

14 Feb '18

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

← Newer
1
...
38
39
40
41
42
43
44
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2018