Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 20:35:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

- dont show the same resolution multiple times

Browse source 
- sort the resolution according to width, height and bits per pixel

See issue #2594 for more details.

svn path=/trunk/; revision=28585
This commit is contained in:
Johannes Anderwald 2007-08-26 22:43:51 +00:00
parent 8598e12a2a
commit 9b57eaeea0
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
reactos/dll/cpl/desk/settings.c
View file

@ -137,11 +137,11 @@ GetPossibleSettings(IN LPTSTR DeviceName, OUT DWORD* pSettingsCount, OUT PSETTIN
Current->dmPelsHeight = devmode.dmPelsHeight; Current->dmPelsHeight = devmode.dmPelsHeight;
Current->dmBitsPerPel = devmode.dmBitsPerPel; Current->dmBitsPerPel = devmode.dmBitsPerPel;
while (Next != NULL && ( while (Next != NULL && (
Next->dmPelsHeight < Current->dmPelsHeight || Next->dmPelsWidth < Current->dmPelsWidth ||
(Next->dmPelsHeight == Current->dmPelsHeight && Next->dmBitsPerPel < Current->dmBitsPerPel) || (Next->dmPelsWidth == Current->dmPelsWidth && Next->dmPelsHeight < Current->dmPelsHeight) ||
(Next->dmPelsHeight == Current->dmPelsHeight && (Next->dmPelsHeight == Current->dmPelsHeight &&
Next->dmBitsPerPel == Current->dmBitsPerPel && Next->dmPelsWidth == Current->dmPelsWidth &&
Next->dmPelsWidth < Current->dmPelsWidth))) Next->dmBitsPerPel < Current->dmBitsPerPel )))
{ {
Previous = Next; Previous = Next;
Next = Next->Flink; Next = Next->Flink;
@ -194,7 +194,7 @@ AddDisplayDevice(IN PGLOBAL_DATA pGlobalData, IN LPTSTR Description, IN LPTSTR D
for (Current = newEntry->Settings; Current != NULL; Current = Current->Flink) for (Current = newEntry->Settings; Current != NULL; Current = Current->Flink)
{ {
if (Current->Flink != NULL && if (Current->Flink != NULL &&
((Current->dmPelsWidth != Current->Flink->dmPelsWidth) || ((Current->dmPelsWidth != Current->Flink->dmPelsWidth) &&
(Current->dmPelsHeight != Current->Flink->dmPelsHeight))) (Current->dmPelsHeight != Current->Flink->dmPelsHeight)))
{ {
ResolutionsCount++; ResolutionsCount++;
@ -211,7 +211,7 @@ AddDisplayDevice(IN PGLOBAL_DATA pGlobalData, IN LPTSTR Description, IN LPTSTR D
{ {
if (Current->Flink == NULL || if (Current->Flink == NULL ||
(Current->Flink != NULL && (Current->Flink != NULL &&
((Current->dmPelsWidth != Current->Flink->dmPelsWidth) || ((Current->dmPelsWidth != Current->Flink->dmPelsWidth) &&
(Current->dmPelsHeight != Current->Flink->dmPelsHeight)))) (Current->dmPelsHeight != Current->Flink->dmPelsHeight))))
{ {
newEntry->Resolutions[i].dmPelsWidth = Current->dmPelsWidth; newEntry->Resolutions[i].dmPelsWidth = Current->dmPelsWidth;