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

Alexandre Julliard : server: Don' t associate a thread to the MJ_CREATE and MJ_CLOSE requests.
by Alexandre Julliard 13 Jul '15

13 Jul '15

Module: wine Branch: master Commit: 9cef52ffd6a3d0c04b96ee44c36aa72e2c1c1537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cef52ffd6a3d0c04b96ee44c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 13 15:10:30 2015 +0900 server: Don't associate a thread to the MJ_CREATE and MJ_CLOSE requests. --- server/device.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/server/device.c b/server/device.c index e8ef832..e6dc15e 100644 --- a/server/device.c +++ b/server/device.c @@ -242,7 +242,7 @@ static void irp_call_destroy( struct object *obj ) release_object( irp->async ); } if (irp->file) release_object( irp->file ); - release_object( irp->thread ); + if (irp->thread) release_object( irp->thread ); } static struct irp_call *create_irp( struct device_file *file, const irp_params_t *params, @@ -337,14 +337,14 @@ 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 ) +static void add_irp_to_queue( struct device_file *file, struct irp_call *irp, struct thread *thread ) { struct device_manager *manager = file->device->manager; assert( manager ); grab_object( irp ); /* grab reference for queued irp */ - irp->thread = (struct thread *)grab_object( current ); + irp->thread = thread ? (struct thread *)grab_object( thread ) : NULL; 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 */ @@ -391,7 +391,7 @@ static struct object *device_open_file( struct object *obj, unsigned int access, if ((irp = create_irp( file, &params, NULL, 0, 0 ))) { - add_irp_to_queue( file, irp ); + add_irp_to_queue( file, irp, NULL ); release_object( irp ); } } @@ -426,7 +426,7 @@ static int device_file_close_handle( struct object *obj, struct process *process if ((irp = create_irp( file, &params, NULL, 0, 0 ))) { - add_irp_to_queue( file, irp ); + add_irp_to_queue( file, irp, NULL ); release_object( irp ); } } @@ -497,7 +497,7 @@ static obj_handle_t queue_irp( struct device_file *file, struct irp_call *irp, return 0; } irp->user_arg = async_data->arg; - add_irp_to_queue( file, irp ); + add_irp_to_queue( file, irp, current ); set_error( STATUS_PENDING ); return handle; } @@ -772,9 +772,12 @@ DECL_HANDLER(get_next_device_request) if ((ptr = list_head( &manager->requests ))) { irp = LIST_ENTRY( ptr, struct irp_call, mgr_entry ); + if (irp->thread) + { + reply->client_pid = get_process_id( irp->thread->process ); + reply->client_tid = get_thread_id( irp->thread ); + } reply->params = irp->params; - reply->client_pid = get_process_id( irp->thread->process ); - reply->client_tid = get_thread_id( irp->thread ); reply->in_size = irp->in_size; reply->out_size = irp->out_size; if (irp->in_size > get_reply_max_size()) set_error( STATUS_BUFFER_OVERFLOW );

1 0

Austin English : loader: Add HKLM\Software\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers registry key.
by Alexandre Julliard 13 Jul '15

13 Jul '15

Module: wine Branch: master Commit: 25247c5a34f4c569a5e0ba2aad5803fadf0ef02b URL: http://source.winehq.org/git/wine.git/?a=commit;h=25247c5a34f4c569a5e0ba2aa… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Jul 12 20:44:27 2015 -0500 loader: Add HKLM\Software\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers registry key. --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index b647c3b..315ef29 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -490,6 +490,7 @@ HKLM,%CurrentVersionNT%\Hotfix\Q246009,"Installed",,"1" HKLM,%CurrentVersionNT%\Image File Execution Options,,16 HKLM,%CurrentVersionNT%\Language Pack,,16 HKLM,%CurrentVersionNT%\NetworkCards,,16 +HKLM,%CurrentVersionNT%\OpenGLDrivers,,16 HKLM,%CurrentVersionNT%\Perflib,,16 HKLM,%CurrentVersionNT%\Ports,,16 HKLM,%CurrentVersionNT%\Print,,16

1 0

Matteo Bruni : wined3d: Make the core extensions enabling table-based.
by Alexandre Julliard 13 Jul '15

13 Jul '15

Module: wine Branch: master Commit: 6dc3ac2b04b7df6b84a96a9707ecf2081f3231bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dc3ac2b04b7df6b84a96a970… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jul 10 00:06:17 2015 +0200 wined3d: Make the core extensions enabling table-based. --- dlls/wined3d/directx.c | 54 +++++++++++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 42072e9..f045bb5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3342,6 +3342,19 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) /* Context activation is done by the caller. */ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) { + static const struct + { + enum wined3d_gl_extension extension; + DWORD min_gl_version; + } + core_extensions[] = + { + {EXT_TEXTURE3D, MAKEDWORD_VERSION(1, 2)}, + {EXT_BLEND_MINMAX, MAKEDWORD_VERSION(1, 4)}, + {EXT_BLEND_SUBTRACT, MAKEDWORD_VERSION(1, 4)}, + {NV_POINT_SPRITE, MAKEDWORD_VERSION(1, 4)}, + {ARB_TEXTURE_NON_POWER_OF_TWO, MAKEDWORD_VERSION(2, 0)}, + }; struct wined3d_driver_info *driver_info = &adapter->driver_info; const char *gl_vendor_str, *gl_renderer_str, *gl_version_str; struct wined3d_gl_info *gl_info = &adapter->gl_info; @@ -3354,7 +3367,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) enum wined3d_pci_device device; DWORD gl_version; HDC hdc; - unsigned int i; + unsigned int i, j; GLint context_profile = 0; TRACE("adapter %p.\n", adapter); @@ -3429,30 +3442,25 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) parse_extension_string(gl_info, WGL_Extensions, wgl_extension_map, sizeof(wgl_extension_map) / sizeof(*wgl_extension_map)); - if (!gl_info->supported[EXT_TEXTURE3D] && gl_version >= MAKEDWORD_VERSION(1, 2)) - { - TRACE("GL CORE: GL_EXT_texture3D support.\n"); - gl_info->supported[EXT_TEXTURE3D] = TRUE; - } - - if (!gl_info->supported[NV_POINT_SPRITE] && gl_version >= MAKEDWORD_VERSION(1, 4)) - { - TRACE("GL CORE: GL_NV_point_sprite support.\n"); - gl_info->supported[NV_POINT_SPRITE] = TRUE; - } - - if ((!gl_info->supported[EXT_BLEND_MINMAX] || !gl_info->supported[EXT_BLEND_SUBTRACT]) - && gl_version >= MAKEDWORD_VERSION(1, 4)) + for (i = 0; i < ARRAY_SIZE(core_extensions); ++i) { - TRACE("GL CORE: GL_EXT_blend_minmax / GL_EXT_blend_subtract support.\n"); - gl_info->supported[EXT_BLEND_MINMAX] = TRUE; - gl_info->supported[EXT_BLEND_SUBTRACT] = TRUE; - } + if (!gl_info->supported[core_extensions[i].extension] + && gl_version >= core_extensions[i].min_gl_version) + { + for (j = 0; j < ARRAY_SIZE(gl_extension_map); ++j) + if (gl_extension_map[j].extension == core_extensions[i].extension) + break; - if (!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] && gl_version >= MAKEDWORD_VERSION(2, 0)) - { - TRACE("GL CORE: GL_ARB_texture_non_power_of_two support.\n"); - gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] = TRUE; + if (j < ARRAY_SIZE(gl_extension_map)) + { + TRACE("GL CORE: %s support.\n", gl_extension_map[j].extension_string); + gl_info->supported[core_extensions[i].extension] = TRUE; + } + else + { + FIXME("GL extension %u not in the GL extensions map.\n", core_extensions[i].extension); + } + } } if (gl_info->supported[EXT_BLEND_MINMAX] || gl_info->supported[EXT_BLEND_SUBTRACT])

1 0

Matteo Bruni : wined3d: Add more entries to the core extensions table.
by Alexandre Julliard 13 Jul '15

13 Jul '15

Module: wine Branch: master Commit: 3c49a012c032759f015fca0594e8818040e26cf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c49a012c032759f015fca059… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jul 10 00:06:18 2015 +0200 wined3d: Add more entries to the core extensions table. --- dlls/wined3d/directx.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f045bb5..859da9d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3350,10 +3350,73 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) core_extensions[] = { {EXT_TEXTURE3D, MAKEDWORD_VERSION(1, 2)}, + {ARB_MULTISAMPLE, MAKEDWORD_VERSION(1, 3)}, + {ARB_MULTITEXTURE, MAKEDWORD_VERSION(1, 3)}, + {ARB_TEXTURE_BORDER_CLAMP, MAKEDWORD_VERSION(1, 3)}, + {ARB_TEXTURE_COMPRESSION, MAKEDWORD_VERSION(1, 3)}, + {ARB_TEXTURE_CUBE_MAP, MAKEDWORD_VERSION(1, 3)}, + {ARB_DEPTH_TEXTURE, MAKEDWORD_VERSION(1, 4)}, + {ARB_POINT_PARAMETERS, MAKEDWORD_VERSION(1, 4)}, + {ARB_SHADOW, MAKEDWORD_VERSION(1, 4)}, + {ARB_TEXTURE_MIRRORED_REPEAT, MAKEDWORD_VERSION(1, 4)}, + {EXT_BLEND_COLOR, MAKEDWORD_VERSION(1, 4)}, + {EXT_BLEND_FUNC_SEPARATE, MAKEDWORD_VERSION(1, 4)}, {EXT_BLEND_MINMAX, MAKEDWORD_VERSION(1, 4)}, {EXT_BLEND_SUBTRACT, MAKEDWORD_VERSION(1, 4)}, + {EXT_STENCIL_WRAP, MAKEDWORD_VERSION(1, 4)}, {NV_POINT_SPRITE, MAKEDWORD_VERSION(1, 4)}, + {ARB_OCCLUSION_QUERY, MAKEDWORD_VERSION(1, 5)}, + {ARB_VERTEX_BUFFER_OBJECT, MAKEDWORD_VERSION(1, 5)}, + {ARB_DRAW_BUFFERS, MAKEDWORD_VERSION(2, 0)}, + {ARB_FRAGMENT_SHADER, MAKEDWORD_VERSION(2, 0)}, + {ARB_SHADING_LANGUAGE_100, MAKEDWORD_VERSION(2, 0)}, {ARB_TEXTURE_NON_POWER_OF_TWO, MAKEDWORD_VERSION(2, 0)}, + {ARB_VERTEX_SHADER, MAKEDWORD_VERSION(2, 0)}, + {EXT_BLEND_EQUATION_SEPARATE, MAKEDWORD_VERSION(2, 0)}, + {ARB_PIXEL_BUFFER_OBJECT, MAKEDWORD_VERSION(2, 1)}, + {EXT_TEXTURE_SRGB, MAKEDWORD_VERSION(2, 1)}, + {ARB_COLOR_BUFFER_FLOAT, MAKEDWORD_VERSION(3, 0)}, + {ARB_DEPTH_BUFFER_FLOAT, MAKEDWORD_VERSION(3, 0)}, + {ARB_FRAMEBUFFER_OBJECT, MAKEDWORD_VERSION(3, 0)}, + {ARB_FRAMEBUFFER_SRGB, MAKEDWORD_VERSION(3, 0)}, + {ARB_HALF_FLOAT_PIXEL, MAKEDWORD_VERSION(3, 0)}, + {ARB_HALF_FLOAT_VERTEX, MAKEDWORD_VERSION(3, 0)}, + {ARB_MAP_BUFFER_RANGE, MAKEDWORD_VERSION(3, 0)}, + {ARB_TEXTURE_COMPRESSION_RGTC, MAKEDWORD_VERSION(3, 0)}, + {ARB_TEXTURE_FLOAT, MAKEDWORD_VERSION(3, 0)}, + {ARB_TEXTURE_RG, MAKEDWORD_VERSION(3, 0)}, + {EXT_DRAW_BUFFERS2, MAKEDWORD_VERSION(3, 0)}, + /* We don't want to enable EXT_GPU_SHADER4: even though similar + * functionality is available in core GL 3.0 / GLSL 1.30, it's different + * enough that reusing the same flag for the new features hurts more + * than it helps. */ + /* EXT_framebuffer_object, EXT_framebuffer_blit, + * EXT_framebuffer_multisample and EXT_packed_depth_stencil + * are integrated into ARB_framebuffer_object. */ + + {ARB_DRAW_INSTANCED, MAKEDWORD_VERSION(3, 1)}, + {ARB_UNIFORM_BUFFER_OBJECT, MAKEDWORD_VERSION(3, 1)}, + {EXT_TEXTURE_SNORM, MAKEDWORD_VERSION(3, 1)}, + /* We don't need or want GL_ARB_texture_rectangle (core in 3.1). */ + + {ARB_DRAW_ELEMENTS_BASE_VERTEX, MAKEDWORD_VERSION(3, 2)}, + /* ARB_geometry_shader4 exposes a somewhat different API compared to 3.2 + * core geometry shaders so it's not really correct to expose the + * extension for core-only support. */ + {ARB_PROVOKING_VERTEX, MAKEDWORD_VERSION(3, 2)}, + {ARB_SYNC, MAKEDWORD_VERSION(3, 2)}, + {ARB_VERTEX_ARRAY_BGRA, MAKEDWORD_VERSION(3, 2)}, + + {ARB_BLEND_FUNC_EXTENDED, MAKEDWORD_VERSION(3, 3)}, + {ARB_INSTANCED_ARRAYS, MAKEDWORD_VERSION(3, 3)}, + {ARB_SAMPLER_OBJECTS, MAKEDWORD_VERSION(3, 3)}, + {ARB_SHADER_BIT_ENCODING, MAKEDWORD_VERSION(3, 3)}, + {ARB_TIMER_QUERY, MAKEDWORD_VERSION(3, 3)}, + + {ARB_MAP_BUFFER_ALIGNMENT, MAKEDWORD_VERSION(4, 2)}, + + {ARB_DEBUG_OUTPUT, MAKEDWORD_VERSION(4, 3)}, + {ARB_INTERNALFORMAT_QUERY2, MAKEDWORD_VERSION(4, 3)}, }; struct wined3d_driver_info *driver_info = &adapter->driver_info; const char *gl_vendor_str, *gl_renderer_str, *gl_version_str;

1 0

Matteo Bruni : wined3d: Bind a VAO when using core profile contexts.
by Alexandre Julliard 13 Jul '15

13 Jul '15

Module: wine Branch: master Commit: a7315eb76aa29dd8ce03de8504f1bbc424bcb164 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7315eb76aa29dd8ce03de850… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jul 10 00:06:19 2015 +0200 wined3d: Bind a VAO when using core profile contexts. --- dlls/wined3d/context.c | 9 +++++++++ dlls/wined3d/directx.c | 12 ++++++++++++ 2 files changed, 21 insertions(+) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c74983e..2fef379 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1735,6 +1735,15 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ALIGNMENT, 1); checkGLcall("glPixelStorei(GL_UNPACK_ALIGNMENT, device->surface_alignment);"); + if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + { + GLuint vao; + + GL_EXTCALL(glGenVertexArrays(1, &vao)); + GL_EXTCALL(glBindVertexArray(vao)); + checkGLcall("creating VAO"); + } + if (gl_info->supported[ARB_VERTEX_BLEND]) { /* Direct3D always uses n-1 weights for n world matrices and uses diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 859da9d..61c3059 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2898,6 +2898,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glBeginQuery) /* OpenGL 1.5 */ USE_GL_FUNC(glBindAttribLocation) /* OpenGL 2.0 */ USE_GL_FUNC(glBindBuffer) /* OpenGL 1.5 */ + USE_GL_FUNC(glBindVertexArray) /* OpenGL 3.0 */ USE_GL_FUNC(glBlendColor) /* OpenGL 1.4 */ USE_GL_FUNC(glBlendEquation) /* OpenGL 1.4 */ USE_GL_FUNC(glBlendEquationSeparate) /* OpenGL 2.0 */ @@ -2916,6 +2917,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glDeleteProgram) /* OpenGL 2.0 */ USE_GL_FUNC(glDeleteQueries) /* OpenGL 1.5 */ USE_GL_FUNC(glDeleteShader) /* OpenGL 2.0 */ + USE_GL_FUNC(glDeleteVertexArrays) /* OpenGL 3.0 */ USE_GL_FUNC(glDetachShader) /* OpenGL 2.0 */ USE_GL_FUNC(glDisableVertexAttribArray) /* OpenGL 2.0 */ USE_GL_FUNC(glDrawArraysInstanced) /* OpenGL 3.1 */ @@ -2925,6 +2927,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glEndQuery) /* OpenGL 1.5 */ USE_GL_FUNC(glGenBuffers) /* OpenGL 1.5 */ USE_GL_FUNC(glGenQueries) /* OpenGL 1.5 */ + USE_GL_FUNC(glGenVertexArrays) /* OpenGL 3.0 */ USE_GL_FUNC(glGetActiveUniform) /* OpenGL 2.0 */ USE_GL_FUNC(glGetAttachedShaders) /* OpenGL 2.0 */ USE_GL_FUNC(glGetAttribLocation) /* OpenGL 2.0 */ @@ -3788,6 +3791,15 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) for (i = 0; i < gl_info->limits.buffers; ++i) adapter->d3d_info.valid_rt_mask |= (1 << i); + if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + { + GLuint vao; + + GL_EXTCALL(glGenVertexArrays(1, &vao)); + GL_EXTCALL(glBindVertexArray(vao)); + checkGLcall("creating VAO"); + } + fixup_extensions(gl_info, gl_renderer_str, gl_vendor, card_vendor, device); init_driver_info(driver_info, card_vendor, device); add_gl_compat_wrappers(gl_info);

1 0

Aaryaman Vasishta : d3drm: Move AddRef from device2->device3.
by Alexandre Julliard 13 Jul '15

13 Jul '15

Module: wine Branch: master Commit: ee6004ce0ce7cc92395a2bdf1607e1e42b1cd4c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee6004ce0ce7cc92395a2bdf1… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Sat Jul 11 18:28:42 2015 +0530 d3drm: Move AddRef from device2->device3. --- dlls/d3drm/device.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index c53abfc..f3f68fa 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -93,11 +93,8 @@ static HRESULT WINAPI d3drm_device2_QueryInterface(IDirect3DRMDevice2 *iface, RE static ULONG WINAPI d3drm_device2_AddRef(IDirect3DRMDevice2 *iface) { struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); - ULONG refcount = InterlockedIncrement(&device->ref); - - TRACE("%p increasing refcount to %u.\n", iface, refcount); - return refcount; + return IDirect3DRMDevice3_AddRef(&device->IDirect3DRMDevice3_iface); } static ULONG WINAPI d3drm_device2_Release(IDirect3DRMDevice2 *iface) @@ -452,8 +449,11 @@ static HRESULT WINAPI d3drm_device3_QueryInterface(IDirect3DRMDevice3 *iface, RE static ULONG WINAPI d3drm_device3_AddRef(IDirect3DRMDevice3 *iface) { struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface); + ULONG refcount = InterlockedIncrement(&device->ref); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); - return d3drm_device2_AddRef(&device->IDirect3DRMDevice2_iface); + return refcount; } static ULONG WINAPI d3drm_device3_Release(IDirect3DRMDevice3 *iface) @@ -865,7 +865,7 @@ static ULONG WINAPI d3drm_device_win_AddRef(IDirect3DRMWinDevice *iface) { struct d3drm_device *device = impl_from_IDirect3DRMWinDevice(iface); - return d3drm_device2_AddRef(&device->IDirect3DRMDevice2_iface); + return d3drm_device3_AddRef(&device->IDirect3DRMDevice3_iface); } static ULONG WINAPI d3drm_device_win_Release(IDirect3DRMWinDevice *iface)

1 0

Aaryaman Vasishta : d3drm: Move Release from device2->device3.
by Alexandre Julliard 13 Jul '15

13 Jul '15

Module: wine Branch: master Commit: 0339e57f321240d98e6d30390fe319901de362ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=0339e57f321240d98e6d30390… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Sat Jul 11 18:28:43 2015 +0530 d3drm: Move Release from device2->device3. --- dlls/d3drm/device.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index f3f68fa..0e41855 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -100,14 +100,8 @@ static ULONG WINAPI d3drm_device2_AddRef(IDirect3DRMDevice2 *iface) static ULONG WINAPI d3drm_device2_Release(IDirect3DRMDevice2 *iface) { struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); - ULONG refcount = InterlockedDecrement(&device->ref); - - TRACE("%p decreasing refcount to %u.\n", iface, refcount); - if (!refcount) - HeapFree(GetProcessHeap(), 0, device); - - return refcount; + return IDirect3DRMDevice3_Release(&device->IDirect3DRMDevice3_iface); } static HRESULT WINAPI d3drm_device2_Clone(IDirect3DRMDevice2 *iface, @@ -459,8 +453,14 @@ static ULONG WINAPI d3drm_device3_AddRef(IDirect3DRMDevice3 *iface) static ULONG WINAPI d3drm_device3_Release(IDirect3DRMDevice3 *iface) { struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface); + ULONG refcount = InterlockedDecrement(&device->ref); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); - return d3drm_device2_Release(&device->IDirect3DRMDevice2_iface); + if (!refcount) + HeapFree(GetProcessHeap(), 0, device); + + return refcount; } static HRESULT WINAPI d3drm_device3_Clone(IDirect3DRMDevice3 *iface, @@ -872,7 +872,7 @@ static ULONG WINAPI d3drm_device_win_Release(IDirect3DRMWinDevice *iface) { struct d3drm_device *device = impl_from_IDirect3DRMWinDevice(iface); - return d3drm_device2_Release(&device->IDirect3DRMDevice2_iface); + return d3drm_device3_Release(&device->IDirect3DRMDevice3_iface); } static HRESULT WINAPI d3drm_device_win_Clone(IDirect3DRMWinDevice *iface,

1 0

Aaryaman Vasishta : d3drm: Move QueryInterface from device2->device3.
by Alexandre Julliard 13 Jul '15

13 Jul '15

Module: wine Branch: master Commit: 8184f5f68fe584964bedec60abf38fea63c6e5a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8184f5f68fe584964bedec60a… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Sat Jul 11 18:28:44 2015 +0530 d3drm: Move QueryInterface from device2->device3. --- dlls/d3drm/device.c | 54 ++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 0e41855..4bea11c 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -63,31 +63,7 @@ static HRESULT WINAPI d3drm_device2_QueryInterface(IDirect3DRMDevice2 *iface, RE { struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); - TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - - if (IsEqualGUID(riid, &IID_IDirect3DRMDevice2) - || IsEqualGUID(riid, &IID_IDirect3DRMDevice) - || IsEqualGUID(riid, &IID_IUnknown)) - { - *out = &device->IDirect3DRMDevice2_iface; - } - else if (IsEqualGUID(riid, &IID_IDirect3DRMDevice3)) - { - *out = &device->IDirect3DRMDevice3_iface; - } - else if (IsEqualGUID(riid, &IID_IDirect3DRMWinDevice)) - { - *out = &device->IDirect3DRMWinDevice_iface; - } - else - { - *out = NULL; - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown *)*out); - return S_OK; + return IDirect3DRMDevice3_QueryInterface(&device->IDirect3DRMDevice3_iface, riid, out); } static ULONG WINAPI d3drm_device2_AddRef(IDirect3DRMDevice2 *iface) @@ -437,7 +413,31 @@ static HRESULT WINAPI d3drm_device3_QueryInterface(IDirect3DRMDevice3 *iface, RE { struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface); - return d3drm_device2_QueryInterface(&device->IDirect3DRMDevice2_iface, riid, out); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); + + if (IsEqualGUID(riid, &IID_IDirect3DRMDevice2) + || IsEqualGUID(riid, &IID_IDirect3DRMDevice) + || IsEqualGUID(riid, &IID_IUnknown)) + { + *out = &device->IDirect3DRMDevice2_iface; + } + else if (IsEqualGUID(riid, &IID_IDirect3DRMDevice3)) + { + *out = &device->IDirect3DRMDevice3_iface; + } + else if (IsEqualGUID(riid, &IID_IDirect3DRMWinDevice)) + { + *out = &device->IDirect3DRMWinDevice_iface; + } + else + { + *out = NULL; + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; } static ULONG WINAPI d3drm_device3_AddRef(IDirect3DRMDevice3 *iface) @@ -858,7 +858,7 @@ static HRESULT WINAPI d3drm_device_win_QueryInterface(IDirect3DRMWinDevice *ifac { struct d3drm_device *device = impl_from_IDirect3DRMWinDevice(iface); - return d3drm_device2_QueryInterface(&device->IDirect3DRMDevice2_iface, riid, out); + return d3drm_device3_QueryInterface(&device->IDirect3DRMDevice3_iface, riid, out); } static ULONG WINAPI d3drm_device_win_AddRef(IDirect3DRMWinDevice *iface)

1 0

Dmitry Timoshkov : kernel32: Fix compilation of loader tests with PSDK.
by Alexandre Julliard 13 Jul '15

13 Jul '15

Module: wine Branch: master Commit: edc0fa74a3c38b628316a7613e9d54b024e44732 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edc0fa74a3c38b628316a7613… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 13 14:17:26 2015 +0800 kernel32: Fix compilation of loader tests with PSDK. --- dlls/kernel32/tests/loader.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 0f9ac38..abd17df 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -68,6 +68,7 @@ static void (WINAPI *pRtlReleasePebLock)(void); static PVOID (WINAPI *pResolveDelayLoadedAPI)(PVOID, PCIMAGE_DELAYLOAD_DESCRIPTOR, PDELAYLOAD_FAILURE_DLL_CALLBACK, PVOID, PIMAGE_THUNK_DATA ThunkAddress,ULONG); +static PVOID (WINAPI *pRtlImageDirectoryEntryToData)(HMODULE,BOOL,WORD,ULONG *); static PVOID RVAToAddr(DWORD_PTR rva, HMODULE module) { @@ -2703,7 +2704,7 @@ static void test_ResolveDelayLoadedAPI(void) return; } - delaydir = RtlImageDirectoryEntryToData(hlib, TRUE, IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT, &file_size); + delaydir = pRtlImageDirectoryEntryToData(hlib, TRUE, IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT, &file_size); if (!delaydir) { skip("haven't found section for delay import directory.\n"); @@ -2783,6 +2784,7 @@ START_TEST(loader) pLdrUnlockLoaderLock = (void *)GetProcAddress(ntdll, "LdrUnlockLoaderLock"); pRtlAcquirePebLock = (void *)GetProcAddress(ntdll, "RtlAcquirePebLock"); pRtlReleasePebLock = (void *)GetProcAddress(ntdll, "RtlReleasePebLock"); + pRtlImageDirectoryEntryToData = (void *)GetProcAddress(ntdll, "RtlImageDirectoryEntryToData"); pResolveDelayLoadedAPI = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "ResolveDelayLoadedAPI"); GetSystemInfo( &si );

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.47
by Jeremy Newman 13 Jul '15

13 Jul '15

Module: website Branch: master Commit: c7bf4fa886f88b2aaeb1e6d63e88cc9950588c21 URL: http://source.winehq.org/git/website.git/?a=commit;h=c7bf4fa886f88b2aaeb1e6… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Jul 10 16:59:09 2015 +0200 Polish translation for release 1.7.47 --- news/pl/2015071001.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/pl/2015071001.xml b/news/pl/2015071001.xml new file mode 100644 index 0000000..46d796a --- /dev/null +++ b/news/pl/2015071001.xml @@ -0,0 +1,17 @@ +<news> +<date>Lipiec 10, 2015</date> +<title>Wydano Wine 1.7.47</title> +<body> + Wydanie rozwojowe Wine 1.7.47 jest już dostępne. + <a href="{$root}/announce/1.7.47">Co nowego</a> w tym wydaniu: +<ul> + <li>Rysowanie tekstu w Direct2D.</li> + <li>Obsługa API nowego zasobnika wątków.</li> + <li>Zachowywanie stanu paska narzędzi.</li> + <li>Początki implementacji właściwej obsługi HID.</li> + <li>Obsługa obiektów plikowych w sterownikach urządzeń.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.47.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0