- wine-devel - winehq.org

[PATCH 5/6] d3d8: Do not set WINED3D_TEXTURE_CREATE_MAPPABLE for swapchain textures.
by Henri Verbeet 08 Nov '18

08 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/device.c | 5 ++--- dlls/d3d8/tests/device.c | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index b05df7e2914..1d7e3dfc387 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3329,9 +3329,8 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic TRACE("device_parent %p, container_parent %p, desc %p, texture flags %#x, texture %p.\n", device_parent, container_parent, desc, texture_flags, texture); - if (FAILED(hr = wined3d_texture_create(device->wined3d_device, desc, 1, 1, - texture_flags | WINED3D_TEXTURE_CREATE_MAPPABLE, NULL, &device->IDirect3DDevice8_iface, - &d3d8_null_wined3d_parent_ops, texture))) + if (FAILED(hr = wined3d_texture_create(device->wined3d_device, desc, 1, 1, texture_flags, + NULL, &device->IDirect3DDevice8_iface, &d3d8_null_wined3d_parent_ops, texture))) { WARN("Failed to create texture, hr %#x.\n", hr); return hr; diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index aec35ce22f0..8495342c0d3 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8460,7 +8460,6 @@ todo_wine ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); hr = IDirect3DSurface8_LockRect(surface, &lockrect, NULL, D3DLOCK_READONLY); -todo_wine ok(SUCCEEDED(hr), "Failed to lock rect, hr %#x.\n", hr); hr = IDirect3DSurface8_UnlockRect(surface); ok(SUCCEEDED(hr), "Failed to unlock rect, hr %#x.\n", hr); -- 2.11.0

2 1

[PATCH 4/6] d3d9: Translate E_INVALIDARG to D3DERR_INVALIDCALL in d3d9_surface_LockRect().
by Henri Verbeet 08 Nov '18

08 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/surface.c | 2 ++ dlls/d3d9/tests/device.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 50c035d93c7..7d4d93b5e8f 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -258,6 +258,8 @@ static HRESULT WINAPI d3d9_surface_LockRect(IDirect3DSurface9 *iface, locked_rect->pBits = map_desc.data; } + if (hr == E_INVALIDARG) + return D3DERR_INVALIDCALL; return hr; } diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 56f7a4357ba..aba083c7754 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12103,7 +12103,6 @@ static void test_lockable_backbuffer(void) ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); hr = IDirect3DSurface9_LockRect(surface, &lockrect, NULL, D3DLOCK_DISCARD); -todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); dc = (void *)0xdeadbeef; -- 2.11.0

2 1

[PATCH 3/6] d3d9: Do not set WINED3D_TEXTURE_CREATE_MAPPABLE for swapchain textures.
by Henri Verbeet 08 Nov '18

08 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/device.c | 3 +-- dlls/d3d9/tests/device.c | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index d6faa97f7a5..0cf204990bd 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -4184,8 +4184,7 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic container_parent = &device->IDirect3DDevice9Ex_iface; if (FAILED(hr = wined3d_texture_create(device->wined3d_device, desc, 1, 1, - texture_flags | WINED3D_TEXTURE_CREATE_MAPPABLE, NULL, container_parent, - &d3d9_null_wined3d_parent_ops, texture))) + texture_flags, NULL, container_parent, &d3d9_null_wined3d_parent_ops, texture))) { WARN("Failed to create texture, hr %#x.\n", hr); return hr; diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index e789107a34a..56f7a4357ba 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12131,7 +12131,6 @@ todo_wine ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); hr = IDirect3DSurface9_LockRect(surface, &lockrect, NULL, D3DLOCK_DISCARD); -todo_wine ok(SUCCEEDED(hr), "Failed to lock rect, hr %#x.\n", hr); hr = IDirect3DSurface9_UnlockRect(surface); ok(SUCCEEDED(hr), "Failed to unlock rect, hr %#x.\n", hr); -- 2.11.0

2 1

[PATCH 2/6] d3d9: Only set WINED3D_SWAPCHAIN_GDI_COMPATIBLE on mappable swapchains.
by Henri Verbeet 08 Nov '18

08 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index eaf162c7da3..d6faa97f7a5 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -346,10 +346,11 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch = wined3dformat_from_d3dformat(present_parameters->AutoDepthStencilFormat); swapchain_desc->flags = (present_parameters->Flags & D3DPRESENTFLAGS_MASK) | WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH; - if (is_gdi_compat_wined3dformat(swapchain_desc->backbuffer_format) + if ((present_parameters->Flags & D3DPRESENTFLAG_LOCKABLE_BACKBUFFER) + && (is_gdi_compat_wined3dformat(swapchain_desc->backbuffer_format) /* WINED3DFMT_UNKNOWN creates the swapchain with the current * display format, which is always GDI-compatible. */ - || swapchain_desc->backbuffer_format == WINED3DFMT_UNKNOWN) + || swapchain_desc->backbuffer_format == WINED3DFMT_UNKNOWN)) swapchain_desc->flags |= WINED3D_SWAPCHAIN_GDI_COMPATIBLE; swapchain_desc->refresh_rate = present_parameters->FullScreen_RefreshRateInHz; swapchain_desc->auto_restore_display_mode = TRUE; -- 2.11.0

2 1

[PATCH 1/6] wined3d: Respect WINED3D_SWAPCHAIN_LOCKABLE_BACKBUFFER.
by Henri Verbeet 08 Nov '18

08 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 5 +++++ dlls/wined3d/swapchain.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3697b8f0005..b1a322e33de 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4756,6 +4756,11 @@ static void update_swapchain_flags(struct wined3d_texture *texture) { unsigned int flags = texture->swapchain->desc.flags; + if (flags & WINED3D_SWAPCHAIN_LOCKABLE_BACKBUFFER) + texture->resource.access |= WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + else + texture->resource.access &= ~(WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W); + if (flags & WINED3D_SWAPCHAIN_GDI_COMPATIBLE) texture->flags |= WINED3D_TEXTURE_GET_DC; else diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 499e1631f18..b95623be7ca 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -838,6 +838,8 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 texture_desc.usage |= WINED3DUSAGE_OWNDC; texture_desc.bind_flags = 0; texture_desc.access = WINED3D_RESOURCE_ACCESS_GPU; + if (swapchain->desc.flags & WINED3D_SWAPCHAIN_LOCKABLE_BACKBUFFER) + texture_desc.access |= WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; texture_desc.width = swapchain->desc.backbuffer_width; texture_desc.height = swapchain->desc.backbuffer_height; texture_desc.depth = 1; @@ -947,6 +949,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 texture_desc.format = swapchain->desc.auto_depth_stencil_format; texture_desc.usage = 0; texture_desc.bind_flags = WINED3D_BIND_DEPTH_STENCIL; + texture_desc.access = WINED3D_RESOURCE_ACCESS_GPU; if (FAILED(hr = device->device_parent->ops->create_swapchain_texture(device->device_parent, device->device_parent, &texture_desc, 0, &ds))) -- 2.11.0

1 0

[PATCH 3/3] gdiplus: Add 4bppIndexed to the list of supported formats. (rebased)
by Akihiro Sagawa 08 Nov '18

08 Nov '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdiplus/image.c | 1 + dlls/gdiplus/tests/image.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)

2 1

[PATCH 1/3] [v3] gdiplus/tests: Add more PNG color format tests.
by Akihiro Sagawa 08 Nov '18

08 Nov '18

In v3, - win_skip tests if broken gdiplus is used. - Remove ugly broken() conditions. - Use a private chunk name instead of standard chunk name. Thanks for Vincent's review and comments. In v2, - Fix test failures on broken XP, Vista, 2003. - Fix the expected value for 1bpp gray scale image with tRNS chunk. - Introduce color_space_mask to test other color space flags aren't set. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdiplus/tests/image.c | 229 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 188 insertions(+), 41 deletions(-)

2 1

[PATCH 2/3] [v2] gdiplus: Convert to 32bppARGB when PNG image with transparency chunk is loaded. (rebased)
by Akihiro Sagawa 08 Nov '18

08 Nov '18

In v2, - Seek tRNS chunk from the stream instead of scanning a palette for better compatiblities. - Reword a commit message. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44409 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdiplus/image.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/image.c | 10 +++++----- 2 files changed, 46 insertions(+), 5 deletions(-)

2 1

[PATCH 1/2] wincodecs: Implement CreateBitmapFromSourceRect().
by Nikolay Sivov 08 Nov '18

08 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/windowscodecs/imgfactory.c | 46 +++++++++++++++++++++++----- dlls/windowscodecs/tests/bitmap.c | 51 +++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index dbcc5f5923..78919a7387 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -486,9 +486,8 @@ static HRESULT WINAPI ImagingFactory_CreateBitmap(IWICImagingFactory2 *iface, return BitmapImpl_Create(uiWidth, uiHeight, 0, 0, NULL, 0, pixelFormat, option, ppIBitmap); } -static HRESULT WINAPI ImagingFactory_CreateBitmapFromSource(IWICImagingFactory2 *iface, - IWICBitmapSource *piBitmapSource, WICBitmapCreateCacheOption option, - IWICBitmap **ppIBitmap) +static HRESULT create_bitmap_from_source_rect(IWICBitmapSource *piBitmapSource, const WICRect *rect, + WICBitmapCreateCacheOption option, IWICBitmap **ppIBitmap) { IWICBitmap *result; IWICBitmapLock *lock; @@ -502,13 +501,20 @@ static HRESULT WINAPI ImagingFactory_CreateBitmapFromSource(IWICImagingFactory2 IWICPixelFormatInfo2 *formatinfo; WICPixelFormatNumericRepresentation format_type; - TRACE("(%p,%p,%u,%p)\n", iface, piBitmapSource, option, ppIBitmap); - if (!piBitmapSource || !ppIBitmap) return E_INVALIDARG; hr = IWICBitmapSource_GetSize(piBitmapSource, &width, &height); + if (SUCCEEDED(hr) && rect) + { + if (rect->X >= width || rect->Y >= height || rect->Width == 0 || rect->Height == 0) + return E_INVALIDARG; + + width = min(width - rect->X, rect->Width); + height = min(height - rect->Y, rect->Height); + } + if (SUCCEEDED(hr)) hr = IWICBitmapSource_GetPixelFormat(piBitmapSource, &pixelformat); @@ -539,7 +545,14 @@ static HRESULT WINAPI ImagingFactory_CreateBitmapFromSource(IWICImagingFactory2 { UINT stride, buffersize; BYTE *buffer; - rc.X = rc.Y = 0; + + if (rect) + { + rc.X = rect->X; + rc.Y = rect->Y; + } + else + rc.X = rc.Y = 0; rc.Width = width; rc.Height = height; @@ -592,13 +605,30 @@ static HRESULT WINAPI ImagingFactory_CreateBitmapFromSource(IWICImagingFactory2 return hr; } +static HRESULT WINAPI ImagingFactory_CreateBitmapFromSource(IWICImagingFactory2 *iface, + IWICBitmapSource *piBitmapSource, WICBitmapCreateCacheOption option, + IWICBitmap **ppIBitmap) +{ + TRACE("(%p,%p,%u,%p)\n", iface, piBitmapSource, option, ppIBitmap); + + return create_bitmap_from_source_rect(piBitmapSource, NULL, option, ppIBitmap); +} + static HRESULT WINAPI ImagingFactory_CreateBitmapFromSourceRect(IWICImagingFactory2 *iface, IWICBitmapSource *piBitmapSource, UINT x, UINT y, UINT width, UINT height, IWICBitmap **ppIBitmap) { - FIXME("(%p,%p,%u,%u,%u,%u,%p): stub\n", iface, piBitmapSource, x, y, width, + WICRect rect; + + TRACE("(%p,%p,%u,%u,%u,%u,%p)\n", iface, piBitmapSource, x, y, width, height, ppIBitmap); - return E_NOTIMPL; + + rect.X = x; + rect.Y = y; + rect.Width = width; + rect.Height = height; + + return create_bitmap_from_source_rect(piBitmapSource, &rect, WICBitmapCacheOnLoad, ppIBitmap); } static HRESULT WINAPI ImagingFactory_CreateBitmapFromMemory(IWICImagingFactory2 *iface, diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 6e01f0b1d1..61e985a19a 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -452,6 +452,20 @@ static void test_createbitmapfromsource(void) hr = IWICBitmap_SetResolution(bitmap, 12.0, 34.0); ok(hr == S_OK, "IWICBitmap_SetResolution failed hr=%x\n", hr); + /* WICBitmapNoCache */ + hr = IWICImagingFactory_CreateBitmapFromSource(factory, (IWICBitmapSource *)bitmap, + WICBitmapNoCache, &bitmap2); + ok(hr == S_OK, "IWICImagingFactory_CreateBitmapFromSource failed hr=%x\n", hr); +todo_wine + ok(bitmap2 == bitmap, "Unexpected bitmap instance.\n"); + + IWICBitmap_Release(bitmap2); + + bitmap2 = (void *)0xdeadbeef; + hr = IWICImagingFactory_CreateBitmapFromSource(factory, &bitmapsource, WICBitmapNoCache, &bitmap2); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(bitmap2 == (void *)0xdeadbeef, "Unexpected pointer %p.\n", bitmap2); + hr = IWICImagingFactory_CreateBitmapFromSource(factory, (IWICBitmapSource*)bitmap, WICBitmapCacheOnLoad, &bitmap2); ok(hr == S_OK, "IWICImagingFactory_CreateBitmapFromSource failed hr=%x\n", hr); @@ -538,6 +552,43 @@ static void test_createbitmapfromsource(void) ok(width == 3, "got %d, expected 3\n", width); ok(height == 3, "got %d, expected 3\n", height); + /* CreateBitmapFromSourceRect */ + hr = IWICImagingFactory_CreateBitmapFromSourceRect(factory, (IWICBitmapSource *)bitmap2, 0, 0, 16, 32, &bitmap); + ok(hr == S_OK, "Failed to create a bitmap, hr %#x.\n", hr); + hr = IWICBitmap_GetSize(bitmap, &width, &height); + ok(hr == S_OK, "Failed to get bitmap size, hr %#x.\n", hr); + ok(width == 3, "Unexpected width %u.\n", width); + ok(height == 3, "Unexpected height %u.\n", height); + IWICBitmap_Release(bitmap); + + hr = IWICImagingFactory_CreateBitmapFromSourceRect(factory, (IWICBitmapSource *)bitmap2, 0, 0, 1, 1, &bitmap); + ok(hr == S_OK, "Failed to create a bitmap, hr %#x.\n", hr); + hr = IWICBitmap_GetSize(bitmap, &width, &height); + ok(hr == S_OK, "Failed to get bitmap size, hr %#x.\n", hr); + ok(width == 1, "Unexpected width %u.\n", width); + ok(height == 1, "Unexpected height %u.\n", height); + IWICBitmap_Release(bitmap); + + hr = IWICImagingFactory_CreateBitmapFromSourceRect(factory, (IWICBitmapSource *)bitmap2, 2, 1, 16, 32, &bitmap); + ok(hr == S_OK, "Failed to create a bitmap, hr %#x.\n", hr); + hr = IWICBitmap_GetSize(bitmap, &width, &height); + ok(hr == S_OK, "Failed to get bitmap size, hr %#x.\n", hr); + ok(width == 1, "Unexpected width %u.\n", width); + ok(height == 2, "Unexpected height %u.\n", height); + IWICBitmap_Release(bitmap); + + hr = IWICImagingFactory_CreateBitmapFromSourceRect(factory, (IWICBitmapSource *)bitmap2, 0, 0, 0, 2, &bitmap); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IWICImagingFactory_CreateBitmapFromSourceRect(factory, (IWICBitmapSource *)bitmap2, 0, 0, 2, 0, &bitmap); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IWICImagingFactory_CreateBitmapFromSourceRect(factory, (IWICBitmapSource *)bitmap2, 1, 3, 16, 32, &bitmap); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IWICImagingFactory_CreateBitmapFromSourceRect(factory, (IWICBitmapSource *)bitmap2, 3, 1, 16, 32, &bitmap); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IWICBitmap_Release(bitmap2); } -- 2.19.1

2 3

[PATCH] make_specfiles: Add extra group for api-ms-win-core-synch-*
by Fabian Maurer 08 Nov '18

08 Nov '18

This is needed since functions from kernelbase are used. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- .../api-ms-win-core-synch-l1-2-0.spec | 6 +++--- .../api-ms-win-core-synch-l1-2-1.spec | 6 +++--- tools/make_specfiles | 10 +++++++--- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-core-synch-l1-2-0/api-ms-win-core-synch-l1-2-0.spec b/dlls/api-ms-win-core-synch-l1-2-0/api-ms-win-core-synch-l1-2-0.spec index d35fe78481..84beb975a2 100644 --- a/dlls/api-ms-win-core-synch-l1-2-0/api-ms-win-core-synch-l1-2-0.spec +++ b/dlls/api-ms-win-core-synch-l1-2-0/api-ms-win-core-synch-l1-2-0.spec @@ -51,8 +51,8 @@ @ stdcall WaitForMultipleObjectsEx(long ptr long long long) kernel32.WaitForMultipleObjectsEx @ stdcall WaitForSingleObject(long long) kernel32.WaitForSingleObject @ stdcall WaitForSingleObjectEx(long long long) kernel32.WaitForSingleObjectEx -@ stub WaitOnAddress +@ stdcall WaitOnAddress(ptr ptr long long) kernelbase.WaitOnAddress @ stdcall WakeAllConditionVariable(ptr) kernel32.WakeAllConditionVariable -@ stub WakeByAddressAll -@ stub WakeByAddressSingle +@ stdcall WakeByAddressAll(ptr) kernelbase.WakeByAddressAll +@ stdcall WakeByAddressSingle(ptr) kernelbase.WakeByAddressSingle @ stdcall WakeConditionVariable(ptr) kernel32.WakeConditionVariable diff --git a/dlls/api-ms-win-core-synch-l1-2-1/api-ms-win-core-synch-l1-2-1.spec b/dlls/api-ms-win-core-synch-l1-2-1/api-ms-win-core-synch-l1-2-1.spec index 84f40fa142..9e533678b5 100644 --- a/dlls/api-ms-win-core-synch-l1-2-1/api-ms-win-core-synch-l1-2-1.spec +++ b/dlls/api-ms-win-core-synch-l1-2-1/api-ms-win-core-synch-l1-2-1.spec @@ -54,8 +54,8 @@ @ stdcall WaitForMultipleObjectsEx(long ptr long long long) kernel32.WaitForMultipleObjectsEx @ stdcall WaitForSingleObject(long long) kernel32.WaitForSingleObject @ stdcall WaitForSingleObjectEx(long long long) kernel32.WaitForSingleObjectEx -@ stub WaitOnAddress +@ stdcall WaitOnAddress(ptr ptr long long) kernelbase.WaitOnAddress @ stdcall WakeAllConditionVariable(ptr) kernel32.WakeAllConditionVariable -@ stub WakeByAddressAll -@ stub WakeByAddressSingle +@ stdcall WakeByAddressAll(ptr) kernelbase.WakeByAddressAll +@ stdcall WakeByAddressSingle(ptr) kernelbase.WakeByAddressSingle @ stdcall WakeConditionVariable(ptr) kernel32.WakeConditionVariable diff --git a/tools/make_specfiles b/tools/make_specfiles index b05afb8189..4c494873ae 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -192,6 +192,13 @@ my @dll_groups = "rasapi32", "ext-ms-win-ras-rasapi32-l1-1-0", ], + [ + "kernel32", + "kernelbase", + "api-ms-win-core-synch-l1-1-0", + "api-ms-win-core-synch-l1-2-0", + "api-ms-win-core-synch-l1-2-1", + ], [ "kernel32", "api-ms-win-appmodel-identity-l1-1-0", @@ -220,9 +227,6 @@ my @dll_groups = "api-ms-win-core-sysinfo-l1-2-0", "api-ms-win-core-util-l1-1-0", "api-ms-win-core-synch-ansi-l1-1-0", - "api-ms-win-core-synch-l1-1-0", - "api-ms-win-core-synch-l1-2-0", - "api-ms-win-core-synch-l1-2-1", "api-ms-win-core-console-l1-1-0", "api-ms-win-core-console-l2-1-0", "api-ms-win-core-file-l1-1-0", -- 2.19.1

1 0

[PATCH vkd3d 5/5] include: Avoid bitfields in public structures.
by Józef Kucia 08 Nov '18

08 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_common.h | 2 ++ include/vkd3d_shader.h | 7 ++++--- libs/vkd3d-shader/vkd3d_shader_main.c | 3 +++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index d097f3d925ef..d942acf2b74b 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -28,6 +28,8 @@ #define STATIC_ASSERT(e) extern void __VKD3D_STATIC_ASSERT__(int [(e) ? 1 : -1]) +#define MEMBER_SIZE(t, m) sizeof(((t *)0)->m) + static inline size_t align(size_t addr, size_t alignment) { return (addr + (alignment - 1)) & ~(alignment - 1); diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 20ed0fb29b9f..c0d1f65af2f9 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -365,6 +365,7 @@ enum vkd3d_root_signature_version int vkd3d_shader_serialize_root_signature(const struct vkd3d_root_signature_desc *root_signature, enum vkd3d_root_signature_version version, struct vkd3d_shader_code *dxbc); +/* FIXME: Add support for 64 UAV bind slots. */ #define VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS 8 struct vkd3d_shader_scan_info @@ -372,9 +373,9 @@ struct vkd3d_shader_scan_info enum vkd3d_shader_structure_type type; void *next; - unsigned int uav_read_mask : VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS; - unsigned int uav_counter_mask : VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS; - unsigned int sampler_comparison_mode_mask; + unsigned int uav_read_mask; /* VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS */ + unsigned int uav_counter_mask; /* VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS */ + unsigned int sampler_comparison_mode_mask; /* 16 */ }; int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 5e292c7eccd9..37aee0f6fce4 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -18,6 +18,9 @@ #include "vkd3d_shader_private.h" +STATIC_ASSERT(MEMBER_SIZE(struct vkd3d_shader_scan_info, uav_counter_mask) * CHAR_BIT >= VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS); +STATIC_ASSERT(MEMBER_SIZE(struct vkd3d_shader_scan_info, uav_read_mask) * CHAR_BIT >= VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS); + struct vkd3d_shader_parser { struct vkd3d_shader_desc shader_desc; -- 2.18.1

2 1

[PATCH vkd3d 4/5] include: Add STATIC_ASSERT() macro.
by Józef Kucia 08 Nov '18

08 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_common.h | 2 ++ libs/vkd3d-shader/dxbc.c | 2 +- libs/vkd3d-shader/spirv.c | 6 +++--- tests/d3d12.c | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 2e3873b82440..d097f3d925ef 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -26,6 +26,8 @@ #define DIV_ROUND_UP(a, b) ((a) % (b) == 0 ? (a) / (b) : (a) / (b) + 1) +#define STATIC_ASSERT(e) extern void __VKD3D_STATIC_ASSERT__(int [(e) ? 1 : -1]) + static inline size_t align(size_t addr, size_t alignment) { return (addr + (alignment - 1)) & ~(alignment - 1); diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index eb1729c9bcf2..7b034482a7c6 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1788,7 +1788,7 @@ static void read_dword(const char **ptr, DWORD *d) static void read_float(const char **ptr, float *f) { - assert(sizeof(float) == sizeof(DWORD)); /* FIXME: use static assert */ + STATIC_ASSERT(sizeof(float) == sizeof(DWORD)); read_dword(ptr, (DWORD *)f); } diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index c9634ed62ca6..1655bf319eae 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6897,10 +6897,10 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_ unsigned int i, count; DWORD variable_idx; - function_id = compiler->epilogue_function_id; + STATIC_ASSERT(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(param_id)); + STATIC_ASSERT(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(param_type_id)); - assert(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(param_id)); - assert(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(param_type_id)); + function_id = compiler->epilogue_function_id; void_id = vkd3d_spirv_get_op_type_void(builder); type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, 4); diff --git a/tests/d3d12.c b/tests/d3d12.c index b50723b11995..c855e9c42cbb 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -7786,7 +7786,7 @@ static void test_shader_instructions(void) }, }; - assert(sizeof(tests->input) == sizeof(uint_tests->input)); + STATIC_ASSERT(sizeof(tests->input) == sizeof(uint_tests->input)); memset(&desc, 0, sizeof(desc)); desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT; -- 2.18.1

2 1

[PATCH vkd3d 3/5] include: Use angle-bracket includes consistently.
by Józef Kucia 08 Nov '18

08 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index 096530959843..3d560b564a67 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -22,8 +22,8 @@ #include <vkd3d_types.h> #ifndef VKD3D_NO_WIN32_TYPES -# include "vkd3d_windows.h" -# include "vkd3d_d3d12.h" +# include <vkd3d_windows.h> +# include <vkd3d_d3d12.h> #endif /* VKD3D_NO_WIN32_TYPES */ #ifndef VKD3D_NO_VULKAN_H -- 2.18.1

2 1

[PATCH vkd3d 1/5] vkd3d: Handle VKD3D_ERROR_INVALID_SHADER in hresult_from_vkd3d_result().
by Józef Kucia 08 Nov '18

08 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 05d15b2ccd62..a2424449660c 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -410,6 +410,7 @@ HRESULT hresult_from_vkd3d_result(int vkd3d_result) case VKD3D_ERROR_OUT_OF_MEMORY: return E_OUTOFMEMORY; case VKD3D_ERROR_INVALID_ARGUMENT: + case VKD3D_ERROR_INVALID_SHADER: return E_INVALIDARG; case VKD3D_ERROR_NOT_IMPLEMENTED: return E_NOTIMPL; -- 2.18.1

2 1

[PATCH vkd3d 2/5] include: Move vkd3d_result to common header.
by Józef Kucia 08 Nov '18

08 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Makefile.am | 1 + include/vkd3d.h | 4 ++-- include/vkd3d_shader.h | 16 ++------------- include/vkd3d_types.h | 44 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 49 insertions(+), 16 deletions(-) create mode 100644 include/vkd3d_types.h diff --git a/Makefile.am b/Makefile.am index 111671837b87..c2a20c6149c3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,6 +20,7 @@ vkd3d_public_headers = \ include/vkd3d_dxgibase.h \ include/vkd3d_dxgiformat.h \ include/vkd3d_shader.h \ + include/vkd3d_types.h \ include/vkd3d_utils.h \ include/vkd3d_windows.h diff --git a/include/vkd3d.h b/include/vkd3d.h index de805420f67a..096530959843 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -19,6 +19,8 @@ #ifndef __VKD3D_H #define __VKD3D_H +#include <vkd3d_types.h> + #ifndef VKD3D_NO_WIN32_TYPES # include "vkd3d_windows.h" # include "vkd3d_d3d12.h" @@ -32,8 +34,6 @@ extern "C" { #endif /* __cplusplus */ -#define VKD3D_FORCE_32_BIT_ENUM(name) name##_FORCE_32BIT = 0x7fffffff - enum vkd3d_structure_type { VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index f96e5055c7cb..20ed0fb29b9f 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -19,12 +19,12 @@ #ifndef __VKD3D_SHADER_H #define __VKD3D_SHADER_H +#include <vkd3d_types.h> + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ -#define VKD3D_FORCE_32_BIT_ENUM(name) name##_FORCE_32BIT = 0x7fffffff - enum vkd3d_shader_structure_type { VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE, @@ -34,18 +34,6 @@ enum vkd3d_shader_structure_type VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STRUCTURE_TYPE), }; -enum vkd3d_result -{ - VKD3D_OK = 0, - VKD3D_ERROR = -1, /* unspecified failure */ - VKD3D_ERROR_OUT_OF_MEMORY = -2, - VKD3D_ERROR_INVALID_ARGUMENT = -3, - VKD3D_ERROR_INVALID_SHADER = -4, - VKD3D_ERROR_NOT_IMPLEMENTED = -5, - - VKD3D_FORCE_32_BIT_ENUM(VKD3D_RESULT), -}; - enum vkd3d_shader_compiler_option { VKD3D_SHADER_STRIP_DEBUG = 0x00000001, diff --git a/include/vkd3d_types.h b/include/vkd3d_types.h new file mode 100644 index 000000000000..34c667489911 --- /dev/null +++ b/include/vkd3d_types.h @@ -0,0 +1,44 @@ +/* + * Copyright 2016-2018 Józef Kucia for CodeWeavers + * + * 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 + */ + +#ifndef __VKD3D_TYPES_H +#define __VKD3D_TYPES_H + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +#define VKD3D_FORCE_32_BIT_ENUM(name) name##_FORCE_32BIT = 0x7fffffff + +enum vkd3d_result +{ + VKD3D_OK = 0, + VKD3D_ERROR = -1, /* unspecified failure */ + VKD3D_ERROR_OUT_OF_MEMORY = -2, + VKD3D_ERROR_INVALID_ARGUMENT = -3, + VKD3D_ERROR_INVALID_SHADER = -4, + VKD3D_ERROR_NOT_IMPLEMENTED = -5, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_RESULT), +}; + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __VKD3D_TYPES_H */ -- 2.18.1

2 1

[PATCH 1/5] shell32/autocomplete: Implement ResetEnumerator
by Gabriel Ivăncescu 08 Nov '18

08 Nov '18

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/shell32/autocomplete.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index a6404ca..8437d2d 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -24,8 +24,6 @@ - implement ACO_SEARCH style - implement ACO_FILTERPREFIXES style - implement ACO_RTLREADING style - - implement ResetEnumerator - */ #include "config.h" @@ -1041,9 +1039,15 @@ static HRESULT WINAPI IAutoCompleteDropDown_fnResetEnumerator( { IAutoCompleteImpl *This = impl_from_IAutoCompleteDropDown(iface); - FIXME("(%p): stub\n", This); + TRACE("(%p)\n", This); - return E_NOTIMPL; + if (This->initialized) + { + free_enum_strs(This); + if ((This->options & ACO_AUTOSUGGEST) && IsWindowVisible(This->hwndListBox)) + autocomplete_text(This, This->hwndEdit, autoappend_flag_displayempty); + } + return S_OK; } /************************************************************************** -- 2.19.1

2 9

[PATCH 2/2] webservices: Fix handling of union fields that match noneEnumValue.
by Hans Leidekker 08 Nov '18

08 Nov '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/tests/writer.c | 31 ++++++++++++++++++++++++++++--- dlls/webservices/writer.c | 19 +++---------------- 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index f46578ba3b..a55da605e8 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -3913,11 +3913,11 @@ static void test_union_type(void) { static const WCHAR testW[] = {'t','e','s','t',0}; static WS_XML_STRING str_ns = {0, NULL}, str_a = {1, (BYTE *)"a"}, str_b = {1, (BYTE *)"b"}; - static WS_XML_STRING str_s = {1, (BYTE *)"s"}, str_t = {1, (BYTE *)"t"}; + static WS_XML_STRING str_none = {4, (BYTE *)"none"}, str_s = {1, (BYTE *)"s"}, str_t = {1, (BYTE *)"t"}; HRESULT hr; WS_XML_WRITER *writer; WS_UNION_DESCRIPTION u; - WS_UNION_FIELD_DESCRIPTION f, f2, *fields[2]; + WS_UNION_FIELD_DESCRIPTION f, f2, f3, *fields[3]; WS_FIELD_DESCRIPTION f_struct, *fields_struct[1]; WS_STRUCT_DESCRIPTION s; enum choice {CHOICE_A = 30, CHOICE_B = 20, CHOICE_C = 10, CHOICE_NONE = 0}; @@ -3929,6 +3929,7 @@ static void test_union_type(void) { const WCHAR *a; UINT32 b; + BOOL none; } value; } test; @@ -4020,11 +4021,35 @@ static void test_union_type(void) WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + /* field value equals noneEnumValue */ + memset( &f3, 0, sizeof(f3) ); + f3.value = CHOICE_NONE; + f3.field.mapping = WS_ELEMENT_FIELD_MAPPING; + f3.field.localName = &str_none; + f3.field.ns = &str_ns; + f3.field.type = WS_BOOL_TYPE; + f3.field.offset = FIELD_OFFSET(struct test, value.none); + fields[2] = &f3; + + u.fieldCount = 3; + u.valueIndices = NULL; + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteStartElement( writer, NULL, &str_t, &str_ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + test.choice = CHOICE_NONE; + test.value.none = TRUE; + hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t><none>true</none></t>", __LINE__ ); + hr = set_output( writer ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsWriteStartElement( writer, NULL, &str_t, &str_ns, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - test.choice = CHOICE_NONE; f_struct.options = WS_FIELD_OPTIONAL; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 0f20049b7a..0a28d9dc84 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -3626,24 +3626,11 @@ static HRESULT write_type_union( struct writer *writer, const WS_UNION_DESCRIPTI int enum_value; HRESULT hr; - if ((hr = get_value_ptr( option, value, size, desc->size, &ptr )) != S_OK) return hr; - if (size < sizeof(enum_value)) return E_INVALIDARG; - if ((enum_value = *(int *)(char *)ptr + desc->enumOffset) == desc->noneEnumValue) - { - switch (option) - { - case WS_WRITE_REQUIRED_VALUE: - return WS_E_INVALID_FORMAT; - - case WS_WRITE_NILLABLE_VALUE: - return S_OK; + if ((hr = get_value_ptr( option, value, size, desc->size, &ptr )) != S_OK) return hr; - default: - ERR( "unhandled write option %u\n", option ); - return E_INVALIDARG; - } - } + enum_value = *(int *)(char *)ptr + desc->enumOffset; + if (enum_value == desc->noneEnumValue && option == WS_WRITE_NILLABLE_VALUE) return S_OK; if ((hr = find_index( desc, enum_value, &i )) != S_OK) return hr; return write_type_field( writer, &desc->fields[i]->field, ptr, desc->fields[i]->field.offset ); -- 2.11.0

1 0

[PATCH 1/2] webservices: Use the search index to look up the union field, if available.
by Hans Leidekker 08 Nov '18

08 Nov '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/tests/writer.c | 13 +++++++++- dlls/webservices/writer.c | 56 ++++++++++++++++++++++++++++++----------- 2 files changed, 54 insertions(+), 15 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index e33c38951e..f46578ba3b 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -3920,7 +3920,8 @@ static void test_union_type(void) WS_UNION_FIELD_DESCRIPTION f, f2, *fields[2]; WS_FIELD_DESCRIPTION f_struct, *fields_struct[1]; WS_STRUCT_DESCRIPTION s; - enum choice {CHOICE_A, CHOICE_B, CHOICE_NONE}; + enum choice {CHOICE_A = 30, CHOICE_B = 20, CHOICE_C = 10, CHOICE_NONE = 0}; + ULONG index[2] = {1, 0}; struct test { enum choice choice; @@ -3987,6 +3988,7 @@ static void test_union_type(void) ok( hr == S_OK, "got %08x\n", hr ); check_output( writer, "<t><a>test</a></t>", __LINE__ ); + u.valueIndices = index; hr = set_output( writer ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsWriteStartElement( writer, NULL, &str_t, &str_ns, NULL ); @@ -4004,6 +4006,15 @@ static void test_union_type(void) ok( hr == S_OK, "got %08x\n", hr ); hr = WsWriteStartElement( writer, NULL, &str_t, &str_ns, NULL ); ok( hr == S_OK, "got %08x\n", hr ); + test.choice = CHOICE_C; + hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteStartElement( writer, NULL, &str_t, &str_ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); test.choice = CHOICE_NONE; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index ff633a656c..0f20049b7a 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -3580,15 +3580,48 @@ static WS_WRITE_OPTION get_field_write_option( WS_TYPE type, ULONG options ) } } -static HRESULT write_type_field( struct writer *, const WS_FIELD_DESCRIPTION *, const char *, ULONG ); +static HRESULT find_index( const WS_UNION_DESCRIPTION *desc, int value, ULONG *idx ) +{ + ULONG i; -static HRESULT write_type( struct writer *, WS_TYPE_MAPPING, WS_TYPE, const void *, WS_WRITE_OPTION, - const void *, ULONG ); + if (desc->valueIndices) + { + int c, min = 0, max = desc->fieldCount - 1; + while (min <= max) + { + i = (min + max) / 2; + c = value - desc->fields[desc->valueIndices[i]]->value; + if (c < 0) + max = i - 1; + else if (c > 0) + min = i + 1; + else + { + *idx = desc->valueIndices[i]; + return S_OK; + } + } + return WS_E_INVALID_FORMAT; + } + + /* fall back to linear search */ + for (i = 0; i < desc->fieldCount; i++) + { + if (desc->fields[i]->value == value) + { + *idx = i; + return S_OK; + } + } + return WS_E_INVALID_FORMAT; +} + +static HRESULT write_type_field( struct writer *, const WS_FIELD_DESCRIPTION *, const char *, ULONG ); static HRESULT write_type_union( struct writer *writer, const WS_UNION_DESCRIPTION *desc, WS_WRITE_OPTION option, const void *value, ULONG size ) { - ULONG i, offset; + ULONG i; const void *ptr; int enum_value; HRESULT hr; @@ -3612,18 +3645,13 @@ static HRESULT write_type_union( struct writer *writer, const WS_UNION_DESCRIPTI } } - for (i = 0; i < desc->fieldCount; i++) - { - if (desc->fields[i]->value == enum_value) - { - offset = desc->fields[i]->field.offset; - return write_type_field( writer, &desc->fields[i]->field, ptr, offset ); - } - } - - return E_INVALIDARG; + if ((hr = find_index( desc, enum_value, &i )) != S_OK) return hr; + return write_type_field( writer, &desc->fields[i]->field, ptr, desc->fields[i]->field.offset ); } +static HRESULT write_type( struct writer *, WS_TYPE_MAPPING, WS_TYPE, const void *, WS_WRITE_OPTION, + const void *, ULONG ); + static HRESULT write_type_array( struct writer *writer, const WS_FIELD_DESCRIPTION *desc, const char *buf, ULONG count ) { -- 2.11.0

1 0

[PATCH v2] mfplat/tests: Use correct interface macro.
by Alistair Leslie-Hughes 08 Nov '18

08 Nov '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfplat/tests/mfplat.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 61cfbbf..2ee81ce 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -307,7 +307,7 @@ static void test_MFCreateMFByteStreamOnStream(void) hr = pMFCreateMFByteStreamOnStream(stream, &bytestream); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IUnknown_QueryInterface(bytestream, &IID_IUnknown, + hr = IMFByteStream_QueryInterface(bytestream, &IID_IUnknown, (void **)&unknown); ok(hr == S_OK, "got 0x%08x\n", hr); ok((void *)unknown == (void *)bytestream, "got %p\n", unknown); @@ -321,7 +321,7 @@ static void test_MFCreateMFByteStreamOnStream(void) ref = IMFByteStream_Release(bytestream2); ok(ref == 1, "got %u\n", ref); - hr = IUnknown_QueryInterface(bytestream, &IID_IMFAttributes, + hr = IMFByteStream_QueryInterface(bytestream, &IID_IMFAttributes, (void **)&attributes); ok(hr == S_OK || /* w7pro64 */ @@ -337,14 +337,14 @@ static void test_MFCreateMFByteStreamOnStream(void) ok(attributes != NULL, "got NULL\n"); - hr = IUnknown_QueryInterface(attributes, &IID_IUnknown, + hr = IMFAttributes_QueryInterface(attributes, &IID_IUnknown, (void **)&unknown); ok(hr == S_OK, "got 0x%08x\n", hr); ok((void *)unknown == (void *)bytestream, "got %p\n", unknown); ref = IUnknown_Release(unknown); ok(ref == 2, "got %u\n", ref); - hr = IUnknown_QueryInterface(attributes, &IID_IMFByteStream, + hr = IMFAttributes_QueryInterface(attributes, &IID_IMFByteStream, (void **)&bytestream2); ok(hr == S_OK, "got 0x%08x\n", hr); ok(bytestream2 == bytestream, "got %p\n", bytestream2); @@ -375,7 +375,7 @@ static void test_MFCreateFile(void) MF_FILEFLAGS_NONE, filename, &bytestream); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IUnknown_QueryInterface(bytestream, &IID_IMFAttributes, + hr = IMFByteStream_QueryInterface(bytestream, &IID_IMFAttributes, (void **)&attributes); ok(hr == S_OK, "got 0x%08x\n", hr); ok(attributes != NULL, "got NULL\n"); -- 1.9.1

1 0

[PATCH] mfplat/tests: Use correct interface macro.
by Alistair Leslie-Hughes 07 Nov '18

07 Nov '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfplat/tests/mfplat.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index f9e0996..8009f1f 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -236,7 +236,7 @@ static void test_source_resolver(void) MF_FILEFLAGS_NONE, filename, &bytestream); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IUnknown_QueryInterface(bytestream, &IID_IMFAttributes, + hr = IMFByteStream_QueryInterface(bytestream, &IID_IMFAttributes, (void **)&attributes); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IMFAttributes_SetString(attributes, &MF_BYTESTREAM_CONTENT_TYPE, file_type); @@ -352,7 +352,7 @@ static void test_MFCreateMFByteStreamOnStream(void) hr = pMFCreateMFByteStreamOnStream(stream, &bytestream); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IUnknown_QueryInterface(bytestream, &IID_IUnknown, + hr = IMFByteStream_QueryInterface(bytestream, &IID_IUnknown, (void **)&unknown); ok(hr == S_OK, "got 0x%08x\n", hr); ok((void *)unknown == (void *)bytestream, "got %p\n", unknown); @@ -366,7 +366,7 @@ static void test_MFCreateMFByteStreamOnStream(void) ref = IMFByteStream_Release(bytestream2); ok(ref == 1, "got %u\n", ref); - hr = IUnknown_QueryInterface(bytestream, &IID_IMFAttributes, + hr = IMFByteStream_QueryInterface(bytestream, &IID_IMFAttributes, (void **)&attributes); ok(hr == S_OK || /* w7pro64 */ @@ -382,14 +382,14 @@ static void test_MFCreateMFByteStreamOnStream(void) ok(attributes != NULL, "got NULL\n"); - hr = IUnknown_QueryInterface(attributes, &IID_IUnknown, + hr = IMFAttributes_QueryInterface(attributes, &IID_IUnknown, (void **)&unknown); ok(hr == S_OK, "got 0x%08x\n", hr); ok((void *)unknown == (void *)bytestream, "got %p\n", unknown); ref = IUnknown_Release(unknown); ok(ref == 2, "got %u\n", ref); - hr = IUnknown_QueryInterface(attributes, &IID_IMFByteStream, + hr = IMFAttributes_QueryInterface(attributes, &IID_IMFByteStream, (void **)&bytestream2); ok(hr == S_OK, "got 0x%08x\n", hr); ok(bytestream2 == bytestream, "got %p\n", bytestream2); -- 1.9.1

2 1

[PATCH] libs/port: Avoid an ARRAY_SIZE-like macro
by Michael Stefaniuc 07 Nov '18

07 Nov '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- libs/port/cptable.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libs/port/cptable.c b/libs/port/cptable.c index 03264f3dd5..73000c2816 100644 --- a/libs/port/cptable.c +++ b/libs/port/cptable.c @@ -175,8 +175,6 @@ static const union cptable * const cptables[72] = /* ### cpmap end ### */ /* Everything above this line is generated automatically by make_unicode */ -#define NB_CODEPAGES (sizeof(cptables)/sizeof(cptables[0])) - static int cmp_codepage( const void *codepage, const void *entry ) { @@ -189,7 +187,7 @@ const union cptable *wine_cp_get_table( unsigned int codepage ) { const union cptable **res; - if (!(res = bsearch( &codepage, cptables, NB_CODEPAGES, + if (!(res = bsearch( &codepage, cptables, ARRAY_SIZE( cptables ), sizeof(cptables[0]), cmp_codepage ))) return NULL; return *res; } @@ -198,6 +196,6 @@ const union cptable *wine_cp_get_table( unsigned int codepage ) /* enum valid codepages */ const union cptable *wine_cp_enum_table( unsigned int index ) { - if (index >= NB_CODEPAGES) return NULL; + if (index >= ARRAY_SIZE( cptables )) return NULL; return cptables[index]; } -- 2.14.5

1 0

[PATCH 7/7] widl: Generate async interface table.
by Jacek Caban 07 Nov '18

07 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/proxy.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-)

1 0

[PATCH 6/7] widl: Support async interfaces proxy.
by Jacek Caban 07 Nov '18

07 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/proxy.c | 19 ++++++++++++++++--- tools/widl/typegen.c | 3 +++ 2 files changed, 19 insertions(+), 3 deletions(-)

1 0

[PATCH 5/7] widl: Use for_each_iface in get_size_procformatstring.
by Jacek Caban 07 Nov '18

07 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/typegen.c | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-)

1 0

[PATCH 4/7] widl: Use for_each_iface in process_tfs.
by Jacek Caban 07 Nov '18

07 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/typegen.c | 51 +++++++++++++++----------------------------- 1 file changed, 17 insertions(+), 34 deletions(-)

1 0

[PATCH 3/7] widl: Introduce for_each_iface helper and use it in write_procformatstring.
by Jacek Caban 07 Nov '18

07 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/typegen.c | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-)

1 0

[PATCH 2/7] widl: Support async interfaces in headers generation.
by Jacek Caban 07 Nov '18

07 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/header.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)

1 0

[PATCH 1/7] widl: Create type for async variant of an interface with async_uuid attribute.
by Jacek Caban 07 Nov '18

07 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/parser.y | 106 +++++++++++++++++++++++++++++++++++++++-- tools/widl/typetree.c | 3 ++ tools/widl/widltypes.h | 1 + 3 files changed, 107 insertions(+), 3 deletions(-)

1 0

[PATCH] dwrite/tests: Test run bidi level too.
by Nikolay Sivov 07 Nov '18

07 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/tests/layout.c | 40 ++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index a117ca0d62..6aaf7925ae 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -311,6 +311,7 @@ struct drawcall_entry { WCHAR string[10]; /* only meaningful for DrawGlyphRun() */ WCHAR locale[LOCALE_NAME_MAX_LENGTH]; UINT32 glyphcount; /* only meaningful for DrawGlyphRun() */ + UINT32 bidilevel; }; struct drawcall_sequence @@ -432,6 +433,17 @@ static void ok_sequence_(struct drawcall_sequence **seq, int sequence_index, ok_(file, line) (expected->glyphcount == actual->glyphcount, "%s: wrong glyph count, %u was expected, but got %u instead\n", context, expected->glyphcount, actual->glyphcount); + + if (expected->bidilevel != actual->bidilevel && todo) { + failcount++; + todo_wine + ok_(file, line) (0, "%s: wrong bidi level, %u was expected, but got %u instead\n", + context, expected->bidilevel, actual->bidilevel); + } + else + ok_(file, line) (expected->bidilevel == actual->bidilevel, + "%s: wrong bidi level, %u was expected, but got %u instead\n", + context, expected->bidilevel, actual->bidilevel); } else if ((expected->kind & DRAW_KINDS_MASK) == DRAW_UNDERLINE) { int cmp = lstrcmpW(expected->locale, actual->locale); @@ -606,6 +618,7 @@ static HRESULT WINAPI testrenderer_DrawGlyphRun(IDWriteTextRenderer *iface, ok(lstrlenW(descr->localeName) < LOCALE_NAME_MAX_LENGTH, "unexpectedly long locale name\n"); lstrcpyW(entry.locale, descr->localeName); entry.glyphcount = run->glyphCount; + entry.bidilevel = run->bidiLevel; add_call(sequences, RENDERER_ID, &entry); return S_OK; } @@ -1681,14 +1694,22 @@ static const struct drawcall_entry draw_single_run_seq[] = { { DRAW_LAST_KIND } }; -static const struct drawcall_entry draw_reordered_run_seq[] = { +static const struct drawcall_entry draw_ltr_reordered_run_seq[] = { { DRAW_GLYPHRUN, {'1','2','3','-','5','2',0}, {'r','u',0}, 6 }, - { DRAW_GLYPHRUN, {0x64a,0x64f,0x633,0x627,0x648,0x650,0x64a,0}, {'r','u',0}, 7 }, - { DRAW_GLYPHRUN, {'7','1',0}, {'r','u',0}, 2 }, + { DRAW_GLYPHRUN, {0x64a,0x64f,0x633,0x627,0x648,0x650,0x64a,0}, {'r','u',0}, 7, 1 }, + { DRAW_GLYPHRUN, {'7','1',0}, {'r','u',0}, 2, 2 }, { DRAW_GLYPHRUN, {'.',0}, {'r','u',0}, 1 }, { DRAW_LAST_KIND } }; +static const struct drawcall_entry draw_rtl_reordered_run_seq[] = { + { DRAW_GLYPHRUN, {'1','2','3','-','5','2',0}, {'r','u',0}, 6, 2 }, + { DRAW_GLYPHRUN, {0x64a,0x64f,0x633,0x627,0x648,0x650,0x64a,0}, {'r','u',0}, 7, 1 }, + { DRAW_GLYPHRUN, {'7','1',0}, {'r','u',0}, 2, 2 }, + { DRAW_GLYPHRUN, {'.',0}, {'r','u',0}, 1, 1 }, + { DRAW_LAST_KIND } +}; + static void test_Draw(void) { static const WCHAR str3W[] = {'1','2','3','-','5','2',0x64a,0x64f,0x633,0x627,0x648,0x650, @@ -1887,10 +1908,21 @@ todo_wine ctxt.use_gdi_natural = FALSE; ctxt.snapping_disabled = TRUE; + hr = IDWriteTextLayout_SetReadingDirection(layout, DWRITE_READING_DIRECTION_LEFT_TO_RIGHT); + ok(hr == S_OK, "Failed to set reading direction, hr %#x.\n", hr); + + flush_sequence(sequences, RENDERER_ID); + hr = IDWriteTextLayout_Draw(layout, &ctxt, &testrenderer, 0.0f, 0.0f); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok_sequence(sequences, RENDERER_ID, draw_ltr_reordered_run_seq, "draw test 11", FALSE); + + hr = IDWriteTextLayout_SetReadingDirection(layout, DWRITE_READING_DIRECTION_RIGHT_TO_LEFT); + ok(hr == S_OK, "Failed to set reading direction, hr %#x.\n", hr); + flush_sequence(sequences, RENDERER_ID); hr = IDWriteTextLayout_Draw(layout, &ctxt, &testrenderer, 0.0f, 0.0f); ok(hr == S_OK, "got 0x%08x\n", hr); - ok_sequence(sequences, RENDERER_ID, draw_reordered_run_seq, "draw test 11", FALSE); + ok_sequence(sequences, RENDERER_ID, draw_rtl_reordered_run_seq, "draw test 12", FALSE); IDWriteTextLayout_Release(layout); -- 2.19.1

1 0

[PATCH] comctl32/tests: Fix Listbox test failures on some configurations.
by Nikolay Sivov 07 Nov '18

07 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/listbox.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index c9d13a8d67..d4bb2cc2a8 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -793,6 +793,7 @@ static void test_listbox_item_data(void) static void test_listbox_LB_DIR(void) { + char path[MAX_PATH], curdir[MAX_PATH]; HWND hList; int res, itemCount; int itemCount_justFiles; @@ -805,6 +806,16 @@ static void test_listbox_LB_DIR(void) char driveletter; const char *wildcard = "*"; HANDLE file; + BOOL ret; + + GetCurrentDirectoryA(ARRAY_SIZE(curdir), curdir); + + GetTempPathA(ARRAY_SIZE(path), path); + ret = SetCurrentDirectoryA(path); + ok(ret, "Failed to set current directory.\n"); + + ret = CreateDirectoryA("lb_dir_test", NULL); + ok(ret, "Failed to create test directory.\n"); file = CreateFileA( "wtest1.tmp.c", GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL ); ok(file != INVALID_HANDLE_VALUE, "Error creating the test file: %d\n", GetLastError()); @@ -1135,11 +1146,11 @@ static void test_listbox_LB_DIR(void) itemCount, itemCount_allDirs); ok(res + 1 == itemCount, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) returned incorrect index!\n"); - if (itemCount && GetCurrentDirectoryA( MAX_PATH, pathBuffer ) > 3) /* there's no [..] in drive root */ + if (itemCount) { memset(pathBuffer, 0, MAX_PATH); SendMessageA(hList, LB_GETTEXT, 0, (LPARAM)pathBuffer); - ok( !strcmp(pathBuffer, "[..]"), "First element is not [..]\n"); + ok( !strcmp(pathBuffer, "[..]"), "First element is %s, not [..]\n", pathBuffer); } /* This tests behavior when no files match the wildcard */ @@ -1224,6 +1235,9 @@ static void test_listbox_LB_DIR(void) DestroyWindow(hList); DeleteFileA( "wtest1.tmp.c" ); + RemoveDirectoryA("lb_dir_test"); + + SetCurrentDirectoryA(curdir); } static HWND g_listBox; -- 2.19.1

1 1

[PATCH] testbot/WineSendLog: Don't report non-existent build errors.
by Francois Gouget 07 Nov '18

07 Nov '18

Make sure there are errors to report even when there is no reference log which is typical of build logs. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This will stop WineSendLog from sending an email for jobs such as 43971 where there is no new error, and the only 'build' error is that user32:msg prints too much data. https://testbot.winehq.org/JobDetails.pl?Key=43971 testbot/bin/WineSendLog.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index bb6dab51ad..a651c097e8 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -296,7 +296,7 @@ EOF $NewGroups = $LogErrors->{Groups}; $NewErrors = $LogErrors->{Errors}; } - elsif (!@$NewGroups) + if (!$NewGroups or !@$NewGroups) { # There is no new error next; -- 2.19.1

1 0

[PATCH] d3d8: Remove abs() invocations on unsigned integers in color_match
by Gerald Pfeifer 07 Nov '18

07 Nov '18

This is per our discussion - since we're only dealing with unsigned integers here (and no casts to signed), abs() is a noop. Gerald --- dlls/d3d8/tests/visual.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index e8e6bf870e..0b2ce20787 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -52,13 +52,13 @@ static HWND create_window(void) static BOOL color_match(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) { - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + if ((c1 & 0xff) - (c2 & 0xff) > max_diff) return FALSE; c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + if ((c1 & 0xff) - (c2 & 0xff) > max_diff) return FALSE; c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + if ((c1 & 0xff) - (c2 & 0xff) > max_diff) return FALSE; c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + if ((c1 & 0xff) - (c2 & 0xff) > max_diff) return FALSE; return TRUE; } -- 2.18.0

2 1

color_match in dlls/d3d8/tests/visual.c may not do what one would think
by Gerald Pfeifer 07 Nov '18

07 Nov '18

Hi Henri, hi everyone, earlier this year via commit 2f6fbdec8caee311e2fb85b2ddc9fbd8a9afaea5 Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sat May 24 10:33:36 2008 +0200 d3d8: Test our texop implementation. we go the following function in dlls/d3d8/tests/visual.c: static BOOL color_match(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) { if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; c1 >>= 8; c2 >>= 8; if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; c1 >>= 8; c2 >>= 8; if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; c1 >>= 8; c2 >>= 8; if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; return TRUE; } Intuitively it's clear what this does, however there's a little challenge: c1 and c2 are unsigned integers (D3DCOLOR being DWORD being unsigned long), and so are c1 & 0xff and c2 & 0xff. Substraction of two unsigned integer types is done in unsigned math, so we may be seeing wrapping, but never a negative number as a result -- and abs() is a noop. Gerald

3 4

[PATCH 5/5] d3d9: Set WINED3D_SWAPCHAIN_GDI_COMPATIBLE on the swapchain when required.
by Henri Verbeet 07 Nov '18

07 Nov '18

Instead of injecting WINED3D_TEXTURE_CREATE_GET_DC during device_parent_create_swapchain_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/device.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 840a786cce4..eaf162c7da3 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -346,6 +346,11 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch = wined3dformat_from_d3dformat(present_parameters->AutoDepthStencilFormat); swapchain_desc->flags = (present_parameters->Flags & D3DPRESENTFLAGS_MASK) | WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH; + if (is_gdi_compat_wined3dformat(swapchain_desc->backbuffer_format) + /* WINED3DFMT_UNKNOWN creates the swapchain with the current + * display format, which is always GDI-compatible. */ + || swapchain_desc->backbuffer_format == WINED3DFMT_UNKNOWN) + swapchain_desc->flags |= WINED3D_SWAPCHAIN_GDI_COMPATIBLE; swapchain_desc->refresh_rate = present_parameters->FullScreen_RefreshRateInHz; swapchain_desc->auto_restore_display_mode = TRUE; @@ -4177,9 +4182,6 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic if (container_parent == device_parent) container_parent = &device->IDirect3DDevice9Ex_iface; - if (is_gdi_compat_wined3dformat(desc->format)) - texture_flags |= WINED3D_TEXTURE_CREATE_GET_DC; - if (FAILED(hr = wined3d_texture_create(device->wined3d_device, desc, 1, 1, texture_flags | WINED3D_TEXTURE_CREATE_MAPPABLE, NULL, container_parent, &d3d9_null_wined3d_parent_ops, texture))) -- 2.11.0

2 1

[PATCH 4/5] wined3d: Update the swapchain flags on wined3d_device_reset().
by Henri Verbeet 07 Nov '18

07 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3efae4bb56c..3697b8f0005 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4752,6 +4752,16 @@ void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) } } +static void update_swapchain_flags(struct wined3d_texture *texture) +{ + unsigned int flags = texture->swapchain->desc.flags; + + if (flags & WINED3D_SWAPCHAIN_GDI_COMPATIBLE) + texture->flags |= WINED3D_TEXTURE_GET_DC; + else + texture->flags &= ~WINED3D_TEXTURE_GET_DC; +} + HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode, wined3d_device_reset_cb callback, BOOL reset_state) @@ -4835,7 +4845,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, swapchain->desc.swap_effect = swapchain_desc->swap_effect; swapchain->desc.enable_auto_depth_stencil = swapchain_desc->enable_auto_depth_stencil; swapchain->desc.auto_depth_stencil_format = swapchain_desc->auto_depth_stencil_format; - swapchain->desc.flags = swapchain_desc->flags; swapchain->desc.refresh_rate = swapchain_desc->refresh_rate; swapchain->desc.auto_restore_display_mode = swapchain_desc->auto_restore_display_mode; @@ -4881,6 +4890,17 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, swapchain_desc->multisample_type, swapchain_desc->multisample_quality))) return hr; + if (swapchain_desc->flags != swapchain->desc.flags) + { + swapchain->desc.flags = swapchain_desc->flags; + + update_swapchain_flags(swapchain->front_buffer); + for (i = 0; i < swapchain->desc.backbuffer_count; ++i) + { + update_swapchain_flags(swapchain->back_buffers[i]); + } + } + if (device->auto_depth_stencil_view) { wined3d_rendertarget_view_decref(device->auto_depth_stencil_view); -- 2.11.0

2 1

[PATCH 3/5] wined3d: Do not set WINED3D_TEXTURE_CREATE_GET_DC on the implicit depth/stencil texture.
by Henri Verbeet 07 Nov '18

07 Nov '18

It doesn't make a lot of sense for depth formats. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 6 +----- dlls/wined3d/swapchain.c | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 893ce55c9aa..3efae4bb56c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4890,7 +4890,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, { struct wined3d_resource_desc texture_desc; struct wined3d_texture *texture; - DWORD flags = 0; TRACE("Creating the depth stencil buffer.\n"); @@ -4906,11 +4905,8 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, texture_desc.depth = 1; texture_desc.size = 0; - if (swapchain_desc->flags & WINED3D_SWAPCHAIN_GDI_COMPATIBLE) - flags |= WINED3D_TEXTURE_CREATE_GET_DC; - if (FAILED(hr = device->device_parent->ops->create_swapchain_texture(device->device_parent, - device->device_parent, &texture_desc, flags, &texture))) + device->device_parent, &texture_desc, 0, &texture))) { ERR("Failed to create the auto depth/stencil surface, hr %#x.\n", hr); return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index f6963c4aba2..499e1631f18 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -949,7 +949,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 texture_desc.bind_flags = WINED3D_BIND_DEPTH_STENCIL; if (FAILED(hr = device->device_parent->ops->create_swapchain_texture(device->device_parent, - device->device_parent, &texture_desc, texture_flags, &ds))) + device->device_parent, &texture_desc, 0, &ds))) { WARN("Failed to create the auto depth/stencil surface, hr %#x.\n", hr); goto err; -- 2.11.0

2 1

[PATCH 2/5] ddraw: Do not set WINED3D_TEXTURE_CREATE_MAPPABLE for swapchain textures.
by Henri Verbeet 07 Nov '18

07 Nov '18

These aren't visible to the application, and we never map them ourselves. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/ddraw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 9a40bc971b2..5043994a56a 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4943,7 +4943,7 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic parent_ops = &ddraw_null_wined3d_parent_ops; if (FAILED(hr = wined3d_texture_create(ddraw->wined3d_device, desc, 1, 1, - texture_flags | WINED3D_TEXTURE_CREATE_MAPPABLE, NULL, ddraw, parent_ops, texture))) + texture_flags, NULL, ddraw, parent_ops, texture))) { WARN("Failed to create texture, hr %#x.\n", hr); return hr; -- 2.11.0

2 1

[PATCH 1/5] d3d9/tests: Test the pool and usage of surfaces created through CreateOffscreenPlainSurface().
by Henri Verbeet 07 Nov '18

07 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/device.c | 3 --- dlls/d3d9/tests/device.c | 6 ++++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1e7c0ea0f45..840a786cce4 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1813,9 +1813,6 @@ static HRESULT WINAPI d3d9_device_CreateOffscreenPlainSurface(IDirect3DDevice9Ex } } - /* FIXME: Offscreen surfaces are supposed to be always lockable, - * regardless of the pool they're created in. Should we set dynamic usage - * here? */ return d3d9_device_create_surface(device, width, height, format, WINED3D_TEXTURE_CREATE_MAPPABLE, surface, 0, pool, D3DMULTISAMPLE_NONE, 0, user_mem); } diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 52a3ee795fa..e789107a34a 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -8673,6 +8673,7 @@ static void test_surface_double_unlock(void) }; IDirect3DSurface9 *surface; IDirect3DDevice9 *device; + D3DSURFACE_DESC desc; D3DLOCKED_RECT lr; IDirect3D9 *d3d; unsigned int i; @@ -8697,6 +8698,11 @@ static void test_surface_double_unlock(void) D3DFMT_X8R8G8B8, pools[i], &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface in pool %#x, hr %#x.\n", pools[i], hr); + hr = IDirect3DSurface9_GetDesc(surface, &desc); + ok(hr == D3D_OK, "Pool %#x: Got unexpected hr %#x.\n", pools[i], hr); + ok(!desc.Usage, "Pool %#x: Got unexpected usage %#x.\n", pools[i], desc.Usage); + ok(desc.Pool == pools[i], "Pool %#x: Got unexpected pool %#x.\n", pools[i], desc.Pool); + hr = IDirect3DSurface9_UnlockRect(surface); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x, for surface in pool %#x.\n", hr, pools[i]); hr = IDirect3DSurface9_LockRect(surface, &lr, NULL, 0); -- 2.11.0

2 1

[PATCH] wineqtdecoder: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 06 Nov '18

06 Nov '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Not compile tested as it is MacOSX only. dlls/wineqtdecoder/main.c | 2 +- dlls/wineqtdecoder/qtdatahandler.c | 2 +- dlls/wineqtdecoder/qtsplitter.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wineqtdecoder/main.c b/dlls/wineqtdecoder/main.c index c7dd76c554..ac9268d70f 100644 --- a/dlls/wineqtdecoder/main.c +++ b/dlls/wineqtdecoder/main.c @@ -141,7 +141,7 @@ FactoryTemplate const g_Templates[] = { } }; -int g_cTemplates = sizeof(g_Templates) / sizeof(g_Templates[0]); +int g_cTemplates = ARRAY_SIZE(g_Templates); static HINSTANCE hInst = NULL; /*********************************************************************** diff --git a/dlls/wineqtdecoder/qtdatahandler.c b/dlls/wineqtdecoder/qtdatahandler.c index bfbeab9276..c88b354e0b 100644 --- a/dlls/wineqtdecoder/qtdatahandler.c +++ b/dlls/wineqtdecoder/qtdatahandler.c @@ -361,7 +361,7 @@ static pascal ComponentResult myDataHGetFileName ( DataHandler dh, Str255 str) int i; IAsyncReader_SyncRead(data->dataRef.pReader, 0, 8, header); - for (i=0; i < sizeof(stream_sigs)/sizeof(signature); i++) + for (i = 0; i < ARRAY_SIZE(stream_sigs); i++) if (memcmp(header, stream_sigs[i].sig, stream_sigs[i].sig_length)==0) { str[0] = strlen(stream_sigs[i].fname); diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 2b9ec88ef3..c0a9b93a47 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -277,7 +277,7 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *punkout, HRESULT *phr) piInput = &This->pInputPin.pin.pinInfo; piInput->dir = PINDIR_INPUT; piInput->pFilter = &This->filter.IBaseFilter_iface; - lstrcpynW(piInput->achName, wcsInputPinName, sizeof(piInput->achName) / sizeof(piInput->achName[0])); + lstrcpynW(piInput->achName, wcsInputPinName, ARRAY_SIZE(piInput->achName)); This->pInputPin.pin.IPin_iface.lpVtbl = &QT_InputPin_Vtbl; This->pInputPin.pin.refCount = 1; This->pInputPin.pin.pConnectedTo = NULL; -- 2.14.5

1 0

[PATCH] testbot/build: Remove support for WineTest.pl's build action.
by Francois Gouget 06 Nov '18

06 Nov '18

It is an old name for testpatch and is not used anymore. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/WineTest.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index cb83642e16..6df028fa95 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -192,7 +192,7 @@ my ($Usage, $OptNoSubmit, $MissionStatement, $FileName, $BaseTag); while (@ARGV) { my $Arg = shift @ARGV; - if ($Arg eq "--testpatch" or $Arg eq "build") + if ($Arg eq "--testpatch") { $Action = "testpatch"; } -- 2.19.1

1 0

[PATCH 1/2] testbot: Fix support for test=module.
by Francois Gouget 06 Nov '18

06 Nov '18

Check that the patched module has tests (Files field), not that it has patched test units (Units field). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/WineTest.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 893a74dd59..efd1498445 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -140,7 +140,7 @@ sub TestPatch($$) { # When given a module name WineTest runs all its tests. # But make sure the module actually has tests first! - push @TestList, $Module if (%{$TestInfo->{Units}}); + push @TestList, $Module if (%{$TestInfo->{Files}}); } else { -- 2.19.1

1 1

[PATCH resend 1/8] comctl32/listbox: Make SetCount fail if LBS_NODATA is not set
by Gabriel Ivăncescu 06 Nov '18

06 Nov '18

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Can anyone please look at this series? Nikolay? They are needed to finally implement LBS_NODATA (which I've already written but I'm sure it will need some changes, however I need these series first anyway). dlls/comctl32/listbox.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 2137ef8..0a7c341 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1752,7 +1752,7 @@ static LRESULT LISTBOX_SetCount( LB_DESCR *descr, INT count ) { LRESULT ret; - if (HAS_STRINGS(descr)) + if (!(descr->style & LBS_NODATA)) { SetLastError(ERROR_SETCOUNT_ON_BAD_LB); return LB_ERR; @@ -2518,6 +2518,9 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc ) if (descr->style & LBS_OWNERDRAWVARIABLE) descr->style |= LBS_NOINTEGRALHEIGHT; descr->item_height = LISTBOX_SetFont( descr, 0 ); + if ((descr->style & (LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_SORT)) != LBS_OWNERDRAWFIXED) + descr->style &= ~LBS_NODATA; + if (descr->style & LBS_OWNERDRAWFIXED) { if( descr->lphc && (descr->lphc->dwStyle & CBS_DROPDOWN)) -- 2.19.1

5 23

[PATCH 1/3] [v2] gdiplus/tests: Add more PNG color format tests.
by Akihiro Sagawa 06 Nov '18

06 Nov '18

In v2, - Fix test failures on broken XP, Vista, 2003. - Fix the expected value for 1bpp gray scale image with tRNS chunk. - Introduce color_space_mask to test other color space flags aren't set. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdiplus/tests/image.c | 226 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 185 insertions(+), 41 deletions(-)

2 1

[PATCH 7/7] winhttp: Properly handle request paths with Unicode characters.
by Hans Leidekker 06 Nov '18

06 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46076 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 202 +++++++++++++++++++++++++++++++++++++---- dlls/winhttp/session.c | 51 ++--------- dlls/winhttp/tests/url.c | 62 +++++++++++++ dlls/winhttp/tests/winhttp.c | 21 ++++- dlls/winhttp/url.c | 74 ++++++++------- dlls/winhttp/winhttp_private.h | 9 -- 6 files changed, 315 insertions(+), 104 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 0409c3c615..77d5315862 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -826,7 +826,6 @@ BOOL WINAPI WinHttpQueryHeaders( HINTERNET hrequest, DWORD level, LPCWSTR name, return ret; } - static const WCHAR basicW[] = {'B','a','s','i','c',0}; static const WCHAR ntlmW[] = {'N','T','L','M',0}; static const WCHAR passportW[] = {'P','a','s','s','p','o','r','t',0}; @@ -2046,6 +2045,176 @@ static void drain_content( request_t *request ) } } +enum escape_flags +{ + ESCAPE_FLAG_NON_PRINTABLE = 0x01, + ESCAPE_FLAG_SPACE = 0x02, + ESCAPE_FLAG_PERCENT = 0x04, + ESCAPE_FLAG_UNSAFE = 0x08, + ESCAPE_FLAG_DEL = 0x10, + ESCAPE_FLAG_8BIT = 0x20, + ESCAPE_FLAG_STRIP_CRLF = 0x40, +}; + +#define ESCAPE_MASK_DEFAULT (ESCAPE_FLAG_NON_PRINTABLE | ESCAPE_FLAG_SPACE | ESCAPE_FLAG_UNSAFE |\ + ESCAPE_FLAG_DEL | ESCAPE_FLAG_8BIT) +#define ESCAPE_MASK_PERCENT (ESCAPE_FLAG_PERCENT | ESCAPE_MASK_DEFAULT) +#define ESCAPE_MASK_DISABLE (ESCAPE_FLAG_SPACE | ESCAPE_FLAG_8BIT | ESCAPE_FLAG_STRIP_CRLF) + +static inline BOOL need_escape( char ch, enum escape_flags flags ) +{ + static const char unsafe[] = "\"#<>[\\]^`{|}"; + const char *ptr = unsafe; + + if ((flags & ESCAPE_FLAG_SPACE) && ch == ' ') return TRUE; + if ((flags & ESCAPE_FLAG_PERCENT) && ch == '%') return TRUE; + if ((flags & ESCAPE_FLAG_NON_PRINTABLE) && ch < 0x20) return TRUE; + if ((flags & ESCAPE_FLAG_DEL) && ch == 0x7f) return TRUE; + if ((flags & ESCAPE_FLAG_8BIT) && (ch & 0x80)) return TRUE; + if ((flags & ESCAPE_FLAG_UNSAFE)) while (*ptr) { if (ch == *ptr++) return TRUE; } + return FALSE; +} + +static DWORD escape_string( const char *src, DWORD len, char *dst, enum escape_flags flags ) +{ + static const char hex[] = "0123456789ABCDEF"; + DWORD i, ret = len; + char *ptr = dst; + + for (i = 0; i < len; i++) + { + if ((flags & ESCAPE_FLAG_STRIP_CRLF) && (src[i] == '\r' || src[i] == '\n')) + { + ret--; + continue; + } + if (need_escape( src[i], flags )) + { + if (dst) + { + ptr[0] = '%'; + ptr[1] = hex[(src[i] >> 4) & 0xf]; + ptr[2] = hex[src[i] & 0xf]; + ptr += 3; + } + ret += 2; + } + else if (dst) *ptr++ = src[i]; + } + + if (dst) dst[ret] = 0; + return ret; +} + +static DWORD str_to_wire( const WCHAR *src, int src_len, char *dst, enum escape_flags flags ) +{ + DWORD len; + char *utf8; + + if (src_len < 0) src_len = strlenW( src ); + len = WideCharToMultiByte( CP_UTF8, 0, src, src_len, NULL, 0, NULL, NULL ); + if (!(utf8 = heap_alloc( len ))) return 0; + + WideCharToMultiByte( CP_UTF8, 0, src, -1, utf8, len, NULL, NULL ); + len = escape_string( utf8, len, dst, flags ); + heap_free( utf8 ); + + return len; +} + +static char *build_wire_path( request_t *request, DWORD *ret_len ) +{ + WCHAR *full_path; + const WCHAR *path, *query = NULL; + DWORD len, len_path = 0, len_query = 0; + enum escape_flags path_flags, query_flags; + char *ret; + + if (!strcmpiW( request->connect->hostname, request->connect->servername )) full_path = request->path; + else if (!(full_path = build_absolute_request_path( request ))) return NULL; + + len = strlenW( full_path ); + if ((path = strchrW( full_path, '/' ))) + { + len_path = strlenW( path ); + if ((query = strchrW( path, '?' ))) + { + len_query = strlenW( query ); + len_path -= len_query; + } + } + + if (request->hdr.flags & WINHTTP_FLAG_ESCAPE_DISABLE) path_flags = ESCAPE_MASK_DISABLE; + else if (request->hdr.flags & WINHTTP_FLAG_ESCAPE_PERCENT) path_flags = ESCAPE_MASK_PERCENT; + else path_flags = ESCAPE_MASK_DEFAULT; + + if (request->hdr.flags & WINHTTP_FLAG_ESCAPE_DISABLE_QUERY) query_flags = ESCAPE_MASK_DISABLE; + else query_flags = path_flags; + + *ret_len = str_to_wire( full_path, len - len_path - len_query, NULL, 0 ); + if (path) *ret_len += str_to_wire( path, len_path, NULL, path_flags ); + if (query) *ret_len += str_to_wire( query, len_query, NULL, query_flags ); + + if ((ret = heap_alloc( *ret_len + 1 ))) + { + len = str_to_wire( full_path, len - len_path - len_query, ret, 0 ); + if (path) len += str_to_wire( path, len_path, ret + len, path_flags ); + if (query) str_to_wire( query, len_query, ret + len, query_flags ); + } + + if (full_path != request->path) heap_free( full_path ); + return ret; +} + +static char *build_wire_request( request_t *request, DWORD *len ) +{ + char *path, *ptr, *ret; + DWORD i, len_path; + + if (!(path = build_wire_path( request, &len_path ))) return NULL; + + *len = str_to_wire( request->verb, -1, NULL, 0 ) + 1; /* ' ' */ + *len += len_path + 1; /* ' ' */ + *len += str_to_wire( request->version, -1, NULL, 0 ); + + for (i = 0; i < request->num_headers; i++) + { + if (request->headers[i].is_request) + { + *len += str_to_wire( request->headers[i].field, -1, NULL, 0 ) + 2; /* ': ' */ + *len += str_to_wire( request->headers[i].value, -1, NULL, 0 ) + 2; /* '\r\n' */ + } + } + *len += 4; /* '\r\n\r\n' */ + + if ((ret = ptr = heap_alloc( *len + 1 ))) + { + ptr += str_to_wire( request->verb, -1, ptr, 0 ); + *ptr++ = ' '; + memcpy( ptr, path, len_path ); + ptr += len_path; + *ptr++ = ' '; + ptr += str_to_wire( request->version, -1, ptr, 0 ); + + for (i = 0; i < request->num_headers; i++) + { + if (request->headers[i].is_request) + { + *ptr++ = '\r'; + *ptr++ = '\n'; + ptr += str_to_wire( request->headers[i].field, -1, ptr, 0 ); + *ptr++ = ':'; + *ptr++ = ' '; + ptr += str_to_wire( request->headers[i].value, -1, ptr, 0 ); + } + } + memcpy( ptr, "\r\n\r\n", sizeof("\r\n\r\n") ); + } + + heap_free( path ); + return ret; +} + static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len, LPVOID optional, DWORD optional_len, DWORD total_len, DWORD_PTR context, BOOL async ) { @@ -2056,8 +2225,7 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len BOOL ret = FALSE; connect_t *connect = request->connect; session_t *session = connect->session; - WCHAR *req = NULL; - char *req_ascii; + char *wire_req; int bytes_sent; DWORD len, i, flags; @@ -2107,16 +2275,13 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len if (context) request->hdr.context = context; if (!(ret = open_connection( request ))) goto end; - if (!(req = build_request_string( request ))) goto end; - - if (!(req_ascii = strdupWA( req ))) goto end; - TRACE("full request: %s\n", debugstr_a(req_ascii)); - len = strlen(req_ascii); + if (!(wire_req = build_wire_request( request, &len ))) goto end; + TRACE("full request: %s\n", debugstr_a(wire_req)); send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST, NULL, 0 ); - ret = netconn_send( request->netconn, req_ascii, len, &bytes_sent ); - heap_free( req_ascii ); + ret = netconn_send( request->netconn, wire_req, len, &bytes_sent ); + heap_free( wire_req ); if (!ret) goto end; if (optional_len) @@ -2140,7 +2305,6 @@ end: send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); } } - heap_free( req ); return ret; } @@ -2524,18 +2688,19 @@ static BOOL handle_redirect( request_t *request, DWORD status ) if (location[0] == '/') { - len = escape_string( NULL, location, len_loc, 0 ); - if (!(path = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; - escape_string( path, location, len_loc, 0 ); + if (!(path = heap_alloc( (len_loc + 1) * sizeof(WCHAR) ))) goto end; + memcpy( path, location, len_loc * sizeof(WCHAR) ); + path[len_loc] = 0; } else { if ((p = strrchrW( request->path, '/' ))) *p = 0; - len = strlenW( request->path ) + 1 + escape_string( NULL, location, len_loc, 0 ); + len = strlenW( request->path ) + 1 + len_loc; if (!(path = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; strcpyW( path, request->path ); strcatW( path, slashW ); - escape_string( path + strlenW(path), location, len_loc, 0 ); + memcpy( path + strlenW(path), location, len_loc * sizeof(WCHAR) ); + path[len_loc] = 0; } heap_free( request->path ); request->path = path; @@ -2586,9 +2751,10 @@ static BOOL handle_redirect( request_t *request, DWORD status ) request->path = NULL; if (uc.dwUrlPathLength) { - len = escape_string( NULL, uc.lpszUrlPath, uc.dwUrlPathLength + uc.dwExtraInfoLength, 0 ); + len = uc.dwUrlPathLength + uc.dwExtraInfoLength; if (!(request->path = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; - escape_string( request->path, uc.lpszUrlPath, uc.dwUrlPathLength + uc.dwExtraInfoLength, 0 ); + memcpy( request->path, uc.lpszUrlPath, (len + 1) * sizeof(WCHAR) ); + request->path[len] = 0; } else request->path = strdupW( slashW ); } diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index d5896e1137..93c10e0679 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1090,47 +1090,16 @@ static BOOL store_accept_types( request_t *request, const WCHAR **accept_types ) return TRUE; } -static WCHAR *get_request_path( const WCHAR *object, DWORD flags ) +static WCHAR *get_request_path( const WCHAR *object ) { - DWORD len, path_len = 0, query_len = 0; - const WCHAR *p = object, *q = NULL; - enum escape_flags path_flags, query_flags; - WCHAR *ret; - - if (flags & WINHTTP_FLAG_ESCAPE_DISABLE) path_flags = ESCAPE_FLAG_SPACE_ONLY|ESCAPE_FLAG_REMOVE_CRLF; - else if (flags & WINHTTP_FLAG_ESCAPE_PERCENT) path_flags = ESCAPE_FLAG_PERCENT; - else path_flags = 0; - - if (flags & WINHTTP_FLAG_ESCAPE_DISABLE_QUERY) query_flags = ESCAPE_FLAG_SPACE_ONLY|ESCAPE_FLAG_REMOVE_CRLF; - else query_flags = path_flags; - - if (object) - { - path_len = strlenW( object ); - if (object[0] == '/') - { - path_len--; - p++; - } - if ((q = strchrW( p, '?' ))) - { - q++; - query_len = path_len - (q - p); - path_len -= query_len + 1; - } - } - - len = escape_string( NULL, p, path_len, path_flags ); - len += escape_string( NULL, q, query_len, query_flags ); - if (!(ret = heap_alloc( (len + 3) * sizeof(WCHAR) ))) return NULL; - - ret[0] = '/'; - len = escape_string( ret + 1, p, path_len, path_flags ) + 1; - if (q) - { - ret[len] = '?'; - escape_string( ret + 1 + len, q, query_len, query_flags ); - } + int len = object ? strlenW(object) : 0; + WCHAR *p, *ret; + + if (!object || object[0] != '/') len++; + if (!(p = ret = heap_alloc( (len + 1) * sizeof(WCHAR) ))) return NULL; + if (!object || object[0] != '/') *p++ = '/'; + if (object) strcpyW( p, object ); + ret[len] = 0; return ret; } @@ -1193,7 +1162,7 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o if (!verb || !verb[0]) verb = getW; if (!(request->verb = strdupW( verb ))) goto end; - if (!(request->path = get_request_path( object, flags ))) goto end; + if (!(request->path = get_request_path( object ))) goto end; if (!version || !version[0]) version = http1_1; if (!(request->version = strdupW( version ))) goto end; diff --git a/dlls/winhttp/tests/url.c b/dlls/winhttp/tests/url.c index 1980ad4da2..0a31e181c2 100644 --- a/dlls/winhttp/tests/url.c +++ b/dlls/winhttp/tests/url.c @@ -35,6 +35,8 @@ static WCHAR about[] = {'/','s','i','t','e','/','a','b','o','u','t',0}; static WCHAR query[] = {'?','q','u','e','r','y',0}; static WCHAR escape[] = {' ','!','"','#','$','%','&','\'','(',')','*','+',',','-','.','/',':',';','<','=','>','?','@','[','\\',']','^','_','`','{','|','}','~',0}; static WCHAR escape2[] = {'\r',0x1f,' ','\n',0x7f,'\r','\n',0}; +static WCHAR escape3[] = {'?','t','e','x','t','=',0xfb00,0}; +static WCHAR escape4[] = {'/','t','e','x','t','=',0xfb00,0}; static const WCHAR url1[] = {'h','t','t','p',':','/','/','u','s','e','r','n','a','m','e',':','p','a','s','s','w','o','r','d', @@ -75,6 +77,10 @@ static const WCHAR url16[] = {'h','t','t','p',':','/','/','w','i','n','e','h','q static const WCHAR url17[] = {'h','t','t','p',':','/','/','w','i','n','e','h','q','.','o','r','g',':',0}; static const WCHAR url18[] = {'h','t','t','p',':','/','/','%','0','D','%','1','F','%','2','0','%','0','A','%','7','F','%','0','D','%','0','A',0}; +static const WCHAR url19[] = + {'h','t','t','p',':','/','/','?','t','e','x','t','=',0xfb00,0}; +static const WCHAR url20[] = + {'h','t','t','p',':','/','/','/','t','e','x','t','=',0xfb00,0}; static const WCHAR url_k1[] = {'h','t','t','p',':','/','/','u','s','e','r','n','a','m','e',':','p','a','s','s','w','o','r','d', @@ -318,6 +324,34 @@ static void WinHttpCreateUrl_test( void ) ok( len == lstrlenW(url18), "expected len %u got %u\n", lstrlenW(url18), len ); ok( !lstrcmpW( url, url18 ), "url doesn't match\n" ); + /* extra info with Unicode characters */ + memset( &uc, 0, sizeof(uc) ); + uc.dwStructSize = sizeof(uc); + uc.lpszExtraInfo = escape3; + uc.dwExtraInfoLength = lstrlenW( uc.lpszExtraInfo ); + url[0] = 0; + len = 256; + SetLastError( 0xdeadbeef ); + ret = WinHttpCreateUrl( &uc, ICU_ESCAPE, url, &len ); + err = GetLastError(); + ok( !ret, "expected failure\n" ); + ok( err == ERROR_INVALID_PARAMETER, "got %u\n", err ); + + /* extra info with Unicode characters, no ICU_ESCAPE */ + memset( &uc, 0, sizeof(uc) ); + uc.dwStructSize = sizeof(uc); + uc.lpszExtraInfo = escape3; + uc.dwExtraInfoLength = lstrlenW( uc.lpszExtraInfo ); + url[0] = 0; + len = 256; + ret = WinHttpCreateUrl( &uc, 0, url, &len ); + ok( ret || broken(!ret) /* < win7 */, "expected success\n" ); + if (ret) + { + ok( len == lstrlenW(url19), "expected len %u got %u\n", lstrlenW(url19), len ); + ok( !lstrcmpW( url, url19 ), "url doesn't match %s\n", wine_dbgstr_w(url) ); + } + /* escape path */ memset( &uc, 0, sizeof(uc) ); uc.dwStructSize = sizeof(uc); @@ -330,6 +364,34 @@ static void WinHttpCreateUrl_test( void ) ok( len == lstrlenW(url18), "expected len %u got %u\n", lstrlenW(url18), len ); ok( !lstrcmpW( url, url18 ), "url doesn't match\n" ); + /* path with Unicode characters */ + memset( &uc, 0, sizeof(uc) ); + uc.dwStructSize = sizeof(uc); + uc.lpszUrlPath = escape4; + uc.dwUrlPathLength = lstrlenW( uc.lpszUrlPath ); + url[0] = 0; + len = 256; + SetLastError( 0xdeadbeef ); + ret = WinHttpCreateUrl( &uc, ICU_ESCAPE, url, &len ); + err = GetLastError(); + ok( !ret, "expected failure\n" ); + ok( err == ERROR_INVALID_PARAMETER, "got %u\n", err ); + + /* path with Unicode characters, no ICU_ESCAPE */ + memset( &uc, 0, sizeof(uc) ); + uc.dwStructSize = sizeof(uc); + uc.lpszUrlPath = escape4; + uc.dwUrlPathLength = lstrlenW( uc.lpszUrlPath ); + url[0] = 0; + len = 256; + ret = WinHttpCreateUrl( &uc, 0, url, &len ); + ok( ret || broken(!ret) /* < win7 */, "expected success\n" ); + if (ret) + { + ok( len == lstrlenW(url20), "expected len %u got %u\n", lstrlenW(url20), len ); + ok( !lstrcmpW( url, url20 ), "url doesn't match %s\n", wine_dbgstr_w(url) ); + } + /* NULL lpszScheme, 0 nScheme and nPort */ fill_url_components( &uc ); uc.lpszScheme = NULL; diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index e13f95057b..70d0b4c747 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2368,9 +2368,16 @@ static DWORD CALLBACK server_thread(LPVOID param) "%5E_%60%7B%7C%7D~%0D%0A "; static const char res3[] = "\x1f\x7f<%20%three?\x1f\x7f%20!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~ "; static const char res4[] = "%0D%0A%1F%7F%3C%20%four?\x1f\x7f%20!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~ "; + static const char res5[] = "&text=one%C2%80%7F~"; + static const char res6[] = "&text=two%C2%80\x7f~"; + static const char res7[] = "&text=%E5%90%9B%E3%81%AE%E5%90%8D%E3%81%AF"; if (strstr(buffer + 11, res) || strstr(buffer + 11, res2) || strstr(buffer + 11, res3) || - strstr(buffer + 11, res4 )) send(c, okmsg, sizeof(okmsg) - 1, 0); + strstr(buffer + 11, res4) || strstr(buffer + 11, res5) || strstr(buffer + 11, res6) || + strstr(buffer + 11, res7)) + { + send(c, okmsg, sizeof(okmsg) - 1, 0); + } else send(c, notokmsg, sizeof(notokmsg) - 1, 0); } if (strstr(buffer, "GET /quit")) @@ -3367,7 +3374,8 @@ static void do_request( HINTERNET con, const WCHAR *obj, DWORD flags ) size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); ok( ret, "failed to query status code %u\n", GetLastError() ); - ok( status == HTTP_STATUS_OK, "request %s with flags %08x failed %u\n", wine_dbgstr_w(obj), flags, status ); + ok( status == HTTP_STATUS_OK || broken(status == HTTP_STATUS_BAD_REQUEST) /* < win7 */, + "request %s with flags %08x failed %u\n", wine_dbgstr_w(obj), flags, status ); WinHttpCloseHandle( req ); } @@ -3389,6 +3397,12 @@ static void test_request_path_escapes( int port ) {'/','e','s','c','a','p','e','\r','\n',0x1f,0x7f,'<',' ','%','f','o','u','r','?',0x1f,0x7f,' ','!','"', '#','$','%','&','\'','(',')','*','+',',','-','.','/',':',';','<','=','>','?','@','[','\\',']','^','_', '`','{','|','}','~','\r','\n',0}; + static const WCHAR obj5W[] = + {'/','e','s','c','a','p','e','&','t','e','x','t','=','o','n','e',0x80,0x7f,0x7e,0}; + static const WCHAR obj6W[] = + {'/','e','s','c','a','p','e','&','t','e','x','t','=','t','w','o',0x80,0x7f,0x7e,0}; + static const WCHAR obj7W[] = + {'/','e','s','c','a','p','e','&','t','e','x','t','=',0x541b,0x306e,0x540d,0x306f,0}; HINTERNET ses, con; ses = WinHttpOpen( test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); @@ -3401,6 +3415,9 @@ static void test_request_path_escapes( int port ) do_request( con, obj2W, WINHTTP_FLAG_ESCAPE_PERCENT ); do_request( con, obj3W, WINHTTP_FLAG_ESCAPE_DISABLE ); do_request( con, obj4W, WINHTTP_FLAG_ESCAPE_DISABLE_QUERY ); + do_request( con, obj5W, 0 ); + do_request( con, obj6W, WINHTTP_FLAG_ESCAPE_DISABLE ); + do_request( con, obj7W, WINHTTP_FLAG_ESCAPE_DISABLE ); WinHttpCloseHandle( con ); WinHttpCloseHandle( ses ); diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 2019305ab3..f66e5105ab 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -87,16 +87,11 @@ static WCHAR *decode_url( LPCWSTR url, DWORD *len ) return ret; } - -static BOOL need_escape( WCHAR ch, enum escape_flags flags ) +static inline BOOL need_escape( WCHAR ch ) { - static const WCHAR escapes[] = {' ','"','#','<','>','[','\\',']','^','`','{','|','}',0}; + static const WCHAR escapes[] = {' ','"','#','%','<','>','[','\\',']','^','`','{','|','}','~',0}; const WCHAR *p = escapes; - if (ch != ' ' && (flags & ESCAPE_FLAG_SPACE_ONLY)) return FALSE; - if (ch == '%' && (flags & ESCAPE_FLAG_PERCENT)) return TRUE; - if (ch == '~' && (flags & ESCAPE_FLAG_TILDE)) return TRUE; - if (ch <= 31 || ch >= 127) return TRUE; while (*p) { @@ -105,21 +100,17 @@ static BOOL need_escape( WCHAR ch, enum escape_flags flags ) return FALSE; } -DWORD escape_string( WCHAR *dst, const WCHAR *src, DWORD len, enum escape_flags flags ) +static BOOL escape_string( const WCHAR *src, DWORD src_len, WCHAR *dst, DWORD *dst_len ) { static const WCHAR hex[] = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'}; - DWORD ret = len; - unsigned int i; WCHAR *p = dst; + DWORD i; - for (i = 0; i < len; i++) + *dst_len = src_len; + for (i = 0; i < src_len; i++) { - if ((flags & ESCAPE_FLAG_REMOVE_CRLF) && (src[i] == '\r' || src[i] == '\n')) - { - ret--; - continue; - } - if (need_escape( src[i], flags )) + if (src[i] > 0xff) return FALSE; + if (need_escape( src[i] )) { if (dst) { @@ -128,25 +119,24 @@ DWORD escape_string( WCHAR *dst, const WCHAR *src, DWORD len, enum escape_flags p[2] = hex[src[i] & 0xf]; p += 3; } - ret += 2; + *dst_len += 2; } else if (dst) *p++ = src[i]; } - if (dst) dst[ret] = 0; - return ret; + if (dst) dst[*dst_len] = 0; + return TRUE; } -static WCHAR *escape_url( const WCHAR *url, DWORD *len ) +static DWORD escape_url( const WCHAR *url, DWORD *len, WCHAR **ret ) { - WCHAR *ret; const WCHAR *p; DWORD len_base, len_path; if ((p = strrchrW( url, '/' ))) { len_base = p - url; - len_path = escape_string( NULL, p, *len - len_base, ESCAPE_FLAG_PERCENT|ESCAPE_FLAG_TILDE ); + if (!escape_string( p, *len - len_base, NULL, &len_path )) return ERROR_INVALID_PARAMETER; } else { @@ -154,14 +144,14 @@ static WCHAR *escape_url( const WCHAR *url, DWORD *len ) len_path = 0; } - if (!(ret = heap_alloc( (len_base + len_path + 1) * sizeof(WCHAR) ))) return NULL; - memcpy( ret, url, len_base * sizeof(WCHAR) ); + if (!(*ret = heap_alloc( (len_base + len_path + 1) * sizeof(WCHAR) ))) return ERROR_OUTOFMEMORY; + memcpy( *ret, url, len_base * sizeof(WCHAR) ); - if (p) escape_string( ret + len_base, p, *len - (p - url), ESCAPE_FLAG_PERCENT|ESCAPE_FLAG_TILDE ); - ret[len_base + len_path] = 0; + if (p) escape_string( p, *len - (p - url), *ret + len_base, &len_path ); + (*ret)[len_base + len_path] = 0; *len = len_base + len_path; - return ret; + return ERROR_SUCCESS; } static DWORD parse_port( const WCHAR *str, DWORD len, INTERNET_PORT *ret ) @@ -198,9 +188,9 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN if (flags & ICU_ESCAPE) { - if (!(url_escaped = escape_url( url, &len ))) + if ((err = escape_url( url, &len, &url_escaped ))) { - set_last_error( ERROR_OUTOFMEMORY ); + set_last_error( err ); return FALSE; } url = url_escaped; @@ -349,7 +339,7 @@ static DWORD get_comp_length( DWORD len, DWORD flags, WCHAR *comp ) ret = len ? len : strlenW( comp ); if (!(flags & ICU_ESCAPE)) return ret; - for (i = 0; i < len; i++) if (need_escape( comp[i], ESCAPE_FLAG_PERCENT|ESCAPE_FLAG_TILDE )) ret += 2; + for (i = 0; i < len; i++) if (need_escape( comp[i] )) ret += 2; return ret; } @@ -415,7 +405,7 @@ static BOOL get_url_length( URL_COMPONENTS *uc, DWORD flags, DWORD *len ) BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDWORD required ) { static const WCHAR formatW[] = {'%','u',0}; - DWORD len; + DWORD len, len_escaped; INTERNET_SCHEME scheme; TRACE("%p, 0x%08x, %p, %p\n", uc, flags, url, required); @@ -503,7 +493,15 @@ BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDW if (uc->lpszUrlPath) { len = get_comp_length( uc->dwUrlPathLength, 0, uc->lpszUrlPath ); - if (flags & ICU_ESCAPE) url += escape_string( url, uc->lpszUrlPath, len, ESCAPE_FLAG_PERCENT|ESCAPE_FLAG_TILDE ); + if (flags & ICU_ESCAPE) + { + if (!escape_string( uc->lpszUrlPath, len, url, &len_escaped )) + { + set_last_error( ERROR_INVALID_PARAMETER ); + return FALSE; + } + url += len_escaped; + } else { memcpy( url, uc->lpszUrlPath, len * sizeof(WCHAR) ); @@ -513,7 +511,15 @@ BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDW if (uc->lpszExtraInfo) { len = get_comp_length( uc->dwExtraInfoLength, 0, uc->lpszExtraInfo ); - if (flags & ICU_ESCAPE) url += escape_string( url, uc->lpszExtraInfo, len, ESCAPE_FLAG_PERCENT|ESCAPE_FLAG_TILDE ); + if (flags & ICU_ESCAPE) + { + if (!escape_string( uc->lpszExtraInfo, len, url, &len_escaped )) + { + set_last_error( ERROR_INVALID_PARAMETER ); + return FALSE; + } + url += len_escaped; + } else { memcpy( url, uc->lpszExtraInfo, len * sizeof(WCHAR) ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index e50e5fad80..cbf9a36599 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -292,15 +292,6 @@ void destroy_authinfo( struct authinfo * ) DECLSPEC_HIDDEN; void release_host( hostdata_t *host ) DECLSPEC_HIDDEN; -enum escape_flags -{ - ESCAPE_FLAG_REMOVE_CRLF = 0x01, - ESCAPE_FLAG_SPACE_ONLY = 0x02, - ESCAPE_FLAG_PERCENT = 0x04, - ESCAPE_FLAG_TILDE = 0x08, -}; -DWORD escape_string( WCHAR *, const WCHAR *, DWORD, enum escape_flags ) DECLSPEC_HIDDEN; - extern HRESULT WinHttpRequest_create( void ** ) DECLSPEC_HIDDEN; void release_typelib( void ) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 6/7] winhttp: Simplify build_request_string.
by Hans Leidekker 06 Nov '18

06 Nov '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 120 +++++++++++++++++++++---------------------------- 1 file changed, 50 insertions(+), 70 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index e3cc39433f..0409c3c615 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -541,98 +541,78 @@ BOOL WINAPI WinHttpAddRequestHeaders( HINTERNET hrequest, LPCWSTR headers, DWORD return ret; } -static WCHAR *build_request_path( request_t *request ) +static WCHAR *build_absolute_request_path( request_t *request ) { + static const WCHAR http[] = {'h','t','t','p',0}; + static const WCHAR https[] = {'h','t','t','p','s',0}; + static const WCHAR fmt[] = {'%','s',':','/','/','%','s',0}; + const WCHAR *scheme; WCHAR *ret; + int len; - if (strcmpiW( request->connect->hostname, request->connect->servername )) - { - static const WCHAR http[] = { 'h','t','t','p',0 }; - static const WCHAR https[] = { 'h','t','t','p','s',0 }; - static const WCHAR fmt[] = { '%','s',':','/','/','%','s',0 }; - LPCWSTR scheme = (request->netconn ? request->netconn->secure : (request->hdr.flags & WINHTTP_FLAG_SECURE)) ? https : http; - int len; + scheme = (request->netconn ? request->netconn->secure : (request->hdr.flags & WINHTTP_FLAG_SECURE)) ? https : http; - len = strlenW( scheme ) + strlenW( request->connect->hostname ); - /* 3 characters for '://', 1 for NUL. */ - len += 4; + len = strlenW( scheme ) + strlenW( request->connect->hostname ) + 4; /* '://' + nul */ + if (request->connect->hostport) len += 6; /* ':' between host and port, up to 5 for port */ + + if (request->path) len += strlenW( request->path ); + if ((ret = heap_alloc( len * sizeof(WCHAR) ))) + { + len = sprintfW( ret, fmt, scheme, request->connect->hostname ); if (request->connect->hostport) { - /* 1 for ':' between host and port, up to 5 for port */ - len += 6; - } - if (request->path) - len += strlenW( request->path ); - if ((ret = heap_alloc( len * sizeof(WCHAR) ))) - { - sprintfW( ret, fmt, scheme, request->connect->hostname ); - if (request->connect->hostport) - { - static const WCHAR colonFmt[] = { ':','%','u',0 }; - - sprintfW( ret + strlenW( ret ), colonFmt, - request->connect->hostport ); - } - if (request->path) - strcatW( ret, request->path ); + static const WCHAR port_fmt[] = {':','%','u',0}; + sprintfW( ret + len, port_fmt, request->connect->hostport ); } + if (request->path) strcatW( ret, request->path ); } - else - ret = request->path; + return ret; } static WCHAR *build_request_string( request_t *request ) { - static const WCHAR space[] = {' ',0}; - static const WCHAR crlf[] = {'\r','\n',0}; - static const WCHAR colon[] = {':',' ',0}; - static const WCHAR twocrlf[] = {'\r','\n','\r','\n',0}; - + static const WCHAR spaceW[] = {' ',0}, crlfW[] = {'\r','\n',0}, colonW[] = {':',' ',0}; + static const WCHAR twocrlfW[] = {'\r','\n','\r','\n',0}; WCHAR *path, *ret; - const WCHAR **headers, **p; - unsigned int len, i = 0, j; + unsigned int i, len; - /* allocate space for an array of all the string pointers to be added */ - len = request->num_headers * 4 + 7; - if (!(headers = heap_alloc( len * sizeof(LPCWSTR) ))) return NULL; + if (!strcmpiW( request->connect->hostname, request->connect->servername )) path = request->path; + else if (!(path = build_absolute_request_path( request ))) return NULL; - path = build_request_path( request ); - headers[i++] = request->verb; - headers[i++] = space; - headers[i++] = path; - headers[i++] = space; - headers[i++] = request->version; + len = strlenW( request->verb ) + 1 /* ' ' */; + len += strlenW( path ) + 1 /* ' ' */; + len += strlenW( request->version ); - for (j = 0; j < request->num_headers; j++) + for (i = 0; i < request->num_headers; i++) { - if (request->headers[j].is_request) - { - headers[i++] = crlf; - headers[i++] = request->headers[j].field; - headers[i++] = colon; - headers[i++] = request->headers[j].value; - - TRACE("adding header %s (%s)\n", debugstr_w(request->headers[j].field), - debugstr_w(request->headers[j].value)); - } + if (request->headers[i].is_request) + len += strlenW( request->headers[i].field ) + strlenW( request->headers[i].value ) + 4; /* '\r\n: ' */ } - headers[i++] = twocrlf; - headers[i] = NULL; + len += 4; /* '\r\n\r\n' */ - len = 0; - for (p = headers; *p; p++) len += strlenW( *p ); - len++; + if ((ret = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + { + strcpyW( ret, request->verb ); + strcatW( ret, spaceW ); + strcatW( ret, path ); + strcatW( ret, spaceW ); + strcatW( ret, request->version ); - if (!(ret = heap_alloc( len * sizeof(WCHAR) ))) - goto out; - *ret = 0; - for (p = headers; *p; p++) strcatW( ret, *p ); + for (i = 0; i < request->num_headers; i++) + { + if (request->headers[i].is_request) + { + strcatW( ret, crlfW ); + strcatW( ret, request->headers[i].field ); + strcatW( ret, colonW ); + strcatW( ret, request->headers[i].value ); + } + } + strcatW( ret, twocrlfW ); + } -out: - if (path != request->path) - heap_free( path ); - heap_free( headers ); + if (path != request->path) heap_free( path ); return ret; } -- 2.11.0

1 0

[PATCH 5/7] winhttp: Get rid of send_request_t.
by Hans Leidekker 06 Nov '18

06 Nov '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 6 +++--- dlls/winhttp/winhttp_private.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 2475a5efd2..e3cc39433f 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2166,7 +2166,7 @@ end: static void task_send_request( struct task_header *task ) { - send_request_t *s = (send_request_t *)task; + struct send_request *s = (struct send_request *)task; send_request( s->hdr.request, s->headers, s->headers_len, s->optional, s->optional_len, s->total_len, s->context, TRUE ); heap_free( s->headers ); } @@ -2199,9 +2199,9 @@ BOOL WINAPI WinHttpSendRequest( HINTERNET hrequest, LPCWSTR headers, DWORD heade if (request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) { - send_request_t *s; + struct send_request *s; - if (!(s = heap_alloc( sizeof(send_request_t) ))) return FALSE; + if (!(s = heap_alloc( sizeof(struct send_request) ))) return FALSE; s->hdr.request = request; s->hdr.proc = task_send_request; s->headers = strdupW( headers ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index ec6464a1db..e50e5fad80 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -221,16 +221,16 @@ struct task_header void (*proc)( struct task_header * ); }; -typedef struct +struct send_request { struct task_header hdr; - LPWSTR headers; + WCHAR *headers; DWORD headers_len; - LPVOID optional; + void *optional; DWORD optional_len; DWORD total_len; DWORD_PTR context; -} send_request_t; +}; typedef struct { -- 2.11.0

1 0

[PATCH 4/7] winhttp: Get rid of header_t.
by Hans Leidekker 06 Nov '18

06 Nov '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 33 +++++++++++++++++---------------- dlls/winhttp/winhttp_private.h | 10 +++++----- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 7ce3deffec..2475a5efd2 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -265,7 +265,7 @@ static BOOL queue_task( struct task_header *task ) return TRUE; } -static void free_header( header_t *header ) +static void free_header( struct header *header ) { heap_free( header->field ); heap_free( header->value ); @@ -293,10 +293,10 @@ static BOOL valid_token_char( WCHAR c ) } } -static header_t *parse_header( LPCWSTR string ) +static struct header *parse_header( const WCHAR *string ) { const WCHAR *p, *q; - header_t *header; + struct header *header; int len; p = string; @@ -320,7 +320,7 @@ static header_t *parse_header( LPCWSTR string ) p++; } len = q - string; - if (!(header = heap_alloc_zero( sizeof(header_t) ))) return NULL; + if (!(header = heap_alloc_zero( sizeof(struct header) ))) return NULL; if (!(header->field = heap_alloc( (len + 1) * sizeof(WCHAR) ))) { heap_free( header ); @@ -364,15 +364,15 @@ static int get_header_index( request_t *request, LPCWSTR field, int requested_in return index; } -static BOOL insert_header( request_t *request, header_t *header ) +static BOOL insert_header( request_t *request, struct header *header ) { DWORD count = request->num_headers + 1; - header_t *hdrs; + struct header *hdrs; if (request->headers) - hdrs = heap_realloc_zero( request->headers, sizeof(header_t) * count ); + hdrs = heap_realloc_zero( request->headers, sizeof(struct header) * count ); else - hdrs = heap_alloc_zero( sizeof(header_t) ); + hdrs = heap_alloc_zero( sizeof(struct header) ); if (!hdrs) return FALSE; request->headers = hdrs; @@ -392,15 +392,16 @@ static BOOL delete_header( request_t *request, DWORD index ) heap_free( request->headers[index].field ); heap_free( request->headers[index].value ); - memmove( &request->headers[index], &request->headers[index + 1], (request->num_headers - index) * sizeof(header_t) ); - memset( &request->headers[request->num_headers], 0, sizeof(header_t) ); + memmove( &request->headers[index], &request->headers[index + 1], + (request->num_headers - index) * sizeof(struct header) ); + memset( &request->headers[request->num_headers], 0, sizeof(struct header) ); return TRUE; } static BOOL process_header( request_t *request, LPCWSTR field, LPCWSTR value, DWORD flags, BOOL request_only ) { int index; - header_t hdr; + struct header hdr; TRACE("%s: %s 0x%08x\n", debugstr_w(field), debugstr_w(value), flags); @@ -435,7 +436,7 @@ static BOOL process_header( request_t *request, LPCWSTR field, LPCWSTR value, DW { WCHAR *tmp; int len, len_orig, len_value; - header_t *header = &request->headers[index]; + struct header *header = &request->headers[index]; len_orig = strlenW( header->value ); len_value = strlenW( value ); @@ -466,7 +467,7 @@ BOOL add_request_headers( request_t *request, LPCWSTR headers, DWORD len, DWORD { BOOL ret = FALSE; WCHAR *buffer, *p, *q; - header_t *header; + struct header *header; if (len == ~0u) len = strlenW( headers ); if (!len) return TRUE; @@ -639,7 +640,7 @@ out: static BOOL query_headers( request_t *request, DWORD level, LPCWSTR name, LPVOID buffer, LPDWORD buflen, LPDWORD index ) { - header_t *header = NULL; + struct header *header = NULL; BOOL request_only, ret = FALSE; int requested_index, header_index = -1; DWORD attr, len; @@ -2458,7 +2459,7 @@ static BOOL read_reply( request_t *request ) offset = buflen + crlf_len - 1; for (;;) { - header_t *header; + struct header *header; buflen = MAX_REPLY_LEN; if (!read_line( request, buffer, &buflen )) return TRUE; @@ -2499,7 +2500,7 @@ static void record_cookies( request_t *request ) for (i = 0; i < request->num_headers; i++) { - header_t *set_cookie = &request->headers[i]; + struct header *set_cookie = &request->headers[i]; if (!strcmpiW( set_cookie->field, attr_set_cookie ) && !set_cookie->is_request) { set_cookies( request, set_cookie->value ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 1fce4a930a..ec6464a1db 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -129,12 +129,12 @@ typedef struct size_t peek_len; } netconn_t; -typedef struct +struct header { - LPWSTR field; - LPWSTR value; + WCHAR *field; + WCHAR *value; BOOL is_request; /* part of request headers? */ -} header_t; +}; enum auth_target { @@ -196,7 +196,7 @@ typedef struct DWORD read_pos; /* current read position in read_buf */ DWORD read_size; /* valid data size in read_buf */ char read_buf[8192]; /* buffer for already read but not returned data */ - header_t *headers; + struct header *headers; DWORD num_headers; WCHAR **accept_types; DWORD num_accept_types; -- 2.11.0

1 0

[PATCH 3/7] winhttp: Get rid of task_header_t.
by Hans Leidekker 06 Nov '18

06 Nov '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 30 +++++++++++++++--------------- dlls/winhttp/winhttp_private.h | 16 +++++++--------- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index d1010239cc..7ce3deffec 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -177,13 +177,13 @@ static const WCHAR *attribute_table[] = NULL /* WINHTTP_QUERY_PASSPORT_CONFIG = 78 */ }; -static task_header_t *dequeue_task( request_t *request ) +static struct task_header *dequeue_task( request_t *request ) { - task_header_t *task; + struct task_header *task; EnterCriticalSection( &request->task_cs ); TRACE("%u tasks queued\n", list_count( &request->task_queue )); - task = LIST_ENTRY( list_head( &request->task_queue ), task_header_t, entry ); + task = LIST_ENTRY( list_head( &request->task_queue ), struct task_header, entry ); if (task) list_remove( &task->entry ); LeaveCriticalSection( &request->task_cs ); @@ -205,7 +205,7 @@ static DWORD CALLBACK task_proc( LPVOID param ) { case WAIT_OBJECT_0: { - task_header_t *task; + struct task_header *task; while ((task = dequeue_task( request ))) { task->proc( task ); @@ -231,7 +231,7 @@ static DWORD CALLBACK task_proc( LPVOID param ) return 0; } -static BOOL queue_task( task_header_t *task ) +static BOOL queue_task( struct task_header *task ) { request_t *request = task->request; @@ -2163,7 +2163,7 @@ end: return ret; } -static void task_send_request( task_header_t *task ) +static void task_send_request( struct task_header *task ) { send_request_t *s = (send_request_t *)task; send_request( s->hdr.request, s->headers, s->headers_len, s->optional, s->optional_len, s->total_len, s->context, TRUE ); @@ -2211,7 +2211,7 @@ BOOL WINAPI WinHttpSendRequest( HINTERNET hrequest, LPCWSTR headers, DWORD heade s->context = context; addref_object( &request->hdr ); - ret = queue_task( (task_header_t *)s ); + ret = queue_task( (struct task_header *)s ); } else ret = send_request( request, headers, headers_len, optional, optional_len, total_len, context, FALSE ); @@ -2690,7 +2690,7 @@ static BOOL receive_response( request_t *request, BOOL async ) return ret; } -static void task_receive_response( task_header_t *task ) +static void task_receive_response( struct task_header *task ) { receive_response_t *r = (receive_response_t *)task; receive_response( r->hdr.request, TRUE ); @@ -2727,7 +2727,7 @@ BOOL WINAPI WinHttpReceiveResponse( HINTERNET hrequest, LPVOID reserved ) r->hdr.proc = task_receive_response; addref_object( &request->hdr ); - ret = queue_task( (task_header_t *)r ); + ret = queue_task( (struct task_header *)r ); } else ret = receive_response( request, FALSE ); @@ -2761,7 +2761,7 @@ done: return TRUE; } -static void task_query_data_available( task_header_t *task ) +static void task_query_data_available( struct task_header *task ) { query_data_t *q = (query_data_t *)task; query_data_available( q->hdr.request, q->available, TRUE ); @@ -2799,7 +2799,7 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) q->available = available; addref_object( &request->hdr ); - ret = queue_task( (task_header_t *)q ); + ret = queue_task( (struct task_header *)q ); } else ret = query_data_available( request, available, FALSE ); @@ -2809,7 +2809,7 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) return ret; } -static void task_read_data( task_header_t *task ) +static void task_read_data( struct task_header *task ) { read_data_t *r = (read_data_t *)task; read_data( r->hdr.request, r->buffer, r->to_read, r->read, TRUE ); @@ -2849,7 +2849,7 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, LPVOID buffer, DWORD to_read, L r->read = read; addref_object( &request->hdr ); - ret = queue_task( (task_header_t *)r ); + ret = queue_task( (struct task_header *)r ); } else ret = read_data( request, buffer, to_read, read, FALSE ); @@ -2881,7 +2881,7 @@ static BOOL write_data( request_t *request, LPCVOID buffer, DWORD to_write, LPDW return ret; } -static void task_write_data( task_header_t *task ) +static void task_write_data( struct task_header *task ) { write_data_t *w = (write_data_t *)task; write_data( w->hdr.request, w->buffer, w->to_write, w->written, TRUE ); @@ -2921,7 +2921,7 @@ BOOL WINAPI WinHttpWriteData( HINTERNET hrequest, LPCVOID buffer, DWORD to_write w->written = written; addref_object( &request->hdr ); - ret = queue_task( (task_header_t *)w ); + ret = queue_task( (struct task_header *)w ); } else ret = write_data( request, buffer, to_write, written, FALSE ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 708840096a..1fce4a930a 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -214,18 +214,16 @@ typedef struct } creds[TARGET_MAX][SCHEME_MAX]; } request_t; -typedef struct _task_header_t task_header_t; - -struct _task_header_t +struct task_header { struct list entry; request_t *request; - void (*proc)( task_header_t * ); + void (*proc)( struct task_header * ); }; typedef struct { - task_header_t hdr; + struct task_header hdr; LPWSTR headers; DWORD headers_len; LPVOID optional; @@ -236,18 +234,18 @@ typedef struct typedef struct { - task_header_t hdr; + struct task_header hdr; } receive_response_t; typedef struct { - task_header_t hdr; + struct task_header hdr; LPDWORD available; } query_data_t; typedef struct { - task_header_t hdr; + struct task_header hdr; LPVOID buffer; DWORD to_read; LPDWORD read; @@ -255,7 +253,7 @@ typedef struct typedef struct { - task_header_t hdr; + struct task_header hdr; LPCVOID buffer; DWORD to_write; LPDWORD written; -- 2.11.0

1 0

[PATCH 2/7] winhttp: Get rid of domain_t.
by Hans Leidekker 06 Nov '18

06 Nov '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/cookie.c | 37 ++++++++++++++++++++++++++++--------- dlls/winhttp/session.c | 8 +------- dlls/winhttp/winhttp_private.h | 9 +-------- 3 files changed, 30 insertions(+), 24 deletions(-) diff --git a/dlls/winhttp/cookie.c b/dlls/winhttp/cookie.c index 098db68e95..0a7f7f0e1c 100644 --- a/dlls/winhttp/cookie.c +++ b/dlls/winhttp/cookie.c @@ -38,11 +38,18 @@ struct cookie WCHAR *path; }; -static domain_t *add_domain( session_t *session, WCHAR *name ) +struct domain { - domain_t *domain; + struct list entry; + WCHAR *name; + struct list cookies; +}; - if (!(domain = heap_alloc_zero( sizeof(domain_t) ))) return NULL; +static struct domain *add_domain( session_t *session, WCHAR *name ) +{ + struct domain *domain; + + if (!(domain = heap_alloc_zero( sizeof(struct domain) ))) return NULL; list_init( &domain->entry ); list_init( &domain->cookies ); @@ -54,7 +61,7 @@ static domain_t *add_domain( session_t *session, WCHAR *name ) return domain; } -static struct cookie *find_cookie( domain_t *domain, const WCHAR *path, const WCHAR *name ) +static struct cookie *find_cookie( struct domain *domain, const WCHAR *path, const WCHAR *name ) { struct list *item; struct cookie *cookie; @@ -71,7 +78,7 @@ static struct cookie *find_cookie( domain_t *domain, const WCHAR *path, const WC return NULL; } -static BOOL domain_match( const WCHAR *name, domain_t *domain, BOOL partial ) +static BOOL domain_match( const WCHAR *name, struct domain *domain, BOOL partial ) { TRACE("comparing %s with %s\n", debugstr_w(name), debugstr_w(domain->name)); @@ -94,7 +101,7 @@ static void delete_cookie( struct cookie *cookie ) free_cookie( cookie ); } -void delete_domain( domain_t *domain ) +static void delete_domain( struct domain *domain ) { struct cookie *cookie; struct list *item, *next; @@ -110,9 +117,21 @@ void delete_domain( domain_t *domain ) heap_free( domain ); } +void destroy_cookies( session_t *session ) +{ + struct list *item, *next; + struct domain *domain; + + LIST_FOR_EACH_SAFE( item, next, &session->cookie_cache ) + { + domain = LIST_ENTRY( item, struct domain, entry ); + delete_domain( domain ); + } +} + static BOOL add_cookie( session_t *session, struct cookie *cookie, WCHAR *domain_name, WCHAR *path ) { - domain_t *domain = NULL; + struct domain *domain = NULL; struct cookie *old_cookie; struct list *item; @@ -122,7 +141,7 @@ static BOOL add_cookie( session_t *session, struct cookie *cookie, WCHAR *domain LIST_FOR_EACH( item, &session->cookie_cache ) { - domain = LIST_ENTRY( item, domain_t, entry ); + domain = LIST_ENTRY( item, struct domain, entry ); if (domain_match( domain_name, domain, FALSE )) break; domain = NULL; } @@ -311,7 +330,7 @@ BOOL add_cookie_headers( request_t *request ) LIST_FOR_EACH( domain_cursor, &session->cookie_cache ) { - domain_t *domain = LIST_ENTRY( domain_cursor, domain_t, entry ); + struct domain *domain = LIST_ENTRY( domain_cursor, struct domain, entry ); if (domain_match( request->connect->servername, domain, TRUE )) { struct list *cookie_cursor; diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index b9d9ab8e1f..d5896e1137 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -89,19 +89,13 @@ BOOL WINAPI WinHttpCheckPlatform( void ) static void session_destroy( object_header_t *hdr ) { session_t *session = (session_t *)hdr; - struct list *item, *next; - domain_t *domain; TRACE("%p\n", session); if (session->unload_event) SetEvent( session->unload_event ); if (session->cred_handle_initialized) FreeCredentialsHandle( &session->cred_handle ); + destroy_cookies( session ); - LIST_FOR_EACH_SAFE( item, next, &session->cookie_cache ) - { - domain = LIST_ENTRY( item, domain_t, entry ); - delete_domain( domain ); - } session->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection( &session->cs ); heap_free( session->agent ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 2ea798bb12..708840096a 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -66,13 +66,6 @@ struct _object_header_t struct list children; }; -typedef struct -{ - struct list entry; - WCHAR *name; - struct list cookies; -} domain_t; - typedef struct { struct list entry; LONG ref; @@ -295,7 +288,7 @@ int netconn_get_cipher_strength( netconn_t * ) DECLSPEC_HIDDEN; BOOL set_cookies( request_t *, const WCHAR * ) DECLSPEC_HIDDEN; BOOL add_cookie_headers( request_t * ) DECLSPEC_HIDDEN; BOOL add_request_headers( request_t *, LPCWSTR, DWORD, DWORD ) DECLSPEC_HIDDEN; -void delete_domain( domain_t * ) DECLSPEC_HIDDEN; +void destroy_cookies( session_t * ) DECLSPEC_HIDDEN; BOOL set_server_for_hostname( connect_t *, LPCWSTR, INTERNET_PORT ) DECLSPEC_HIDDEN; void destroy_authinfo( struct authinfo * ) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 1/7] winhttp: Get rid of cookie_t.
by Hans Leidekker 06 Nov '18

06 Nov '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/cookie.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/winhttp/cookie.c b/dlls/winhttp/cookie.c index 668daba5fa..098db68e95 100644 --- a/dlls/winhttp/cookie.c +++ b/dlls/winhttp/cookie.c @@ -30,13 +30,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(winhttp); -typedef struct +struct cookie { struct list entry; WCHAR *name; WCHAR *value; WCHAR *path; -} cookie_t; +}; static domain_t *add_domain( session_t *session, WCHAR *name ) { @@ -54,14 +54,14 @@ static domain_t *add_domain( session_t *session, WCHAR *name ) return domain; } -static cookie_t *find_cookie( domain_t *domain, const WCHAR *path, const WCHAR *name ) +static struct cookie *find_cookie( domain_t *domain, const WCHAR *path, const WCHAR *name ) { struct list *item; - cookie_t *cookie; + struct cookie *cookie; LIST_FOR_EACH( item, &domain->cookies ) { - cookie = LIST_ENTRY( item, cookie_t, entry ); + cookie = LIST_ENTRY( item, struct cookie, entry ); if (!strcmpW( cookie->path, path ) && !strcmpW( cookie->name, name )) { TRACE("found %s=%s\n", debugstr_w(cookie->name), debugstr_w(cookie->value)); @@ -80,7 +80,7 @@ static BOOL domain_match( const WCHAR *name, domain_t *domain, BOOL partial ) return TRUE; } -static void free_cookie( cookie_t *cookie ) +static void free_cookie( struct cookie *cookie ) { heap_free( cookie->name ); heap_free( cookie->value ); @@ -88,7 +88,7 @@ static void free_cookie( cookie_t *cookie ) heap_free( cookie ); } -static void delete_cookie( cookie_t *cookie ) +static void delete_cookie( struct cookie *cookie ) { list_remove( &cookie->entry ); free_cookie( cookie ); @@ -96,12 +96,12 @@ static void delete_cookie( cookie_t *cookie ) void delete_domain( domain_t *domain ) { - cookie_t *cookie; + struct cookie *cookie; struct list *item, *next; LIST_FOR_EACH_SAFE( item, next, &domain->cookies ) { - cookie = LIST_ENTRY( item, cookie_t, entry ); + cookie = LIST_ENTRY( item, struct cookie, entry ); delete_cookie( cookie ); } @@ -110,10 +110,10 @@ void delete_domain( domain_t *domain ) heap_free( domain ); } -static BOOL add_cookie( session_t *session, cookie_t *cookie, WCHAR *domain_name, WCHAR *path ) +static BOOL add_cookie( session_t *session, struct cookie *cookie, WCHAR *domain_name, WCHAR *path ) { domain_t *domain = NULL; - cookie_t *old_cookie; + struct cookie *old_cookie; struct list *item; if (!(cookie->path = strdupW( path ))) return FALSE; @@ -140,9 +140,9 @@ static BOOL add_cookie( session_t *session, cookie_t *cookie, WCHAR *domain_name return domain != NULL; } -static cookie_t *parse_cookie( const WCHAR *string ) +static struct cookie *parse_cookie( const WCHAR *string ) { - cookie_t *cookie; + struct cookie *cookie; const WCHAR *p; int len; @@ -151,7 +151,7 @@ static cookie_t *parse_cookie( const WCHAR *string ) while (len && string[len - 1] == ' ') len--; if (!len) return NULL; - if (!(cookie = heap_alloc_zero( sizeof(cookie_t) ))) return NULL; + if (!(cookie = heap_alloc_zero( sizeof(struct cookie) ))) return NULL; list_init( &cookie->entry ); if (!(cookie->name = heap_alloc( (len + 1) * sizeof(WCHAR) ))) @@ -250,7 +250,7 @@ BOOL set_cookies( request_t *request, const WCHAR *cookies ) WCHAR *cookie_domain = NULL, *cookie_path = NULL; struct attr *attr, *domain = NULL, *path = NULL; session_t *session = request->connect->session; - cookie_t *cookie; + struct cookie *cookie; int len, used; len = strlenW( cookies ); @@ -319,7 +319,7 @@ BOOL add_cookie_headers( request_t *request ) LIST_FOR_EACH( cookie_cursor, &domain->cookies ) { - cookie_t *cookie = LIST_ENTRY( cookie_cursor, cookie_t, entry ); + struct cookie *cookie = LIST_ENTRY( cookie_cursor, struct cookie, entry ); TRACE("comparing path %s with %s\n", debugstr_w(request->path), debugstr_w(cookie->path)); -- 2.11.0

1 0

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