wine-devel February 2020

wine-devel@winehq.org

80 participants
745 discussions

[PATCH resend 1/3] ntdll/tests: Test updating TickCount in user_shared_data.
by Rémi Bernon 10 Feb '20

10 Feb '20

Patch from: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/tests/time.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index 5382a952d8d..be6859fe3e1 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION #include "ntdll_test.h" +#include "ddk/wdm.h" #define TICKSPERSEC 10000000 #define TICKSPERMSEC 10000 @@ -29,6 +31,7 @@ static VOID (WINAPI *pRtlTimeFieldsToTime)( PTIME_FIELDS TimeFields, PLARGE_IN static NTSTATUS (WINAPI *pNtQueryPerformanceCounter)( LARGE_INTEGER *counter, LARGE_INTEGER *frequency ); static NTSTATUS (WINAPI *pRtlQueryTimeZoneInformation)( RTL_TIME_ZONE_INFORMATION *); static NTSTATUS (WINAPI *pRtlQueryDynamicTimeZoneInformation)( RTL_DYNAMIC_TIME_ZONE_INFORMATION *); +static ULONG (WINAPI *pNtGetTickCount)(void); static const int MonthLengths[2][12] = { @@ -153,12 +156,35 @@ static void test_RtlQueryTimeZoneInformation(void) wine_dbgstr_w(tzinfo.DaylightName)); } +static void test_NtGetTickCount(void) +{ + KSHARED_USER_DATA *user_shared_data = (void *)0x7ffe0000; + LONG diff; + int i; + + if (!pNtGetTickCount) + { + win_skip("NtGetTickCount is not available\n"); + return; + } + + for (i = 0; i < 5; ++i) + { + diff = (user_shared_data->u.TickCountQuad * user_shared_data->TickCountMultiplier) >> 24; + diff = pNtGetTickCount() - diff; + todo_wine + ok(diff < 100, "NtGetTickCount - TickCountQuad too high, expected < 100 got %d\n", diff); + Sleep(50); + } +} + START_TEST(time) { HMODULE mod = GetModuleHandleA("ntdll.dll"); pRtlTimeToTimeFields = (void *)GetProcAddress(mod,"RtlTimeToTimeFields"); pRtlTimeFieldsToTime = (void *)GetProcAddress(mod,"RtlTimeFieldsToTime"); pNtQueryPerformanceCounter = (void *)GetProcAddress(mod, "NtQueryPerformanceCounter"); + pNtGetTickCount = (void *)GetProcAddress(mod,"NtGetTickCount"); pRtlQueryTimeZoneInformation = (void *)GetProcAddress(mod, "RtlQueryTimeZoneInformation"); pRtlQueryDynamicTimeZoneInformation = @@ -169,5 +195,6 @@ START_TEST(time) else win_skip("Required time conversion functions are not available\n"); test_NtQueryPerformanceCounter(); + test_NtGetTickCount(); test_RtlQueryTimeZoneInformation(); } -- 2.25.0

2 4

[PATCH] kernel32: Add semi-stub for LoadPackagedLibrary().
by Paul Gofman 10 Feb '20

10 Feb '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48229 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/tests/loader.c | 19 +++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/loader.c | 8 ++++++++ include/winbase.h | 1 + 5 files changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 47c7d63761..f07a2ee9ff 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1048,6 +1048,7 @@ @ stdcall -import LoadLibraryExA( str long long) @ stdcall -import LoadLibraryExW(wstr long long) @ stdcall -import LoadLibraryW(wstr) +@ stdcall -import LoadPackagedLibrary(wstr long) @ stdcall LoadModule(str ptr) @ stdcall -import LoadResource(long long) # @ stub LoadStringBaseExW diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 6f143f5efd..5eaee97a91 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -86,6 +86,7 @@ static BOOL (WINAPI *pFlsFree)(DWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE,PBOOL); static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(void **); static BOOL (WINAPI *pWow64RevertWow64FsRedirection)(void *); +static HMODULE (WINAPI *pLoadPackagedLibrary)(LPCWSTR lpwLibFileName, DWORD Reserved); static PVOID RVAToAddr(DWORD_PTR rva, HMODULE module) { @@ -3917,6 +3918,22 @@ static void test_dll_file( const char *name ) #undef OK_FIELD } +static void test_LoadPackagedLibrary(void) +{ + static const WCHAR kernel32_nameW[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; + HANDLE h; + + if (!pLoadPackagedLibrary) + { + win_skip("LoadPackagedLibrary is not available."); + return; + } + + h = pLoadPackagedLibrary(kernel32_nameW, 0); + ok(!h && GetLastError() == APPMODEL_ERROR_NO_PACKAGE, "Got unexpected handle %p, GetLastError() %u.\n", + h, GetLastError()); +} + START_TEST(loader) { int argc; @@ -3954,6 +3971,7 @@ START_TEST(loader) pWow64DisableWow64FsRedirection = (void *)GetProcAddress(kernel32, "Wow64DisableWow64FsRedirection"); pWow64RevertWow64FsRedirection = (void *)GetProcAddress(kernel32, "Wow64RevertWow64FsRedirection"); pResolveDelayLoadedAPI = (void *)GetProcAddress(kernel32, "ResolveDelayLoadedAPI"); + pLoadPackagedLibrary = (void *)GetProcAddress(kernel32, "LoadPackagedLibrary"); if (pIsWow64Process) pIsWow64Process( GetCurrentProcess(), &is_wow64 ); GetSystemInfo( &si ); @@ -3993,4 +4011,5 @@ START_TEST(loader) test_dll_file( "user32.dll" ); /* loader test must be last, it can corrupt the internal loader state on Windows */ test_Loader(); + test_LoadPackagedLibrary(); } diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index caa6de1d51..49fb4a7ff1 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -926,7 +926,7 @@ @ stdcall LoadLibraryExA( str long long) @ stdcall LoadLibraryExW(wstr long long) @ stdcall LoadLibraryW(wstr) -# @ stub LoadPackagedLibrary +@ stdcall LoadPackagedLibrary(wstr long) @ stdcall LoadResource(long long) @ stdcall LoadStringA(long long ptr long) @ stub LoadStringBaseExW diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index 456a9f2da4..0f114bb315 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -1209,3 +1209,11 @@ BOOL WINAPI DECLSPEC_HOTPATCH ZombifyActCtx( HANDLE context ) { return set_ntstatus( RtlZombifyActivationContext( context )); } + +HMODULE WINAPI LoadPackagedLibrary( LPCWSTR name, DWORD reserved ) +{ + FIXME("semi-stub, name %s, reserved %#x.\n", debugstr_w(name), reserved); + + SetLastError(APPMODEL_ERROR_NO_PACKAGE); + return NULL; +} diff --git a/include/winbase.h b/include/winbase.h index 3062d3b6ad..23a782a6dc 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2417,6 +2417,7 @@ WINBASEAPI HMODULE WINAPI LoadLibraryW(LPCWSTR); WINBASEAPI HMODULE WINAPI LoadLibraryExA(LPCSTR,HANDLE,DWORD); WINBASEAPI HMODULE WINAPI LoadLibraryExW(LPCWSTR,HANDLE,DWORD); #define LoadLibraryEx WINELIB_NAME_AW(LoadLibraryEx) +WINBASEAPI HMODULE WINAPI LoadPackagedLibrary(LPCWSTR,DWORD); WINBASEAPI DWORD WINAPI LoadModule(LPCSTR,LPVOID); WINBASEAPI HGLOBAL WINAPI LoadResource(HMODULE,HRSRC); WINBASEAPI HLOCAL WINAPI LocalAlloc(UINT,SIZE_T) __WINE_ALLOC_SIZE(2); -- 2.24.1

1 0

[PATCH 5/5] dxgi: Check NULL adapter and output pointers.
by Zhiyi Zhang 10 Feb '20

10 Feb '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/adapter.c | 3 +++ dlls/dxgi/factory.c | 3 +++ dlls/dxgi/tests/dxgi.c | 9 +++++++++ 3 files changed, 15 insertions(+) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 329c67196c..ac80818152 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -129,6 +129,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac TRACE("iface %p, output_idx %u, output %p.\n", iface, output_idx, output); + if (!output) + return E_INVALIDARG; + hr = wined3d_adapter_get_output_count(adapter->factory->wined3d, adapter->ordinal, &output_count); if (FAILED(hr) || output_idx >= output_count) { diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index a0038b4fe7..3f41df9e36 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -403,6 +403,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapterByLuid(IWineDXGIFactory TRACE("iface %p, luid %08x:%08x, iid %s, adapter %p.\n", iface, luid.HighPart, luid.LowPart, debugstr_guid(iid), adapter); + if (!adapter) + return DXGI_ERROR_INVALID_CALL; + adapter_index = 0; while ((hr = dxgi_factory_EnumAdapters1(iface, adapter_index, &adapter1)) == S_OK) { diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index f8e63ea25e..cd007bfced 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -912,6 +912,9 @@ static void test_adapter_luid(void) return; } + hr = IDXGIFactory4_EnumAdapterByLuid(factory4, device_adapter_desc.AdapterLuid, &IID_IDXGIAdapter, NULL); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = IDXGIFactory4_EnumAdapterByLuid(factory4, device_adapter_desc.AdapterLuid, &IID_IDXGIAdapter, (void **)&adapter); todo_wine ok(hr == S_OK, "Failed to enum adapter by LUID, hr %#x.\n", hr); @@ -1171,6 +1174,9 @@ static void test_output(void) hr = IDXGIDevice_GetAdapter(device, &adapter); ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); + hr = IDXGIAdapter_EnumOutputs(adapter, 0, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = IDXGIAdapter_EnumOutputs(adapter, 0, &output); if (hr == DXGI_ERROR_NOT_FOUND) { @@ -4949,6 +4955,9 @@ static void test_multi_adapter(void) return; } + hr = IDXGIFactory_EnumAdapters(factory, 0, NULL); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); if (hr == DXGI_ERROR_NOT_FOUND) { -- 2.20.1

2 1

[PATCH 4/5] wined3d: Introduce wined3d_adapter_get_output_ordinal().
by Zhiyi Zhang 10 Feb '20

10 Feb '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/adapter.c | 2 +- dlls/dxgi/dxgi_private.h | 3 ++- dlls/dxgi/output.c | 8 +++++--- dlls/wined3d/directx.c | 25 ++++++++++++++++++++++--- dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 2 ++ include/wine/wined3d.h | 2 ++ 7 files changed, 35 insertions(+), 8 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 477f19f3f4..329c67196c 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -136,7 +136,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac return DXGI_ERROR_NOT_FOUND; } - if (FAILED(hr = dxgi_output_create(adapter, &output_object))) + if (FAILED(hr = dxgi_output_create(adapter, output_idx, &output_object))) { *output = NULL; return hr; diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 5b93449834..5fd920b642 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -146,9 +146,10 @@ struct dxgi_output LONG refcount; struct wined3d_private_store private_store; struct dxgi_adapter *adapter; + UINT wined3d_output_ordinal; }; -HRESULT dxgi_output_create(struct dxgi_adapter *adapter, struct dxgi_output **output) DECLSPEC_HIDDEN; +HRESULT dxgi_output_create(struct dxgi_adapter *adapter, UINT ordinal, struct dxgi_output **output) DECLSPEC_HIDDEN; struct dxgi_output *unsafe_impl_from_IDXGIOutput(IDXGIOutput *iface) DECLSPEC_HIDDEN; /* IDXGIAdapter */ diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index a2331358e6..0f14dc75fc 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -581,20 +581,22 @@ struct dxgi_output *unsafe_impl_from_IDXGIOutput(IDXGIOutput *iface) return CONTAINING_RECORD(iface, struct dxgi_output, IDXGIOutput4_iface); } -static void dxgi_output_init(struct dxgi_output *output, struct dxgi_adapter *adapter) +static void dxgi_output_init(struct dxgi_output *output, UINT ordinal, struct dxgi_adapter *adapter) { output->IDXGIOutput4_iface.lpVtbl = &dxgi_output_vtbl; output->refcount = 1; wined3d_private_store_init(&output->private_store); output->adapter = adapter; + wined3d_adapter_get_output_ordinal(adapter->factory->wined3d, + adapter->ordinal, ordinal, &output->wined3d_output_ordinal); IWineDXGIAdapter_AddRef(&output->adapter->IWineDXGIAdapter_iface); } -HRESULT dxgi_output_create(struct dxgi_adapter *adapter, struct dxgi_output **output) +HRESULT dxgi_output_create(struct dxgi_adapter *adapter, UINT ordinal, struct dxgi_output **output) { if (!(*output = heap_alloc_zero(sizeof(**output)))) return E_OUTOFMEMORY; - dxgi_output_init(*output, adapter); + dxgi_output_init(*output, ordinal, adapter); return S_OK; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 10bbfa4c54..c828b1fce4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -63,6 +63,24 @@ const GLenum magLookup[] = GL_NEAREST, GL_NEAREST, GL_LINEAR, }; +/* Retrieve an ordinal to uniquely identify an output within a wined3d instance. + * output_idx here is the output index within an adapter, rather than in wined3d instance */ +HRESULT CDECL wined3d_adapter_get_output_ordinal(const struct wined3d *wined3d, + UINT adapter_idx, UINT output_idx, UINT *ordinal) +{ + struct wined3d_adapter *adapter; + + if (adapter_idx >= wined3d->adapter_count) + return WINED3DERR_INVALIDCALL; + + adapter = wined3d->adapters[adapter_idx]; + if (output_idx >= adapter->output_count) + return WINED3DERR_INVALIDCALL; + + *ordinal = adapter->outputs[output_idx].ordinal; + return WINED3D_OK; +} + void CDECL wined3d_output_release_ownership(const struct wined3d_output *output) { D3DKMT_SETVIDPNSOURCEOWNER set_owner_desc = {0}; @@ -117,13 +135,13 @@ static void wined3d_output_cleanup(const struct wined3d_output *output) D3DKMTCloseAdapter(&close_adapter_desc); } -static HRESULT wined3d_output_init(struct wined3d_output *output, const WCHAR *device_name) +static HRESULT wined3d_output_init(struct wined3d_output *output, const WCHAR *device_name, UINT ordinal) { D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME open_adapter_desc; D3DKMT_CREATEDEVICE create_device_desc = {{0}}; D3DKMT_CLOSEADAPTER close_adapter_desc; - TRACE("output %p, device_name %s.\n", output, wine_dbgstr_w(device_name)); + TRACE("output %p, device_name %s, ordinal %u.\n", output, wine_dbgstr_w(device_name), ordinal); lstrcpyW(open_adapter_desc.DeviceName, device_name); if (D3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_desc)) @@ -137,6 +155,7 @@ static HRESULT wined3d_output_init(struct wined3d_output *output, const WCHAR *d return E_FAIL; } + output->ordinal = ordinal; output->kmt_adapter = open_adapter_desc.hAdapter; output->kmt_device = create_device_desc.hDevice; output->vidpn_source_id = open_adapter_desc.VidPnSourceId; @@ -2920,7 +2939,7 @@ HRESULT wined3d_init(struct wined3d *wined3d, DWORD flags) wined3d->adapters[0]->outputs = wined3d->outputs; wined3d->adapters[0]->output_count = 1; - if (FAILED(hr = wined3d_output_init(&wined3d->outputs[0], wined3d->adapters[0]->device_name))) + if (FAILED(hr = wined3d_output_init(&wined3d->outputs[0], wined3d->adapters[0]->device_name, 0))) { WARN("Failed to create output, hr %#x.\n", hr); goto fail; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 7e13e19891..dda8390bd2 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -27,6 +27,7 @@ @ cdecl wined3d_unregister_windows(ptr) @ cdecl wined3d_adapter_get_output_count(ptr long ptr) +@ cdecl wined3d_adapter_get_output_ordinal(ptr long long ptr) @ cdecl wined3d_blend_state_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_blend_state_decref(ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c7ace57324..a0b3982cec 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2896,6 +2896,8 @@ struct wined3d_adapter_ops /* The output structure, represents a video card output */ struct wined3d_output { + UINT ordinal; + D3DKMT_HANDLE kmt_adapter; D3DKMT_HANDLE kmt_device; D3DDDI_VIDEO_PRESENT_SOURCE_ID vidpn_source_id; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f676871b25..3c9e72d210 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2284,6 +2284,8 @@ HRESULT __cdecl wined3d_set_adapter_display_mode(struct wined3d *wined3d, void __cdecl wined3d_unregister_windows(struct wined3d *wined3d); HRESULT __cdecl wined3d_adapter_get_output_count(const struct wined3d *wined3d, UINT adapter_idx, UINT *count); +HRESULT __cdecl wined3d_adapter_get_output_ordinal(const struct wined3d *wined3d, UINT adapter_idx, UINT output_idx, + UINT *ordinal); HRESULT __cdecl wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, -- 2.20.1

2 1

[PATCH] include: Update winhttp.h.
by Hans Leidekker 10 Feb '20

10 Feb '20

From: Biswapriyo Nath <nathbappai(a)gmail.com> Here is the updated patch. `HTTP_STATUS_PERMANENT_REDIRECT` is present in 10.0.18362.0. v3: Add WINHTTP_CALLBACK_STATUS_GETPROXYFORURL_COMPLETE to WINHTTP_CALLBACK_FLAG_ALL_COMPLETIONS. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- include/winhttp.h | 230 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 227 insertions(+), 3 deletions(-) diff --git a/include/winhttp.h b/include/winhttp.h index e873e7719e..33fc1f915d 100644 --- a/include/winhttp.h +++ b/include/winhttp.h @@ -46,6 +46,8 @@ typedef INTERNET_PORT *LPINTERNET_PORT; typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define ICU_ESCAPE 0x80000000 +#define ICU_ESCAPE_AUTHORITY 0x00002000 +#define ICU_REJECT_USERPWD 0x00004000 /* flags for WinHttpOpen */ #define WINHTTP_FLAG_ASYNC 0x10000000 @@ -62,6 +64,7 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define WINHTTP_ACCESS_TYPE_DEFAULT_PROXY 0 #define WINHTTP_ACCESS_TYPE_NO_PROXY 1 #define WINHTTP_ACCESS_TYPE_NAMED_PROXY 3 +#define WINHTTP_ACCESS_TYPE_AUTOMATIC_PROXY 4 #define WINHTTP_NO_PROXY_NAME NULL #define WINHTTP_NO_PROXY_BYPASS NULL @@ -108,6 +111,7 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define WINHTTP_OPTION_URL 34 #define WINHTTP_OPTION_SECURITY_KEY_BITNESS 36 #define WINHTTP_OPTION_PROXY 38 +#define WINHTTP_OPTION_PROXY_RESULT_ENTRY 39 #define WINHTTP_OPTION_USER_AGENT 41 #define WINHTTP_OPTION_CONTEXT_VALUE 45 #define WINHTTP_OPTION_CLIENT_CERT_CONTEXT 47 @@ -141,7 +145,35 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define WINHTTP_OPTION_UNLOAD_NOTIFY_EVENT 99 #define WINHTTP_OPTION_REJECT_USERPWD_IN_URL 100 #define WINHTTP_OPTION_USE_GLOBAL_SERVER_CREDENTIALS 101 -#define WINHTTP_LAST_OPTION WINHTTP_OPTION_USE_GLOBAL_SERVER_CREDENTIALS +#define WINHTTP_OPTION_RECEIVE_PROXY_CONNECT_RESPONSE 103 +#define WINHTTP_OPTION_IS_PROXY_CONNECT_RESPONSE 104 +#define WINHTTP_OPTION_SERVER_SPN_USED 106 +#define WINHTTP_OPTION_PROXY_SPN_USED 107 +#define WINHTTP_OPTION_SERVER_CBT 108 +#define WINHTTP_OPTION_UNSAFE_HEADER_PARSING 110 +#define WINHTTP_OPTION_ASSURED_NON_BLOCKING_CALLBACKS 111 +#define WINHTTP_OPTION_UPGRADE_TO_WEB_SOCKET 114 +#define WINHTTP_OPTION_WEB_SOCKET_CLOSE_TIMEOUT 115 +#define WINHTTP_OPTION_WEB_SOCKET_KEEPALIVE_INTERVAL 116 +#define WINHTTP_OPTION_DECOMPRESSION 118 +#define WINHTTP_OPTION_WEB_SOCKET_RECEIVE_BUFFER_SIZE 122 +#define WINHTTP_OPTION_WEB_SOCKET_SEND_BUFFER_SIZE 123 +#define WINHTTP_OPTION_TCP_PRIORITY_HINT 128 +#define WINHTTP_OPTION_CONNECTION_FILTER 131 +#define WINHTTP_OPTION_ENABLE_HTTP_PROTOCOL 133 +#define WINHTTP_OPTION_HTTP_PROTOCOL_USED 134 +#define WINHTTP_OPTION_KDC_PROXY_SETTINGS 136 +#define WINHTTP_OPTION_ENCODE_EXTRA 138 +#define WINHTTP_OPTION_DISABLE_STREAM_QUEUE 139 +#define WINHTTP_OPTION_IPV6_FAST_FALLBACK 140 +#define WINHTTP_OPTION_CONNECTION_STATS_V0 141 +#define WINHTTP_OPTION_REQUEST_TIMES 142 +#define WINHTTP_OPTION_EXPIRE_CONNECTION 143 +#define WINHTTP_OPTION_DISABLE_SECURE_PROTOCOL_FALLBACK 144 +#define WINHTTP_OPTION_HTTP_PROTOCOL_REQUIRED 145 +#define WINHTTP_OPTION_REQUEST_STATS 146 +#define WINHTTP_OPTION_SERVER_CERT_CHAIN_CONTEXT 147 +#define WINHTTP_LAST_OPTION WINHTTP_OPTION_SERVER_CERT_CHAIN_CONTEXT #define WINHTTP_OPTION_USERNAME 0x1000 #define WINHTTP_OPTION_PASSWORD 0x1001 #define WINHTTP_OPTION_PROXY_USERNAME 0x1002 @@ -149,6 +181,14 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define WINHTTP_CONNS_PER_SERVER_UNLIMITED 0xFFFFFFFF +#define WINHTTP_DECOMPRESSION_FLAG_GZIP 0x00000001 +#define WINHTTP_DECOMPRESSION_FLAG_DEFLATE 0x00000002 + +#define WINHTTP_DECOMPRESSION_FLAG_ALL ( WINHTTP_DECOMPRESSION_FLAG_GZIP | WINHTTP_DECOMPRESSION_FLAG_DEFLATE ) + +#define WINHTTP_PROTOCOL_FLAG_HTTP2 0x1 +#define WINHTTP_PROTOCOL_MASK WINHTTP_PROTOCOL_FLAG_HTTP2 + #define WINHTTP_AUTOLOGON_SECURITY_LEVEL_MEDIUM 0 #define WINHTTP_AUTOLOGON_SECURITY_LEVEL_LOW 1 #define WINHTTP_AUTOLOGON_SECURITY_LEVEL_HIGH 2 @@ -223,6 +263,8 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define ERROR_WINHTTP_SECURE_CERT_REVOKED (WINHTTP_ERROR_BASE + 170) #define ERROR_WINHTTP_NOT_INITIALIZED (WINHTTP_ERROR_BASE + 172) #define ERROR_WINHTTP_SECURE_FAILURE (WINHTTP_ERROR_BASE + 175) +#define ERROR_WINHTTP_UNHANDLED_SCRIPT_TYPE (WINHTTP_ERROR_BASE + 176) +#define ERROR_WINHTTP_SCRIPT_EXECUTION_ERROR (WINHTTP_ERROR_BASE + 177) #define ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR (WINHTTP_ERROR_BASE + 178) #define ERROR_WINHTTP_SECURE_CERT_WRONG_USAGE (WINHTTP_ERROR_BASE + 179) #define ERROR_WINHTTP_AUTODETECTION_FAILED (WINHTTP_ERROR_BASE + 180) @@ -232,7 +274,20 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define ERROR_WINHTTP_RESPONSE_DRAIN_OVERFLOW (WINHTTP_ERROR_BASE + 184) #define ERROR_WINHTTP_CLIENT_CERT_NO_PRIVATE_KEY (WINHTTP_ERROR_BASE + 185) #define ERROR_WINHTTP_CLIENT_CERT_NO_ACCESS_PRIVATE_KEY (WINHTTP_ERROR_BASE + 186) -#define WINHTTP_ERROR_LAST (WINHTTP_ERROR_BASE + 186) +#define ERROR_WINHTTP_CLIENT_AUTH_CERT_NEEDED_PROXY (WINHTTP_ERROR_BASE + 187) +#define ERROR_WINHTTP_SECURE_FAILURE_PROXY (WINHTTP_ERROR_BASE + 188) +#define ERROR_WINHTTP_RESERVED_189 (WINHTTP_ERROR_BASE + 189) +#define ERROR_WINHTTP_HTTP_PROTOCOL_MISMATCH (WINHTTP_ERROR_BASE + 190) +#define WINHTTP_ERROR_LAST (WINHTTP_ERROR_BASE + 188) + +#define WINHTTP_RESET_STATE 0x00000001 +#define WINHTTP_RESET_SWPAD_CURRENT_NETWORK 0x00000002 +#define WINHTTP_RESET_SWPAD_ALL 0x00000004 +#define WINHTTP_RESET_SCRIPT_CACHE 0x00000008 +#define WINHTTP_RESET_ALL 0x0000FFFF +#define WINHTTP_RESET_NOTIFY_NETWORK_CHANGED 0x00010000 +#define WINHTTP_RESET_OUT_OF_PROC 0x00020000 +#define WINHTTP_RESET_DISCARD_RESOLVERS 0x00040000 /* WinHttp status codes */ #define HTTP_STATUS_CONTINUE 100 @@ -252,6 +307,7 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define HTTP_STATUS_NOT_MODIFIED 304 #define HTTP_STATUS_USE_PROXY 305 #define HTTP_STATUS_REDIRECT_KEEP_VERB 307 +#define HTTP_STATUS_PERMANENT_REDIRECT 308 #define HTTP_STATUS_BAD_REQUEST 400 #define HTTP_STATUS_DENIED 401 #define HTTP_STATUS_PAYMENT_REQ 402 @@ -375,6 +431,7 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define WINHTTP_QUERY_FLAG_REQUEST_HEADERS 0x80000000 #define WINHTTP_QUERY_FLAG_SYSTEMTIME 0x40000000 #define WINHTTP_QUERY_FLAG_NUMBER 0x20000000 +#define WINHTTP_QUERY_FLAG_NUMBER64 0x08000000 /* Callback options */ #define WINHTTP_CALLBACK_STATUS_RESOLVING_NAME 0x00000001 @@ -399,6 +456,11 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE 0x00100000 #define WINHTTP_CALLBACK_STATUS_REQUEST_ERROR 0x00200000 #define WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE 0x00400000 +#define WINHTTP_CALLBACK_STATUS_GETPROXYFORURL_COMPLETE 0x01000000 +#define WINHTTP_CALLBACK_STATUS_CLOSE_COMPLETE 0x02000000 +#define WINHTTP_CALLBACK_STATUS_SHUTDOWN_COMPLETE 0x04000000 +#define WINHTTP_CALLBACK_STATUS_SETTINGS_WRITE_COMPLETE 0x10000000 +#define WINHTTP_CALLBACK_STATUS_SETTINGS_READ_COMPLETE 0x20000000 #define WINHTTP_CALLBACK_FLAG_RESOLVE_NAME (WINHTTP_CALLBACK_STATUS_RESOLVING_NAME | WINHTTP_CALLBACK_STATUS_NAME_RESOLVED) #define WINHTTP_CALLBACK_FLAG_CONNECT_TO_SERVER (WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER | WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER) #define WINHTTP_CALLBACK_FLAG_SEND_REQUEST (WINHTTP_CALLBACK_STATUS_SENDING_REQUEST | WINHTTP_CALLBACK_STATUS_REQUEST_SENT) @@ -415,9 +477,11 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define WINHTTP_CALLBACK_FLAG_READ_COMPLETE WINHTTP_CALLBACK_STATUS_READ_COMPLETE #define WINHTTP_CALLBACK_FLAG_WRITE_COMPLETE WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE #define WINHTTP_CALLBACK_FLAG_REQUEST_ERROR WINHTTP_CALLBACK_STATUS_REQUEST_ERROR +#define WINHTTP_CALLBACK_FLAG_GETPROXYFORURL_COMPLETE WINHTTP_CALLBACK_STATUS_GETPROXYFORURL_COMPLETE #define WINHTTP_CALLBACK_FLAG_ALL_COMPLETIONS (WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE | WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE \ | WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE | WINHTTP_CALLBACK_STATUS_READ_COMPLETE \ - | WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE | WINHTTP_CALLBACK_STATUS_REQUEST_ERROR) + | WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE | WINHTTP_CALLBACK_STATUS_REQUEST_ERROR \ + | WINHTTP_CALLBACK_STATUS_GETPROXYFORURL_COMPLETE) #define WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS 0xffffffff #define WINHTTP_INVALID_STATUS_CALLBACK ((WINHTTP_STATUS_CALLBACK)(-1)) @@ -426,6 +490,7 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define API_READ_DATA (3) #define API_WRITE_DATA (4) #define API_SEND_REQUEST (5) +#define API_GET_PROXY_FOR_URL (6) #define WINHTTP_HANDLE_TYPE_SESSION 1 #define WINHTTP_HANDLE_TYPE_CONNECT 2 @@ -445,6 +510,7 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define WINHTTP_FLAG_SECURE_PROTOCOL_TLS1 0x00000080 #define WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_1 0x00000200 #define WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2 0x00000800 +#define WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_3 0x00002000 #define WINHTTP_FLAG_SECURE_PROTOCOL_ALL (WINHTTP_FLAG_SECURE_PROTOCOL_SSL2 |\ WINHTTP_FLAG_SECURE_PROTOCOL_SSL3 |\ WINHTTP_FLAG_SECURE_PROTOCOL_TLS1) @@ -517,14 +583,24 @@ typedef struct } WINHTTP_CURRENT_USER_IE_PROXY_CONFIG; typedef VOID (CALLBACK *WINHTTP_STATUS_CALLBACK)(HINTERNET,DWORD_PTR,DWORD,LPVOID,DWORD); +typedef WINHTTP_STATUS_CALLBACK * LPWINHTTP_STATUS_CALLBACK; #define WINHTTP_AUTO_DETECT_TYPE_DHCP 0x00000001 #define WINHTTP_AUTO_DETECT_TYPE_DNS_A 0x00000002 #define WINHTTP_AUTOPROXY_AUTO_DETECT 0x00000001 #define WINHTTP_AUTOPROXY_CONFIG_URL 0x00000002 +#define WINHTTP_AUTOPROXY_HOST_KEEPCASE 0x00000004 +#define WINHTTP_AUTOPROXY_HOST_LOWERCASE 0x00000008 +#define WINHTTP_AUTOPROXY_ALLOW_AUTOCONFIG 0x00000100 +#define WINHTTP_AUTOPROXY_ALLOW_STATIC 0x00000200 +#define WINHTTP_AUTOPROXY_ALLOW_CM 0x00000400 #define WINHTTP_AUTOPROXY_RUN_INPROCESS 0x00010000 #define WINHTTP_AUTOPROXY_RUN_OUTPROCESS_ONLY 0x00020000 +#define WINHTTP_AUTOPROXY_NO_DIRECTACCESS 0x00040000 +#define WINHTTP_AUTOPROXY_NO_CACHE_CLIENT 0x00080000 +#define WINHTTP_AUTOPROXY_NO_CACHE_SVC 0x00100000 +#define WINHTTP_AUTOPROXY_SORT_RESULTS 0x00400000 typedef struct { @@ -536,6 +612,56 @@ typedef struct BOOL fAutoLogonIfChallenged; } WINHTTP_AUTOPROXY_OPTIONS; +typedef struct _WINHTTP_PROXY_RESULT_ENTRY +{ + BOOL fProxy; + BOOL fBypass; + INTERNET_SCHEME ProxyScheme; + PWSTR pwszProxy; + INTERNET_PORT ProxyPort; +} WINHTTP_PROXY_RESULT_ENTRY; + +typedef struct _WINHTTP_PROXY_RESULT +{ + DWORD cEntries; + WINHTTP_PROXY_RESULT_ENTRY *pEntries; +} WINHTTP_PROXY_RESULT; + +typedef struct _WINHTTP_PROXY_RESULT_EX +{ + DWORD cEntries; + WINHTTP_PROXY_RESULT_ENTRY *pEntries; + HANDLE hProxyDetectionHandle; + DWORD dwProxyInterfaceAffinity; +} WINHTTP_PROXY_RESULT_EX; + +#define NETWORKING_KEY_BUFSIZE 128 + +typedef struct _WinHttpProxyNetworkKey +{ + unsigned char pbBuffer[NETWORKING_KEY_BUFSIZE]; +} WINHTTP_PROXY_NETWORKING_KEY, *PWINHTTP_PROXY_NETWORKING_KEY; + +typedef struct _WINHTTP_PROXY_SETTINGS +{ + DWORD dwStructSize; + DWORD dwFlags; + DWORD dwCurrentSettingsVersion; + PWSTR pwszConnectionName; + PWSTR pwszProxy; + PWSTR pwszProxyBypass; + PWSTR pwszAutoconfigUrl; + PWSTR pwszAutoconfigSecondaryUrl; + DWORD dwAutoDiscoveryFlags; + PWSTR pwszLastKnownGoodAutoConfigUrl; + DWORD dwAutoconfigReloadDelayMins; + FILETIME ftLastKnownDetectTime; + DWORD dwDetectedInterfaceIpCount; + PDWORD pdwDetectedInterfaceIp; + DWORD cNetworkKeys; + PWINHTTP_PROXY_NETWORKING_KEY pNetworkKeys; +} WINHTTP_PROXY_SETTINGS, *PWINHTTP_PROXY_SETTINGS; + typedef struct { DWORD dwMajorVersion; @@ -551,6 +677,91 @@ typedef struct } WINHTTP_CONNECTION_INFO; #endif +typedef enum _WINHTTP_REQUEST_TIME_ENTRY +{ + WinHttpProxyDetectionStart = 0, + WinHttpProxyDetectionEnd, + WinHttpConnectionAcquireStart, + WinHttpConnectionAcquireWaitEnd, + WinHttpConnectionAcquireEnd, + WinHttpNameResolutionStart, + WinHttpNameResolutionEnd, + WinHttpConnectionEstablishmentStart, + WinHttpConnectionEstablishmentEnd, + WinHttpTlsHandshakeClientLeg1Start, + WinHttpTlsHandshakeClientLeg1End, + WinHttpTlsHandshakeClientLeg2Start, + WinHttpTlsHandshakeClientLeg2End, + WinHttpTlsHandshakeClientLeg3Start, + WinHttpTlsHandshakeClientLeg3End, + WinHttpStreamWaitStart, + WinHttpStreamWaitEnd, + WinHttpSendRequestStart, + WinHttpSendRequestHeadersCompressionStart, + WinHttpSendRequestHeadersCompressionEnd, + WinHttpSendRequestHeadersEnd, + WinHttpSendRequestEnd, + WinHttpReceiveResponseStart, + WinHttpReceiveResponseHeadersDecompressionStart, + WinHttpReceiveResponseHeadersDecompressionEnd, + WinHttpReceiveResponseHeadersEnd, + WinHttpReceiveResponseBodyDecompressionDelta, + WinHttpReceiveResponseEnd, + WinHttpProxyTunnelStart, + WinHttpProxyTunnelEnd, + WinHttpProxyTlsHandshakeClientLeg1Start, + WinHttpProxyTlsHandshakeClientLeg1End, + WinHttpProxyTlsHandshakeClientLeg2Start, + WinHttpProxyTlsHandshakeClientLeg2End, + WinHttpProxyTlsHandshakeClientLeg3Start, + WinHttpProxyTlsHandshakeClientLeg3End, + WinHttpRequestTimeLast, + WinHttpRequestTimeMax = 64 +} WINHTTP_REQUEST_TIME_ENTRY; + +typedef struct _WINHTTP_REQUEST_TIMES +{ + ULONG cTimes; + ULONGLONG rgullTimes[WinHttpRequestTimeMax]; +} WINHTTP_REQUEST_TIMES, *PWINHTTP_REQUEST_TIMES; + +typedef enum _WINHTTP_REQUEST_STAT_ENTRY +{ + WinHttpConnectFailureCount = 0, + WinHttpProxyFailureCount, + WinHttpTlsHandshakeClientLeg1Size, + WinHttpTlsHandshakeServerLeg1Size, + WinHttpTlsHandshakeClientLeg2Size, + WinHttpTlsHandshakeServerLeg2Size, + WinHttpRequestHeadersSize, + WinHttpRequestHeadersCompressedSize, + WinHttpResponseHeadersSize, + WinHttpResponseHeadersCompressedSize, + WinHttpResponseBodySize, + WinHttpResponseBodyCompressedSize, + WinHttpProxyTlsHandshakeClientLeg1Size, + WinHttpProxyTlsHandshakeServerLeg1Size, + WinHttpProxyTlsHandshakeClientLeg2Size, + WinHttpProxyTlsHandshakeServerLeg2Size, + WinHttpRequestStatLast, + WinHttpRequestStatMax = 32 +} WINHTTP_REQUEST_STAT_ENTRY; + +#define WINHTTP_REQUEST_STAT_FLAG_TCP_FAST_OPEN 0x00000001 +#define WINHTTP_REQUEST_STAT_FLAG_TLS_SESSION_RESUMPTION 0x00000002 +#define WINHTTP_REQUEST_STAT_FLAG_TLS_FALSE_START 0x00000004 +#define WINHTTP_REQUEST_STAT_FLAG_PROXY_TLS_SESSION_RESUMPTION 0x00000008 +#define WINHTTP_REQUEST_STAT_FLAG_PROXY_TLS_FALSE_START 0x00000010 +#define WINHTTP_REQUEST_STAT_FLAG_FIRST_REQUEST 0x00000020 + +typedef struct _WINHTTP_REQUEST_STATS +{ + ULONGLONG ullFlags; + ULONG ulIndex; + ULONG cStats; + ULONGLONG rgullStats[WinHttpRequestStatMax]; +} WINHTTP_REQUEST_STATS, *PWINHTTP_REQUEST_STATS; + #ifdef __cplusplus extern "C" { #endif @@ -561,10 +772,20 @@ BOOL WINAPI WinHttpCheckPlatform(void); BOOL WINAPI WinHttpCloseHandle(HINTERNET); HINTERNET WINAPI WinHttpConnect(HINTERNET,LPCWSTR,INTERNET_PORT,DWORD); BOOL WINAPI WinHttpCrackUrl(LPCWSTR,DWORD,DWORD,LPURL_COMPONENTS); +DWORD WINAPI WinHttpCreateProxyResolver(HINTERNET,HINTERNET*); BOOL WINAPI WinHttpCreateUrl(LPURL_COMPONENTS,DWORD,LPWSTR,LPDWORD); +VOID WINAPI WinHttpFreeProxyResult(WINHTTP_PROXY_RESULT*); +VOID WINAPI WinHttpFreeProxyResultEx(WINHTTP_PROXY_RESULT_EX*); +VOID WINAPI WinHttpFreeProxySettings(WINHTTP_PROXY_SETTINGS*); BOOL WINAPI WinHttpGetDefaultProxyConfiguration(WINHTTP_PROXY_INFO*); BOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG*); BOOL WINAPI WinHttpGetProxyForUrl(HINTERNET,LPCWSTR,WINHTTP_AUTOPROXY_OPTIONS*,WINHTTP_PROXY_INFO*); +DWORD WINAPI WinHttpGetProxyForUrlEx(HINTERNET,PCWSTR,WINHTTP_AUTOPROXY_OPTIONS*,DWORD_PTR); +DWORD WINAPI WinHttpGetProxyForUrlEx2(HINTERNET,PCWSTR,WINHTTP_AUTOPROXY_OPTIONS*,DWORD,BYTE*,DWORD_PTR); +DWORD WINAPI WinHttpGetProxyResult(HINTERNET,WINHTTP_PROXY_RESULT*); +DWORD WINAPI WinHttpGetProxyResultEx(HINTERNET,WINHTTP_PROXY_RESULT_EX*); +DWORD WINAPI WinHttpGetProxySettingsVersion(HINTERNET,DWORD*); +DWORD WINAPI WinHttpIsHostInProxyBypassList(const WINHTTP_PROXY_INFO*,PCWSTR,INTERNET_SCHEME,INTERNET_PORT,BOOL*); HINTERNET WINAPI WinHttpOpen(LPCWSTR,DWORD,LPCWSTR,LPCWSTR,DWORD); HINTERNET WINAPI WinHttpOpenRequest(HINTERNET,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR*,DWORD); BOOL WINAPI WinHttpQueryAuthParams(HINTERNET,DWORD,LPVOID*); @@ -573,7 +794,9 @@ BOOL WINAPI WinHttpQueryDataAvailable(HINTERNET,LPDWORD); BOOL WINAPI WinHttpQueryHeaders(HINTERNET,DWORD,LPCWSTR,LPVOID,LPDWORD,LPDWORD); BOOL WINAPI WinHttpQueryOption(HINTERNET,DWORD,LPVOID,LPDWORD); BOOL WINAPI WinHttpReadData(HINTERNET,LPVOID,DWORD,LPDWORD); +DWORD WINAPI WinHttpReadProxySettings(HINTERNET,PCWSTR,BOOL,BOOL,DWORD*,BOOL*,WINHTTP_PROXY_SETTINGS*); BOOL WINAPI WinHttpReceiveResponse(HINTERNET,LPVOID); +DWORD WINAPI WinHttpResetAutoProxy(HINTERNET,DWORD); BOOL WINAPI WinHttpSendRequest(HINTERNET,LPCWSTR,DWORD,LPVOID,DWORD,DWORD,DWORD_PTR); BOOL WINAPI WinHttpSetDefaultProxyConfiguration(WINHTTP_PROXY_INFO*); BOOL WINAPI WinHttpSetCredentials(HINTERNET,DWORD,DWORD,LPCWSTR,LPCWSTR,LPVOID); @@ -583,6 +806,7 @@ BOOL WINAPI WinHttpSetTimeouts(HINTERNET,int,int,int,int); BOOL WINAPI WinHttpTimeFromSystemTime(const SYSTEMTIME *,LPWSTR); BOOL WINAPI WinHttpTimeToSystemTime(LPCWSTR,SYSTEMTIME*); BOOL WINAPI WinHttpWriteData(HINTERNET,LPCVOID,DWORD,LPDWORD); +DWORD WINAPI WinHttpWriteProxySettings(HINTERNET,BOOL,WINHTTP_PROXY_SETTINGS*); #ifdef __cplusplus } -- 2.20.1

1 0

[PATCH 3/3] comctl32/tests: Add more tests for Static/SS_BITMAP control.
by Dmitry Timoshkov 10 Feb '20

10 Feb '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/tests/static.c | 58 +++++++++++++++++++++++++++++++----- 1 file changed, 51 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index 0b990d6b39..4efb768579 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -134,7 +134,20 @@ static void test_set_text(void) DestroyWindow(hStatic); } -static void test_image(HBITMAP image, BOOL is_dib, BOOL is_premult) +static void remove_alpha(HBITMAP hbitmap) +{ + BITMAP bm; + BYTE *ptr; + int i; + + GetObjectW(hbitmap, sizeof(bm), &bm); + ok(bm.bmBits != NULL, "bmBits is NULL\n"); + + for (i = 0, ptr = bm.bmBits; i < bm.bmWidth * bm.bmHeight; i++, ptr += 4) + ptr[3] = 0; +} + +static void test_image(HBITMAP image, BOOL is_dib, BOOL is_premult, BOOL is_alpha) { BITMAP bm; HDC hdc; @@ -153,9 +166,12 @@ static void test_image(HBITMAP image, BOOL is_dib, BOOL is_premult) todo_wine ok(bits[0] == 0x05 && bits[1] == 0x09 && bits[2] == 0x0e && bits[3] == 0x44, "bits: %02x %02x %02x %02x\n", bits[0], bits[1], bits[2], bits[3]); - else + else if (is_alpha) ok(bits[0] == 0x11 && bits[1] == 0x22 && bits[2] == 0x33 && bits[3] == 0x44, "bits: %02x %02x %02x %02x\n", bits[0], bits[1], bits[2], bits[3]); + else + ok(bits[0] == 0x11 && bits[1] == 0x22 && bits[2] == 0x33 && bits[3] == 0, + "bits: %02x %02x %02x %02x\n", bits[0], bits[1], bits[2], bits[3]); } else ok(bm.bmBits == NULL, "bmBits is not NULL\n"); @@ -180,9 +196,12 @@ todo_wine todo_wine ok(bits[0] == 0x05 && bits[1] == 0x09 && bits[2] == 0x0e && bits[3] == 0x44, "bits: %02x %02x %02x %02x\n", bits[0], bits[1], bits[2], bits[3]); - else + else if (is_alpha) ok(bits[0] == 0x11 && bits[1] == 0x22 && bits[2] == 0x33 && bits[3] == 0x44, "bits: %02x %02x %02x %02x\n", bits[0], bits[1], bits[2], bits[3]); + else + ok(bits[0] == 0x11 && bits[1] == 0x22 && bits[2] == 0x33 && bits[3] == 0, + "bits: %02x %02x %02x %02x\n", bits[0], bits[1], bits[2], bits[3]); } static void test_set_image(void) @@ -193,7 +212,7 @@ static void test_set_image(void) image = LoadImageW(GetModuleHandleW(NULL), MAKEINTRESOURCEW(IDB_BITMAP_1x1_32BPP), IMAGE_BITMAP, 0, 0, 0); ok(image != NULL, "LoadImage failed\n"); - test_image(image, FALSE, FALSE); + test_image(image, FALSE, FALSE, TRUE); bmp1 = (HBITMAP)SendMessageW(hwnd, STM_GETIMAGE, IMAGE_BITMAP, 0); ok(bmp1 == NULL, "got not NULL\n"); @@ -204,17 +223,42 @@ static void test_set_image(void) bmp1 = (HBITMAP)SendMessageW(hwnd, STM_GETIMAGE, IMAGE_BITMAP, 0); ok(bmp1 != NULL, "got NULL\n"); ok(bmp1 != image, "bmp == image\n"); - test_image(bmp1, TRUE, TRUE); + test_image(bmp1, TRUE, TRUE, TRUE); bmp2 = (HBITMAP)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM)image); ok(bmp2 != NULL, "got NULL\n"); ok(bmp2 != image, "bmp == image\n"); ok(bmp1 == bmp2, "bmp1 != bmp2\n"); - test_image(bmp2, TRUE, TRUE); + test_image(bmp2, TRUE, TRUE, TRUE); + + DeleteObject(image); + + image = LoadImageW(GetModuleHandleW(NULL), MAKEINTRESOURCEW(IDB_BITMAP_1x1_32BPP), IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION); + ok(image != NULL, "LoadImage failed\n"); + + test_image(image, TRUE, FALSE, TRUE); + remove_alpha(image); + test_image(image, TRUE, FALSE, FALSE); + + bmp1 = (HBITMAP)SendMessageW(hwnd, STM_GETIMAGE, IMAGE_BITMAP, 0); + ok(bmp1 != NULL, "got NULL\n"); + ok(bmp1 != image, "bmp == image\n"); + test_image(bmp1, TRUE, TRUE, TRUE); + + bmp2 = (HBITMAP)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM)image); + ok(bmp2 != NULL, "got NULL\n"); + ok(bmp2 != image, "bmp == image\n"); + ok(bmp1 == bmp2, "bmp1 != bmp2\n"); + test_image(bmp1, TRUE, TRUE, FALSE); + + bmp2 = (HBITMAP)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM)image); + ok(bmp2 != NULL, "got NULL\n"); + ok(bmp2 == image, "bmp1 != image\n"); + test_image(bmp2, TRUE, FALSE, FALSE); DestroyWindow(hwnd); - test_image(bmp2, TRUE, TRUE); + test_image(image, TRUE, FALSE, FALSE); DeleteObject(image); } -- 2.20.1

1 0

[PATCH 2/3] comctl32: Create an internal copy for 32-bpp bitmaps with an alpha channel for Static control.
by Dmitry Timoshkov 10 Feb '20

10 Feb '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/static.c | 79 ++++++++++++++++++++++++++++++++++-- dlls/comctl32/tests/static.c | 7 +--- 2 files changed, 77 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/static.c b/dlls/comctl32/static.c index d08710c06f..b3254e5761 100644 --- a/dlls/comctl32/static.c +++ b/dlls/comctl32/static.c @@ -60,6 +60,7 @@ struct static_extra_info HBITMAP hbitmap; HENHMETAFILE hemf; } image; + BOOL image_has_alpha; }; typedef void (*pfPaint)( HWND hwnd, HDC hdc, DWORD style ); @@ -163,6 +164,52 @@ static HICON STATIC_SetIcon( HWND hwnd, HICON hicon, DWORD style ) return prevIcon; } +static HBITMAP create_alpha_bitmap( HBITMAP hbitmap ) +{ + BITMAP bm; + HBITMAP alpha; + BITMAPINFO info; + HDC hdc; + void *bits; + DWORD i; + BYTE *ptr; + BOOL has_alpha = FALSE; + + GetObjectW( hbitmap, sizeof(bm), &bm ); + if (bm.bmBitsPixel != 32) return 0; + + if (!(hdc = CreateCompatibleDC( 0 ))) return 0; + + info.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info.bmiHeader.biWidth = bm.bmWidth; + info.bmiHeader.biHeight = -bm.bmHeight; + info.bmiHeader.biPlanes = 1; + info.bmiHeader.biBitCount = 32; + info.bmiHeader.biCompression = BI_RGB; + info.bmiHeader.biSizeImage = bm.bmWidth * bm.bmHeight * 4; + info.bmiHeader.biXPelsPerMeter = 0; + info.bmiHeader.biYPelsPerMeter = 0; + info.bmiHeader.biClrUsed = 0; + info.bmiHeader.biClrImportant = 0; + if ((alpha = CreateDIBSection( hdc, &info, DIB_RGB_COLORS, &bits, NULL, 0 ))) + { + GetDIBits( hdc, hbitmap, 0, bm.bmHeight, bits, &info, DIB_RGB_COLORS ); + + for (i = 0, ptr = bits; i < bm.bmWidth * bm.bmHeight; i++, ptr += 4) + if ((has_alpha = (ptr[3] != 0))) break; + + if (!has_alpha) + { + DeleteObject( alpha ); + alpha = 0; + } + } + + DeleteDC( hdc ); + + return alpha; +} + /*********************************************************************** * STATIC_SetBitmap * @@ -170,7 +217,7 @@ static HICON STATIC_SetIcon( HWND hwnd, HICON hicon, DWORD style ) */ static HBITMAP STATIC_SetBitmap( HWND hwnd, HBITMAP hBitmap, DWORD style ) { - HBITMAP hOldBitmap; + HBITMAP hOldBitmap, alpha; struct static_extra_info *extra; if ((style & SS_TYPEMASK) != SS_BITMAP) return 0; @@ -185,10 +232,23 @@ static HBITMAP STATIC_SetBitmap( HWND hwnd, HBITMAP hBitmap, DWORD style ) hOldBitmap = extra->image.hbitmap; extra->image.hbitmap = hBitmap; + extra->image_has_alpha = FALSE; + + if (hBitmap) + { + alpha = create_alpha_bitmap( hBitmap ); + if (alpha) + { + extra->image.hbitmap = alpha; + extra->image_has_alpha = TRUE; + } + } + if (hBitmap && !(style & SS_CENTERIMAGE) && !(style & SS_REALSIZECONTROL)) { BITMAP bm; GetObjectW(hBitmap, sizeof(bm), &bm); + /* Windows currently doesn't implement SS_RIGHTJUST */ /* if ((style & SS_RIGHTJUST) != 0) @@ -386,7 +446,12 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, if (style == SS_ICON) { struct static_extra_info *extra = get_extra_ptr( hwnd, FALSE ); - heap_free( extra ); + if (extra) + { + if (extra->image_has_alpha) + DeleteObject( extra->image.hbitmap ); + heap_free( extra ); + } /* * FIXME * DestroyIcon32( STATIC_SetIcon( wndPtr, 0 ) ); @@ -765,6 +830,8 @@ static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style ) BITMAP bm; RECT rcClient; LOGBRUSH brush; + BLENDFUNCTION blend = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA }; + struct static_extra_info *extra = get_extra_ptr( hwnd, FALSE ); GetObjectW(hBitmap, sizeof(bm), &bm); oldbitmap = SelectObject(hMemDC, hBitmap); @@ -785,7 +852,13 @@ static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style ) rcClient.right = rcClient.left + bm.bmWidth; rcClient.bottom = rcClient.top + bm.bmHeight; } - StretchBlt(hdc, rcClient.left, rcClient.top, rcClient.right - rcClient.left, + + if (extra->image_has_alpha) + GdiAlphaBlend(hdc, rcClient.left, rcClient.top, rcClient.right - rcClient.left, + rcClient.bottom - rcClient.top, hMemDC, + 0, 0, bm.bmWidth, bm.bmHeight, blend); + else + StretchBlt(hdc, rcClient.left, rcClient.top, rcClient.right - rcClient.left, rcClient.bottom - rcClient.top, hMemDC, 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY); SelectObject(hMemDC, oldbitmap); diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index 0e44c4ed7a..0b990d6b39 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -147,18 +147,15 @@ static void test_image(HBITMAP image, BOOL is_dib, BOOL is_premult) ok(bm.bmBitsPixel == 32, "got %d\n", bm.bmBitsPixel); if (is_dib) { -todo_wine ok(bm.bmBits != NULL, "bmBits is NULL\n"); -if (bm.bmBits) -{ memcpy(bits, bm.bmBits, 4); if (is_premult) +todo_wine ok(bits[0] == 0x05 && bits[1] == 0x09 && bits[2] == 0x0e && bits[3] == 0x44, "bits: %02x %02x %02x %02x\n", bits[0], bits[1], bits[2], bits[3]); else ok(bits[0] == 0x11 && bits[1] == 0x22 && bits[2] == 0x33 && bits[3] == 0x44, "bits: %02x %02x %02x %02x\n", bits[0], bits[1], bits[2], bits[3]); -} } else ok(bm.bmBits == NULL, "bmBits is not NULL\n"); @@ -206,13 +203,11 @@ static void test_set_image(void) bmp1 = (HBITMAP)SendMessageW(hwnd, STM_GETIMAGE, IMAGE_BITMAP, 0); ok(bmp1 != NULL, "got NULL\n"); -todo_wine ok(bmp1 != image, "bmp == image\n"); test_image(bmp1, TRUE, TRUE); bmp2 = (HBITMAP)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM)image); ok(bmp2 != NULL, "got NULL\n"); -todo_wine ok(bmp2 != image, "bmp == image\n"); ok(bmp1 == bmp2, "bmp1 != bmp2\n"); test_image(bmp2, TRUE, TRUE); -- 2.20.1

1 0

[PATCH 1/3] comctl32: Switch to using a structure for extra storage.
by Dmitry Timoshkov 10 Feb '20

10 Feb '20

These patches aim to fix the bug 47018. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/static.c | 92 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 76 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/static.c b/dlls/comctl32/static.c index 5cc02ced97..d08710c06f 100644 --- a/dlls/comctl32/static.c +++ b/dlls/comctl32/static.c @@ -36,6 +36,7 @@ #include "winuser.h" #include "commctrl.h" +#include "wine/heap.h" #include "wine/debug.h" #include "comctl32.h" @@ -50,10 +51,16 @@ static void STATIC_PaintBitmapfn( HWND hwnd, HDC hdc, DWORD style ); static void STATIC_PaintEnhMetafn( HWND hwnd, HDC hdc, DWORD style ); static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, DWORD style ); -/* offsets for GetWindowLong for static private information */ -#define HFONT_GWL_OFFSET 0 -#define HICON_GWL_OFFSET (sizeof(HFONT)) -#define STATIC_EXTRA_BYTES (HICON_GWL_OFFSET + sizeof(HICON)) +struct static_extra_info +{ + HFONT hfont; + union + { + HICON hicon; + HBITMAP hbitmap; + HENHMETAFILE hemf; + } image; +}; typedef void (*pfPaint)( HWND hwnd, HDC hdc, DWORD style ); @@ -80,6 +87,18 @@ static const pfPaint staticPaintFunc[SS_TYPEMASK+1] = STATIC_PaintEtchedfn, /* SS_ETCHEDFRAME */ }; +static struct static_extra_info *get_extra_ptr( HWND hwnd, BOOL force ) +{ + struct static_extra_info *extra = (struct static_extra_info *)GetWindowLongPtrW( hwnd, 0 ); + if (!extra && force) + { + extra = heap_alloc_zero( sizeof(*extra) ); + if (extra) + SetWindowLongPtrW( hwnd, 0, (ULONG_PTR)extra ); + } + return extra; +} + static BOOL get_icon_size( HICON handle, SIZE *size ) { ICONINFO info; @@ -111,6 +130,7 @@ static HICON STATIC_SetIcon( HWND hwnd, HICON hicon, DWORD style ) { HICON prevIcon; SIZE size; + struct static_extra_info *extra; if ((style & SS_TYPEMASK) != SS_ICON) return 0; if (hicon && !get_icon_size( hicon, &size )) @@ -118,7 +138,12 @@ static HICON STATIC_SetIcon( HWND hwnd, HICON hicon, DWORD style ) WARN("hicon != 0, but invalid\n"); return 0; } - prevIcon = (HICON)SetWindowLongPtrW( hwnd, HICON_GWL_OFFSET, (LONG_PTR)hicon ); + + extra = get_extra_ptr( hwnd, TRUE ); + if (!extra) return 0; + + prevIcon = extra->image.hicon; + extra->image.hicon = hicon; if (hicon && !(style & SS_CENTERIMAGE) && !(style & SS_REALSIZECONTROL)) { /* Windows currently doesn't implement SS_RIGHTJUST */ @@ -146,6 +171,7 @@ static HICON STATIC_SetIcon( HWND hwnd, HICON hicon, DWORD style ) static HBITMAP STATIC_SetBitmap( HWND hwnd, HBITMAP hBitmap, DWORD style ) { HBITMAP hOldBitmap; + struct static_extra_info *extra; if ((style & SS_TYPEMASK) != SS_BITMAP) return 0; if (hBitmap && GetObjectType(hBitmap) != OBJ_BITMAP) @@ -153,7 +179,12 @@ static HBITMAP STATIC_SetBitmap( HWND hwnd, HBITMAP hBitmap, DWORD style ) WARN("hBitmap != 0, but it's not a bitmap\n"); return 0; } - hOldBitmap = (HBITMAP)SetWindowLongPtrW( hwnd, HICON_GWL_OFFSET, (LONG_PTR)hBitmap ); + + extra = get_extra_ptr( hwnd, TRUE ); + if (!extra) return 0; + + hOldBitmap = extra->image.hbitmap; + extra->image.hbitmap = hBitmap; if (hBitmap && !(style & SS_CENTERIMAGE) && !(style & SS_REALSIZECONTROL)) { BITMAP bm; @@ -183,13 +214,23 @@ static HBITMAP STATIC_SetBitmap( HWND hwnd, HBITMAP hBitmap, DWORD style ) */ static HENHMETAFILE STATIC_SetEnhMetaFile( HWND hwnd, HENHMETAFILE hEnhMetaFile, DWORD style ) { + HENHMETAFILE old_hemf; + struct static_extra_info *extra; + if ((style & SS_TYPEMASK) != SS_ENHMETAFILE) return 0; if (hEnhMetaFile && GetObjectType(hEnhMetaFile) != OBJ_ENHMETAFILE) { WARN("hEnhMetaFile != 0, but it's not an enhanced metafile\n"); return 0; } - return (HENHMETAFILE)SetWindowLongPtrW( hwnd, HICON_GWL_OFFSET, (LONG_PTR)hEnhMetaFile ); + + extra = get_extra_ptr( hwnd, TRUE ); + if (!extra) return 0; + + old_hemf = extra->image.hemf; + extra->image.hemf = hEnhMetaFile; + + return old_hemf; } /*********************************************************************** @@ -200,6 +241,8 @@ static HENHMETAFILE STATIC_SetEnhMetaFile( HWND hwnd, HENHMETAFILE hEnhMetaFile, */ static HANDLE STATIC_GetImage( HWND hwnd, WPARAM wParam, DWORD style ) { + struct static_extra_info *extra; + switch (style & SS_TYPEMASK) { case SS_ICON: @@ -215,7 +258,22 @@ static HANDLE STATIC_GetImage( HWND hwnd, WPARAM wParam, DWORD style ) default: return NULL; } - return (HANDLE)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET ); + + extra = get_extra_ptr( hwnd, FALSE ); + return extra ? extra->image.hbitmap : 0; +} + +static void STATIC_SetFont( HWND hwnd, HFONT hfont ) +{ + struct static_extra_info *extra = get_extra_ptr( hwnd, TRUE ); + if (extra) + extra->hfont = hfont; +} + +static HFONT STATIC_GetFont( HWND hwnd ) +{ + struct static_extra_info *extra = get_extra_ptr( hwnd, FALSE ); + return extra ? extra->hfont : 0; } /*********************************************************************** @@ -327,6 +385,8 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, case WM_NCDESTROY: if (style == SS_ICON) { + struct static_extra_info *extra = get_extra_ptr( hwnd, FALSE ); + heap_free( extra ); /* * FIXME * DestroyIcon32( STATIC_SetIcon( wndPtr, 0 ) ); @@ -423,14 +483,14 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, case WM_SETFONT: if (hasTextStyle( full_style )) { - SetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET, wParam ); + STATIC_SetFont( hwnd, (HFONT)wParam ); if (LOWORD(lParam)) RedrawWindow( hwnd, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ALLCHILDREN ); } break; case WM_GETFONT: - return GetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET ); + return (LRESULT)STATIC_GetFont( hwnd ); case WM_NCHITTEST: if (full_style & SS_NOTIFY) @@ -508,7 +568,7 @@ static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style ) dis.itemData = 0; GetClientRect( hwnd, &dis.rcItem ); - font = (HFONT)GetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET ); + font = STATIC_GetFont( hwnd ); if (font) oldFont = SelectObject( hdc, font ); SendMessageW( GetParent(hwnd), WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd ); SendMessageW( GetParent(hwnd), WM_DRAWITEM, id, (LPARAM)&dis ); @@ -572,7 +632,7 @@ static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, DWORD style ) format |= DT_SINGLELINE | DT_WORD_ELLIPSIS; } - if ((hFont = (HFONT)GetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET ))) + if ((hFont = STATIC_GetFont( hwnd ))) hOldFont = SelectObject( hdc, hFont ); /* SS_SIMPLE controls: WM_CTLCOLORSTATIC is sent, but the returned @@ -668,7 +728,7 @@ static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, DWORD style ) GetClientRect( hwnd, &rc ); hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); - hIcon = (HICON)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET ); + hIcon = STATIC_GetImage( hwnd, IMAGE_ICON, style ); if (!hIcon || !get_icon_size( hIcon, &size )) { FillRect(hdc, &rc, hbrush); @@ -698,7 +758,7 @@ static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style ) hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); - if ((hBitmap = (HBITMAP)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET )) + if ((hBitmap = STATIC_GetImage( hwnd, IMAGE_BITMAP, style )) && (GetObjectType(hBitmap) == OBJ_BITMAP) && (hMemDC = CreateCompatibleDC( hdc ))) { @@ -742,7 +802,7 @@ static void STATIC_PaintEnhMetafn(HWND hwnd, HDC hdc, DWORD style ) GetClientRect(hwnd, &rc); hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); FillRect(hdc, &rc, hbrush); - if ((hEnhMetaFile = (HENHMETAFILE)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET ))) + if ((hEnhMetaFile = STATIC_GetImage( hwnd, IMAGE_ENHMETAFILE, style ))) { /* The control's current font is not selected into the device context! */ @@ -779,7 +839,7 @@ void STATIC_Register(void) wndClass.style = CS_DBLCLKS | CS_PARENTDC | CS_GLOBALCLASS; wndClass.lpfnWndProc = STATIC_WindowProc; wndClass.cbClsExtra = 0; - wndClass.cbWndExtra = STATIC_EXTRA_BYTES; + wndClass.cbWndExtra = sizeof(struct static_extra_info *); wndClass.hCursor = LoadCursorW(0, (LPWSTR)IDC_ARROW); wndClass.hbrBackground = NULL; wndClass.lpszClassName = WC_STATICW; -- 2.20.1

1 0

[PATCH 3/5] wined3d: Introduce wined3d_adapter_get_output_count().
by Zhiyi Zhang 10 Feb '20

10 Feb '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/adapter.c | 4 +++- dlls/wined3d/directx.c | 12 ++++++++++++ dlls/wined3d/wined3d.spec | 2 ++ include/wine/wined3d.h | 2 ++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index d2fc629c84..477f19f3f4 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -124,11 +124,13 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac { struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); struct dxgi_output *output_object; + UINT output_count; HRESULT hr; TRACE("iface %p, output_idx %u, output %p.\n", iface, output_idx, output); - if (output_idx > 0) + hr = wined3d_adapter_get_output_count(adapter->factory->wined3d, adapter->ordinal, &output_count); + if (FAILED(hr) || output_idx >= output_count) { *output = NULL; return DXGI_ERROR_NOT_FOUND; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e6abd139d0..10bbfa4c54 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -899,6 +899,18 @@ UINT CDECL wined3d_get_output_count(const struct wined3d *wined3d) return wined3d->output_count; } +HRESULT CDECL wined3d_adapter_get_output_count(const struct wined3d *wined3d, UINT adapter_idx, UINT *count) +{ + TRACE("wined3d %p, adapter_idx %u, count %p.\n", wined3d, adapter_idx, count); + + if (adapter_idx >= wined3d->adapter_count) + return WINED3DERR_INVALIDCALL; + + *count = wined3d->adapters[adapter_idx]->output_count; + TRACE("reporting %u outputs for adapter %u.\n", *count, adapter_idx); + return WINED3D_OK; +} + HRESULT CDECL wined3d_register_software_device(struct wined3d *wined3d, void *init_function) { FIXME("wined3d %p, init_function %p stub!\n", wined3d, init_function); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 2cd66ec215..7e13e19891 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -26,6 +26,8 @@ @ cdecl wined3d_set_adapter_display_mode(ptr long ptr) @ cdecl wined3d_unregister_windows(ptr) +@ cdecl wined3d_adapter_get_output_count(ptr long ptr) + @ cdecl wined3d_blend_state_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_blend_state_decref(ptr) @ cdecl wined3d_blend_state_get_parent(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 925d4111d9..f676871b25 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2283,6 +2283,8 @@ HRESULT __cdecl wined3d_set_adapter_display_mode(struct wined3d *wined3d, UINT adapter_idx, const struct wined3d_display_mode *mode); void __cdecl wined3d_unregister_windows(struct wined3d *wined3d); +HRESULT __cdecl wined3d_adapter_get_output_count(const struct wined3d *wined3d, UINT adapter_idx, UINT *count); + HRESULT __cdecl wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer); -- 2.20.1

1 0

[PATCH 2/5] wined3d: Introduce wined3d_get_output_count().
by Zhiyi Zhang 10 Feb '20

10 Feb '20

For D3D9 and older, adapters are actually outputs. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/directx.c | 2 +- dlls/d3d9/directx.c | 2 +- dlls/wined3d/directx.c | 7 +++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index d1f8872d12..256fcf4e29 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -98,7 +98,7 @@ static UINT WINAPI d3d8_GetAdapterCount(IDirect3D8 *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - count = wined3d_get_adapter_count(d3d8->wined3d); + count = wined3d_get_output_count(d3d8->wined3d); wined3d_mutex_unlock(); return count; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index b552c3b910..9a48b5c7c2 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -113,7 +113,7 @@ static UINT WINAPI d3d9_GetAdapterCount(IDirect3D9Ex *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - ret = wined3d_get_adapter_count(d3d9->wined3d); + ret = wined3d_get_output_count(d3d9->wined3d); wined3d_mutex_unlock(); return ret; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3d676f7e10..e6abd139d0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -892,6 +892,13 @@ UINT CDECL wined3d_get_adapter_count(const struct wined3d *wined3d) return wined3d->adapter_count; } +UINT CDECL wined3d_get_output_count(const struct wined3d *wined3d) +{ + TRACE("wined3d %p, reporting %u outputs.\n", wined3d, wined3d->output_count); + + return wined3d->output_count; +} + HRESULT CDECL wined3d_register_software_device(struct wined3d *wined3d, void *init_function) { FIXME("wined3d %p, init_function %p stub!\n", wined3d, init_function); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index c8ef442c72..2cd66ec215 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -18,6 +18,7 @@ @ cdecl wined3d_get_adapter_output(ptr long ptr) @ cdecl wined3d_get_adapter_raster_status(ptr long ptr) @ cdecl wined3d_get_device_caps(ptr long long ptr) +@ cdecl wined3d_get_output_count(ptr) @ cdecl wined3d_get_output_desc(ptr long ptr) @ cdecl wined3d_incref(ptr) @ cdecl wined3d_register_software_device(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d313c7aec8..925d4111d9 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2272,6 +2272,7 @@ HRESULT __cdecl wined3d_get_adapter_raster_status(const struct wined3d *wined3d, struct wined3d_raster_status *raster_status); HRESULT __cdecl wined3d_get_device_caps(const struct wined3d *wined3d, unsigned int adapter_idx, enum wined3d_device_type device_type, struct wined3d_caps *caps); +UINT __cdecl wined3d_get_output_count(const struct wined3d *wined3d); HRESULT __cdecl wined3d_get_output_desc(const struct wined3d *wined3d, unsigned int adapter_idx, struct wined3d_output_desc *desc); ULONG __cdecl wined3d_incref(struct wined3d *wined3d); -- 2.20.1

1 0

← Newer
1
...
51
52
53
54
55
56
57
...
75
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-devel February 2020