November 2016 - Wine-commits

Andrey Gusev : d3dx11: Add D3DX11SaveTextureToMemory stub.
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: 0951a1b6db1ed219058f82c330e22d9d9bfc8516 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0951a1b6db1ed219058f82c33… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Nov 4 15:43:21 2016 +0100 d3dx11: Add D3DX11SaveTextureToMemory stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_42/Makefile.in | 3 ++- dlls/d3dx11_42/d3dx11_42.spec | 2 +- dlls/d3dx11_43/Makefile.in | 3 ++- dlls/d3dx11_43/d3dx11_43.spec | 2 +- dlls/d3dx11_43/texture.c | 35 +++++++++++++++++++++++++++++++++++ include/d3dx11tex.h | 3 +++ 6 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx11_42/Makefile.in b/dlls/d3dx11_42/Makefile.in index 3ed7fd3..d20f660 100644 --- a/dlls/d3dx11_42/Makefile.in +++ b/dlls/d3dx11_42/Makefile.in @@ -4,6 +4,7 @@ PARENTSRC = ../d3dx11_43 C_SRCS = \ async.c \ - d3dx11_42.c + d3dx11_42.c \ + texture.c RC_SRCS = version.rc diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec index 45e8482..f97ec24 100644 --- a/dlls/d3dx11_42/d3dx11_42.spec +++ b/dlls/d3dx11_42/d3dx11_42.spec @@ -41,4 +41,4 @@ @ stub D3DX11SHProjectCubeMap @ stub D3DX11SaveTextureToFileA @ stub D3DX11SaveTextureToFileW -@ stub D3DX11SaveTextureToMemory +@ stdcall D3DX11SaveTextureToMemory(ptr ptr long ptr long) diff --git a/dlls/d3dx11_43/Makefile.in b/dlls/d3dx11_43/Makefile.in index 1cc4911..d5c5b45 100644 --- a/dlls/d3dx11_43/Makefile.in +++ b/dlls/d3dx11_43/Makefile.in @@ -4,6 +4,7 @@ IMPORTS = d3dcompiler C_SRCS = \ async.c \ - d3dx11_43.c + d3dx11_43.c \ + texture.c RC_SRCS = version.rc diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec index 7c3a598..0a6350c 100644 --- a/dlls/d3dx11_43/d3dx11_43.spec +++ b/dlls/d3dx11_43/d3dx11_43.spec @@ -41,4 +41,4 @@ @ stub D3DX11SHProjectCubeMap @ stub D3DX11SaveTextureToFileA @ stub D3DX11SaveTextureToFileW -@ stub D3DX11SaveTextureToMemory +@ stdcall D3DX11SaveTextureToMemory(ptr ptr long ptr long) diff --git a/dlls/d3dx11_43/texture.c b/dlls/d3dx11_43/texture.c new file mode 100644 index 0000000..832f64f --- /dev/null +++ b/dlls/d3dx11_43/texture.c @@ -0,0 +1,35 @@ +/* + * Copyright 2016 Andrey Gusev + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" +#include "d3dx11.h" +#include "d3dcompiler.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + +HRESULT WINAPI D3DX11SaveTextureToMemory(ID3D11DeviceContext *context, ID3D11Resource *texture, + D3DX11_IMAGE_FILE_FORMAT format, ID3D10Blob **buffer, UINT flags) +{ + FIXME("context %p, texture %p, format %u, buffer %p, flags %#x stub!\n", + context, texture, format, buffer, flags); + + return E_NOTIMPL; +} diff --git a/include/d3dx11tex.h b/include/d3dx11tex.h index 0217777..bd22f32 100644 --- a/include/d3dx11tex.h +++ b/include/d3dx11tex.h @@ -92,6 +92,9 @@ HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *s HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump, D3DX11_IMAGE_INFO *img_info, HRESULT *hresult); +HRESULT WINAPI D3DX11SaveTextureToMemory(ID3D11DeviceContext *context, ID3D11Resource *texture, + D3DX11_IMAGE_FILE_FORMAT format, ID3D10Blob **buffer, UINT flags); + #ifdef __cplusplus } #endif

1 0

Andrey Gusev : d3dx11: Move D3DX11CreateTextureFromMemory to texture.c.
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: b8140565990886cc90604d993c48ac4efe59031e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8140565990886cc90604d993… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Nov 4 15:43:22 2016 +0100 d3dx11: Move D3DX11CreateTextureFromMemory to texture.c. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_43/async.c | 10 ---------- dlls/d3dx11_43/texture.c | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx11_43/async.c b/dlls/d3dx11_43/async.c index 6eb2a10..b33c235 100644 --- a/dlls/d3dx11_43/async.c +++ b/dlls/d3dx11_43/async.c @@ -65,13 +65,3 @@ HRESULT WINAPI D3DX11CompileFromFileW(const WCHAR *filename, const D3D10_SHADER_ return E_NOTIMPL; } - -HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *data, - SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, - ID3D11Resource **texture, HRESULT *hresult) -{ - FIXME("device %p, data %p, data_size %lu, load_info %p, pump %p, texture %p, hresult %p stub.\n", - device, data, data_size, load_info, pump, texture, hresult); - - return E_NOTIMPL; -} diff --git a/dlls/d3dx11_43/texture.c b/dlls/d3dx11_43/texture.c index 832f64f..65598a6 100644 --- a/dlls/d3dx11_43/texture.c +++ b/dlls/d3dx11_43/texture.c @@ -25,6 +25,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); +HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *data, + SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, + ID3D11Resource **texture, HRESULT *hresult) +{ + FIXME("device %p, data %p, data_size %lu, load_info %p, pump %p, texture %p, hresult %p stub.\n", + device, data, data_size, load_info, pump, texture, hresult); + + return E_NOTIMPL; +} + HRESULT WINAPI D3DX11SaveTextureToMemory(ID3D11DeviceContext *context, ID3D11Resource *texture, D3DX11_IMAGE_FILE_FORMAT format, ID3D10Blob **buffer, UINT flags) {

1 0

Nikolay Sivov : msvcrt: Added _wfindnext32().
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: c03e5ed3be146ef12dfeaf060000fc62c1323731 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c03e5ed3be146ef12dfeaf060… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 4 19:05:05 2016 +0300 msvcrt: Added _wfindnext32(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-filesystem-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/dir.c | 17 +++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 9 files changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/api-ms-win-crt-filesystem-l1-1-0/api-ms-win-crt-filesystem-l1-1-0.spec b/dlls/api-ms-win-crt-filesystem-l1-1-0/api-ms-win-crt-filesystem-l1-1-0.spec index dd881aa..26520b6 100644 --- a/dlls/api-ms-win-crt-filesystem-l1-1-0/api-ms-win-crt-filesystem-l1-1-0.spec +++ b/dlls/api-ms-win-crt-filesystem-l1-1-0/api-ms-win-crt-filesystem-l1-1-0.spec @@ -43,7 +43,7 @@ @ stub _wfindfirst32i64 @ cdecl _wfindfirst64(wstr ptr) ucrtbase._wfindfirst64 @ cdecl _wfindfirst64i32(wstr ptr) ucrtbase._wfindfirst64i32 -@ stub _wfindnext32 +@ cdecl _wfindnext32(long ptr) ucrtbase._wfindnext32 @ stub _wfindnext32i64 @ cdecl _wfindnext64(long ptr) ucrtbase._wfindnext64 @ cdecl _wfindnext64i32(long ptr) ucrtbase._wfindnext64i32 diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 03fd698..15d5339 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1547,7 +1547,7 @@ @ stub _wfindfirst32i64 @ cdecl _wfindfirst64(wstr ptr) MSVCRT__wfindfirst64 @ cdecl _wfindfirst64i32(wstr ptr) MSVCRT__wfindfirst64i32 -@ stub _wfindnext32 +@ cdecl _wfindnext32(long ptr) MSVCRT__wfindnext32 @ stub _wfindnext32i64 @ cdecl _wfindnext64(long ptr) MSVCRT__wfindnext64 @ cdecl _wfindnext64i32(long ptr) MSVCRT__wfindnext64i32 diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index f5371b9..b4549f5 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1905,7 +1905,7 @@ @ stub _wfindfirst32i64 @ cdecl _wfindfirst64(wstr ptr) MSVCRT__wfindfirst64 @ cdecl _wfindfirst64i32(wstr ptr) MSVCRT__wfindfirst64i32 -@ stub _wfindnext32 +@ cdecl _wfindnext32(long ptr) MSVCRT__wfindnext32 @ stub _wfindnext32i64 @ cdecl _wfindnext64(long ptr) MSVCRT__wfindnext64 @ cdecl _wfindnext64i32(long ptr) MSVCRT__wfindnext64i32 diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index e402c5f..683dc6a 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1929,7 +1929,7 @@ @ stub _wfindfirst32i64 @ cdecl _wfindfirst64(wstr ptr) MSVCRT__wfindfirst64 @ cdecl _wfindfirst64i32(wstr ptr) MSVCRT__wfindfirst64i32 -@ stub _wfindnext32 +@ cdecl _wfindnext32(long ptr) MSVCRT__wfindnext32 @ stub _wfindnext32i64 @ cdecl _wfindnext64(long ptr) MSVCRT__wfindnext64 @ cdecl _wfindnext64i32(long ptr) MSVCRT__wfindnext64i32 diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index a953c38..0510b16 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1613,7 +1613,7 @@ @ stub _wfindfirst32i64 @ cdecl _wfindfirst64(wstr ptr) msvcr120._wfindfirst64 @ cdecl _wfindfirst64i32(wstr ptr) msvcr120._wfindfirst64i32 -@ stub _wfindnext32 +@ cdecl _wfindnext32(long ptr) msvcr120._wfindnext32 @ stub _wfindnext32i64 @ cdecl _wfindnext64(long ptr) msvcr120._wfindnext64 @ cdecl _wfindnext64i32(long ptr) msvcr120._wfindnext64i32 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index c1edc24..4bcef50 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1226,7 +1226,7 @@ @ stub _wfindfirst32i64 @ cdecl _wfindfirst64(wstr ptr) MSVCRT__wfindfirst64 @ cdecl _wfindfirst64i32(wstr ptr) MSVCRT__wfindfirst64i32 -@ stub _wfindnext32 +@ cdecl _wfindnext32(long ptr) MSVCRT__wfindnext32 @ stub _wfindnext32i64 @ cdecl _wfindnext64(long ptr) MSVCRT__wfindnext64 @ cdecl _wfindnext64i32(long ptr) MSVCRT__wfindnext64i32 diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 93da303..5c34e77 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1202,7 +1202,7 @@ @ stub _wfindfirst32i64 @ cdecl _wfindfirst64(wstr ptr) MSVCRT__wfindfirst64 @ cdecl _wfindfirst64i32(wstr ptr) MSVCRT__wfindfirst64i32 -@ stub _wfindnext32 +@ cdecl _wfindnext32(long ptr) MSVCRT__wfindnext32 @ stub _wfindnext32i64 @ cdecl _wfindnext64(long ptr) MSVCRT__wfindnext64 @ cdecl _wfindnext64i32(long ptr) MSVCRT__wfindnext64i32 diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 3c5d16f..f4edc28 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -599,6 +599,23 @@ int CDECL MSVCRT__findnext32(MSVCRT_intptr_t hand, struct MSVCRT__finddata32_t * } /********************************************************************* + * _wfindnext32 (MSVCRT.@) + */ +int CDECL MSVCRT__wfindnext32(MSVCRT_intptr_t hand, struct MSVCRT__wfinddata32_t * ft) +{ + WIN32_FIND_DATAW find_data; + + if (!FindNextFileW((HANDLE)hand, &find_data)) + { + *MSVCRT__errno() = MSVCRT_ENOENT; + return -1; + } + + msvcrt_wfttofd32(&find_data, ft); + return 0; +} + +/********************************************************************* * _wfindnext (MSVCRT.@) * * Unicode version of _findnext. diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 47608f9..83143b6 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2077,7 +2077,7 @@ @ stub _wfindfirst32i64 @ cdecl _wfindfirst64(wstr ptr) MSVCRT__wfindfirst64 @ cdecl _wfindfirst64i32(wstr ptr) MSVCRT__wfindfirst64i32 -@ stub _wfindnext32 +@ cdecl _wfindnext32(long ptr) MSVCRT__wfindnext32 @ stub _wfindnext32i64 @ cdecl _wfindnext64(long ptr) MSVCRT__wfindnext64 @ cdecl _wfindnext64i32(long ptr) MSVCRT__wfindnext64i32

1 0

Nikolay Sivov : gdiplus: Return success from GdipImageSetAbort().
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: da2021e46fb05addd74b1bab32f971d88ab5b347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da2021e46fb05addd74b1bab3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 3 23:34:44 2016 +0300 gdiplus: Return success from GdipImageSetAbort(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 11 +++++++++-- dlls/gdiplus/tests/image.c | 27 +++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index e4eba2b..21d5a3a 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -5373,8 +5373,15 @@ GpStatus WINGDIPAPI GdipImageRotateFlip(GpImage *image, RotateFlipType type) */ GpStatus WINGDIPAPI GdipImageSetAbort(GpImage *image, GdiplusAbort *pabort) { - FIXME("(%p, %p): stub\n", image, pabort); - return NotImplemented; + TRACE("(%p, %p)\n", image, pabort); + + if (!image) + return InvalidParameter; + + if (pabort) + FIXME("Abort callback is not supported.\n"); + + return Ok; } /***************************************************************************** diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index ad0cc6f..6abd026 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -32,6 +32,7 @@ static GpStatus (WINAPI *pGdipBitmapGetHistogramSize)(HistogramFormat,UINT*); static GpStatus (WINAPI *pGdipBitmapGetHistogram)(GpBitmap*,HistogramFormat,UINT,UINT*,UINT*,UINT*,UINT*); +static GpStatus (WINAPI *pGdipImageSetAbort)(GpImage*,GdiplusAbort*); #define expect(expected, got) ok((got) == (expected), "Expected %d, got %d\n", (UINT)(expected), (UINT)(got)) #define expectf(expected, got) ok(fabs((expected) - (got)) < 0.0001, "Expected %f, got %f\n", (expected), (got)) @@ -4916,6 +4917,30 @@ static void test_histogram(void) GdipDisposeImage((GpImage*)bm); } +static void test_imageabort(void) +{ + GpStatus stat; + GpBitmap *bm; + + if (!pGdipImageSetAbort) + { + win_skip("GdipImageSetAbort() is not supported.\n"); + return; + } + + bm = NULL; + stat = GdipCreateBitmapFromScan0(8, 8, 0, PixelFormat24bppRGB, NULL, &bm); + expect(Ok, stat); + + stat = pGdipImageSetAbort(NULL, NULL); + expect(InvalidParameter, stat); + + stat = pGdipImageSetAbort((GpImage*)bm, NULL); + expect(Ok, stat); + + GdipDisposeImage((GpImage*)bm); +} + START_TEST(image) { HMODULE mod = GetModuleHandleA("gdiplus.dll"); @@ -4931,6 +4956,7 @@ START_TEST(image) pGdipBitmapGetHistogramSize = (void*)GetProcAddress(mod, "GdipBitmapGetHistogramSize"); pGdipBitmapGetHistogram = (void*)GetProcAddress(mod, "GdipBitmapGetHistogram"); + pGdipImageSetAbort = (void*)GetProcAddress(mod, "GdipImageSetAbort"); test_supported_encoders(); test_CloneBitmapArea(); @@ -4979,6 +5005,7 @@ START_TEST(image) test_createeffect(); test_getadjustedpalette(); test_histogram(); + test_imageabort(); GdiplusShutdown(gdiplusToken); }

1 0

Nikolay Sivov : gdiplus: Use static data for identity check in GdipIsMatrixIdentity().
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: f7187ecbd62f778649e055af61cd2c6786ead7f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7187ecbd62f778649e055af6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 4 04:18:19 2016 +0300 gdiplus: Use static data for identity check in GdipIsMatrixIdentity(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/matrix.c | 20 +++++++------------- dlls/gdiplus/tests/matrix.c | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 44 insertions(+), 14 deletions(-) diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index fc2d3f5..3cd8d82 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -497,23 +497,17 @@ GpStatus WINGDIPAPI GdipIsMatrixEqual(GDIPCONST GpMatrix *matrix, GDIPCONST GpMa GpStatus WINGDIPAPI GdipIsMatrixIdentity(GDIPCONST GpMatrix *matrix, BOOL *result) { - GpMatrix *e; - GpStatus ret; - BOOL isIdentity; + static const GpMatrix identity = + { + { 1.0, 0.0, + 0.0, 1.0, + 0.0, 0.0 } + }; TRACE("(%p, %p)\n", matrix, result); if(!matrix || !result) return InvalidParameter; - ret = GdipCreateMatrix(&e); - if(ret != Ok) return ret; - - ret = GdipIsMatrixEqual(matrix, e, &isIdentity); - if(ret == Ok) - *result = isIdentity; - - heap_free(e); - - return ret; + return GdipIsMatrixEqual(matrix, &identity, result); } diff --git a/dlls/gdiplus/tests/matrix.c b/dlls/gdiplus/tests/matrix.c index 83b57ef..a2e0595 100644 --- a/dlls/gdiplus/tests/matrix.c +++ b/dlls/gdiplus/tests/matrix.c @@ -302,7 +302,42 @@ static void test_constructor3(void) expectf(0.0, values[4]); expectf(0.0, values[5]); - GdipDeleteMatrix(matrix);} + GdipDeleteMatrix(matrix); +} + +static void test_isidentity(void) +{ + GpMatrix *matrix; + GpStatus stat; + BOOL result; + + stat = GdipIsMatrixIdentity(NULL, NULL); + expect(InvalidParameter, stat); + + stat = GdipIsMatrixIdentity(NULL, &result); + expect(InvalidParameter, stat); + + stat = GdipCreateMatrix2(1.0, 0.0, 0.0, 1.0, 0.0, 0.0, &matrix); + expect(Ok, stat); + + stat = GdipIsMatrixIdentity(matrix, NULL); + expect(InvalidParameter, stat); + + result = FALSE; + stat = GdipIsMatrixIdentity(matrix, &result); + expect(Ok, stat); + ok(!!result, "got %d\n", result); + + stat = GdipSetMatrixElements(matrix, 1.0, 0.0, 0.0, 1.0, 0.1, 0.0); + expect(Ok, stat); + + result = TRUE; + stat = GdipIsMatrixIdentity(matrix, &result); + expect(Ok, stat); + ok(!result, "got %d\n", result); + + GdipDeleteMatrix(matrix); +} START_TEST(matrix) { @@ -322,6 +357,7 @@ START_TEST(matrix) test_invert(); test_shear(); test_constructor3(); + test_isidentity(); GdiplusShutdown(gdiplusToken); }

1 0

Huw Davies : dssenh/tests: The default container may already exist.
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: 43204a0d926093cd22e395bd3cebfc21cc540a22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43204a0d926093cd22e395bd3… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Nov 4 11:20:08 2016 +0000 dssenh/tests: The default container may already exist. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/tests/dssenh.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index feb9a30..df5a1d1 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -86,10 +86,13 @@ static void test_acquire_context(void) result = CryptAcquireContextA( &hProv, NULL, MS_DEF_DSS_DH_PROV_A, PROV_DSS_DH, CRYPT_NEWKEYSET); - ok(result, "Expected no errors.\n"); + ok(result || GetLastError() == NTE_EXISTS, "Expected no errors or NTE_EXISTS\n"); - result = CryptReleaseContext(hProv, 0); - ok(result, "Expected release of the provider.\n"); + if (result) + { + result = CryptReleaseContext(hProv, 0); + ok(result, "Expected release of the provider.\n"); + } result = CryptAcquireContextA(&hProv, NULL, NULL, PROV_DSS, 0); ok(result, "Expected no errors.\n");

1 0

Huw Davies : dssenh/tests: RC4 has been crippled in recent Windows versions.
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: 25b744b0afc411a7e31a50dacd9e08338894db76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25b744b0afc411a7e31a50dac… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Nov 4 11:20:09 2016 +0000 dssenh/tests: RC4 has been crippled in recent Windows versions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/tests/dssenh.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index df5a1d1..a054003 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -639,7 +639,8 @@ static void test_data_encryption(const struct encrypt_test *tests, int testLen) ok(result, "Expected data decryption.\n"); /* Verify we have received expected decrypted data */ - ok(!memcmp(pbData, tests[i].decrypted, dataLen), "Incorrect decrypted data.\n"); + ok(!memcmp(pbData, tests[i].decrypted, dataLen) || + broken(tests[i].algid == CALG_RC4), "Incorrect decrypted data.\n"); result = CryptDestroyKey(pKey); ok(result, "Expected no DestroyKey errors.\n");

1 0

Huw Davies : dssenh/tests: Use a non-crippled algorithm in the key exchange tests.
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: 07115ab98fef3d2256fc004459072408c36945b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07115ab98fef3d2256fc00445… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Nov 4 11:20:10 2016 +0000 dssenh/tests: Use a non-crippled algorithm in the key exchange tests. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/tests/dssenh.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index a054003..f07b0d3 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -1317,11 +1317,11 @@ static void test_keyExchange_dssDH(HCRYPTPROV hProv, const struct keyExchange_te ok(result, "Failed to import key for user 2, got %x\n", GetLastError()); /* Set the shared key parameters to matching cipher type */ - algid = CALG_RC4; + algid = CALG_3DES; result = CryptSetKeyParam(sessionKey1, KP_ALGID, (BYTE *)&algid, 0); ok(result, "Failed to set session key for user 1, got %x\n", GetLastError()); - algid = CALG_RC4; + algid = CALG_3DES; result = CryptSetKeyParam(sessionKey2, KP_ALGID, (BYTE *)&algid, 0); ok(result, "Failed to set session key for user 2, got %x\n", GetLastError());

1 0

Hans Leidekker : msi/tests: Fix some test failures on Windows 10.
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: f6c4f87d32cce6271c2ebf7e1474f40ed562980f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6c4f87d32cce6271c2ebf7e1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 4 13:28:03 2016 +0100 msi/tests: Fix some test failures on Windows 10. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/msi.c | 45 +++++++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index feeb1ff..49d8f28 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -559,6 +559,18 @@ static const char property_dat[] = "UpgradeCode\t{9574448F-9B86-4E07-B6F6-8D199DA12127}\n" "MSIFASTINSTALL\t1\n"; +static const char ci2_property_dat[] = + "Property\tValue\n" + "s72\tl0\n" + "Property\tProperty\n" + "INSTALLLEVEL\t3\n" + "Manufacturer\tWine\n" + "ProductCode\t{FF4AFE9C-6AC2-44F9-A060-9EA6BD16C75E}\n" + "ProductName\tMSITEST2\n" + "ProductVersion\t1.1.1\n" + "UpgradeCode\t{6B60C3CA-B8CA-4FB7-A395-092D98FF5D2A}\n" + "MSIFASTINSTALL\t1\n"; + static const char mcp_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" "s72\tS38\ts72\ti2\tS255\tS72\n" @@ -830,22 +842,26 @@ static const char ci_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "s72\tS255\tI2\n" "InstallExecuteSequence\tAction\n" - "CostFinalize\t\t1000\n" "CostInitialize\t\t800\n" "FileCost\t\t900\n" - "InstallFiles\t\t4000\n" - "InstallServices\t\t5000\n" - "InstallFinalize\t\t6600\n" - "InstallInitialize\t\t1500\n" - "RunInstall\t\t1600\n" + "CostFinalize\t\t1000\n" "InstallValidate\t\t1400\n" - "LaunchConditions\t\t100"; + "InstallInitialize\t\t1500\n" + "RunInstall\tnot Installed\t1550\n" + "ProcessComponents\t\t1600\n" + "UnpublishFeatures\t\t1800\n" + "RemoveFiles\t\t3500\n" + "InstallFiles\t\t4000\n" + "RegisterProduct\t\t6100\n" + "PublishFeatures\t\t6300\n" + "PublishProduct\t\t6400\n" + "InstallFinalize\t\t6600\n"; static const char ci_custom_action_dat[] = "Action\tType\tSource\tTarget\tISComments\n" "s72\ti2\tS64\tS0\tS255\n" "CustomAction\tAction\n" - "RunInstall\t87\tmsitest\\concurrent.msi\tMYPROP=[UILevel]\t\n"; + "RunInstall\t23\tmsitest\\concurrent.msi\tMYPROP=[UILevel]\t\n"; static const char ci_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" @@ -1011,7 +1027,7 @@ static const msi_table ci2_tables[] = ADD_TABLE(ci2_file), ADD_TABLE(install_exec_seq), ADD_TABLE(lus0_media), - ADD_TABLE(property), + ADD_TABLE(ci2_property), }; static const msi_table cl_tables[] = @@ -14183,22 +14199,23 @@ static void test_concurrentinstall(void) if (r == ERROR_INSTALL_PACKAGE_REJECTED) { skip("Not enough rights to perform tests\n"); - DeleteFileA(path); goto error; } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - if (!delete_pf("msitest\\augustus", TRUE)) - trace("concurrent installs not supported\n"); + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); r = MsiConfigureProductA("{38847338-1BBC-4104-81AC-2FAAC7ECDDCD}", INSTALLLEVEL_DEFAULT, INSTALLSTATE_ABSENT); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(r == ERROR_SUCCESS, "got %u\n", r); - DeleteFileA(path); + r = MsiConfigureProductA("{FF4AFE9C-6AC2-44F9-A060-9EA6BD16C75E}", INSTALLLEVEL_DEFAULT, + INSTALLSTATE_ABSENT); + ok(r == ERROR_SUCCESS, "got %u\n", r); error: + DeleteFileA(path); DeleteFileA(msifile); DeleteFileA("msitest\\msitest\\augustus"); DeleteFileA("msitest\\maximus");

1 0

Hans Leidekker : msi: Handle descriptors without component in MsiProvideQualifiedComponentEx.
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: dea323dcecc2de2e66df04b48eaf3858fdddb426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dea323dcecc2de2e66df04b48… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 4 13:28:04 2016 +0100 msi: Handle descriptors without component in MsiProvideQualifiedComponentEx. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msi.c | 79 +++++++++++++++++++++-------- dlls/msi/tests/msi.c | 141 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 198 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dea323dcecc2de2e66df0…

1 0