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

[PATCH] secur32: Use offsetof() instead of pointer substraction
by Michael Stefaniuc Feb. 19, 2019

Feb. 19, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/secur32/secur32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index b3ab80a850..909207f0c6 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -247,8 +247,8 @@ static void _makeFnTableA(PSecurityFunctionTableA fnTableA, * implemented (yikes) */ size_t tableSize = inFnTableA->dwVersion == 1 ? - (const BYTE *)&inFnTableA->SetContextAttributesA - - (const BYTE *)inFnTableA : sizeof(SecurityFunctionTableA); + offsetof(const SecurityFunctionTableA, SetContextAttributesA) : + sizeof(SecurityFunctionTableA); memcpy(fnTableA, inFnTableA, tableSize); /* override this, since we can do it internally anyway */ @@ -318,8 +318,8 @@ static void _makeFnTableW(PSecurityFunctionTableW fnTableW, * implemented (yikes) */ size_t tableSize = inFnTableW->dwVersion == 1 ? - (const BYTE *)&inFnTableW->SetContextAttributesW - - (const BYTE *)inFnTableW : sizeof(SecurityFunctionTableW); + offsetof(const SecurityFunctionTableW, SetContextAttributesW) : + sizeof(SecurityFunctionTableW); memcpy(fnTableW, inFnTableW, tableSize); /* override this, since we can do it internally anyway */ -- 2.20.1

1 0

[PATCH v2 1/9] user32: Correctly calculate the client size of a minimized window.
by Zebediah Figura Feb. 19, 2019

Feb. 19, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/nonclient.c | 5 +++++ dlls/user32/tests/win.c | 39 ++++++++++++++++++++++++++++----------- 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 4444a2c91e..26bb0a01b5 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -414,6 +414,11 @@ LRESULT NC_HandleNCCalcSize( HWND hwnd, WPARAM wparam, RECT *winRect ) if (winRect->left > winRect->right) winRect->right = winRect->left; } + else + { + winRect->right = winRect->left; + winRect->bottom = winRect->top; + } return result; } diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index ceb4b82313..308e243c3d 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6469,7 +6469,7 @@ static void test_ShowWindow(void) { HWND hwnd; DWORD style; - RECT rcMain, rc, rcMinimized, rcClient, rcEmpty, rcMaximized, rcResized; + RECT rcMain, rc, rcMinimized, rcClient, rcEmpty, rcMaximized, rcResized, rcNonClient; LPARAM ret; MONITORINFO mon_info; @@ -6533,7 +6533,6 @@ static void test_ShowWindow(void) ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); GetClientRect(hwnd, &rc); - todo_wine ok(EqualRect(&rcEmpty, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcEmpty), wine_dbgstr_rect(&rc)); /* shouldn't be able to resize minimized windows */ @@ -6547,7 +6546,6 @@ static void test_ShowWindow(void) ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); GetClientRect(hwnd, &rc); - todo_wine ok(EqualRect(&rcEmpty, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcEmpty), wine_dbgstr_rect(&rc)); /* SetWindowPos shouldn't affect the client rect */ @@ -6559,9 +6557,14 @@ static void test_ShowWindow(void) ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); GetClientRect(hwnd, &rc); - todo_wine ok(EqualRect(&rcEmpty, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcEmpty), wine_dbgstr_rect(&rc)); + /* test NC area */ + GetWindowRect(hwnd, &rc); + SetRect(&rcNonClient, rc.left, rc.top, rc.left, rc.top); + DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc); + ok(EqualRect(&rc, &rcNonClient), "expected %s, got %s\n", + wine_dbgstr_rect(&rcNonClient), wine_dbgstr_rect(&rc)); ShowWindow(hwnd, SW_RESTORE); ok(ret, "not expected ret: %lu\n", ret); @@ -6651,7 +6654,6 @@ static void test_ShowWindow(void) ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); GetClientRect(hwnd, &rc); - todo_wine ok(EqualRect(&rcEmpty, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcEmpty), wine_dbgstr_rect(&rc)); @@ -6667,7 +6669,6 @@ static void test_ShowWindow(void) ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); GetClientRect(hwnd, &rc); - todo_wine ok(EqualRect(&rcEmpty, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcEmpty), wine_dbgstr_rect(&rc)); @@ -6710,7 +6711,6 @@ static void test_ShowWindow(void) ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); GetClientRect(hwnd, &rc); - todo_wine ok(EqualRect(&rcEmpty, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcEmpty), wine_dbgstr_rect(&rc)); DestroyWindow(hwnd); @@ -6729,7 +6729,6 @@ static void test_ShowWindow(void) ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); GetClientRect(hwnd, &rc); - todo_wine ok(EqualRect(&rcEmpty, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcEmpty), wine_dbgstr_rect(&rc)); DestroyWindow(hwnd); @@ -6740,7 +6739,7 @@ static void test_ShowWindow(void) static void test_ShowWindow_owned(HWND hwndMain) { MONITORINFO mon_info = {sizeof(mon_info)}; - RECT rect, orig, expect; + RECT rect, orig, expect, nc; BOOL ret; HWND hwnd, hwnd2; LONG style; @@ -6798,6 +6797,12 @@ static void test_ShowWindow_owned(HWND hwndMain) todo_wine ok(EqualRect(&expect, &rect), "expected %s, got %s\n", wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect)); + /* test NC area */ + GetWindowRect(hwnd, &rect); + SetRect(&nc, rect.left, rect.top, rect.left, rect.top); + DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rect); + ok(EqualRect(&rect, &nc), "expected %s, got %s\n", + wine_dbgstr_rect(&nc), wine_dbgstr_rect(&rect)); /* multiple minimized owned windows stack next to each other (and eventually * on top of each other) */ @@ -6863,7 +6868,7 @@ static void test_ShowWindow_owned(HWND hwndMain) static void test_ShowWindow_child(HWND hwndMain) { - RECT rect, orig, expect; + RECT rect, orig, expect, nc; BOOL ret; HWND hwnd, hwnd2; LONG style; @@ -6926,6 +6931,12 @@ static void test_ShowWindow_child(HWND hwndMain) todo_wine ok(EqualRect(&expect, &rect), "expected %s, got %s\n", wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect)); + /* test NC area */ + GetWindowRect(hwnd, &rect); + SetRect(&nc, rect.left, rect.top, rect.left, rect.top); + DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rect); + ok(EqualRect(&rect, &nc), "expected %s, got %s\n", + wine_dbgstr_rect(&nc), wine_dbgstr_rect(&rect)); /* multiple minimized children also stack; here the parent is too small to * fit more than one per row */ @@ -6993,7 +7004,7 @@ static void test_ShowWindow_child(HWND hwndMain) static void test_ShowWindow_mdichild(HWND hwndMain) { - RECT rect, orig, expect; + RECT rect, orig, expect, nc; BOOL ret; HWND mdiclient, hwnd, hwnd2; LONG style; @@ -7051,6 +7062,12 @@ static void test_ShowWindow_mdichild(HWND hwndMain) todo_wine ok(EqualRect(&expect, &rect), "expected %s, got %s\n", wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect)); + /* test NC area */ + GetWindowRect(hwnd, &rect); + SetRect(&nc, rect.left, rect.top, rect.left, rect.top); + DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rect); + ok(EqualRect(&rect, &nc), "expected %s, got %s\n", + wine_dbgstr_rect(&nc), wine_dbgstr_rect(&rect)); /* multiple minimized children also stack; here the parent is too small to * fit more than one per row */ -- 2.20.1

2 17

[PATCH] wined3d: Use LSB only in _SAMP_SRGB_TEXTURE state value.
by Paul Gofman Feb. 19, 2019

Feb. 19, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37705 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> The final version of wined3d changes were suggested by Henri Verbeet. --- dlls/d3d9/tests/visual.c | 149 +++++++++++++++++++++++++++++++-- dlls/wined3d/context.c | 2 +- dlls/wined3d/state.c | 4 +- dlls/wined3d/wined3d_private.h | 5 ++ 4 files changed, 148 insertions(+), 12 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 13cf6c7283..d0e2932db5 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,168 @@ static void srgbtexture_test(void) goto done; } - hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &texture, NULL); + hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 2, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &texture, NULL); ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); - ok(hr == D3D_OK, "IDirect3DTexture9_GetSurfaceLevel failed with %08x\n", hr); - + ok(SUCCEEDED(hr), "IDirect3DTexture9_GetSurfaceLevel failed, hr %#x.\n", hr); fill_surface(surface, 0xff7f7f7f, 0); IDirect3DSurface9_Release(surface); + hr = IDirect3DTexture9_GetSurfaceLevel(texture, 1, &surface); + ok(SUCCEEDED(hr), "IDirect3DTexture9_GetSurfaceLevel failed, 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); + /* AMD uses LSB from D3DSAMP_SRGBTEXTURE value. + * NVIDIA ignores any values except for 0 or 1 leaving 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); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 0x7e41882a); ok(SUCCEEDED(hr), "Failed to set sampler state, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(SUCCEEDED(hr), "Failed to get sampler state, hr %#x.\n", hr); + ok(value == 0x7e41882a, "Unexpected D3DSAMP_SRGBTEXTURE value %#x.\n", value); hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); ok(SUCCEEDED(hr), "Failed to set FVF, 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); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x007f7f7f, 1) || broken(color_match(color, 0x00363636, 1)), + "sRGB quad has color 0x%08x, expected 0x007f7f7f.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 100); + ok(SUCCEEDED(hr), "Failed to set sampler state, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(SUCCEEDED(hr), "Failed to get sampler state, hr %#x.\n", hr); + ok(value == 100, "Unexpected D3DSAMP_SRGBTEXTURE value %#x.\n", value); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x007f7f7f, 1) || broken(color_match(color, 0x00363636, 1)), + "sRGB quad has color 0x%08x, expected 0x007f7f7f.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 2); + ok(SUCCEEDED(hr), "Failed to set sampler state, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(SUCCEEDED(hr), "Failed to get sampler state, hr %#x.\n", hr); + ok(value == 2, "Unexpected D3DSAMP_SRGBTEXTURE value %#x.\n", value); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice9_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x007f7f7f, 1) || broken(color_match(color, 0x00363636, 1)), + "sRGB quad has color 0x%08x, expected 0x007f7f7f.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 3); + ok(SUCCEEDED(hr), "Failed to set sampler state, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(SUCCEEDED(hr), "Failed to get sampler state, hr %#x.\n", hr); + ok(value == 3, "Unexpected D3DSAMP_SRGBTEXTURE value %#x.\n", value); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x007f7f7f, 1) || color_match(color, 0x00363636, 1), + "sRGB quad has color 0x%08x, expected 0x007f7f7f or 0x00363636.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); + + 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); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(SUCCEEDED(hr), "Failed to get sampler state, hr %#x.\n", hr); + ok(value == TRUE, "Unexpected D3DSAMP_SRGBTEXTURE value %#x.\n", value); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, 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); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, 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(SUCCEEDED(hr), "Failed to set sampler state, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(SUCCEEDED(hr), "Failed to get sampler state, hr %#x.\n", hr); + ok(value == 0x7e41882a, "Unexpected D3DSAMP_SRGBTEXTURE value %#x.\n", value); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MIPFILTER, D3DTEXF_POINT); + ok(SUCCEEDED(hr), "Failed to set sampler state, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAXMIPLEVEL, 1); + ok(SUCCEEDED(hr), "Failed to set sampler state, 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); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x000d0d0d, 1) || color_match(color, 0x003f3f3f, 1), + "sRGB quad has color 0x%08x, expected 0x000d0d0d or 0x003f3f3f.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 0); + ok(SUCCEEDED(hr), "Failed to set sampler state, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(SUCCEEDED(hr), "Failed to get sampler state, hr %#x.\n", hr); + ok(value == 0, "Unexpected D3DSAMP_SRGBTEXTURE value %#x.\n", value); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x003f3f3f, 1), "sRGB quad has color 0x%08x, expected 0x003f3f3f.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 0x7e41882a); + ok(SUCCEEDED(hr), "Failed to set sampler state, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(SUCCEEDED(hr), "Failed to get sampler state, hr %#x.\n", hr); + ok(value == 0x7e41882a, "Unexpected D3DSAMP_SRGBTEXTURE value %#x.\n", value); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); + ok(SUCCEEDED(hr), "Failed to set FVF, 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); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x003f3f3f, 1) || broken(color_match(color, 0x000d0d0d, 1)), + "sRGB quad has color 0x%08x, expected 0x003f3f3f.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\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 96ba06ddf1..63ff833691 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 0f7b030b0c..43746a4363 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 57df9f1eb2..5c5e515e50 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4591,6 +4591,11 @@ 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) +{ + 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.20.1

2 1

[PATCH] winmm/tests: Floating point numeric constants are by default doubles
by Michael Stefaniuc Feb. 19, 2019

Feb. 19, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winmm/tests/wave.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index c106594b3f..9c114c87a0 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -102,11 +102,11 @@ static char* wave_generate_la(WAVEFORMATEX* wfx, double duration, DWORD* size) for (i=0;i<nb_samples;i++) { double y=sin(440.0*2*PI*i/wfx->nSamplesPerSec); if (wfx->wBitsPerSample==8) { - unsigned char sample=(unsigned char)((double)127.5*(y+1.0)); + unsigned char sample=(unsigned char)(127.5*(y+1.0)); for (j = 0; j < wfx->nChannels; j++) *b++=sample; } else if (wfx->wBitsPerSample==16) { - signed short sample=(signed short)((double)32767.5*y-0.5); + signed short sample=(signed short)(32767.5*y-0.5); for (j = 0; j < wfx->nChannels; j++) { b[0]=sample & 0xff; b[1]=sample >> 8; -- 2.20.1

2 1

[PATCH 01/10] explorer: Enable the taskbar by default.
by Zebediah Figura Feb. 19, 2019

Feb. 19, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Apologies for the rather large series, but I didn't want to leave minimized windows in a half-migrated state. programs/explorer/desktop.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 27b9b24901..24ce8702a9 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -754,7 +754,6 @@ static BOOL get_default_enable_shell( const WCHAR *name ) 'E','x','p','l','o','r','e','r','\\', 'D','e','s','k','t','o','p','s',0}; static const WCHAR enable_shellW[] = {'E','n','a','b','l','e','S','h','e','l','l',0}; - static const WCHAR shellW[] = {'s','h','e','l','l',0}; HKEY hkey; BOOL found = FALSE; BOOL result; @@ -767,9 +766,9 @@ static BOOL get_default_enable_shell( const WCHAR *name ) found = TRUE; RegCloseKey( hkey ); } - /* Default off, except for the magic desktop name "shell" */ + /* Default on */ if (!found) - result = (lstrcmpiW( name, shellW ) == 0); + result = TRUE; return result; } -- 2.20.1

3 20

[PATCH v5 1/6] comctl32/listbox: Use a helper to retrieve item height by index
by Gabriel Ivăncescu Feb. 19, 2019

Feb. 19, 2019

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.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 50ff5c5..a457d63 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.20.1

1 5

[v2 PATCH 1/4] mfplat/tests: Remove initialization from tests that don't need it.
by Nikolay Sivov Feb. 19, 2019

Feb. 19, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 395fde421d..7d202bc2e5 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -319,12 +319,6 @@ static void test_MFCreateMediaType(void) HRESULT hr; IMFMediaType *mediatype; - hr = MFStartup(MAKELONG( MF_API_VERSION, 0xdead ), MFSTARTUP_FULL); - ok(hr == MF_E_BAD_STARTUP_VERSION, "got 0x%08x\n", hr); - - hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); - ok(hr == S_OK, "got 0x%08x\n", hr); - if(0) { /* Crash on Windows Vista/7 */ @@ -339,8 +333,6 @@ if(0) todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); IMFMediaType_Release(mediatype); - - MFShutdown(); } static void test_MFCreateMediaEvent(void) @@ -832,12 +824,27 @@ static void test_MFCreateAsyncResult(void) ok(!refcount, "Unexpected refcount %u\n.", refcount); } +static void test_startup(void) +{ + HRESULT hr; + + hr = MFStartup(MAKELONG(MF_API_VERSION, 0xdead), MFSTARTUP_FULL); + ok(hr == MF_E_BAD_STARTUP_VERSION, "Unexpected hr %#x.\n", hr); + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shutdown, hr %#x.\n", hr); +} + START_TEST(mfplat) { CoInitialize(NULL); init_functions(); + test_startup(); test_register(); test_MFCreateMediaType(); test_MFCreateMediaEvent(); -- 2.20.1

1 3

[PATCH 1/4] mfplat/tests: Remove initialization from tests that don't need it.
by Nikolay Sivov Feb. 19, 2019

Feb. 19, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 395fde421d..7d202bc2e5 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -319,12 +319,6 @@ static void test_MFCreateMediaType(void) HRESULT hr; IMFMediaType *mediatype; - hr = MFStartup(MAKELONG( MF_API_VERSION, 0xdead ), MFSTARTUP_FULL); - ok(hr == MF_E_BAD_STARTUP_VERSION, "got 0x%08x\n", hr); - - hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); - ok(hr == S_OK, "got 0x%08x\n", hr); - if(0) { /* Crash on Windows Vista/7 */ @@ -339,8 +333,6 @@ if(0) todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); IMFMediaType_Release(mediatype); - - MFShutdown(); } static void test_MFCreateMediaEvent(void) @@ -832,12 +824,27 @@ static void test_MFCreateAsyncResult(void) ok(!refcount, "Unexpected refcount %u\n.", refcount); } +static void test_startup(void) +{ + HRESULT hr; + + hr = MFStartup(MAKELONG(MF_API_VERSION, 0xdead), MFSTARTUP_FULL); + ok(hr == MF_E_BAD_STARTUP_VERSION, "Unexpected hr %#x.\n", hr); + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shutdown, hr %#x.\n", hr); +} + START_TEST(mfplat) { CoInitialize(NULL); init_functions(); + test_startup(); test_register(); test_MFCreateMediaType(); test_MFCreateMediaEvent(); -- 2.20.1

2 4

[PATCH 1/4] ext-ms-win-gdi-draw-l1-1-0: Add dll.
by Andrey Gusev Feb. 19, 2019

Feb. 19, 2019

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/ext-ms-win-gdi-draw-l1-1-0/Makefile.in | 1 + .../ext-ms-win-gdi-draw-l1-1-0.spec | 18 ++++++++++++++++++ tools/make_specfiles | 1 + 3 files changed, 20 insertions(+) create mode 100644 dlls/ext-ms-win-gdi-draw-l1-1-0/Makefile.in create mode 100644 dlls/ext-ms-win-gdi-draw-l1-1-0/ext-ms-win-gdi-draw-l1-1-0.spec diff --git a/dlls/ext-ms-win-gdi-draw-l1-1-0/Makefile.in b/dlls/ext-ms-win-gdi-draw-l1-1-0/Makefile.in new file mode 100644 index 0000000000..1a0efdfd28 --- /dev/null +++ b/dlls/ext-ms-win-gdi-draw-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-gdi-draw-l1-1-0.dll diff --git a/dlls/ext-ms-win-gdi-draw-l1-1-0/ext-ms-win-gdi-draw-l1-1-0.spec b/dlls/ext-ms-win-gdi-draw-l1-1-0/ext-ms-win-gdi-draw-l1-1-0.spec new file mode 100644 index 0000000000..6f1f587045 --- /dev/null +++ b/dlls/ext-ms-win-gdi-draw-l1-1-0/ext-ms-win-gdi-draw-l1-1-0.spec @@ -0,0 +1,18 @@ +@ stdcall BitBlt(long long long long long long long long long) gdi32.BitBlt +@ stdcall CreateBitmap(long long long long ptr) gdi32.CreateBitmap +@ stdcall CreateCompatibleBitmap(long long long) gdi32.CreateCompatibleBitmap +@ stdcall CreateDIBSection(long ptr long ptr long long) gdi32.CreateDIBSection +@ stdcall CreateSolidBrush(long) gdi32.CreateSolidBrush +@ stdcall GdiFlush() gdi32.GdiFlush +@ stdcall GetBitmapBits(long long ptr) gdi32.GetBitmapBits +@ stdcall GetDIBits(long long long long ptr ptr long) gdi32.GetDIBits +@ stdcall GetWorldTransform(long ptr) gdi32.GetWorldTransform +@ stdcall LineTo(long long long) gdi32.LineTo +@ stdcall MoveToEx(long long long ptr) gdi32.MoveToEx +@ stdcall PolyBezierTo(long ptr long) gdi32.PolyBezierTo +@ stdcall SetDIBits(long long long long ptr ptr long) gdi32.SetDIBits +@ stdcall SetGraphicsMode(long long) gdi32.SetGraphicsMode +@ stdcall SetLayout(long long) gdi32.SetLayout +@ stdcall SetWorldTransform(long ptr) gdi32.SetWorldTransform +@ stdcall StretchBlt(long long long long long long long long long long long) gdi32.StretchBlt +@ stdcall StretchDIBits(long long long long long long long long long ptr ptr long long) gdi32.StretchDIBits diff --git a/tools/make_specfiles b/tools/make_specfiles index d93723daf7..c00f3bfe8a 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -435,6 +435,7 @@ my @dll_groups = "ext-ms-win-gdi-dc-create-l1-1-1", "ext-ms-win-gdi-dc-l1-2-0", "ext-ms-win-gdi-devcaps-l1-1-0", + "ext-ms-win-gdi-draw-l1-1-0", "ext-ms-win-gdi-draw-l1-1-1", "ext-ms-win-gdi-render-l1-1-0", "ext-ms-win-rtcore-gdi-devcaps-l1-1-0", -- 2.20.1

1 3

[PATCH v4 1/4] comctl32/listbox: Move the item data insertion into a separate function
by Gabriel Ivăncescu Feb. 19, 2019

Feb. 19, 2019

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This is a no-op patch. nb_items is incremented before the call and this is taken care of in the helper function. This is for two reasons: 1) This simplifies the nodata patch (only adds a single line to insert_item_data). 2) This matches what RemoveItem does, so it's more consistent. dlls/comctl32/listbox.c | 62 ++++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 50ff5c5..330d3ae 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -176,6 +176,38 @@ 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, INT index, WCHAR *str, ULONG_PTR data) +{ + LB_ITEMDATA *item; + + item = &descr->items[index]; + + if (index < descr->nb_items - 1) + RtlMoveMemory(item + 1, item, + (descr->nb_items - 1 - index) * sizeof(LB_ITEMDATA)); + item->str = str; + item->data = HAS_STRINGS(descr) ? 0 : data; + item->height = 0; + item->selected = FALSE; + + /* Get item height */ + if (descr->style & LBS_OWNERDRAWVARIABLE) + { + MEASUREITEMSTRUCT mis; + UINT id = (UINT)GetWindowLongPtrW( descr->self, GWLP_ID ); + + mis.CtlType = ODT_LISTBOX; + mis.CtlID = id; + mis.itemID = index; + mis.itemData = data; + mis.itemHeight = descr->item_height; + 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 ); + } +} + /*********************************************************************** * LISTBOX_GetCurrentPageSize * @@ -1553,42 +1585,14 @@ 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; descr->nb_items++; - - /* Get item height */ - - if (descr->style & LBS_OWNERDRAWVARIABLE) - { - MEASUREITEMSTRUCT mis; - UINT id = (UINT)GetWindowLongPtrW( descr->self, GWLP_ID ); - - mis.CtlType = ODT_LISTBOX; - mis.CtlID = id; - mis.itemID = index; - mis.itemData = data; - mis.itemHeight = descr->item_height; - 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 ); - } + insert_item_data(descr, index, str, data); /* Repaint the items */ -- 2.20.1

2 7