October 2017 - Wine-commits

Jacek Caban : ntdll/tests: Remove no longer needed Sleep calls.
by Alexandre Julliard 09 Oct '17

09 Oct '17

Module: wine Branch: master Commit: 4e17ff7c98a654e11c06c4ac742065ae3e6ed9d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e17ff7c98a654e11c06c4ac7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 9 14:28:21 2017 +0200 ntdll/tests: Remove no longer needed Sleep calls. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 9628cc2..a619fee 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -811,7 +811,6 @@ static void read_pipe_test(ULONG pipe_flags, ULONG pipe_type) ret = WriteFile( write, buffer, 1, &written, NULL ); ok(ret && written == 1, "WriteFile error %d\n", GetLastError()); /* iosb updated here by async i/o */ - Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 1, "wrong info %lu\n", iosb.Information ); ok( !is_signaled( read ), "read handle is signaled\n" ); @@ -837,7 +836,6 @@ static void read_pipe_test(ULONG pipe_flags, ULONG pipe_type) ret = WriteFile( write, buffer, 1, &written, NULL ); ok(ret && written == 1, "WriteFile error %d\n", GetLastError()); /* iosb updated here by async i/o */ - Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 1, "wrong info %lu\n", iosb.Information ); ok( is_signaled( read ), "read handle is not signaled\n" );

1 0

Jacek Caban : server: Store named pipe fd in pipe_end throughout its whole life time.
by Alexandre Julliard 09 Oct '17

09 Oct '17

Module: wine Branch: master Commit: c295dd6bda731553f835447c4049d79d11c43b5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c295dd6bda731553f835447c4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 9 14:28:46 2017 +0200 server: Store named pipe fd in pipe_end throughout its whole life time. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 63 ++++++++++++----------------------------------------- 1 file changed, 14 insertions(+), 49 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index b5738ad..5796089 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -75,7 +75,6 @@ struct pipe_end struct pipe_server { struct pipe_end pipe_end; /* common header for pipe_client and pipe_server */ - struct fd *ioctl_fd; /* file descriptor for ioctls when not connected */ struct list entry; /* entry in named pipe servers list */ enum pipe_state state; /* server state */ struct pipe_client *client; /* client that this server is connected to */ @@ -142,6 +141,7 @@ static const struct object_ops named_pipe_ops = /* common server and client pipe end functions */ static enum server_fd_type pipe_end_get_fd_type( struct fd *fd ); +static struct fd *pipe_end_get_fd( struct object *obj ); static int pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ); static int pipe_end_write( struct fd *fd, struct async *async_data, file_pos_t pos ); static int pipe_end_flush( struct fd *fd, struct async *async ); @@ -150,7 +150,6 @@ static void pipe_end_reselect_async( struct fd *fd, struct async_queue *queue ); /* server end functions */ static void pipe_server_dump( struct object *obj, int verbose ); -static struct fd *pipe_server_get_fd( struct object *obj ); static void pipe_server_destroy( struct object *obj); static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); @@ -164,7 +163,7 @@ static const struct object_ops pipe_server_ops = default_fd_signaled, /* signaled */ no_satisfied, /* satisfied */ no_signal, /* signal */ - pipe_server_get_fd, /* get_fd */ + pipe_end_get_fd, /* get_fd */ default_fd_map_access, /* map_access */ default_get_sd, /* get_sd */ default_set_sd, /* set_sd */ @@ -193,7 +192,6 @@ static const struct fd_ops pipe_server_fd_ops = /* client end functions */ static void pipe_client_dump( struct object *obj, int verbose ); static int pipe_client_signaled( struct object *obj, struct wait_queue_entry *entry ); -static struct fd *pipe_client_get_fd( struct object *obj ); static void pipe_client_destroy( struct object *obj ); static int pipe_client_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); @@ -207,7 +205,7 @@ static const struct object_ops pipe_client_ops = pipe_client_signaled, /* signaled */ no_satisfied, /* satisfied */ no_signal, /* signal */ - pipe_client_get_fd, /* get_fd */ + pipe_end_get_fd, /* get_fd */ default_fd_map_access, /* map_access */ default_get_sd, /* get_sd */ default_set_sd, /* set_sd */ @@ -324,13 +322,10 @@ static void named_pipe_destroy( struct object *obj) free_async_queue( &pipe->waiters ); } -static struct fd *pipe_client_get_fd( struct object *obj ) +static struct fd *pipe_end_get_fd( struct object *obj ) { - struct pipe_client *client = (struct pipe_client *) obj; - if (client->pipe_end.fd) - return (struct fd *) grab_object( client->pipe_end.fd ); - set_error( STATUS_PIPE_DISCONNECTED ); - return NULL; + struct pipe_end *pipe_end = (struct pipe_end *) obj; + return (struct fd *) grab_object( pipe_end->fd ); } static void set_server_state( struct pipe_server *server, enum pipe_state state ) @@ -341,27 +336,17 @@ static void set_server_state( struct pipe_server *server, enum pipe_state state { case ps_connected_server: case ps_wait_disconnect: - assert( server->pipe_end.fd ); break; case ps_wait_open: case ps_idle_server: - assert( !server->pipe_end.fd ); - set_no_fd_status( server->ioctl_fd, STATUS_PIPE_LISTENING ); + set_no_fd_status( server->pipe_end.fd, STATUS_PIPE_LISTENING ); break; case ps_wait_connect: - assert( !server->pipe_end.fd ); - set_no_fd_status( server->ioctl_fd, STATUS_PIPE_DISCONNECTED ); + set_no_fd_status( server->pipe_end.fd, STATUS_PIPE_DISCONNECTED ); break; } } -static struct fd *pipe_server_get_fd( struct object *obj ) -{ - struct pipe_server *server = (struct pipe_server *) obj; - - return (struct fd *)grab_object( server->pipe_end.fd ? server->pipe_end.fd : server->ioctl_fd ); -} - static void wake_message( struct pipe_message *message ) { @@ -411,19 +396,6 @@ static void pipe_end_disconnect( struct pipe_end *pipe_end, unsigned int status } } -static void do_disconnect( struct pipe_server *server ) -{ - /* we may only have a server fd, if the client disconnected */ - if (server->client) - { - assert( server->client->server == server ); - assert( server->client->pipe_end.fd ); - } - assert( server->pipe_end.fd ); - release_object( server->pipe_end.fd ); - server->pipe_end.fd = NULL; -} - static void pipe_end_destroy( struct pipe_end *pipe_end ) { struct pipe_message *message; @@ -437,6 +409,7 @@ static void pipe_end_destroy( struct pipe_end *pipe_end ) free_async_queue( &pipe_end->read_q ); free_async_queue( &pipe_end->write_q ); + if (pipe_end->fd) release_object( pipe_end->fd ); } static void pipe_server_destroy( struct object *obj) @@ -447,8 +420,6 @@ static void pipe_server_destroy( struct object *obj) pipe_end_disconnect( &server->pipe_end, STATUS_PIPE_BROKEN ); - if (server->pipe_end.fd) do_disconnect( server ); - pipe_end_destroy( &server->pipe_end ); if (server->client) { @@ -459,7 +430,6 @@ static void pipe_server_destroy( struct object *obj) assert( server->pipe->instances ); server->pipe->instances--; - if (server->ioctl_fd) release_object( server->ioctl_fd ); list_remove( &server->entry ); release_object( server->pipe ); } @@ -494,7 +464,6 @@ static void pipe_client_destroy( struct object *obj) } pipe_end_destroy( &client->pipe_end ); - if (client->pipe_end.fd) release_object( client->pipe_end.fd ); } static void named_pipe_device_dump( struct object *obj, int verbose ) @@ -849,7 +818,7 @@ static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *as { case ps_idle_server: case ps_wait_connect: - fd_queue_async( server->ioctl_fd, async, ASYNC_TYPE_WAIT ); + fd_queue_async( server->pipe_end.fd, async, ASYNC_TYPE_WAIT ); set_server_state( server, ps_wait_open ); async_wake_up( &server->pipe->waiters, STATUS_SUCCESS ); set_error( STATUS_PENDING ); @@ -871,11 +840,9 @@ static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *as { case ps_connected_server: assert( server->client ); - assert( server->client->pipe_end.fd ); /* dump the client and server fds - client loses all waiting data */ pipe_end_disconnect( &server->pipe_end, STATUS_PIPE_DISCONNECTED ); - do_disconnect( server ); server->client->server = NULL; server->client = NULL; set_server_state( server, ps_wait_connect ); @@ -883,7 +850,6 @@ static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *as case ps_wait_disconnect: assert( !server->client ); pipe_end_disconnect( &server->pipe_end, STATUS_PIPE_DISCONNECTED ); - do_disconnect( server ); set_server_state( server, ps_wait_connect ); break; case ps_idle_server: @@ -953,12 +919,12 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned list_add_head( &pipe->servers, &server->entry ); grab_object( pipe ); - if (!(server->ioctl_fd = alloc_pseudo_fd( &pipe_server_fd_ops, &server->pipe_end.obj, options ))) + if (!(server->pipe_end.fd = alloc_pseudo_fd( &pipe_server_fd_ops, &server->pipe_end.obj, options ))) { release_object( server ); return NULL; } - set_fd_signaled( server->ioctl_fd, 1 ); + set_fd_signaled( server->pipe_end.fd, 1 ); set_server_state( server, ps_idle_server ); return server; } @@ -1048,11 +1014,10 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc if ((client = create_pipe_client( options, pipe->flags, pipe->outsize, options ))) { - server->pipe_end.fd = (struct fd *)grab_object( server->ioctl_fd ); - set_no_fd_status( server->ioctl_fd, STATUS_BAD_DEVICE_TYPE ); + set_no_fd_status( server->pipe_end.fd, STATUS_BAD_DEVICE_TYPE ); allow_fd_caching( server->pipe_end.fd ); if (server->state == ps_wait_open) - fd_async_wake_up( server->ioctl_fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS ); + fd_async_wake_up( server->pipe_end.fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS ); set_server_state( server, ps_connected_server ); server->client = client; client->server = server;

1 0

Jacek Caban : ntdll: Remove no longer needed handling of FD_TYPE_PIPE.
by Alexandre Julliard 09 Oct '17

09 Oct '17

Module: wine Branch: master Commit: f449146ae3154d14150159f7f21cf9dbaf2ba6df URL: http://source.winehq.org/git/wine.git/?a=commit;h=f449146ae3154d14150159f7f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 9 14:28:56 2017 +0200 ntdll: Remove no longer needed handling of FD_TYPE_PIPE. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 35fd2c1..ca2afa0 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -711,7 +711,6 @@ static NTSTATUS get_io_timeouts( HANDLE handle, enum server_fd_type type, ULONG } break; case FD_TYPE_SOCKET: - case FD_TYPE_PIPE: case FD_TYPE_CHAR: if (is_read) timeouts->interval = 0; /* return as soon as we got something */ break; @@ -764,7 +763,6 @@ static NTSTATUS get_io_avail_mode( HANDLE handle, enum server_fd_type type, BOOL break; case FD_TYPE_MAILSLOT: case FD_TYPE_SOCKET: - case FD_TYPE_PIPE: case FD_TYPE_CHAR: *avail_mode = TRUE; break; @@ -1128,7 +1126,7 @@ static NTSTATUS FILE_AsyncWriteService( void *user, IO_STATUS_BLOCK *iosb, NTSTA &needs_close, &type, NULL ))) break; - if (!fileio->count && (type == FD_TYPE_MAILSLOT || type == FD_TYPE_PIPE || type == FD_TYPE_SOCKET)) + if (!fileio->count && (type == FD_TYPE_MAILSLOT || type == FD_TYPE_SOCKET)) result = send( fd, fileio->buffer, 0, 0 ); else result = write( fd, &fileio->buffer[fileio->already], fileio->count - fileio->already ); @@ -1308,7 +1306,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, for (;;) { /* zero-length writes on sockets may not work with plain write(2) */ - if (!length && (type == FD_TYPE_MAILSLOT || type == FD_TYPE_PIPE || type == FD_TYPE_SOCKET)) + if (!length && (type == FD_TYPE_MAILSLOT || type == FD_TYPE_SOCKET)) result = send( unix_handle, buffer, 0, 0 ); else result = write( unix_handle, (const char *)buffer + total, length - total );

1 0

Jacek Caban : jscript: Fixed visit_function_expression error handling.
by Alexandre Julliard 09 Oct '17

09 Oct '17

Module: wine Branch: master Commit: 8f89e142eca5b042ad915d90daaccd2d7e1a83aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f89e142eca5b042ad915d90d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 9 14:35:48 2017 +0200 jscript: Fixed visit_function_expression error handling. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index cbc360f..8691595 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1874,12 +1874,13 @@ static BOOL alloc_variable(compiler_ctx_t *ctx, const WCHAR *name) return alloc_local(ctx, ident, ctx->func->var_cnt++); } -static BOOL visit_function_expression(compiler_ctx_t *ctx, function_expression_t *expr) +static HRESULT visit_function_expression(compiler_ctx_t *ctx, function_expression_t *expr) { expr->func_id = ctx->func->func_cnt++; ctx->func_tail = ctx->func_tail ? (ctx->func_tail->next = expr) : (ctx->func_head = expr); - return !expr->identifier || expr->event_target || alloc_variable(ctx, expr->identifier); + return !expr->identifier || expr->event_target || alloc_variable(ctx, expr->identifier) + ? S_OK : E_OUTOFMEMORY; } static HRESULT visit_expression(compiler_ctx_t *ctx, expression_t *expr) @@ -1992,7 +1993,7 @@ static HRESULT visit_expression(compiler_ctx_t *ctx, expression_t *expr) break; } case EXPR_FUNC: - visit_function_expression(ctx, (function_expression_t*)expr); + hres = visit_function_expression(ctx, (function_expression_t*)expr); break; case EXPR_MEMBER: hres = visit_expression(ctx, ((member_expression_t*)expr)->expression);

1 0

Jacek Caban : mshtml/tests: Fixed typo in iface_cmp helper.
by Alexandre Julliard 09 Oct '17

09 Oct '17

Module: wine Branch: master Commit: becc92a814f0e9691c92d2dc1d30f8f71cafa6c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=becc92a814f0e9691c92d2dc1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 9 15:10:41 2017 +0200 mshtml/tests: Fixed typo in iface_cmp helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 5e2f8c7..ea2b6d0 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -159,7 +159,7 @@ static BOOL iface_cmp(IUnknown *iface1, IUnknown *iface2) IUnknown_QueryInterface(iface1, &IID_IUnknown, (void**)&unk1); IUnknown_Release(unk1); - IUnknown_QueryInterface(iface1, &IID_IUnknown, (void**)&unk2); + IUnknown_QueryInterface(iface2, &IID_IUnknown, (void**)&unk2); IUnknown_Release(unk2); return unk1 == unk2; @@ -407,7 +407,8 @@ static void _test_attached_event_args(unsigned line, DISPID id, WORD wFlags, DIS ok(V_DISPATCH(pdp->rgvarg) != NULL, "V_DISPATCH(pdp->rgvarg) = %p\n", V_DISPATCH(pdp->rgvarg)); event = _get_event_obj(line); - ok(iface_cmp((IUnknown*)event, (IUnknown*)V_DISPATCH(pdp->rgvarg)), "event != arg0\n"); + todo_wine + ok(!iface_cmp((IUnknown*)event, (IUnknown*)V_DISPATCH(pdp->rgvarg)), "event != arg0\n"); IHTMLEventObj_Release(event); } @@ -1376,7 +1377,8 @@ static void _test_cp_eventarg(unsigned line, REFIID riid, WORD flags, DISPPARAMS ok(V_DISPATCH(dp->rgvarg) != NULL, "V_DISPATCH(dp->rgvarg) = %p\n", V_DISPATCH(dp->rgvarg)); event = _get_event_obj(line); - ok(iface_cmp((IUnknown*)event, (IUnknown*)V_DISPATCH(dp->rgvarg)), "event != arg0\n"); + todo_wine + ok(!iface_cmp((IUnknown*)event, (IUnknown*)V_DISPATCH(dp->rgvarg)), "event != arg0\n"); IHTMLEventObj_Release(event); }

1 0

Jacek Caban : mshtml.idl: Added IDocumentEvent declaration.
by Alexandre Julliard 09 Oct '17

09 Oct '17

Module: wine Branch: master Commit: 4c412e4a44cc55227c03763d5438555e34e1e848 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c412e4a44cc55227c03763d5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 9 17:52:13 2017 +0200 mshtml.idl: Added IDocumentEvent declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 3 +++ include/mshtml.idl | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 5423216..22b3f20 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -3518,6 +3518,9 @@ #define DISPID_IDOMPROCESSINGINSTRUCTION_TARGET DISPID_PROCESSINGINSTRUCTION #define DISPID_IDOMPROCESSINGINSTRUCTION_DATA DISPID_PROCESSINGINSTRUCTION+1 +/* IDocumentEvent */ +#define DISPID_IDOCUMENTEVENT_CREATEEVENT DISPID_OMDOCUMENT+108 + /* IDocumentSelector */ #define DISPID_IDOCUMENTSELECTOR_QUERYSELECTOR DISPID_OMDOCUMENT+105 #define DISPID_IDOCUMENTSELECTOR_QUERYSELECTORALL DISPID_OMDOCUMENT+106 diff --git a/include/mshtml.idl b/include/mshtml.idl index b5cd1e9..45feb09 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -16019,6 +16019,21 @@ interface IHTMLDocument8 : IDispatch } /***************************************************************************** + * IDocumentEvent interface + */ +[ + odl, + oleautomation, + dual, + uuid(305104bc-98b5-11cf-bb82-00aa00bdce0b) +] +interface IDocumentEvent : IDispatch +{ + [id(DISPID_IDOCUMENTEVENT_CREATEEVENT)] + HRESULT createEvent([in] BSTR eventType, [out, retval] IDOMEvent **ppEvent); +} + +/***************************************************************************** * IDocumentSelector interface */ [ @@ -16667,6 +16682,7 @@ coclass HTMLDocument interface IHTMLDocument6; interface IHTMLDOMNode; interface IHTMLDOMNode2; + interface IDocumentEvent; } /*****************************************************************************

1 0

Alexandre Julliard : opengl32/tests: Fix wglCreatePbufferARB prototype.
by Alexandre Julliard 09 Oct '17

09 Oct '17

Module: wine Branch: master Commit: fd7fbc922afa2d347628faeaa2f353eefc27f74c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd7fbc922afa2d347628faeaa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 9 19:55:54 2017 +0200 opengl32/tests: Fix wglCreatePbufferARB prototype. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/tests/opengl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index fd68a99..dc15147 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -24,7 +24,7 @@ #include "wine/wgl.h" #define MAX_FORMATS 256 -typedef void* HPBUFFERARB; +DECLARE_HANDLE(HPBUFFERARB); /* WGL_ARB_create_context */ static HGLRC (WINAPI *pwglCreateContextAttribsARB)(HDC hDC, HGLRC hShareContext, const int *attribList); @@ -64,7 +64,7 @@ static BOOL (WINAPI *pwglGetPixelFormatAttribivARB)(HDC, int, int, UINT, const i /* WGL_ARB_pbuffer */ #define WGL_DRAW_TO_PBUFFER_ARB 0x202D -static HPBUFFERARB* (WINAPI *pwglCreatePbufferARB)(HDC, int, int, int, const int *); +static HPBUFFERARB (WINAPI *pwglCreatePbufferARB)(HDC, int, int, int, const int *); static HDC (WINAPI *pwglGetPbufferDCARB)(HPBUFFERARB); /* WGL_EXT_swap_control */

1 0

Alexandre Julliard : opengl32: Store GL extensions in a private XML file instead of Perl arrays.
by Alexandre Julliard 09 Oct '17

09 Oct '17

Module: wine Branch: master Commit: e8767bed3c7461a2dcbdeebb06e1ab16c7133a7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8767bed3c7461a2dcbdeebb0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 9 20:13:01 2017 +0200 opengl32: Store GL extensions in a private XML file instead of Perl arrays. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/make_opengl | 165 +----------------- dlls/opengl32/opengl_ext.c | 36 ++-- dlls/opengl32/opengl_norm.c | 44 ++--- dlls/opengl32/winegl.xml | 410 ++++++++++++++++++++++++++++++++++++++++++++ include/wine/wgl_driver.h | 44 ++--- 5 files changed, 480 insertions(+), 219 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e8767bed3c7461a2dcbde…

1 0

Akihiro Sagawa : d3d9: Return success in d3d9_device_SetMaximumFrameLatency().
by Alexandre Julliard 09 Oct '17

09 Oct '17

Module: wine Branch: master Commit: 7bdfb745ea22fe8417a6c9dfc981d0361c9be5a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bdfb745ea22fe8417a6c9dfc… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Oct 9 17:28:37 2017 +0200 d3d9: Return success in d3d9_device_SetMaximumFrameLatency(). Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index cd42cbc..50bba6b 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3548,9 +3548,12 @@ static HRESULT WINAPI d3d9_device_CheckResourceResidency(IDirect3DDevice9Ex *ifa static HRESULT WINAPI d3d9_device_SetMaximumFrameLatency(IDirect3DDevice9Ex *iface, UINT max_latency) { - FIXME("iface %p, max_latency %u stub!\n", iface, max_latency); + TRACE("iface %p, max_latency %u.\n", iface, max_latency); - return E_NOTIMPL; + if (max_latency) + FIXME("Ignoring max_latency %u.\n", max_latency); + + return S_OK; } static HRESULT WINAPI d3d9_device_GetMaximumFrameLatency(IDirect3DDevice9Ex *iface, UINT *max_latency)

1 0

Zebediah Figura : d3dcompiler: Fix a buffer size computation.
by Alexandre Julliard 09 Oct '17

09 Oct '17

Module: wine Branch: master Commit: 63d6dce04746237c1cb39c22914ed666c55178e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63d6dce04746237c1cb39c229… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 7 11:38:58 2017 -0500 d3dcompiler: Fix a buffer size computation. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index c5f66d6..c2c415f 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1151,7 +1151,7 @@ preproc_directive: PRE_LINE STRING hlsl_ctx.line_no = $1; if (strcmp($2, hlsl_ctx.source_file)) new_array = d3dcompiler_realloc(hlsl_ctx.source_files, - sizeof(*hlsl_ctx.source_files) * hlsl_ctx.source_files_count + 1); + sizeof(*hlsl_ctx.source_files) * (hlsl_ctx.source_files_count + 1)); if (new_array) {

1 0