March 2014 - Wine-commits - list.winehq.org

Piotr Caban : ole32/tests: Fix DoDragDrop tests.
by Alexandre Julliard 04 Mar '14

04 Mar '14

Module: wine Branch: master Commit: 9f9fb6b7f1542f33f6ed18d882cfe088780e08d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f9fb6b7f1542f33f6ed18d88… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 4 10:23:16 2014 +0100 ole32/tests: Fix DoDragDrop tests. --- dlls/ole32/tests/dragdrop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c index 36328df..8051f58 100644 --- a/dlls/ole32/tests/dragdrop.c +++ b/dlls/ole32/tests/dragdrop.c @@ -485,7 +485,7 @@ static void test_DoDragDrop(void) HWND hwnd; RECT rect; - hwnd = CreateWindowA("WineOleTestClass", "Test", 0, + hwnd = CreateWindowExA(WS_EX_TOPMOST, "WineOleTestClass", "Test", 0, CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, NULL, NULL, NULL, NULL); ok(IsWindow(hwnd), "failed to create window\n");

1 0

Henri Verbeet : wined3d: Filter redundant WINED3D_MAP_DISCARD buffer maps.
by Alexandre Julliard 04 Mar '14

04 Mar '14

Module: wine Branch: master Commit: c1032e977bb9f850e3aea28dd79e3d7c2244cd6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1032e977bb9f850e3aea28dd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 4 10:21:33 2014 +0100 wined3d: Filter redundant WINED3D_MAP_DISCARD buffer maps. --- dlls/ddraw/ddraw_private.h | 2 -- dlls/ddraw/device.c | 6 ------ dlls/ddraw/vertexbuffer.c | 5 +---- dlls/wined3d/buffer.c | 34 +++++++++++++++------------------- 4 files changed, 16 insertions(+), 31 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index fb3755f..0f7f755 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -543,8 +543,6 @@ struct d3d_vertex_buffer DWORD fvf; DWORD size; BOOL dynamic; - - BOOL read_since_last_map; }; HRESULT d3d_vertex_buffer_create(struct d3d_vertex_buffer **buffer, struct ddraw *ddraw, diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 874d78d..e6f40a0 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4268,9 +4268,6 @@ static HRESULT d3d_device7_DrawPrimitiveVB(IDirect3DDevice7 *iface, D3DPRIMITIVE wined3d_device_set_primitive_type(device->wined3d_device, PrimitiveType); hr = wined3d_device_draw_primitive(device->wined3d_device, StartVertex, NumVertices); - if (SUCCEEDED(hr)) - vb->read_since_last_map = TRUE; - wined3d_mutex_unlock(); return hr; @@ -4396,9 +4393,6 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, wined3d_device_set_primitive_type(This->wined3d_device, PrimitiveType); hr = wined3d_device_draw_indexed_primitive(This->wined3d_device, ib_pos / sizeof(WORD), IndexCount); - if (SUCCEEDED(hr)) - vb->read_since_last_map = TRUE; - wined3d_mutex_unlock(); return hr; diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 5acd2e6..5d77790 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -245,7 +245,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_Lock(IDirect3DVertexBuffer7 *iface, wined3d_flags |= WINED3D_MAP_READONLY; if (flags & DDLOCK_NOOVERWRITE) wined3d_flags |= WINED3D_MAP_NOOVERWRITE; - if (flags & DDLOCK_DISCARDCONTENTS && buffer->read_since_last_map) + if (flags & DDLOCK_DISCARDCONTENTS) { wined3d_flags |= WINED3D_MAP_DISCARD; @@ -279,9 +279,6 @@ static HRESULT WINAPI d3d_vertex_buffer7_Lock(IDirect3DVertexBuffer7 *iface, hr = wined3d_buffer_map(buffer->wineD3DVertexBuffer, 0, 0, (BYTE **)data, wined3d_flags); - if (SUCCEEDED(hr)) - buffer->read_since_last_map = FALSE; - wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index c53021b..fbbe398 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -944,13 +944,20 @@ struct wined3d_resource * CDECL wined3d_buffer_get_resource(struct wined3d_buffe HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UINT size, BYTE **data, DWORD flags) { - BOOL dirty = buffer_is_dirty(buffer); LONG count; BYTE *base; TRACE("buffer %p, offset %u, size %u, data %p, flags %#x\n", buffer, offset, size, data, flags); flags = wined3d_resource_sanitize_map_flags(&buffer->resource, flags); + /* Filter redundant WINED3D_MAP_DISCARD maps. The 3DMark2001 multitexture + * fill rate test seems to depend on this. When we map a buffer with + * GL_MAP_INVALIDATE_BUFFER_BIT, the driver is free to discard the + * previous contents of the buffer. The r600g driver only does this when + * the buffer is currently in use, while the proprietary NVIDIA driver + * appears to do this unconditionally. */ + if (buffer->flags & WINED3D_BUFFER_DISCARD) + flags &= ~WINED3D_MAP_DISCARD; count = ++buffer->resource.map_count; if (buffer->buffer_object) @@ -1026,25 +1033,14 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN context_release(context); } } - else - { - if (dirty) - { - if (buffer->flags & WINED3D_BUFFER_NOSYNC && !(flags & WINED3D_MAP_NOOVERWRITE)) - { - buffer->flags &= ~WINED3D_BUFFER_NOSYNC; - } - } - else if(flags & WINED3D_MAP_NOOVERWRITE) - { - buffer->flags |= WINED3D_BUFFER_NOSYNC; - } - if (flags & WINED3D_MAP_DISCARD) - { - buffer->flags |= WINED3D_BUFFER_DISCARD; - } - } + if (flags & WINED3D_MAP_DISCARD) + buffer->flags |= WINED3D_BUFFER_DISCARD; + + if (!(flags & WINED3D_MAP_NOOVERWRITE)) + buffer->flags &= ~WINED3D_BUFFER_NOSYNC; + else if (!buffer_is_dirty(buffer)) + buffer->flags |= WINED3D_BUFFER_NOSYNC; } base = buffer->map_ptr ? buffer->map_ptr : buffer->resource.heap_memory;

1 0

Henri Verbeet : ddraw: User memory surfaces should be in the system memory pool.
by Alexandre Julliard 04 Mar '14

04 Mar '14

Module: wine Branch: master Commit: da2fafca8d504e8794c1d603f5feec1cfbf474f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da2fafca8d504e8794c1d603f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 4 10:21:34 2014 +0100 ddraw: User memory surfaces should be in the system memory pool. --- dlls/ddraw/surface.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index c503992..e49454a 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5531,11 +5531,6 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ /* Ensure DDSD_CAPS is always set. */ desc->dwFlags |= DDSD_CAPS; - /* If the surface is of the 'ALLOCONLOAD' type, ignore the LPSURFACE - * field. Frank Herbert's Dune specifies a NULL pointer for lpSurface. */ - if ((desc->ddsCaps.dwCaps & DDSCAPS_ALLOCONLOAD) || !desc->lpSurface) - desc->dwFlags &= ~DDSD_LPSURFACE; - if (desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { DWORD flippable = desc->ddsCaps.dwCaps & (DDSCAPS_FLIP | DDSCAPS_COMPLEX); @@ -5813,6 +5808,17 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ } } + /* If the surface is of the 'ALLOCONLOAD' type, ignore the LPSURFACE + * field. Frank Herbert's Dune specifies a NULL pointer for lpSurface. */ + if ((desc->ddsCaps.dwCaps & DDSCAPS_ALLOCONLOAD) || !desc->lpSurface) + desc->dwFlags &= ~DDSD_LPSURFACE; + if ((desc->dwFlags & DDSD_LPSURFACE) && wined3d_desc.pool != WINED3D_POOL_SYSTEM_MEM) + { + WARN("User memory surfaces should be in the system memory pool.\n"); + HeapFree(GetProcessHeap(), 0, texture); + return DDERR_INVALIDCAPS; + } + if (desc->ddsCaps.dwCaps & (DDSCAPS_OVERLAY)) wined3d_desc.usage |= WINED3DUSAGE_OVERLAY;

1 0

Henri Verbeet : ddraw: User memory surfaces should be created with an explicit pitch.
by Alexandre Julliard 04 Mar '14

04 Mar '14

Module: wine Branch: master Commit: 162bc8db6e1bf0ba1222c0bfb09319313c803e29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=162bc8db6e1bf0ba1222c0bfb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 4 10:21:35 2014 +0100 ddraw: User memory surfaces should be created with an explicit pitch. --- dlls/ddraw/surface.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index e49454a..af578b3 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5812,11 +5812,21 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ * field. Frank Herbert's Dune specifies a NULL pointer for lpSurface. */ if ((desc->ddsCaps.dwCaps & DDSCAPS_ALLOCONLOAD) || !desc->lpSurface) desc->dwFlags &= ~DDSD_LPSURFACE; - if ((desc->dwFlags & DDSD_LPSURFACE) && wined3d_desc.pool != WINED3D_POOL_SYSTEM_MEM) + if (desc->dwFlags & DDSD_LPSURFACE) { - WARN("User memory surfaces should be in the system memory pool.\n"); - HeapFree(GetProcessHeap(), 0, texture); - return DDERR_INVALIDCAPS; + if (wined3d_desc.pool != WINED3D_POOL_SYSTEM_MEM) + { + WARN("User memory surfaces should be in the system memory pool.\n"); + HeapFree(GetProcessHeap(), 0, texture); + return DDERR_INVALIDCAPS; + } + + if (!(desc->dwFlags & DDSD_PITCH)) + { + WARN("User memory surfaces should explicitly specify the pitch.\n"); + HeapFree(GetProcessHeap(), 0, texture); + return DDERR_INVALIDPARAMS; + } } if (desc->ddsCaps.dwCaps & (DDSCAPS_OVERLAY)) @@ -6057,17 +6067,9 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, s if (desc->dwFlags & DDSD_LPSURFACE) { - UINT pitch = 0; - - if (desc->dwFlags & DDSD_PITCH) - { - pitch = desc->u1.lPitch; - surface->surface_desc.u1.lPitch = pitch; - } - if (FAILED(hr = wined3d_surface_update_desc(wined3d_surface, wined3d_desc.width, wined3d_desc.height, wined3d_desc.format, WINED3D_MULTISAMPLE_NONE, 0, - desc->lpSurface, pitch))) + desc->lpSurface, desc->u1.lPitch))) { ERR("Failed to set surface memory, hr %#x.\n", hr); return hr;

1 0

Henri Verbeet : ddraw: Don' t overwrite the caller specified pitch in ddraw_surface_init().
by Alexandre Julliard 04 Mar '14

04 Mar '14

Module: wine Branch: master Commit: 10db40cecc7455542f13abb097b8167359e05f23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10db40cecc7455542f13abb09… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 4 10:21:36 2014 +0100 ddraw: Don't overwrite the caller specified pitch in ddraw_surface_init(). --- dlls/ddraw/surface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index af578b3..8cfba29 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6059,10 +6059,10 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, s else surface->surface_desc.u1.dwLinearSize = max(4, desc->dwWidth) * max(4, desc->dwHeight); } - else + else if (!(desc->dwFlags & DDSD_LPSURFACE)) { - surface->surface_desc.dwFlags |= DDSD_PITCH; - surface->surface_desc.u1.lPitch = wined3d_surface_get_pitch(wined3d_surface); + desc->dwFlags |= DDSD_PITCH; + desc->u1.lPitch = wined3d_surface_get_pitch(wined3d_surface); } if (desc->dwFlags & DDSD_LPSURFACE)

1 0

Henri Verbeet : ddraw: Validate the surface pitch for user memory surfaces in ddraw_surface_init ().
by Alexandre Julliard 04 Mar '14

04 Mar '14

Module: wine Branch: master Commit: 9c138d772c692d44103a6641c32f3b74dc83303e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c138d772c692d44103a6641c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 4 10:21:37 2014 +0100 ddraw: Validate the surface pitch for user memory surfaces in ddraw_surface_init(). --- dlls/ddraw/surface.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 8cfba29..4a1b112 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6067,6 +6067,12 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, s if (desc->dwFlags & DDSD_LPSURFACE) { + if (desc->u1.lPitch < wined3d_surface_get_pitch(wined3d_surface) || desc->u1.lPitch & 3) + { + WARN("Invalid pitch %u specified.\n", desc->u1.lPitch); + return DDERR_INVALIDPARAMS; + } + if (FAILED(hr = wined3d_surface_update_desc(wined3d_surface, wined3d_desc.width, wined3d_desc.height, wined3d_desc.format, WINED3D_MULTISAMPLE_NONE, 0, desc->lpSurface, desc->u1.lPitch)))

1 0

Alexandre Julliard : configure: Avoid printing empty warning lines.
by Alexandre Julliard 04 Mar '14

04 Mar '14

Module: wine Branch: master Commit: 237d7891ef17d417b70e096d2d9f0eaebdb19ca7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=237d7891ef17d417b70e096d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 4 14:40:39 2014 +0100 configure: Avoid printing empty warning lines. --- aclocal.m4 | 4 ++-- configure | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 8274b89..3d43721 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -782,13 +782,13 @@ if test "x$wine_notices != "x; then IFS="|" for msg in $wine_notices; do IFS="$ac_save_IFS" - AS_VAR_SET_IF([msg],[AC_MSG_NOTICE([$msg])]) + AS_VAR_IF([msg],[],,[AC_MSG_NOTICE([$msg])]) done fi IFS="|" for msg in $wine_warnings; do IFS="$ac_save_IFS" - AS_VAR_SET_IF([msg],[echo >&2 + AS_VAR_IF([msg],[],,[echo >&2 AC_MSG_WARN([$msg])]) done IFS="$ac_save_IFS"]) diff --git a/configure b/configure index dcd8581..56ddd71 100755 --- a/configure +++ b/configure @@ -18907,7 +18907,9 @@ if test "x$wine_notices != "x; then IFS="|" for msg in $wine_notices; do IFS="$ac_save_IFS" - if ${msg+:} false; then : + if ${msg:+false} :; then : + +else { $as_echo "$as_me:${as_lineno-$LINENO}: $msg" >&5 $as_echo "$as_me: $msg" >&6;} fi @@ -18916,7 +18918,9 @@ fi IFS="|" for msg in $wine_warnings; do IFS="$ac_save_IFS" - if ${msg+:} false; then : + if ${msg:+false} :; then : + +else echo >&2 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $msg" >&5 $as_echo "$as_me: WARNING: $msg" >&2;}

1 0

Francois Gouget : advapi32/tests: Fix the backup tests when run in a non-administrator pre-Vista account.
by Alexandre Julliard 04 Mar '14

04 Mar '14

Module: wine Branch: master Commit: daaae48e8fd728b3e33a4a66dcef9c400e4602d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daaae48e8fd728b3e33a4a66d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 4 14:01:04 2014 +0100 advapi32/tests: Fix the backup tests when run in a non-administrator pre-Vista account. --- dlls/advapi32/tests/eventlog.c | 138 +++++++++++++++++++++++----------------- 1 file changed, 79 insertions(+), 59 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index f71529c..a3fe44b 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -49,17 +49,27 @@ static void init_function_pointers(void) pWow64RevertWow64FsRedirection = (void*)GetProcAddress(hkernel32, "Wow64RevertWow64FsRedirection"); } -static void create_backup(const char *filename) +static BOOL create_backup(const char *filename) { HANDLE handle; + DWORD rc, attribs; DeleteFileA(filename); handle = OpenEventLogA(NULL, "Application"); - BackupEventLogA(handle, filename); + rc = BackupEventLogA(handle, filename); + if (!rc && GetLastError() == ERROR_PRIVILEGE_NOT_HELD) + { + skip("insufficient privileges to backup the eventlog\n"); + CloseEventLog(handle); + return FALSE; + } + ok(rc, "BackupEventLogA failed, le=%u\n", GetLastError()); CloseEventLog(handle); + attribs = GetFileAttributesA(filename); todo_wine - ok(GetFileAttributesA(filename) != INVALID_FILE_ATTRIBUTES, "Expected a backup file\n"); + ok(attribs != INVALID_FILE_ATTRIBUTES, "Expected a backup file attribs=%#x le=%u\n", attribs, GetLastError()); + return TRUE; } static void test_open_close(void) @@ -209,23 +219,24 @@ static void test_count(void) CloseEventLog(handle); /* Make a backup eventlog to work with */ - create_backup(backup); + if (create_backup(backup)) + { + handle = OpenBackupEventLogA(NULL, backup); + todo_wine + ok(handle != NULL, "Expected a handle, le=%d\n", GetLastError()); - handle = OpenBackupEventLogA(NULL, backup); - todo_wine - ok(handle != NULL, "Expected a handle\n"); + /* Does GetNumberOfEventLogRecords work with backup eventlogs? */ + count = 0xdeadbeef; + ret = GetNumberOfEventLogRecords(handle, &count); + todo_wine + { + ok(ret, "Expected success\n"); + ok(count != 0xdeadbeef, "Expected the number of records\n"); + } - /* Does GetNumberOfEventLogRecords work with backup eventlogs? */ - count = 0xdeadbeef; - ret = GetNumberOfEventLogRecords(handle, &count); - todo_wine - { - ok(ret, "Expected success\n"); - ok(count != 0xdeadbeef, "Expected the number of records\n"); + CloseEventLog(handle); + DeleteFileA(backup); } - - CloseEventLog(handle); - DeleteFileA(backup); } static void test_oldest(void) @@ -262,23 +273,24 @@ static void test_oldest(void) CloseEventLog(handle); /* Make a backup eventlog to work with */ - create_backup(backup); + if (create_backup(backup)) + { + handle = OpenBackupEventLogA(NULL, backup); + todo_wine + ok(handle != NULL, "Expected a handle\n"); - handle = OpenBackupEventLogA(NULL, backup); - todo_wine - ok(handle != NULL, "Expected a handle\n"); + /* Does GetOldestEventLogRecord work with backup eventlogs? */ + oldest = 0xdeadbeef; + ret = GetOldestEventLogRecord(handle, &oldest); + todo_wine + { + ok(ret, "Expected success\n"); + ok(oldest != 0xdeadbeef, "Expected the number of the oldest record\n"); + } - /* Does GetOldestEventLogRecord work with backup eventlogs? */ - oldest = 0xdeadbeef; - ret = GetOldestEventLogRecord(handle, &oldest); - todo_wine - { - ok(ret, "Expected success\n"); - ok(oldest != 0xdeadbeef, "Expected the number of the oldest record\n"); + CloseEventLog(handle); + DeleteFileA(backup); } - - CloseEventLog(handle); - DeleteFileA(backup); } static void test_backup(void) @@ -306,6 +318,12 @@ static void test_backup(void) ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); ret = BackupEventLogA(handle, backup); + if (!ret && GetLastError() == ERROR_PRIVILEGE_NOT_HELD) + { + skip("insufficient privileges for backup tests\n"); + CloseEventLog(handle); + return; + } ok(ret, "Expected success\n"); todo_wine ok(GetFileAttributesA(backup) != INVALID_FILE_ATTRIBUTES, "Expected a backup file\n"); @@ -516,38 +534,39 @@ static void test_openbackup(void) "Expected RPC_S_SERVER_UNAVAILABLE, got %d\n", GetLastError()); /* Make a backup eventlog to work with */ - create_backup(backup); - - /* FIXME: Wine stops here */ - if (GetFileAttributesA(backup) == INVALID_FILE_ATTRIBUTES) + if (create_backup(backup)) { - skip("We don't have a backup eventlog to work with\n"); - return; - } - - SetLastError(0xdeadbeef); - handle = OpenBackupEventLogA("IDontExist", backup); - ok(handle == NULL, "Didn't expect a handle\n"); - ok(GetLastError() == RPC_S_SERVER_UNAVAILABLE || - GetLastError() == RPC_S_INVALID_NET_ADDR, /* Some Vista and Win7 */ - "Expected RPC_S_SERVER_UNAVAILABLE, got %d\n", GetLastError()); + /* FIXME: Wine stops here */ + if (GetFileAttributesA(backup) == INVALID_FILE_ATTRIBUTES) + { + skip("We don't have a backup eventlog to work with\n"); + return; + } - /* Empty servername should be read as local server */ - handle = OpenBackupEventLogA("", backup); - ok(handle != NULL, "Expected a handle\n"); - CloseEventLog(handle); + SetLastError(0xdeadbeef); + handle = OpenBackupEventLogA("IDontExist", backup); + ok(handle == NULL, "Didn't expect a handle\n"); + ok(GetLastError() == RPC_S_SERVER_UNAVAILABLE || + GetLastError() == RPC_S_INVALID_NET_ADDR, /* Some Vista and Win7 */ + "Expected RPC_S_SERVER_UNAVAILABLE, got %d\n", GetLastError()); + + /* Empty servername should be read as local server */ + handle = OpenBackupEventLogA("", backup); + ok(handle != NULL, "Expected a handle\n"); + CloseEventLog(handle); - handle = OpenBackupEventLogA(NULL, backup); - ok(handle != NULL, "Expected a handle\n"); + handle = OpenBackupEventLogA(NULL, backup); + ok(handle != NULL, "Expected a handle\n"); - /* Can we open that same backup eventlog more than once? */ - handle2 = OpenBackupEventLogA(NULL, backup); - ok(handle2 != NULL, "Expected a handle\n"); - ok(handle2 != handle, "Didn't expect the same handle\n"); - CloseEventLog(handle2); + /* Can we open that same backup eventlog more than once? */ + handle2 = OpenBackupEventLogA(NULL, backup); + ok(handle2 != NULL, "Expected a handle\n"); + ok(handle2 != handle, "Didn't expect the same handle\n"); + CloseEventLog(handle2); - CloseEventLog(handle); - DeleteFileA(backup); + CloseEventLog(handle); + DeleteFileA(backup); + } /* Is there any content checking done? */ file = CreateFileA(backup, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, NULL); @@ -585,7 +604,8 @@ static void test_clear(void) ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); /* Make a backup eventlog to work with */ - create_backup(backup); + if (!create_backup(backup)) + return; SetLastError(0xdeadbeef); ret = ClearEventLogA(NULL, backup);

1 0

Francois Gouget : kernel32/tests: Skip some profile tests if not allowed to create files in the Windows directory.
by Alexandre Julliard 04 Mar '14

04 Mar '14

Module: wine Branch: master Commit: f1087d865b8aa0c4dde43060def21d2d09dc1f92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1087d865b8aa0c4dde43060d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 4 15:21:56 2014 +0100 kernel32/tests: Skip some profile tests if not allowed to create files in the Windows directory. --- dlls/kernel32/tests/profile.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index ca3a07e..2eb90a8 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -1019,18 +1019,22 @@ static void test_WritePrivateProfileString(void) broken(GetLastError() == ERROR_PATH_NOT_FOUND), /* Win9x and WinME */ "Expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); - /* The resulting file will be X:\\%WINDIR%\\win1.tmp */ + /* Relative paths are relative to X:\\%WINDIR% */ GetWindowsDirectoryA(temp, MAX_PATH); GetTempFileNameA(temp, "win", 1, path); - DeleteFileA(path); + if (GetFileAttributesA(path) == INVALID_FILE_ATTRIBUTES) + skip("Not allowed to create a file in the Windows directory\n"); + else + { + DeleteFileA(path); - /* relative path in lpFileName */ - data = "[App]\r\n" - "key=string\r\n"; - ret = WritePrivateProfileStringA("App", "key", "string", "win1.tmp"); - ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - ok(check_file_data(path, data), "File doesn't match\n"); - DeleteFileA(path); + data = "[App]\r\n" + "key=string\r\n"; + ret = WritePrivateProfileStringA("App", "key", "string", "win1.tmp"); + ok(ret == TRUE, "Expected TRUE, got %d, le=%u\n", ret, GetLastError()); + ok(check_file_data(path, data), "File doesn't match\n"); + DeleteFileA(path); + } GetTempPathA(MAX_PATH, temp); GetTempFileNameA(temp, "wine", 0, path);

1 0

Jacek Caban : crypt32: Moved chain engine handle handling to separated function and improved error handling.
by Alexandre Julliard 04 Mar '14

04 Mar '14

Module: wine Branch: master Commit: 786c0c2d58284d51cc67443e27c88a0737be060c URL: http://source.winehq.org/git/wine.git/?a=commit;h=786c0c2d58284d51cc67443e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 4 13:18:21 2014 +0100 crypt32: Moved chain engine handle handling to separated function and improved error handling. --- dlls/crypt32/chain.c | 173 ++++++++++++++++++++-------------------- dlls/crypt32/crypt32_private.h | 3 +- 2 files changed, 89 insertions(+), 87 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 427db63..ffca677 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -33,8 +33,6 @@ WINE_DECLARE_DEBUG_CHANNEL(chain); #define DEFAULT_CYCLE_MODULUS 7 -static HCERTCHAINENGINE CRYPT_defaultChainEngine; - /* This represents a subset of a certificate chain engine: it doesn't include * the "hOther" store described by MSDN, because I'm not sure how that's used. * It also doesn't include the "hTrust" store, because I don't yet implement @@ -114,45 +112,88 @@ static BOOL CRYPT_CheckRestrictedRoot(HCERTSTORE store) return ret; } -HCERTCHAINENGINE CRYPT_CreateChainEngine(HCERTSTORE root, - PCERT_CHAIN_ENGINE_CONFIG pConfig) +HCERTCHAINENGINE CRYPT_CreateChainEngine(HCERTSTORE root, const CERT_CHAIN_ENGINE_CONFIG *config) { + CertificateChainEngine *engine; + HCERTSTORE worldStores[4]; + static const WCHAR caW[] = { 'C','A',0 }; static const WCHAR myW[] = { 'M','y',0 }; static const WCHAR trustW[] = { 'T','r','u','s','t',0 }; - CertificateChainEngine *engine = - CryptMemAlloc(sizeof(CertificateChainEngine)); - - if (engine) - { - HCERTSTORE worldStores[4]; - - engine->ref = 1; - engine->hRoot = root; - engine->hWorld = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0, - CERT_STORE_CREATE_NEW_FLAG, NULL); - worldStores[0] = CertDuplicateStore(engine->hRoot); - worldStores[1] = CertOpenSystemStoreW(0, caW); - worldStores[2] = CertOpenSystemStoreW(0, myW); - worldStores[3] = CertOpenSystemStoreW(0, trustW); - CRYPT_AddStoresToCollection(engine->hWorld, - sizeof(worldStores) / sizeof(worldStores[0]), worldStores); - CRYPT_AddStoresToCollection(engine->hWorld, - pConfig->cAdditionalStore, pConfig->rghAdditionalStore); - CRYPT_CloseStores(sizeof(worldStores) / sizeof(worldStores[0]), - worldStores); - engine->dwFlags = pConfig->dwFlags; - engine->dwUrlRetrievalTimeout = pConfig->dwUrlRetrievalTimeout; - engine->MaximumCachedCertificates = - pConfig->MaximumCachedCertificates; - if (pConfig->CycleDetectionModulus) - engine->CycleDetectionModulus = pConfig->CycleDetectionModulus; + + if(!root) { + if(config->cbSize >= sizeof(CERT_CHAIN_ENGINE_CONFIG) && config->hExclusiveRoot) + root = CertDuplicateStore(config->hExclusiveRoot); + else if (config->hRestrictedRoot) + root = CertDuplicateStore(config->hRestrictedRoot); else - engine->CycleDetectionModulus = DEFAULT_CYCLE_MODULUS; + root = CertOpenSystemStoreW(0, rootW); + if(!root) + return NULL; + } + + engine = CryptMemAlloc(sizeof(CertificateChainEngine)); + if(!engine) { + CertCloseStore(root, 0); + return NULL; } + + engine->ref = 1; + engine->hRoot = root; + engine->hWorld = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); + worldStores[0] = CertDuplicateStore(engine->hRoot); + worldStores[1] = CertOpenSystemStoreW(0, caW); + worldStores[2] = CertOpenSystemStoreW(0, myW); + worldStores[3] = CertOpenSystemStoreW(0, trustW); + + CRYPT_AddStoresToCollection(engine->hWorld, sizeof(worldStores) / sizeof(worldStores[0]), worldStores); + CRYPT_AddStoresToCollection(engine->hWorld, config->cAdditionalStore, config->rghAdditionalStore); + CRYPT_CloseStores(sizeof(worldStores) / sizeof(worldStores[0]), worldStores); + + engine->dwFlags = config->dwFlags; + engine->dwUrlRetrievalTimeout = config->dwUrlRetrievalTimeout; + engine->MaximumCachedCertificates = config->MaximumCachedCertificates; + if(config->CycleDetectionModulus) + engine->CycleDetectionModulus = config->CycleDetectionModulus; + else + engine->CycleDetectionModulus = DEFAULT_CYCLE_MODULUS; + return engine; } +static CertificateChainEngine *default_cu_engine; + +static CertificateChainEngine *get_chain_engine(HCERTCHAINENGINE handle, BOOL allow_default) +{ + const CERT_CHAIN_ENGINE_CONFIG config = { sizeof(config) }; + + if(handle == HCCE_CURRENT_USER) { + if(!allow_default) + return NULL; + + if(!default_cu_engine) { + handle = CRYPT_CreateChainEngine(NULL, &config); + InterlockedCompareExchangePointer((void**)&default_cu_engine, handle, NULL); + if(default_cu_engine != handle) + CertFreeCertificateChainEngine(handle); + } + + return default_cu_engine; + } + + return (CertificateChainEngine*)handle; +} + +static void free_chain_engine(CertificateChainEngine *engine) +{ + if(!engine || InterlockedDecrement(&engine->ref)) + return; + + CertCloseStore(engine->hWorld, 0); + CertCloseStore(engine->hRoot, 0); + CryptMemFree(engine); +} + typedef struct _CERT_CHAIN_ENGINE_CONFIG_NO_EXCLUSIVE_ROOT { DWORD cbSize; @@ -180,66 +221,26 @@ BOOL WINAPI CertCreateCertificateChainEngine(PCERT_CHAIN_ENGINE_CONFIG pConfig, SetLastError(E_INVALIDARG); return FALSE; } - *phChainEngine = NULL; ret = CRYPT_CheckRestrictedRoot(pConfig->hRestrictedRoot); - if (ret) + if (!ret) { - HCERTSTORE root; - HCERTCHAINENGINE engine; - - if (pConfig->cbSize >= sizeof(CERT_CHAIN_ENGINE_CONFIG) && - pConfig->hExclusiveRoot) - root = CertDuplicateStore(pConfig->hExclusiveRoot); - else if (pConfig->hRestrictedRoot) - root = CertDuplicateStore(pConfig->hRestrictedRoot); - else - root = CertOpenSystemStoreW(0, rootW); - engine = CRYPT_CreateChainEngine(root, pConfig); - if (engine) - { - *phChainEngine = engine; - ret = TRUE; - } - else - ret = FALSE; + *phChainEngine = NULL; + return FALSE; } - return ret; -} - -VOID WINAPI CertFreeCertificateChainEngine(HCERTCHAINENGINE hChainEngine) -{ - CertificateChainEngine *engine = (CertificateChainEngine*)hChainEngine; - - TRACE("(%p)\n", hChainEngine); - if (engine && InterlockedDecrement(&engine->ref) == 0) - { - CertCloseStore(engine->hWorld, 0); - CertCloseStore(engine->hRoot, 0); - CryptMemFree(engine); - } + *phChainEngine = CRYPT_CreateChainEngine(NULL, pConfig); + return *phChainEngine != NULL; } -static HCERTCHAINENGINE CRYPT_GetDefaultChainEngine(void) +void WINAPI CertFreeCertificateChainEngine(HCERTCHAINENGINE hChainEngine) { - if (!CRYPT_defaultChainEngine) - { - CERT_CHAIN_ENGINE_CONFIG config = { 0 }; - HCERTCHAINENGINE engine; - - config.cbSize = sizeof(config); - CertCreateCertificateChainEngine(&config, &engine); - InterlockedCompareExchangePointer(&CRYPT_defaultChainEngine, engine, - NULL); - if (CRYPT_defaultChainEngine != engine) - CertFreeCertificateChainEngine(engine); - } - return CRYPT_defaultChainEngine; + TRACE("(%p)\n", hChainEngine); + free_chain_engine(get_chain_engine(hChainEngine, FALSE)); } void default_chain_engine_free(void) { - CertFreeCertificateChainEngine(CRYPT_defaultChainEngine); + free_chain_engine(default_cu_engine); } typedef struct _CertificateChain @@ -2867,14 +2868,18 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, PCERT_CHAIN_PARA pChainPara, DWORD dwFlags, LPVOID pvReserved, PCCERT_CHAIN_CONTEXT* ppChainContext) { - CertificateChainEngine *engine = (CertificateChainEngine*)hChainEngine; + CertificateChainEngine *engine; BOOL ret; CertificateChain *chain = NULL; - TRACE("(%p, %p, %s, %p, %p, %08x, %p, %p)\n", engine, pCertContext, + TRACE("(%p, %p, %s, %p, %p, %08x, %p, %p)\n", hChainEngine, pCertContext, debugstr_filetime(pTime), hAdditionalStore, pChainPara, dwFlags, pvReserved, ppChainContext); + engine = get_chain_engine(hChainEngine, TRUE); + if (!engine) + return FALSE; + if (ppChainContext) *ppChainContext = NULL; if (!pChainPara) @@ -2888,8 +2893,6 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, return FALSE; } - if (!engine) - engine = CRYPT_GetDefaultChainEngine(); if (TRACE_ON(chain)) dump_chain_para(pChainPara); /* FIXME: what about HCCE_LOCAL_MACHINE? */ diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 53e0834..b582a78 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -342,8 +342,7 @@ WINECRYPT_CERTSTORE *CRYPT_RootOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags) D * the root store. Instead, it uses root, and assumes the caller has done any * checking necessary. */ -HCERTCHAINENGINE CRYPT_CreateChainEngine(HCERTSTORE root, - PCERT_CHAIN_ENGINE_CONFIG pConfig) DECLSPEC_HIDDEN; +HCERTCHAINENGINE CRYPT_CreateChainEngine(HCERTSTORE, const CERT_CHAIN_ENGINE_CONFIG*) DECLSPEC_HIDDEN; /* Helper function for store reading functions and * CertAddSerializedElementToStore. Returns a context of the appropriate type

1 0