July 2008 - Wine-commits - list.winehq.org

Nikolay Sivov : gdiplus: GdipInvertMatrix implementation with tests.
by Alexandre Julliard 08 Jul '08

08 Jul '08

Module: wine Branch: master Commit: d7999a008be5d7e95fcd86019adc79b0359ae8d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7999a008be5d7e95fcd86019… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jul 8 01:32:36 2008 +0400 gdiplus: GdipInvertMatrix implementation with tests. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/matrix.c | 36 ++++++++++++++++++++++++++++++++---- dlls/gdiplus/tests/matrix.c | 32 ++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 4 files changed, 66 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 34e094d..b40b8a2 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -413,7 +413,7 @@ @ stdcall GdipImageSelectActiveFrame(ptr ptr long) @ stub GdipImageSetAbort @ stub GdipInitializePalette -@ stub GdipInvertMatrix +@ stdcall GdipInvertMatrix(ptr) @ stub GdipIsClipEmpty @ stdcall GdipIsEmptyRegion(ptr ptr ptr) @ stdcall GdipIsEqualRegion(ptr ptr ptr ptr) diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index dcdc2bd..8714908 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -50,6 +50,11 @@ static void matrix_multiply(GDIPCONST REAL * left, GDIPCONST REAL * right, REAL memcpy(out, temp, 6 * sizeof(REAL)); } +static REAL matrix_det(GDIPCONST GpMatrix *matrix) +{ + return matrix->matrix[0]*matrix->matrix[3] - matrix->matrix[1]*matrix->matrix[2]; +} + GpStatus WINGDIPAPI GdipCreateMatrix2(REAL m11, REAL m12, REAL m21, REAL m22, REAL dx, REAL dy, GpMatrix **matrix) { @@ -158,16 +163,39 @@ GpStatus WINGDIPAPI GdipGetMatrixElements(GDIPCONST GpMatrix *matrix, return Ok; } -GpStatus WINGDIPAPI GdipIsMatrixInvertible(GDIPCONST GpMatrix *matrix, BOOL *result) +GpStatus WINGDIPAPI GdipInvertMatrix(GpMatrix *matrix) { + GpMatrix copy; REAL det; + BOOL invertible; - if(!matrix || !result) + if(!matrix) + return InvalidParameter; + + GdipIsMatrixInvertible(matrix, &invertible); + if(!invertible) return InvalidParameter; - det = matrix->matrix[0]*matrix->matrix[3] - matrix->matrix[1]*matrix->matrix[2]; + det = matrix_det(matrix); + + copy = *matrix; + /* store result */ + matrix->matrix[0] = copy.matrix[3] / det; + matrix->matrix[1] = -copy.matrix[1] / det; + matrix->matrix[2] = -copy.matrix[2] / det; + matrix->matrix[3] = copy.matrix[0] / det; + matrix->matrix[4] = (copy.matrix[2]*copy.matrix[5]-copy.matrix[3]*copy.matrix[4]) / det; + matrix->matrix[5] = -(copy.matrix[0]*copy.matrix[5]-copy.matrix[1]*copy.matrix[4]) / det; + + return Ok; +} + +GpStatus WINGDIPAPI GdipIsMatrixInvertible(GDIPCONST GpMatrix *matrix, BOOL *result) +{ + if(!matrix || !result) + return InvalidParameter; - *result = (fabs(det) >= 1e-5); + *result = (fabs(matrix_det(matrix)) >= 1e-5); return Ok; } diff --git a/dlls/gdiplus/tests/matrix.c b/dlls/gdiplus/tests/matrix.c index 7d5e798..3d3c484 100644 --- a/dlls/gdiplus/tests/matrix.c +++ b/dlls/gdiplus/tests/matrix.c @@ -21,6 +21,7 @@ #include <math.h> #include "windows.h" +#include <stdio.h> #include "gdiplus.h" #include "wine/test.h" @@ -118,6 +119,36 @@ static void test_isinvertible(void) GdipDeleteMatrix(matrix); } +static void test_invert(void) +{ + GpStatus status; + GpMatrix *matrix = NULL; + GpMatrix *inverted = NULL; + BOOL equal; + + /* NULL */ + status = GdipInvertMatrix(NULL); + expect(InvalidParameter, status); + + /* noninvertible */ + GdipCreateMatrix2(2.0, -1.0, 6.0, -3.0, 2.2, 3.0, &matrix); + status = GdipInvertMatrix(matrix); + expect(InvalidParameter, status); + GdipDeleteMatrix(matrix); + + /* invertible */ + GdipCreateMatrix2(1.0, 2.0, 4.0, -1.0, 6.0, 3.0, &matrix); + status = GdipInvertMatrix(matrix); + expect(Ok, status); + + GdipCreateMatrix2(1.0/9.0, 2.0/9.0, 4.0/9.0, -1.0/9.0, -2.0, -1.0, &inverted); + GdipIsMatrixEqual(matrix, inverted, &equal); + expect(TRUE, equal); + + GdipDeleteMatrix(inverted); + GdipDeleteMatrix(matrix); +} + START_TEST(matrix) { struct GdiplusStartupInput gdiplusStartupInput; @@ -133,6 +164,7 @@ START_TEST(matrix) test_constructor_destructor(); test_transform(); test_isinvertible(); + test_invert(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 92cb286..cdc2db0 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -262,6 +262,7 @@ GpStatus WINGDIPAPI GdipCreateMatrix(GpMatrix**); GpStatus WINGDIPAPI GdipCreateMatrix2(REAL,REAL,REAL,REAL,REAL,REAL,GpMatrix**); GpStatus WINGDIPAPI GdipCreateMatrix3(GDIPCONST GpRectF *,GDIPCONST GpPointF*,GpMatrix**); GpStatus WINGDIPAPI GdipCreateMatrix3I(GDIPCONST GpRect*,GDIPCONST GpPoint*,GpMatrix**); +GpStatus WINGDIPAPI GdipInvertMatrix(GpMatrix*); GpStatus WINGDIPAPI GdipIsMatrixEqual(GDIPCONST GpMatrix*, GDIPCONST GpMatrix*, BOOL*); GpStatus WINGDIPAPI GdipIsMatrixIdentity(GDIPCONST GpMatrix*, BOOL*); GpStatus WINGDIPAPI GdipIsMatrixInvertible(GDIPCONST GpMatrix*, BOOL*);

1 0

Alexandre Julliard : include: Remove duplicate definition in winhttp.h.
by Alexandre Julliard 08 Jul '08

08 Jul '08

Module: wine Branch: master Commit: f1fd5667f1ad65a04bf51ca083039b30d2342eaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1fd5667f1ad65a04bf51ca08… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 8 11:16:17 2008 +0200 include: Remove duplicate definition in winhttp.h. --- include/winhttp.h | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/include/winhttp.h b/include/winhttp.h index c866df2..8a6bc17 100644 --- a/include/winhttp.h +++ b/include/winhttp.h @@ -58,10 +58,6 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define WINHTTP_NO_REFERER NULL #define WINHTTP_DEFAULT_ACCEPT_TYPES NULL -#define WINHTTP_ERROR_BASE 12000 - -#define ERROR_WINHTTP_AUTODETECTION_FAILED (WINHTTP_ERROR_BASE + 180) - /* flags for WinHttp{Set/Query}Options */ #define WINHTTP_FIRST_OPTION WINHTTP_OPTION_CALLBACK #define WINHTTP_OPTION_CALLBACK 1 @@ -162,6 +158,7 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define ERROR_WINHTTP_NOT_INITIALIZED (WINHTTP_ERROR_BASE + 172) #define ERROR_WINHTTP_SECURE_FAILURE (WINHTTP_ERROR_BASE + 175) #define ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR (WINHTTP_ERROR_BASE + 178) +#define ERROR_WINHTTP_AUTODETECTION_FAILED (WINHTTP_ERROR_BASE + 180) typedef struct {

1 0

Nikolay Sivov : gdiplus: GdipGetLineWrapMode implementation.
by Alexandre Julliard 08 Jul '08

08 Jul '08

Module: wine Branch: master Commit: 9fbec615ae4e78dd3ed3b185dba3097be0cba056 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fbec615ae4e78dd3ed3b185d… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jul 8 01:32:19 2008 +0400 gdiplus: GdipGetLineWrapMode implementation. --- dlls/gdiplus/brush.c | 10 ++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 2d15e01..d128f20 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -482,6 +482,16 @@ GpStatus WINGDIPAPI GdipGetLineGammaCorrection(GpLineGradient *line, return Ok; } +GpStatus WINGDIPAPI GdipGetLineWrapMode(GpLineGradient *brush, GpWrapMode *wrapmode) +{ + if(!brush || !wrapmode) + return InvalidParameter; + + *wrapmode = brush->wrap; + + return Ok; +} + GpStatus WINGDIPAPI GdipGetPathGradientCenterPoint(GpPathGradient *grad, GpPointF *point) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 861b68d..1906a88 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -310,7 +310,7 @@ @ stdcall GdipGetLineRectI(ptr ptr) @ stdcall GdipGetLineSpacing(ptr long ptr) @ stub GdipGetLineTransform -@ stub GdipGetLineWrapMode +@ stdcall GdipGetLineWrapMode(ptr ptr) @ stub GdipGetLogFontA @ stdcall GdipGetLogFontW(ptr ptr ptr) @ stdcall GdipGetMatrixElements(ptr ptr) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 3c8d587..09bcafe 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -179,6 +179,7 @@ GpStatus WINGDIPAPI GdipCreateTextureIAI(GpImage*,GDIPCONST GpImageAttributes*, GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush*); GpStatus WINGDIPAPI GdipGetBrushType(GpBrush*,GpBrushType*); GpStatus WINGDIPAPI GdipGetLineGammaCorrection(GpLineGradient*,BOOL*); +GpStatus WINGDIPAPI GdipGetLineWrapMode(GpLineGradient*,GpWrapMode*); GpStatus WINGDIPAPI GdipGetLineRect(GpLineGradient*,GpRectF*); GpStatus WINGDIPAPI GdipGetLineRectI(GpLineGradient*,GpRect*); GpStatus WINGDIPAPI GdipGetLineColors(GpLineGradient*,ARGB*);

1 0

James Hawkins : mlang: Add tests for ConvertINetMultiByteToUnicode.
by Alexandre Julliard 08 Jul '08

08 Jul '08

Module: wine Branch: master Commit: 6e313864e8ece443b3c70ac96fd851150f8390a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e313864e8ece443b3c70ac96… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 8 00:02:59 2008 -0500 mlang: Add tests for ConvertINetMultiByteToUnicode. --- dlls/mlang/tests/mlang.c | 384 +++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 349 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6e313864e8ece443b3c70…

1 0

James Hawkins : mlang: Encode all the way to the NULL terminator.
by Alexandre Julliard 08 Jul '08

08 Jul '08

Module: wine Branch: master Commit: 8b2bfbb778a6c8731b98c7c717e4bd82d52e4a56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b2bfbb778a6c8731b98c7c71… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 8 00:04:47 2008 -0500 mlang: Encode all the way to the NULL terminator. --- dlls/mlang/tests/mlang.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 59774a1..81377ed 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -269,7 +269,7 @@ static BOOL check_convertible(IMultiLanguage2 *iML2, UINT from, UINT to) static WCHAR strW[] = {'a','b','c',0}; - srcsz = -1; + srcsz = lstrlenW(strW) + 1; destsz = MAX_PATH; hr = IMultiLanguage2_ConvertStringFromUnicode(iML2, NULL, from, strW, &srcsz, convert, &destsz);

1 0

Alexandre Julliard : msvcrt/tests: Fix register constraints on thiscall wrappers.
by Alexandre Julliard 08 Jul '08

08 Jul '08

Module: wine Branch: master Commit: c2545cd43e578ea2f19cad77369d3e7d231c0e30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2545cd43e578ea2f19cad773… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 8 11:16:01 2008 +0200 msvcrt/tests: Fix register constraints on thiscall wrappers. --- dlls/msvcrt/tests/cpp.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index f642bcd..c2fdf36 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -157,20 +157,20 @@ static inline void* do_call_func2(void *func, void *_this, const void* arg) #else static void* do_call_func1(void *func, void *_this) { - void* ret; - __asm__ __volatile__ ("call *%1" - : "=a" (ret) - : "g" (func), "c" (_this) - : "memory" ); + void *ret, *dummy; + __asm__ __volatile__ ("call *%2" + : "=a" (ret), "=c" (dummy) + : "g" (func), "1" (_this) + : "edx", "memory" ); return ret; } static void* do_call_func2(void *func, void *_this, const void* arg) { - void* ret; - __asm__ __volatile__ ("pushl %2\n\tcall *%1" - : "=a" (ret) - : "r" (func), "g" (arg), "c" (_this) - : "memory" ); + void *ret, *dummy; + __asm__ __volatile__ ("pushl %3\n\tcall *%2" + : "=a" (ret), "=c" (dummy) + : "r" (func), "r" (arg), "1" (_this) + : "edx", "memory" ); return ret; } #endif

1 0

James Hawkins : mlang: Reimplement ConvertINetMultiByteToUnicode.
by Alexandre Julliard 08 Jul '08

08 Jul '08

Module: wine Branch: master Commit: 4e3ce9f887d01bdd46f77a0ec6eee8ad7dbc8ad1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e3ce9f887d01bdd46f77a0ec… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 8 00:01:21 2008 -0500 mlang: Reimplement ConvertINetMultiByteToUnicode. --- dlls/mlang/mlang.c | 57 +++++++++++++++++++++++++++++++-------------------- 1 files changed, 35 insertions(+), 22 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 2f73f1f..14f881e 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -546,50 +546,63 @@ HRESULT WINAPI ConvertINetUnicodeToMultiByte( LPSTR pDstStr, LPINT pcDstSize) { - + INT destsz, size; INT src_len = -1; TRACE("%p %d %s %p %p %p\n", pdwMode, dwEncoding, debugstr_w(pSrcStr), pcSrcSize, pDstStr, pcDstSize); if (!pcDstSize) - return E_FAIL; + return S_OK; if (!pcSrcSize) pcSrcSize = &src_len; - if (!*pcSrcSize) - { - *pcDstSize = 0; + destsz = (pDstStr) ? *pcDstSize : 0; + *pcDstSize = 0; + + if (!pSrcStr || !*pcSrcSize) return S_OK; - } - switch (dwEncoding) + if (*pcSrcSize == -1) + *pcSrcSize = lstrlenW(pSrcStr); + + if (dwEncoding == CP_UNICODE) { - case CP_UNICODE: if (*pcSrcSize == -1) *pcSrcSize = lstrlenW(pSrcStr); - *pcDstSize = min(*pcSrcSize * sizeof(WCHAR), *pcDstSize); + + size = min(*pcSrcSize, destsz) * sizeof(WCHAR); if (pDstStr) - memmove(pDstStr, pSrcStr, *pcDstSize); - break; + memmove(pDstStr, pSrcStr, size); - default: - if (*pcSrcSize == -1) - *pcSrcSize = lstrlenW(pSrcStr); + if (size >= destsz) + goto fail; + } + else + { + size = WideCharToMultiByte(dwEncoding, 0, pSrcStr, *pcSrcSize, + NULL, 0, NULL, NULL); + if (!size) + goto fail; if (pDstStr) - *pcDstSize = WideCharToMultiByte(dwEncoding, 0, pSrcStr, *pcSrcSize, pDstStr, *pcDstSize, NULL, NULL); - else - *pcDstSize = WideCharToMultiByte(dwEncoding, 0, pSrcStr, *pcSrcSize, NULL, 0, NULL, NULL); - break; + { + size = min(size, destsz); + size = WideCharToMultiByte(dwEncoding, 0, pSrcStr, *pcSrcSize, + pDstStr, destsz, NULL, NULL); + if (!size) + goto fail; + } } - - if (!*pcDstSize) - return E_FAIL; - + *pcDstSize = size; return S_OK; + +fail: + *pcSrcSize = 0; + *pcDstSize = 0; + return E_FAIL; } HRESULT WINAPI ConvertINetString(

1 0

James Hawkins : fusion: Implement GetCachePath.
by Alexandre Julliard 08 Jul '08

08 Jul '08

Module: wine Branch: master Commit: e7fe63df60ae01acd0c73915e7d9168b8d604cff URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7fe63df60ae01acd0c73915e… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Jul 7 23:57:16 2008 -0500 fusion: Implement GetCachePath. --- dlls/fusion/fusion.c | 91 +++++++++++++++++++- dlls/fusion/tests/Makefile.in | 5 +- dlls/fusion/tests/asmcache.c | 5 +- dlls/fusion/tests/fusion.c | 191 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 284 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7fe63df60ae01acd0c73…

1 0

James Hawkins : msi: Consolidate and add more SourceDir tests.
by Alexandre Julliard 08 Jul '08

08 Jul '08

Module: wine Branch: master Commit: e59b3fa8645a41e19cb0aca523cda12e7d0c9beb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e59b3fa8645a41e19cb0aca52… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 8 00:09:45 2008 -0500 msi: Consolidate and add more SourceDir tests. --- dlls/msi/tests/package.c | 498 +++++++++++++++++++++++++++++++--------------- 1 files changed, 334 insertions(+), 164 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e59b3fa8645a41e19cb0a…

1 0

James Hawkins : oleaut32: Fix a few failing tests in win9x.
by Alexandre Julliard 08 Jul '08

08 Jul '08

Module: wine Branch: master Commit: 698fac49839ad93cc95aa87cd3f089d4577efd16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=698fac49839ad93cc95aa87cd… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 8 00:00:01 2008 -0500 oleaut32: Fix a few failing tests in win9x. --- dlls/oleaut32/tests/vartest.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index c3842bf..21eeb3f 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2085,7 +2085,12 @@ static void test_VarSub(void) leftvt == VT_RECORD || rightvt == VT_RECORD) { if (leftvt == VT_RECORD && rightvt == VT_I8) - expectedhres = DISP_E_TYPEMISMATCH; + { + if (HAVE_OLEAUT32_I8) + expectedhres = DISP_E_TYPEMISMATCH; + else + expectedhres = DISP_E_BADVARTYPE; + } else if (leftvt < VT_UI1 && rightvt == VT_RECORD) expectedhres = DISP_E_TYPEMISMATCH; else if (leftvt >= VT_UI1 && rightvt == VT_RECORD) @@ -5412,7 +5417,8 @@ static void test_VarCat(void) hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08x\n", hres); hres = VarCmp(&result,&expected,lcid,0); - ok(hres == VARCMP_EQ, "Expected VARCMP_EQ, got %08x\n", hres); + ok(hres == VARCMP_EQ || + broken(hres == VARCMP_GT), "Expected VARCMP_EQ, got %08x\n", hres); VariantClear(&left); VariantClear(&right); @@ -5428,7 +5434,8 @@ static void test_VarCat(void) hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08x\n", hres); hres = VarCmp(&result,&expected,lcid,0); - ok(hres == VARCMP_EQ, "Expected VARCMP_EQ, got %08x\n", hres); + ok(hres == VARCMP_EQ || + broken(hres == VARCMP_GT), "Expected VARCMP_EQ, got %08x\n", hres); VariantClear(&left); VariantClear(&right);

1 0