- wine-gitlab - winehq.org

Re: [PATCH v6 0/2] MR7060: scrrun/tests: Add drive_get_path test
by Quinn Rafferty (＠ramleejo) 30 Dec '24

30 Dec '24

On Mon Dec 30 17:30:16 2024 +0000, Alex Henrie wrote: > Thanks for the patches. The implementation looks good and it allows the > Windows Search Index Analyzer to display its initial dialog. It's > possible that drive_get_Path should really call GetVolumePathNameW and > strip the trailing backslash, but Wine's implementation of the Drive > class currently only supports letter drives, so a simpler implementation > is fine for now. > I'm not sure that all the tests are necessary. If it were me, I would > just do this: > ```diff > diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c > index e53bd092ce9..aabec74b3f9 100644 > --- a/dlls/scrrun/tests/filesystem.c > +++ b/dlls/scrrun/tests/filesystem.c > @@ -1471,7 +1471,7 @@ static void test_DriveCollection(void) > while (IEnumVARIANT_Next(enumvar, 1, &var, &fetched) == S_OK) { > IDrive *drive = (IDrive*)V_DISPATCH(&var); > DriveTypeConst type; > - BSTR str; > + BSTR str, path; > > hr = IDrive_get_DriveType(drive, &type); > ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); > @@ -1482,7 +1482,17 @@ static void test_DriveCollection(void) > hr = IDrive_get_DriveLetter(drive, &str); > ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); > ok(SysStringLen(str) == 1, "got string %s\n", wine_dbgstr_w(str)); > + > + hr = IDrive_get_Path(drive, NULL); > + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); > + > + hr = IDrive_get_Path(drive, &path); > + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); > + ok(SysStringLen(path) == 2 && path[0] == str[0] && path[1] == ':', > + "got string %s\n", wine_dbgstr_w(path)); > + > SysFreeString(str); > + SysFreeString(path); > > hr = IDrive_get_IsReady(drive, NULL); > ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); > ``` > However, when submitting tests I am often told that I have added either > too few tests or too many tests, and I'm not sure what the preferred > amount of tests is here. Thanks for the feedback; I'm happy I could help fix the issue for you. I had thought about adding my test to a previous test like in your example, but I wasn't sure what would be considered best practice so I went with the safe route. I'm open to changing the tests to what you suggested, it's much more concise than my solution. Also, thanks for adding this to the Bugzilla report. I had meant to but had forgotten to as I was sick all last week. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7060#note_91195

1 0

Re: [PATCH v6 0/2] MR7060: scrrun/tests: Add drive_get_path test
by Alex Henrie (＠alexhenrie) 29 Dec '24

29 Dec '24

Thanks for the patches. The implementation looks good and it allows the Windows Search Index Analyzer to display its initial dialog. It's possible that drive_get_Path should really call GetVolumePathNameW and strip the trailing backslash, but Wine's implementation of the Drive class currently only supports letter drives, so a simpler implementation is fine for now. I'm not sure that all the tests are necessary. If it were me, I would just do this: ```diff diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index e53bd092ce9..aabec74b3f9 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1471,7 +1471,7 @@ static void test_DriveCollection(void) while (IEnumVARIANT_Next(enumvar, 1, &var, &fetched) == S_OK) { IDrive *drive = (IDrive*)V_DISPATCH(&var); DriveTypeConst type; - BSTR str; + BSTR str, path; hr = IDrive_get_DriveType(drive, &type); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -1482,7 +1482,17 @@ static void test_DriveCollection(void) hr = IDrive_get_DriveLetter(drive, &str); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(SysStringLen(str) == 1, "got string %s\n", wine_dbgstr_w(str)); + + hr = IDrive_get_Path(drive, NULL); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + + hr = IDrive_get_Path(drive, &path); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(SysStringLen(path) == 2 && path[0] == str[0] && path[1] == ':', + "got string %s\n", wine_dbgstr_w(path)); + SysFreeString(str); + SysFreeString(path); hr = IDrive_get_IsReady(drive, NULL); ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); ``` However, when submitting tests I am often told that I have added either too few tests or too many tests, and I'm not sure what the preferred amount of tests is here. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7060#note_91192

2 1

[PATCH v4 0/1] MR4878: advpack: Ignore lines that begin with '@' in (Un)RegisterOCXs sections.
by Alex Henrie (＠alexhenrie) 29 Dec '24

29 Dec '24

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56209 -- v4: advpack: Ignore lines that begin with '@' in (Un)RegisterOCXs sections. https://gitlab.winehq.org/wine/wine/-/merge_requests/4878

3 3

[PATCH 0/1] MR7078: user32: copy the clipboard format iterator's position when cloning it
by Damjan Jovanovic (＠dj) 29 Dec '24

29 Dec '24

Fixes a bug in the clipboard's IEnumFORMATETC::Clone(), where cloned iterators start at the beginning, instead of at the position of the original iterator. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7078

4 3

[PATCH 0/1] MR7080: user32/tests: Force window to be visible in subtest_swp_paint_regions
by Jinoh Kang (＠iamahuman) 28 Dec '24

28 Dec '24

Works around Windows 7 bug that sometimes hides the first created window with `WS_VISIBLE`. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53891 -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7080

2 1

Re: [PATCH v3 0/2] MR6492: d2d1: Implement drawing of ID2D1GeometryGroup
by kralo (＠kralo) 28 Dec '24

28 Dec '24

Thanks, @d1saster , patch is exactly what is needed. Was able to compile locally, works great. ![patchAndResult](/uploads/2d7e661fc17ccdb771a0c4695efadbb7/patchAndResult.png) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6492#note_91181

1 0

Re: [PATCH v3 0/2] MR6492: d2d1: Implement drawing of ID2D1GeometryGroup
by kralo (＠kralo) 28 Dec '24

28 Dec '24

Tax Season is upon us (this breaks T@x from buhl). @nsivov could you re-run the pipeline so we can have a fresh look what's blocking here? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6492#note_91180

1 0

[PATCH v7 0/1] MR7064: Draft: ntdll: Check for invalid GS base in the 64-bit segv_handler.
by William Horvath (＠whrvth) 27 Dec '24

27 Dec '24

Adapted from [check_invalid_gs](https://gitlab.winehq.org/wine/wine/-/blob/d7a7cae2e2d1ad… in signal_i386.c. This prevents crashing when the %gs register is manipulated, such as in 32-bit code on "new-style" WoW64. "Exertus: Darkness Approaches" is a 32-bit game that triggers this crash (on WoW64), which can be downloaded from the Bugzilla page's attachments. For another example, [test.c](https://bugs.winehq.org/attachment.cgi?id=77444) can reproduce it, courtesy of Fabian Maurer from the Bugzilla comments. This will crash whether it's compiled as 32-bit or 64-bit, while it works fine on Windows. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=57444 -- v7: ntdll: Check for invalid GS base in the 64-bit segv_handler on WoW64. https://gitlab.winehq.org/wine/wine/-/merge_requests/7064

2 2

Re: [PATCH v3 0/2] MR7072: win32u: Check window state updates again after applying new state. - approved
by Alexandre Julliard (＠julliard) 26 Dec '24

26 Dec '24

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7072

1 0

Re: [PATCH v2 0/1] MR7074: kernelbase: Don't free pathname if query failed. - approved
by Alexandre Julliard (＠julliard) 26 Dec '24

26 Dec '24

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7074

1 0

2025

2024

2023

2022

wine-gitlab