August 2013 - Wine-Commits - list.winehq.org

Stefan Dösinger : wined3d: Implement sRGB for volumes.
by Alexandre Julliard Aug. 26, 2013

Aug. 26, 2013

Module: wine Branch: master Commit: 6bc3cbf1c57d59368af6930aa25243fc074f4345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bc3cbf1c57d59368af6930aa… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Aug 26 02:01:29 2013 +0200 wined3d: Implement sRGB for volumes. --- dlls/wined3d/texture.c | 54 +++++++-------------- dlls/wined3d/utils.c | 1 + dlls/wined3d/volume.c | 102 ++++++++++++++++++++++++++++++++-------- dlls/wined3d/wined3d_private.h | 4 +- 4 files changed, 104 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6bc3cbf1c57d59368af69…

1 0

Stefan Dösinger : wined3d: Implement NOOVERWRITE and DISCARD volume maps.
by Alexandre Julliard Aug. 26, 2013

Aug. 26, 2013

Module: wine Branch: master Commit: bd866c02949890ca77c7058a00562fbd16375533 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd866c02949890ca77c7058a0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Aug 26 02:01:28 2013 +0200 wined3d: Implement NOOVERWRITE and DISCARD volume maps. --- dlls/wined3d/buffer.c | 54 +-------------------------------------- dlls/wined3d/resource.c | 50 +++++++++++++++++++++++++++++++++++++ dlls/wined3d/volume.c | 39 ++++++++++++++++++++++------ dlls/wined3d/wined3d_private.h | 3 ++ 4 files changed, 85 insertions(+), 61 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b3f760b..8178604 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -922,56 +922,6 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) context_release(context); } -static DWORD buffer_sanitize_flags(const struct wined3d_buffer *buffer, DWORD flags) -{ - /* Not all flags make sense together, but Windows never returns an error. - * Catch the cases that could cause issues. */ - if (flags & WINED3D_MAP_READONLY) - { - if (flags & WINED3D_MAP_DISCARD) - { - WARN("WINED3D_MAP_READONLY combined with WINED3D_MAP_DISCARD, ignoring flags.\n"); - return 0; - } - if (flags & WINED3D_MAP_NOOVERWRITE) - { - WARN("WINED3D_MAP_READONLY combined with WINED3D_MAP_NOOVERWRITE, ignoring flags.\n"); - return 0; - } - } - else if ((flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) - == (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) - { - WARN("WINED3D_MAP_DISCARD and WINED3D_MAP_NOOVERWRITE used together, ignoring.\n"); - return 0; - } - else if (flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE) - && !(buffer->resource.usage & WINED3DUSAGE_DYNAMIC)) - { - WARN("DISCARD or NOOVERWRITE map on non-dynamic buffer, ignoring.\n"); - return 0; - } - - return flags; -} - -static GLbitfield buffer_gl_map_flags(DWORD d3d_flags) -{ - GLbitfield ret = 0; - - if (!(d3d_flags & WINED3D_MAP_READONLY)) - ret |= GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT; - if (!(d3d_flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE))) - ret |= GL_MAP_READ_BIT; - - if (d3d_flags & WINED3D_MAP_DISCARD) - ret |= GL_MAP_INVALIDATE_BUFFER_BIT; - if (d3d_flags & WINED3D_MAP_NOOVERWRITE) - ret |= GL_MAP_UNSYNCHRONIZED_BIT; - - return ret; -} - struct wined3d_resource * CDECL wined3d_buffer_get_resource(struct wined3d_buffer *buffer) { TRACE("buffer %p.\n", buffer); @@ -986,7 +936,7 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN TRACE("buffer %p, offset %u, size %u, data %p, flags %#x\n", buffer, offset, size, data, flags); - flags = buffer_sanitize_flags(buffer, flags); + flags = wined3d_resource_sanitize_map_flags(&buffer->resource, flags); count = ++buffer->resource.map_count; if (buffer->buffer_object) @@ -1017,7 +967,7 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { - GLbitfield mapflags = buffer_gl_map_flags(flags); + GLbitfield mapflags = wined3d_resource_gl_map_flags(flags); buffer->resource.allocatedMemory = GL_EXTCALL(glMapBufferRange(buffer->buffer_type_hint, 0, buffer->resource.size, mapflags)); checkGLcall("glMapBufferRange"); diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 59fced9..ca322b2 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -358,3 +358,53 @@ void wined3d_resource_free_sysmem(void *mem) HeapFree(GetProcessHeap(), 0, *(--p)); } + +DWORD wined3d_resource_sanitize_map_flags(const struct wined3d_resource *resource, DWORD flags) +{ + /* Not all flags make sense together, but Windows never returns an error. + * Catch the cases that could cause issues. */ + if (flags & WINED3D_MAP_READONLY) + { + if (flags & WINED3D_MAP_DISCARD) + { + WARN("WINED3D_MAP_READONLY combined with WINED3D_MAP_DISCARD, ignoring flags.\n"); + return 0; + } + if (flags & WINED3D_MAP_NOOVERWRITE) + { + WARN("WINED3D_MAP_READONLY combined with WINED3D_MAP_NOOVERWRITE, ignoring flags.\n"); + return 0; + } + } + else if ((flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) + == (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) + { + WARN("WINED3D_MAP_DISCARD and WINED3D_MAP_NOOVERWRITE used together, ignoring.\n"); + return 0; + } + else if (flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE) + && !(resource->usage & WINED3DUSAGE_DYNAMIC)) + { + WARN("DISCARD or NOOVERWRITE map on non-dynamic buffer, ignoring.\n"); + return 0; + } + + return flags; +} + +GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) +{ + GLbitfield ret = 0; + + if (!(d3d_flags & WINED3D_MAP_READONLY)) + ret |= GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT; + if (!(d3d_flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE))) + ret |= GL_MAP_READ_BIT; + + if (d3d_flags & WINED3D_MAP_DISCARD) + ret |= GL_MAP_INVALIDATE_BUFFER_BIT; + if (d3d_flags & WINED3D_MAP_NOOVERWRITE) + ret |= GL_MAP_UNSYNCHRONIZED_BIT; + + return ret; +} diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 3f1563c..1813a31 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -469,6 +469,7 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, map_desc->data = NULL; return WINED3DERR_INVALIDCALL; } + flags = wined3d_resource_sanitize_map_flags(&volume->resource, flags); if (volume->flags & WINED3D_VFLAG_PBO) { @@ -476,10 +477,25 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, gl_info = context->gl_info; wined3d_volume_prepare_pbo(volume, context); - wined3d_volume_load_location(volume, context, WINED3D_LOCATION_BUFFER); + if (flags & WINED3D_MAP_DISCARD) + wined3d_volume_validate_location(volume, WINED3D_LOCATION_BUFFER); + else + wined3d_volume_load_location(volume, context, WINED3D_LOCATION_BUFFER); GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, volume->pbo)); - base_memory = GL_EXTCALL(glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); + + if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) + { + GLbitfield mapflags = wined3d_resource_gl_map_flags(flags); + mapflags &= ~GL_MAP_FLUSH_EXPLICIT_BIT; + base_memory = GL_EXTCALL(glMapBufferRange(GL_PIXEL_UNPACK_BUFFER_ARB, + 0, volume->resource.size, mapflags)); + } + else + { + base_memory = GL_EXTCALL(glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); + } + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); checkGLcall("Map PBO"); @@ -487,14 +503,19 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, } else { - if (!(volume->locations & WINED3D_LOCATION_SYSMEM)) + if (!volume_prepare_system_memory(volume)) + { + WARN("Out of memory.\n"); + map_desc->data = NULL; + return E_OUTOFMEMORY; + } + + if (flags & WINED3D_MAP_DISCARD) + { + wined3d_volume_validate_location(volume, WINED3D_LOCATION_SYSMEM); + } + else if (!(volume->locations & WINED3D_LOCATION_SYSMEM)) { - if (!volume_prepare_system_memory(volume)) - { - WARN("Out of memory.\n"); - map_desc->data = NULL; - return E_OUTOFMEMORY; - } context = context_acquire(device, NULL); wined3d_volume_load_location(volume, context, WINED3D_LOCATION_SYSMEM); context_release(context); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1773ba7..4db7600 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1968,6 +1968,9 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * const struct wined3d_resource_ops *resource_ops) DECLSPEC_HIDDEN; DWORD resource_set_priority(struct wined3d_resource *resource, DWORD priority) DECLSPEC_HIDDEN; void resource_unload(struct wined3d_resource *resource) DECLSPEC_HIDDEN; +DWORD wined3d_resource_sanitize_map_flags(const struct wined3d_resource *resource, + DWORD flags) DECLSPEC_HIDDEN; +GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; /* Tests show that the start address of resources is 32 byte aligned */ #define RESOURCE_ALIGNMENT 16

1 0

Stefan Dösinger : wined3d: Use PBOs for dynamic volumes.
by Alexandre Julliard Aug. 26, 2013

Aug. 26, 2013

Module: wine Branch: master Commit: 8c708486c3654afce76326204d7d7bc441ba22f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c708486c3654afce76326204… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 8 16:42:29 2013 +0200 wined3d: Use PBOs for dynamic volumes. --- dlls/wined3d/utils.c | 1 + dlls/wined3d/volume.c | 168 ++++++++++++++++++++++++++++++++++++---- dlls/wined3d/wined3d_private.h | 7 +- 3 files changed, 157 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c708486c3654afce7632…

1 0

Stefan Dösinger : wined3d: Check volume formats and sizes in device_update_volume.
by Alexandre Julliard Aug. 26, 2013

Aug. 26, 2013

Module: wine Branch: master Commit: 1bd6710b6ff077ed3647850ec3149134dccad642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bd6710b6ff077ed3647850ec… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Aug 26 02:01:31 2013 +0200 wined3d: Check volume formats and sizes in device_update_volume. --- dlls/wined3d/device.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 79a957b..18dcae4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4096,6 +4096,19 @@ static HRESULT device_update_volume(struct wined3d_device *device, TRACE("device %p, src_volume %p, dst_volume %p.\n", device, src_volume, dst_volume); + if (src_volume->resource.format != dst_volume->resource.format) + { + FIXME("Source and destination formats do not match.\n"); + return WINED3DERR_INVALIDCALL; + } + if (src_volume->resource.width != dst_volume->resource.width + || src_volume->resource.height != dst_volume->resource.height + || src_volume->resource.depth != dst_volume->resource.depth) + { + FIXME("Source and destination sizes do not match.\n"); + return WINED3DERR_INVALIDCALL; + } + if (FAILED(hr = wined3d_volume_map(src_volume, &src, NULL, WINED3D_MAP_READONLY))) return hr;

1 0

Stefan Dösinger : wined3d: Enforce volume mapping restrictions.
by Alexandre Julliard Aug. 26, 2013

Aug. 26, 2013

Module: wine Branch: master Commit: 421b7a17adbb06924332a25e959319d68323e18d URL: http://source.winehq.org/git/wine.git/?a=commit;h=421b7a17adbb06924332a25e9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Aug 26 02:01:26 2013 +0200 wined3d: Enforce volume mapping restrictions. --- dlls/d3dx9_36/tests/volume.c | 2 +- dlls/wined3d/volume.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/volume.c b/dlls/d3dx9_36/tests/volume.c index f3976c0..eb2877f 100644 --- a/dlls/d3dx9_36/tests/volume.c +++ b/dlls/d3dx9_36/tests/volume.c @@ -184,7 +184,7 @@ static void test_D3DXLoadVolumeFromMemory(IDirect3DDevice9 *device) set_box(&src_box, 0, 0, 4, 1, 0, 4); set_box(&dst_box, 0, 0, 4, 1, 0, 4); hr = D3DXLoadVolumeFromMemory(volume, NULL, &dst_box, pixels, D3DFMT_A8R8G8B8, 16, 16, NULL, &src_box, D3DX_DEFAULT, 0); - todo_wine ok(hr == D3DERR_INVALIDCALL, "D3DXLoadVolumeFromMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + ok(hr == D3DERR_INVALIDCALL, "D3DXLoadVolumeFromMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); IDirect3DVolume9_Release(volume); IDirect3DVolumeTexture9_Release(volume_texture); diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 71b2937..0369f54 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -373,6 +373,13 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, TRACE("volume %p, map_desc %p, box %p, flags %#x.\n", volume, map_desc, box, flags); + if (!(volume->resource.access_flags & WINED3D_RESOURCE_ACCESS_CPU)) + { + WARN("Volume %p is not CPU accessible.\n", volume); + map_desc->data = NULL; + return WINED3DERR_INVALIDCALL; + } + if (!volume_prepare_system_memory(volume)) { WARN("Out of memory.\n");

1 0

Alexandre Julliard : iphlpapi: Fix some memory leaks.
by Alexandre Julliard Aug. 26, 2013

Aug. 26, 2013

Module: wine Branch: master Commit: fc36c5eb5d2795d8e4a8639896cce6aac18e0600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc36c5eb5d2795d8e4a863989… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 26 17:32:03 2013 +0200 iphlpapi: Fix some memory leaks. --- dlls/iphlpapi/ipstats.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 962d421..809dbc6 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -2197,7 +2197,7 @@ DWORD build_tcp_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE size_t Len = 0; char *Buf = NULL; struct xinpgen *pXIG, *pOrigXIG; - struct pid_map *pMap; + struct pid_map *pMap = NULL; unsigned NumEntries; if (sysctlbyname ("net.inet.tcp.pcblist", NULL, &Len, NULL, 0) < 0) @@ -2280,6 +2280,7 @@ DWORD build_tcp_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE } done: + HeapFree( GetProcessHeap(), 0, pMap ); HeapFree (GetProcessHeap (), 0, Buf); } #else @@ -2471,7 +2472,7 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE size_t Len = 0; char *Buf = NULL; struct xinpgen *pXIG, *pOrigXIG; - struct pid_map *pMap; + struct pid_map *pMap = NULL; unsigned NumEntries; if (sysctlbyname ("net.inet.udp.pcblist", NULL, &Len, NULL, 0) < 0) @@ -2547,6 +2548,7 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE } done: + HeapFree( GetProcessHeap(), 0, pMap ); HeapFree (GetProcessHeap (), 0, Buf); } #else

1 0

Detlef Riekenberg : comdlg32/tests: Limit the number of copies to avoid a test hang.
by Alexandre Julliard Aug. 26, 2013

Aug. 26, 2013

Module: wine Branch: master Commit: 9a7d510ccb2ffc232f56192f89b52ae2fd0ccf18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a7d510ccb2ffc232f56192f8… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Aug 23 19:08:44 2013 +0200 comdlg32/tests: Limit the number of copies to avoid a test hang. --- dlls/comdlg32/tests/printdlg.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index 83be893..d0b0443 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -128,7 +128,9 @@ static UINT_PTR CALLBACK print_hook_proc(HWND hdlg, UINT msg, WPARAM wp, LPARAM { if (msg == WM_INITDIALOG) { - SetDlgItemInt(hdlg, edt3, 1234, FALSE); + /* some driver popup a dialog and hung the test or silently limit the number of copies, + when trying to set more than 999 copies */ + SetDlgItemInt(hdlg, edt3, 123, FALSE); PostMessage(hdlg, WM_COMMAND, IDOK, FALSE); } return 0; @@ -252,7 +254,7 @@ static void test_PrintDlgA(void) /* Version of Microsoft XPS Document Writer driver shipped before Win7 * reports that it can print multiple copies, but returns 1. */ - ok(pDlg->nCopies == 1234 || broken(pDlg->nCopies == 1), "expected nCopies 1234, got %d\n", pDlg->nCopies); + ok(pDlg->nCopies == 123 || broken(pDlg->nCopies == 1), "expected nCopies 123, got %d\n", pDlg->nCopies); ok(pDlg->hDevMode != 0, "hDevMode should not be 0\n"); dm = GlobalLock(pDlg->hDevMode); ok(S1(U1(*dm)).dmCopies == 1, "expected dm->dmCopies 1, got %d\n", S1(U1(*dm)).dmCopies); @@ -269,7 +271,7 @@ static void test_PrintDlgA(void) ok(pDlg->nCopies == 1, "expected nCopies 1, got %d\n", pDlg->nCopies); ok(pDlg->hDevMode != 0, "hDevMode should not be 0\n"); dm = GlobalLock(pDlg->hDevMode); - ok(S1(U1(*dm)).dmCopies == 1234, "expected dm->dmCopies 1234, got %d\n", S1(U1(*dm)).dmCopies); + ok(S1(U1(*dm)).dmCopies == 123, "expected dm->dmCopies 123, got %d\n", S1(U1(*dm)).dmCopies); GlobalUnlock(pDlg->hDevMode); GlobalFree(pDlg->hDevMode); GlobalFree(pDlg->hDevNames);

1 0

Aric Stewart : wineps.drv: Remove unnecessary changes included with vertical font work.
by Alexandre Julliard Aug. 26, 2013

Aug. 26, 2013

Module: wine Branch: master Commit: 72b78e7a0a78eb066c593d044fb3257c1258cee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72b78e7a0a78eb066c593d044… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Aug 26 09:52:21 2013 -0500 wineps.drv: Remove unnecessary changes included with vertical font work. --- dlls/wineps.drv/builtin.c | 2 +- dlls/wineps.drv/download.c | 2 +- dlls/wineps.drv/ps.c | 2 +- dlls/wineps.drv/psdrv.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c index 23219b9..e2106d3 100644 --- a/dlls/wineps.drv/builtin.c +++ b/dlls/wineps.drv/builtin.c @@ -238,7 +238,7 @@ BOOL PSDRV_WriteSetBuiltinFont(PHYSDEV dev) PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); return PSDRV_WriteSetFont(dev, physDev->font.fontinfo.Builtin.afm->FontName, - physDev->font.size, physDev->font.escapement, FALSE, FALSE); + physDev->font.size, physDev->font.escapement, FALSE); } BOOL PSDRV_WriteBuiltinGlyphShow(PHYSDEV dev, LPCWSTR str, INT count) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index 6290872..f476843 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -353,7 +353,7 @@ BOOL PSDRV_WriteSetDownloadFont(PHYSDEV dev, BOOL vertical) escapement += 900; PSDRV_WriteSetFont(dev, ps_name, physDev->font.size, escapement, - is_fake_italic( dev->hdc ), (lf.lfFaceName[0] == '@')); + is_fake_italic( dev->hdc )); HeapFree(GetProcessHeap(), 0, ps_name); HeapFree(GetProcessHeap(), 0, potm); diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index ea6c530..6187223 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -571,7 +571,7 @@ BOOL PSDRV_WriteCurveTo(PHYSDEV dev, POINT pts[3]) return PSDRV_WriteSpool(dev, buf, strlen(buf)); } -BOOL PSDRV_WriteSetFont(PHYSDEV dev, const char *name, matrix size, INT escapement, BOOL fake_italic, BOOL vertical) +BOOL PSDRV_WriteSetFont(PHYSDEV dev, const char *name, matrix size, INT escapement, BOOL fake_italic) { char *buf; diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index f410e2a..229d04c 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -500,7 +500,7 @@ extern BOOL PSDRV_WriteStroke(PHYSDEV dev) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteRectangle(PHYSDEV dev, INT x, INT y, INT width, INT height) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteRRectangle(PHYSDEV dev, INT x, INT y, INT width, INT height) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteSetFont(PHYSDEV dev, const char *name, matrix size, INT escapement, - BOOL fake_italic, BOOL vertical) DECLSPEC_HIDDEN; + BOOL fake_italic) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteGlyphShow(PHYSDEV dev, LPCSTR g_name) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteSetPen(PHYSDEV dev) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteArc(PHYSDEV dev, INT x, INT y, INT w, INT h,

1 0

Nikolay Sivov : ole32: Release marshal info on error path.
by Alexandre Julliard Aug. 26, 2013

Aug. 26, 2013

Module: wine Branch: master Commit: 4d565644b63ec45a79cd71ea20950b9061d5fcdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d565644b63ec45a79cd71ea2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 25 15:40:36 2013 +0400 ole32: Release marshal info on error path. --- dlls/ole32/git.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index 4d44e39..b83d415 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -180,7 +180,12 @@ StdGlobalInterfaceTable_RegisterInterfaceInGlobal( IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); entry = HeapAlloc(GetProcessHeap(), 0, sizeof(StdGITEntry)); - if (entry == NULL) return E_OUTOFMEMORY; + if (!entry) + { + CoReleaseMarshalData(stream); + IStream_Release(stream); + return E_OUTOFMEMORY; + } EnterCriticalSection(&git_section);

1 0

Alexandre Julliard : server: Don' t include SYNCHRONIZE in the keyed event access rights.
by Alexandre Julliard Aug. 26, 2013

Aug. 26, 2013

Module: wine Branch: master Commit: 33406f51beabbe799f34483b085718bdad8ca942 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33406f51beabbe799f34483b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 23 14:39:49 2013 +0200 server: Don't include SYNCHRONIZE in the keyed event access rights. --- server/event.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/event.c b/server/event.c index 7b150f5..3b052b8 100644 --- a/server/event.c +++ b/server/event.c @@ -103,7 +103,7 @@ static const struct object_ops keyed_event_ops = #define KEYEDEVENT_WAIT 0x0001 #define KEYEDEVENT_WAKE 0x0002 -#define KEYEDEVENT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x0003) +#define KEYEDEVENT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0x0003) struct event *create_event( struct directory *root, const struct unicode_str *name, @@ -252,10 +252,10 @@ static int keyed_event_signaled( struct object *obj, struct thread *thread ) static unsigned int keyed_event_map_access( struct object *obj, unsigned int access ) { - if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | SYNCHRONIZE | KEYEDEVENT_WAIT; + if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | KEYEDEVENT_WAIT; if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE | KEYEDEVENT_WAKE; if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE; - if (access & GENERIC_ALL) access |= STANDARD_RIGHTS_ALL | KEYEDEVENT_ALL_ACCESS; + if (access & GENERIC_ALL) access |= KEYEDEVENT_ALL_ACCESS; return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); }

1 0