wine-commits March 2020

wine-commits@winehq.org

1 participants
996 discussions

Matteo Bruni : wined3d: Skip loading current index buffer if the draw is not indexed.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: b83b897b4a2f96be7446a7b8ac6678b1559e9386 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b83b897b4a2f96be7446a7b8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 26 13:26:00 2020 +0100 wined3d: Skip loading current index buffer if the draw is not indexed. 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/context.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c6a1d76267..2e363fb1d6 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4225,7 +4225,7 @@ static void context_load_stream_output_buffers(struct wined3d_context *context, /* Context activation is done by the caller. */ static BOOL context_apply_draw_state(struct wined3d_context *context, - const struct wined3d_device *device, const struct wined3d_state *state) + const struct wined3d_device *device, const struct wined3d_state *state, BOOL indexed) { const struct wined3d_state_entry *state_table = context->state_table; struct wined3d_context_gl *context_gl = wined3d_context_gl(context); @@ -4277,7 +4277,7 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, if (isStateDirty(context, STATE_STREAMSRC)) context_update_stream_info(context, state); } - if (state->index_buffer) + if (indexed && state->index_buffer) { if (context->stream_info.all_vbo) wined3d_buffer_load(state->index_buffer, context, state); @@ -5194,7 +5194,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s if (parameters->indirect) wined3d_buffer_load(parameters->u.indirect.buffer, context, state); - if (!context_apply_draw_state(context, device, state)) + if (!context_apply_draw_state(context, device, state, parameters->indexed)) { context_release(context); WARN("Unable to apply draw state, skipping draw.\n");

1 0

Matteo Bruni : wined3d: Fix ARB_TEXTURE_STORAGE_MULTISAMPLE core_extension[] entry.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: a281544bde79592bdd128e8691ce310ce260c3da URL: https://source.winehq.org/git/wine.git/?a=commit;h=a281544bde79592bdd128e86… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 26 13:25:59 2020 +0100 wined3d: Fix ARB_TEXTURE_STORAGE_MULTISAMPLE core_extension[] entry. 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/adapter_gl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 33ba2c01ca..77fe4ca720 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3423,7 +3423,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_STENCIL_TEXTURING, MAKEDWORD_VERSION(4, 3)}, {ARB_TEXTURE_BUFFER_RANGE, MAKEDWORD_VERSION(4, 3)}, {ARB_TEXTURE_QUERY_LEVELS, MAKEDWORD_VERSION(4, 3)}, - {ARB_TEXTURE_STORAGE_MULTISAMPLE, MAKEDWORD_VERSION(4, 2)}, + {ARB_TEXTURE_STORAGE_MULTISAMPLE, MAKEDWORD_VERSION(4, 3)}, {ARB_TEXTURE_VIEW, MAKEDWORD_VERSION(4, 3)}, {ARB_BUFFER_STORAGE, MAKEDWORD_VERSION(4, 4)},

1 0

Matteo Bruni : wined3d: Make blend state cleanup more consistent with samplers cleanup.
by Alexandre Julliard 26 Mar '20

26 Mar '20

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

Matteo Bruni : wined3d: Store the framebuffer inline in struct wined3d_state.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: e11ae91b9cb27a7f95baa7a9cfe1d50fb04155f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e11ae91b9cb27a7f95baa7a9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 26 13:25:57 2020 +0100 wined3d: Store the framebuffer inline in struct wined3d_state. 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/arb_program_shader.c | 4 +-- dlls/wined3d/context.c | 10 +++---- dlls/wined3d/cs.c | 34 ++++++++++++------------ dlls/wined3d/device.c | 56 +++++++++++++++++++++------------------ dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 6 ++--- dlls/wined3d/state.c | 30 ++++++++++----------- dlls/wined3d/stateblock.c | 4 +-- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/utils.c | 4 +-- dlls/wined3d/wined3d_private.h | 11 +++----- 11 files changed, 81 insertions(+), 82 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e11ae91b9cb27a7f95ba…

1 0

Lukáš Horáček : wined3d: Add GTX 1660 SUPER as a card.
by Alexandre Julliard 26 Mar '20

26 Mar '20

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

Paul Gofman : d3d11: Use stricmp() instead of _strnicmp(..., -1).
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: fa990afbbc4ac09f06be847d35e47389364acf98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa990afbbc4ac09f06be847d… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Mar 25 21:28:07 2020 +0300 d3d11: Use stricmp() instead of _strnicmp(..., -1). Fixes Epic Games Launcher crash with native ucrtbase.dll. 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/d3d11/inputlayout.c | 2 +- dlls/d3d11/shader.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index 9bee927a7b..e27984212b 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -30,7 +30,7 @@ static struct wined3d_shader_signature_element *shader_find_signature_element(co for (i = 0; i < s->element_count; ++i) { - if (!_strnicmp(e[i].semantic_name, semantic_name, -1) && e[i].semantic_idx == semantic_idx + if (!stricmp(e[i].semantic_name, semantic_name) && e[i].semantic_idx == semantic_idx && e[i].stream_idx == stream_idx) return &e[i]; } diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 6bec79740b..d51d8e4e60 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -1024,7 +1024,7 @@ static HRESULT validate_stream_output_entries(const D3D11_SO_DECLARATION_ENTRY * continue; if (e1->Stream == e2->Stream - && !_strnicmp(e1->SemanticName, e2->SemanticName, -1) + && !stricmp(e1->SemanticName, e2->SemanticName) && e1->SemanticIndex == e2->SemanticIndex && e1->StartComponent < e2->StartComponent + e2->ComponentCount && e1->StartComponent + e1->ComponentCount > e2->StartComponent)

1 0

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

26 Mar '20

Module: wine Branch: master Commit: d637640f9af4ccfb6639361fc548d4bbeaafeb6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d637640f9af4ccfb6639361f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 26 16:49:17 2020 +0100 krnl386: Get rid of DOS parallel port I/O support. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 35 ----- configure.ac | 12 -- dlls/krnl386.exe16/ioports.c | 318 ------------------------------------------- include/config.h.in | 3 - 4 files changed, 368 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d637640f9af4ccfb6639…

1 0

Alexandre Julliard : krnl386: Return a handle to the vxd file itself instead of creating a dummy file.
by Alexandre Julliard 26 Mar '20

26 Mar '20

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

Alexandre Julliard : krnl386: Get rid of DOS SCSI ioctl support.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: 7b10b02411258c837191f7a8a429451108fd1be7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b10b02411258c837191f7a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 26 16:49:07 2020 +0100 krnl386: Get rid of DOS SCSI ioctl support. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/int21.c | 280 ++++++--------------------------------------- 1 file changed, 37 insertions(+), 243 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7b10b02411258c837191…

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2020