March 2021 - Wine-devel - list.winehq.org

[PATCH] wrc: Remove the trailing linefeed from a parser_error() message.
by Francois Gouget 02 Mar '21

02 Mar '21

Unlike most other trace and error reporting functions, parser_error() appends a linefeed to the error message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- 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 3ee7eb4a96a..f0cec77945e 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -429,7 +429,7 @@ L\" { yy_push_state(tklstr); wbufidx = 0; if(!win32) - parser_error("16bit resource contains unicode strings\n"); + parser_error("16bit resource contains unicode strings"); } <tklstr>\"{ws}+ | <tklstr>\" { -- 2.20.1

1 0

[PATCH] msado15: Fix the name of the command_text variable.
by Francois Gouget 02 Mar '21

02 Mar '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/msado15/connection.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 80297dcdc16..a3c9a450be6 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -339,7 +339,7 @@ static HRESULT WINAPI connection_Execute( _Connection *iface, BSTR command, VARI { struct connection *connection = impl_from_Connection( iface ); HRESULT hr; - ICommandText *comand_text; + ICommandText *command_text; DBROWCOUNT affected; IUnknown *rowset; _Recordset *recordset; @@ -349,12 +349,12 @@ static HRESULT WINAPI connection_Execute( _Connection *iface, BSTR command, VARI if (connection->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); - hr = create_command_text(connection->session, command, &comand_text); + hr = create_command_text(connection->session, command, &command_text); if (FAILED(hr)) return hr; - hr = ICommandText_Execute(comand_text, NULL, &IID_IUnknown, NULL, &affected, &rowset); - ICommandText_Release(comand_text); + hr = ICommandText_Execute(command_text, NULL, &IID_IUnknown, NULL, &affected, &rowset); + ICommandText_Release(command_text); if (FAILED(hr)) return hr; -- 2.20.1

1 0

[PATCH] advapi32/tests: Fix the spelling of a couple of ok() messages.
by Francois Gouget 02 Mar '21

02 Mar '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/advapi32/tests/security.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index f43ac2431e1..a8c1a80e419 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -8008,12 +8008,12 @@ static void test_GetKernelObjectSecurity(void) ret = GetSecurityDescriptorDacl(sd, &present, &acl, &defaulted); ok(ret, "got error %u\n", GetLastError()); - todo_wine ok(!present, "expeced no DACL present\n"); + todo_wine ok(!present, "expected no DACL present\n"); /* the descriptor is defaulted only on Windows >= 7 */ ret = GetSecurityDescriptorSacl(sd, &present, &acl, &defaulted); ok(ret, "got error %u\n", GetLastError()); - ok(!present, "expeced no SACL present\n"); + ok(!present, "expected no SACL present\n"); /* the descriptor is defaulted only on Windows >= 7 */ free(sd); -- 2.20.1

1 0

[PATCH] odbccp32/tests: Fix the spelling of a comment.
by Francois Gouget 02 Mar '21

02 Mar '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/odbccp32/tests/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index f52dcee7acd..ec706f57f06 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -831,7 +831,7 @@ static void test_SQLWriteDSNToIni(void) ok(ret, "got %d\n", ret); } - /* Show that values are writen, even though an invalid driver was specified. */ + /* Show that values are written, even though an invalid driver was specified. */ ret = SQLWriteDSNToIni("wine_mis", "Missing Access Driver (*.mis)"); ok(ret, "got %d\n", ret); if(ret) -- 2.20.1

1 0

[PATCH 4/4] ntdll: Use syscall dispatcher to restore context in NtSetContextThread.
by Jacek Caban 02 Mar '21

02 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- The patch unmarks win7u tests as broken(). My theory is that it's really a difference between real 32-bit kernel and wow. dlls/ntdll/tests/exception.c | 2 +- dlls/ntdll/unix/signal_i386.c | 21 ++++++++++++++++----- tools/winebuild/import.c | 10 +++++++++- 3 files changed, 26 insertions(+), 7 deletions(-)

2 1

[PATCH v2 1/6] ddraw: Store hardware_device flag in struct d3d_device.
by Paul Gofman 02 Mar '21

02 Mar '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ddraw/ddraw.c | 6 +++--- dlls/ddraw/ddraw_private.h | 3 ++- dlls/ddraw/device.c | 12 +++++++----- dlls/ddraw/surface.c | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d616330c307..705d0335d95 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4330,7 +4330,7 @@ static HRESULT WINAPI d3d7_CreateDevice(IDirect3D7 *iface, REFCLSID riid, TRACE("iface %p, riid %s, surface %p, device %p.\n", iface, debugstr_guid(riid), surface, device); wined3d_mutex_lock(); - if (SUCCEEDED(hr = d3d_device_create(ddraw, target, (IUnknown *)surface, 7, &object, NULL))) + if (SUCCEEDED(hr = d3d_device_create(ddraw, riid, target, (IUnknown *)surface, 7, &object, NULL))) { *device = &object->IDirect3DDevice7_iface; } @@ -4359,7 +4359,7 @@ static HRESULT WINAPI d3d3_CreateDevice(IDirect3D3 *iface, REFCLSID riid, return CLASS_E_NOAGGREGATION; wined3d_mutex_lock(); - if (SUCCEEDED(hr = d3d_device_create(ddraw, surface_impl, (IUnknown *)surface, 3, &device_impl, NULL))) + if (SUCCEEDED(hr = d3d_device_create(ddraw, riid, surface_impl, (IUnknown *)surface, 3, &device_impl, NULL))) { *device = &device_impl->IDirect3DDevice3_iface; } @@ -4385,7 +4385,7 @@ static HRESULT WINAPI d3d2_CreateDevice(IDirect3D2 *iface, REFCLSID riid, iface, debugstr_guid(riid), surface, device); wined3d_mutex_lock(); - if (SUCCEEDED(hr = d3d_device_create(ddraw, surface_impl, (IUnknown *)surface, 2, &device_impl, NULL))) + if (SUCCEEDED(hr = d3d_device_create(ddraw, riid, surface_impl, (IUnknown *)surface, 2, &device_impl, NULL))) { *device = &device_impl->IDirect3DDevice2_iface; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 6bbd62949ac..e25ab23c2bc 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -317,6 +317,7 @@ struct d3d_device IUnknown IUnknown_inner; LONG ref; UINT version; + BOOL hardware_device; IUnknown *outer_unknown; struct wined3d_device *wined3d_device; @@ -364,7 +365,7 @@ struct d3d_device const struct wined3d_stateblock_state *stateblock_state; }; -HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUnknown *rt_iface, +HRESULT d3d_device_create(struct ddraw *ddraw, const GUID *guid, struct ddraw_surface *target, IUnknown *rt_iface, UINT version, struct d3d_device **device, IUnknown *outer_unknown) DECLSPEC_HIDDEN; enum wined3d_depth_buffer_type d3d_device_update_depth_stencil(struct d3d_device *device) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 4d24c22650e..5e66007213d 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6925,7 +6925,7 @@ static void ddraw_reset_viewport_state(struct ddraw *ddraw) wined3d_stateblock_set_scissor_rect(ddraw->state, &rect); } -static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, +static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, const GUID *guid, struct ddraw_surface *target, IUnknown *rt_iface, UINT version, IUnknown *outer_unknown) { static const struct wined3d_matrix ident = @@ -6948,6 +6948,8 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, device->IUnknown_inner.lpVtbl = &d3d_device_inner_vtbl; device->ref = 1; device->version = version; + device->hardware_device = IsEqualGUID(&IID_IDirect3DTnLHalDevice, guid) + || IsEqualGUID(&IID_IDirect3DHALDevice, guid); if (outer_unknown) device->outer_unknown = outer_unknown; @@ -7006,14 +7008,14 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, return D3D_OK; } -HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUnknown *rt_iface, +HRESULT d3d_device_create(struct ddraw *ddraw, const GUID *guid, struct ddraw_surface *target, IUnknown *rt_iface, UINT version, struct d3d_device **device, IUnknown *outer_unknown) { struct d3d_device *object; HRESULT hr; - TRACE("ddraw %p, target %p, version %u, device %p, outer_unknown %p.\n", - ddraw, target, version, device, outer_unknown); + TRACE("ddraw %p, guid %s, target %p, version %u, device %p, outer_unknown %p.\n", + ddraw, debugstr_guid(guid), target, version, device, outer_unknown); if (!(target->surface_desc.ddsCaps.dwCaps & DDSCAPS_3DDEVICE) || (target->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER)) @@ -7054,7 +7056,7 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn return DDERR_OUTOFMEMORY; } - if (FAILED(hr = d3d_device_init(object, ddraw, target, rt_iface, version, outer_unknown))) + if (FAILED(hr = d3d_device_init(object, ddraw, guid, target, rt_iface, version, outer_unknown))) { WARN("Failed to initialize device, hr %#x.\n", hr); heap_free(object); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 0ca19d4f8a5..b910fb6817e 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -256,7 +256,7 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, { HRESULT hr; - if (FAILED(hr = d3d_device_create(This->ddraw, This, (IUnknown *)&This->IDirectDrawSurface_iface, + if (FAILED(hr = d3d_device_create(This->ddraw, riid, This, (IUnknown *)&This->IDirectDrawSurface_iface, 1, &This->device1, (IUnknown *)&This->IDirectDrawSurface_iface))) { This->device1 = NULL; -- 2.29.2

3 15

[PATCH v2 4/4] ntdll: Use syscall dispatcher to restore context in NtSetContextThread.
by Jacek Caban 02 Mar '21

02 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/exception.c | 2 +- dlls/ntdll/unix/signal_i386.c | 21 ++++++++++++++++----- tools/winebuild/import.c | 10 +++++++++- 3 files changed, 26 insertions(+), 7 deletions(-)

1 0

[PATCH 3/4] ntdll: Use syscall frame for handling x86 YMM context in NtSetContextThread.
by Jacek Caban 02 Mar '21

02 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/signal_i386.c | 61 ++++++++++++++--------------------- 1 file changed, 25 insertions(+), 36 deletions(-)

1 0

[PATCH 2/4] ntdll: Use syscall frame for x86 YMM context in NtGetContextThread.
by Jacek Caban 02 Mar '21

02 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/signal_i386.c | 81 +++++++++++------------------------ 1 file changed, 25 insertions(+), 56 deletions(-)

1 0

[PATCH 1/4] ntdll: Store x86 YMM context insyscall dispatcher.
by Jacek Caban 02 Mar '21

02 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/signal_i386.c | 14 ++++++++++++-- tools/winebuild/import.c | 18 +++++++++++++++--- 2 files changed, 27 insertions(+), 5 deletions(-)

1 0