commit f87b96e711f35e14774fccb01303c69f2d3b3cf6
author Patrik Stridvall <ps@leissner.se> Tue Oct 24 02:20:31 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Oct 24 02:20:31 2000 +0000
tree aaf81c54981087c398bd0b12024d54462f7de38c
parent 0282825f63797b760e238cd50927f2e2e9ce7ad4

- Explicitly initialize structures.
- Fixed strange code probably caused by a merge conflict.

objects/palette.c

diff --git a/objects/palette.c b/objects/palette.c
index 046fe31..6bc21d1 100644
--- a/objects/palette.c
+++ b/objects/palette.c
@@ -162,12 +162,11 @@
 	WORD Version;
 	WORD NumberOfEntries;
 	PALETTEENTRY aEntries[256];
-    } Palette = {
-	0x300, 256
-    };
+    } Palette;
 
+    Palette.Version = 0x300;
+    Palette.NumberOfEntries = 256;
     GetSystemPaletteEntries(hdc, 0, 256, Palette.aEntries);
-    return CreatePalette((LOGPALETTE *)&Palette);
 
     for (r = 0; r < 6; r++) {
 	for (g = 0; g < 6; g++) {