August 2019 - Wine-commits - list.winehq.org

Jacek Caban : mshtml/tests: Fix SCRIPTPROP_ABBREVIATE_GLOBALNAME_RESOLUTION tests on recent IE11 versions.
by Alexandre Julliard 12 Aug '19

12 Aug '19

Module: wine Branch: master Commit: 36758fc76fd63b3e4eb2a6f2510958df724f0b36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36758fc76fd63b3e4eb2a6f2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 12 14:02:06 2019 +0200 mshtml/tests: Fix SCRIPTPROP_ABBREVIATE_GLOBALNAME_RESOLUTION tests on recent IE11 versions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/script.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 3704d39..d4c53cd 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -108,7 +108,8 @@ DEFINE_EXPECT(InitNew); DEFINE_EXPECT(Close); DEFINE_EXPECT(SetProperty_HACK_TRIDENTEVENTSINK); DEFINE_EXPECT(SetProperty_INVOKEVERSIONING); -DEFINE_EXPECT(SetProperty_ABBREVIATE_GLOBALNAME_RESOLUTION); +DEFINE_EXPECT(SetProperty_ABBREVIATE_GLOBALNAME_RESOLUTION_FALSE); +DEFINE_EXPECT(SetProperty_ABBREVIATE_GLOBALNAME_RESOLUTION_TRUE); DEFINE_EXPECT(SetScriptSite); DEFINE_EXPECT(GetScriptState); DEFINE_EXPECT(SetScriptState_STARTED); @@ -1824,9 +1825,11 @@ static HRESULT WINAPI ActiveScriptProperty_SetProperty(IActiveScriptProperty *if ok(V_I4(pvarValue) == 1, "V_I4(pvarValue)=%d\n", V_I4(pvarValue)); break; case SCRIPTPROP_ABBREVIATE_GLOBALNAME_RESOLUTION: - CHECK_EXPECT(SetProperty_ABBREVIATE_GLOBALNAME_RESOLUTION); + if(V_BOOL(pvarValue)) + CHECK_EXPECT(SetProperty_ABBREVIATE_GLOBALNAME_RESOLUTION_TRUE); + else + CHECK_EXPECT(SetProperty_ABBREVIATE_GLOBALNAME_RESOLUTION_FALSE); ok(V_VT(pvarValue) == VT_BOOL, "V_VT(pvarValue)=%d\n", V_VT(pvarValue)); - ok(V_BOOL(pvarValue) == VARIANT_TRUE, "V_BOOL(pvarValue)=%x\n", V_BOOL(pvarValue)); break; case 0x70000003: /* Undocumented property set by IE10 */ return E_NOTIMPL; @@ -2369,8 +2372,11 @@ static void test_script_run(void) dp.cArgs = 1; dp.rgvarg = &arg; + SET_EXPECT(SetProperty_ABBREVIATE_GLOBALNAME_RESOLUTION_FALSE); /* IE11 */ SET_EXPECT(funcDisp); hres = IDispatchEx_InvokeEx(document, id, LOCALE_NEUTRAL, INVOKE_FUNC, &dp, &var, &ei, NULL); + todo_wine + CHECK_CALLED_BROKEN(SetProperty_ABBREVIATE_GLOBALNAME_RESOLUTION_FALSE); /* IE11 */ CHECK_CALLED(funcDisp); ok(hres == S_OK, "InvokeEx(INVOKE_FUNC) failed: %08x\n", hres); @@ -3304,7 +3310,7 @@ static void test_simple_script(void) SET_EXPECT(GetScriptState); SET_EXPECT(SetScriptState_STARTED); SET_EXPECT(AddNamedItem); - SET_EXPECT(SetProperty_ABBREVIATE_GLOBALNAME_RESOLUTION); /* IE8 */ + SET_EXPECT(SetProperty_ABBREVIATE_GLOBALNAME_RESOLUTION_TRUE); /* IE8 */ SET_EXPECT(ParseScriptText_script); SET_EXPECT(SetScriptState_CONNECTED); @@ -3320,7 +3326,7 @@ static void test_simple_script(void) CHECK_CALLED(GetScriptState); CHECK_CALLED(SetScriptState_STARTED); CHECK_CALLED(AddNamedItem); - CHECK_CALLED_BROKEN(SetProperty_ABBREVIATE_GLOBALNAME_RESOLUTION); /* IE8 */ + CHECK_CALLED_BROKEN(SetProperty_ABBREVIATE_GLOBALNAME_RESOLUTION_TRUE); /* IE8 */ CHECK_CALLED(ParseScriptText_script); CHECK_CALLED(SetScriptState_CONNECTED);

1 0

Jacek Caban : mshtml: Support semicolon in UA compatible string.
by Alexandre Julliard 12 Aug '19

12 Aug '19

Module: wine Branch: master Commit: d2f5eaf9165bc8eaa5205daabee9c6c997cd4e54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2f5eaf9165bc8eaa5205daa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 12 14:02:21 2019 +0200 mshtml: Support semicolon in UA compatible string. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mutation.c | 9 ++++++--- dlls/mshtml/tests/script.c | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index ab748c7..6903fe8 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -405,7 +405,7 @@ BOOL parse_compat_version(const WCHAR *version_string, compat_mode_t *r) for(p = version_string; '0' <= *p && *p <= '9'; p++) version = version * 10 + *p-'0'; - if(*p || p == version_string) + if((*p && *p != ';') || p == version_string) return FALSE; switch(version){ @@ -434,7 +434,7 @@ BOOL parse_compat_version(const WCHAR *version_string, compat_mode_t *r) static BOOL parse_ua_compatible(const WCHAR *p, compat_mode_t *r) { static const WCHAR ie_eqW[] = {'I','E','='}; - static const WCHAR edgeW[] = {'e','d','g','e',0}; + static const WCHAR edgeW[] = {'e','d','g','e'}; TRACE("%s\n", debugstr_w(p)); @@ -442,7 +442,10 @@ static BOOL parse_ua_compatible(const WCHAR *p, compat_mode_t *r) return FALSE; p += 3; - if(!wcsicmp(p, edgeW)) { + if(!wcsnicmp(p, edgeW, ARRAY_SIZE(edgeW))) { + p += ARRAY_SIZE(edgeW); + if(*p && *p != ';') + return FALSE; *r = COMPAT_MODE_IE11; return TRUE; } diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index d4c53cd..e62b83d 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -3493,9 +3493,9 @@ static void run_js_tests(void) run_script_as_http_with_mode("documentmode.js", "7", "7"); run_script_as_http_with_mode("documentmode.js", "8", "8"); run_script_as_http_with_mode("documentmode.js", "9", "9"); - run_script_as_http_with_mode("documentmode.js", "10", "10"); + run_script_as_http_with_mode("documentmode.js", "10", "10;abc"); run_script_as_http_with_mode("documentmode.js", "11", "11"); - run_script_as_http_with_mode("documentmode.js", "11", "edge"); + run_script_as_http_with_mode("documentmode.js", "11", "edge;123"); run_script_as_http_with_mode("asyncscriptload.js", NULL, "9"); }

1 0

Michael Stefaniuc : ntdll: Remove useless cast to self.
by Alexandre Julliard 12 Aug '19

12 Aug '19

Module: wine Branch: master Commit: 724c216d180d257a8d888aec299f297d3d6e91d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=724c216d180d257a8d888aec… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Aug 9 21:17:44 2019 +0200 ntdll: Remove useless cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 2d2caf5..e8ac1ff 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1293,7 +1293,7 @@ static BOOL HEAP_ValidateInUseArena( const SUBHEAP *subheap, const ARENA_INUSE * if (*ptr != ARENA_FREE_FILLER) { ERR("Heap %p: free block %p overwritten at %p by %08x\n", - subheap->heap, (const ARENA_INUSE *)pArena + 1, ptr, *ptr ); + subheap->heap, pArena + 1, ptr, *ptr ); if (!*ptr) { HEAP_Dump( subheap->heap ); DbgBreakPoint(); } return FALSE; }

1 0

Michael Stefaniuc : d3d12/tests: Remove useless casts to self.
by Alexandre Julliard 12 Aug '19

12 Aug '19

Module: wine Branch: master Commit: 9d73bc6bdca90672c60108671978af64859572f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d73bc6bdca90672c6010867… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Aug 9 21:17:45 2019 +0200 d3d12/tests: Remove useless casts to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/tests/d3d12.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index 54eec6b..33f5288 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -1403,12 +1403,12 @@ static void test_desktop_window(void) swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_FLIP_DISCARD; swapchain_desc.AlphaMode = DXGI_ALPHA_MODE_UNSPECIFIED; swapchain_desc.Flags = 0; - hr = IDXGIFactory4_CreateSwapChainForHwnd(factory, (IUnknown *)queue, window, &swapchain_desc, NULL, NULL, &swapchain); + hr = IDXGIFactory4_CreateSwapChainForHwnd(factory, queue, window, &swapchain_desc, NULL, NULL, &swapchain); ok(hr == E_ACCESSDENIED, "Got unexpected hr %#x.\n", hr); swapchain_desc.Width = rect.right; swapchain_desc.Height = rect.bottom; - hr = IDXGIFactory4_CreateSwapChainForHwnd(factory, (IUnknown *)queue, window, &swapchain_desc, NULL, NULL, &swapchain); + hr = IDXGIFactory4_CreateSwapChainForHwnd(factory, queue, window, &swapchain_desc, NULL, NULL, &swapchain); ok(hr == E_ACCESSDENIED, "Got unexpected hr %#x.\n", hr); IDXGIFactory4_Release(factory);

1 0

Michael Stefaniuc : dxgi/tests: Remove useless casts to self.
by Alexandre Julliard 12 Aug '19

12 Aug '19

Module: wine Branch: master Commit: ce9909863b3d35fd025515f9efe57015f7566cf6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce9909863b3d35fd025515f9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Aug 9 21:17:46 2019 +0200 dxgi/tests: Remove useless casts to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index f8136a4..b35c79a 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2326,7 +2326,7 @@ static void test_set_fullscreen(IUnknown *device, BOOL is_d3d12) memset(&initial_state, 0, sizeof(initial_state)); capture_fullscreen_state(&initial_state.fullscreen_state, swapchain_desc.OutputWindow); - hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); hr = IDXGISwapChain_GetContainingOutput(swapchain, &output); ok(SUCCEEDED(hr) || broken(hr == DXGI_ERROR_UNSUPPORTED), /* Win 7 testbot */ @@ -2358,7 +2358,7 @@ static void test_set_fullscreen(IUnknown *device, BOOL is_d3d12) DestroyWindow(swapchain_desc.OutputWindow); swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state); - hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); check_swapchain_fullscreen_state(swapchain, &initial_state); test_swapchain_fullscreen_state(swapchain, adapter, &initial_state); @@ -2368,7 +2368,7 @@ static void test_set_fullscreen(IUnknown *device, BOOL is_d3d12) DestroyWindow(swapchain_desc.OutputWindow); swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state); - hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); @@ -2384,7 +2384,7 @@ static void test_set_fullscreen(IUnknown *device, BOOL is_d3d12) swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state); - hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); @@ -2403,7 +2403,7 @@ static void test_set_fullscreen(IUnknown *device, BOOL is_d3d12) swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state); swapchain_desc.Flags = DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH; - hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); check_swapchain_fullscreen_state(swapchain, &initial_state); test_swapchain_fullscreen_state(swapchain, adapter, &initial_state); @@ -2751,7 +2751,7 @@ static void test_resize_target(IUnknown *device, BOOL is_d3d12) memset(&initial_state, 0, sizeof(initial_state)); capture_fullscreen_state(&initial_state.fullscreen_state, swapchain_desc.OutputWindow); - hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); check_swapchain_fullscreen_state(swapchain, &initial_state);

1 0

Michael Stefaniuc : gdi32/tests: Remove useless casts to self.
by Alexandre Julliard 12 Aug '19

12 Aug '19

Module: wine Branch: master Commit: 0ae101080b810554f03c8a13bb84a260e6badad0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ae101080b810554f03c8a13… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Aug 9 21:17:47 2019 +0200 gdi32/tests: Remove useless casts to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/brush.c | 2 +- dlls/gdi32/tests/path.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/brush.c b/dlls/gdi32/tests/brush.c index a3ebb91..1a2201b 100644 --- a/dlls/gdi32/tests/brush.c +++ b/dlls/gdi32/tests/brush.c @@ -165,7 +165,7 @@ static void test_pattern_brush(void) info->bmiHeader.biBitCount = 1; info->bmiHeader.biPlanes = 1; info->bmiHeader.biCompression = BI_RGB; - bitmap = CreateDIBSection( 0, info, DIB_RGB_COLORS, (void**)&bits, NULL, 0 ); + bitmap = CreateDIBSection( 0, info, DIB_RGB_COLORS, &bits, NULL, 0 ); ok( bitmap != NULL, "CreateDIBSection failed\n" ); /* MSDN says a DIB section is not allowed, but it works fine */ diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index f4a9d18..3fb479d 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -51,7 +51,7 @@ static void test_path_state(void) bi->bmiHeader.biBitCount = 32; bi->bmiHeader.biPlanes = 1; bi->bmiHeader.biCompression = BI_RGB; - dib = CreateDIBSection( 0, bi, DIB_RGB_COLORS, (void**)&bits, NULL, 0 ); + dib = CreateDIBSection( 0, bi, DIB_RGB_COLORS, &bits, NULL, 0 ); orig = SelectObject( hdc, dib ); BeginPath( hdc );

1 0

Michael Stefaniuc : gdi32: Remove useless casts to self.
by Alexandre Julliard 12 Aug '19

12 Aug '19

Module: wine Branch: master Commit: dccbd6a949de196820e3618db9fa5079b07ae313 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dccbd6a949de196820e3618d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Aug 9 21:17:48 2019 +0200 gdi32: Remove useless casts to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/path.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index a360778..d2d9ac9 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -461,8 +461,8 @@ static struct gdi_path *PATH_FlattenPath(const struct gdi_path *pPath) static void PATH_ScaleNormalizedPoint(FLOAT_POINT corners[], double x, double y, POINT *pPoint) { - pPoint->x=GDI_ROUND( (double)corners[0].x + (double)(corners[1].x-corners[0].x)*0.5*(x+1.0) ); - pPoint->y=GDI_ROUND( (double)corners[0].y + (double)(corners[1].y-corners[0].y)*0.5*(y+1.0) ); + pPoint->x = GDI_ROUND( corners[0].x + (corners[1].x-corners[0].x)*0.5*(x+1.0) ); + pPoint->y = GDI_ROUND( corners[0].y + (corners[1].y-corners[0].y)*0.5*(y+1.0) ); } /* PATH_NormalizePoint @@ -474,8 +474,8 @@ static void PATH_NormalizePoint(FLOAT_POINT corners[], const FLOAT_POINT *pPoint, double *pX, double *pY) { - *pX=(double)(pPoint->x-corners[0].x)/(double)(corners[1].x-corners[0].x) * 2.0 - 1.0; - *pY=(double)(pPoint->y-corners[0].y)/(double)(corners[1].y-corners[0].y) * 2.0 - 1.0; + *pX = (pPoint->x-corners[0].x)/(corners[1].x-corners[0].x) * 2.0 - 1.0; + *pY = (pPoint->y-corners[0].y)/(corners[1].y-corners[0].y) * 2.0 - 1.0; } /* PATH_DoArcPart

1 0

Henri Verbeet : wined3d: Make the adapter responsible for buffer creation and destruction.
by Alexandre Julliard 12 Aug '19

12 Aug '19

Module: wine Branch: master Commit: 5b3f89ae8d8fd124d113918267af308f46eb54e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b3f89ae8d8fd124d1139182… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 11 14:23:08 2019 +0430 wined3d: Make the adapter responsible for buffer creation and destruction. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 63 ++++++++++++++++++++ dlls/wined3d/adapter_vk.c | 48 +++++++++++++++ dlls/wined3d/buffer.c | 129 +++++++++++++++++++++++++++-------------- dlls/wined3d/directx.c | 47 +++++++++++++++ dlls/wined3d/wined3d_private.h | 29 +++++++++ 5 files changed, 274 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5b3f89ae8d8fd124d113…

1 0

Henri Verbeet : wined3d: Don't call wined3d_texture_prepare_location() with a NULL context in wined3d_texture_update_desc().
by Alexandre Julliard 12 Aug '19

12 Aug '19

Module: wine Branch: master Commit: da3eb0e752b526b8c9fd6aef7f0d1de2a35894c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da3eb0e752b526b8c9fd6aef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 11 14:23:09 2019 +0430 wined3d: Don't call wined3d_texture_prepare_location() with a NULL context in wined3d_texture_update_desc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 705b725..467dd09 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1535,6 +1535,14 @@ void wined3d_texture_gl_set_compatible_renderbuffer(struct wined3d_texture_gl *t checkGLcall("set compatible renderbuffer"); } +static BOOL wined3d_texture_prepare_sysmem(struct wined3d_texture *texture) +{ + if (texture->resource.heap_memory) + return TRUE; + + return wined3d_resource_allocate_sysmem(&texture->resource); +} + HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT width, UINT height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, UINT multisample_quality, void *mem, UINT pitch) @@ -1657,7 +1665,7 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT } else { - wined3d_texture_prepare_location(texture, 0, NULL, WINED3D_LOCATION_SYSMEM); + wined3d_texture_prepare_sysmem(texture); valid_location = WINED3D_LOCATION_SYSMEM; } @@ -1832,12 +1840,7 @@ BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned switch (location) { case WINED3D_LOCATION_SYSMEM: - if (texture->resource.heap_memory) - return TRUE; - - if (!wined3d_resource_allocate_sysmem(&texture->resource)) - return FALSE; - return TRUE; + return wined3d_texture_prepare_sysmem(texture); case WINED3D_LOCATION_USER_MEMORY: if (!texture->user_memory)

1 0

Henri Verbeet : wined3d: Make the adapter responsible for render target view creation and destruction.
by Alexandre Julliard 12 Aug '19

12 Aug '19

Module: wine Branch: master Commit: b7e134f80a36151baaff16c5ba546909c06c4c9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7e134f80a36151baaff16c5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 11 14:23:10 2019 +0430 wined3d: Make the adapter responsible for render target view creation and destruction. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 96 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/adapter_vk.c | 48 +++++++++++++++++++++ dlls/wined3d/directx.c | 47 +++++++++++++++++++++ dlls/wined3d/view.c | 93 ++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 28 ++++++++++++ 5 files changed, 265 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b7e134f80a36151baaff…

1 0