January 2021 - Wine-commits

Alexandre Julliard : Wine release 6.1
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: website Branch: master Commit: 42f365b348868fdc7c0dd97934464c8f7d186e6a URL: https://source.winehq.org/git/website.git/?a=commit;h=42f365b348868fdc7c0dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 29 22:10:36 2021 +0100 Wine release 6.1 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021012901.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2021012901.xml b/news/en/2021012901.xml new file mode 100644 index 00000000..798cb6a0 --- /dev/null +++ b/news/en/2021012901.xml @@ -0,0 +1,18 @@ +<news> +<date>January 29, 2021</date> +<title>Wine 6.1 Released</title> +<body> + The Wine development release 6.1 is now available. + <a href="{$root}/announce/6.1">What's new</a> in this release: +<ul> + <li>Arabic text shaping.</li> + <li>More WinRT support in WIDL.</li> + <li>VKD3D version 1.2 is used for Direct3D 12.</li> + <li>Support for Rosetta's memory layout on M1 Macs.</li> + <li>Support for Thumb-2 mode on ARM.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/6.x/wine-6.1.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Jacek Caban : ieframe: Implement SetQueryNetSessionCount.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: ffecc7f41bccd4c672ac7aa3085dce6b2175db89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffecc7f41bccd4c672ac7aa3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 29 14:14:20 2021 +0100 ieframe: Implement SetQueryNetSessionCount. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/ieframe.h | 9 +++++++++ dlls/ieframe/ieframe.spec | 1 + dlls/ieframe/ieframe_main.c | 22 ++++++++++++++++++++ dlls/ieframe/oleobject.c | 1 + dlls/ieframe/tests/webbrowser.c | 45 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 78 insertions(+) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index a35507e6fb3..633906a70ca 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -385,3 +385,12 @@ static inline LPSTR co_strdupWtoA(LPCWSTR str) WideCharToMultiByte(CP_ACP, 0, str, -1, ret, len, 0, 0); return ret; } + +enum SessionOp +{ + SESSION_QUERY, + SESSION_INCREMENT, + SESSION_DECREMENT +}; + +LONG WINAPI SetQueryNetSessionCount(DWORD session_op); diff --git a/dlls/ieframe/ieframe.spec b/dlls/ieframe/ieframe.spec index 94eb36db9f3..27d73c5aa62 100644 --- a/dlls/ieframe/ieframe.spec +++ b/dlls/ieframe/ieframe.spec @@ -7,3 +7,4 @@ @ stdcall -private DllUnregisterServer() @ stdcall IEGetWriteableHKCU(ptr) @ stdcall OpenURL(long long str long) +@ stdcall SetQueryNetSessionCount(long) diff --git a/dlls/ieframe/ieframe_main.c b/dlls/ieframe/ieframe_main.c index 5abe502f1e4..b05686f24f9 100644 --- a/dlls/ieframe/ieframe_main.c +++ b/dlls/ieframe/ieframe_main.c @@ -285,3 +285,25 @@ HRESULT WINAPI IEGetWriteableHKCU(HKEY *pkey) FIXME("(%p) stub\n", pkey); return E_NOTIMPL; } + +/*********************************************************************** + * SetQueryNetSessionCount (ieframe.@) + */ +LONG WINAPI SetQueryNetSessionCount(DWORD session_op) +{ + static LONG session_count; + + TRACE("(%x)\n", session_op); + + switch(session_op) + { + case SESSION_QUERY: + return session_count; + case SESSION_INCREMENT: + return InterlockedIncrement(&session_count); + case SESSION_DECREMENT: + return InterlockedDecrement(&session_count); + }; + + return 0; +} diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index be0e6ec5bfc..b8377b35d43 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -555,6 +555,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, LPOLECLIENTSITE on_offlineconnected_change(This); on_silent_change(This); + SetQueryNetSessionCount(SESSION_INCREMENT); return S_OK; } diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 52d1f707357..903c1062b6c 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -173,6 +173,15 @@ static const WCHAR *current_url; static int wb_version, expect_update_commands_enable, set_update_commands_enable; static BOOL nav_back_todo, nav_forward_todo; /* FIXME */ +enum SessionOp +{ + SESSION_QUERY, + SESSION_INCREMENT, + SESSION_DECREMENT +}; + +static LONG (WINAPI *pSetQueryNetSessionCount)(DWORD); + #define BUSY_FAIL 2 #define DWL_EXPECT_BEFORE_NAVIGATE 0x01 @@ -1946,6 +1955,7 @@ static void test_ClientSite(IWebBrowser2 *unk, IOleClientSite *client, BOOL stop { IOleObject *oleobj; IOleInPlaceObject *inplace; + DWORD session_count; HWND hwnd; HRESULT hres; @@ -1969,6 +1979,8 @@ static void test_ClientSite(IWebBrowser2 *unk, IOleClientSite *client, BOOL stop ok((hwnd == NULL) ^ (client == NULL), "unexpected hwnd %p\n", hwnd); if(client) { + session_count = pSetQueryNetSessionCount(SESSION_QUERY); + SET_EXPECT(GetContainer); SET_EXPECT(Site_GetWindow); SET_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); @@ -1995,6 +2007,9 @@ static void test_ClientSite(IWebBrowser2 *unk, IOleClientSite *client, BOOL stop ok(hres == S_OK, "SetClientSite failed: %08x\n", hres); if(client) { + DWORD count = pSetQueryNetSessionCount(SESSION_QUERY); + ok(count == session_count + 1, "count = %u expected %u\n", count, session_count + 1); + CHECK_CALLED(GetContainer); CHECK_CALLED(Site_GetWindow); CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); @@ -3837,6 +3852,7 @@ static void test_WebBrowser(DWORD flags, BOOL do_close) test_EnumVerbs(webbrowser); test_LocationURL(webbrowser, L""); test_ConnectionPoint(webbrowser, TRUE); + test_ClientSite(webbrowser, &ClientSite, !do_download); test_Extent(webbrowser); test_wb_funcs(webbrowser, TRUE); @@ -4401,6 +4417,29 @@ static void test_SetAdvise(void) IWebBrowser2_Release(browser); } +static void test_SetQueryNetSessionCount(void) +{ + LONG count; + + count = pSetQueryNetSessionCount(SESSION_QUERY); + ok(count == 0, "count = %d\n", count); + + count = pSetQueryNetSessionCount(SESSION_INCREMENT); + ok(count == 1, "count = %d\n", count); + + count = pSetQueryNetSessionCount(SESSION_QUERY); + ok(count == 1, "count = %d\n", count); + + count = pSetQueryNetSessionCount(0xdeadbeef); + ok(count == 0, "count = %d\n", count); + + count = pSetQueryNetSessionCount(SESSION_DECREMENT); + ok(count == 0, "count = %d\n", count); + + count = pSetQueryNetSessionCount(SESSION_QUERY); + ok(count == 0, "count = %d\n", count); +} + static HRESULT WINAPI outer_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { if(IsEqualGUID(riid, &outer_test_iid)) { @@ -4460,8 +4499,14 @@ static void test_com_aggregation(void) START_TEST(webbrowser) { + HMODULE ieframe = LoadLibraryW(L"ieframe.dll"); + + pSetQueryNetSessionCount = (void*)GetProcAddress(ieframe, "SetQueryNetSessionCount"); + OleInitialize(NULL); + test_SetQueryNetSessionCount(); + container_hwnd = create_container_window(); trace("Testing WebBrowser (no download)...\n");

1 0

Rémi Bernon : d3d11/tests: Add more SwapDeviceContextState tests.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: e11aa21ac2ac76ed882c666c1dab4e7df2d8fa55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e11aa21ac2ac76ed882c666c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 27 20:50:02 2021 +0100 d3d11/tests: Add more SwapDeviceContextState tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 79 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 69 insertions(+), 10 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 7220be73ac7..20bf62b792e 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6673,19 +6673,19 @@ static void test_device_context_state(void) 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, }; - ID3DDeviceContextState *context_state, *previous_context_state; + ID3DDeviceContextState *context_state, *previous_context_state, *tmp_context_state, *context_state2; ID3D11SamplerState *sampler, *tmp_sampler; D3D11_SHADER_RESOURCE_VIEW_DESC srv_desc; ID3D11ShaderResourceView *tmp_srv, *srv; D3D11_DEVICE_CONTEXT_TYPE context_type; - ID3D11DeviceContext1 *context = NULL; + ID3D11DeviceContext1 *context = NULL, *context2; D3D11_SAMPLER_DESC sampler_desc; D3D_FEATURE_LEVEL feature_level; ID3D11GeometryShader *tmp_gs, *gs; - ID3D11VertexShader *tmp_vs, *vs; + ID3D11VertexShader *tmp_vs, *vs, *vs2; ID3D11PixelShader *tmp_ps, *ps; - ID3D11Device *d3d11_device; - ID3D11Device1 *device; + ID3D11Device *d3d11_device, *d3d11_device2; + ID3D11Device1 *device, *device2; struct vec4 constant; ID3D11Buffer *cb, *srvb, *tmp_cb; ULONG refcount; @@ -6809,6 +6809,8 @@ static void test_device_context_state(void) ID3D11DeviceContext1_VSSetSamplers(context, 0, 1, &sampler); ID3D11DeviceContext1_VSSetShader(context, vs, NULL, 0); ID3D11DeviceContext1_VSSetShaderResources(context, 0, 1, &srv); + refcount = get_refcount(vs); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); ID3D11DeviceContext1_GSSetConstantBuffers(context, 0, 1, &cb); ID3D11DeviceContext1_GSSetSamplers(context, 0, 1, &sampler); @@ -6820,11 +6822,15 @@ static void test_device_context_state(void) ID3D11DeviceContext1_PSSetShader(context, ps, NULL, 0); ID3D11DeviceContext1_PSSetShaderResources(context, 0, 1, &srv); + previous_context_state = (ID3DDeviceContextState *)0xdeadbeef; + ID3D11DeviceContext1_SwapDeviceContextState(context, NULL, &previous_context_state); + todo_wine ok(previous_context_state == NULL, "Got unexpected state pointer.\n"); + if (previous_context_state) ID3DDeviceContextState_Release(previous_context_state); previous_context_state = NULL; ID3D11DeviceContext1_SwapDeviceContextState(context, context_state, &previous_context_state); - refcount = ID3DDeviceContextState_Release(context_state); - ok(!refcount, "Got refcount %u, expected 0.\n", refcount); ok(previous_context_state != NULL, "Failed to get previous context state\n"); + refcount = get_refcount(vs); + todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); context_type = ID3D11DeviceContext1_GetType(context); ok(context_type == D3D11_DEVICE_CONTEXT_IMMEDIATE, "Unexpected context type %u.\n", context_type); @@ -6868,11 +6874,64 @@ static void test_device_context_state(void) ID3D11DeviceContext1_PSGetShaderResources(context, 0, 1, &tmp_srv); ok(!tmp_srv, "Got unexpected srv %p.\n", tmp_srv); - ID3D11DeviceContext1_SwapDeviceContextState(context, previous_context_state, &context_state); - refcount = ID3DDeviceContextState_Release(context_state); - ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + /* updating the device context should also update the device context state */ + hr = ID3D11Device1_CreateVertexShader(device, simple_vs, sizeof(simple_vs), NULL, &vs2); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + ID3D11DeviceContext1_VSSetShader(context, vs2, NULL, 0); + ID3D11DeviceContext1_SwapDeviceContextState(context, context_state, &tmp_context_state); + refcount = ID3DDeviceContextState_Release(tmp_context_state); + todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + todo_wine ok(tmp_context_state == context_state, "Got unexpected state pointer.\n"); + tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context, &tmp_vs, NULL, NULL); + todo_wine ok(tmp_vs == vs2, "Got shader %p, expected %p.\n", tmp_vs, vs2); + if (tmp_vs) refcount = ID3D11VertexShader_Release(tmp_vs); + else refcount = 0; + todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + + /* context states may be used with other devices instances too */ + d3d11_device2 = create_device(NULL); + ok(!!d3d11_device2, "Failed to create device.\n"); + hr = ID3D11Device_QueryInterface(d3d11_device2, &IID_ID3D11Device1, (void **)&device2); + ok(SUCCEEDED(hr), "Failed to query device interface, hr %#x.\n", hr); + ID3D11Device_Release(d3d11_device2); + ID3D11Device1_GetImmediateContext1(device2, &context2); + ok(!!context2, "Failed to get immediate context.\n"); + + ID3D11DeviceContext1_SwapDeviceContextState(context2, context_state, &tmp_context_state); + ok(!!tmp_context_state, "Failed to get context state.\n"); + tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context, &tmp_vs, NULL, NULL); + todo_wine ok(tmp_vs == vs2, "Got shader %p, expected %p.\n", tmp_vs, vs2); + if (tmp_vs) refcount = ID3D11VertexShader_Release(tmp_vs); + else refcount = 0; + todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + ID3D11DeviceContext1_SwapDeviceContextState(context2, tmp_context_state, &context_state2); + refcount = ID3DDeviceContextState_Release(tmp_context_state); + ok(refcount == 0, "Got refcount %u, expected 1.\n", refcount); + refcount = ID3DDeviceContextState_Release(context_state2); + todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + todo_wine ok(context_state2 == context_state, "Got unexpected state pointer.\n"); + + refcount = ID3D11DeviceContext1_Release(context2); + ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); + refcount = ID3D11Device1_Release(device2); + ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); + + ID3D11DeviceContext1_VSSetShader(context, NULL, NULL, 0); + refcount = ID3D11VertexShader_Release(vs2); + ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); + + ID3D11DeviceContext1_SwapDeviceContextState(context, previous_context_state, &tmp_context_state); refcount = ID3DDeviceContextState_Release(previous_context_state); ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + refcount = ID3DDeviceContextState_Release(tmp_context_state); + todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + refcount = ID3DDeviceContextState_Release(context_state); + ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + todo_wine ok(tmp_context_state == context_state, "Got unexpected state pointer.\n"); + refcount = get_refcount(vs); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); /* ID3DDeviceContextState retains the previous state. */

1 0

Rémi Bernon : d3d11/tests: Add tests for hull shader state swap.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 24c948df6810550df477fefe15e0d24a756dafea URL: https://source.winehq.org/git/wine.git/?a=commit;h=24c948df6810550df477fefe… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 27 20:50:03 2021 +0100 d3d11/tests: Add tests for hull shader state swap. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 152 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 133 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=24c948df6810550df477…

1 0

Rémi Bernon : d3d11/tests: Add tests for domain shader state swap.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 7a289ba268376694d30950b716ed0460f31ad6af URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a289ba268376694d30950b7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 27 20:50:04 2021 +0100 d3d11/tests: Add tests for domain shader state swap. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 119 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 96 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7a289ba268376694d309…

1 0

Rémi Bernon : d3d11/tests: Add tests for compute shader state swap.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: fbad62fdca6a2a6a622b13fa385c27a5d3981b0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbad62fdca6a2a6a622b13fa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 27 20:50:05 2021 +0100 d3d11/tests: Add tests for compute shader state swap. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 144 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 120 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fbad62fdca6a2a6a622b…

1 0

Zebediah Figura : wined3d: Implement global resource memory barriers.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 387a63237d0e040c4e9f53b2bd3580671f832254 URL: https://source.winehq.org/git/wine.git/?a=commit;h=387a63237d0e040c4e9f53b2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 25 14:58:18 2021 -0600 wined3d: Implement global resource memory barriers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 6 ++++++ dlls/wined3d/shader.c | 5 +++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 12 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6ce9178c561..45eebcc2c20 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5729,6 +5729,12 @@ static void shader_glsl_sync(const struct wined3d_shader_instruction *ins) sync_flags &= ~WINED3DSSF_GROUP_SHARED_MEMORY; } + if (sync_flags & WINED3DSSF_GLOBAL_UAV) + { + shader_addline(buffer, "memoryBarrier();\n"); + sync_flags &= ~WINED3DSSF_GLOBAL_UAV; + } + if (sync_flags) FIXME("Unhandled sync flags %#x.\n", sync_flags); } diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 8843e6883fc..9052d217148 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1910,6 +1910,11 @@ static void shader_dump_global_flags(struct wined3d_string_buffer *buffer, DWORD static void shader_dump_sync_flags(struct wined3d_string_buffer *buffer, DWORD sync_flags) { + if (sync_flags & WINED3DSSF_GLOBAL_UAV) + { + shader_addline(buffer, "_uglobal"); + sync_flags &= ~WINED3DSSF_GLOBAL_UAV; + } if (sync_flags & WINED3DSSF_GROUP_SHARED_MEMORY) { shader_addline(buffer, "_g"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 119ce3af033..101c0287936 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -656,6 +656,7 @@ enum wined3d_shader_sync_flags { WINED3DSSF_THREAD_GROUP = 0x1, WINED3DSSF_GROUP_SHARED_MEMORY = 0x2, + WINED3DSSF_GLOBAL_UAV = 0x8, }; enum wined3d_shader_uav_flags

1 0

Michael Stefaniuc : ddraw: Remove superfluous cast to self.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 956721e15c0de5a379a7bba69961e9c353694d1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=956721e15c0de5a379a7bba6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jan 28 23:29:39 2021 +0100 ddraw: Remove superfluous cast 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/ddraw/device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 3f1fe08c11e..4d24c22650e 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3179,8 +3179,7 @@ static HRESULT WINAPI d3d_device3_SetTransform(IDirect3DDevice3 *iface, wined3d_mutex_lock(); multiply_matrix(&projection, &device->legacy_clipspace, (struct wined3d_matrix *)matrix); - wined3d_stateblock_set_transform(device->state, - WINED3D_TS_PROJECTION, (struct wined3d_matrix *)&projection); + wined3d_stateblock_set_transform(device->state, WINED3D_TS_PROJECTION, &projection); memcpy(&device->legacy_projection, matrix, sizeof(*matrix)); wined3d_mutex_unlock();

1 0

Michael Stefaniuc : d2d1/tests: Remove superfluous cast to self.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 3e1bb7f727fed3d6db597b4900d113474d5f441b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e1bb7f727fed3d6db597b49… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jan 28 23:29:38 2021 +0100 d2d1/tests: Remove superfluous cast 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/d2d1/tests/d2d1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 3e7df715dda..7c1ff9dc197 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -412,7 +412,7 @@ static void get_d3d11_surface_readback(IDXGISurface *surface, struct resource_re ID3D11Resource_Release(src_resource); ID3D11Device_Release(device); - hr = ID3D11DeviceContext_Map(context, (ID3D11Resource *)rb->u.d3d11_resource, 0, D3D11_MAP_READ, 0, &map_desc); + hr = ID3D11DeviceContext_Map(context, rb->u.d3d11_resource, 0, D3D11_MAP_READ, 0, &map_desc); ok(SUCCEEDED(hr), "Failed to map texture, hr %#x.\n", hr); ID3D11DeviceContext_Release(context);

1 0

Zebediah Figura : include: Fix the definition of PNDIS_HANDLE.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 06a92a85baa93d3e26ba45bea3753d0cd809368b URL: https://source.winehq.org/git/wine.git/?a=commit;h=06a92a85baa93d3e26ba45be… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 29 10:10:18 2021 -0600 include: Fix the definition of PNDIS_HANDLE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/ndis.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ddk/ndis.h b/include/ddk/ndis.h index 38eec8a7ac4..872b43b5824 100644 --- a/include/ddk/ndis.h +++ b/include/ddk/ndis.h @@ -25,7 +25,7 @@ typedef ULONG NDIS_AF, *PNDIS_AF; typedef MDL NDIS_BUFFER, *PNDIS_BUFFER; -typedef void *NDIS_HANDLE, *PNDIS_HANDLE, *PNDIS_PACKET_POOL; +typedef void *NDIS_HANDLE, **PNDIS_HANDLE, *PNDIS_PACKET_POOL; typedef ULONG NDIS_OID, *PNDIS_OID; typedef int NDIS_STATUS, *PNDIS_STATUS; typedef UNICODE_STRING NDIS_STRING, *PNDIS_STRING;

1 0