Alexandre Julliard : winemenubuilder: Use the new wine glass icon from user32 as default icon.
Module: wine Branch: master Commit: db68b1e60228a562f6df723adf682bd216457c0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=db68b1e60228a562f6df723adf...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Jun 28 16:39:39 2010 +0200
winemenubuilder: Use the new wine glass icon from user32 as default icon.
---
programs/winemenubuilder/wine.xpm | 210 ---------------------------- programs/winemenubuilder/winemenubuilder.c | 34 +---- 2 files changed, 5 insertions(+), 239 deletions(-)
diff --git a/programs/winemenubuilder/wine.xpm b/programs/winemenubuilder/wine.xpm deleted file mode 100644 index 85e34f8..0000000 --- a/programs/winemenubuilder/wine.xpm +++ /dev/null @@ -1,210 +0,0 @@ -/* XPM */ -static const char * wine_xpm[] = { -"48 48 159 2", -" c None", -". c #010101", -"+ c #030303", -"@ c #000000", -"# c #040404", -"$ c #0D0D0D", -"% c #222222", -"& c #090909", -"* c #050505", -"= c #101010", -"- c #0B0B0B", -"; c #131313", -"> c #1C1C1C", -", c #232323", -"' c #161616", -") c #020202", -"! c #2F2F2F", -"~ c #212121", -"{ c #060606", -"] c #292929", -"^ c #0A0A0A", -"/ c #111111", -"( c #252525", -"_ c #0E0E0E", -": c #262626", -"< c #0C0005", -"[ c #100308", -"} c #2D2D2D", -"| c #2A2A2A", -"1 c #360013", -"2 c #59001C", -"3 c #120006", -"4 c #080808", -"5 c #141414", -"6 c #090707", -"7 c #0A0003", -"8 c #0E0003", -"9 c #0B0205", -"0 c #191919", -"a c #6A0022", -"b c #AC0033", -"c c #730024", -"d c #4F0019", -"e c #470016", -"f c #4B0019", -"g c #5D001E", -"h c #690022", -"i c #6E0023", -"j c #660021", -"k c #410012", -"l c #1B080D", -"m c #171717", -"n c #160007", -"o c #8E002E", -"p c #B60038", -"q c #AE0038", -"r c #A90035", -"s c #A60033", -"t c #A60035", -"u c #AF0038", -"v c #B10038", -"w c #B00038", -"x c #A10031", -"y c #6D0020", -"z c #1A0007", -"A c #121212", -"B c #3D0014", -"C c #A70033", -"D c #AE0039", -"E c #B30038", -"F c #B20038", -"G c #B70038", -"H c #98002E", -"I c #2E000F", -"J c #52021A", -"K c #7C0026", -"L c #AC0035", -"M c #AD0038", -"N c #B50038", -"O c #830029", -"P c #1A0008", -"Q c #490017", -"R c #A00033", -"S c #B20039", -"T c #53001B", -"U c #3C0014", -"V c #A20032", -"W c #AD0039", -"X c #B40038", -"Y c #8F002D", -"Z c #1E0008", -"` c #171616", -" . c #51001A", -".. c #A80035", -"+. c #B20037", -"@. c #700025", -"#. c #0A0104", -"$. c #090204", -"%. c #B00039", -"&. c #A40033", -"*. c #32000F", -"=. c #110005", -"-. c #730026", -";. c #AF0039", -">. c #810029", -",. c #0A0002", -"'. c #1D0009", -"). c #820029", -"!. c #410014", -"~. c #21000A", -"{. c #87002A", -"]. c #88002C", -"^. c #8B002A", -"/. c #3C0015", -"(. c #20000A", -"_. c #86002A", -":. c #B50037", -"<. c #710022", -"[. c #080002", -"}. c #130006", -"|. c #790026", -"1. c #7A0128", -"2. c #140007", -"3. c #0D0608", -"4. c #650021", -"5. c #90002E", -"6. c #290310", -"7. c #181818", -"8. c #390013", -"9. c #9A0032", -"0. c #B40039", -"a. c #B10037", -"b. c #91002D", -"c. c #3E0014", -"d. c #0C0407", -"e. c #0A0004", -"f. c #4A001A", -"g. c #92002D", -"h. c #A50034", -"i. c #94002E", -"j. c #6C0122", -"k. c #2E0210", -"l. c #0B0406", -"m. c #070707", -"n. c #090003", -"o. c #26000C", -"p. c #370414", -"q. c #28000C", -"r. c #060303", -"s. c #191818", -"t. c #1F1F1F", -"u. c #0F0F0F", -"v. c #1D1D1D", -"w. c #3E3E3E", -"x. c #2B2B2B", -"y. c #1A1A1A", -"z. c #323232", -"A. c #2E2E2E", -"B. c #1E1E1E", -" . + @ @ # ", -" $ % & . * ", -" & . = & - ", -" @ ; - # ", -" > @ , # ", -" . ' ) ", -" ! # ~ * ", -" { @ # @ ", -" . > . * ", -" ] ^ / ( _ : ", -" $ < [ } + + ", -" | ' 1 2 3 4 5 / 6 7 8 9 $ & 0 ", -" ^ * a b c d e f g h i j k l m & ' ", -" @ n o p q r s t u q v w x y z @ ", -" A B C u D E F v q F u u G H I @ ", -" J K L E D F M v u M E q N O P ", -" Q R E q S u v M F u E q r T + ", -" { U V v F W w v v w F M X Y Z ", -" ` ...F u D F u w v w M +.@.#. ", -" $.a w w v %.v u u w v w &.*.. ", -" =.-.w w v ;.u v u w M G >.,.@ ", -" '.).w v u W v q v u v E !.@ ", -" ~.{.E u F D F u w v X ].7 # ", -" ~.^.F F q S u v M F X /.@ ", -" (._.X u E W u v v :.<.[.@ ", -" }.|.w F q D F v v 1.2.4 ", -" 3.4.w w F %.F X 5.6.. 7. ", -" ^ 8.9.G v 0.a.b.c.d.. ", -" e.f.g.h.i.j.k.l.m. ", -" - n.o.p.q.3 4 ^ ", -" r.@ @ . @ @ ", -" s.@ @ @ ", -" > @ ) ", -" t.. u. ", -" > + ", -" > v. ", -" 5 ' ", -" # ", -" v. ", -" @ ( ", -" w.x.] _ @ ( ", -" @ @ @ @ & / - @ @ @ ( ", -" { & @ @ @ @ @ @ & ( ", -" = / m.@ @ @ @ = 5 ) ", -" y.@ @ @ @ @ @ @ - ", -" z.^ @ @ @ @ m.# ", -" A _ . @ . & ", -" A.B.; "}; diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 620d705..8ee8387 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -95,7 +95,6 @@ #include "wine/debug.h" #include "wine/library.h" #include "wine/list.h" -#include "wine.xpm"
#ifdef HAVE_PNG_H #undef FAR @@ -865,27 +864,11 @@ end: return ret; }
-static BOOL create_default_icon( const char *filename, const char* comment ) +static BOOL create_default_icon( char *filename ) { - FILE *fXPM; - unsigned int i; - - if (!(fXPM = fopen(filename, "w"))) return FALSE; - if (fprintf(fXPM, "/* XPM */\n/* %s */\nstatic char * icon[] = {", comment) <= 0) - goto error; - for (i = 0; i < sizeof(wine_xpm)/sizeof(wine_xpm[0]); i++) { - if (fprintf( fXPM, "\n"%s",", wine_xpm[i]) <= 0) - goto error; - } - if (fprintf( fXPM, "};\n" ) <=0) - goto error; - fclose( fXPM ); - return TRUE; - error: - fclose( fXPM ); - unlink( filename ); - return FALSE; + static const WCHAR user32W[] = {'u','s','e','r','3','2',0};
+ return extract_icon32( user32W, -(INT_PTR)IDI_WINLOGO, filename ); }
static unsigned short crc16(const char* string) @@ -1084,15 +1067,8 @@ static char *extract_icon( LPCWSTR path, int index, const char *destFilename, BO goto end; if (ExtractFromFileType( path, xpm_path )) goto end; - if (!bWait) - { - if (destFilename) - sprintf(xpm_path,"%s/%s.xpm",iconsdir,destFilename); - else - sprintf(xpm_path,"%s/%04x_%s.xpm",iconsdir,crc,ico_name); - if (create_default_icon( xpm_path, ico_path )) - goto end; - } + if (!bWait && create_default_icon( xpm_path )) + goto end;
HeapFree( GetProcessHeap(), 0, xpm_path ); xpm_path=NULL;
-
Alexandre Julliard