- Explicitly initialize structures.

- Fixed strange code probably caused by a merge conflict.

- Explicitly initialize structures.
f87b96e7 · Patrik Stridvall · Alexandre Julliard · 0282825f · f87b96e7
Commit f87b96e7 authored Oct 24, 2000 by Patrik Stridvall Committed by Alexandre Julliard Oct 24, 2000
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

palette.c objects/palette.c +3 -4

No files found.
--- a/objects/palette.c
+++ b/objects/palette.c
@@ -162,12 +162,11 @@ HPALETTE WINAPI CreateHalftonePalette(
 	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++) {