June 2018 - Wine-commits - list.winehq.org

Zebediah Figura : oleaut32: Correct some comments.
by Alexandre Julliard 21 Jun '18

21 Jun '18

Module: wine Branch: master Commit: bab41c8aeaa0fd21c3616361caa1d496da71bd84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bab41c8aeaa0fd21c3616361… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 20 19:15:50 2018 -0500 oleaut32: Correct some comments. This corresponds to 652ec646ad3 affecting widl. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 2 +- dlls/oleaut32/typelib.h | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 4ee6aa5..9b1c782 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2675,7 +2675,7 @@ static ITypeInfoImpl * MSFT_DoTypeInfo( ptiRet->typeattr.wMajorVerNum = LOWORD(tiBase.version); ptiRet->typeattr.wMinorVerNum = HIWORD(tiBase.version); ptiRet->typeattr.cImplTypes = tiBase.cImplTypes; - ptiRet->typeattr.cbSizeVft = tiBase.cbSizeVft; /* FIXME: this is only the non inherited part */ + ptiRet->typeattr.cbSizeVft = tiBase.cbSizeVft; if (ptiRet->typeattr.typekind == TKIND_ALIAS) { TYPEDESC tmp; MSFT_GetTdesc(pcx, tiBase.datatype1, &tmp); diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index 2003c75..629ed72 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -142,11 +142,11 @@ typedef struct tagMSFT_TypeInfoBase { INT helpcontext; /* */ INT oCustData; /* offset in customer data table */ #ifdef WORDS_BIGENDIAN - INT16 cbSizeVft; /* virtual table size, not including inherits */ + INT16 cbSizeVft; /* virtual table size, including inherits */ INT16 cImplTypes; /* nr of implemented interfaces */ #else INT16 cImplTypes; /* nr of implemented interfaces */ - INT16 cbSizeVft; /* virtual table size, not including inherits */ + INT16 cbSizeVft; /* virtual table size, including inherits */ #endif /*050*/ INT size; /* size in bytes, at least for structures */ /* FIXME: name of this field */ @@ -155,10 +155,8 @@ typedef struct tagMSFT_TypeInfoBase { /* if coclass: offset in reftable */ /* if interface: reference to inherited if */ /* if module: offset to dllname in name table */ - INT datatype2; /* if 0x8000, entry above is valid */ - /* actually dunno */ - /* else it is zero? */ - /* if interface: inheritance level | no of inherited funcs */ + INT datatype2; /* for interfaces: hiword is num of inherited funcs */ + /* loword is num of inherited interfaces */ INT res18; /* always? 0 */ /*060*/ INT res19; /* always? -1 */ } MSFT_TypeInfoBase; @@ -281,9 +279,10 @@ typedef struct { to the typeinfo itself or to a member of the typeinfo */ INT next_hash; /* offset to next name in the hash bucket */ - INT namelen; /* only lower 8 bits are valid, - lower-middle 8 bits are unknown (flags?), - upper 16 bits are hash code */ + INT namelen; /* only lower 8 bits are valid */ + /* 0x1000 if name is only used once as a variable name */ + /* 0x2000 if name is a variable in an enumeration */ + /* 0x3800 if name is typeinfo name */ } MSFT_NameIntro; /* the custom data table directory has entries like this */ typedef struct {

1 0

Kieran Duggan : d3dx9/tests: Add initial tests for ID3DXFont::DrawText().
by Alexandre Julliard 21 Jun '18

21 Jun '18

Module: wine Branch: master Commit: 36ad988da85886aedc17dc6acf0681641bb8bdb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36ad988da85886aedc17dc6a… Author: Kieran Duggan <kieranduggan15(a)gmail.com> Date: Thu Jun 21 00:48:22 2018 +0200 d3dx9/tests: Add initial tests for ID3DXFont::DrawText(). Signed-off-by: Kieran Duggan <kieranduggan15(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/core.c | 84 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 65 insertions(+), 19 deletions(-) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index 75d33c1..91e458b 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -305,23 +305,28 @@ static void test_ID3DXSprite(IDirect3DDevice9 *device) static void test_ID3DXFont(IDirect3DDevice9 *device) { - D3DXFONT_DESCA desc; - ID3DXFont *font; - HRESULT hr; - int ref; - int i; - static const struct { - INT font_height; - UINT expected_size; - DWORD expected_levels; - } texture_tests[] = { + static const WCHAR testW[] = {'t','e','s','t',0}; + static const struct + { + int font_height; + unsigned int expected_size; + unsigned int expected_levels; + } + tests[] = + { { 6, 128, 4 }, { 8, 128, 4 }, { 10, 256, 5 }, { 12, 256, 5 }, - { 72, 256, 8 } + { 72, 256, 8 }, }; - + const unsigned int size = ARRAY_SIZE(testW); + D3DXFONT_DESCA desc; + ID3DXSprite *sprite; + int ref, i, height; + ID3DXFont *font; + HRESULT hr; + RECT rect; /* D3DXCreateFont */ ref = get_ref((IUnknown*)device); @@ -463,8 +468,6 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) /* ID3DXFont_PreloadText */ hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); if(SUCCEEDED(hr)) { - const WCHAR testW[] = {'t','e','s','t',0}; - todo_wine { hr = ID3DXFont_PreloadTextA(font, NULL, -1); ok(hr == D3DERR_INVALIDCALL, "ID3DXFont_PreloadTextA returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); @@ -552,7 +555,8 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) check_release((IUnknown*)font, 0); } else skip("Failed to create a ID3DXFont object\n"); - for(i = 0; i < ARRAY_SIZE(texture_tests); i++) { + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { HDC hdc; DWORD ret; HRESULT hr; @@ -560,7 +564,8 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) char c = 'a'; IDirect3DTexture9 *texture; - hr = D3DXCreateFontA(device, texture_tests[i].font_height, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + hr = D3DXCreateFontA(device, tests[i].font_height, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, + OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); if(FAILED(hr)) { skip("Failed to create a ID3DXFont object\n"); continue; @@ -578,17 +583,58 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) D3DSURFACE_DESC desc; levels = IDirect3DTexture9_GetLevelCount(texture); - ok(levels == texture_tests[i].expected_levels, "Got levels %u, expected %u\n", levels, texture_tests[i].expected_levels); + ok(levels == tests[i].expected_levels, "Got levels %u, expected %u\n", + levels, tests[i].expected_levels); hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); ok(hr == D3D_OK, "IDirect3DTexture9_GetLevelDesc failed\n"); ok(desc.Format == D3DFMT_A8R8G8B8, "Got format %#x, expected %#x\n", desc.Format, D3DFMT_A8R8G8B8); ok(desc.Usage == 0, "Got usage %#x, expected %#x\n", desc.Usage, 0); - ok(desc.Width == texture_tests[i].expected_size, "Got width %u, expected %u\n", desc.Width, texture_tests[i].expected_size); - ok(desc.Height == texture_tests[i].expected_size, "Got height %u, expected %u\n", desc.Height, texture_tests[i].expected_size); + ok(desc.Width == tests[i].expected_size, "Got width %u, expected %u\n", + desc.Width, tests[i].expected_size); + ok(desc.Height == tests[i].expected_size, "Got height %u, expected %u\n", + desc.Height, tests[i].expected_size); ok(desc.Pool == D3DPOOL_MANAGED, "Got pool %u, expected %u\n", desc.Pool, D3DPOOL_MANAGED); IDirect3DTexture9_Release(texture); } + + /* ID3DXFontImpl_DrawText */ + D3DXCreateSprite(device, &sprite); + SetRect(&rect, 0, 0, 640, 480); + + IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff000000, 1.0f, 0); + + IDirect3DDevice9_BeginScene(device); + hr = ID3DXSprite_Begin(sprite, D3DXSPRITE_ALPHABLEND); + ok (hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + todo_wine + { + height = ID3DXFont_DrawTextW(font, sprite, testW, -1, &rect, DT_TOP, 0xffffffff); + ok(height == tests[i].font_height, "Got unexpected height %u.\n", height); + height = ID3DXFont_DrawTextW(font, sprite, testW, size, &rect, DT_TOP, 0xffffffff); + ok(height == tests[i].font_height, "Got unexpected height %u.\n", height); + height = ID3DXFont_DrawTextW(font, sprite, testW, size, &rect, DT_RIGHT, 0xffffffff); + ok(height == tests[i].font_height, "Got unexpected height %u.\n", height); + height = ID3DXFont_DrawTextW(font, sprite, testW, size, &rect, DT_LEFT | DT_NOCLIP, + 0xffffffff); + ok(height == tests[i].font_height, "Got unexpected height %u.\n", height); + } + + SetRect(&rect, 0, 0, 0, 0); + height = ID3DXFont_DrawTextW(font, sprite, testW, size, &rect, + DT_LEFT | DT_CALCRECT, 0xffffffff); + todo_wine ok(height == tests[i].font_height, "Got unexpected height %u.\n", height); + ok(!rect.left, "Got unexpected rect left %d.\n", rect.left); + ok(!rect.top, "Got unexpected rect top %d.\n", rect.top); + todo_wine ok(rect.right, "Got unexpected rect right %d.\n", rect.right); + todo_wine ok(rect.bottom == tests[i].font_height, "Got unexpected rect bottom %d.\n", rect.bottom); + + hr = ID3DXSprite_End(sprite); + ok (hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + IDirect3DDevice9_EndScene(device); + ID3DXSprite_Release(sprite); + ID3DXFont_Release(font); } }

1 0

Michael Stefaniuc : wininet/tests: Use the correct array size in a notification_data test.
by Alexandre Julliard 21 Jun '18

21 Jun '18

Module: wine Branch: master Commit: 91c1fc2ff98ef0d77b1f80e994e1835ed55200c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91c1fc2ff98ef0d77b1f80e9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jun 20 23:35:10 2018 +0200 wininet/tests: Use the correct array size in a notification_data test. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 72121d8..0524ddf 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -6558,7 +6558,7 @@ static const struct notification_data notification_data[] = { }, { async_send_request_ex_test2, - sizeof(async_send_request_ex_test)/sizeof(async_send_request_ex_test[0]), + ARRAY_SIZE(async_send_request_ex_test2), "POST", "test.winehq.org", "tests/post.php"

1 0

Zebediah Figura : winedbg: Suppress all message boxes if ShowCrashDialog is disabled.
by Alexandre Julliard 21 Jun '18

21 Jun '18

Module: wine Branch: master Commit: 14da5bfbd58072374d77b75e493bf96f2f81cca5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14da5bfbd58072374d77b75e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 20 17:25:47 2018 -0500 winedbg: Suppress all message boxes if ShowCrashDialog is disabled. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/crashdlg.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/programs/winedbg/crashdlg.c b/programs/winedbg/crashdlg.c index 5c913ff..a925378 100644 --- a/programs/winedbg/crashdlg.c +++ b/programs/winedbg/crashdlg.c @@ -34,13 +34,18 @@ static char *crash_log; -int msgbox_res_id(HWND hwnd, UINT textId, UINT captionId, UINT uType) +int msgbox_res_id(HWND hwnd, UINT textid, UINT captionid, UINT type) { - WCHAR caption[256]; - WCHAR text[256]; - LoadStringW(GetModuleHandleW(NULL), captionId, caption, ARRAY_SIZE(caption)); - LoadStringW(GetModuleHandleW(NULL), textId, text, ARRAY_SIZE(text)); - return MessageBoxW(hwnd, text, caption, uType); + if (DBG_IVAR(ShowCrashDialog)) + { + WCHAR caption[256]; + WCHAR text[256]; + LoadStringW(GetModuleHandleW(NULL), captionid, caption, ARRAY_SIZE(caption)); + LoadStringW(GetModuleHandleW(NULL), textid, text, ARRAY_SIZE(text)); + return MessageBoxW(hwnd, text, caption, type); + } + + return IDCANCEL; } static WCHAR *get_program_name(HANDLE hProcess)

1 0

Józef Kucia : wrc: Accept hyphens in identificators.
by Alexandre Julliard 21 Jun '18

21 Jun '18

Module: wine Branch: master Commit: 9269562a3ab2d9fa82cd12c12dfab33fbc73c267 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9269562a3ab2d9fa82cd12c1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 21 11:42:42 2018 +0200 wrc: Accept hyphens in identificators. It is a bit more permissive than it should be, hyphens should be allowed in resource names, but not in filenames. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/parser.l | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index 32a231b..0f46670 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -402,7 +402,7 @@ static unsigned long xstrtoul(const char *nptr, char **endptr, int base) 0[oO][0-7]+[lL]? { parser_lval.num = xstrtoul(yytext+2, 0, 8); return (yytext[yyleng-1] == 'L' || yytext[yyleng-1] == 'l') ? tLNUMBER : tNUMBER; } -[A-Za-z_0-9./\\]+ { +[A-Za-z_0-9./\\][A-Za-z_0-9./\\\-]* { struct keyword *tok = iskeyword(yytext); if(tok)

1 0

Józef Kucia : wined3d: Initialize depth/ stencil texture data.
by Alexandre Julliard 20 Jun '18

20 Jun '18

Module: wine Branch: master Commit: 5836b957e55c6ec3f720e995bb8a01ec295d7d38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5836b957e55c6ec3f720e995… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 19 17:14:57 2018 +0200 wined3d: Initialize depth/stencil texture data. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 91c703c..c316906 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2802,8 +2802,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc if (wined3d_texture_use_pbo(texture, gl_info)) texture->resource.map_binding = WINED3D_LOCATION_BUFFER; - if ((desc->resource_type != WINED3D_RTYPE_TEXTURE_3D - && !(texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL)) + if (desc->resource_type != WINED3D_RTYPE_TEXTURE_3D || !wined3d_texture_use_pbo(texture, gl_info)) { if (!wined3d_resource_allocate_sysmem(&texture->resource)) @@ -2842,8 +2841,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc sub_resource = &texture->sub_resources[i]; sub_resource->locations = WINED3D_LOCATION_DISCARDED; - if (desc->resource_type != WINED3D_RTYPE_TEXTURE_3D - && !(texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL)) + if (desc->resource_type != WINED3D_RTYPE_TEXTURE_3D) { wined3d_texture_validate_location(texture, i, WINED3D_LOCATION_SYSMEM); wined3d_texture_invalidate_location(texture, i, ~WINED3D_LOCATION_SYSMEM);

1 0

Józef Kucia : d3d9/tests: Add test for depth stencil initialization.
by Alexandre Julliard 20 Jun '18

20 Jun '18

Module: wine Branch: master Commit: 14678ce73f5c2d8932d7bb4610ad1fecfd9bfc3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=14678ce73f5c2d8932d7bb46… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 19 17:14:58 2018 +0200 d3d9/tests: Add test for depth stencil initialization. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 95982e0..b36c189 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -211,6 +211,34 @@ static DWORD getPixelColor(IDirect3DDevice9 *device, UINT x, UINT y) return ret; } +#define check_rt_color(a, b) check_rt_color_(__LINE__, a, b) +static void check_rt_color_(unsigned int line, IDirect3DSurface9 *rt, D3DCOLOR expected_color) +{ + struct surface_readback rb; + D3DSURFACE_DESC desc; + unsigned int x, y; + D3DCOLOR color; + HRESULT hr; + + hr = IDirect3DSurface9_GetDesc(rt, &desc); + ok_(__FILE__, line)(hr == S_OK, "Failed to get surface desc, hr %#x.\n", hr); + + get_rt_readback(rt, &rb); + for (y = 0; y < desc.Height; ++y) + { + for (x = 0; x < desc.Width; ++x) + { + color = get_readback_color(&rb, x, y) & 0x00ffffff; + if (color != expected_color) + break; + } + if (color != expected_color) + break; + } + release_surface_readback(&rb); + ok_(__FILE__, line)(color == 0x000000ff, "Got unexpected color 0x%08x.\n", color); +} + static IDirect3DDevice9 *create_device(IDirect3D9 *d3d, HWND device_window, HWND focus_window, BOOL windowed) { D3DPRESENT_PARAMETERS present_parameters = {0}; @@ -21406,6 +21434,92 @@ done: DestroyWindow(window); } +static void test_depth_stencil_init(void) +{ + IDirect3DDevice9 *device; + IDirect3DSurface9 *ds[2]; + IDirect3DSurface9 *rt; + IDirect3D9 *d3d; + ULONG refcount; + unsigned int i; + HWND window; + HRESULT hr; + + static const struct + { + struct vec3 position; + } + quad[] = + { + {{-1.0f, -1.0f, 0.0f}}, + {{-1.0f, 1.0f, 0.0f}}, + {{ 1.0f, -1.0f, 0.0f}}, + {{ 1.0f, 1.0f, 0.0f}}, + }; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create D3D device.\n"); + goto done; + } + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == S_OK, "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_TRUE); + ok(hr == S_OK, "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZFUNC, D3DCMP_LESSEQUAL); + ok(hr == S_OK, "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(hr == S_OK, "Failed to set color op, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TFACTOR); + ok(hr == S_OK, "Failed to set color arg, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); + ok(hr == S_OK, "Failed to set FVF, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 640, 480, D3DFMT_D24S8, 0, 0, FALSE, &ds[0], NULL); + ok(hr == S_OK, "Failed to create depth stencil surface, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetDepthStencilSurface(device, &ds[1]); + ok(hr == S_OK, "Failed to get depth stencil surface, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(ds); ++i) + { + hr = IDirect3DDevice9_SetDepthStencilSurface(device, ds[i]); + ok(hr == S_OK, "Failed to set depth stencil surface, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(hr == S_OK, "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == S_OK, "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_TEXTUREFACTOR, 0x000000ff); + ok(hr == S_OK, "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(hr == S_OK, "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == S_OK, "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &rt); + ok(hr == S_OK, "Failed to get render target, hr %#x.\n", hr); + check_rt_color(rt, 0x000000ff); + IDirect3DSurface9_Release(rt); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Failed to present, hr %#x.\n", hr); + + IDirect3DSurface9_Release(ds[i]); + } + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + static void test_texture_blending(void) { #define STATE_END() {0xffffffff, 0xffffffff} @@ -24037,6 +24151,7 @@ START_TEST(visual) test_flip(); test_uninitialized_varyings(); test_multisample_init(); + test_depth_stencil_init(); test_texture_blending(); test_color_clamping(); test_line_antialiasing_blending();

1 0

Józef Kucia : wined3d: Reduce nesting in texture2d_load_sysmem().
by Alexandre Julliard 20 Jun '18

20 Jun '18

Module: wine Branch: master Commit: ec04b2e382208f39d64904d78a3b3bcedcae0bec URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec04b2e382208f39d64904d7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 19 17:14:59 2018 +0200 wined3d: Reduce nesting in texture2d_load_sysmem(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5217033..5502d05 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -198,7 +198,6 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3 else wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location); - if (src_location == WINED3D_LOCATION_DRAWABLE) { required_texture = src_texture; @@ -1655,21 +1654,18 @@ BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_res WINED3D_LOCATION_RB_RESOLVED, dst_location); return TRUE; } - else - { - if (sub_resource->locations & (WINED3D_LOCATION_RB_MULTISAMPLE | WINED3D_LOCATION_RB_RESOLVED)) - wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); - /* Download the sub-resource to system memory. */ - if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) - { - wined3d_texture_bind_and_dirtify(texture, context, - !(sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB)); - texture2d_download_data(texture, sub_resource_idx, context, dst_location); - ++texture->download_count; + if (sub_resource->locations & (WINED3D_LOCATION_RB_MULTISAMPLE | WINED3D_LOCATION_RB_RESOLVED)) + wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); - return TRUE; - } + /* Download the sub-resource to system memory. */ + if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) + { + wined3d_texture_bind_and_dirtify(texture, context, + !(sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB)); + texture2d_download_data(texture, sub_resource_idx, context, dst_location); + ++texture->download_count; + return TRUE; } if (!(texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL)

1 0

Józef Kucia : wined3d: Use WINED3D_LOCATION_DISCARDED before initializing buffers with data.
by Alexandre Julliard 20 Jun '18

20 Jun '18

Module: wine Branch: master Commit: 537007525a8909a2295bd7cd123f0eb6ce1b77cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=537007525a8909a2295bd7cd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 19 17:15:00 2018 +0200 wined3d: Use WINED3D_LOCATION_DISCARDED before initializing buffers with data. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index e06d156..4b14d68 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1354,7 +1354,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device } buffer->buffer_type_hint = buffer_type_hint_from_bind_flags(gl_info, bind_flags); buffer->bind_flags = bind_flags; - buffer->locations = WINED3D_LOCATION_SYSMEM; + buffer->locations = data ? WINED3D_LOCATION_DISCARDED : WINED3D_LOCATION_SYSMEM; if (!wined3d_resource_allocate_sysmem(&buffer->resource)) return E_OUTOFMEMORY;

1 0

Józef Kucia : wined3d: Call wined3d_cs_emit_update_sub_resource() directly in buffer_init().
by Alexandre Julliard 20 Jun '18

20 Jun '18

Module: wine Branch: master Commit: bb535b1a2d5a9164353d7d89db18f05526050043 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb535b1a2d5a9164353d7d89… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 19 17:15:01 2018 +0200 wined3d: Call wined3d_cs_emit_update_sub_resource() directly in buffer_init(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 4b14d68..181be6b 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1325,6 +1325,8 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_format *format = wined3d_get_format(gl_info, format_id, usage); + struct wined3d_resource *resource = &buffer->resource; + struct wined3d_box box; BOOL dynamic_buffer_ok; HRESULT hr; @@ -1346,7 +1348,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device return E_INVALIDARG; } - if (FAILED(hr = resource_init(&buffer->resource, device, WINED3D_RTYPE_BUFFER, format, WINED3D_MULTISAMPLE_NONE, + if (FAILED(hr = resource_init(resource, device, WINED3D_RTYPE_BUFFER, format, WINED3D_MULTISAMPLE_NONE, 0, usage, access, size, 1, 1, size, parent, parent_ops, &buffer_resource_ops))) { WARN("Failed to initialize resource, hr %#x.\n", hr); @@ -1386,7 +1388,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device { TRACE("Not creating a BO because the buffer is not GPU accessible.\n"); } - else if (!dynamic_buffer_ok && (buffer->resource.usage & WINED3DUSAGE_DYNAMIC)) + else if (!dynamic_buffer_ok && (resource->usage & WINED3DUSAGE_DYNAMIC)) { TRACE("Not creating a BO because the buffer has dynamic usage and no GL support.\n"); } @@ -1398,16 +1400,19 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device if (!(buffer->maps = heap_alloc(sizeof(*buffer->maps)))) { ERR("Out of memory.\n"); - buffer_unload(&buffer->resource); - resource_cleanup(&buffer->resource); - wined3d_resource_wait_idle(&buffer->resource); + buffer_unload(resource); + resource_cleanup(resource); + wined3d_resource_wait_idle(resource); return E_OUTOFMEMORY; } buffer->maps_size = 1; if (data) - wined3d_device_update_sub_resource(device, &buffer->resource, - 0, NULL, data->data, data->row_pitch, data->slice_pitch, 0); + { + wined3d_box_set(&box, 0, 0, resource->size, 1, 0, 1); + wined3d_cs_emit_update_sub_resource(device->cs, resource, + 0, &box, data->data, data->row_pitch, data->slice_pitch); + } return WINED3D_OK; }

1 0