January 2016 - Wine-Commits

Nikolay Sivov : shlwapi/tests: Fix uninitialized data access in tests ( Valgrind).
by Alexandre Julliard Jan. 9, 2016

Jan. 9, 2016

Module: wine Branch: master Commit: ed0520e2e2a4c15eebc4f97a6f6d8258ad9387b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed0520e2e2a4c15eebc4f97a6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 7 23:14:55 2016 +0300 shlwapi/tests: Fix uninitialized data access in tests (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/ordinal.c | 2 +- dlls/shlwapi/tests/ordinal.c | 41 +++++++++++++++++++++-------------------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index e3d021f..334607e 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4842,7 +4842,7 @@ typedef struct SHELL_USER_PERMISSION { /* ...and this should be in shlwapi.h */ * NOTES * Call should free returned descriptor with LocalFree */ -PSECURITY_DESCRIPTOR WINAPI GetShellSecurityDescriptor(PSHELL_USER_PERMISSION *apUserPerm, int cUserPerm) +PSECURITY_DESCRIPTOR WINAPI GetShellSecurityDescriptor(const PSHELL_USER_PERMISSION *apUserPerm, int cUserPerm) { PSID *sidlist; PSID cur_user = NULL; diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index afccd3a..2a1eaed 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -72,6 +72,23 @@ static HWND (WINAPI *pSHSetParentHwnd)(HWND, HWND); static HRESULT (WINAPI *pIUnknown_GetClassID)(IUnknown*, CLSID*); static HRESULT (WINAPI *pDllGetVersion)(DLLVERSIONINFO2*); +typedef struct SHELL_USER_SID { + SID_IDENTIFIER_AUTHORITY sidAuthority; + DWORD dwUserGroupID; + DWORD dwUserID; +} SHELL_USER_SID, *PSHELL_USER_SID; +typedef struct SHELL_USER_PERMISSION { + + SHELL_USER_SID susID; + DWORD dwAccessType; + BOOL fInherit; + DWORD dwAccessMask; + DWORD dwInheritMask; + DWORD dwInheritAccessMask; +} SHELL_USER_PERMISSION, *PSHELL_USER_PERMISSION; + +static SECURITY_DESCRIPTOR* (WINAPI *pGetShellSecurityDescriptor)(const SHELL_USER_PERMISSION**,int); + static HMODULE hmlang; static HRESULT (WINAPI *pLcidToRfc1766A)(LCID, LPSTR, INT); @@ -676,40 +693,23 @@ static void test_fdsa(void) HeapFree(GetProcessHeap(), 0, mem); } - -typedef struct SHELL_USER_SID { - SID_IDENTIFIER_AUTHORITY sidAuthority; - DWORD dwUserGroupID; - DWORD dwUserID; -} SHELL_USER_SID, *PSHELL_USER_SID; -typedef struct SHELL_USER_PERMISSION { - SHELL_USER_SID susID; - DWORD dwAccessType; - BOOL fInherit; - DWORD dwAccessMask; - DWORD dwInheritMask; - DWORD dwInheritAccessMask; -} SHELL_USER_PERMISSION, *PSHELL_USER_PERMISSION; static void test_GetShellSecurityDescriptor(void) { - SHELL_USER_PERMISSION supCurrentUserFull = { + static const SHELL_USER_PERMISSION supCurrentUserFull = { { {SECURITY_NULL_SID_AUTHORITY}, 0, 0 }, ACCESS_ALLOWED_ACE_TYPE, FALSE, GENERIC_ALL, 0, 0 }; #define MY_INHERITANCE 0xBE /* invalid value to proof behavior */ - SHELL_USER_PERMISSION supEveryoneDenied = { + static const SHELL_USER_PERMISSION supEveryoneDenied = { { {SECURITY_WORLD_SID_AUTHORITY}, SECURITY_WORLD_RID, 0 }, ACCESS_DENIED_ACE_TYPE, TRUE, GENERIC_WRITE, MY_INHERITANCE | 0xDEADBA00, GENERIC_READ }; - PSHELL_USER_PERMISSION rgsup[2] = { + const SHELL_USER_PERMISSION* rgsup[2] = { &supCurrentUserFull, &supEveryoneDenied, }; SECURITY_DESCRIPTOR* psd; - SECURITY_DESCRIPTOR* (WINAPI*pGetShellSecurityDescriptor)(PSHELL_USER_PERMISSION*,int); void *pChrCmpIW = GetProcAddress(hShlwapi, "ChrCmpIW"); - pGetShellSecurityDescriptor=(void*)GetProcAddress(hShlwapi,(char*)475); - if(!pGetShellSecurityDescriptor) { win_skip("GetShellSecurityDescriptor not available\n"); @@ -3064,6 +3064,7 @@ static void init_pointers(void) MAKEFUNC(SHFormatDateTimeA, 353); MAKEFUNC(SHFormatDateTimeW, 354); MAKEFUNC(SHIShellFolder_EnumObjects, 404); + MAKEFUNC(GetShellSecurityDescriptor, 475); MAKEFUNC(SHGetObjectCompatFlags, 476); MAKEFUNC(IUnknown_QueryServiceExec, 484); MAKEFUNC(SHGetShellKey, 491);

1 0

Alexandre Julliard : Release 1.9.1.
by Alexandre Julliard Jan. 9, 2016

Jan. 9, 2016

Module: wine Branch: master Commit: 91dd155e9bc13c1bc1be860cd67fe3e48c20feae URL: http://source.winehq.org/git/wine.git/?a=commit;h=91dd155e9bc13c1bc1be860cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 9 18:30:39 2016 +0900 Release 1.9.1. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 484 ++++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 +-- 3 files changed, 262 insertions(+), 242 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=91dd155e9bc13c1bc1be8…

1 0

Tag wine-1.9.1 : Alexandre Julliard : Release 1.9.1
by Alexandre Julliard Jan. 9, 2016

Jan. 9, 2016

Module: wine Branch: refs/tags/wine-1.9.1 Tag: 0dc2659f07ed2a614f6ae73fba3c89810f34face URL: http://source.winehq.org/git/wine.git/?a=tag;h=0dc2659f07ed2a614f6ae73fba3c… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 9 18:30:40 2016 +0900 Release 1.9.1

1 0

Nikolay Sivov : comctl32/tests: Separate individual Trackbar tests from each other.
by Alexandre Julliard Jan. 9, 2016

Jan. 9, 2016

Module: wine Branch: master Commit: 1fce80024bab34a0828cb8f04c69819d3452ade9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fce80024bab34a0828cb8f04… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 8 15:47:07 2016 +0300 comctl32/tests: Separate individual Trackbar tests from each other. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/trackbar.c | 202 ++++++++++++++++++++++++++++------------- 1 file changed, 138 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1fce80024bab34a0828cb…

1 0

Alex Henrie : ntdll/tests: Correct signaled / not signaled error messages.
by Alexandre Julliard Jan. 9, 2016

Jan. 9, 2016

Module: wine Branch: master Commit: a228d7d9808d5a48b3a31e7fdd06e73b112df20f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a228d7d9808d5a48b3a31e7fd… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Jan 8 02:38:36 2016 -0700 ntdll/tests: Correct signaled / not signaled error messages. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index b8f1847..7bf2ffe 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -677,7 +677,7 @@ static void read_file_test(void) apc_count = 0; U(iosb).Status = 0xdeadbabe; iosb.Information = 0xdeadbeef; - ok( !is_signaled( read ), "read handle is not signaled\n" ); + ok( !is_signaled( read ), "read handle is signaled\n" ); status = pNtReadFile( read, 0, apc, &apc_count, &iosb, buffer, 1, NULL, NULL ); ok( status == STATUS_PENDING, "wrong status %x\n", status ); ok( !is_signaled( read ), "read handle is signaled\n" ); @@ -690,7 +690,7 @@ static void read_file_test(void) Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 1, "wrong info %lu\n", iosb.Information ); - ok( is_signaled( read ), "read handle is signaled\n" ); + ok( is_signaled( read ), "read handle is not signaled\n" ); ok( !apc_count, "apc was called\n" ); apc_count = 0; SleepEx( 1, FALSE ); /* non-alertable sleep */ @@ -731,7 +731,7 @@ static void read_file_test(void) ok(ret && written == 1, "WriteFile error %d\n", GetLastError()); /* partial read is good enough */ Sleep(1); /* FIXME: needed for wine to run the i/o apc */ - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 1, "wrong info %lu\n", iosb.Information ); ok( !apc_count, "apc was called\n" ); @@ -762,7 +762,7 @@ static void read_file_test(void) ok( status == STATUS_INVALID_HANDLE, "wrong status %x\n", status ); ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); /* not reset on invalid handle */ + ok( is_signaled( event ), "event is not signaled\n" ); /* not reset on invalid handle */ ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( !apc_count, "apc was called\n" ); @@ -782,7 +782,7 @@ static void read_file_test(void) Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( U(iosb).Status == STATUS_PIPE_BROKEN, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); @@ -807,7 +807,7 @@ static void read_file_test(void) Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); @@ -833,7 +833,7 @@ static void read_file_test(void) Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); @@ -859,7 +859,7 @@ static void read_file_test(void) Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); @@ -885,7 +885,7 @@ static void read_file_test(void) Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 2, "apc was not called\n" ); @@ -906,7 +906,7 @@ static void read_file_test(void) if (status == STATUS_PENDING) WaitForSingleObject( event, 1000 ); ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == strlen(text), "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); @@ -923,7 +923,7 @@ static void read_file_test(void) if (status == STATUS_PENDING) WaitForSingleObject( event, 1000 ); ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == strlen(text), "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); @@ -940,7 +940,7 @@ static void read_file_test(void) WaitForSingleObject( event, 1000 ); ok( U(iosb).Status == STATUS_END_OF_FILE, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); @@ -961,7 +961,7 @@ static void read_file_test(void) if (status == STATUS_PENDING) WaitForSingleObject( event, 1000 ); ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == strlen(text), "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); @@ -975,7 +975,7 @@ static void read_file_test(void) ok( status == STATUS_SUCCESS, "wrong status %x\n", status ); ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == strlen(text), "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ todo_wine ok( !apc_count, "apc was called\n" );

1 0

Nikolay Sivov : shlwapi: Fix initializer causing compiler warning.
by Alexandre Julliard Jan. 9, 2016

Jan. 9, 2016

Module: wine Branch: master Commit: 37cdf65949a22e53195520326a58a79a604ad2af URL: http://source.winehq.org/git/wine.git/?a=commit;h=37cdf65949a22e53195520326… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 7 17:09:47 2016 +0300 shlwapi: Fix initializer causing compiler warning. Spotted by Józef. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/stopwatch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/stopwatch.c b/dlls/shlwapi/stopwatch.c index c7b4356..fcee075 100644 --- a/dlls/shlwapi/stopwatch.c +++ b/dlls/shlwapi/stopwatch.c @@ -190,7 +190,7 @@ void WINAPI StopWatch_MarkJavaStop(LPCWSTR lpszEvent, HWND hWnd, DWORD dwReserve */ DWORD WINAPI GetPerfTime(void) { - static LARGE_INTEGER iCounterFreq = { 0 }; + static LARGE_INTEGER iCounterFreq = { {0} }; LARGE_INTEGER iCounter; TRACE("()\n");

1 0

Józef Kucia : d3d9: Implement d3d9_device_CreateDepthStencilSurfaceEx().
by Alexandre Julliard Jan. 9, 2016

Jan. 9, 2016

Module: wine Branch: master Commit: 89c6a755c4c752558b8d3bf3ba3883d8d3ab4cbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=89c6a755c4c752558b8d3bf3b… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Thu Jan 7 16:22:45 2016 +0100 d3d9: Implement d3d9_device_CreateDepthStencilSurfaceEx(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 294e680..ef019b1 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3352,16 +3352,28 @@ static HRESULT WINAPI d3d9_device_CreateDepthStencilSurfaceEx(IDirect3DDevice9Ex UINT width, UINT height, D3DFORMAT format, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, BOOL discard, IDirect3DSurface9 **surface, HANDLE *shared_handle, DWORD usage) { - FIXME("iface %p, width %u, height %u, format %#x, multisample_type %#x, multisample_quality %u,\n" - "discard %#x, surface %p, shared_handle %p, usage %#x stub!\n", + struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + DWORD flags = WINED3D_SURFACE_MAPPABLE; + + TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x, multisample_quality %u, " + "discard %#x, surface %p, shared_handle %p, usage %#x.\n", iface, width, height, format, multisample_type, multisample_quality, discard, surface, shared_handle, usage); - *surface = NULL; + if (usage & D3DUSAGE_DEPTHSTENCIL) + { + WARN("Invalid usage %#x.\n", usage); + return D3DERR_INVALIDCALL; + } + if (shared_handle) FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); - return E_NOTIMPL; + if (discard) + flags |= WINED3D_SURFACE_DISCARD; + + return d3d9_device_create_surface(device, width, height, format, flags, surface, + D3DUSAGE_DEPTHSTENCIL | usage, D3DPOOL_DEFAULT, multisample_type, multisample_quality, NULL); } static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_ResetEx(IDirect3DDevice9Ex *iface,

1 0

Alistair Leslie-Hughes : d3dx9/tests: Add D3DXSaveSurfaceToFileInMemory DDS header tests.
by Alexandre Julliard Jan. 9, 2016

Jan. 9, 2016

Module: wine Branch: master Commit: 54ebbfdc63d9952d3cff1476d16ed9578d222808 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54ebbfdc63d9952d3cff1476d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Dec 22 18:26:31 2015 +1100 d3dx9/tests: Add D3DXSaveSurfaceToFileInMemory DDS header tests. Also update the structure dds_header to be the same as d3dx9_36/surface.c. Use (DDS_CAPS_TEXTURE | DDSCAPS_ALPHA) with a todo. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/surface.c | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 1697a03..f22bf21 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -175,6 +175,7 @@ static HRESULT create_file(const char *filename, const unsigned char *data, cons #define DDS_LINEARSIZE 0x00080000 /* dds_header.caps */ +#define DDSCAPS_ALPHA 0x00000002 #define DDS_CAPS_TEXTURE 0x00001000 /* dds_pixel_format.flags */ @@ -211,7 +212,9 @@ struct dds_header struct dds_pixel_format pixel_format; DWORD caps; DWORD caps2; - DWORD reserved2[3]; + DWORD caps3; + DWORD caps4; + DWORD reserved2; }; /* fills dds_header with reasonable default values */ @@ -1231,6 +1234,7 @@ static void test_D3DXSaveSurfaceToFileInMemory(IDirect3DDevice9 *device) RECT rect; ID3DXBuffer *buffer; IDirect3DSurface9 *surface; + struct dds_header *header; hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 4, 4, D3DFMT_A8R8G8B8, D3DPOOL_SCRATCH, &surface, NULL); if (FAILED(hr)) { @@ -1248,6 +1252,42 @@ static void test_D3DXSaveSurfaceToFileInMemory(IDirect3DDevice9 *device) ID3DXBuffer_Release(buffer); } + SetRectEmpty(&rect); + hr = D3DXSaveSurfaceToFileInMemory(&buffer, D3DXIFF_DDS, surface, NULL, &rect); + todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + header = ID3DXBuffer_GetBufferPointer(buffer); + + ok(header->magic == MAKEFOURCC('D','D','S',' '), "Invalid DDS signature.\n"); + ok(header->size == 124, "Invalid DDS size %u.\n", header->size); + ok(!header->height, "Got unexpected height %u.\n", header->height); + ok(!header->width, "Got unexpected width %u.\n", header->width); + ok(!header->depth, "Got unexpected depth %u.\n", header->depth); + ok(!header->miplevels, "Got unexpected miplevels %u.\n", header->miplevels); + ok(!header->pitch_or_linear_size, "Got unexpected pitch_or_linear_size %u.\n", header->pitch_or_linear_size); + ok(header->caps == (DDS_CAPS_TEXTURE | DDSCAPS_ALPHA), "Got unexpected caps %x.\n", header->caps); + ok(header->flags == (DDS_CAPS | DDS_HEIGHT | DDS_WIDTH | DDS_PIXELFORMAT), + "Got unexpected flags %x.\n", header->flags); + ID3DXBuffer_Release(buffer); + } + + hr = D3DXSaveSurfaceToFileInMemory(&buffer, D3DXIFF_DDS, surface, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + header = ID3DXBuffer_GetBufferPointer(buffer); + + ok(header->magic == MAKEFOURCC('D','D','S',' '), "Invalid DDS signature.\n"); + todo_wine ok(header->size == 124, "Invalid DDS size %u.\n", header->size); + ok(header->height == 4, "Got unexpected height %u.\n", header->height); + ok(header->width == 4, "Got unexpected width %u.\n", header->width); + todo_wine ok(!header->depth, "Got unexpected depth %u.\n", header->depth); + todo_wine ok(!header->miplevels, "Got unexpected miplevels %u.\n", header->miplevels); + todo_wine ok(!header->pitch_or_linear_size, "Got unexpected pitch_or_linear_size %u.\n", header->pitch_or_linear_size); + todo_wine ok(header->caps == (DDS_CAPS_TEXTURE | DDSCAPS_ALPHA), "Got unexpected caps %x.\n", header->caps); + todo_wine ok(header->flags == (DDS_CAPS | DDS_HEIGHT | DDS_WIDTH | DDS_PIXELFORMAT), + "Got unexpected flags %x.\n", header->flags); + ID3DXBuffer_Release(buffer); + IDirect3DSurface9_Release(surface); }

1 0

Sebastian Lackner : cmd: Fix sharing permissions of piped output files.
by Alexandre Julliard Jan. 9, 2016

Jan. 9, 2016

Module: wine Branch: master Commit: c634f34aae0d35d3fe9a687abd86e8c0832b7d17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c634f34aae0d35d3fe9a687ab… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jan 7 08:01:38 2016 +0100 cmd: Fix sharing permissions of piped output files. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/tests/test_builtins.cmd.exp | 2 +- programs/cmd/wcmdmain.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 811ba9f..7543b53 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1207,7 +1207,7 @@ passed --- a batch file can delete itself file correctly deleted --- a batch file can alter itself -(a)todo_wine@bar +bar ---------- Testing copy Passed: Found expected dummy.file Passed: Found expected dir1\file1 diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index bf988f5..de92e0a 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1364,7 +1364,7 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, if (cmdList && (*cmdList)->pipeFile[0] != 0x00) { WINE_TRACE("Input coming from %s\n", wine_dbgstr_w((*cmdList)->pipeFile)); h = CreateFileW((*cmdList)->pipeFile, GENERIC_READ, - FILE_SHARE_READ, &sa, OPEN_EXISTING, + FILE_SHARE_READ | FILE_SHARE_WRITE, &sa, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE, NULL); if (h == INVALID_HANDLE_VALUE) { WCMD_print_error (); @@ -1425,8 +1425,8 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, } else { WCHAR *param = WCMD_parameter(p, 0, NULL, FALSE, FALSE); - h = CreateFileW(param, GENERIC_WRITE, 0, &sa, creationDisposition, - FILE_ATTRIBUTE_NORMAL, NULL); + h = CreateFileW(param, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_DELETE, + &sa, creationDisposition, FILE_ATTRIBUTE_NORMAL, NULL); if (h == INVALID_HANDLE_VALUE) { WCMD_print_error (); heap_free(cmd);

1 0

Bernhard Übelacker : msvcp120/tests: Test virtual base table size exports.
by Alexandre Julliard Jan. 9, 2016

Jan. 9, 2016

Module: wine Branch: master Commit: 91ddd1d8b2b3164bffe1b4a7ddf2c485dd7a3879 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91ddd1d8b2b3164bffe1b4a7d… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Thu Jan 7 13:13:36 2016 +0100 msvcp120/tests: Test virtual base table size exports. Signed-off-by: Bernhard Übelacker <bernhardu(a)vr-web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 51 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 6ea024a..f5c0954 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -1549,6 +1549,55 @@ static void test_cnd(void) CloseHandle(cm.initialized); } +static struct { + struct { + int value; + int todo; + } arch[2]; + const char* export_name; +} vbtable_size_exports_list[] = { + {{{0x20, FALSE}, {0x20, FALSE}}, "??_8?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@7B?$basic_istream(a)DU?$char_traits(a)D@std@@@1@@"}, + {{{0x10, FALSE}, {0x10, FALSE}}, "??_8?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@7B?$basic_ostream(a)DU?$char_traits(a)D@std@@@1@@"}, + {{{0x20, FALSE}, {0x20, FALSE}}, "??_8?$basic_iostream(a)GU?$char_traits(a)G@std@@@std@@7B?$basic_istream(a)GU?$char_traits(a)G@std@@@1@@"}, + {{{0x10, FALSE}, {0x10, FALSE}}, "??_8?$basic_iostream(a)GU?$char_traits(a)G@std@@@std@@7B?$basic_ostream(a)GU?$char_traits(a)G@std@@@1@@"}, + {{{0x20, FALSE}, {0x20, FALSE}}, "??_8?$basic_iostream(a)_WU?$char_traits(a)_W@std@@@std@@7B?$basic_istream(a)_WU?$char_traits(a)_W@std@@@1@@"}, + {{{0x10, FALSE}, {0x10, FALSE}}, "??_8?$basic_iostream(a)_WU?$char_traits(a)_W@std@@@std@@7B?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1@@"}, + {{{0x18, FALSE}, {0x18, FALSE}}, "??_8?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@7B@"}, + {{{0x18, FALSE}, {0x18, FALSE}}, "??_8?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@7B@"}, + {{{0x18, FALSE}, {0x18, FALSE}}, "??_8?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@7B@"}, + {{{ 0x8, TRUE}, {0x10, FALSE}}, "??_8?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@7B@"}, + {{{ 0x8, TRUE}, {0x10, FALSE}}, "??_8?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@7B@"}, + {{{ 0x8, TRUE}, {0x10, FALSE}}, "??_8?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@7B@"}, + {{{ 0x0, FALSE}, { 0x0, FALSE}}, 0} +}; + +static void test_vbtable_size_exports(void) +{ + int i; + const int *p_vbtable; + int arch_idx; + + if(sizeof(void*) == 8) + arch_idx = 1; + else + arch_idx = 0; + + for (i = 0; vbtable_size_exports_list[i].export_name; i++) + { + SET(p_vbtable, vbtable_size_exports_list[i].export_name); + + ok(p_vbtable[0] == 0, "vbtable[0] wrong, got 0x%x\n", p_vbtable[0]); + + if (vbtable_size_exports_list[i].arch[arch_idx].todo) + todo_wine + ok(p_vbtable[1] == vbtable_size_exports_list[i].arch[arch_idx].value, + "%d: %s[1] wrong, got 0x%x\n", i, vbtable_size_exports_list[i].export_name, p_vbtable[1]); + else + ok(p_vbtable[1] == vbtable_size_exports_list[i].arch[arch_idx].value, + "%d: %s[1] wrong, got 0x%x\n", i, vbtable_size_exports_list[i].export_name, p_vbtable[1]); + } +} + START_TEST(msvcp120) { if(!init()) return; @@ -1577,5 +1626,7 @@ START_TEST(msvcp120) test_thrd(); test_cnd(); + test_vbtable_size_exports(); + FreeLibrary(msvcp); }

1 0