@Skif-off true, the #3046 does not change the generated `gsdlg.h` and also don't contain any other obvious changes which are related. So this PR is independent of the pending Scintilla update.
It doesn't look bad, I just did not yet understand why the many parameter handling changes are necessary. The commit message of b0b1b2acc226938dc37723cd1d2366fc2785b611 is not very verbose. I see there are new parameter types added but also some existing code moved and so potential logic changed. This is probably ok, I just cannot see why. @xiota can you shed some light on this?