February 2019 - Wine-devel - list.winehq.org

[PATCH v6 3/6] comctl32/listbox: Move the item data insertion into a separate function
by Huw Davies 20 Feb '19

20 Feb '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/comctl32/listbox.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index ba8b7eeade..44e3b1c7d1 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -186,6 +186,20 @@ static void set_item_selected_state(LB_DESCR *descr, UINT index, BOOL state) descr->items[index].selected = state; } +static void insert_item_data(LB_DESCR *descr, UINT index, WCHAR *str, ULONG_PTR data) +{ + LB_ITEMDATA *item; + + item = descr->items + index; + if (index < descr->nb_items) + memmove(item + 1, item, (descr->nb_items - index) * sizeof(LB_ITEMDATA)); + + item->str = str; + item->data = HAS_STRINGS(descr) ? 0 : data; + item->height = 0; + item->selected = FALSE; +} + /*********************************************************************** * LISTBOX_GetCurrentPageSize * @@ -1563,23 +1577,13 @@ static void LISTBOX_MoveCaret( LB_DESCR *descr, INT index, BOOL fully_visible ) static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, LPWSTR str, ULONG_PTR data ) { - LB_ITEMDATA *item; INT oldfocus = descr->focus_item; if (index == -1) index = descr->nb_items; else if ((index < 0) || (index > descr->nb_items)) return LB_ERR; if (!resize_storage(descr, descr->nb_items + 1)) return LB_ERR; - /* Insert the item structure */ - - item = &descr->items[index]; - if (index < descr->nb_items) - RtlMoveMemory( item + 1, item, - (descr->nb_items - index) * sizeof(LB_ITEMDATA) ); - item->str = str; - item->data = HAS_STRINGS(descr) ? 0 : data; - item->height = 0; - item->selected = FALSE; + insert_item_data(descr, index, str, data); descr->nb_items++; /* Get item height */ -- 2.18.0

1 0

[PATCH v6 2/6] comctl32/listbox: Use a helper to set item height by index
by Huw Davies 20 Feb '19

20 Feb '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/comctl32/listbox.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index a457d63ead..ba8b7eeade 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -168,6 +168,11 @@ static UINT get_item_height( const LB_DESCR *descr, UINT index ) return (descr->style & LBS_NODATA) ? 0 : descr->items[index].height; } +static void set_item_height( LB_DESCR *descr, UINT index, UINT height ) +{ + if (!(descr->style & LBS_NODATA)) descr->items[index].height = height; +} + static BOOL is_item_selected( const LB_DESCR *descr, UINT index ) { if (!(descr->style & (LBS_MULTIPLESEL | LBS_EXTENDEDSEL))) @@ -1233,7 +1238,7 @@ static LRESULT LISTBOX_SetItemHeight( LB_DESCR *descr, INT index, INT height, BO return LB_ERR; } TRACE("[%p]: item %d height = %d\n", descr->self, index, height ); - descr->items[index].height = height; + set_item_height(descr, index, height); LISTBOX_UpdateScroll( descr ); if (repaint) LISTBOX_InvalidateItems( descr, index ); @@ -1590,7 +1595,7 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, mis.itemData = data; mis.itemHeight = descr->item_height; SendMessageW( descr->owner, WM_MEASUREITEM, id, (LPARAM)&mis ); - item->height = mis.itemHeight ? mis.itemHeight : 1; + set_item_height(descr, index, mis.itemHeight ? mis.itemHeight : 1); TRACE("[%p]: measure item %d (%s) = %d\n", descr->self, index, str ? debugstr_w(str) : "", get_item_height(descr, index)); } -- 2.18.0

1 0

[PATCH v6 1/6] comctl32/listbox: Use a helper to retrieve item height by index
by Huw Davies 20 Feb '19

20 Feb '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/comctl32/listbox.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 50ff5c53f8..a457d63ead 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -163,6 +163,11 @@ static WCHAR *get_item_string( const LB_DESCR *descr, UINT index ) return HAS_STRINGS(descr) ? descr->items[index].str : NULL; } +static UINT get_item_height( const LB_DESCR *descr, UINT index ) +{ + return (descr->style & LBS_NODATA) ? 0 : descr->items[index].height; +} + static BOOL is_item_selected( const LB_DESCR *descr, UINT index ) { if (!(descr->style & (LBS_MULTIPLESEL | LBS_EXTENDEDSEL))) @@ -187,7 +192,7 @@ static INT LISTBOX_GetCurrentPageSize( const LB_DESCR *descr ) if (!(descr->style & LBS_OWNERDRAWVARIABLE)) return descr->page_size; for (i = descr->top_item, height = 0; i < descr->nb_items; i++) { - if ((height += descr->items[i].height) > descr->height) break; + if ((height += get_item_height(descr, i)) > descr->height) break; } if (i == descr->top_item) return 1; else return i - descr->top_item; @@ -207,7 +212,7 @@ static INT LISTBOX_GetMaxTopIndex( const LB_DESCR *descr ) { page = descr->height; for (max = descr->nb_items - 1; max >= 0; max--) - if ((page -= descr->items[max].height) < 0) break; + if ((page -= get_item_height(descr, max)) < 0) break; if (max < descr->nb_items - 1) max++; } else if (descr->style & LBS_MULTICOLUMN) @@ -335,12 +340,12 @@ static LRESULT LISTBOX_SetTopItem( LB_DESCR *descr, INT index, BOOL scroll ) if (index > descr->top_item) { for (i = index - 1; i >= descr->top_item; i--) - dy -= descr->items[i].height; + dy -= get_item_height(descr, i); } else { for (i = index; i < descr->top_item; i++) - dy += descr->items[i].height; + dy += get_item_height(descr, i); } } else @@ -456,14 +461,14 @@ static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT *rect if (index < descr->top_item) { for (i = descr->top_item-1; i >= index; i--) - rect->top -= descr->items[i].height; + rect->top -= get_item_height(descr, i); } else { for (i = descr->top_item; i < index; i++) - rect->top += descr->items[i].height; + rect->top += get_item_height(descr, i); } - rect->bottom = rect->top + descr->items[index].height; + rect->bottom = rect->top + get_item_height(descr, index); } } @@ -498,7 +503,7 @@ static INT LISTBOX_GetItemFromPoint( const LB_DESCR *descr, INT x, INT y ) { while (index < descr->nb_items) { - if ((pos += descr->items[index].height) > y) break; + if ((pos += get_item_height(descr, index)) > y) break; index++; } } @@ -507,7 +512,7 @@ static INT LISTBOX_GetItemFromPoint( const LB_DESCR *descr, INT x, INT y ) while (index > 0) { index--; - if ((pos -= descr->items[index].height) <= y) break; + if ((pos -= get_item_height(descr, index)) <= y) break; } } } @@ -1057,7 +1062,7 @@ static LRESULT LISTBOX_Paint( LB_DESCR *descr, HDC hdc ) if (!(descr->style & LBS_OWNERDRAWVARIABLE)) rect.bottom = rect.top + descr->item_height; else - rect.bottom = rect.top + descr->items[i].height; + rect.bottom = rect.top + get_item_height(descr, i); /* keep the focus rect, to paint the focus item after */ if (i == descr->focus_item) @@ -1204,7 +1209,7 @@ static LRESULT LISTBOX_GetItemHeight( const LB_DESCR *descr, INT index ) SetLastError(ERROR_INVALID_INDEX); return LB_ERR; } - return descr->items[index].height; + return get_item_height(descr, index); } else return descr->item_height; } @@ -1374,9 +1379,9 @@ static void LISTBOX_MakeItemVisible( LB_DESCR *descr, INT index, BOOL fully ) } else if (descr->style & LBS_OWNERDRAWVARIABLE) { - INT height = fully ? descr->items[index].height : 1; + INT height = fully ? get_item_height(descr, index) : 1; for (top = index; top > descr->top_item; top--) - if ((height += descr->items[top-1].height) > descr->height) break; + if ((height += get_item_height(descr, top - 1)) > descr->height) break; } else { @@ -1587,7 +1592,7 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, SendMessageW( descr->owner, WM_MEASUREITEM, id, (LPARAM)&mis ); item->height = mis.itemHeight ? mis.itemHeight : 1; TRACE("[%p]: measure item %d (%s) = %d\n", - descr->self, index, str ? debugstr_w(str) : "", item->height ); + descr->self, index, str ? debugstr_w(str) : "", get_item_height(descr, index)); } /* Repaint the items */ -- 2.18.0

1 0

[PATCH] shell32: Use the return value of ResetEnumerator (Coverity).
by Sven Baars 20 Feb '19

20 Feb '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/shell32/autocomplete.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 36b0c5d7bc..6850ded0ab 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -1096,7 +1096,7 @@ static HRESULT WINAPI IAutoComplete2_fnSetOptions( if ((changed & ACO_FILTERPREFIXES) && This->txtbackup) { if (get_text_prefix_filtering(This->txtbackup) != prefix_filtering_none) - IAutoCompleteDropDown_ResetEnumerator(&This->IAutoCompleteDropDown_iface); + hr = IAutoCompleteDropDown_ResetEnumerator(&This->IAutoCompleteDropDown_iface); } return hr; -- 2.17.1

1 0

[PATCH] setupapi: Add a missing return statement (Coverity).
by Sven Baars 20 Feb '19

20 Feb '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/setupapi/devinst.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 7769284d54..888bed051a 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2585,6 +2585,7 @@ HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyW(HDEVINFO devinfo, devinfo, iface_data, reserved, access, hinf, debugstr_w(section)); if (!(iface = get_device_iface(devinfo, iface_data))) + return INVALID_HANDLE_VALUE; if (hinf && !section) { -- 2.17.1

1 0

[PATCH 2/2] wined3d: Get rid of unused wined3d_blit_op enum elements.
by Henri Verbeet 20 Feb '19

20 Feb '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/wined3d_private.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5751bb2a2ee..a8ba1d074d4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2106,8 +2106,6 @@ enum wined3d_blit_op WINED3D_BLIT_OP_COLOR_BLIT, WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST, WINED3D_BLIT_OP_COLOR_BLIT_CKEY, - WINED3D_BLIT_OP_COLOR_FILL, - WINED3D_BLIT_OP_DEPTH_FILL, WINED3D_BLIT_OP_DEPTH_BLIT, WINED3D_BLIT_OP_RAW_BLIT, }; -- 2.11.0

1 0

[PATCH 1/2] wined3d: Only use the LSB of the _SAMP_SRGB_TEXTURE state value.
by Henri Verbeet 20 Feb '19

20 Feb '19

From: Paul Gofman <gofmanp(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37705 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 173 ++++++++++++++++++++++++++++++++++++----- dlls/wined3d/context.c | 2 +- dlls/wined3d/state.c | 4 +- dlls/wined3d/wined3d_private.h | 12 +++ 4 files changed, 168 insertions(+), 23 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 13cf6c72833..52d67c81991 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8886,11 +8886,11 @@ done: static void srgbtexture_test(void) { - /* Fill a texture with 0x7f (~ .5), and then turn on the D3DSAMP_SRGBTEXTURE - * texture stage state to render a quad using that texture. The resulting - * color components should be 0x36 (~ 0.21), per this formula: + /* The result of sRGB to linear conversion for value 0x7f (~ .5) used on + * texture mip level 0 should be 0x36 (~ 0.21), per this formula: * linear_color = ((srgb_color + 0.055) / 1.055) ^ 2.4 - * This is true where srgb_color > 0.04045. */ + * This is true where srgb_color > 0.04045. + * For the value of 0x3f used on mip level 1 the result should be 0x0d (~0.05). */ struct IDirect3DTexture9 *texture; struct IDirect3DSurface9 *surface; IDirect3DDevice9 *device; @@ -8898,6 +8898,7 @@ static void srgbtexture_test(void) D3DCOLOR color; ULONG refcount; HWND window; + DWORD value; HRESULT hr; static const float quad[] = @@ -8925,38 +8926,170 @@ static void srgbtexture_test(void) goto done; } - hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &texture, NULL); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 2, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &texture, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); - ok(hr == D3D_OK, "IDirect3DTexture9_GetSurfaceLevel failed with %08x\n", hr); - + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); fill_surface(surface, 0xff7f7f7f, 0); IDirect3DSurface9_Release(surface); + hr = IDirect3DTexture9_GetSurfaceLevel(texture, 1, &surface); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + fill_surface(surface, 0xff3f3f3f, 0); + IDirect3DSurface9_Release(surface); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); - hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *) texture); - ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed with %08x\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + /* AMD uses the LSB of the D3DSAMP_SRGBTEXTURE value. + * NVIDIA ignores any values other than 0 and 1, leaving the previous + * D3DSAMP_SRGBTEXTURE state. + * Intel, WARP treat the value as boolean. */ hr = IDirect3DDevice9_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - - hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, TRUE); - ok(SUCCEEDED(hr), "Failed to set sampler state, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 0x7e41882a); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == 0x7e41882a, "Got unexpected value %#x.\n", value); hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); - ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x007f7f7f, 1) || broken(color_match(color, 0x00363636, 1)), + "Got unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 100); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == 100, "Got unexpected value %#x.\n", value); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x007f7f7f, 1) || broken(color_match(color, 0x00363636, 1)), + "Got unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == 2, "Got unexpected value %#x.\n", value); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColor(device, 320, 240); - ok(color_match(color, 0x00363636, 1), "sRGB quad has color 0x%08x, expected 0x00363636.\n", color); + ok(color_match(color, 0x007f7f7f, 1) || broken(color_match(color, 0x00363636, 1)), + "Got unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 3); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == 3, "Got unexpected value %#x.\n", value); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x007f7f7f, 1) || color_match(color, 0x00363636, 1), + "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, TRUE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == TRUE, "Got unexpected value %#x.\n", value); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x00363636, 1), "Got unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + /* Set the other state to verify that the sampler just inherits old + * D3DSAMP_SRGBTEXTURE but * the old sampler is not preserved entirely on + * NVIDIA. */ + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 0x7e41882a); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == 0x7e41882a, "Got unexpected value %#x.\n", value); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MIPFILTER, D3DTEXF_POINT); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAXMIPLEVEL, 1); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x000d0d0d, 1) || color_match(color, 0x003f3f3f, 1), + "Got unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == 0, "Got unexpected value %#x.\n", value); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x003f3f3f, 1), "Got unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 0x7e41882a); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == 0x7e41882a, "Got unexpected value %#x.\n", value); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x003f3f3f, 1) || broken(color_match(color, 0x000d0d0d, 1)), + "Got unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); IDirect3DTexture9_Release(texture); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 96ba06ddf1c..63ff8336919 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3719,7 +3719,7 @@ static void context_preload_texture(struct wined3d_context *context, if (!(texture = state->textures[idx])) return; - wined3d_texture_load(texture, context, state->sampler_states[idx][WINED3D_SAMP_SRGB_TEXTURE]); + wined3d_texture_load(texture, context, is_srgb_enabled(state->sampler_states[idx])); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 0f7b030b0cc..43746a4363e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3574,7 +3574,7 @@ static void wined3d_sampler_desc_from_sampler_states(struct wined3d_sampler_desc desc->max_anisotropy = 1; desc->compare = texture_gl->t.resource.format_flags & WINED3DFMT_FLAG_SHADOW; desc->comparison_func = WINED3D_CMP_LESSEQUAL; - desc->srgb_decode = sampler_states[WINED3D_SAMP_SRGB_TEXTURE]; + desc->srgb_decode = is_srgb_enabled(sampler_states); if (!(texture_gl->t.resource.format_flags & WINED3DFMT_FLAG_FILTERING)) { @@ -3615,9 +3615,9 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state if (state->textures[sampler_idx]) { struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(state->textures[sampler_idx]); - BOOL srgb = state->sampler_states[sampler_idx][WINED3D_SAMP_SRGB_TEXTURE]; const DWORD *sampler_states = state->sampler_states[sampler_idx]; struct wined3d_device *device = context->device; + BOOL srgb = is_srgb_enabled(sampler_states); struct wined3d_sampler_desc desc; struct wined3d_sampler *sampler; struct wine_rb_entry *entry; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 57df9f1eb24..5751bb2a2ee 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4591,6 +4591,18 @@ static inline void context_apply_state(struct wined3d_context *context, state_table[rep].apply(context, state, rep); } +static inline BOOL is_srgb_enabled(const DWORD *sampler_states) +{ + /* Only use the LSB of the WINED3D_SAMP_SRGB_TEXTURE value. This matches + * the behaviour of the AMD Windows driver. + * + * Might & Magic: Heroes VI - Shades of Darkness sets + * WINED3D_SAMP_SRGB_TEXTURE to a large value that looks like a + * pointer—presumably by accident—and expects sRGB decoding to be + * disabled. */ + return sampler_states[WINED3D_SAMP_SRGB_TEXTURE] & 0x1; +} + static inline BOOL needs_separate_srgb_gl_texture(const struct wined3d_context *context, const struct wined3d_texture *texture) { -- 2.11.0

1 0

[PATCH] ddraw/tests: Avoid using the comma operator (coccinellery)
by Michael Stefaniuc 20 Feb '19

20 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 1dc88561b4..ceb1f83367 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -8383,7 +8383,7 @@ static void test_range_colorkey(void) ok(!ckey.dwColorSpaceLowValue, "Got unexpected value 0x%08x.\n", ckey.dwColorSpaceLowValue); ok(!ckey.dwColorSpaceHighValue, "Got unexpected value 0x%08x.\n", ckey.dwColorSpaceHighValue); - IDirectDrawSurface_Release(surface), + IDirectDrawSurface_Release(surface); refcount = IDirectDraw_Release(ddraw); ok(!refcount, "Got unexpected refcount %u.\n", refcount); DestroyWindow(window); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 91300ed38a..db67afa0e4 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -9535,7 +9535,7 @@ static void test_range_colorkey(void) ok(!ckey.dwColorSpaceLowValue, "Got unexpected value 0x%08x.\n", ckey.dwColorSpaceLowValue); ok(!ckey.dwColorSpaceHighValue, "Got unexpected value 0x%08x.\n", ckey.dwColorSpaceHighValue); - IDirectDrawSurface_Release(surface), + IDirectDrawSurface_Release(surface); refcount = IDirectDraw2_Release(ddraw); ok(!refcount, "Got unexpected refcount %u.\n", refcount); DestroyWindow(window); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index d192cdf151..dbba9b5104 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -10975,7 +10975,7 @@ static void test_range_colorkey(void) ok(!ckey.dwColorSpaceLowValue, "Got unexpected value 0x%08x.\n", ckey.dwColorSpaceLowValue); ok(!ckey.dwColorSpaceHighValue, "Got unexpected value 0x%08x.\n", ckey.dwColorSpaceHighValue); - IDirectDrawSurface4_Release(surface), + IDirectDrawSurface4_Release(surface); refcount = IDirectDraw4_Release(ddraw); ok(!refcount, "Got unexpected refcount %u.\n", refcount); DestroyWindow(window); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index b43b53881d..215e1c7107 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -10878,7 +10878,7 @@ static void test_range_colorkey(void) ok(!ckey.dwColorSpaceLowValue, "Got unexpected value 0x%08x.\n", ckey.dwColorSpaceLowValue); ok(!ckey.dwColorSpaceHighValue, "Got unexpected value 0x%08x.\n", ckey.dwColorSpaceHighValue); - IDirectDrawSurface7_Release(surface), + IDirectDrawSurface7_Release(surface); refcount = IDirectDraw7_Release(ddraw); ok(!refcount, "Got unexpected refcount %u.\n", refcount); DestroyWindow(window); -- 2.20.1

3 2

[PATCH] d3d8/tests: Remove useless casts to self
by Michael Stefaniuc 20 Feb '19

20 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- 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 749062220d..c405f8245e 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -10564,7 +10564,7 @@ static void test_sysmem_draw(void) hr = IDirect3DDevice8_CreateVertexBuffer(device, sizeof(quad), 0, 0, D3DPOOL_SYSTEMMEM, &vb); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DVertexBuffer8_Lock(vb, 0, sizeof(quad), (BYTE **)&data, 0); + hr = IDirect3DVertexBuffer8_Lock(vb, 0, sizeof(quad), &data, 0); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); memcpy(data, quad, sizeof(quad)); hr = IDirect3DVertexBuffer8_Unlock(vb); @@ -10622,7 +10622,7 @@ static void test_sysmem_draw(void) hr = IDirect3DDevice8_CreateIndexBuffer(device, sizeof(indices), 0, D3DFMT_INDEX16, D3DPOOL_SYSTEMMEM, &ib); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DIndexBuffer8_Lock(ib, 0, sizeof(indices), (BYTE **)&data, 0); + hr = IDirect3DIndexBuffer8_Lock(ib, 0, sizeof(indices), &data, 0); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); memcpy(data, indices, sizeof(indices)); hr = IDirect3DIndexBuffer8_Unlock(ib); @@ -10651,14 +10651,14 @@ static void test_sysmem_draw(void) hr = IDirect3DDevice8_CreateVertexBuffer(device, sizeof(quad_s0), 0, 0, D3DPOOL_SYSTEMMEM, &vb_s0); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DVertexBuffer8_Lock(vb_s0, 0, sizeof(quad_s0), (BYTE **)&data, 0); + hr = IDirect3DVertexBuffer8_Lock(vb_s0, 0, sizeof(quad_s0), &data, 0); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); memcpy(data, quad_s0, sizeof(quad_s0)); hr = IDirect3DVertexBuffer8_Unlock(vb_s0); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_CreateVertexBuffer(device, sizeof(quad_s1), 0, 0, D3DPOOL_SYSTEMMEM, &vb_s1); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DVertexBuffer8_Lock(vb_s1, 0, sizeof(quad_s1), (BYTE **)&data, 0); + hr = IDirect3DVertexBuffer8_Lock(vb_s1, 0, sizeof(quad_s1), &data, 0); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); memcpy(data, quad_s1, sizeof(quad_s1)); hr = IDirect3DVertexBuffer8_Unlock(vb_s1); -- 2.20.1

2 1

[PATCH 2/2] winhttp: Introduce a structure to describe URL components.
by Hans Leidekker 20 Feb '19

20 Feb '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/url.c | 112 ++++++++++++++++++++++++++++----------------- 1 file changed, 70 insertions(+), 42 deletions(-) diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 786378d3b6..e1255bd6b1 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -34,27 +34,33 @@ WINE_DEFAULT_DEBUG_CHANNEL(winhttp); static const WCHAR scheme_http[] = {'h','t','t','p',0}; static const WCHAR scheme_https[] = {'h','t','t','p','s',0}; -static DWORD set_component( WCHAR **str, DWORD *str_len, WCHAR *value, DWORD len, DWORD flags, BOOL *overflow ) +struct url_component { - if (*str && !*str_len) return ERROR_INVALID_PARAMETER; - if (!*str_len) return ERROR_SUCCESS; - if (!*str) + WCHAR **str; + DWORD *len; +}; + +static DWORD set_component( struct url_component *comp, WCHAR *value, DWORD len, DWORD flags, BOOL *overflow ) +{ + if (*comp->str && !*comp->len) return ERROR_INVALID_PARAMETER; + if (!*comp->len) return ERROR_SUCCESS; + if (!*comp->str) { - if (len && *str_len && (flags & (ICU_DECODE|ICU_ESCAPE))) return ERROR_INVALID_PARAMETER; - *str = value; - *str_len = len; + if (len && *comp->len && (flags & (ICU_DECODE|ICU_ESCAPE))) return ERROR_INVALID_PARAMETER; + *comp->str = value; + *comp->len = len; } else { - if (len >= *str_len) + if (len >= *comp->len) { - *str_len = len+1; + *comp->len = len + 1; *overflow = TRUE; return ERROR_SUCCESS; } - memcpy( *str, value, len * sizeof(WCHAR) ); - (*str)[len] = 0; - *str_len = len; + memcpy( *comp->str, value, len * sizeof(WCHAR) ); + (*comp->str)[len] = 0; + *comp->len = len; } return ERROR_SUCCESS; } @@ -173,7 +179,8 @@ static DWORD parse_port( const WCHAR *str, DWORD len, INTERNET_PORT *ret ) BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONENTSW uc ) { WCHAR *p, *q, *r, *url_decoded = NULL, *url_escaped = NULL; - INTERNET_SCHEME scheme = 0; + INTERNET_SCHEME scheme_number = 0; + struct url_component scheme, username, password, hostname, path, extra; BOOL overflow = FALSE; DWORD err; @@ -209,15 +216,18 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN SetLastError( ERROR_WINHTTP_UNRECOGNIZED_SCHEME ); return FALSE; } - if (p - url == 4 && !strncmpiW( url, scheme_http, 4 )) scheme = INTERNET_SCHEME_HTTP; - else if (p - url == 5 && !strncmpiW( url, scheme_https, 5 )) scheme = INTERNET_SCHEME_HTTPS; + if (p - url == 4 && !strncmpiW( url, scheme_http, 4 )) scheme_number = INTERNET_SCHEME_HTTP; + else if (p - url == 5 && !strncmpiW( url, scheme_https, 5 )) scheme_number = INTERNET_SCHEME_HTTPS; else { err = ERROR_WINHTTP_UNRECOGNIZED_SCHEME; goto exit; } - if ((err = set_component( &uc->lpszScheme, &uc->dwSchemeLength, (WCHAR *)url, p - url, flags, &overflow ))) goto exit; + scheme.str = &uc->lpszScheme; + scheme.len = &uc->dwSchemeLength; + + if ((err = set_component( &scheme, (WCHAR *)url, p - url, flags, &overflow ))) goto exit; p++; /* skip ':' */ if (!p[0] || p[0] != '/' || p[1] != '/') @@ -231,83 +241,101 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN err = ERROR_WINHTTP_INVALID_URL; goto exit; } + + username.str = &uc->lpszUserName; + username.len = &uc->dwUserNameLength; + + password.str = &uc->lpszPassword; + password.len = &uc->dwPasswordLength; + if ((q = memchrW( p, '@', len - (p - url) )) && !(memchrW( p, '/', q - p ))) { + if ((r = memchrW( p, ':', q - p ))) { - if ((err = set_component( &uc->lpszUserName, &uc->dwUserNameLength, p, r - p, flags, &overflow ))) goto exit; + if ((err = set_component( &username, p, r - p, flags, &overflow ))) goto exit; r++; - if ((err = set_component( &uc->lpszPassword, &uc->dwPasswordLength, r, q - r, flags, &overflow ))) goto exit; + if ((err = set_component( &password, r, q - r, flags, &overflow ))) goto exit; } else { - if ((err = set_component( &uc->lpszUserName, &uc->dwUserNameLength, p, q - p, flags, &overflow ))) goto exit; - if ((err = set_component( &uc->lpszPassword, &uc->dwPasswordLength, NULL, 0, flags, &overflow ))) goto exit; + if ((err = set_component( &username, p, q - p, flags, &overflow ))) goto exit; + if ((err = set_component( &password, NULL, 0, flags, &overflow ))) goto exit; } p = q + 1; } else { - if ((err = set_component( &uc->lpszUserName, &uc->dwUserNameLength, NULL, 0, flags, &overflow ))) goto exit; - if ((err = set_component( &uc->lpszPassword, &uc->dwPasswordLength, NULL, 0, flags, &overflow ))) goto exit; + if ((err = set_component( &username, NULL, 0, flags, &overflow ))) goto exit; + if ((err = set_component( &password, NULL, 0, flags, &overflow ))) goto exit; } + + hostname.str = &uc->lpszHostName; + hostname.len = &uc->dwHostNameLength; + + path.str = &uc->lpszUrlPath; + path.len = &uc->dwUrlPathLength; + + extra.str = &uc->lpszExtraInfo; + extra.len = &uc->dwExtraInfoLength; + if ((q = memchrW( p, '/', len - (p - url) ))) { if ((r = memchrW( p, ':', q - p ))) { - if ((err = set_component( &uc->lpszHostName, &uc->dwHostNameLength, p, r - p, flags, &overflow ))) goto exit; + if ((err = set_component( &hostname, p, r - p, flags, &overflow ))) goto exit; r++; if ((err = parse_port( r, q - r, &uc->nPort ))) goto exit; } else { - if ((err = set_component( &uc->lpszHostName, &uc->dwHostNameLength, p, q - p, flags, &overflow ))) goto exit; - if (scheme == INTERNET_SCHEME_HTTP) uc->nPort = INTERNET_DEFAULT_HTTP_PORT; - if (scheme == INTERNET_SCHEME_HTTPS) uc->nPort = INTERNET_DEFAULT_HTTPS_PORT; + if ((err = set_component( &hostname, p, q - p, flags, &overflow ))) goto exit; + if (scheme_number == INTERNET_SCHEME_HTTP) uc->nPort = INTERNET_DEFAULT_HTTP_PORT; + if (scheme_number == INTERNET_SCHEME_HTTPS) uc->nPort = INTERNET_DEFAULT_HTTPS_PORT; } if ((r = memchrW( q, '?', len - (q - url) ))) { - if (uc->dwExtraInfoLength) + if (*extra.len) { - if ((err = set_component( &uc->lpszUrlPath, &uc->dwUrlPathLength, q, r - q, flags, &overflow ))) goto exit; - if ((err = set_component( &uc->lpszExtraInfo, &uc->dwExtraInfoLength, r, len - (r - url), flags, &overflow ))) goto exit; + if ((err = set_component( &path, q, r - q, flags, &overflow ))) goto exit; + if ((err = set_component( &extra, r, len - (r - url), flags, &overflow ))) goto exit; } - else if ((err = set_component( &uc->lpszUrlPath, &uc->dwUrlPathLength, q, len - (q - url), flags, &overflow ))) goto exit; + else if ((err = set_component( &path, q, len - (q - url), flags, &overflow ))) goto exit; } else { - if ((err = set_component( &uc->lpszUrlPath, &uc->dwUrlPathLength, q, len - (q - url), flags, &overflow ))) goto exit; - if ((err = set_component( &uc->lpszExtraInfo, &uc->dwExtraInfoLength, (WCHAR *)url + len, 0, flags, &overflow ))) goto exit; + if ((err = set_component( &path, q, len - (q - url), flags, &overflow ))) goto exit; + if ((err = set_component( &extra, (WCHAR *)url + len, 0, flags, &overflow ))) goto exit; } } else { if ((r = memchrW( p, ':', len - (p - url) ))) { - if ((err = set_component( &uc->lpszHostName, &uc->dwHostNameLength, p, r - p, flags, &overflow ))) goto exit; + if ((err = set_component( &hostname, p, r - p, flags, &overflow ))) goto exit; r++; if ((err = parse_port( r, len - (r - url), &uc->nPort ))) goto exit; } else { - if ((err = set_component( &uc->lpszHostName, &uc->dwHostNameLength, p, len - (p - url), flags, &overflow ))) goto exit; - if (scheme == INTERNET_SCHEME_HTTP) uc->nPort = INTERNET_DEFAULT_HTTP_PORT; - if (scheme == INTERNET_SCHEME_HTTPS) uc->nPort = INTERNET_DEFAULT_HTTPS_PORT; + if ((err = set_component( &hostname, p, len - (p - url), flags, &overflow ))) goto exit; + if (scheme_number == INTERNET_SCHEME_HTTP) uc->nPort = INTERNET_DEFAULT_HTTP_PORT; + if (scheme_number == INTERNET_SCHEME_HTTPS) uc->nPort = INTERNET_DEFAULT_HTTPS_PORT; } - if ((err = set_component( &uc->lpszUrlPath, &uc->dwUrlPathLength, (WCHAR *)url + len, 0, flags, &overflow ))) goto exit; - if ((err = set_component( &uc->lpszExtraInfo, &uc->dwExtraInfoLength, (WCHAR *)url + len, 0, flags, &overflow ))) goto exit; + if ((err = set_component( &path, (WCHAR *)url + len, 0, flags, &overflow ))) goto exit; + if ((err = set_component( &extra, (WCHAR *)url + len, 0, flags, &overflow ))) goto exit; } - TRACE("scheme(%s) host(%s) port(%d) path(%s) extra(%s)\n", debugstr_wn( uc->lpszScheme, uc->dwSchemeLength ), - debugstr_wn( uc->lpszHostName, uc->dwHostNameLength ), uc->nPort, debugstr_wn( uc->lpszUrlPath, uc->dwUrlPathLength ), - debugstr_wn( uc->lpszExtraInfo, uc->dwExtraInfoLength )); + TRACE("scheme(%s) host(%s) port(%d) path(%s) extra(%s)\n", debugstr_wn(*scheme.str, *scheme.len), + debugstr_wn(*hostname.str, *hostname.len ), uc->nPort, debugstr_wn(*path.str, *path.len), + debugstr_wn(*extra.str, *extra.len)); exit: if (!err) { if (overflow) err = ERROR_INSUFFICIENT_BUFFER; - uc->nScheme = scheme; + uc->nScheme = scheme_number; } heap_free( url_decoded ); heap_free( url_escaped ); -- 2.20.1

1 0