wine-commits June 2017

wine-commits@winehq.org

2 participants
595 discussions

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: aab1fb88db61e8fa81c77664e948024aab9b4272 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aab1fb88db61e8fa81c77664e… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Sat Jun 17 09:44:57 2017 +0300 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 e8dbdd2..0633ad6 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: 2017-06-14 08:17+0300\n" +"PO-Revision-Date: 2017-06-17 09: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" @@ -12068,10 +12068,8 @@ msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgstr "regedit: Neatpažinta kaitos seka [\\%1!c!]\n" #: regedit.rc:420 -#, fuzzy -#| msgid "regedit: Unsupported registry data type [%1]\n" msgid "regedit: Unsupported registry data type [0x%1!x!]\n" -msgstr "regedit: Nepalaikomas registro duomenų tipas [%1]\n" +msgstr "regedit: Nepalaikomas registro duomenų tipas [0x%1!x!]\n" #: regedit.rc:421 msgid "regedit: Unexpected end of line in '%1'.\n"

1 0

André Hentschel : kernel32: Fix EscapeCommFunction prototype.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: 1ab9c9d8490e54991ef13e4ce2961605d88d6772 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ab9c9d8490e54991ef13e4ce… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jun 16 18:45:07 2017 +0200 kernel32: Fix EscapeCommFunction prototype. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/comm.c | 2 +- include/winbase.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/comm.c b/dlls/kernel32/comm.c index f6c1270..b5de654 100644 --- a/dlls/kernel32/comm.c +++ b/dlls/kernel32/comm.c @@ -592,7 +592,7 @@ BOOL WINAPI ClearCommBreak(HANDLE handle) * false if the device is not present cannot execute the command * or the command failed. */ -BOOL WINAPI EscapeCommFunction(HANDLE handle, UINT func) +BOOL WINAPI EscapeCommFunction(HANDLE handle, DWORD func) { DWORD ioc; DWORD dwBytesReturned; diff --git a/include/winbase.h b/include/winbase.h index 1347f8c..d634c86 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1899,7 +1899,7 @@ WINBASEAPI BOOL WINAPI DosDateTimeToFileTime(WORD,WORD,LPFILETIME); WINBASEAPI BOOL WINAPI DuplicateHandle(HANDLE,HANDLE,HANDLE,HANDLE*,DWORD,BOOL,DWORD); WINADVAPI BOOL WINAPI DuplicateToken(HANDLE,SECURITY_IMPERSONATION_LEVEL,PHANDLE); WINADVAPI BOOL WINAPI DuplicateTokenEx(HANDLE,DWORD,LPSECURITY_ATTRIBUTES,SECURITY_IMPERSONATION_LEVEL,TOKEN_TYPE,PHANDLE); -WINBASEAPI BOOL WINAPI EscapeCommFunction(HANDLE,UINT); +WINBASEAPI BOOL WINAPI EscapeCommFunction(HANDLE,DWORD); WINBASEAPI void * WINAPI EncodePointer(void *); WINBASEAPI void * WINAPI EncodeSystemPointer(void *); WINADVAPI BOOL WINAPI EncryptFileA(LPCSTR);

1 0

Sebastian Lackner : wined3d: Fix memory leaks in blitter_destroy callbacks.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: a77d957da8777c690972dfa99e7956f18d06ba0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a77d957da8777c690972dfa99… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jun 16 16:01:58 2017 +0200 wined3d: Fix memory leaks in blitter_destroy callbacks. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index abdeb9c..af8b5b4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2394,6 +2394,8 @@ static void fbo_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_ if ((next = blitter->next)) next->ops->blitter_destroy(next, context); + + HeapFree(GetProcessHeap(), 0, blitter); } static void fbo_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, @@ -2476,6 +2478,8 @@ static void ffp_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_ if ((next = blitter->next)) next->ops->blitter_destroy(next, context); + + HeapFree(GetProcessHeap(), 0, blitter); } static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, @@ -2766,6 +2770,8 @@ static void cpu_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_ if ((next = blitter->next)) next->ops->blitter_destroy(next, context); + + HeapFree(GetProcessHeap(), 0, blitter); } static HRESULT surface_cpu_blt_compressed(const BYTE *src_data, BYTE *dst_data,

1 0

Sebastian Lackner : wined3d: Create CPU blitter also for GDI render.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: 6dd1ca28bfea0d2dcee368a70ba196bc25ec8d38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dd1ca28bfea0d2dcee368a70… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jun 16 16:01:34 2017 +0200 wined3d: Create CPU blitter also for GDI render. Fixes a regression introduced in cad4badbcf25992e0c61521aa15e639c2611f5d6. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ded4af6..3d12e41 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1164,6 +1164,15 @@ HRESULT CDECL wined3d_device_init_gdi(struct wined3d_device *device, goto err_out; } device->swapchains[0] = swapchain; + + if (!(device->blitter = wined3d_cpu_blitter_create())) + { + ERR("Failed to create CPU blitter.\n"); + HeapFree(GetProcessHeap(), 0, device->swapchains); + device->swapchain_count = 0; + goto err_out; + } + return WINED3D_OK; err_out: @@ -1252,6 +1261,8 @@ HRESULT CDECL wined3d_device_uninit_gdi(struct wined3d_device *device) { unsigned int i; + device->blitter->ops->blitter_destroy(device->blitter, NULL); + for (i = 0; i < device->swapchain_count; ++i) { TRACE("Releasing the implicit swapchain %u.\n", i);

1 0

Sebastian Lackner : wined3d: Avoid NULL pointer dereference when using GDI renderer.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: a2c0d2bb37244d1bece3ddd411981aaf06f3c842 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2c0d2bb37244d1bece3ddd41… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jun 16 16:01:04 2017 +0200 wined3d: Avoid NULL pointer dereference when using GDI renderer. Fixes a regression introduced in 62ca4f38269139ef2a8b9842ec538d9e7f7a0e76. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 0f60542..fbc73ca 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2703,12 +2703,13 @@ void context_bind_texture(struct wined3d_context *context, GLenum target, GLuint void *context_map_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, size_t size, GLenum binding, DWORD flags) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info; BYTE *memory; if (!data->buffer_object) return data->addr; + gl_info = context->gl_info; context_bind_bo(context, binding, data->buffer_object); if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) @@ -2731,11 +2732,12 @@ void *context_map_bo_address(struct wined3d_context *context, void context_unmap_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, GLenum binding) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info; if (!data->buffer_object) return; + gl_info = context->gl_info; context_bind_bo(context, binding, data->buffer_object); GL_EXTCALL(glUnmapBuffer(binding)); context_bind_bo(context, binding, 0);

1 0

Sebastian Lackner : server: Do not shutdown server in persistent mode when creation of first process fails.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: 4fc5d8873ca3b1bd0a4029e331f9292564ac86c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fc5d8873ca3b1bd0a4029e33… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jun 18 01:54:16 2017 +0200 server: Do not shutdown server in persistent mode when creation of first process fails. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/process.c b/server/process.c index 4f38ae1..3e962ca 100644 --- a/server/process.c +++ b/server/process.c @@ -592,7 +592,7 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit error: if (process) release_object( process ); /* if we failed to start our first process, close everything down */ - if (!running_processes) close_master_socket( 0 ); + if (!running_processes && master_socket_timeout != TIMEOUT_INFINITE) close_master_socket( 0 ); return NULL; }

1 0

Henri Verbeet : include: Simply forward declare the required D2D interfaces in wincodec.idl.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: 92847874b273ec488e6eaa882cac8772005ff9ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=92847874b273ec488e6eaa882… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 16 12:18:25 2017 +0200 include: Simply forward declare the required D2D interfaces in wincodec.idl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wincodec.idl | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index 1ea6e0e..2a80876 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -218,14 +218,9 @@ cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bppPRGBA, 0x6fddc324,0x4e03,0x4bfe,0 cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppCMYK, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x1c);") cpp_quote("#if 0") -typedef DWORD *ID2D1Device; -typedef DWORD *ID2D1Image; typedef DWORD *D2D1_PIXEL_FORMAT; cpp_quote ("#endif") -cpp_quote ("typedef interface ID2D1Device ID2D1Device;") -cpp_quote ("typedef interface ID2D1Image ID2D1Image;") - typedef struct WICRect { INT X; INT Y; @@ -254,6 +249,8 @@ typedef struct WICImageParameters typedef UINT32 WICColor; +interface ID2D1Device; +interface ID2D1Image; interface IWICPalette; [

1 0

Clemens Tamme : gdiplus: Implement triangular line caps in widened paths.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: 260cbd022e43b9385b8d501de412151d89debd6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=260cbd022e43b9385b8d501de… Author: Clemens Tamme <clemens.tamme(a)gmail.com> Date: Sat Jun 17 17:28:28 2017 +0200 gdiplus: Implement triangular line caps in widened paths. Signed-off-by: Clemens Tamme <clemens.tamme(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 3d33c29..e34f4ed 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1883,6 +1883,27 @@ static void widen_cap(const GpPointF *endpoint, const GpPointF *nextpoint, } break; } + case LineCapTriangle: + { + REAL segment_dy = nextpoint->Y-endpoint->Y; + REAL segment_dx = nextpoint->X-endpoint->X; + REAL segment_length = sqrtf(segment_dy*segment_dy + segment_dx*segment_dx); + REAL distance = pen->width/2.0; + REAL dx, dy; + + dx = distance * segment_dx / segment_length; + dy = distance * segment_dy / segment_length; + + if (add_first_points) { + add_bevel_point(endpoint, nextpoint, pen, 1, last_point); + + *last_point = add_path_list_node(*last_point, endpoint->X - dx, + endpoint->Y - dy, PathPointTypeLine); + } + if (add_last_point) + add_bevel_point(endpoint, nextpoint, pen, 0, last_point); + break; + } } } @@ -2118,10 +2139,10 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, { last_point = points; - if (pen->endcap > LineCapRound) + if (pen->endcap > LineCapTriangle) FIXME("unimplemented end cap %x\n", pen->endcap); - if (pen->startcap > LineCapRound) + if (pen->startcap > LineCapTriangle) FIXME("unimplemented start cap %x\n", pen->startcap); if (pen->dashcap != DashCapFlat)

1 0

Sebastian Lackner : gdiplus: Initialize containers list in GdipCloneImage.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: a4b7fe6a92ec5fd709156c6d3547730929833248 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4b7fe6a92ec5fd709156c6d3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jun 16 16:06:12 2017 +0200 gdiplus: Initialize containers list in GdipCloneImage. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 07609ac..720f8f2 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1333,6 +1333,7 @@ GpStatus WINGDIPAPI GdipCloneImage(GpImage *image, GpImage **cloneImage) result->unit = metafile->unit; result->metafile_type = metafile->metafile_type; result->hemf = CopyEnhMetaFileW(metafile->hemf, NULL); + list_init(&result->containers); if (!result->hemf) {

1 0

Francois Gouget : testbot: Force CGI::param() to scalar context for security.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: tools Branch: master Commit: e0e43d8cac1e3d64d1c104bc0b49f930b44df305 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e0e43d8cac1e3d64d1c104bc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 19 09:06:49 2017 +0200 testbot: Force CGI::param() to scalar context for security. Otherwise a call like foo($Page->GetParam("Name")) can end up passing extra arguments to foo() if the URL contains multiple instances of 'Name'. The situation is even worse if one uses named parameters. No code depended on being able to get multiple values and the only place that used CGI:param() to get the list of parameter names is already using Page::GetParameterNames(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/Page.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 1fb2ca3..50598bf 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -77,7 +77,9 @@ sub GetParamNames($) =head1 C<GetParam()> -This thunks to CGI::param() and thus takes the same arguments list. +This thunks to CGI::param() and thus takes the same arguments list but forces +the result to scalar context to avoid security issues. +To get the list of parameter names use GetParamNames(). =back =cut @@ -86,7 +88,7 @@ sub GetParam($@) { my $self = shift; - return $self->{CGIObj}->param(@_); + return scalar($self->{CGIObj}->param(@_)); } sub CGI($)

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
60
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2017