July 2015 - Wine-Commits - list.winehq.org

Matteo Bruni : d3d9/tests: Add a test for UpdateTexture.
by Alexandre Julliard July 9, 2015

July 9, 2015

Module: wine Branch: master Commit: 76b1461d17bc8fa241eececda942c9d66c666dd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76b1461d17bc8fa241eececda… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jul 8 15:47:03 2015 +0200 d3d9/tests: Add a test for UpdateTexture. --- dlls/d3d9/tests/visual.c | 334 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 334 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=76b1461d17bc8fa241eec…

1 0

Jacek Caban : shdocvw: Call DisableThreadLibraryCalls in DllMain.
by Alexandre Julliard July 9, 2015

July 9, 2015

Module: wine Branch: master Commit: cf7a118a9e5922d819f216c21c3a0984c7bde5dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf7a118a9e5922d819f216c21… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 9 15:57:11 2015 +0200 shdocvw: Call DisableThreadLibraryCalls in DllMain. --- dlls/shdocvw/shdocvw_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 4ef2dd5..efeb08f 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -78,7 +78,7 @@ static HRESULT get_ieframe_object(REFCLSID rclsid, REFIID riid, void **ppv) */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) { - TRACE("\n"); + TRACE("(%s %s %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); if(IsEqualGUID(&CLSID_WebBrowser, rclsid) || IsEqualGUID(&CLSID_WebBrowser_V1, rclsid) @@ -146,7 +146,8 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) TRACE("%p 0x%x %p\n", hinst, fdwReason, fImpLoad); switch (fdwReason) { - case DLL_PROCESS_ATTACH: + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinst); break; case DLL_PROCESS_DETACH: if (fImpLoad) break;

1 0

Matteo Bruni : wined3d: Use the correct texture coordinates in swapchain_blit() in the non-glBlitFramebuffer, NP2 case.
by Alexandre Julliard July 9, 2015

July 9, 2015

Module: wine Branch: master Commit: 6521fc78be1b2e5fa51cca971788ba4862d3363e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6521fc78be1b2e5fa51cca971… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jul 8 15:47:00 2015 +0200 wined3d: Use the correct texture coordinates in swapchain_blit() in the non-glBlitFramebuffer, NP2 case. --- dlls/wined3d/swapchain.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 146f5d6..5a5ba6b 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -351,10 +351,10 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, if (backbuffer->container->flags & WINED3D_TEXTURE_NORMALIZED_COORDS) { - tex_left /= src_w; - tex_right /= src_w; - tex_top /= src_h; - tex_bottom /= src_h; + tex_left /= backbuffer->pow2Width; + tex_right /= backbuffer->pow2Width; + tex_top /= backbuffer->pow2Height; + tex_bottom /= backbuffer->pow2Height; } if (is_complex_fixup(backbuffer->resource.format->color_fixup))

1 0

Matteo Bruni : wined3d: Add a setting for the maximum OpenGL version to use.
by Alexandre Julliard July 9, 2015

July 9, 2015

Module: wine Branch: master Commit: a1e718ccabc7c330dd16c7face78022965b03e20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1e718ccabc7c330dd16c7fac… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jul 8 15:47:01 2015 +0200 wined3d: Add a setting for the maximum OpenGL version to use. --- dlls/wined3d/context.c | 52 +++++++++++++------ dlls/wined3d/directx.c | 113 +++++++++++++++++++++++++++++++---------- dlls/wined3d/wined3d_gl.h | 1 + dlls/wined3d/wined3d_main.c | 10 ++++ dlls/wined3d/wined3d_private.h | 7 ++- 5 files changed, 137 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a1e718ccabc7c330dd16c…

1 0

Alexandre Julliard : ntoskrnl: Implement creation and destruction of file objects.
by Alexandre Julliard July 9, 2015

July 9, 2015

Module: wine Branch: master Commit: 13499a3d115998ced8aaacb62900766174e99af2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13499a3d115998ced8aaacb62… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 8 18:56:01 2015 +0900 ntoskrnl: Implement creation and destruction of file objects. --- dlls/ntoskrnl.exe/ntoskrnl.c | 100 ++++++++++++++++++++++++++++++++++++++--- include/wine/server_protocol.h | 7 +-- server/device.c | 26 ++++++++++- server/protocol.def | 3 +- server/request.h | 5 ++- server/trace.c | 3 +- 6 files changed, 130 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=13499a3d115998ced8aaa…

1 0

Alexandre Julliard : server: Queue an IRP_MJ_CLOSE request on file destruction.
by Alexandre Julliard July 9, 2015

July 9, 2015

Module: wine Branch: master Commit: 350ee62ab4ea40904296dcf90cf052938ca4ae75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=350ee62ab4ea40904296dcf90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 8 18:05:04 2015 +0900 server: Queue an IRP_MJ_CLOSE request on file destruction. --- include/wine/server_protocol.h | 8 +++++++- server/device.c | 24 +++++++++++++++++++++++- server/protocol.def | 6 ++++++ server/trace.c | 5 +++++ 4 files changed, 41 insertions(+), 2 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 8f18035..9807dcc 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -645,6 +645,12 @@ typedef union struct { unsigned int major; + int __pad; + client_ptr_t device; + } close; + struct + { + unsigned int major; unsigned int key; client_ptr_t device; file_pos_t pos; @@ -6089,6 +6095,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 478 +#define SERVER_PROTOCOL_VERSION 479 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/device.c b/server/device.c index 021f11b..2bdf82a 100644 --- a/server/device.c +++ b/server/device.c @@ -170,6 +170,7 @@ struct device_file static void device_file_dump( struct object *obj, int verbose ); static struct fd *device_file_get_fd( struct object *obj ); +static int device_file_close_handle( struct object *obj, struct process *process, obj_handle_t handle ); static void device_file_destroy( struct object *obj ); static enum server_fd_type device_file_get_fd_type( struct fd *fd ); static obj_handle_t device_file_read( struct fd *fd, const async_data_t *async_data, int blocking, @@ -196,7 +197,7 @@ static const struct object_ops device_file_ops = default_set_sd, /* set_sd */ no_lookup_name, /* lookup_name */ no_open_file, /* open_file */ - no_close_handle, /* close_handle */ + device_file_close_handle, /* close_handle */ device_file_destroy /* destroy */ }; @@ -409,6 +410,27 @@ static struct fd *device_file_get_fd( struct object *obj ) return (struct fd *)grab_object( file->fd ); } +static int device_file_close_handle( struct object *obj, struct process *process, obj_handle_t handle ) +{ + struct device_file *file = (struct device_file *)obj; + + if (file->device->manager && obj->handle_count == 1) /* last handle */ + { + struct irp_call *irp; + irp_params_t params; + + params.close.major = IRP_MJ_CLOSE; + params.close.device = file->device->user_ptr; + + if ((irp = create_irp( file, &params, NULL, 0, 0 ))) + { + add_irp_to_queue( file, irp ); + release_object( irp ); + } + } + return 1; +} + static void device_file_destroy( struct object *obj ) { struct device_file *file = (struct device_file *)obj; diff --git a/server/protocol.def b/server/protocol.def index 5372c52..1578345 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -660,6 +660,12 @@ typedef union } create; struct { + unsigned int major; /* IRP_MJ_CLOSE */ + int __pad; + client_ptr_t device; /* opaque ptr for the device */ + } close; + struct + { unsigned int major; /* IRP_MJ_READ */ unsigned int key; /* driver key */ client_ptr_t device; /* opaque ptr for the device */ diff --git a/server/trace.c b/server/trace.c index 4c728ef..f24c368 100644 --- a/server/trace.c +++ b/server/trace.c @@ -322,6 +322,11 @@ static void dump_irp_params( const char *prefix, const irp_params_t *data ) dump_uint64( ",device=", &data->create.device ); fputc( '}', stderr ); break; + case IRP_MJ_CLOSE: + fprintf( stderr, "%s{major=CLOSE", prefix ); + dump_uint64( ",device=", &data->close.device ); + fputc( '}', stderr ); + break; case IRP_MJ_READ: fprintf( stderr, "%s{major=READ,key=%08x", prefix, data->read.key ); dump_uint64( ",pos=", &data->read.pos );

1 0

Alexandre Julliard : server: Queue an IRP_MJ_CREATE request on file creation.
by Alexandre Julliard July 9, 2015

July 9, 2015

Module: wine Branch: master Commit: b1fd5955c9a6de8444ec488db3957aef85c629ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1fd5955c9a6de8444ec488db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 8 17:55:14 2015 +0900 server: Queue an IRP_MJ_CREATE request on file creation. --- include/wine/server_protocol.h | 10 +++++- server/device.c | 74 ++++++++++++++++++++++++++++-------------- server/protocol.def | 8 +++++ server/trace.c | 9 +++++ 4 files changed, 75 insertions(+), 26 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 860b66f..8f18035 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -637,6 +637,14 @@ typedef union struct { unsigned int major; + unsigned int access; + unsigned int sharing; + unsigned int options; + client_ptr_t device; + } create; + struct + { + unsigned int major; unsigned int key; client_ptr_t device; file_pos_t pos; @@ -6081,6 +6089,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 477 +#define SERVER_PROTOCOL_VERSION 478 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/device.c b/server/device.c index 5dd3ae6..021f11b 100644 --- a/server/device.c +++ b/server/device.c @@ -335,31 +335,61 @@ static void device_destroy( struct object *obj ) if (device->manager) list_remove( &device->entry ); } +static void add_irp_to_queue( struct device_file *file, struct irp_call *irp ) +{ + struct device_manager *manager = file->device->manager; + + assert( manager ); + + grab_object( irp ); /* grab reference for queued irp */ + irp->thread = (struct thread *)grab_object( current ); + list_add_tail( &file->requests, &irp->dev_entry ); + list_add_tail( &manager->requests, &irp->mgr_entry ); + if (list_head( &manager->requests ) == &irp->mgr_entry) wake_up( &manager->obj, 0 ); /* first one */ +} + static struct object *device_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ) { struct device *device = (struct device *)obj; struct device_file *file; - if ((file = alloc_object( &device_file_ops ))) + if (!(file = alloc_object( &device_file_ops ))) return NULL; + + file->device = (struct device *)grab_object( device ); + list_init( &file->requests ); + list_add_tail( &device->files, &file->entry ); + if (device->unix_path) { - file->device = (struct device *)grab_object( device ); - list_init( &file->requests ); - list_add_tail( &device->files, &file->entry ); - if (device->unix_path) - { - mode_t mode = 0666; - access = file->obj.ops->map_access( &file->obj, access ); - file->fd = open_fd( NULL, device->unix_path, O_NONBLOCK | O_LARGEFILE, - &mode, access, sharing, options ); - if (file->fd) set_fd_user( file->fd, &device_file_fd_ops, &file->obj ); - } - else file->fd = alloc_pseudo_fd( &device_file_fd_ops, &file->obj, 0 ); + mode_t mode = 0666; + access = file->obj.ops->map_access( &file->obj, access ); + file->fd = open_fd( NULL, device->unix_path, O_NONBLOCK | O_LARGEFILE, + &mode, access, sharing, options ); + if (file->fd) set_fd_user( file->fd, &device_file_fd_ops, &file->obj ); + } + else file->fd = alloc_pseudo_fd( &device_file_fd_ops, &file->obj, 0 ); + + if (!file->fd) + { + release_object( file ); + return NULL; + } + + if (device->manager) + { + struct irp_call *irp; + irp_params_t params; + + params.create.major = IRP_MJ_CREATE; + params.create.access = access; + params.create.sharing = sharing; + params.create.options = options; + params.create.device = file->device->user_ptr; - if (!file->fd) + if ((irp = create_irp( file, &params, NULL, 0, 0 ))) { - release_object( file ); - file = NULL; + add_irp_to_queue( file, irp ); + release_object( irp ); } } return &file->obj; @@ -411,9 +441,6 @@ static obj_handle_t queue_irp( struct device_file *file, struct irp_call *irp, const async_data_t *async_data, int blocking ) { obj_handle_t handle = 0; - struct device_manager *manager = file->device->manager; - - assert( manager ); if (blocking && !(handle = alloc_handle( current->process, irp, SYNCHRONIZE, 0 ))) return 0; @@ -422,13 +449,8 @@ static obj_handle_t queue_irp( struct device_file *file, struct irp_call *irp, if (handle) close_handle( current->process, handle ); return 0; } - irp->thread = (struct thread *)grab_object( current ); irp->user_arg = async_data->arg; - grab_object( irp ); /* grab reference for queued irp */ - - list_add_tail( &file->requests, &irp->dev_entry ); - list_add_tail( &manager->requests, &irp->mgr_entry ); - if (list_head( &manager->requests ) == &irp->mgr_entry) wake_up( &manager->obj, 0 ); /* first one */ + add_irp_to_queue( file, irp ); set_error( STATUS_PENDING ); return handle; } @@ -683,6 +705,8 @@ DECL_HANDLER(get_next_device_request) struct device_manager *manager; struct list *ptr; + reply->params.major = IRP_MJ_MAXIMUM_FUNCTION + 1; + if (!(manager = (struct device_manager *)get_handle_obj( current->process, req->manager, 0, &device_manager_ops ))) return; diff --git a/server/protocol.def b/server/protocol.def index ab03f59..5372c52 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -652,6 +652,14 @@ typedef union unsigned int major; /* irp major function */ struct { + unsigned int major; /* IRP_MJ_CREATE */ + unsigned int access; /* access rights */ + unsigned int sharing; /* sharing flags */ + unsigned int options; /* file options */ + client_ptr_t device; /* opaque ptr for the device */ + } create; + struct + { unsigned int major; /* IRP_MJ_READ */ unsigned int key; /* driver key */ client_ptr_t device; /* opaque ptr for the device */ diff --git a/server/trace.c b/server/trace.c index 8857585..4c728ef 100644 --- a/server/trace.c +++ b/server/trace.c @@ -316,6 +316,12 @@ static void dump_irp_params( const char *prefix, const irp_params_t *data ) { switch (data->major) { + case IRP_MJ_CREATE: + fprintf( stderr, "%s{major=CREATE,access=%08x,sharing=%08x,options=%08x", + prefix, data->create.access, data->create.sharing, data->create.options ); + dump_uint64( ",device=", &data->create.device ); + fputc( '}', stderr ); + break; case IRP_MJ_READ: fprintf( stderr, "%s{major=READ,key=%08x", prefix, data->read.key ); dump_uint64( ",pos=", &data->read.pos ); @@ -339,6 +345,9 @@ static void dump_irp_params( const char *prefix, const irp_params_t *data ) dump_uint64( ",device=", &data->ioctl.device ); fputc( '}', stderr ); break; + case IRP_MJ_MAXIMUM_FUNCTION + 1: /* invalid */ + fprintf( stderr, "%s{}", prefix ); + break; default: fprintf( stderr, "%s{major=%u}", prefix, data->major ); break;

1 0

Alexandre Julliard : server: Pass the device client pointer as part of the IRP parameters.
by Alexandre Julliard July 9, 2015

July 9, 2015

Module: wine Branch: master Commit: d087ea6798d9dca4d974a21bb9acb70ae7dac4eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d087ea6798d9dca4d974a21bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 8 17:50:00 2015 +0900 server: Pass the device client pointer as part of the IRP parameters. --- dlls/ntoskrnl.exe/ntoskrnl.c | 41 ++++++++++++++++++++++++----------------- include/wine/server_protocol.h | 12 ++++++++++-- server/device.c | 23 +++++++++++++---------- server/protocol.def | 10 +++++++++- server/request.h | 5 ++--- server/trace.c | 10 +++++++--- tools/make_requests | 2 +- 7 files changed, 66 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d087ea6798d9dca4d974a…

1 0

Alexandre Julliard : server: Pass the file instead of the device pointer in all IRP requests.
by Alexandre Julliard July 9, 2015

July 9, 2015

Module: wine Branch: master Commit: bf2695019450deda848c450087cc4853809f9199 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf2695019450deda848c45008… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 8 19:04:32 2015 +0900 server: Pass the file instead of the device pointer in all IRP requests. --- dlls/ntoskrnl.exe/ntoskrnl.c | 56 ++++++++++++++++++++++++++++++------------ include/wine/server_protocol.h | 10 ++++---- server/device.c | 30 ++++++++++++---------- server/protocol.def | 8 +++--- server/trace.c | 8 +++--- 5 files changed, 70 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bf2695019450deda848c4…

1 0

Matteo Bruni : wined3d: Use GLSL 1.50 on core contexts.
by Alexandre Julliard July 9, 2015

July 9, 2015

Module: wine Branch: master Commit: 4c0b1a5038090555b09e26caa02e8f9b64f5e745 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c0b1a5038090555b09e26caa… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jul 8 15:47:02 2015 +0200 wined3d: Use GLSL 1.50 on core contexts. --- dlls/wined3d/glsl_shader.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2770ab9..3c92781 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -297,7 +297,9 @@ static const char *shader_glsl_get_prefix(enum wined3d_shader_type type) static const char *shader_glsl_get_version(const struct wined3d_gl_info *gl_info, const struct wined3d_shader_version *version) { - if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30) && version->major >= 4) + if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + return "#version 150"; + else if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30) && version && version->major >= 4) return "#version 130"; else return "#version 120"; @@ -5594,8 +5596,7 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct wined3d_string_buffe string_buffer_clear(buffer); - shader_addline(buffer, "#version 120\n"); - shader_addline(buffer, "\n"); + shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, NULL)); for (i = 0; i < WINED3D_FFP_ATTRIBS_COUNT; ++i) { @@ -6112,7 +6113,7 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * } lowest_disabled_stage = stage; - shader_addline(buffer, "#version 120\n"); + shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, NULL)); if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) shader_addline(buffer, "#extension GL_ARB_texture_rectangle : enable\n");

1 0