Author: janderwald
Date: Sun Mar 9 10:34:13 2008
New Revision: 32626
URL:
http://svn.reactos.org/svn/reactos?rev=3D32626&view=3Drev
Log:
- fix enumeration of available time zones
Modified:
trunk/reactos/dll/cpl/timedate/timezone.c
Modified: trunk/reactos/dll/cpl/timedate/timezone.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/time=
zone.c?rev=3D32626&r1=3D32625&r2=3D32626&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/reactos/dll/cpl/timedate/timezone.c (original)
+++ trunk/reactos/dll/cpl/timedate/timezone.c Sun Mar 9 10:34:13 2008
@@ -89,7 +89,7 @@
NULL,
NULL,
NULL);
- if (lError !=3D ERROR_SUCCESS && lError !=3D ERROR_MORE_DATA)
+ if (lError =3D=3D ERROR_NO_MORE_ITEMS)
break;
=
if (RegOpenKeyEx (hZonesKey,
@@ -107,15 +107,18 @@
}
=
dwValueSize =3D 64 * sizeof(WCHAR);
- if (RegQueryValueExW(hZoneKey,
+ lError =3D RegQueryValueExW(hZoneKey,
L"Display",
NULL,
NULL,
(LPBYTE)&Entry->Description,
- &dwValueSize))
- {
- RegCloseKey(hZoneKey);
- break;
+ &dwValueSize);
+ if (lError !=3D ERROR_SUCCESS)
+ {
+ RegCloseKey(hZoneKey);
+ dwIndex++;
+ HeapFree(GetProcessHeap(), 0, Entry);
+ continue;
}
=
dwValueSize =3D 33 * sizeof(WCHAR);