- Wine-Commits - list.winehq.org

Bartosz Kosiorek : gdiplus: Add additional check to GdipSetPenTransform.
by Alexandre Julliard Oct. 30, 2023

Oct. 30, 2023

Module: wine Branch: master Commit: caec1c249366723050f415d482528f444a57fdfe URL: https://gitlab.winehq.org/wine/wine/-/commit/caec1c249366723050f415d482528f… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Sat Oct 28 19:51:19 2023 +0200 gdiplus: Add additional check to GdipSetPenTransform. --- dlls/gdiplus/pen.c | 6 +++++- dlls/gdiplus/tests/pen.c | 14 +++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index fac31d6e84e..05acd54b36d 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -445,8 +445,9 @@ GpStatus WINGDIPAPI GdipResetPenTransform(GpPen *pen) GpStatus WINGDIPAPI GdipSetPenTransform(GpPen *pen, GpMatrix *matrix) { static int calls; + BOOL result; - TRACE("(%p,%s)\n", pen, debugstr_matrix(matrix)); + TRACE("(%p, %s)\n", pen, debugstr_matrix(matrix)); if(!pen || !matrix) return InvalidParameter; @@ -454,6 +455,9 @@ GpStatus WINGDIPAPI GdipSetPenTransform(GpPen *pen, GpMatrix *matrix) if(!(calls++)) FIXME("(%p,%p) Semi-stub\n", pen, matrix); + GdipIsMatrixInvertible(matrix, &result); + if (!result) + return InvalidParameter; pen->transform = *matrix; return Ok; diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index 1ac74123877..445f2dbb5b8 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -472,7 +472,7 @@ static void test_transform(void) GdipCreateMatrix2(3.0, 3.0, 2.0, 2.0, 6.0, 3.0, &not_invertible_matrix); status = GdipSetPenTransform(pen, not_invertible_matrix); - todo_wine expect(InvalidParameter, status); + expect(InvalidParameter, status); GdipDeleteMatrix(not_invertible_matrix); status = GdipGetPenTransform(pen, matrix); @@ -480,12 +480,12 @@ static void test_transform(void) status = GdipGetMatrixElements(matrix, values); expect(Ok, status); - todo_wine expectf(1.0, values[0]); - todo_wine expectf(0.0, values[1]); - todo_wine expectf(0.0, values[2]); - todo_wine expectf(1.0, values[3]); - todo_wine expectf(0.0, values[4]); - todo_wine expectf(0.0, values[5]); + expectf(1.0, values[0]); + expectf(0.0, values[1]); + expectf(0.0, values[2]); + expectf(1.0, values[3]); + expectf(0.0, values[4]); + expectf(0.0, values[5]); /* Setting Pen Tranformation to invertible matrix, should be successfull */ GdipCreateMatrix2(3.0, -2.0, 5.0, 2.0, 6.0, 3.0, &matrix2);

1 0

Alex Henrie : loader: Associate Wine with internet shortcuts.
by Alexandre Julliard Oct. 30, 2023

Oct. 30, 2023

Module: wine Branch: master Commit: b520a19fc210d4c640398cdb1207713ec434cd6c URL: https://gitlab.winehq.org/wine/wine/-/commit/b520a19fc210d4c640398cdb120771… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 29 15:13:49 2023 -0600 loader: Associate Wine with internet shortcuts. --- loader/wine.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.desktop b/loader/wine.desktop index d232a756b9b..e76dd0df903 100644 --- a/loader/wine.desktop +++ b/loader/wine.desktop @@ -26,7 +26,7 @@ Name[hr]=Wine - dizač Windows programa Name[he]=Wine — מריץ תכניות Windows Name[ja]=Wine Windowsプログラムローダー Exec=wine start /unix %f -MimeType=application/x-ms-dos-executable;application/x-msi;application/x-ms-shortcut;application/x-bat +MimeType=application/x-ms-dos-executable;application/x-msi;application/x-ms-shortcut;application/x-bat;application/x-mswinurl Icon=wine NoDisplay=true StartupNotify=true

1 0

Alex Henrie : uninstaller: Use CRT allocation functions.
by Alexandre Julliard Oct. 30, 2023

Oct. 30, 2023

Module: wine Branch: master Commit: 0c3530d69808bc41c5c8f53b96e2afd14686ebab URL: https://gitlab.winehq.org/wine/wine/-/commit/0c3530d69808bc41c5c8f53b96e2af… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 29 13:19:06 2023 -0600 uninstaller: Use CRT allocation functions. --- programs/uninstaller/main.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index 15f63976838..52e8a0debe9 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -61,12 +61,12 @@ static void output_writeconsole(const WCHAR *str, DWORD len) * If this occurs, we should use an OEM codepage and call WriteFile. */ lenA = WideCharToMultiByte(GetOEMCP(), 0, str, len, NULL, 0, NULL, NULL); - strA = HeapAlloc(GetProcessHeap(), 0, lenA); + strA = malloc(lenA); if (strA) { WideCharToMultiByte(GetOEMCP(), 0, str, len, strA, lenA, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), strA, lenA, &written, FALSE); - HeapFree(GetProcessHeap(), 0, strA); + free(strA); } } @@ -257,13 +257,12 @@ static int FetchFromRootKey(HKEY root) if (!RegQueryValueExW(hkeyApp, L"WindowsInstaller", NULL, &type, (BYTE *)&value, &size) && type == REG_DWORD && value == 1) { - command = HeapAlloc(GetProcessHeap(), 0, - sizeof(L"msiexec /x") + wcslen(subKeyName) * sizeof(WCHAR)); + command = malloc(sizeof(L"msiexec /x") + wcslen(subKeyName) * sizeof(WCHAR)); wsprintfW(command, L"msiexec /x%s", subKeyName); } else if (!RegQueryValueExW(hkeyApp, L"UninstallString", NULL, NULL, NULL, &uninstlen)) { - command = HeapAlloc(GetProcessHeap(), 0, uninstlen); + command = malloc(uninstlen); RegQueryValueExW(hkeyApp, L"UninstallString", 0, 0, (BYTE *)command, &uninstlen); } else @@ -273,11 +272,10 @@ static int FetchFromRootKey(HKEY root) continue; } numentries++; - entries = HeapReAlloc(GetProcessHeap(), 0, entries, numentries*sizeof(uninst_entry)); + entries = realloc(entries, numentries * sizeof(uninst_entry)); entries[numentries-1].root = root; - entries[numentries-1].key = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(subKeyName)+1)*sizeof(WCHAR)); - lstrcpyW(entries[numentries-1].key, subKeyName); - entries[numentries-1].descr = HeapAlloc(GetProcessHeap(), 0, displen); + entries[numentries-1].key = wcsdup(subKeyName); + entries[numentries-1].descr = malloc(displen); RegQueryValueExW(hkeyApp, L"DisplayName", 0, 0, (BYTE *)entries[numentries-1].descr, &displen); entries[numentries-1].command = command; entries[numentries-1].active = 0; @@ -302,7 +300,7 @@ static int FetchUninstallInformation(void) numentries = 0; oldsel = -1; if (!entries) - entries = HeapAlloc(GetProcessHeap(), 0, sizeof(uninst_entry)); + entries = malloc(sizeof(uninst_entry)); if (!RegOpenKeyExW(HKEY_LOCAL_MACHINE, PathUninstallW, 0, KEY_READ, &root)) {

1 0

Bartosz Kosiorek : gdiplus/tests: Add tests for GdipSetPenTransform.
by Alexandre Julliard Oct. 30, 2023

Oct. 30, 2023

Module: wine Branch: master Commit: 04308954790c1a90065ce71b74a1ae3aaf4ed69d URL: https://gitlab.winehq.org/wine/wine/-/commit/04308954790c1a90065ce71b74a1ae… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Sat Oct 28 19:51:55 2023 +0200 gdiplus/tests: Add tests for GdipSetPenTransform. --- dlls/gdiplus/tests/pen.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index 874344e9c04..1ac74123877 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -445,9 +445,10 @@ static void test_transform(void) { GpStatus status; GpPen *pen; - GpMatrix *matrix, *matrix2; + GpMatrix *matrix, *matrix2, *not_invertible_matrix; REAL values[6]; + /* Check default Pen Transformation */ status = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen); expect(Ok, status); @@ -467,6 +468,26 @@ static void test_transform(void) expectf(0.0, values[4]); expectf(0.0, values[5]); + /* Setting Pen Tranformation to Not invertible matrix, should return InvalidParameter */ + GdipCreateMatrix2(3.0, 3.0, 2.0, 2.0, 6.0, 3.0, &not_invertible_matrix); + + status = GdipSetPenTransform(pen, not_invertible_matrix); + todo_wine expect(InvalidParameter, status); + GdipDeleteMatrix(not_invertible_matrix); + + status = GdipGetPenTransform(pen, matrix); + expect(Ok, status); + status = GdipGetMatrixElements(matrix, values); + expect(Ok, status); + + todo_wine expectf(1.0, values[0]); + todo_wine expectf(0.0, values[1]); + todo_wine expectf(0.0, values[2]); + todo_wine expectf(1.0, values[3]); + todo_wine expectf(0.0, values[4]); + todo_wine expectf(0.0, values[5]); + + /* Setting Pen Tranformation to invertible matrix, should be successfull */ GdipCreateMatrix2(3.0, -2.0, 5.0, 2.0, 6.0, 3.0, &matrix2); status = GdipSetPenTransform(pen, matrix2); expect(Ok, status);

1 0

Bartosz Kosiorek : gdiplus/tests: Add default tension tests for GdipAddPath*Curve.
by Alexandre Julliard Oct. 30, 2023

Oct. 30, 2023

Module: wine Branch: master Commit: 375f7bfa964a3504bde6052eef33fd1db258b848 URL: https://gitlab.winehq.org/wine/wine/-/commit/375f7bfa964a3504bde6052eef33fd… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Fri Oct 27 18:11:16 2023 +0200 gdiplus/tests: Add default tension tests for GdipAddPath*Curve. --- dlls/gdiplus/tests/graphicspath.c | 43 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 03122cdda5d..5e37d0a2f18 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -75,7 +75,7 @@ typedef struct int todo; } path_test_t; -#define ok_path(a,b,c,d) _ok_path_fudge(a,b,c,d,2.0,__LINE__) +#define ok_path(a,b,c,d) _ok_path_fudge(a,b,c,d,1.0,__LINE__) #define ok_path_fudge(a,b,c,d,e) _ok_path_fudge(a,b,c,d,e,__LINE__) static void _ok_path_fudge(GpPath* path, const path_test_t *expected, INT expected_size, BOOL todo_size, REAL fudge, int line) @@ -919,6 +919,18 @@ static path_test_t addcurve_path[] = { {23.3, 13.3, PathPointTypeBezier, 0, 0}, /*8*/ {30.0, 10.0, PathPointTypeBezier, 0, 0} /*9*/ }; +static path_test_t addcurve_path_default_tension[] = { + {0.0, 0.0, PathPointTypeStart, 0, 0}, /*0*/ + {1.66, 1.66, PathPointTypeBezier, 0, 1}, /*1*/ + {8.33, 6.66, PathPointTypeBezier, 0, 1}, /*2*/ + {10.0, 10.0, PathPointTypeBezier, 0, 0}, /*3*/ + {11.6, 13.3, PathPointTypeBezier, 0, 1}, /*4*/ + {6.66, 20.0, PathPointTypeBezier, 0, 1}, /*5*/ + {10.0, 20.0, PathPointTypeBezier, 0, 0}, /*6*/ + {13.3, 20.0, PathPointTypeBezier, 0, 1}, /*7*/ + {26.6, 11.6, PathPointTypeBezier, 0, 1}, /*8*/ + {30.0, 10.0, PathPointTypeBezier, 0, 0} /*9*/ + }; static path_test_t addcurve_path2[] = { {100.0,120.0,PathPointTypeStart, 0, 0}, /*0*/ {123.0,10.0, PathPointTypeLine, 0, 0}, /*1*/ @@ -975,6 +987,13 @@ static void test_addcurve(void) ok_path(path, addcurve_path, ARRAY_SIZE(addcurve_path), FALSE); GdipDeletePath(path); + /* add to empty path with default tension */ + GdipCreatePath(FillModeAlternate, &path); + status = GdipAddPathCurve(path, points, 4); + expect(Ok, status); + ok_path(path, addcurve_path_default_tension, ARRAY_SIZE(addcurve_path_default_tension), FALSE); + GdipDeletePath(path); + /* add to notempty path and opened figure */ GdipCreatePath(FillModeAlternate, &path); GdipAddPathLine(path, 100.0, 120.0, 123.0, 10.0); @@ -1030,6 +1049,21 @@ static path_test_t addclosedcurve_path[] = { {6.7, 0.0, PathPointTypeBezier, 0, 0}, /*11*/ {0.0, 0.0, PathPointTypeBezier | PathPointTypeCloseSubpath, 0, 0} /*12*/ }; +static path_test_t addclosedcurve_path_default_tension[] = { + {0.0, 0.0, PathPointTypeStart, 0, 0}, /*0*/ + {-3.33, 0.0, PathPointTypeBezier, 0, 1}, /*1*/ + {8.33, 6.66, PathPointTypeBezier, 0, 1}, /*2*/ + {10.0, 10.0, PathPointTypeBezier, 0, 0}, /*3*/ + {11.6, 13.3, PathPointTypeBezier, 0, 1}, /*4*/ + {6.66, 20.0, PathPointTypeBezier, 0, 1}, /*5*/ + {10.0, 20.0, PathPointTypeBezier, 0, 0}, /*6*/ + {13.3, 20.0, PathPointTypeBezier, 0, 1}, /*7*/ + {31.6, 13.3, PathPointTypeBezier, 0, 1}, /*8*/ + {30.0, 10.0, PathPointTypeBezier, 0, 0}, /*9*/ + {28.3, 6.66, PathPointTypeBezier, 0, 1}, /*10*/ + {3.33, 0.0, PathPointTypeBezier, 0, 1}, /*11*/ + {0.0, 0.0, PathPointTypeBezier | PathPointTypeCloseSubpath, 0, 0} /*12*/ + }; static void test_addclosedcurve(void) { GpStatus status; @@ -1062,6 +1096,13 @@ static void test_addclosedcurve(void) expect(Ok, status); ok_path(path, addclosedcurve_path, ARRAY_SIZE(addclosedcurve_path), FALSE); GdipDeletePath(path); + + /* add to empty path with default tension */ + GdipCreatePath(FillModeAlternate, &path); + status = GdipAddPathClosedCurve(path, points, 4); + expect(Ok, status); + ok_path(path, addclosedcurve_path_default_tension, ARRAY_SIZE(addclosedcurve_path_default_tension), FALSE); + GdipDeletePath(path); } static path_test_t reverse_path[] = {

1 0

Bartosz Kosiorek : gdiplus: Fix default tension for GdipAddPathCurve and GdipAddPathClosedCurve.
by Alexandre Julliard Oct. 30, 2023

Oct. 30, 2023

Module: wine Branch: master Commit: 86cdcb6994389ad0a89c72001635e8aa6cd6bb80 URL: https://gitlab.winehq.org/wine/wine/-/commit/86cdcb6994389ad0a89c72001635e8… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Fri Oct 27 18:11:16 2023 +0200 gdiplus: Fix default tension for GdipAddPathCurve and GdipAddPathClosedCurve. --- dlls/gdiplus/graphicspath.c | 8 ++++---- dlls/gdiplus/tests/graphicspath.c | 28 ++++++++++++++-------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 54234ea0bd6..74fdfa6cf45 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -421,7 +421,7 @@ GpStatus WINGDIPAPI GdipAddPathClosedCurve(GpPath *path, GDIPCONST GpPointF *poi { TRACE("(%p, %p, %d)\n", path, points, count); - return GdipAddPathClosedCurve2(path, points, count, 1.0); + return GdipAddPathClosedCurve2(path, points, count, 0.5); } GpStatus WINGDIPAPI GdipAddPathClosedCurveI(GpPath *path, GDIPCONST GpPoint *points, @@ -429,7 +429,7 @@ GpStatus WINGDIPAPI GdipAddPathClosedCurveI(GpPath *path, GDIPCONST GpPoint *poi { TRACE("(%p, %p, %d)\n", path, points, count); - return GdipAddPathClosedCurve2I(path, points, count, 1.0); + return GdipAddPathClosedCurve2I(path, points, count, 0.5); } GpStatus WINGDIPAPI GdipAddPathClosedCurve2(GpPath *path, GDIPCONST GpPointF *points, @@ -537,7 +537,7 @@ GpStatus WINGDIPAPI GdipAddPathCurve(GpPath *path, GDIPCONST GpPointF *points, I if(!path || !points || count <= 1) return InvalidParameter; - return GdipAddPathCurve2(path, points, count, 1.0); + return GdipAddPathCurve2(path, points, count, 0.5); } GpStatus WINGDIPAPI GdipAddPathCurveI(GpPath *path, GDIPCONST GpPoint *points, INT count) @@ -547,7 +547,7 @@ GpStatus WINGDIPAPI GdipAddPathCurveI(GpPath *path, GDIPCONST GpPoint *points, I if(!path || !points || count <= 1) return InvalidParameter; - return GdipAddPathCurve2I(path, points, count, 1.0); + return GdipAddPathCurve2I(path, points, count, 0.5); } GpStatus WINGDIPAPI GdipAddPathCurve2(GpPath *path, GDIPCONST GpPointF *points, INT count, diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 5e37d0a2f18..238305c3c24 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -921,14 +921,14 @@ static path_test_t addcurve_path[] = { }; static path_test_t addcurve_path_default_tension[] = { {0.0, 0.0, PathPointTypeStart, 0, 0}, /*0*/ - {1.66, 1.66, PathPointTypeBezier, 0, 1}, /*1*/ - {8.33, 6.66, PathPointTypeBezier, 0, 1}, /*2*/ + {1.66, 1.66, PathPointTypeBezier, 0, 0}, /*1*/ + {8.33, 6.66, PathPointTypeBezier, 0, 0}, /*2*/ {10.0, 10.0, PathPointTypeBezier, 0, 0}, /*3*/ - {11.6, 13.3, PathPointTypeBezier, 0, 1}, /*4*/ - {6.66, 20.0, PathPointTypeBezier, 0, 1}, /*5*/ + {11.6, 13.3, PathPointTypeBezier, 0, 0}, /*4*/ + {6.66, 20.0, PathPointTypeBezier, 0, 0}, /*5*/ {10.0, 20.0, PathPointTypeBezier, 0, 0}, /*6*/ - {13.3, 20.0, PathPointTypeBezier, 0, 1}, /*7*/ - {26.6, 11.6, PathPointTypeBezier, 0, 1}, /*8*/ + {13.3, 20.0, PathPointTypeBezier, 0, 0}, /*7*/ + {26.6, 11.6, PathPointTypeBezier, 0, 0}, /*8*/ {30.0, 10.0, PathPointTypeBezier, 0, 0} /*9*/ }; static path_test_t addcurve_path2[] = { @@ -1051,17 +1051,17 @@ static path_test_t addclosedcurve_path[] = { }; static path_test_t addclosedcurve_path_default_tension[] = { {0.0, 0.0, PathPointTypeStart, 0, 0}, /*0*/ - {-3.33, 0.0, PathPointTypeBezier, 0, 1}, /*1*/ - {8.33, 6.66, PathPointTypeBezier, 0, 1}, /*2*/ + {-3.33, 0.0, PathPointTypeBezier, 0, 0}, /*1*/ + {8.33, 6.66, PathPointTypeBezier, 0, 0}, /*2*/ {10.0, 10.0, PathPointTypeBezier, 0, 0}, /*3*/ - {11.6, 13.3, PathPointTypeBezier, 0, 1}, /*4*/ - {6.66, 20.0, PathPointTypeBezier, 0, 1}, /*5*/ + {11.6, 13.3, PathPointTypeBezier, 0, 0}, /*4*/ + {6.66, 20.0, PathPointTypeBezier, 0, 0}, /*5*/ {10.0, 20.0, PathPointTypeBezier, 0, 0}, /*6*/ - {13.3, 20.0, PathPointTypeBezier, 0, 1}, /*7*/ - {31.6, 13.3, PathPointTypeBezier, 0, 1}, /*8*/ + {13.3, 20.0, PathPointTypeBezier, 0, 0}, /*7*/ + {31.6, 13.3, PathPointTypeBezier, 0, 0}, /*8*/ {30.0, 10.0, PathPointTypeBezier, 0, 0}, /*9*/ - {28.3, 6.66, PathPointTypeBezier, 0, 1}, /*10*/ - {3.33, 0.0, PathPointTypeBezier, 0, 1}, /*11*/ + {28.3, 6.66, PathPointTypeBezier, 0, 0}, /*10*/ + {3.33, 0.0, PathPointTypeBezier, 0, 0}, /*11*/ {0.0, 0.0, PathPointTypeBezier | PathPointTypeCloseSubpath, 0, 0} /*12*/ }; static void test_addclosedcurve(void)

1 0

Tag wine-8.19 : Alexandre Julliard : Release 8.19
by Alexandre Julliard Oct. 29, 2023

Oct. 29, 2023

Module: wine Branch: refs/tags/wine-8.19 Tag: 455ce14a389a9672843ce237d3f7be13016a17e6 URL: https://gitlab.winehq.org/wine/wine/-/tags/455ce14a389a9672843ce237d3f7be13… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Oct 29 14:44:03 2023 +0100 Release 8.19

1 0

Alexandre Julliard : Release 8.19.
by Alexandre Julliard Oct. 29, 2023

Oct. 29, 2023

Module: wine Branch: master Commit: 8b5a60d2d73252e3796cc86fa14d4e549421a104 URL: https://gitlab.winehq.org/wine/wine/-/commit/8b5a60d2d73252e3796cc86fa14d4e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Oct 29 14:44:03 2023 +0100 Release 8.19. --- ANNOUNCE | 710 +++++++++++++++++++++++++++++--------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 346 insertions(+), 384 deletions(-)

1 0

Rémi Bernon : dmstyle: Rewrite style pttn list parsing.
by Alexandre Julliard Oct. 27, 2023

Oct. 27, 2023

Module: wine Branch: master Commit: d1d13e50ec505e2cf4e40b9293853975bf3945e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/d1d13e50ec505e2cf4e40b92938539… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 26 22:50:48 2023 +0200 dmstyle: Rewrite style pttn list parsing. --- dlls/dmstyle/style.c | 248 ++++++++++++++++++--------------------------------- 1 file changed, 87 insertions(+), 161 deletions(-)

1 0

Rémi Bernon : dmstyle: Rename style_motif to style_pattern.
by Alexandre Julliard Oct. 27, 2023

Oct. 27, 2023

Module: wine Branch: master Commit: e89cef0ea67ab9d818cd5a4b9014b44065de7821 URL: https://gitlab.winehq.org/wine/wine/-/commit/e89cef0ea67ab9d818cd5a4b9014b4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 27 08:55:21 2023 +0200 dmstyle: Rename style_motif to style_pattern. Doc says "A motif is a special kind of pattern in a style". --- dlls/dmstyle/style.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 9080d73f943..d3477fbf12e 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -62,7 +62,8 @@ static void style_part_destroy(struct style_part *part) free(part); } -struct style_motif { +struct style_pattern +{ struct list entry; DWORD dwRhythm; DMUS_IO_PATTERN pattern; @@ -79,7 +80,7 @@ struct style struct dmobject dmobj; LONG ref; DMUS_IO_STYLE style; - struct list motifs; + struct list patterns; struct list bands; struct list parts; }; @@ -133,7 +134,7 @@ static ULONG WINAPI style_Release(IDirectMusicStyle8 *iface) if (!ref) { struct style_band *band, *band2; - struct style_motif *motif, *motif2; + struct style_pattern *pattern; struct style_part_ref *part_ref; struct style_part *part; void *next; @@ -144,14 +145,15 @@ static ULONG WINAPI style_Release(IDirectMusicStyle8 *iface) IDirectMusicBand_Release(band->pBand); free(band); } - LIST_FOR_EACH_ENTRY_SAFE(motif, motif2, &This->motifs, struct style_motif, entry) { - list_remove(&motif->entry); - LIST_FOR_EACH_ENTRY_SAFE(part_ref, next, &motif->part_refs, struct style_part_ref, entry) + LIST_FOR_EACH_ENTRY_SAFE(pattern, next, &This->patterns, struct style_pattern, entry) + { + list_remove(&pattern->entry); + LIST_FOR_EACH_ENTRY_SAFE(part_ref, next, &pattern->part_refs, struct style_part_ref, entry) { list_remove(&part_ref->entry); free(part_ref); } - free(motif); + free(pattern); } LIST_FOR_EACH_ENTRY_SAFE(part, next, &This->parts, struct style_part, entry) @@ -227,7 +229,7 @@ static HRESULT WINAPI style_EnumMotif(IDirectMusicStyle8 *iface, DWORD index, WCHAR *name) { struct style *This = impl_from_IDirectMusicStyle8(iface); - const struct style_motif *motif = NULL; + const struct style_pattern *pattern = NULL; const struct list *cursor; unsigned int i = 0; @@ -237,18 +239,19 @@ static HRESULT WINAPI style_EnumMotif(IDirectMusicStyle8 *iface, DWORD index, return E_POINTER; /* index is zero based */ - LIST_FOR_EACH(cursor, &This->motifs) { + LIST_FOR_EACH(cursor, &This->patterns) + { if (i == index) { - motif = LIST_ENTRY(cursor, struct style_motif, entry); + pattern = LIST_ENTRY(cursor, struct style_pattern, entry); break; } i++; } - if (!motif) + if (!pattern) return S_FALSE; - if (motif->desc.dwValidData & DMUS_OBJ_NAME) - lstrcpynW(name, motif->desc.wszName, DMUS_MAX_NAME); + if (pattern->desc.dwValidData & DMUS_OBJ_NAME) + lstrcpynW(name, pattern->desc.wszName, DMUS_MAX_NAME); else name[0] = 0; @@ -524,7 +527,7 @@ static HRESULT parse_pattern_list(struct style *This, DMUS_PRIVATE_CHUNK *pChunk DWORD ListSize[3], ListCount[3]; LARGE_INTEGER liMove; /* used when skipping chunks */ IDirectMusicBand* pBand = NULL; - struct style_motif *pNewMotif = NULL; + struct style_pattern *pNewMotif = NULL; if (pChunk->fccID != DMUS_FOURCC_PATTERN_LIST) { ERR_(dmfile)(": %s chunk should be a PATTERN list\n", debugstr_fourcc (pChunk->fccID)); @@ -543,7 +546,7 @@ static HRESULT parse_pattern_list(struct style *This, DMUS_PRIVATE_CHUNK *pChunk TRACE_(dmfile)(": Pattern chunk\n"); /** alloc new motif entry */ if (!(pNewMotif = calloc(1, sizeof(*pNewMotif)))) return E_OUTOFMEMORY; - list_add_tail(&This->motifs, &pNewMotif->entry); + list_add_tail(&This->patterns, &pNewMotif->entry); IStream_Read (pStm, &pNewMotif->pattern, Chunk.dwSize, NULL); /** TODO trace pattern */ @@ -896,7 +899,7 @@ HRESULT create_dmstyle(REFIID lpcGUID, void **ppobj) obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; list_init(&obj->parts); list_init(&obj->bands); - list_init(&obj->motifs); + list_init(&obj->patterns); hr = IDirectMusicStyle8_QueryInterface(&obj->IDirectMusicStyle8_iface, lpcGUID, ppobj); IDirectMusicStyle8_Release(&obj->IDirectMusicStyle8_iface);

1 0