March 2020 - Wine-commits - list.winehq.org

Paul Gofman : ddraw: Factor out ddraw_surface_lock_ddsd() function.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: 62ff00b066bc248cc877afb9249dfb4fb88fa23d URL: https://source.winehq.org/git/wine.git/?a=commit;h=62ff00b066bc248cc877afb9… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Mar 26 16:09:40 2020 +0300 ddraw: Factor out ddraw_surface_lock_ddsd() function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 43 ++++++++++++++----------------------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 9d937414ae..b6a7ebb734 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1128,17 +1128,13 @@ static HRESULT WINAPI ddraw_surface4_Lock(IDirectDrawSurface4 *iface, RECT *rect return surface_lock(surface, rect, surface_desc, surface_desc_size, flags, h); } -static HRESULT WINAPI ddraw_surface3_Lock(IDirectDrawSurface3 *iface, RECT *rect, +static HRESULT ddraw_surface_lock_ddsd(struct ddraw_surface *surface, RECT *rect, DDSURFACEDESC *surface_desc, DWORD flags, HANDLE h) { - struct ddraw_surface *surface = impl_from_IDirectDrawSurface3(iface); unsigned int surface_desc_size; DDSURFACEDESC2 surface_desc2; HRESULT hr; - TRACE("iface %p, rect %s, surface_desc %p, flags %#x, h %p.\n", - iface, wine_dbgstr_rect(rect), surface_desc, flags, h); - if (!surface_validate_lock_desc(surface, surface_desc, &surface_desc_size)) return DDERR_INVALIDPARAMS; @@ -1150,48 +1146,37 @@ static HRESULT WINAPI ddraw_surface3_Lock(IDirectDrawSurface3 *iface, RECT *rect return hr; } +static HRESULT WINAPI ddraw_surface3_Lock(IDirectDrawSurface3 *iface, RECT *rect, + DDSURFACEDESC *surface_desc, DWORD flags, HANDLE h) +{ + struct ddraw_surface *surface = impl_from_IDirectDrawSurface3(iface); + + TRACE("iface %p, rect %s, surface_desc %p, flags %#x, h %p.\n", + iface, wine_dbgstr_rect(rect), surface_desc, flags, h); + + return ddraw_surface_lock_ddsd(surface, rect, surface_desc, flags, h); +} + static HRESULT WINAPI ddraw_surface2_Lock(IDirectDrawSurface2 *iface, RECT *rect, DDSURFACEDESC *surface_desc, DWORD flags, HANDLE h) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface2(iface); - unsigned int surface_desc_size; - DDSURFACEDESC2 surface_desc2; - HRESULT hr; TRACE("iface %p, rect %s, surface_desc %p, flags %#x, h %p.\n", iface, wine_dbgstr_rect(rect), surface_desc, flags, h); - if (!surface_validate_lock_desc(surface, surface_desc, &surface_desc_size)) - return DDERR_INVALIDPARAMS; - - surface_desc2.dwSize = surface_desc->dwSize; - surface_desc2.dwFlags = 0; - hr = surface_lock(surface, rect, &surface_desc2, surface_desc_size, flags, h); - DDSD2_to_DDSD(&surface_desc2, surface_desc); - surface_desc->dwSize = surface_desc2.dwSize; - return hr; + return ddraw_surface_lock_ddsd(surface, rect, surface_desc, flags, h); } static HRESULT WINAPI ddraw_surface1_Lock(IDirectDrawSurface *iface, RECT *rect, DDSURFACEDESC *surface_desc, DWORD flags, HANDLE h) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface(iface); - unsigned int surface_desc_size; - DDSURFACEDESC2 surface_desc2; - HRESULT hr; TRACE("iface %p, rect %s, surface_desc %p, flags %#x, h %p.\n", iface, wine_dbgstr_rect(rect), surface_desc, flags, h); - if (!surface_validate_lock_desc(surface, surface_desc, &surface_desc_size)) - return DDERR_INVALIDPARAMS; - - surface_desc2.dwSize = surface_desc->dwSize; - surface_desc2.dwFlags = 0; - hr = surface_lock(surface, rect, &surface_desc2, surface_desc_size, flags, h); - DDSD2_to_DDSD(&surface_desc2, surface_desc); - surface_desc->dwSize = surface_desc2.dwSize; - return hr; + return ddraw_surface_lock_ddsd(surface, rect, surface_desc, flags, h); } /*****************************************************************************

1 0

Paul Gofman : ddraw: Deny locking lost surfaces.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: 530a3d94de949030f8d74bacd6c20986b32f1a31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=530a3d94de949030f8d74bac… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Mar 26 16:09:41 2020 +0300 ddraw: Deny locking lost surfaces. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 18 ++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 13 +++++++++++++ 2 files changed, 31 insertions(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index b6a7ebb734..9850a1e8c9 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1110,6 +1110,12 @@ static HRESULT WINAPI ddraw_surface7_Lock(IDirectDrawSurface7 *iface, if (!surface_validate_lock_desc(surface, (DDSURFACEDESC *)surface_desc, &surface_desc_size)) return DDERR_INVALIDPARAMS; + if (ddraw_surface_is_lost(surface)) + { + WARN("Surface is lost.\n"); + return DDERR_SURFACELOST; + } + return surface_lock(surface, rect, surface_desc, surface_desc_size, flags, h); } @@ -1125,6 +1131,12 @@ static HRESULT WINAPI ddraw_surface4_Lock(IDirectDrawSurface4 *iface, RECT *rect if (!surface_validate_lock_desc(surface, (DDSURFACEDESC *)surface_desc, &surface_desc_size)) return DDERR_INVALIDPARAMS; + if (ddraw_surface_is_lost(surface)) + { + WARN("Surface is lost.\n"); + return DDERR_SURFACELOST; + } + return surface_lock(surface, rect, surface_desc, surface_desc_size, flags, h); } @@ -1138,6 +1150,12 @@ static HRESULT ddraw_surface_lock_ddsd(struct ddraw_surface *surface, RECT *rect if (!surface_validate_lock_desc(surface, surface_desc, &surface_desc_size)) return DDERR_INVALIDPARAMS; + if (ddraw_surface_is_lost(surface)) + { + WARN("Surface is lost.\n"); + return DDERR_SURFACELOST; + } + surface_desc2.dwSize = surface_desc->dwSize; surface_desc2.dwFlags = 0; hr = surface_lock(surface, rect, &surface_desc2, surface_desc_size, flags, h); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 5c0c5bb7c3..abe5249cc0 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1056,6 +1056,7 @@ static void test_coop_level_d3d_state(void) IDirectDrawSurface7 *rt, *surface; IDirect3DDevice7 *device; IDirectDraw7 *ddraw; + DDSURFACEDESC2 lock; IDirect3D7 *d3d; D3DCOLOR color; DDSCAPS2 caps; @@ -1116,6 +1117,13 @@ static void test_coop_level_d3d_state(void) hr = IDirectDrawSurface7_IsLost(rt); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + memset(&lock, 0, sizeof(lock)); + lock.dwSize = sizeof(lock); + lock.lpSurface = (void *)0xdeadbeef; + hr = IDirectDrawSurface7_Lock(rt, NULL, &lock, DDLOCK_READONLY, NULL); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + ok(lock.lpSurface == (void *)0xdeadbeef, "Got unexpected lock.lpSurface %p.\n", lock.lpSurface); + memset(&caps, 0, sizeof(caps)); caps.dwCaps = DDSCAPS_ZBUFFER; hr = IDirectDrawSurface7_GetAttachedSurface(rt, &caps, &surface); @@ -1127,6 +1135,11 @@ static void test_coop_level_d3d_state(void) hr = IDirectDraw7_RestoreAllSurfaces(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_Lock(rt, NULL, &lock, DDLOCK_READONLY, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_Unlock(rt, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + caps.dwCaps = DDSCAPS_ZBUFFER; hr = IDirectDrawSurface7_GetAttachedSurface(rt, &caps, &surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);

1 0

Zebediah Figura : include: Rename the FileSystemAttribute field of FILE_FS_ATTRIBUTE_INFORMATION to FileSystemAttributes.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: 97e88a56bce95417a49bb60176680284d75c97f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97e88a56bce95417a49bb601… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 25 18:15:19 2020 -0500 include: Rename the FileSystemAttribute field of FILE_FS_ATTRIBUTE_INFORMATION to FileSystemAttributes. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 6 +++--- dlls/ntdll/tests/file.c | 6 +++--- include/winioctl.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 1a5f86d7c2..bd27d5a434 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -3248,9 +3248,9 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io FILE_FS_ATTRIBUTE_INFORMATION *info = buffer; FIXME( "%p: faking attribute info\n", handle ); - info->FileSystemAttribute = FILE_SUPPORTS_ENCRYPTION | FILE_FILE_COMPRESSION | - FILE_PERSISTENT_ACLS | FILE_UNICODE_ON_DISK | - FILE_CASE_PRESERVED_NAMES | FILE_CASE_SENSITIVE_SEARCH; + info->FileSystemAttributes = FILE_SUPPORTS_ENCRYPTION | FILE_FILE_COMPRESSION | + FILE_PERSISTENT_ACLS | FILE_UNICODE_ON_DISK | + FILE_CASE_PRESERVED_NAMES | FILE_CASE_SENSITIVE_SEARCH; info->MaximumComponentNameLength = MAXIMUM_FILENAME_LENGTH - 1; info->FileSystemNameLength = sizeof(ntfsW); memcpy(info->FileSystemName, ntfsW, sizeof(ntfsW)); diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 75a67e8095..546795456a 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3955,12 +3955,12 @@ static void test_query_attribute_information_file(void) ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %d\n", status); ok(U(io).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %d\n", U(io).Status); - ok(ffai->FileSystemAttribute != 0, "Missing FileSystemAttribute\n"); + ok(ffai->FileSystemAttributes != 0, "Missing FileSystemAttributes\n"); ok(ffai->MaximumComponentNameLength != 0, "Missing MaximumComponentNameLength\n"); ok(ffai->FileSystemNameLength != 0, "Missing FileSystemNameLength\n"); - trace("FileSystemAttribute: %x MaximumComponentNameLength: %x FileSystemName: %s\n", - ffai->FileSystemAttribute, ffai->MaximumComponentNameLength, + trace("FileSystemAttributes: %x MaximumComponentNameLength: %x FileSystemName: %s\n", + ffai->FileSystemAttributes, ffai->MaximumComponentNameLength, wine_dbgstr_wn(ffai->FileSystemName, ffai->FileSystemNameLength / sizeof(WCHAR))); CloseHandle( dir ); diff --git a/include/winioctl.h b/include/winioctl.h index 7699579183..076ce9d7a8 100644 --- a/include/winioctl.h +++ b/include/winioctl.h @@ -434,7 +434,7 @@ typedef struct _FILE_FS_DEVICE_INFORMATION { /* FileFsAttributeInformation = 5 */ typedef struct _FILE_FS_ATTRIBUTE_INFORMATION { - ULONG FileSystemAttribute; + ULONG FileSystemAttributes; LONG MaximumComponentNameLength; ULONG FileSystemNameLength; WCHAR FileSystemName[1];

1 0

Zebediah Figura : mountmgr: Fill the mountmgr_unix_drive structure even if the buffer is too small to hold the dynamic strings.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: aafe39a8126ef3d500d70cd330cadf94f339568a URL: https://source.winehq.org/git/wine.git/?a=commit;h=aafe39a8126ef3d500d70cd3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 25 18:17:02 2020 -0500 mountmgr: Fill the mountmgr_unix_drive structure even if the buffer is too small to hold the dynamic strings. kernel32 actually already assumes this. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/mountmgr.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 3331eedf8d..dd3a3932b4 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -311,6 +311,11 @@ static NTSTATUS query_unix_drive( void *buff, SIZE_T insize, input = NULL; output = buff; + output->size = size; + output->letter = letter; + output->type = type; + output->mount_point_offset = 0; + output->device_offset = 0; if (size > outsize) { @@ -328,9 +333,7 @@ static NTSTATUS query_unix_drive( void *buff, SIZE_T insize, status = STATUS_MORE_ENTRIES; goto done; } - output->size = size; - output->letter = letter; - output->type = type; + ptr = (char *)(output + 1); if (mount_point)

1 0

Zebediah Figura : mountmgr: Return STATUS_BUFFER_OVERFLOW from query_unix_drive() if the buffer is too small.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: 2d0e113db15fc6109d0b44502cda40727ff04fa7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d0e113db15fc6109d0b4450… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 25 18:17:03 2020 -0500 mountmgr: Return STATUS_BUFFER_OVERFLOW from query_unix_drive() if the buffer is too small. STATUS_MORE_ENTRIES is meant for enumeration APIs like NtQueryDirectoryFile(); we are not enumerating anything here. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/mountmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index dd3a3932b4..222395fadf 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -330,7 +330,7 @@ static NTSTATUS query_unix_drive( void *buff, SIZE_T insize, output->type = type; iosb->Information = FIELD_OFFSET( struct mountmgr_unix_drive, type ) + sizeof(output->type); } - status = STATUS_MORE_ENTRIES; + status = STATUS_BUFFER_OVERFLOW; goto done; }

1 0

Brendan Shanks : dinput/tests: Test IDirectInputEffect::SetParameters() with NULL effect parameters.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: f00b59f597b047577d7542d0743701890a8f3b78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f00b59f597b047577d7542d0… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Mar 25 16:31:29 2020 -0700 dinput/tests: Test IDirectInputEffect::SetParameters() with NULL effect parameters. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/joystick.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index f009ef347b..fb777e71ae 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -598,11 +598,34 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) { DWORD effect_status; struct DIPROPDWORD diprop_word; + void *tmp; GUID guid = {0}; hr = IDirectInputEffect_Initialize(effect, hInstance, data->version, &effect_data.guid); ok(hr==DI_OK,"IDirectInputEffect_Initialize failed: %08x\n", hr); + + /* Test SetParameters with NULL pointers */ + todo_wine { + tmp = effect_data.eff.rgdwAxes; + effect_data.eff.rgdwAxes = NULL; + hr = IDirectInputEffect_SetParameters(effect, &effect_data.eff, DIEP_AXES); + ok(hr==DIERR_INVALIDPARAM,"IDirectInputEffect_SetParameters should fail with INVALIDPARAM, got: %08x\n", hr); + effect_data.eff.rgdwAxes = tmp; + + tmp = effect_data.eff.rglDirection; + effect_data.eff.rglDirection = NULL; + hr = IDirectInputEffect_SetParameters(effect, &effect_data.eff, DIEP_DIRECTION); + ok(hr==DIERR_INVALIDPARAM,"IDirectInputEffect_SetParameters should fail with INVALIDPARAM, got: %08x\n", hr); + effect_data.eff.rglDirection = tmp; + + tmp = effect_data.eff.lpvTypeSpecificParams; + effect_data.eff.lpvTypeSpecificParams = NULL; + hr = IDirectInputEffect_SetParameters(effect, &effect_data.eff, DIEP_TYPESPECIFICPARAMS); + ok(hr==DIERR_INVALIDPARAM,"IDirectInputEffect_SetParameters should fail with INVALIDPARAM, got: %08x\n", hr); + effect_data.eff.lpvTypeSpecificParams = tmp; + } + hr = IDirectInputEffect_SetParameters(effect, &effect_data.eff, DIEP_AXES | DIEP_DIRECTION | DIEP_TYPESPECIFICPARAMS); ok(hr==DI_OK,"IDirectInputEffect_SetParameters failed: %08x\n", hr);

1 0

Brendan Shanks : dinput: Fix IDirectInputEffect::SetParameters() behavior with NULL effect parameters.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: f66517b5a27057243912f3a7c4a41a291ab2bfb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f66517b5a27057243912f3a7… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Mar 25 16:31:30 2020 -0700 dinput: Fix IDirectInputEffect::SetParameters() behavior with NULL effect parameters. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/effect_linuxinput.c | 8 +++++++- dlls/dinput/tests/joystick.c | 2 -- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index cc2df3ce87..ef21ecaa30 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -499,6 +499,9 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( dump_DIEFFECT(peff, &This->guid, dwFlags); if (dwFlags & DIEP_AXES) { + if (!(peff->rgdwAxes)) + return DIERR_INVALIDPARAM; + /* the linux input effect system only supports one or two axes */ if (peff->cAxes > 2) return DIERR_INVALIDPARAM; @@ -511,6 +514,9 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( * different opinions about which way direction "0" is. directx has 0 along the x * axis (left), linux has it along the y axis (down). */ if (dwFlags & DIEP_DIRECTION) { + if (!(peff->rglDirection)) + return DIERR_INVALIDPARAM; + if (peff->cAxes == 1) { if (peff->dwFlags & DIEFF_CARTESIAN) { if (dwFlags & DIEP_AXES) { @@ -629,7 +635,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( if (dwFlags & DIEP_TYPESPECIFICPARAMS) { if (!(peff->lpvTypeSpecificParams)) - return DIERR_INCOMPLETEEFFECT; + return DIERR_INVALIDPARAM; if (type == DIEFT_PERIODIC) { diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index fb777e71ae..a3d7440367 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -606,7 +606,6 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) ok(hr==DI_OK,"IDirectInputEffect_Initialize failed: %08x\n", hr); /* Test SetParameters with NULL pointers */ - todo_wine { tmp = effect_data.eff.rgdwAxes; effect_data.eff.rgdwAxes = NULL; hr = IDirectInputEffect_SetParameters(effect, &effect_data.eff, DIEP_AXES); @@ -624,7 +623,6 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) hr = IDirectInputEffect_SetParameters(effect, &effect_data.eff, DIEP_TYPESPECIFICPARAMS); ok(hr==DIERR_INVALIDPARAM,"IDirectInputEffect_SetParameters should fail with INVALIDPARAM, got: %08x\n", hr); effect_data.eff.lpvTypeSpecificParams = tmp; - } hr = IDirectInputEffect_SetParameters(effect, &effect_data.eff, DIEP_AXES | DIEP_DIRECTION | DIEP_TYPESPECIFICPARAMS);

1 0

Alexandre Julliard : ntdll: Use the NLS case mapping table for RtlHashUnicodeString().
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: 9bbb66fdf72a4090e38da46bda0eff0a6ab642ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bbb66fdf72a4090e38da46b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 26 11:26:13 2020 +0100 ntdll: Use the NLS case mapping table for RtlHashUnicodeString(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 34 ++++++++++++++++++++++++++++++++++ dlls/ntdll/rtlstr.c | 25 ------------------------- dlls/ntdll/tests/rtlstr.c | 20 ++++++++++++-------- 3 files changed, 46 insertions(+), 33 deletions(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index afd65f3c02..1be3086a1e 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -1288,6 +1288,40 @@ BOOLEAN WINAPI RtlPrefixUnicodeString( const UNICODE_STRING *s1, const UNICODE_S } + +/****************************************************************************** + * RtlHashUnicodeString (NTDLL.@) + */ +NTSTATUS WINAPI RtlHashUnicodeString( const UNICODE_STRING *string, BOOLEAN case_insensitive, + ULONG alg, ULONG *hash ) +{ + unsigned int i; + + if (!string || !hash) return STATUS_INVALID_PARAMETER; + + switch (alg) + { + case HASH_STRING_ALGORITHM_DEFAULT: + case HASH_STRING_ALGORITHM_X65599: + break; + default: + return STATUS_INVALID_PARAMETER; + } + + *hash = 0; + if (!case_insensitive) + for (i = 0; i < string->Length / sizeof(WCHAR); i++) + *hash = *hash * 65599 + string->Buffer[i]; + else if (nls_info.UpperCaseTable) + for (i = 0; i < string->Length / sizeof(WCHAR); i++) + *hash = *hash * 65599 + casemap( nls_info.UpperCaseTable, string->Buffer[i] ); + else /* locale not setup yet */ + for (i = 0; i < string->Length / sizeof(WCHAR); i++) + *hash = *hash * 65599 + casemap_ascii( string->Buffer[i] ); + return STATUS_SUCCESS; +} + + /************************************************************************** * RtlCustomCPToUnicodeN (NTDLL.@) */ diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index c0d8ec6477..6f2a2e85c2 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -1708,28 +1708,3 @@ NTSTATUS WINAPI RtlStringFromGUID(const GUID* guid, UNICODE_STRING *str) return STATUS_SUCCESS; } - -/****************************************************************************** - * RtlHashUnicodeString [NTDLL.@] - */ -NTSTATUS WINAPI RtlHashUnicodeString(PCUNICODE_STRING string, BOOLEAN case_insensitive, ULONG alg, ULONG *hash) -{ - unsigned int i; - - if (!string || !hash) return STATUS_INVALID_PARAMETER; - - switch (alg) - { - case HASH_STRING_ALGORITHM_DEFAULT: - case HASH_STRING_ALGORITHM_X65599: - break; - default: - return STATUS_INVALID_PARAMETER; - } - - *hash = 0; - for (i = 0; i < string->Length/sizeof(WCHAR); i++) - *hash = *hash*65599 + (case_insensitive ? toupperW(string->Buffer[i]) : string->Buffer[i]); - - return STATUS_SUCCESS; -} diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index f872422954..cd95ec3a48 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -1942,14 +1942,18 @@ struct hash_unicodestring_test { }; static const struct hash_unicodestring_test hash_test[] = { - { {'T',0}, FALSE, 0x00000054 }, - { {'T','e','s','t',0}, FALSE, 0x766bb952 }, - { {'T','e','S','t',0}, FALSE, 0x764bb172 }, - { {'t','e','s','t',0}, FALSE, 0x4745d132 }, - { {'t','e','s','t',0}, TRUE, 0x6689c132 }, - { {'T','E','S','T',0}, TRUE, 0x6689c132 }, - { {'T','E','S','T',0}, FALSE, 0x6689c132 }, - { {'a','b','c','d','e','f',0}, FALSE, 0x971318c3 }, + { L"T", FALSE, 0x00000054 }, + { L"Test", FALSE, 0x766bb952 }, + { L"TeSt", FALSE, 0x764bb172 }, + { L"test", FALSE, 0x4745d132 }, + { L"test", TRUE, 0x6689c132 }, + { L"TEST", TRUE, 0x6689c132 }, + { L"TEST", FALSE, 0x6689c132 }, + { L"t\xe9st", FALSE, 0x8845cfb6 }, + { L"t\xe9st", TRUE, 0xa789bfb6 }, + { L"T\xc9ST", TRUE, 0xa789bfb6 }, + { L"T\xc9ST", FALSE, 0xa789bfb6 }, + { L"abcdef", FALSE, 0x971318c3 }, { { 0 } } };

1 0

Alexandre Julliard : user.exe: Clear out the thunk array to catch invalid winprocs.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: 64bd952b85eb183d97b438a3d2695b2bf78d17ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=64bd952b85eb183d97b438a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 26 15:31:21 2020 +0100 user.exe: Clear out the thunk array to catch invalid winprocs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48814 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/message.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 14e7a19889..e3ca3fd779 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -152,7 +152,8 @@ static WNDPROC16 alloc_win16_thunk( WNDPROC handle ) { assert( MAX_WINPROCS16 * sizeof(WINPROC_THUNK) <= 0x10000 ); - if (!(thunk_selector = GlobalAlloc16( GMEM_FIXED, MAX_WINPROCS16 * sizeof(WINPROC_THUNK) ))) + if (!(thunk_selector = GlobalAlloc16( GMEM_FIXED | GMEM_ZEROINIT, + MAX_WINPROCS16 * sizeof(WINPROC_THUNK) ))) return NULL; PrestoChangoSelector16( thunk_selector, thunk_selector ); thunk_array = GlobalLock16( thunk_selector );

1 0

Alexandre Julliard : krnl386: Get rid of DOS direct I/O support.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: 88746a5597c7fe098e7caf8fe3f2125560aa090c URL: https://source.winehq.org/git/wine.git/?a=commit;h=88746a5597c7fe098e7caf8f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 26 16:49:02 2020 +0100 krnl386: Get rid of DOS direct I/O support. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/ioports.c | 224 ------------------------------------------- 1 file changed, 224 deletions(-) diff --git a/dlls/krnl386.exe16/ioports.c b/dlls/krnl386.exe16/ioports.c index 20fecdec59..5efc07efc7 100644 --- a/dlls/krnl386.exe16/ioports.c +++ b/dlls/krnl386.exe16/ioports.c @@ -59,12 +59,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(int); -#if defined(linux) && !defined(__ANDROID__) -# define DIRECT_IO_ACCESS -#else -# undef DIRECT_IO_ACCESS -#endif - static struct { WORD countmax; WORD latch; @@ -174,17 +168,6 @@ static void IO_FixCMOSCheckSum(void) TRACE("calculated hi %02x, lo %02x\n", cmosimage[0x2e], cmosimage[0x2f]); } -#ifdef DIRECT_IO_ACCESS - -extern int iopl(int level); -static char do_direct_port_access = -1; -static char port_permissions[0x10000]; - -#define IO_READ 1 -#define IO_WRITE 2 - -#endif /* DIRECT_IO_ACCESS */ - #ifdef HAVE_PPDEV static int do_pp_port_access = -1; /* -1: uninitialized, 1: not available 0: available);*/ @@ -271,176 +254,6 @@ static WORD get_timer_val(unsigned timer) } -/********************************************************************** - * IO_port_init - */ - -/* set_IO_permissions(int val1, int val) - * Helper function for IO_port_init - */ -#ifdef DIRECT_IO_ACCESS -static void set_IO_permissions(int val1, int val, char rw) -{ - int j; - if (val1 != -1) { - if (val == -1) val = 0x3ff; - for (j = val1; j <= val; j++) - port_permissions[j] |= rw; - - do_direct_port_access = 1; - - val1 = -1; - } else if (val != -1) { - do_direct_port_access = 1; - - port_permissions[val] |= rw; - } - -} - -/* do_IO_port_init_read_or_write(char* temp, char rw) - * Helper function for IO_port_init - */ - -static void do_IO_port_init_read_or_write(const WCHAR *str, char rw) -{ - int val, val1; - unsigned int i; - WCHAR *end; - static const WCHAR allW[] = {'a','l','l',0}; - - if (!strcmpiW(str, allW)) - { - for (i=0; i < sizeof(port_permissions); i++) - port_permissions[i] |= rw; - } - else - { - val = -1; - val1 = -1; - while (*str) - { - switch(*str) - { - case ',': - case ' ': - case '\t': - set_IO_permissions(val1, val, rw); - val1 = -1; - val = -1; - str++; - break; - case '-': - val1 = val; - if (val1 == -1) val1 = 0; - str++; - break; - default: - if (isdigitW(*str)) - { - val = strtoulW( str, &end, 0 ); - if (end == str) - { - val = -1; - str++; - } - else str = end; - } - break; - } - } - set_IO_permissions(val1, val, rw); - } -} - -static inline BYTE inb( WORD port ) -{ - BYTE b; - __asm__ __volatile__( "inb %w1,%0" : "=a" (b) : "d" (port) ); - return b; -} - -static inline WORD inw( WORD port ) -{ - WORD w; - __asm__ __volatile__( "inw %w1,%0" : "=a" (w) : "d" (port) ); - return w; -} - -static inline DWORD inl( WORD port ) -{ - DWORD dw; - __asm__ __volatile__( "inl %w1,%0" : "=a" (dw) : "d" (port) ); - return dw; -} - -static inline void outb( BYTE value, WORD port ) -{ - __asm__ __volatile__( "outb %b0,%w1" : : "a" (value), "d" (port) ); -} - -static inline void outw( WORD value, WORD port ) -{ - __asm__ __volatile__( "outw %w0,%w1" : : "a" (value), "d" (port) ); -} - -static inline void outl( DWORD value, WORD port ) -{ - __asm__ __volatile__( "outl %0,%w1" : : "a" (value), "d" (port) ); -} - -static void IO_port_init(void) -{ - char tmp[1024]; - HANDLE root, hkey; - DWORD dummy; - OBJECT_ATTRIBUTES attr; - UNICODE_STRING nameW; - - static const WCHAR portsW[] = {'S','o','f','t','w','a','r','e','\\', - 'W','i','n','e','\\','V','D','M','\\','P','o','r','t','s',0}; - static const WCHAR readW[] = {'r','e','a','d',0}; - static const WCHAR writeW[] = {'w','r','i','t','e',0}; - - do_direct_port_access = 0; - /* Can we do that? */ - if (!iopl(3)) - { - iopl(0); - - RtlOpenCurrentUser( KEY_ALL_ACCESS, &root ); - attr.Length = sizeof(attr); - attr.RootDirectory = root; - attr.ObjectName = &nameW; - attr.Attributes = 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - RtlInitUnicodeString( &nameW, portsW ); - - /* @@ Wine registry key: HKCU\Software\Wine\VDM\Ports */ - if (!NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr )) - { - RtlInitUnicodeString( &nameW, readW ); - if (!NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, tmp, sizeof(tmp), &dummy )) - { - WCHAR *str = (WCHAR *)((KEY_VALUE_PARTIAL_INFORMATION *)tmp)->Data; - do_IO_port_init_read_or_write(str, IO_READ); - } - RtlInitUnicodeString( &nameW, writeW ); - if (!NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, tmp, sizeof(tmp), &dummy )) - { - WCHAR *str = (WCHAR *)((KEY_VALUE_PARTIAL_INFORMATION *)tmp)->Data; - do_IO_port_init_read_or_write(str, IO_WRITE); - } - NtClose( hkey ); - } - NtClose( root ); - } -} - -#endif /* DIRECT_IO_ACCESS */ - - #ifdef HAVE_PPDEV typedef struct _PPDEVICESTRUCT{ @@ -749,24 +562,6 @@ DWORD DOSVM_inport( int port, int size ) } #endif -#ifdef DIRECT_IO_ACCESS - if (do_direct_port_access == -1) IO_port_init(); - if ((do_direct_port_access) - /* Make sure we have access to the port */ - && (port_permissions[port] & IO_READ)) - { - iopl(3); - switch(size) - { - case 1: res = inb( port ); break; - case 2: res = inw( port ); break; - case 4: res = inl( port ); break; - } - iopl(0); - return res; - } -#endif - switch (port) { case 0x40: @@ -862,25 +657,6 @@ void DOSVM_outport( int port, int size, DWORD value ) } #endif -#ifdef DIRECT_IO_ACCESS - - if (do_direct_port_access == -1) IO_port_init(); - if ((do_direct_port_access) - /* Make sure we have access to the port */ - && (port_permissions[port] & IO_WRITE)) - { - iopl(3); - switch(size) - { - case 1: outb( LOBYTE(value), port ); break; - case 2: outw( LOWORD(value), port ); break; - case 4: outl( value, port ); break; - } - iopl(0); - return; - } -#endif - switch (port) { case 0x20:

1 0