March 2016 - Wine-Commits - list.winehq.org

Sebastian Lackner : services: Remove pipe argument from service_send_command function.
by Alexandre Julliard March 2, 2016

March 2, 2016

Module: wine Branch: master Commit: 0819c739ec3fe0eb7fc6ffec5ae6567a30e33f72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0819c739ec3fe0eb7fc6ffec5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 2 07:19:36 2016 +0100 services: Remove pipe argument from service_send_command function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 18 ++++++++---------- programs/services/services.c | 2 +- programs/services/services.h | 3 +-- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 0b194cf..5c25a2e 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -992,15 +992,14 @@ static BOOL service_accepts_control(const struct service_entry *service, DWORD d /****************************************************************************** * service_send_command */ -BOOL service_send_command( struct service_entry *service, HANDLE pipe, - const void *data, DWORD size, DWORD *result ) +BOOL service_send_command( struct service_entry *service, const void *data, DWORD size, DWORD *result ) { OVERLAPPED overlapped; DWORD count, ret; BOOL r; overlapped.hEvent = service->overlapped_event; - r = WriteFile(pipe, data, size, &count, &overlapped); + r = WriteFile(service->control_pipe, data, size, &count, &overlapped); if (!r && GetLastError() == ERROR_IO_PENDING) { ret = WaitForSingleObject( service->overlapped_event, service_pipe_timeout ); @@ -1010,7 +1009,7 @@ BOOL service_send_command( struct service_entry *service, HANDLE pipe, *result = ERROR_SERVICE_REQUEST_TIMEOUT; return FALSE; } - r = GetOverlappedResult( pipe, &overlapped, &count, FALSE ); + r = GetOverlappedResult(service->control_pipe, &overlapped, &count, FALSE); } if (!r || count != size) { @@ -1018,7 +1017,7 @@ BOOL service_send_command( struct service_entry *service, HANDLE pipe, *result = (!r ? GetLastError() : ERROR_WRITE_FAULT); return FALSE; } - r = ReadFile(pipe, result, sizeof *result, &count, &overlapped); + r = ReadFile(service->control_pipe, result, sizeof *result, &count, &overlapped); if (!r && GetLastError() == ERROR_IO_PENDING) { ret = WaitForSingleObject( service->overlapped_event, service_pipe_timeout ); @@ -1028,7 +1027,7 @@ BOOL service_send_command( struct service_entry *service, HANDLE pipe, *result = ERROR_SERVICE_REQUEST_TIMEOUT; return FALSE; } - r = GetOverlappedResult( pipe, &overlapped, &count, FALSE ); + r = GetOverlappedResult(service->control_pipe, &overlapped, &count, FALSE); } if (!r || count != sizeof *result) { @@ -1045,7 +1044,7 @@ BOOL service_send_command( struct service_entry *service, HANDLE pipe, /****************************************************************************** * service_send_control */ -static BOOL service_send_control(struct service_entry *service, HANDLE pipe, DWORD dwControl, DWORD *result) +static BOOL service_send_control(struct service_entry *service, DWORD dwControl, DWORD *result) { service_start_info *ssi; DWORD len; @@ -1061,7 +1060,7 @@ static BOOL service_send_control(struct service_entry *service, HANDLE pipe, DWO ssi->name_size = strlenW(service->name) + 1; strcpyW( ssi->data, service->name ); - r = service_send_command( service, pipe, ssi, ssi->total_size, result ); + r = service_send_command( service, ssi, ssi->total_size, result ); HeapFree( GetProcessHeap(), 0, ssi ); return r; } @@ -1182,8 +1181,7 @@ DWORD __cdecl svcctl_ControlService( ret = WaitForSingleObject(control_mutex, 30000); if (ret == WAIT_OBJECT_0) { - service_send_control(service->service_entry, service->service_entry->control_pipe, - dwControl, &result); + service_send_control(service->service_entry, dwControl, &result); if (lpServiceStatus) { diff --git a/programs/services/services.c b/programs/services/services.c index 8489f17..a53d68f 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -834,7 +834,7 @@ static BOOL service_send_start_message(struct service_entry *service, HANDLE pro } *p=0; - r = service_send_command( service, service->control_pipe, ssi, ssi->total_size, &result ); + r = service_send_command( service, ssi, ssi->total_size, &result ); if (r && result) { SetLastError(result); diff --git a/programs/services/services.h b/programs/services/services.h index 9090542..bf4ce89 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -80,8 +80,7 @@ void service_lock_exclusive(struct service_entry *service); void service_unlock(struct service_entry *service); DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR *service_argv); void service_terminate(struct service_entry *service); -BOOL service_send_command( struct service_entry *service, HANDLE pipe, - const void *data, DWORD size, DWORD *result ); +BOOL service_send_command( struct service_entry *service, const void *data, DWORD size, DWORD *result ); extern HANDLE g_hStartedEvent;

1 0

Charles Davis : winemac.drv: Fix our handling of bitmaps on the clipboard.
by Alexandre Julliard March 2, 2016

March 2, 2016

Module: wine Branch: master Commit: 9a18a62fb22d57092e6279e79ddb7e119088d47d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a18a62fb22d57092e6279e79… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Fri Feb 26 02:55:28 2016 -0700 winemac.drv: Fix our handling of bitmaps on the clipboard. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 87 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 76 insertions(+), 11 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 97fa80e..188d4e2 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -73,6 +73,7 @@ typedef struct _WINE_CLIPFORMAT static HANDLE import_clipboard_data(CFDataRef data); static HANDLE import_bmp_to_bitmap(CFDataRef data); static HANDLE import_bmp_to_dib(CFDataRef data); +static HANDLE import_dib_to_bitmap(CFDataRef data); static HANDLE import_enhmetafile(CFDataRef data); static HANDLE import_enhmetafile_to_metafilepict(CFDataRef data); static HANDLE import_metafilepict(CFDataRef data); @@ -93,6 +94,7 @@ static HANDLE import_utf16_to_unicodetext(CFDataRef data); static CFDataRef export_clipboard_data(HANDLE data); static CFDataRef export_bitmap_to_bmp(HANDLE data); +static CFDataRef export_bitmap_to_dib(HANDLE data); static CFDataRef export_dib_to_bmp(HANDLE data); static CFDataRef export_enhmetafile(HANDLE data); static CFDataRef export_hdrop_to_filenames(HANDLE data); @@ -158,7 +160,6 @@ static const struct BOOL synthesized; } builtin_format_ids[] = { - { CF_DIBV5, CFSTR("org.winehq.builtin.dibv5"), import_clipboard_data, export_clipboard_data, FALSE }, { CF_DIF, CFSTR("org.winehq.builtin.dif"), import_clipboard_data, export_clipboard_data, FALSE }, { CF_DSPBITMAP, CFSTR("org.winehq.builtin.dspbitmap"), import_clipboard_data, export_clipboard_data, FALSE }, { CF_DSPENHMETAFILE, CFSTR("org.winehq.builtin.dspenhmetafile"), import_clipboard_data, export_clipboard_data, FALSE }, @@ -193,11 +194,21 @@ static const struct { CF_OEMTEXT, CFSTR("public.utf16-plain-text"), import_utf16_to_oemtext, export_oemtext_to_utf16, TRUE }, { CF_UNICODETEXT, CFSTR("public.utf16-plain-text"), import_utf16_to_unicodetext, export_unicodetext_to_utf16,TRUE }, + { CF_BITMAP, CFSTR("org.winehq.builtin.bitmap"), import_bmp_to_bitmap, export_bitmap_to_bmp, FALSE }, + { CF_DIB, CFSTR("org.winehq.builtin.bitmap"), import_bmp_to_dib, export_dib_to_bmp, TRUE }, + { CF_DIBV5, CFSTR("org.winehq.builtin.bitmap"), import_bmp_to_dib, export_dib_to_bmp, TRUE }, + { CF_DIB, CFSTR("org.winehq.builtin.dib"), import_clipboard_data, export_clipboard_data, FALSE }, - { CF_DIB, CFSTR("com.microsoft.bmp"), import_bmp_to_dib, export_dib_to_bmp, TRUE }, + { CF_BITMAP, CFSTR("org.winehq.builtin.dib"), import_dib_to_bitmap, export_bitmap_to_dib, TRUE }, + { CF_DIBV5, CFSTR("org.winehq.builtin.dib"), import_clipboard_data, export_clipboard_data, TRUE }, + + { CF_DIBV5, CFSTR("org.winehq.builtin.dibv5"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_BITMAP, CFSTR("org.winehq.builtin.dibv5"), import_dib_to_bitmap, export_bitmap_to_dib, TRUE }, + { CF_DIB, CFSTR("org.winehq.builtin.dibv5"), import_clipboard_data, export_clipboard_data, TRUE }, - { CF_BITMAP, CFSTR("org.winehq.builtin.bitmap"), import_bmp_to_bitmap, export_bitmap_to_bmp, FALSE }, { CF_BITMAP, CFSTR("com.microsoft.bmp"), import_bmp_to_bitmap, export_bitmap_to_bmp, TRUE }, + { CF_DIB, CFSTR("com.microsoft.bmp"), import_bmp_to_dib, export_dib_to_bmp, TRUE }, + { CF_DIBV5, CFSTR("com.microsoft.bmp"), import_bmp_to_dib, export_dib_to_bmp, TRUE }, { CF_HDROP, CFSTR("org.winehq.builtin.hdrop"), import_clipboard_data, export_clipboard_data, FALSE }, { CF_HDROP, CFSTR("NSFilenamesPboardType"), import_nsfilenames_to_hdrop, export_hdrop_to_filenames, TRUE }, @@ -640,14 +651,13 @@ static HANDLE import_clipboard_data(CFDataRef data) /************************************************************************** - * import_bmp_to_bitmap + * create_bitmap_from_dib * - * Import BMP data, converting to CF_BITMAP format. + * Given a packed DIB, creates a bitmap object from it. */ -static HANDLE import_bmp_to_bitmap(CFDataRef data) +static HANDLE create_bitmap_from_dib(HANDLE dib) { HANDLE ret = 0; - HANDLE dib = import_bmp_to_dib(data); BITMAPINFO *bmi; if (dib && (bmi = GlobalLock(dib))) @@ -666,6 +676,22 @@ static HANDLE import_bmp_to_bitmap(CFDataRef data) ReleaseDC(NULL, hdc); } + return ret; +} + + +/************************************************************************** + * import_bmp_to_bitmap + * + * Import BMP data, converting to CF_BITMAP format. + */ +static HANDLE import_bmp_to_bitmap(CFDataRef data) +{ + HANDLE ret; + HANDLE dib = import_bmp_to_dib(data); + + ret = create_bitmap_from_dib(dib); + GlobalFree(dib); return ret; } @@ -674,8 +700,8 @@ static HANDLE import_bmp_to_bitmap(CFDataRef data) /************************************************************************** * import_bmp_to_dib * - * Import BMP data, converting to CF_DIB format. This just entails - * stripping the BMP file format header. + * Import BMP data, converting to CF_DIB or CF_DIBV5 format. This just + * entails stripping the BMP file format header. */ static HANDLE import_bmp_to_dib(CFDataRef data) { @@ -706,6 +732,24 @@ static HANDLE import_bmp_to_dib(CFDataRef data) /************************************************************************** + * import_dib_to_bitmap + * + * Import device-independent bitmap data, converting to CF_BITMAP format. + */ +static HANDLE import_dib_to_bitmap(CFDataRef data) +{ + HANDLE ret; + HANDLE dib = import_clipboard_data(data); + + ret = create_bitmap_from_dib(dib); + + GlobalFree(dib); + + return ret; +} + + +/************************************************************************** * import_enhmetafile * * Import enhanced metafile data, converting it to CF_ENHMETAFILE. @@ -1198,6 +1242,27 @@ static CFDataRef export_bitmap_to_bmp(HANDLE data) /************************************************************************** + * export_bitmap_to_dib + * + * Export CF_BITMAP to a raw packed device-independent bitmap. + */ +static CFDataRef export_bitmap_to_dib(HANDLE data) +{ + CFDataRef ret = NULL; + HGLOBAL dib; + + dib = create_dib_from_bitmap(data); + if (dib) + { + ret = export_clipboard_data(dib); + GlobalFree(dib); + } + + return ret; +} + + +/************************************************************************** * export_codepage_to_utf8 * * Export string data in a specified codepage to UTF-8. @@ -1248,8 +1313,8 @@ static CFDataRef export_codepage_to_utf16(HANDLE data, UINT cp) /************************************************************************** * export_dib_to_bmp * - * Export CF_DIB to BMP file format. This just entails prepending a BMP - * file format header to the data. + * Export CF_DIB or CF_DIBV5 to BMP file format. This just entails + * prepending a BMP file format header to the data. */ static CFDataRef export_dib_to_bmp(HANDLE data) {

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard March 2, 2016

March 2, 2016

Module: wine Branch: master Commit: 16fcbe558226c1ea986e52dbc1c4e36bd955dd83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16fcbe558226c1ea986e52dbc… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Mar 1 22:45:28 2016 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index f07344b..5d70814 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-02-11 08:10+0300\n" +"PO-Revision-Date: 2016-03-01 22:44+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -11635,10 +11635,8 @@ msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Ar tikrai norite pašalinti registro raktą „%1“?" #: reg.rc:52 -#, fuzzy -#| msgid "reg: The option [/d] must be followed by a valid integer\n" msgid "reg: The option [/d] must be followed by a valid string\n" -msgstr "reg: Už parametro [/d] privalo būti tinkamas sveikasis skaičius\n" +msgstr "reg: Už parametro [/d] privalo būti tinkama eilutė\n" #: regedit.rc:34 msgid "&Registry"

1 0

Stefan Dösinger : wined3d: Get rid of wined3d_surface_ops.surface_unmap().
by Alexandre Julliard March 2, 2016

March 2, 2016

Module: wine Branch: master Commit: a7316e1927a847e65494caa9fc892e724b81f48b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7316e1927a847e65494caa9f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 1 19:31:49 2016 +0100 wined3d: Get rid of wined3d_surface_ops.surface_unmap(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 101 +++++++++++++++-------------------------- dlls/wined3d/swapchain.c | 30 +++++++++--- dlls/wined3d/wined3d_private.h | 4 +- 3 files changed, 60 insertions(+), 75 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1acc3b6..01095e9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -672,55 +672,6 @@ static HRESULT surface_private_setup(struct wined3d_surface *surface) return WINED3D_OK; } -static void surface_unmap(struct wined3d_surface *surface) -{ - struct wined3d_device *device = surface->resource.device; - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; - struct wined3d_texture *texture; - - TRACE("surface %p.\n", surface); - - switch (surface->resource.map_binding) - { - case WINED3D_LOCATION_SYSMEM: - case WINED3D_LOCATION_USER_MEMORY: - case WINED3D_LOCATION_DIB: - break; - - case WINED3D_LOCATION_BUFFER: - context = context_acquire(device, NULL); - gl_info = context->gl_info; - - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, surface->pbo)); - GL_EXTCALL(glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER)); - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); - checkGLcall("glUnmapBuffer"); - context_release(context); - break; - - default: - ERR("Unexpected map binding %s.\n", wined3d_debug_location(surface->resource.map_binding)); - } - - if (surface->locations & (WINED3D_LOCATION_DRAWABLE | WINED3D_LOCATION_TEXTURE_RGB)) - { - TRACE("Not dirtified, nothing to do.\n"); - return; - } - - texture = surface->container; - if (texture->swapchain && texture->swapchain->front_buffer == texture) - { - context = context_acquire(device, surface); - surface_load_location(surface, context, texture->resource.draw_binding); - context_release(context); - memset(&texture->swapchain->front_buffer_update, 0, sizeof(texture->swapchain->front_buffer_update)); - } - else if (texture->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) - FIXME("Depth / stencil buffer locking is not implemented.\n"); -} - static BOOL surface_is_full_rect(const struct wined3d_surface *surface, const RECT *r) { if ((r->left && r->right) || abs(r->right - r->left) != surface->resource.width) @@ -1215,7 +1166,6 @@ static const struct wined3d_resource_ops surface_resource_ops = static const struct wined3d_surface_ops surface_ops = { surface_private_setup, - surface_unmap, }; /***************************************************************************** @@ -1259,23 +1209,9 @@ static HRESULT gdi_surface_private_setup(struct wined3d_surface *surface) return WINED3D_OK; } -static void gdi_surface_unmap(struct wined3d_surface *surface) -{ - struct wined3d_texture *texture = surface->container; - - TRACE("surface %p.\n", surface); - - /* Tell the swapchain to update the screen. */ - if (texture->swapchain && texture == texture->swapchain->front_buffer) - x11_copy_to_screen(texture->swapchain, &texture->swapchain->front_buffer_update); - - memset(&texture->swapchain->front_buffer_update, 0, sizeof(texture->swapchain->front_buffer_update)); -} - static const struct wined3d_surface_ops gdi_surface_ops = { gdi_surface_private_setup, - gdi_surface_unmap, }; /* This call just downloads data, the caller is responsible for binding the @@ -2239,6 +2175,11 @@ do { \ HRESULT wined3d_surface_unmap(struct wined3d_surface *surface) { + struct wined3d_device *device = surface->resource.device; + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; + struct wined3d_texture *texture; + TRACE("surface %p.\n", surface); if (!surface->resource.map_count) @@ -2248,7 +2189,37 @@ HRESULT wined3d_surface_unmap(struct wined3d_surface *surface) } --surface->resource.map_count; - surface->surface_ops->surface_unmap(surface); + switch (surface->resource.map_binding) + { + case WINED3D_LOCATION_SYSMEM: + case WINED3D_LOCATION_USER_MEMORY: + case WINED3D_LOCATION_DIB: + break; + + case WINED3D_LOCATION_BUFFER: + context = context_acquire(device, NULL); + gl_info = context->gl_info; + + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, surface->pbo)); + GL_EXTCALL(glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER)); + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); + checkGLcall("glUnmapBuffer"); + context_release(context); + break; + + default: + ERR("Unexpected map binding %s.\n", wined3d_debug_location(surface->resource.map_binding)); + break; + } + + if (!(surface->locations & (WINED3D_LOCATION_DRAWABLE | WINED3D_LOCATION_TEXTURE_RGB))) + { + texture = surface->container; + if (texture->swapchain && texture->swapchain->front_buffer == texture) + texture->swapchain->swapchain_ops->swapchain_frontbuffer_updated(texture->swapchain); + else if (texture->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) + FIXME("Depth / stencil buffer locking is not implemented.\n"); + } return WINED3D_OK; } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index becad97..9b8d04c 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -647,13 +647,25 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT context_release(context); } +static void swapchain_gl_frontbuffer_updated(struct wined3d_swapchain *swapchain) +{ + struct wined3d_surface *surface; + struct wined3d_context *context; + + surface = surface_from_resource(swapchain->front_buffer->sub_resources[0].resource); + context = context_acquire(swapchain->device, surface); + surface_load_location(surface, context, surface->container->resource.draw_binding); + context_release(context); + SetRectEmpty(&swapchain->front_buffer_update); +} + static const struct wined3d_swapchain_ops swapchain_gl_ops = { swapchain_gl_present, + swapchain_gl_frontbuffer_updated, }; -/* Helper function that blits the front buffer contents to the target window. */ -void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *rect) +static void swapchain_gdi_frontbuffer_updated(struct wined3d_swapchain *swapchain) { struct wined3d_surface *front; POINT offset = {0, 0}; @@ -661,7 +673,7 @@ void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *r RECT draw_rect; HWND window; - TRACE("swapchain %p, rect %s.\n", swapchain, wine_dbgstr_rect(rect)); + TRACE("swapchain %p.\n", swapchain); front = surface_from_resource(wined3d_texture_get_sub_resource(swapchain->front_buffer, 0)); if (swapchain->palette) @@ -689,14 +701,14 @@ void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *r draw_rect.right = front->resource.width; draw_rect.top = 0; draw_rect.bottom = front->resource.height; - - if (rect) - IntersectRect(&draw_rect, &draw_rect, rect); + IntersectRect(&draw_rect, &draw_rect, &swapchain->front_buffer_update); BitBlt(dst_dc, draw_rect.left - offset.x, draw_rect.top - offset.y, draw_rect.right - draw_rect.left, draw_rect.bottom - draw_rect.top, src_dc, draw_rect.left, draw_rect.top, SRCCOPY); ReleaseDC(window, dst_dc); + + SetRectEmpty(&swapchain->front_buffer_update); } static void swapchain_gdi_present(struct wined3d_swapchain *swapchain, const RECT *src_rect_in, @@ -755,12 +767,16 @@ static void swapchain_gdi_present(struct wined3d_swapchain *swapchain, const REC } } - x11_copy_to_screen(swapchain, NULL); + SetRect(&swapchain->front_buffer_update, 0, 0, + swapchain->front_buffer->resource.width, + swapchain->front_buffer->resource.height); + swapchain_gdi_frontbuffer_updated(swapchain); } static const struct wined3d_swapchain_ops swapchain_gdi_ops = { swapchain_gdi_present, + swapchain_gdi_frontbuffer_updated, }; static void swapchain_update_render_to_fbo(struct wined3d_swapchain *swapchain) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4066c79..ce2f196 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2500,7 +2500,6 @@ struct fbo_entry struct wined3d_surface_ops { HRESULT (*surface_private_setup)(struct wined3d_surface *surface); - void (*surface_unmap)(struct wined3d_surface *surface); }; struct wined3d_surface @@ -2916,6 +2915,7 @@ struct wined3d_swapchain_ops { void (*swapchain_present)(struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, const RGNDATA *dirty_region, DWORD flags); + void (*swapchain_frontbuffer_updated)(struct wined3d_swapchain *swaphchain); }; struct wined3d_swapchain @@ -2948,8 +2948,6 @@ struct wined3d_swapchain HWND backup_wnd; }; -void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *rect) DECLSPEC_HIDDEN; - void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activate) DECLSPEC_HIDDEN; struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Keep track of front buffer updates in the swapchain.
by Alexandre Julliard March 2, 2016

March 2, 2016

Module: wine Branch: master Commit: 29c27b9bab922a485e02ad816a5e34802c1f4227 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29c27b9bab922a485e02ad816… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 1 19:31:48 2016 +0100 wined3d: Keep track of front buffer updates in the swapchain. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 56 +++++++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 3 +-- 2 files changed, 32 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ee6588e..1acc3b6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -677,11 +677,10 @@ static void surface_unmap(struct wined3d_surface *surface) struct wined3d_device *device = surface->resource.device; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; + struct wined3d_texture *texture; TRACE("surface %p.\n", surface); - memset(&surface->lockedRect, 0, sizeof(surface->lockedRect)); - switch (surface->resource.map_binding) { case WINED3D_LOCATION_SYSMEM: @@ -710,13 +709,15 @@ static void surface_unmap(struct wined3d_surface *surface) return; } - if (surface->container->swapchain && surface->container->swapchain->front_buffer == surface->container) + texture = surface->container; + if (texture->swapchain && texture->swapchain->front_buffer == texture) { context = context_acquire(device, surface); - surface_load_location(surface, context, surface->container->resource.draw_binding); + surface_load_location(surface, context, texture->resource.draw_binding); context_release(context); + memset(&texture->swapchain->front_buffer_update, 0, sizeof(texture->swapchain->front_buffer_update)); } - else if (surface->container->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) + else if (texture->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) FIXME("Depth / stencil buffer locking is not implemented.\n"); } @@ -1260,13 +1261,15 @@ static HRESULT gdi_surface_private_setup(struct wined3d_surface *surface) static void gdi_surface_unmap(struct wined3d_surface *surface) { + struct wined3d_texture *texture = surface->container; + TRACE("surface %p.\n", surface); /* Tell the swapchain to update the screen. */ - if (surface->container->swapchain && surface->container == surface->container->swapchain->front_buffer) - x11_copy_to_screen(surface->container->swapchain, &surface->lockedRect); + if (texture->swapchain && texture == texture->swapchain->front_buffer) + x11_copy_to_screen(texture->swapchain, &texture->swapchain->front_buffer_update); - memset(&surface->lockedRect, 0, sizeof(RECT)); + memset(&texture->swapchain->front_buffer_update, 0, sizeof(texture->swapchain->front_buffer_update)); } static const struct wined3d_surface_ops gdi_surface_ops = @@ -2253,9 +2256,10 @@ HRESULT wined3d_surface_unmap(struct wined3d_surface *surface) HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags) { - const struct wined3d_format *format = surface->resource.format; - unsigned int fmt_flags = surface->container->resource.format_flags; - struct wined3d_device *device = surface->resource.device; + struct wined3d_texture *texture = surface->container; + const struct wined3d_format *format = texture->resource.format; + struct wined3d_device *device = texture->resource.device; + unsigned int fmt_flags = texture->resource.format_flags; struct wined3d_context *context; const struct wined3d_gl_info *gl_info; BYTE *base_memory; @@ -2270,7 +2274,7 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_ } if ((fmt_flags & WINED3DFMT_FLAG_BLOCKS) && box - && !wined3d_texture_check_block_align(surface->container, surface->texture_level, box)) + && !wined3d_texture_check_block_align(texture, surface->texture_level, box)) { WARN("Map box %s is misaligned for %ux%u blocks.\n", debug_box(box), format->block_width, format->block_height); @@ -2289,13 +2293,13 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_ * the need to download the surface from OpenGL all the time. The surface * is still downloaded if the OpenGL texture is changed. Note that this * only really makes sense for managed textures.*/ - if (!(surface->container->flags & WINED3D_TEXTURE_DYNAMIC_MAP) + if (!(texture->flags & WINED3D_TEXTURE_DYNAMIC_MAP) && surface->resource.map_binding == WINED3D_LOCATION_SYSMEM) { if (++surface->lockCount > MAXLOCKCOUNT) { TRACE("Surface is mapped regularly, not freeing the system memory copy any more.\n"); - surface->container->flags |= WINED3D_TEXTURE_DYNAMIC_MAP; + texture->flags |= WINED3D_TEXTURE_DYNAMIC_MAP; } } @@ -2330,7 +2334,7 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_ break; case WINED3D_LOCATION_USER_MEMORY: - base_memory = surface->container->user_memory; + base_memory = texture->user_memory; break; case WINED3D_LOCATION_DIB: @@ -2361,17 +2365,13 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_ } else { - wined3d_texture_get_pitch(surface->container, surface->texture_level, + wined3d_texture_get_pitch(texture, surface->texture_level, &map_desc->row_pitch, &map_desc->slice_pitch); } if (!box) { map_desc->data = base_memory; - surface->lockedRect.left = 0; - surface->lockedRect.top = 0; - surface->lockedRect.right = surface->resource.width; - surface->lockedRect.bottom = surface->resource.height; } else { @@ -2389,13 +2389,19 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_ + (map_desc->row_pitch * box->top) + (box->left * format->byte_count); } - surface->lockedRect.left = box->left; - surface->lockedRect.top = box->top; - surface->lockedRect.right = box->right; - surface->lockedRect.bottom = box->bottom; } - TRACE("Locked rect %s.\n", wine_dbgstr_rect(&surface->lockedRect)); + if (texture->swapchain && texture->swapchain->front_buffer == texture) + { + RECT *r = &texture->swapchain->front_buffer_update; + + if (!box) + SetRect(r, 0, 0, texture->resource.width, texture->resource.height); + else + SetRect(r, box->left, box->top, box->right, box->bottom); + TRACE("Mapped front buffer %s.\n", wine_dbgstr_rect(r)); + } + TRACE("Returning memory %p, pitch %u.\n", map_desc->data, map_desc->row_pitch); return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 409ab36..4066c79 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2522,8 +2522,6 @@ struct wined3d_surface GLenum texture_target; unsigned int texture_level; unsigned int texture_layer; - - RECT lockedRect; int lockCount; /* For GetDC */ @@ -2936,6 +2934,7 @@ struct wined3d_swapchain BOOL render_to_fbo, reapply_mode; const struct wined3d_format *ds_format; struct wined3d_palette *palette; + RECT front_buffer_update; LONG prev_time, frames; /* Performance tracking */

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_texture_cube_GetLevelDesc().
by Alexandre Julliard March 2, 2016

March 2, 2016

Module: wine Branch: master Commit: 63256e31b38fc8acec0fb00358843a34e804c1df URL: http://source.winehq.org/git/wine.git/?a=commit;h=63256e31b38fc8acec0fb0035… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 1 19:31:47 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_texture_cube_GetLevelDesc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/texture.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index cdb7193..50ef88d 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -675,9 +675,9 @@ static void WINAPI d3d9_texture_cube_GenerateMipSubLevels(IDirect3DCubeTexture9 static HRESULT WINAPI d3d9_texture_cube_GetLevelDesc(IDirect3DCubeTexture9 *iface, UINT level, D3DSURFACE_DESC *desc) { struct d3d9_texture *texture = impl_from_IDirect3DCubeTexture9(iface); - struct wined3d_resource *sub_resource; - HRESULT hr = D3D_OK; + struct wined3d_sub_resource_desc wined3d_desc; DWORD level_count; + HRESULT hr; TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); @@ -689,15 +689,10 @@ static HRESULT WINAPI d3d9_texture_cube_GetLevelDesc(IDirect3DCubeTexture9 *ifac return D3DERR_INVALIDCALL; } - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) - hr = D3DERR_INVALIDCALL; - else + if (SUCCEEDED(hr = wined3d_texture_get_sub_resource_desc(texture->wined3d_texture, level, &wined3d_desc))) { - struct wined3d_resource_desc wined3d_desc; - - wined3d_resource_get_desc(sub_resource, &wined3d_desc); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); - desc->Type = wined3d_desc.resource_type; + desc->Type = D3DRTYPE_SURFACE; desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->MultiSampleType = wined3d_desc.multisample_type;

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_device_StretchRect().
by Alexandre Julliard March 2, 2016

March 2, 2016

Module: wine Branch: master Commit: 4917b987531b6fd64cc2c1dfe27050f141919e14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4917b987531b6fd64cc2c1dfe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 1 19:31:42 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_device_StretchRect(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index bd94712..718de91 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1335,17 +1335,15 @@ static HRESULT WINAPI d3d9_device_StretchRect(IDirect3DDevice9Ex *iface, IDirect struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_surface *src = unsafe_impl_from_IDirect3DSurface9(src_surface); struct d3d9_surface *dst = unsafe_impl_from_IDirect3DSurface9(dst_surface); + struct wined3d_sub_resource_desc src_desc, dst_desc; HRESULT hr = D3DERR_INVALIDCALL; - struct wined3d_resource_desc src_desc, dst_desc; - struct wined3d_resource *sub_resource; RECT d, s; TRACE("iface %p, src_surface %p, src_rect %p, dst_surface %p, dst_rect %p, filter %#x.\n", iface, src_surface, src_rect, dst_surface, dst_rect, filter); wined3d_mutex_lock(); - sub_resource = wined3d_texture_get_sub_resource(dst->wined3d_texture, dst->sub_resource_idx); - wined3d_resource_get_desc(sub_resource, &dst_desc); + wined3d_texture_get_sub_resource_desc(dst->wined3d_texture, dst->sub_resource_idx, &dst_desc); if (!dst_rect) { d.left = 0; @@ -1355,8 +1353,7 @@ static HRESULT WINAPI d3d9_device_StretchRect(IDirect3DDevice9Ex *iface, IDirect dst_rect = &d; } - sub_resource = wined3d_texture_get_sub_resource(src->wined3d_texture, src->sub_resource_idx); - wined3d_resource_get_desc(sub_resource, &src_desc); + wined3d_texture_get_sub_resource_desc(src->wined3d_texture, src->sub_resource_idx, &src_desc); if (!src_rect) { s.left = 0;

1 0

Sebastian Lackner : services: Do not distinguish between shared/ exclusive lock.
by Alexandre Julliard March 2, 2016

March 2, 2016

Module: wine Branch: master Commit: 34fd6398013ee2b95ebeb2ed8c7de966e5db8989 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34fd6398013ee2b95ebeb2ed8… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 2 07:21:17 2016 +0100 services: Do not distinguish between shared/exclusive lock. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 40 ++++++++++++++++++++-------------------- programs/services/services.c | 32 +++++++++++--------------------- programs/services/services.h | 6 ++---- 3 files changed, 33 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=34fd6398013ee2b95ebeb…

1 0

Sebastian Lackner : services: Fix calculation of service timeout.
by Alexandre Julliard March 2, 2016

March 2, 2016

Module: wine Branch: master Commit: 6780c20342d3c332947594fdb4c26c2fa867be6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6780c20342d3c332947594fdb… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 2 07:24:22 2016 +0100 services: Fix calculation of service timeout. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index aad3b22..6951fb8 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -121,7 +121,7 @@ static void run_after_timeout(void (*func)(struct service_entry*), struct servic GetSystemTimeAsFileTime(&elem->time); time.u.LowPart = elem->time.dwLowDateTime; time.u.HighPart = elem->time.dwHighDateTime; - time.QuadPart += timeout*10000000; + time.QuadPart += (ULONGLONG)timeout * 10000; elem->time.dwLowDateTime = time.u.LowPart; elem->time.dwHighDateTime = time.u.HighPart;

1 0

Sebastian Lackner : services: Get rid of unnecessary locks.
by Alexandre Julliard March 2, 2016

March 2, 2016

Module: wine Branch: master Commit: 4931f5fbe9b46de86aa9a0c2709b60659fc622fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4931f5fbe9b46de86aa9a0c27… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 2 07:21:51 2016 +0100 services: Get rid of unnecessary locks. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 6 ------ programs/services/services.c | 2 -- 2 files changed, 8 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index d9379c4..aad3b22 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -274,7 +274,6 @@ DWORD __cdecl svcctl_GetServiceDisplayNameW( { LPCWSTR name; int len; - service_lock(entry); name = get_display_name(entry); len = strlenW(name); if (len <= *cchBufSize) @@ -285,7 +284,6 @@ DWORD __cdecl svcctl_GetServiceDisplayNameW( else err = ERROR_INSUFFICIENT_BUFFER; *cchBufSize = len; - service_unlock(entry); } else err = ERROR_SERVICE_DOES_NOT_EXIST; @@ -319,7 +317,6 @@ DWORD __cdecl svcctl_GetServiceKeyNameW( if (entry != NULL) { int len; - service_lock(entry); len = strlenW(entry->name); if (len <= *cchBufSize) { @@ -329,7 +326,6 @@ DWORD __cdecl svcctl_GetServiceKeyNameW( else err = ERROR_INSUFFICIENT_BUFFER; *cchBufSize = len; - service_unlock(entry); } else err = ERROR_SERVICE_DOES_NOT_EXIST; @@ -539,9 +535,7 @@ static DWORD create_serviceW( if ((found = scmdatabase_find_service(manager->db, lpServiceName))) { - service_lock(found); err = is_marked_for_delete(found) ? ERROR_SERVICE_MARKED_FOR_DELETE : ERROR_SERVICE_EXISTS; - service_unlock(found); scmdatabase_unlock(manager->db); free_service_entry(entry); return err; diff --git a/programs/services/services.c b/programs/services/services.c index 1972cce..c45aed3 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -435,9 +435,7 @@ void release_service(struct service_entry *service) if (InterlockedDecrement(&service->ref_count) == 0 && is_marked_for_delete(service)) { scmdatabase_lock(service->db); - service_lock(service); scmdatabase_remove_service(service->db, service); - service_unlock(service); scmdatabase_unlock(service->db); free_service_entry(service); }

1 0