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

Matteo Bruni : wined3d: Only invalidate STATE_INDEXBUFFER if the buffer being destroyed is bound as index buffer.
by Alexandre Julliard March 26, 2020

March 26, 2020

Module: wine Branch: master Commit: 3cc218d5b51140354afdd689c67be9258476a1e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cc218d5b51140354afdd689… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 26 13:26:01 2020 +0100 wined3d: Only invalidate STATE_INDEXBUFFER if the buffer being destroyed is bound as index buffer. Signed-off-by: Matteo Bruni <mbruni(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 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 427b1a2649..dffa703dcc 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -144,6 +144,8 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu { const struct wined3d_gl_info *gl_info = context_gl->gl_info; struct wined3d_resource *resource = &buffer_gl->b.resource; + struct wined3d_buffer *buffer = &buffer_gl->b; + struct wined3d_cs *cs = resource->device->cs; GLuint bo; if (!buffer_gl->b.buffer_object) @@ -158,7 +160,8 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu { if (resource->bind_flags & WINED3D_BIND_VERTEX_BUFFER) device_invalidate_state(resource->device, STATE_STREAMSRC); - if (resource->bind_flags & WINED3D_BIND_INDEX_BUFFER) + if (resource->bind_flags & WINED3D_BIND_INDEX_BUFFER + && cs->state.index_buffer == buffer) device_invalidate_state(resource->device, STATE_INDEXBUFFER); if (resource->bind_flags & WINED3D_BIND_CONSTANT_BUFFER) {

1 0

Jacek Caban : dbghelp: Remove unused code in module_find_cb.
by Alexandre Julliard March 26, 2020

March 26, 2020

Module: wine Branch: master Commit: 8d702a3aa54fc61bd146f584e66364a12a0ee3a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d702a3aa54fc61bd146f584… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 26 16:51:20 2020 +0100 dbghelp: Remove unused code in module_find_cb. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/path.c | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index 06208d109d..24649cf280 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -474,7 +474,7 @@ struct module_find static BOOL CALLBACK module_find_cb(PCWSTR buffer, PVOID user) { struct module_find* mf = user; - DWORD size, checksum, timestamp; + DWORD size, timestamp; unsigned matched = 0; /* the matching weights: @@ -524,30 +524,6 @@ static BOOL CALLBACK module_find_cb(PCWSTR buffer, PVOID user) if (timestamp == mf->dw1 && size == mf->dw2) matched++; } break; - case DMT_MACHO: - case DMT_ELF: - { - HANDLE file; - - file = CreateFileW(buffer, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (file == INVALID_HANDLE_VALUE) break; - - checksum = calc_crc32(file); - if (checksum == mf->dw1) matched += 2; - else - { - struct image_file_map fmap; - WARN("Found %s, but wrong checksums: %08x %08x\n", debugstr_w(buffer), checksum, mf->dw1); - if (elf_map_handle(file, &fmap)) /* FIXME: validate macho files */ - { - image_unmap_file(&fmap); - matched++; - } - } - CloseHandle(file); - } - break; case DMT_PDB: { struct pdb_lookup pdb_lookup;

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 March 26, 2020

March 26, 2020

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 : include: Rename the FileSystemAttribute field of FILE_FS_ATTRIBUTE_INFORMATION to FileSystemAttributes.
by Alexandre Julliard March 26, 2020

March 26, 2020

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

Matteo Bruni : wined3d: Make blend state cleanup more consistent with samplers cleanup.
by Alexandre Julliard March 26, 2020

March 26, 2020

Module: wine Branch: master Commit: 7163cb0568e63937b14714553b03dbcba60498a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7163cb0568e63937b1471455… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 26 13:25:58 2020 +0100 wined3d: Make blend state cleanup more consistent with samplers cleanup. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 41554b93cf..f8caa0c23c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -525,11 +525,11 @@ static void device_leftover_rasterizer_state(struct wine_rb_entry *entry, void * ERR("Leftover rasterizer state %p.\n", state); } -static void device_free_blend_state(struct wine_rb_entry *entry, void *context) +static void device_leftover_blend_state(struct wine_rb_entry *entry, void *context) { - struct wined3d_blend_state *state = WINE_RB_ENTRY_VALUE(entry, struct wined3d_blend_state, entry); + struct wined3d_blend_state *blend_state = WINE_RB_ENTRY_VALUE(entry, struct wined3d_blend_state, entry); - wined3d_blend_state_decref(state); + ERR("Leftover blend state %p.\n", blend_state); } void wined3d_device_cleanup(struct wined3d_device *device) @@ -539,8 +539,6 @@ void wined3d_device_cleanup(struct wined3d_device *device) if (device->swapchain_count) wined3d_device_uninit_3d(device); - wine_rb_destroy(&device->blend_states, device_free_blend_state, NULL); - wined3d_cs_destroy(device->cs); for (i = 0; i < ARRAY_SIZE(device->multistate_funcs); ++i) @@ -570,6 +568,7 @@ void wined3d_device_cleanup(struct wined3d_device *device) wine_rb_destroy(&device->samplers, device_leftover_sampler, NULL); wine_rb_destroy(&device->rasterizer_states, device_leftover_rasterizer_state, NULL); + wine_rb_destroy(&device->blend_states, device_leftover_blend_state, NULL); wined3d_decref(device->wined3d); device->wined3d = NULL; @@ -1118,6 +1117,13 @@ static void device_free_rasterizer_state(struct wine_rb_entry *entry, void *cont wined3d_rasterizer_state_decref(state); } +static void device_free_blend_state(struct wine_rb_entry *entry, void *context) +{ + struct wined3d_blend_state *blend_state = WINE_RB_ENTRY_VALUE(entry, struct wined3d_blend_state, entry); + + wined3d_blend_state_decref(blend_state); +} + void wined3d_device_uninit_3d(struct wined3d_device *device) { BOOL no3d = device->wined3d->flags & WINED3D_NO3D; @@ -1159,6 +1165,7 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) wine_rb_clear(&device->samplers, device_free_sampler, NULL); wine_rb_clear(&device->rasterizer_states, device_free_rasterizer_state, NULL); + wine_rb_clear(&device->blend_states, device_free_blend_state, NULL); LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) { @@ -5336,6 +5343,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wine_rb_clear(&device->samplers, device_free_sampler, NULL); wine_rb_clear(&device->rasterizer_states, device_free_rasterizer_state, NULL); + wine_rb_clear(&device->blend_states, device_free_blend_state, NULL); if (reset_state) {

1 0

Alexandre Julliard : krnl386: Return a handle to the vxd file itself instead of creating a dummy file.
by Alexandre Julliard March 26, 2020

March 26, 2020

Module: wine Branch: master Commit: 61ad36fdc94d9a46ed2530a3766204525e062491 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61ad36fdc94d9a46ed2530a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 26 16:49:11 2020 +0100 krnl386: Return a handle to the vxd file itself instead of creating a dummy file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/vxd.c | 51 ++++-------------------------------------------- 1 file changed, 4 insertions(+), 47 deletions(-) diff --git a/dlls/krnl386.exe16/vxd.c b/dlls/krnl386.exe16/vxd.c index 88d43c2d36..1b50b15027 100644 --- a/dlls/krnl386.exe16/vxd.c +++ b/dlls/krnl386.exe16/vxd.c @@ -108,51 +108,6 @@ static WORD VXD_WinVersion(void) return (version >> 8) | (version << 8); } -/* create a file handle to represent a VxD, by opening a dummy file in the wineserver directory */ -static HANDLE open_vxd_handle( LPCWSTR name ) -{ - static const WCHAR prefixW[] = {'\\','?','?','\\','u','n','i','x'}; - const char *dir = wine_get_server_dir(); - int len; - HANDLE ret; - NTSTATUS status; - OBJECT_ATTRIBUTES attr; - UNICODE_STRING nameW; - IO_STATUS_BLOCK io; - - len = MultiByteToWideChar( CP_UNIXCP, 0, dir, -1, NULL, 0 ); - nameW.Length = sizeof(prefixW) + (len + strlenW( name )) * sizeof(WCHAR); - nameW.MaximumLength = nameW.Length + sizeof(WCHAR); - if (!(nameW.Buffer = HeapAlloc( GetProcessHeap(), 0, nameW.MaximumLength ))) - { - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); - return 0; - } - memcpy( nameW.Buffer, prefixW, sizeof(prefixW) ); - MultiByteToWideChar( CP_UNIXCP, 0, dir, -1, nameW.Buffer + ARRAY_SIZE(prefixW), len ); - len += ARRAY_SIZE(prefixW); - nameW.Buffer[len-1] = '/'; - strcpyW( nameW.Buffer + len, name ); - - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.Attributes = 0; - attr.ObjectName = &nameW; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - - status = NtCreateFile( &ret, SYNCHRONIZE, &attr, &io, NULL, 0, - FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN_IF, - FILE_SYNCHRONOUS_IO_ALERT, NULL, 0 ); - if (status) - { - ret = 0; - SetLastError( RtlNtStatusToDosError(status) ); - } - RtlFreeUnicodeString( &nameW ); - return ret; -} - /* retrieve the DeviceIoControl function for a Vxd given a file handle */ DeviceIoProc __wine_vxd_get_proc( HANDLE handle ) { @@ -240,11 +195,13 @@ HANDLE __wine_vxd_open( LPCWSTR filenameW, DWORD access, SECURITY_ATTRIBUTES *sa } if (!vxd_modules[i].module) /* new one, register it */ { + WCHAR path[MAX_PATH]; IO_STATUS_BLOCK io; FILE_INTERNAL_INFORMATION info; - /* get a file handle to the dummy file */ - if (!(handle = open_vxd_handle( name ))) + GetModuleFileNameW( module, path, MAX_PATH ); + handle = CreateFileW( path, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); + if (handle == INVALID_HANDLE_VALUE) { FreeLibrary( module ); goto done;

1 0

Brendan Shanks : dinput/tests: Test IDirectInputEffect::SetParameters() with NULL effect parameters.
by Alexandre Julliard March 26, 2020

March 26, 2020

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

Alexandre Julliard : krnl386: Get rid of DOS direct I/O support.
by Alexandre Julliard March 26, 2020

March 26, 2020

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

Alexandre Julliard : ntdll: Use the NLS case mapping table for RtlHashUnicodeString().
by Alexandre Julliard March 26, 2020

March 26, 2020

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

Lukáš Horáček : wined3d: Add GTX 1660 SUPER as a card.
by Alexandre Julliard March 26, 2020

March 26, 2020

Module: wine Branch: master Commit: 0804914bb711be2c0996773687f3f60c641b9224 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0804914bb711be2c09967736… Author: Lukáš Horáček <flgx16(a)gmail.com> Date: Wed Mar 25 21:51:59 2020 +0100 wined3d: Add GTX 1660 SUPER as a card. Signed-off-by: Lukáš Horáček <flgx16(a)gmail.com> Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 3 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index e269bf8138..33ba2c01ca 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1363,6 +1363,7 @@ cards_nvidia_binary[] = {"RTX 2070", CARD_NVIDIA_GEFORCE_RTX2070}, /* GeForce 2000 - highend */ {"RTX 2060", CARD_NVIDIA_GEFORCE_RTX2060}, /* GeForce 2000 - highend */ {"GTX 1660 Ti", CARD_NVIDIA_GEFORCE_GTX1660TI}, /* GeForce 1600 - highend */ + {"GTX 1660 SUPER", CARD_NVIDIA_GEFORCE_GTX1660SUPER}, /* GeForce 1600 - highend */ {"GTX 1650 SUPER", CARD_NVIDIA_GEFORCE_GTX1650SUPER}, /* GeForce 1600 - midend high */ {"TITAN V", CARD_NVIDIA_TITANV}, /* GeForce 1000 - highend */ {"TITAN X (Pascal)", CARD_NVIDIA_TITANX_PASCAL}, /* GeForce 1000 - highend */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3dc3043bce..cb3e0dd104 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -430,6 +430,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_TITANX_PASCAL, "NVIDIA TITAN X (Pascal)", DRIVER_NVIDIA_GEFORCE8, 12288}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_TITANV, "NVIDIA TITAN V", DRIVER_NVIDIA_GEFORCE8, 12288}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1650SUPER,"NVIDIA GeForce GTX 1650 SUPER", DRIVER_NVIDIA_GEFORCE8, 4096}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1660SUPER,"NVIDIA GeForce GTX 1660 SUPER", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1660TI, "NVIDIA GeForce GTX 1660 Ti", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2060, "NVIDIA GeForce RTX 2060", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2070, "NVIDIA GeForce RTX 2070", DRIVER_NVIDIA_GEFORCE8, 8192}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bb0551e2af..38fcaf6039 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2592,6 +2592,7 @@ enum wined3d_pci_device CARD_NVIDIA_TITANX_PASCAL = 0x1b00, CARD_NVIDIA_TITANV = 0x1d81, CARD_NVIDIA_GEFORCE_GTX1650SUPER= 0x2187, + CARD_NVIDIA_GEFORCE_GTX1660SUPER= 0x21c4, CARD_NVIDIA_GEFORCE_GTX1660TI = 0x2182, CARD_NVIDIA_GEFORCE_RTX2060 = 0x1f08, CARD_NVIDIA_GEFORCE_RTX2070 = 0x1f07,

1 0