August 2013 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Get rid of the unused MAX_PALETTES constant.
by Alexandre Julliard Aug. 28, 2013

Aug. 28, 2013

Module: wine Branch: master Commit: 00ffc0c24ba754063b205b4cfce843048ac551a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00ffc0c24ba754063b205b4cf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 28 10:09:56 2013 +0200 wined3d: Get rid of the unused MAX_PALETTES constant. --- dlls/wined3d/wined3d_private.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a01c3a4..1746417 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -155,7 +155,6 @@ void *wined3d_rb_realloc(void *ptr, size_t size) DECLSPEC_HIDDEN; void wined3d_rb_free(void *ptr) DECLSPEC_HIDDEN; /* Device caps */ -#define MAX_PALETTES 65536 #define MAX_STREAM_OUT 4 #define MAX_STREAMS 16 #define MAX_TEXTURES 8

1 0

Alexandre Julliard : server: Pass a wait queue entry to the signaled/ satisfied object functions.
by Alexandre Julliard Aug. 28, 2013

Aug. 28, 2013

Module: wine Branch: master Commit: 39644bb30992744b798e2375d6441df73f4ed751 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39644bb30992744b798e2375d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 26 11:55:04 2013 +0200 server: Pass a wait queue entry to the signaled/satisfied object functions. --- server/completion.c | 4 +- server/console.c | 4 +- server/debugger.c | 8 +++--- server/device.c | 8 +++--- server/event.c | 12 +++++----- server/fd.c | 6 ++-- server/file.h | 2 +- server/mutex.c | 54 +++++++++++++++++++++++++++++--------------------- server/named_pipe.c | 4 +- server/object.c | 2 +- server/object.h | 6 ++-- server/process.c | 8 +++--- server/queue.c | 10 ++++---- server/semaphore.c | 8 +++--- server/sock.c | 4 +- server/thread.c | 16 +++++++------- server/timer.c | 8 +++--- 17 files changed, 86 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=39644bb30992744b798e2…

1 0

Henri Verbeet : d3dx9: Simplify D3DXLoadSurfaceFromResourceW().
by Alexandre Julliard Aug. 28, 2013

Aug. 28, 2013

Module: wine Branch: master Commit: 9595dd873e7cc0065d16d1421b651e54de78d4d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9595dd873e7cc0065d16d1421… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 28 10:10:00 2013 +0200 d3dx9: Simplify D3DXLoadSurfaceFromResourceW(). --- dlls/d3dx9_36/surface.c | 27 +++++++++++---------------- 1 files changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index a2b553b..9b76457 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1268,7 +1268,9 @@ HRESULT WINAPI D3DXLoadSurfaceFromResourceW(IDirect3DSurface9 *dst_surface, const PALETTEENTRY *dst_palette, const RECT *dst_rect, HMODULE src_module, const WCHAR *resource, const RECT *src_rect, DWORD filter, D3DCOLOR color_key, D3DXIMAGE_INFO *src_info) { - HRSRC hResInfo; + UINT data_size; + HRSRC resinfo; + void *data; TRACE("dst_surface %p, dst_palette %p, dst_rect %s, src_module %p, resource %s, " "src_rect %s, filter %#x, color_key 0x%08x, src_info %p.\n", @@ -1278,23 +1280,16 @@ HRESULT WINAPI D3DXLoadSurfaceFromResourceW(IDirect3DSurface9 *dst_surface, if (!dst_surface) return D3DERR_INVALIDCALL; - hResInfo = FindResourceW(src_module, resource, (const WCHAR *)RT_RCDATA); - if (!hResInfo) /* Try loading the resource as bitmap data (which is in DIB format D3DXIFF_DIB) */ - hResInfo = FindResourceW(src_module, resource, (const WCHAR *)RT_BITMAP); - - if (hResInfo) - { - UINT data_size; - void *data; - - if (FAILED(load_resource_into_memory(src_module, hResInfo, &data, &data_size))) - return D3DXERR_INVALIDDATA; + if (!(resinfo = FindResourceW(src_module, resource, (const WCHAR *)RT_RCDATA)) + /* Try loading the resource as bitmap data (which is in DIB format D3DXIFF_DIB) */ + && !(resinfo = FindResourceW(src_module, resource, (const WCHAR *)RT_BITMAP))) + return D3DXERR_INVALIDDATA; - return D3DXLoadSurfaceFromFileInMemory(dst_surface, dst_palette, dst_rect, - data, data_size, src_rect, filter, color_key, src_info); - } + if (FAILED(load_resource_into_memory(src_module, resinfo, &data, &data_size))) + return D3DXERR_INVALIDDATA; - return D3DXERR_INVALIDDATA; + return D3DXLoadSurfaceFromFileInMemory(dst_surface, dst_palette, dst_rect, + data, data_size, src_rect, filter, color_key, src_info); }

1 0

Henri Verbeet : wined3d: Get rid of RTL_READDRAW.
by Alexandre Julliard Aug. 28, 2013

Aug. 28, 2013

Module: wine Branch: master Commit: ac54753e7c9f0798afa4397b6dc42f7f17c95793 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac54753e7c9f0798afa4397b6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 28 10:09:58 2013 +0200 wined3d: Get rid of RTL_READDRAW. I don't think we ever want to use glDrawPixels(). --- dlls/wined3d/surface.c | 156 ++-------------------------------------- dlls/wined3d/wined3d_main.c | 14 ---- dlls/wined3d/wined3d_private.h | 4 - 3 files changed, 5 insertions(+), 169 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e001185..66f15fb 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4439,76 +4439,6 @@ void surface_prepare_rb(struct wined3d_surface *surface, const struct wined3d_gl } } -static void flush_to_framebuffer_drawpixels(struct wined3d_surface *surface, - const RECT *rect, GLenum fmt, GLenum type, UINT bpp, const BYTE *mem) -{ - struct wined3d_device *device = surface->resource.device; - UINT pitch = wined3d_surface_get_pitch(surface); - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; - RECT local_rect; - UINT w, h; - - surface_get_rect(surface, rect, &local_rect); - - mem += local_rect.top * pitch + local_rect.left * bpp; - w = local_rect.right - local_rect.left; - h = local_rect.bottom - local_rect.top; - - /* Activate the correct context for the render target */ - context = context_acquire(device, surface); - context_apply_blit_state(context, device); - gl_info = context->gl_info; - - if (!surface_is_offscreen(surface)) - { - GLenum buffer = surface_get_gl_buffer(surface); - TRACE("Unlocking %#x buffer.\n", buffer); - context_set_draw_buffer(context, buffer); - - surface_translate_drawable_coords(surface, context->win_handle, &local_rect); - gl_info->gl_ops.gl.p_glPixelZoom(1.0f, -1.0f); - } - else - { - /* Primary offscreen render target */ - TRACE("Offscreen render target.\n"); - context_set_draw_buffer(context, device->offscreenBuffer); - - gl_info->gl_ops.gl.p_glPixelZoom(1.0f, 1.0f); - } - - gl_info->gl_ops.gl.p_glRasterPos3i(local_rect.left, local_rect.top, 1); - checkGLcall("glRasterPos3i"); - - /* If not fullscreen, we need to skip a number of bytes to find the next row of data */ - gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, surface->resource.width); - - if (surface->flags & SFLAG_PBO) - { - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); - checkGLcall("glBindBufferARB"); - } - - gl_info->gl_ops.gl.p_glDrawPixels(w, h, fmt, type, mem); - checkGLcall("glDrawPixels"); - - if (surface->flags & SFLAG_PBO) - { - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); - checkGLcall("glBindBufferARB"); - } - - gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); - checkGLcall("glPixelStorei(GL_UNPACK_ROW_LENGTH, 0)"); - - if (wined3d_settings.strict_draw_ordering - || (surface->swapchain && surface->swapchain->front_buffer == surface)) - gl_info->gl_ops.gl.p_glFlush(); - - context_release(context); -} - static BOOL color_in_range(const struct wined3d_color_key *color_key, DWORD color) { /* FIXME: Is this really how color keys are supposed to work? I think it @@ -5860,11 +5790,7 @@ static void surface_load_sysmem(struct wined3d_surface *surface, static HRESULT surface_load_drawable(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, const RECT *rect) { - struct wined3d_device *device = surface->resource.device; - enum wined3d_conversion_type convert; - struct wined3d_format format; - UINT byte_count; - BYTE *mem; + RECT r; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && surface_is_offscreen(surface)) { @@ -5872,82 +5798,10 @@ static HRESULT surface_load_drawable(struct wined3d_surface *surface, return WINED3DERR_INVALIDCALL; } - if (wined3d_settings.rendertargetlock_mode == RTL_READTEX) - surface_load_location(surface, SFLAG_INTEXTURE, NULL); - - if (surface->flags & SFLAG_INTEXTURE) - { - RECT r; - - surface_get_rect(surface, rect, &r); - surface_blt_to_drawable(device, WINED3D_TEXF_POINT, FALSE, surface, &r, surface, &r); - - return WINED3D_OK; - } - - if ((surface->flags & SFLAG_LOCATIONS) == SFLAG_INSRGBTEX) - { - /* This needs colorspace conversion from sRGB to RGB. We take the slow - * path through sysmem. */ - surface_load_location(surface, SFLAG_INSYSMEM, rect); - } - - d3dfmt_get_conv(surface, FALSE, FALSE, &format, &convert); - - /* Don't use PBOs for converted surfaces. During PBO conversion we look at - * SFLAG_CONVERTED but it isn't set (yet) in all cases where it is getting - * called. */ - if ((convert != WINED3D_CT_NONE) && (surface->flags & SFLAG_PBO)) - { - struct wined3d_context *context; - - TRACE("Removing the pbo attached to surface %p.\n", surface); - - /* TODO: Use already acquired context when possible. */ - context = context_acquire(device, NULL); - - surface_remove_pbo(surface, gl_info); - - context_release(context); - } - - if ((convert != WINED3D_CT_NONE) && surface->resource.allocatedMemory) - { - UINT height = surface->resource.height; - UINT width = surface->resource.width; - UINT src_pitch, dst_pitch; - - byte_count = format.conv_byte_count; - src_pitch = wined3d_surface_get_pitch(surface); - - /* Stick to the alignment for the converted surface too, makes it - * easier to load the surface. */ - dst_pitch = width * byte_count; - dst_pitch = (dst_pitch + device->surface_alignment - 1) & ~(device->surface_alignment - 1); - - if (!(mem = HeapAlloc(GetProcessHeap(), 0, dst_pitch * height))) - { - ERR("Out of memory (%u).\n", dst_pitch * height); - return E_OUTOFMEMORY; - } - - d3dfmt_convert_surface(surface->resource.allocatedMemory, mem, - src_pitch, width, height, dst_pitch, convert, surface); - - surface->flags |= SFLAG_CONVERTED; - } - else - { - surface->flags &= ~SFLAG_CONVERTED; - mem = surface->resource.allocatedMemory; - byte_count = format.byte_count; - } - - flush_to_framebuffer_drawpixels(surface, rect, format.glFormat, format.glType, byte_count, mem); - - /* Don't delete PBO memory. */ - if ((mem != surface->resource.allocatedMemory) && !(surface->flags & SFLAG_PBO)) - HeapFree(GetProcessHeap(), 0, mem); + surface_get_rect(surface, rect, &r); + surface_load_location(surface, SFLAG_INTEXTURE, NULL); + surface_blt_to_drawable(surface->resource.device, + WINED3D_TEXF_POINT, FALSE, surface, &r, surface, &r); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 62dc462..a897bdc 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -74,7 +74,6 @@ struct wined3d_settings wined3d_settings = { TRUE, /* Use of GLSL enabled by default */ ORM_FBO, /* Use FBOs to do offscreen rendering */ - RTL_READTEX, /* Default render target locking method */ PCI_VENDOR_NONE,/* PCI Vendor ID */ PCI_DEVICE_NONE,/* PCI Device ID */ 0, /* The default of memory is set in init_driver_info */ @@ -223,19 +222,6 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) wined3d_settings.offscreen_rendering_mode = ORM_FBO; } } - if ( !get_config_key( hkey, appkey, "RenderTargetLockMode", buffer, size) ) - { - if (!strcmp(buffer,"readdraw")) - { - TRACE("Using glReadPixels for render target reading and glDrawPixels for writing\n"); - wined3d_settings.rendertargetlock_mode = RTL_READDRAW; - } - else if (!strcmp(buffer,"readtex")) - { - TRACE("Using glReadPixels for render target reading and textures for writing\n"); - wined3d_settings.rendertargetlock_mode = RTL_READTEX; - } - } if ( !get_config_key_dword( hkey, appkey, "VideoPciDeviceID", &tmpvalue) ) { int pci_device_id = tmpvalue; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1746417..c320b65 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -241,9 +241,6 @@ static inline float float_24_to_32(DWORD in) #define ORM_BACKBUFFER 0 #define ORM_FBO 1 -#define RTL_READDRAW 1 -#define RTL_READTEX 2 - #define PCI_VENDOR_NONE 0xffff /* e.g. 0x8086 for Intel and 0x10de for Nvidia */ #define PCI_DEVICE_NONE 0xffff /* e.g. 0x14f for a Geforce6200 */ @@ -256,7 +253,6 @@ struct wined3d_settings * implemented, we'll leave it as a registry setting for developers. */ BOOL glslRequested; int offscreen_rendering_mode; - int rendertargetlock_mode; unsigned short pci_vendor_id; unsigned short pci_device_id; /* Memory tracking and object counting. */

1 0

Alexandre Julliard : ntdll/tests: Add a number of tests for keyed events.
by Alexandre Julliard Aug. 28, 2013

Aug. 28, 2013

Module: wine Branch: master Commit: 54017b0fac12b04e4c08a95c71ea4db69a95e062 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54017b0fac12b04e4c08a95c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 28 11:04:06 2013 +0200 ntdll/tests: Add a number of tests for keyed events. --- dlls/ntdll/tests/om.c | 200 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 199 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=54017b0fac12b04e4c08a…

1 0

Alexandre Julliard : server: Implement waiting on keyed events.
by Alexandre Julliard Aug. 28, 2013

Aug. 28, 2013

Module: wine Branch: master Commit: 93fbb12e65ca8ecddd889488c71d89a82dc35c08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93fbb12e65ca8ecddd889488c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 22 17:53:15 2013 +0200 server: Implement waiting on keyed events. --- dlls/ntdll/sync.c | 22 ++++++++++++++--- include/wine/server_protocol.h | 12 ++++++++- server/event.c | 33 ++++++++++++++++++++++---- server/object.h | 5 ++++ server/protocol.def | 10 +++++++- server/thread.c | 50 ++++++++++++++++++++++++++++++++++++++++ server/thread.h | 3 ++ server/trace.c | 7 +++++ 8 files changed, 130 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=93fbb12e65ca8ecddd889…

1 0

Alexandre Julliard : server: Store the wait structure in the wait entry and add an accessor function for the thread .
by Alexandre Julliard Aug. 28, 2013

Aug. 28, 2013

Module: wine Branch: master Commit: de9f5b33b8fb505119eb2b5f1af20dc57ae0a3c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de9f5b33b8fb505119eb2b5f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 22 16:17:54 2013 +0200 server: Store the wait structure in the wait entry and add an accessor function for the thread. --- server/object.h | 6 +++--- server/queue.c | 6 +++--- server/thread.c | 9 +++++++-- server/thread.h | 1 + 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/server/object.h b/server/object.h index 3b401bc..50c279f 100644 --- a/server/object.h +++ b/server/object.h @@ -106,9 +106,9 @@ struct object struct wait_queue_entry { - struct list entry; - struct object *obj; - struct thread *thread; + struct list entry; + struct object *obj; + struct thread_wait *wait; }; extern void *mem_alloc( size_t size ); /* malloc wrapper */ diff --git a/server/queue.c b/server/queue.c index 7aa9b14..0a02798 100644 --- a/server/queue.c +++ b/server/queue.c @@ -866,7 +866,7 @@ static int is_queue_hung( struct msg_queue *queue ) LIST_FOR_EACH_ENTRY( entry, &queue->obj.wait_queue, struct wait_queue_entry, entry ) { - if (entry->thread->queue == queue) + if (get_wait_queue_thread(entry)->queue == queue) return 0; /* thread is waiting on queue -> not hung */ } return 1; @@ -875,10 +875,10 @@ static int is_queue_hung( struct msg_queue *queue ) static int msg_queue_add_queue( struct object *obj, struct wait_queue_entry *entry ) { struct msg_queue *queue = (struct msg_queue *)obj; - struct process *process = entry->thread->process; + struct process *process = get_wait_queue_thread(entry)->process; /* a thread can only wait on its own queue */ - if (entry->thread->queue != queue) + if (get_wait_queue_thread(entry)->queue != queue) { set_error( STATUS_ACCESS_DENIED ); return 0; diff --git a/server/thread.c b/server/thread.c index b5698b3..38a6219 100644 --- a/server/thread.c +++ b/server/thread.c @@ -543,6 +543,11 @@ void remove_queue( struct object *obj, struct wait_queue_entry *entry ) release_object( obj ); } +struct thread *get_wait_queue_thread( struct wait_queue_entry *entry ) +{ + return entry->wait->thread; +} + /* finish waiting */ static void end_wait( struct thread *thread ) { @@ -579,7 +584,7 @@ static int wait_on( const select_op_t *select_op, unsigned int count, struct obj for (i = 0, entry = wait->queues; i < count; i++, entry++) { struct object *obj = objects[i]; - entry->thread = current; + entry->wait = wait; if (!obj->ops->add_queue( obj, entry )) { wait->count = i; @@ -809,7 +814,7 @@ void wake_up( struct object *obj, int max ) LIST_FOR_EACH( ptr, &obj->wait_queue ) { struct wait_queue_entry *entry = LIST_ENTRY( ptr, struct wait_queue_entry, entry ); - if (!wake_thread( entry->thread )) continue; + if (!wake_thread( get_wait_queue_thread( entry ))) continue; if (max && !--max) break; /* restart at the head of the list since a wake up can change the object wait queue */ ptr = &obj->wait_queue; diff --git a/server/thread.h b/server/thread.h index 1c4a74a..c82f780 100644 --- a/server/thread.h +++ b/server/thread.h @@ -105,6 +105,7 @@ extern struct thread *get_thread_from_id( thread_id_t id ); extern struct thread *get_thread_from_handle( obj_handle_t handle, unsigned int access ); extern struct thread *get_thread_from_tid( int tid ); extern struct thread *get_thread_from_pid( int pid ); +extern struct thread *get_wait_queue_thread( struct wait_queue_entry *entry ); extern void stop_thread( struct thread *thread ); extern void stop_thread_if_suspended( struct thread *thread ); extern int wake_thread( struct thread *thread );

1 0

Lucas Zawacki : Portuguese translation for version 1.7.0
by Jeremy Newman Aug. 28, 2013

Aug. 28, 2013

Module: website Branch: master Commit: cdb9f3ef93cb1e2ed6643f8d7875020d625cf1b8 URL: http://source.winehq.org/git/website.git/?a=commit;h=cdb9f3ef93cb1e2ed6643f… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Wed Aug 21 14:40:30 2013 -0300 Portuguese translation for version 1.7.0 --- news/pt/2013080202.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/pt/2013080202.xml b/news/pt/2013080202.xml new file mode 100644 index 0000000..420ff58 --- /dev/null +++ b/news/pt/2013080202.xml @@ -0,0 +1,16 @@ +<news> +<date>2 de Agosto de 2013</date> +<title>Wine 1.7.0 lançado</title> +<body> + A versão de desenvolvimento 1.7.0 já está disponível agora. + <a href="{$root}/announce/1.7.0">Novidades</a> desta versão: +<ul> + <li>Suporte a texto vertical no driver Postscript.</li> + <li>Versão 2 da liblcms sendo usada ao invés da versão 1.</li> + <li>Dados Unicode atualizados para Unicode 6.2.0.</li> + <li>Suporte a controles de hyperlink em instaladores.</li> + <li>Melhoria no suporte a atributos XML.</li> + <li>Várias correções de bugs.</li> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.0.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e irão aparecer em breve em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0

Dmitry Timoshkov : ntdll: Properly test line status register for TIOCSER_TEMT bit.
by Alexandre Julliard Aug. 27, 2013

Aug. 27, 2013

Module: wine Branch: master Commit: d21b05b06d019ee351a1feb4cd8f6e006a19f460 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d21b05b06d019ee351a1feb4c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Aug 27 17:41:10 2013 +0900 ntdll: Properly test line status register for TIOCSER_TEMT bit. --- dlls/ntdll/serial.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index bb025cf..7f56cb5 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -804,6 +804,8 @@ typedef struct async_commio */ static NTSTATUS get_irq_info(int fd, serial_irq_info *irq_info) { + int out; + #if defined (HAVE_LINUX_SERIAL_H) && defined (TIOCGICOUNT) struct serial_icounter_struct einfo; if (!ioctl(fd, TIOCGICOUNT, &einfo)) @@ -828,8 +830,11 @@ static NTSTATUS get_irq_info(int fd, serial_irq_info *irq_info) irq_info->temt = 0; /* Generate a single TX_TXEMPTY event when the TX Buffer turns empty*/ #ifdef TIOCSERGETLSR /* prefer to log the state TIOCSERGETLSR */ - if (!ioctl(fd, TIOCSERGETLSR, &irq_info->temt)) + if (!ioctl(fd, TIOCSERGETLSR, &out)) + { + irq_info->temt = (out & TIOCSER_TEMT) != 0; return STATUS_SUCCESS; + } TRACE("TIOCSERGETLSR err %s\n", strerror(errno)); #endif

1 0

Dmitry Timoshkov : ntdll: Ignore ioctl(TIOCGICOUNT) failures.
by Alexandre Julliard Aug. 27, 2013

Aug. 27, 2013

Module: wine Branch: master Commit: 1202c14e6efbf53ffd90ab7c6797e063b795451b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1202c14e6efbf53ffd90ab7c6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Aug 27 17:38:23 2013 +0900 ntdll: Ignore ioctl(TIOCGICOUNT) failures. Most USB-serial Linux drivers don't support it. --- dlls/ntdll/serial.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index f4ab212..91e7230 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -820,12 +820,11 @@ static NTSTATUS get_irq_info(int fd, serial_irq_info *irq_info) { TRACE("TIOCGICOUNT err %s\n", strerror(errno)); memset(irq_info,0, sizeof(serial_irq_info)); - return FILE_GetNtStatus(); } #else memset(irq_info,0, sizeof(serial_irq_info)); - return STATUS_NOT_IMPLEMENTED; #endif + irq_info->temt = 0; /* Generate a single TX_TXEMPTY event when the TX Buffer turns empty*/ #ifdef TIOCSERGETLSR /* prefer to log the state TIOCSERGETLSR */

1 0