Commit 529246b
committed
[WIN32SS:USER] Fix ScrollBar class creation when using comctl32 v6, mute useless errors
For some reason, both Windows and Wine define ScrollBar class to be forwarded. Wine does not re-register the ScrollBar class, and Windows does not appear to do so either. Previously, ReactOS relied on a hack to register the ScrollBar class: https://github.com/reactos/reactos/blob/eecfbaeaa0bdef86f0cecff9828871be276ccd6e/dll/win32/comctl32/theming.c#L164. Wine uses a is_builtin_class function to determine if the class is implemented server side rather than user32/comctl32, so use the same function.
Wine switched to registering all of its comctl32 classes in RegisterClassNameW rather than its dllmain. See wine-mirror/wine@05421ef.
Remove errors when the class could not be located in the first pass, which is now the default behavior, which results in user32!VersionRegisterClass being called, which allows CreateWindow to succeed. I also confirmed that Windows's comctl32 registers its classes when RegisterClassNameW is called by user32, not at startup using a debugger.1 parent c4331b4 commit 529246b
3 files changed
Lines changed: 51 additions & 24 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1477 | 1477 | | |
1478 | 1478 | | |
1479 | 1479 | | |
1480 | | - | |
| 1480 | + | |
1481 | 1481 | | |
1482 | 1482 | | |
1483 | 1483 | | |
1484 | | - | |
| 1484 | + | |
1485 | 1485 | | |
1486 | 1486 | | |
1487 | 1487 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2214 | 2214 | | |
2215 | 2215 | | |
2216 | 2216 | | |
2217 | | - | |
| 2217 | + | |
2218 | 2218 | | |
2219 | 2219 | | |
2220 | 2220 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
47 | 47 | | |
48 | 48 | | |
49 | 49 | | |
50 | | - | |
51 | | - | |
52 | | - | |
53 | | - | |
54 | | - | |
55 | | - | |
56 | | - | |
57 | | - | |
58 | | - | |
59 | | - | |
60 | | - | |
61 | | - | |
62 | | - | |
63 | | - | |
64 | | - | |
65 | | - | |
66 | | - | |
67 | | - | |
68 | | - | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
69 | 70 | | |
70 | 71 | | |
71 | 72 | | |
| |||
80 | 81 | | |
81 | 82 | | |
82 | 83 | | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
83 | 105 | | |
84 | 106 | | |
85 | 107 | | |
| |||
128 | 150 | | |
129 | 151 | | |
130 | 152 | | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
131 | 160 | | |
132 | 161 | | |
133 | 162 | | |
| |||
205 | 234 | | |
206 | 235 | | |
207 | 236 | | |
208 | | - | |
209 | | - | |
210 | 237 | | |
211 | 238 | | |
212 | 239 | | |
| |||
0 commit comments