April 2012 - Wine-commits - list.winehq.org

Hans Leidekker : msi: Don't free cached tables in MsiDatabaseCommit.
by Alexandre Julliard 26 Apr '12

26 Apr '12

Module: wine Branch: master Commit: fde66de6a5c86db4daee1b5c11052288af21d5db URL: http://source.winehq.org/git/wine.git/?a=commit;h=fde66de6a5c86db4daee1b5c1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 26 11:18:31 2012 +0200 msi: Don't free cached tables in MsiDatabaseCommit. --- dlls/msi/table.c | 3 -- dlls/msi/tests/package.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 54743bd..dd25fbb 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2195,9 +2195,6 @@ UINT MSI_CommitTables( MSIDATABASE *db ) } } - /* force everything to reload next time */ - free_cached_tables( db ); - hr = IStorage_Commit( db->storage, 0 ); if (FAILED( hr )) { diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index fc77c03..8cf8f27 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -8746,6 +8746,52 @@ error: DeleteFileA( msifile ); } +static void test_MsiDatabaseCommit(void) +{ + UINT r; + MSIHANDLE hdb, hpkg = 0; + char buf[32], package[12]; + DWORD sz; + + hdb = create_package_db(); + ok( hdb, "failed to create database\n" ); + + r = create_property_table( hdb ); + ok( r == ERROR_SUCCESS, "can't create Property table %u\n", r ); + + sprintf( package, "#%u", hdb ); + r = MsiOpenPackage( package, &hpkg ); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + goto error; + } + ok( r == ERROR_SUCCESS, "got %u\n", r ); + + r = MsiSetPropertyA( hpkg, "PROP", "value" ); + ok( r == ERROR_SUCCESS, "got %u\n", r ); + + buf[0] = 0; + sz = sizeof(buf); + r = MsiGetPropertyA( hpkg, "PROP", buf, &sz ); + ok( r == ERROR_SUCCESS, "MsiGetPropertyA returned %u\n", r ); + ok( !lstrcmpA( buf, "value" ), "got \"%s\"\n", buf ); + + r = MsiDatabaseCommit( hdb ); + ok( r == ERROR_SUCCESS, "MsiDatabaseCommit returned %u\n", r ); + + buf[0] = 0; + sz = sizeof(buf); + r = MsiGetPropertyA( hpkg, "PROP", buf, &sz ); + ok( r == ERROR_SUCCESS, "MsiGetPropertyA returned %u\n", r ); + ok( !lstrcmpA( buf, "value" ), "got \"%s\"\n", buf ); + + MsiCloseHandle( hpkg ); +error: + MsiCloseHandle( hdb ); + DeleteFileA( msifile ); +} + START_TEST(package) { STATEMGRSTATUS status; @@ -8802,6 +8848,7 @@ START_TEST(package) test_MsiApplyMultiplePatches(); test_MsiApplyPatch(); test_MsiEnumComponentCosts(); + test_MsiDatabaseCommit(); if (pSRSetRestorePointA && !pMsiGetComponentPathExA && ret) {

1 0

Hans Leidekker : msi: Avoid a crash in get_registered_local_package.
by Alexandre Julliard 26 Apr '12

26 Apr '12

Module: wine Branch: master Commit: 89e95aa92c5d56fbb267189b2353401e2d848c8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=89e95aa92c5d56fbb267189b2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 26 11:18:46 2012 +0200 msi: Avoid a crash in get_registered_local_package. --- dlls/msi/package.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index ca836ec..2077396 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1455,6 +1455,9 @@ static UINT get_registered_local_package( const WCHAR *product, const WCHAR *pac if (!strcmpiW( package, unsquashed )) { WCHAR *filename = msi_reg_get_val_str( props_key, INSTALLPROPERTY_LOCALPACKAGEW ); + if (!filename) + goto done; + strcpyW( localfile, filename ); msi_free( filename ); r = ERROR_SUCCESS;

1 0

Hans Leidekker : fusion: Implement IAssemblyCache::UninstallAssembly.
by Alexandre Julliard 26 Apr '12

26 Apr '12

Module: wine Branch: master Commit: 25ba5c8b593e5763407a036d614d980a82d1ce9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=25ba5c8b593e5763407a036d6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 26 11:18:57 2012 +0200 fusion: Implement IAssemblyCache::UninstallAssembly. --- dlls/fusion/asmcache.c | 71 ++++++++++++++++++++++++++++++++++++++++- dlls/fusion/tests/asmcache.c | 46 +++++++++------------------ 2 files changed, 84 insertions(+), 33 deletions(-) diff --git a/dlls/fusion/asmcache.c b/dlls/fusion/asmcache.c index fe4e12a..d0b45c7 100644 --- a/dlls/fusion/asmcache.c +++ b/dlls/fusion/asmcache.c @@ -183,10 +183,77 @@ static HRESULT WINAPI IAssemblyCacheImpl_UninstallAssembly(IAssemblyCache *iface LPCFUSION_INSTALL_REFERENCE pRefData, ULONG *pulDisposition) { - FIXME("(%p, %d, %s, %p, %p) stub!\n", iface, dwFlags, + HRESULT hr; + IAssemblyName *asmname, *next = NULL; + IAssemblyEnum *asmenum = NULL; + WCHAR *p, *path = NULL; + ULONG disp; + DWORD len; + + TRACE("(%p, 0%08x, %s, %p, %p)\n", iface, dwFlags, debugstr_w(pszAssemblyName), pRefData, pulDisposition); - return E_NOTIMPL; + if (pRefData) + { + FIXME("application reference not supported\n"); + return E_NOTIMPL; + } + hr = CreateAssemblyNameObject( &asmname, pszAssemblyName, CANOF_PARSE_DISPLAY_NAME, NULL ); + if (FAILED( hr )) + return hr; + + hr = CreateAssemblyEnum( &asmenum, NULL, asmname, ASM_CACHE_GAC, NULL ); + if (FAILED( hr )) + goto done; + + hr = IAssemblyEnum_GetNextAssembly( asmenum, NULL, &next, 0 ); + if (hr == S_FALSE) + { + if (pulDisposition) + *pulDisposition = IASSEMBLYCACHE_UNINSTALL_DISPOSITION_ALREADY_UNINSTALLED; + goto done; + } + hr = IAssemblyName_GetPath( next, NULL, &len ); + if (hr != HRESULT_FROM_WIN32( ERROR_INSUFFICIENT_BUFFER )) + goto done; + + if (!(path = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + { + hr = E_OUTOFMEMORY; + goto done; + } + hr = IAssemblyName_GetPath( next, path, &len ); + if (FAILED( hr )) + goto done; + + if (DeleteFileW( path )) + { + if ((p = strrchrW( path, '\\' ))) + { + *p = 0; + RemoveDirectoryW( path ); + if ((p = strrchrW( path, '\\' ))) + { + *p = 0; + RemoveDirectoryW( path ); + } + } + disp = IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED; + hr = S_OK; + } + else + { + disp = IASSEMBLYCACHE_UNINSTALL_DISPOSITION_ALREADY_UNINSTALLED; + hr = S_FALSE; + } + if (pulDisposition) *pulDisposition = disp; + +done: + IAssemblyName_Release( asmname ); + if (next) IAssemblyName_Release( next ); + if (asmenum) IAssemblyEnum_Release( asmenum ); + HeapFree( GetProcessHeap(), 0, path ); + return hr; } static HRESULT WINAPI IAssemblyCacheImpl_QueryAssemblyInfo(IAssemblyCache *iface, diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index 3910488..141e442 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -888,7 +888,6 @@ static void test_InstallAssembly(void) ULONG disp; DWORD attr; char dllpath[MAX_PATH]; - UINT size; static const WCHAR empty[] = {0}; static const WCHAR noext[] = {'f','i','l','e',0}; @@ -942,7 +941,7 @@ static void test_InstallAssembly(void) hr = IAssemblyCache_InstallAssembly(cache, 0, winedll, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - size = GetWindowsDirectoryA(dllpath, MAX_PATH); + GetWindowsDirectoryA(dllpath, MAX_PATH); strcat(dllpath, "\\assembly\\GAC_MSIL\\wine\\\\1.0.0.0__2d03617b1c31e2f5\\wine.dll"); attr = GetFileAttributes(dllpath); @@ -951,19 +950,18 @@ static void test_InstallAssembly(void) /* uninstall the assembly from the GAC */ disp = 0xf00dbad; hr = IAssemblyCache_UninstallAssembly(cache, 0, wine, NULL, &disp); - todo_wine - { - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(disp == IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, - "Expected IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, got %d\n", disp); - } + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(disp == IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, + "Expected IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, got %d\n", disp); - /* FIXME: remove once UninstallAssembly is implemented */ - DeleteFileA(dllpath); - dllpath[size + sizeof("\\assembly\\GAC_MSIL\\wine\\1.0.0.0__2d03617b1c31e2f5")] = '\0'; - RemoveDirectoryA(dllpath); - dllpath[size + sizeof("\\assembly\\GAC_MSIL\\wine")] = '\0'; - RemoveDirectoryA(dllpath); + attr = GetFileAttributes(dllpath); + ok(attr == INVALID_FILE_ATTRIBUTES, "Expected assembly not to exist\n"); + + disp = 0xf00dbad; + hr = IAssemblyCache_UninstallAssembly(cache, 0, wine, NULL, &disp); + ok(hr == S_FALSE, "Expected S_FALSE, got %08x\n", hr); + ok(disp == IASSEMBLYCACHE_UNINSTALL_DISPOSITION_ALREADY_UNINSTALLED, + "Expected IASSEMBLYCACHE_UNINSTALL_DISPOSITION_ALREADY_UNINSTALLED, got %d\n", disp); DeleteFileA("test.dll"); DeleteFileA("wine.dll"); @@ -987,8 +985,6 @@ static void test_QueryAssemblyInfo(void) HRESULT hr; DWORD size; ULONG disp; - char dllpath[MAX_PATH]; - UINT len; static const WCHAR empty[] = {0}; static const WCHAR commasep[] = {',',' ',0}; @@ -1503,21 +1499,9 @@ static void test_QueryAssemblyInfo(void) /* uninstall the assembly from the GAC */ disp = 0xf00dbad; hr = IAssemblyCache_UninstallAssembly(cache, 0, wine, NULL, &disp); - todo_wine - { - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(disp == IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, - "Expected IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, got %d\n", disp); - } - - /* FIXME: remove once UninstallAssembly is implemented */ - len = GetWindowsDirectoryA(dllpath, MAX_PATH); - strcat(dllpath, "\\assembly\\GAC_MSIL\\wine\\\\1.0.0.0__2d03617b1c31e2f5\\wine.dll"); - DeleteFileA(dllpath); - dllpath[len + sizeof("\\assembly\\GAC_MSIL\\wine\\1.0.0.0__2d03617b1c31e2f5")] = '\0'; - RemoveDirectoryA(dllpath); - dllpath[len + sizeof("\\assembly\\GAC_MSIL\\wine")] = '\0'; - RemoveDirectoryA(dllpath); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(disp == IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, + "Expected IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, got %d\n", disp); DeleteFileA("test.dll"); DeleteFileA("wine.dll");

1 0

Vincent Povirk : gdiplus: Return OutOfMemory when creating a path gradient with NULL points.
by Alexandre Julliard 26 Apr '12

26 Apr '12

Module: wine Branch: master Commit: ea3e26e32ddeeba6a2afe3f3ee60b4cd8d859414 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea3e26e32ddeeba6a2afe3f3e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 24 10:22:58 2012 -0500 gdiplus: Return OutOfMemory when creating a path gradient with NULL points. --- dlls/gdiplus/brush.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index c11dea6..8dfa18d 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -578,10 +578,10 @@ GpStatus WINGDIPAPI GdipCreatePathGradient(GDIPCONST GpPointF* points, TRACE("(%p, %d, %d, %p)\n", points, count, wrap, grad); - if(!points || !grad) + if(!grad) return InvalidParameter; - if(count <= 0) + if(!points || count <= 0) return OutOfMemory; stat = GdipCreatePath(FillModeAlternate, &path); @@ -611,10 +611,10 @@ GpStatus WINGDIPAPI GdipCreatePathGradientI(GDIPCONST GpPoint* points, TRACE("(%p, %d, %d, %p)\n", points, count, wrap, grad); - if(!points || !grad) + if(!grad) return InvalidParameter; - if(count <= 0) + if(!points || count <= 0) return OutOfMemory; stat = GdipCreatePath(FillModeAlternate, &path);

1 0

Vincent Povirk : gdiplus: Return OutOfMemory when creating a path gradient from a NULL path.
by Alexandre Julliard 26 Apr '12

26 Apr '12

Module: wine Branch: master Commit: 3a3ca55ffa705c0266b27fdc2d89234a83359784 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a3ca55ffa705c0266b27fdc2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 24 10:26:12 2012 -0500 gdiplus: Return OutOfMemory when creating a path gradient from a NULL path. --- dlls/gdiplus/brush.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 8dfa18d..184c8de 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -647,9 +647,12 @@ GpStatus WINGDIPAPI GdipCreatePathGradientFromPath(GDIPCONST GpPath* path, TRACE("(%p, %p)\n", path, grad); - if(!path || !grad) + if(!grad) return InvalidParameter; + if (!path) + return OutOfMemory; + stat = GdipClonePath((GpPath*)path, &new_path); if (stat == Ok)

1 0

Vincent Povirk : gdiplus: Add basic implementation of GdipWidenPath.
by Alexandre Julliard 26 Apr '12

26 Apr '12

Module: wine Branch: master Commit: 930cdab2e9d17be1d1cb1c38f2f28dc764d98b90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=930cdab2e9d17be1d1cb1c38f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 24 16:32:50 2012 -0500 gdiplus: Add basic implementation of GdipWidenPath. --- dlls/gdiplus/graphicspath.c | 172 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 170 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index c41278c..8096507 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1656,12 +1656,180 @@ GpStatus WINGDIPAPI GdipWarpPath(GpPath *path, GpMatrix* matrix, return NotImplemented; } +static void add_bevel_point(const GpPointF *endpoint, const GpPointF *nextpoint, + GpPen *pen, int right_side, path_list_node_t **last_point) +{ + REAL segment_dy = nextpoint->Y-endpoint->Y; + REAL segment_dx = nextpoint->X-endpoint->X; + REAL segment_length = sqrtf(segment_dy*segment_dy + segment_dx*segment_dx); + REAL distance = pen->width/2.0; + REAL bevel_dx, bevel_dy; + + if (right_side) + { + bevel_dx = -distance * segment_dy / segment_length; + bevel_dy = distance * segment_dx / segment_length; + } + else + { + bevel_dx = distance * segment_dy / segment_length; + bevel_dy = -distance * segment_dx / segment_length; + } + + *last_point = add_path_list_node(*last_point, endpoint->X + bevel_dx, + endpoint->Y + bevel_dy, PathPointTypeLine); +} + +static void widen_joint(const GpPointF *p1, const GpPointF *p2, const GpPointF *p3, + GpPen* pen, path_list_node_t **last_point) +{ + switch (pen->join) + { + default: + case LineJoinBevel: + add_bevel_point(p2, p1, pen, 1, last_point); + add_bevel_point(p2, p3, pen, 0, last_point); + break; + } +} + +static void widen_cap(const GpPointF *endpoint, const GpPointF *nextpoint, + GpPen *pen, GpLineCap cap, GpCustomLineCap *custom, int add_first_points, + int add_last_point, path_list_node_t **last_point) +{ + switch (cap) + { + default: + case LineCapFlat: + if (add_first_points) + add_bevel_point(endpoint, nextpoint, pen, 1, last_point); + if (add_last_point) + add_bevel_point(endpoint, nextpoint, pen, 0, last_point); + break; + } +} + +static void widen_open_figure(GpPath *path, GpPen *pen, int start, int end, + path_list_node_t **last_point) +{ + int i; + + if (end <= start) + return; + + widen_cap(&path->pathdata.Points[start], &path->pathdata.Points[start+1], + pen, pen->startcap, pen->customstart, FALSE, TRUE, last_point); + + (*last_point)->type = PathPointTypeStart; + + for (i=start+1; i<end; i++) + widen_joint(&path->pathdata.Points[i-1], &path->pathdata.Points[i], + &path->pathdata.Points[i+1], pen, last_point); + + widen_cap(&path->pathdata.Points[end], &path->pathdata.Points[end-1], + pen, pen->endcap, pen->customend, TRUE, TRUE, last_point); + + for (i=end-1; i>start; i--) + widen_joint(&path->pathdata.Points[i+1], &path->pathdata.Points[i], + &path->pathdata.Points[i-1], pen, last_point); + + widen_cap(&path->pathdata.Points[start], &path->pathdata.Points[start+1], + pen, pen->startcap, pen->customstart, TRUE, FALSE, last_point); + + (*last_point)->type |= PathPointTypeCloseSubpath; +} + GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, REAL flatness) { - FIXME("(%p,%p,%p,%0.2f)\n", path, pen, matrix, flatness); + GpPath *flat_path=NULL; + GpStatus status; + path_list_node_t *points=NULL, *last_point=NULL; + int i, subpath_start=0, new_length; + BYTE type; - return NotImplemented; + TRACE("(%p,%p,%p,%0.2f)\n", path, pen, matrix, flatness); + + if (!path || !pen) + return InvalidParameter; + + if (path->pathdata.Count <= 1) + return OutOfMemory; + + status = GdipClonePath(path, &flat_path); + + if (status == Ok) + status = GdipFlattenPath(flat_path, matrix, flatness); + + if (status == Ok && !init_path_list(&points, 314.0, 22.0)) + status = OutOfMemory; + + if (status == Ok) + { + last_point = points; + + if (pen->endcap != LineCapFlat) + FIXME("unimplemented end cap %x\n", pen->endcap); + + if (pen->startcap != LineCapFlat) + FIXME("unimplemented start cap %x\n", pen->startcap); + + if (pen->dashcap != DashCapFlat) + FIXME("unimplemented dash cap %d\n", pen->dashcap); + + if (pen->join != LineJoinBevel) + FIXME("unimplemented line join %d\n", pen->join); + + if (pen->dash != DashStyleSolid) + FIXME("unimplemented dash style %d\n", pen->dash); + + if (pen->align != PenAlignmentCenter) + FIXME("unimplemented pen alignment %d\n", pen->align); + + for (i=0; i < flat_path->pathdata.Count; i++) + { + type = flat_path->pathdata.Types[i]; + + if ((type&PathPointTypePathTypeMask) == PathPointTypeStart) + subpath_start = i; + + if ((type&PathPointTypeCloseSubpath) == PathPointTypeCloseSubpath) + { + FIXME("closed figures unimplemented\n"); + } + else if (i == flat_path->pathdata.Count-1 || + (flat_path->pathdata.Types[i+1]&PathPointTypePathTypeMask) == PathPointTypeStart) + { + widen_open_figure(flat_path, pen, subpath_start, i, &last_point); + } + } + + new_length = path_list_count(points)-1; + + if (!lengthen_path(path, new_length)) + status = OutOfMemory; + } + + if (status == Ok) + { + path->pathdata.Count = new_length; + + last_point = points->next; + for (i = 0; i < new_length; i++) + { + path->pathdata.Points[i] = last_point->pt; + path->pathdata.Types[i] = last_point->type; + last_point = last_point->next; + } + + path->fill = FillModeWinding; + } + + free_path_list(points); + + GdipDeletePath(flat_path); + + return status; } GpStatus WINGDIPAPI GdipAddPathRectangle(GpPath *path, REAL x, REAL y,

1 0

Vincent Povirk : gdiplus: Implement GdipWidenPath for closed figures.
by Alexandre Julliard 26 Apr '12

26 Apr '12

Module: wine Branch: master Commit: 7b5af23604867e3b8f1a328424dbea08b3141934 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b5af23604867e3b8f1a32842… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 24 16:43:06 2012 -0500 gdiplus: Implement GdipWidenPath for closed figures. --- dlls/gdiplus/graphicspath.c | 44 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 43 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 8096507..d37512e 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1739,6 +1739,48 @@ static void widen_open_figure(GpPath *path, GpPen *pen, int start, int end, (*last_point)->type |= PathPointTypeCloseSubpath; } +static void widen_closed_figure(GpPath *path, GpPen *pen, int start, int end, + path_list_node_t **last_point) +{ + int i; + path_list_node_t *prev_point; + + if (end <= start+1) + return; + + /* left outline */ + prev_point = *last_point; + + widen_joint(&path->pathdata.Points[end], &path->pathdata.Points[start], + &path->pathdata.Points[start+1], pen, last_point); + + for (i=start+1; i<end; i++) + widen_joint(&path->pathdata.Points[i-1], &path->pathdata.Points[i], + &path->pathdata.Points[i+1], pen, last_point); + + widen_joint(&path->pathdata.Points[end-1], &path->pathdata.Points[end], + &path->pathdata.Points[start], pen, last_point); + + prev_point->next->type = PathPointTypeStart; + (*last_point)->type |= PathPointTypeCloseSubpath; + + /* right outline */ + prev_point = *last_point; + + widen_joint(&path->pathdata.Points[start], &path->pathdata.Points[end], + &path->pathdata.Points[end-1], pen, last_point); + + for (i=end-1; i>start; i--) + widen_joint(&path->pathdata.Points[i+1], &path->pathdata.Points[i], + &path->pathdata.Points[i-1], pen, last_point); + + widen_joint(&path->pathdata.Points[start+1], &path->pathdata.Points[start], + &path->pathdata.Points[end], pen, last_point); + + prev_point->next->type = PathPointTypeStart; + (*last_point)->type |= PathPointTypeCloseSubpath; +} + GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, REAL flatness) { @@ -1795,7 +1837,7 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, if ((type&PathPointTypeCloseSubpath) == PathPointTypeCloseSubpath) { - FIXME("closed figures unimplemented\n"); + widen_closed_figure(flat_path, pen, subpath_start, i, &last_point); } else if (i == flat_path->pathdata.Count-1 || (flat_path->pathdata.Types[i+1]&PathPointTypePathTypeMask) == PathPointTypeStart)

1 0

Jacek Caban : jscript: Get rid of parser function collecting hack by moving the logic to compiler .
by Alexandre Julliard 26 Apr '12

26 Apr '12

Module: wine Branch: master Commit: ca15adfde6a0c9acf3c45fa2aa9ce0825ff8cb99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca15adfde6a0c9acf3c45fa2a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 26 16:17:31 2012 +0200 jscript: Get rid of parser function collecting hack by moving the logic to compiler. --- dlls/jscript/compile.c | 12 +++++++++--- dlls/jscript/engine.h | 23 ++++------------------- dlls/jscript/parser.y | 46 +++------------------------------------------- 3 files changed, 16 insertions(+), 65 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index c903651..df3acb4 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -56,6 +56,9 @@ typedef struct { variable_declaration_t *var_head; variable_declaration_t *var_tail; + + function_expression_t *func_head; + function_expression_t *func_tail; } compiler_ctx_t; static const struct { @@ -815,6 +818,8 @@ static HRESULT compile_object_literal(compiler_ctx_t *ctx, property_value_expres static HRESULT compile_function_expression(compiler_ctx_t *ctx, function_expression_t *expr) { + ctx->func_tail = ctx->func_tail ? (ctx->func_tail->next = expr) : (ctx->func_head = expr); + /* FIXME: not exactly right */ if(expr->identifier) { ctx->func->func_cnt++; @@ -1787,13 +1792,14 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, BOOL from_eval, function_code_t *func) { variable_declaration_t *var_iter; - function_declaration_t *iter; + function_expression_t *iter; unsigned off, i; HRESULT hres; TRACE("\n"); ctx->var_head = ctx->var_tail = NULL; + ctx->func_head = ctx->func_tail = NULL; off = ctx->code_off; ctx->func = func; @@ -1856,8 +1862,8 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, return E_OUTOFMEMORY; memset(func->funcs, 0, func->func_cnt * sizeof(*func->funcs)); - for(iter = source->functions, i=0; iter; iter = iter->next, i++) { - hres = compile_function(ctx, iter->expr->source_elements, iter->expr, FALSE, func->funcs+i); + for(iter = ctx->func_head, i=0; iter; iter = iter->next, i++) { + hres = compile_function(ctx, iter->source_elements, iter, FALSE, func->funcs+i); if(FAILED(hres)) return hres; } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 6a318c7..a842a35 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -17,23 +17,9 @@ */ typedef struct _source_elements_t source_elements_t; -typedef struct _function_expression_t function_expression_t; typedef struct _expression_t expression_t; typedef struct _statement_t statement_t; -typedef struct _function_declaration_t { - function_expression_t *expr; - - struct _function_declaration_t *next; -} function_declaration_t; - -typedef struct _func_stack { - function_declaration_t *func_head; - function_declaration_t *func_tail; - - struct _func_stack *next; -} func_stack_t; - typedef struct { const WCHAR *begin; const WCHAR *end; @@ -47,8 +33,6 @@ typedef struct { HRESULT hres; jsheap_t heap; - - func_stack_t *func_stack; } parser_ctx_t; #define OP_LIST \ @@ -497,17 +481,18 @@ typedef struct _parameter_t { struct _source_elements_t { statement_t *statement; statement_t *statement_tail; - function_declaration_t *functions; }; -struct _function_expression_t { +typedef struct _function_expression_t { expression_t expr; const WCHAR *identifier; parameter_t *parameter_list; source_elements_t *source_elements; const WCHAR *src_str; DWORD src_len; -}; + + struct _function_expression_t *next; /* for compiler */ +} function_expression_t; typedef struct { expression_t expr; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index c5984b2..d108ab0 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -29,7 +29,6 @@ static void set_error(parser_ctx_t*,UINT); static BOOL explicit_error(parser_ctx_t*,void*,WCHAR); static BOOL allow_auto_semicolon(parser_ctx_t*); static void program_parsed(parser_ctx_t*,source_elements_t*); -static source_elements_t *function_body_parsed(parser_ctx_t*,source_elements_t*); typedef struct _statement_list_t { statement_t *head; @@ -117,12 +116,6 @@ typedef struct _parameter_list_t { static parameter_list_t *new_parameter_list(parser_ctx_t*,const WCHAR*); static parameter_list_t *parameter_list_add(parser_ctx_t*,parameter_list_t*,const WCHAR*); -static void push_func(parser_ctx_t*); -static inline void pop_func(parser_ctx_t *ctx) -{ - ctx->func_stack = ctx->func_stack->next; -} - static void *new_expression(parser_ctx_t *ctx,expression_type_t,size_t); static expression_t *new_function_expression(parser_ctx_t*,const WCHAR*,parameter_list_t*, source_elements_t*,const WCHAR*,DWORD); @@ -271,11 +264,11 @@ FunctionExpression { $$ = new_function_expression(ctx, $2, $4, $7, $1, $8-$1+1); } KFunction - : kFUNCTION { push_func(ctx); $$ = $1; } + : kFUNCTION { $$ = $1; } /* ECMA-262 3rd Edition 13 */ FunctionBody - : SourceElements { $$ = function_body_parsed(ctx, $1); } + : SourceElements { $$ = $1; } /* ECMA-262 3rd Edition 13 */ FormalParameterList @@ -1307,23 +1300,13 @@ static expression_t *new_function_expression(parser_ctx_t *ctx, const WCHAR *ide parameter_list_t *parameter_list, source_elements_t *source_elements, const WCHAR *src_str, DWORD src_len) { function_expression_t *ret = new_expression(ctx, EXPR_FUNC, sizeof(*ret)); - function_declaration_t *decl; ret->identifier = identifier; ret->parameter_list = parameter_list ? parameter_list->head : NULL; ret->source_elements = source_elements; ret->src_str = src_str; ret->src_len = src_len; - - decl = parser_alloc(ctx, sizeof(function_declaration_t)); - - decl->expr = ret; - decl->next = NULL; - - if(ctx->func_stack->func_tail) - ctx->func_stack->func_tail = ctx->func_stack->func_tail->next = decl; - else - ctx->func_stack->func_head = ctx->func_stack->func_tail = decl; + ret->next = NULL; return &ret->expr; } @@ -1490,29 +1473,8 @@ static statement_list_t *statement_list_add(statement_list_t *list, statement_t return list; } -static void push_func(parser_ctx_t *ctx) -{ - func_stack_t *new_func = parser_alloc_tmp(ctx, sizeof(func_stack_t)); - - new_func->func_head = new_func->func_tail = NULL; - - new_func->next = ctx->func_stack; - ctx->func_stack = new_func; -} - -static source_elements_t *function_body_parsed(parser_ctx_t *ctx, source_elements_t *source) -{ - source->functions = ctx->func_stack->func_head; - pop_func(ctx); - - return source; -} - static void program_parsed(parser_ctx_t *ctx, source_elements_t *source) { - source->functions = ctx->func_stack->func_head; - pop_func(ctx); - ctx->source = source; if(!ctx->lexer_error) ctx->hres = S_OK; @@ -1550,8 +1512,6 @@ HRESULT script_parse(script_ctx_t *ctx, const WCHAR *code, const WCHAR *delimite mark = jsheap_mark(&ctx->tmp_heap); jsheap_init(&parser_ctx->heap); - push_func(parser_ctx); - parser_parse(parser_ctx); jsheap_clear(mark); hres = parser_ctx->hres;

1 0

Frédéric Delanoy : Add link to translated FAQ in French help page (resend)
by Jeremy Newman 26 Apr '12

26 Apr '12

Module: website Branch: master Commit: adb4e5970b75d6ad958bfd7f3aa6bd8079d82ab0 URL: http://source.winehq.org/git/website.git/?a=commit;h=adb4e5970b75d6ad958bfd… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Apr 26 08:35:50 2012 +0200 Add link to translated FAQ in French help page (resend) --- templates/fr/help.template | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/fr/help.template b/templates/fr/help.template index 99569eb..aa18446 100644 --- a/templates/fr/help.template +++ b/templates/fr/help.template @@ -24,11 +24,11 @@ payant pour Wine. <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="http://wiki.winehq.org/FAQ"><img src="{$root}/images/faq.png"><br>FAQ</a> + <a href="http://wiki.winehq.org/FAQ_fr"><img src="{$root}/images/faq.png"><br>FAQ</a> </td> <td valign="top"> Des réponses rapides à la plupart des questions sont disponibles dans la - <a href="http://wiki.winehq.org/FAQ">FAQ</a>. + <a href="http://wiki.winehq.org/FAQ_fr">FAQ</a>. C'est le premier endroit à visiter pour obtenir une réponse à vos questions. </td> </tr>

1 0

Jacek Caban : vbscript: 'property' may be both keyword and identifier.
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: d856d7cd11d8845321b0ebf89ad866b3b168e9ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=d856d7cd11d8845321b0ebf89… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 25 11:26:34 2012 +0200 vbscript: 'property' may be both keyword and identifier. --- dlls/vbscript/parser.y | 37 ++++++++++++++++++++++--------------- dlls/vbscript/tests/lang.vbs | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 15 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 2a85272..a5f7405 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -71,6 +71,8 @@ static class_decl_t *add_variant_prop(parser_ctx_t*,class_decl_t*,const WCHAR*,u static statement_t *link_statements(statement_t*,statement_t*); +static const WCHAR propertyW[] = {'p','r','o','p','e','r','t','y',0}; + #define STORAGE_IS_PRIVATE 1 #define STORAGE_IS_DEFAULT 2 @@ -129,6 +131,7 @@ static statement_t *link_statements(statement_t*,statement_t*); %type <uint> Storage Storage_opt %type <dim_decl> DimDeclList %type <const_decl> ConstDecl ConstDeclList +%type <string> Identifier %% @@ -189,25 +192,25 @@ SimpleStatement | tON tERROR tRESUME tNEXT { $$ = new_onerror_statement(ctx, TRUE); CHECK_ERROR; } | tON tERROR tGOTO '0' { $$ = new_onerror_statement(ctx, FALSE); CHECK_ERROR; } | tCONST ConstDeclList { $$ = new_const_statement(ctx, $2); CHECK_ERROR; } - | tFOR tIdentifier '=' Expression tTO Expression Step_opt tNL StatementsNl_opt tNEXT + | tFOR Identifier '=' Expression tTO Expression Step_opt tNL StatementsNl_opt tNEXT { $$ = new_forto_statement(ctx, $2, $4, $6, $7, $9); CHECK_ERROR; } - | tFOR tEACH tIdentifier tIN Expression tNL StatementsNl_opt tNEXT + | tFOR tEACH Identifier tIN Expression tNL StatementsNl_opt tNEXT { $$ = new_foreach_statement(ctx, $3, $5, $7); } MemberExpression - : tIdentifier { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; } - | CallExpression '.' tIdentifier { $$ = new_member_expression(ctx, $1, $3); CHECK_ERROR; } + : Identifier { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; } + | CallExpression '.' Identifier { $$ = new_member_expression(ctx, $1, $3); CHECK_ERROR; } DimDeclList /* FIXME: Support arrays */ - : tIdentifier { $$ = new_dim_decl(ctx, $1, NULL); CHECK_ERROR; } - | tIdentifier ',' DimDeclList { $$ = new_dim_decl(ctx, $1, $3); CHECK_ERROR; } + : Identifier { $$ = new_dim_decl(ctx, $1, NULL); CHECK_ERROR; } + | Identifier ',' DimDeclList { $$ = new_dim_decl(ctx, $1, $3); CHECK_ERROR; } ConstDeclList : ConstDecl { $$ = $1; } | ConstDecl ',' ConstDeclList { $1->next = $3; $$ = $1; } ConstDecl - : tIdentifier '=' LiteralExpression { $$ = new_const_decl(ctx, $1, $3); CHECK_ERROR; } + : Identifier '=' LiteralExpression { $$ = new_const_decl(ctx, $1, $3); CHECK_ERROR; } DoType : tWHILE { $$ = TRUE; } @@ -326,7 +329,7 @@ ExpExpression UnaryExpression : LiteralExpression { $$ = $1; } | CallExpression { $$ = $1; } - | tNEW tIdentifier { $$ = new_new_expression(ctx, $2); CHECK_ERROR; } + | tNEW Identifier { $$ = new_new_expression(ctx, $2); CHECK_ERROR; } | '-' UnaryExpression { $$ = new_unary_expression(ctx, EXPR_NEG, $2); CHECK_ERROR; } CallExpression @@ -350,7 +353,7 @@ PrimaryExpression | tME { $$ = new_expression(ctx, EXPR_ME, 0); CHECK_ERROR; } ClassDeclaration - : tCLASS tIdentifier tNL ClassBody tEND tCLASS tNL { $4->name = $2; $$ = $4; } + : tCLASS Identifier tNL ClassBody tEND tCLASS tNL { $4->name = $2; $$ = $4; } ClassBody : /* empty */ { $$ = new_class_decl(ctx); } @@ -367,9 +370,9 @@ PropertyDecl { $$ = new_function_decl(ctx, $4, FUNC_PROPSET, $1, $6, $9); CHECK_ERROR; } FunctionDecl - : Storage_opt tSUB tIdentifier ArgumentsDecl_opt tNL StatementsNl_opt tEND tSUB + : Storage_opt tSUB Identifier ArgumentsDecl_opt tNL StatementsNl_opt tEND tSUB { $$ = new_function_decl(ctx, $3, FUNC_SUB, $1, $4, $6); CHECK_ERROR; } - | Storage_opt tFUNCTION tIdentifier ArgumentsDecl_opt tNL StatementsNl_opt tEND tFUNCTION + | Storage_opt tFUNCTION Identifier ArgumentsDecl_opt tNL StatementsNl_opt tEND tFUNCTION { $$ = new_function_decl(ctx, $3, FUNC_FUNCTION, $1, $4, $6); CHECK_ERROR; } Storage_opt @@ -390,10 +393,14 @@ ArgumentDeclList | ArgumentDecl ',' ArgumentDeclList { $1->next = $3; $$ = $1; } ArgumentDecl - : tIdentifier { $$ = new_argument_decl(ctx, $1, TRUE); } - | tBYREF tIdentifier { $$ = new_argument_decl(ctx, $2, TRUE); } - | tBYVAL tIdentifier { $$ = new_argument_decl(ctx, $2, FALSE); } - + : Identifier { $$ = new_argument_decl(ctx, $1, TRUE); } + | tBYREF Identifier { $$ = new_argument_decl(ctx, $2, TRUE); } + | tBYVAL Identifier { $$ = new_argument_decl(ctx, $2, FALSE); } + +/* 'property' may be both keyword and identifier, depending on context */ +Identifier + : tIdentifier { $$ = $1; } + | tPROPERTY { $$ = propertyW; } %% static int parser_error(const char *str) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 4380432..1015e34 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -781,4 +781,36 @@ End Sub Call ConstTestSub Dim funcconst +' Property may be used as an identifier (although it's a keyword) +Sub TestProperty + Dim Property + PROPERTY = true + Call ok(property, "property = " & property) + + for property = 1 to 2 + next +End Sub + +Call TestProperty + +Class Property + Public Sub Property() + End Sub + + Sub Test(byref property) + End Sub +End Class + +Class Property2 + Function Property() + End Function + + + Sub Test(property) + End Sub + + Sub Test2(byval property) + End Sub +End Class + reportSuccess()

1 0