May 2010 - Wine-commits - list.winehq.org

Joel Holdsworth : wordpad: Replaced formatbar. bmp with a Tango compliant tool strip.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 00ff0db708477f04a5a62275f066ce8c89f7db9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=00ff0db708477f04a5a62275f… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun May 16 23:10:09 2010 +0100 wordpad: Replaced formatbar.bmp with a Tango compliant tool strip. --- programs/wordpad/Makefile.in | 1 + programs/wordpad/formatbar.bmp | Bin 1142 -> 8314 bytes programs/wordpad/formatbar.svg | 51 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/Makefile.in b/programs/wordpad/Makefile.in index 0ad0549..7559924 100644 --- a/programs/wordpad/Makefile.in +++ b/programs/wordpad/Makefile.in @@ -37,6 +37,7 @@ RC_SRCS = \ rsrc.rc SVG_SRCS = \ + formatbar.svg \ toolbar.svg \ wordpad.svg diff --git a/programs/wordpad/formatbar.bmp b/programs/wordpad/formatbar.bmp index 310b596..e6c6c36 100644 Binary files a/programs/wordpad/formatbar.bmp and b/programs/wordpad/formatbar.bmp differ diff --git a/programs/wordpad/formatbar.svg b/programs/wordpad/formatbar.svg new file mode 100644 index 0000000..2efff84 --- /dev/null +++ b/programs/wordpad/formatbar.svg @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + +<svg id="bitmap:128-32" xmlns="http://www.w3.org/2000/svg" height="16" width="128" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink"> + <defs id="defs2898"> + <linearGradient id="linearGradient2882" y2="15.5" gradientUnits="userSpaceOnUse" y1="6.5" x2="57.5" x1="48.5"> + <stop id="stop3063" stop-color="#729fcf" offset="0"/> + <stop id="stop3065" stop-color="#3465a4" offset="1"/> + </linearGradient> + </defs> + <image id="image2926" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1gEEDyEex32EyAAAAk5JREFUOMvFkj9MU1EUxr97b9tX qrSl0ILyJynoUGON0UmjgyYmmkAYSHAgGhNtXHXCmDgpg5VBk8aBaGI0YXBygDg6MtUoQUMMCBUQ oS3t4/XPe33vnutAAkVwcvBs50vOL9853wH+sdifwulbb4KcsyyRctXrnDOHSIXTL64V63XXHiJD ou/cUZ7ojYOxLb5SCs/ffeLvp+YTAJ781cGpm6+5S/Dq2PAVz+zPEj6kFwgAzp7o4CEvw8NXUzVH UsPHl9dp21k9gKS8cDzaInxeF5bzZaRnMkjPZLBasGDZhHDAK0jKi7tWq2/cAs8un4mK6cUN/FjJ A0TLIFqaW8xift3Eka4WIRie7guID411ugWLhQMaMjkLn78uScuy71iWfXd2bkX+0h14vAfgOE4s PjTWuQfAmbp3/mQX+75WxcqagY2iASI5SSQn9U0D2UIF2TLQFAoxpdT9XYDYYEqTjrzdeaiJZXI1 5AolOLYtSEqLpLQc2xFFvYyKSfD5mxlJJxEbTGnbMRLJgWh7CLrJUKwotEaacePqJYQOuhH2awgH NDAAI2+/QXEP3FoDzIoxAGDctWWfpdoPR8RqUaJqA8WSjeWcCdtRsB2CLRWU2jlcoLlVmOVSCsC4 q6d/NM6Z8jPND71K+DI9LfVCQez3tr7GoOzoOSZ8jUEoKH9P/2jcxYBkpK1dbJqAYRgo5jegFGkL E8O1+uFo72NPWS9UamYVHm8Dgi1tIr+6lGTdfck1kjKy/ZqcP1qYGH6wn4Pu3uQIkdxJgIt1/Pf6 DUkxDWtjDc8LAAAAAElFTkSuQmCC " height="16" width="16" y="0" x="0"/> + <image id="image2940" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QAAAAAAAD5Q7t/AAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1gEJFSIFhe7gnAAAAfhJREFUOMvNkk9Ik3EYx7+/5/fu HctiMjLTqFXTlrYtZjGIgg6FUhQkISEaEUVG1CGKDuvoIaQIGlTkISx26xAeaqM/NIkgrAbZwg6b gzIQEabi9N07f8/bwZIKdUKXnvPzfPjwfb7AP45Y7mLD6QdeSfIzsyUBQBKZ/d1tdm05x4GzD106 tIErx3fJ7Z7VGB03cP5GXAcAKnVccyGiO1ikThz02yqcDly6neCJ6SIsZgBASQOX4ezdu8NdGaqv Fpcjzzg3OUPfxmbArFDSIHjyftizztV4bP82utbzhicmjSgrRmYkD1a8NMDffq+pvMzeea4lRD1P P1npr6PfhW6eYlaYmlZLG/ha73h1SU8utu2hV8lh9L39ogqsGj50d8xaSiFvKFhqEUCg+a5LAANn WnbLzEgej2L9bLIKDUY7xgCAmTFlKPBCIdYciOhs51TzvqDN0ux4/jplmQWTACS9R2/NFYck5w1F /NPgD4C+Er3B+g2VVdVrRDI9Drd7vfBt3YxVDhucKzSUl9kgSVA0MTyfwTyg9sjNcFWFszHo30KP X3y0htLZBVsqbTp7fDvp1xc0ANh4uKuJSHTW1tVR4n0WQ5lsURTNtelYOPc3YNOhLmsui98MpBDX C4ZB8dhLCEEKajaQjV/NLfJhc/Bdny6ITPwX8wNOwM9Q5xcsRQAAAABJRU5ErkJggg== " height="16" width="16" y="0" x="16"/> + <image id="image2954" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1gEEDyMK75EyNwAAAi5JREFUOMut0k9I02EYB/Dv+74/ 98fy56opYymUa61RQ1I6denfpRIMDLzoTcmDHYTA6NhFtB0qFEHsFOQxgyFUsA4aqbHTmC1xiX+a lPsna7r22/u8HbzoXF3sOX+fz/s8vA9DmWruemnjnG0SKQ0AOGdFIlUTGu/MlGa1cgBj6L5xqYF3 tfgAAOOBMH8/H+sG8ORAtszrXBN8x3//umk6/F0BQKOrhj1+MV0oSrKGxjtpb56XAiTlNZezWuhH TZgMLqjJ4IIC5zihWwRJebU0fwDQBJ7eueIRs5ENKCVXlJIrc5E4zrsdQhN49k/A1zFWb9KY1113 HK+DEZnPF/ry+ULfTCgm9WodhlH0+jrG6v8KcODR7cvn2JfVNOI/MiBJUyRpKpHMYjO1A6fDzqDw sCzgbR8xS5LdF9wO9vbToiKSo5GJHiMy0WNIkqPRpXVlr6llUhbvedtHzAe+kaRsazzrZKmcxPJ6 koyC0eu5+7wXAIqGgcxWVtoddcJisSL3K9sG4NU+QHA27DlTx5fi22i+6BMWs0ClWcMRs4BurUCV VROzX9NYP1Yrctns8D7A1er3mSq4TsKKdx8+y2QiKcodWGWVTZ5s8AoFpbta/b7Ymwfh3VNlGHI4 nWJxNYXkZgJEZF4O9Bf2Np9uGTTlttLbxu88bHaHSG6sDQG4yXf3p6ZoJIq5mY9QRAOlzQCwHOgv QKnBWHgeP9e+QRE14X8UO3VrQB0G4Ied4A+X1/MuJnM+zQAAAABJRU5ErkJggg== " height="16" width="16" y="0" x="32"/> + <image id="image2968" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAAB3RJ TUUH1wUZCSMcg2cB8wAAAV9JREFUOI2lUj1LA0EQfftxF6Ii9rZWFhGiFrHIJogWYhEI2Ohv8FfZ SVoFQfCSaKKFCVEwjWKltYKS3M7uWuQilw8jmgfLzj52Zt6bXYYhpDMbF6RJDfMAIKQIGvVaLs7J 4UukSe1sKzjnYIwBkYl2jcvr5kjhkQLSl8HJWfCjgnH8VGCTPP8GznkgSZMq7G5BSgnGWMw7Rf4p invnfqy1xt3Do5pawX/yBsCAyW8/qXvzpp6TQO/tN1UGnDM4BzjnYK2NloExFsaY2GwI9+0nBUT/ QHgiOA9qf1bwbSGO2wM4ALBdLKwd4w0A6vuY91kvTh8N5rD24dyeDU1Bd8KsIbMIAKliFq1SGXYG swDAP/HR5wCAS/HqJf0r4funLCypdcGRd8zm4VgeQKJfvZ+QKmbjTTUcqo67CiyvyudKY4lCs0qd 7gqFlBinoFUqxxV4wpPLXtJ/Z573MvUMvgCWdtSD8ajNJAAAAABJRU5ErkJggg== " height="16" width="16" y="0" x="80"/> + <image id="image2982" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAAB3RJ TUUH1wUZCSMcg2cB8wAAAUZJREFUOI2lksFLAkEUxr+ZnRUsEBEp2D1Y/0CHEEKlVqiDtw5eu/nn hYcu4aHAtUPiIcSM6BD9DV2Cdt6810HFNlrL+uAxA29m+H3fPIUM7dfqfbIUZfW11vF4NGyarANk KTqOamB2ICIQLdZZ3T8+RwCQ+YDxTXwd364kyOqtJVWt1/tJku11FcF4NGyaJKGofdqC53lgZjjn QOTgHH3ynPZvrV1mYHwTdy96fyJY9863UovNT//+HUFqDshS1Do5BIB5FrM8ZkXzXJZZPDy9pOfA +CbuXd2sRZCy8FvdnUEAgN9RrJ7jVU07pqFyfgWQimIdCkvg4LbBUmbmElsuApKa2L32ESbdAXgD m0ouDwp4ywfkuVApFSpGIAohgABIrforzaQ7gJp28g2Vk13RekcLQmEJWGQLjsvsXMlZLqwk+G8G H3ahyiC/JGBsAAAAAElFTkSuQmCC " height="16" width="16" y="0" x="96"/> + <image id="image2996" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAAB3RJ TUUH1wUZCSMcg2cB8wAAAThJREFUOI2lkj9LA0EQxX8zu0FI4zexsFKLRASx0EIIdtZ+MltLCxHU E0QLjWijnVrcgSIhCCp4uzsWpydo4r88WAbmsTNvHk8AJqdn9kIZ2gyBb7ise3g4O5ADCGVoLy7M oqqICGaGmRFjJITI9u7B8OHVBp9tbu19o8Bnw7iRIfCzB8PgvGa1B8tL83jvaw+q+0Ndq/feC5Rl oHt+2R5ZwV//fMG/FDjvstOjKhe1B3OtqbccgBlvWUiklIgxEWOs/Tg5u6iXeQDXcNnO/tEfFHzc LgDHK4zrGH2AyfWq91vI8RpNfeJxotPifGP/Mx20oX1V7aFy73C3olKYphzkxl7KG+muYhOd1qDh CciB4r2KkZtSmFnuo8tpPhc/KnANfVDneji9V5E7USmSkEtK1/YiVyN78AqSILdEfKYGywAAAABJ RU5ErkJggg== " height="16" width="16" y="0" x="64"/> + <g id="g2855" fill-rule="nonzero"> + <rect id="rect3002" rx="1" ry="1" height="3" width="3" stroke="#204a87" y="1.5" x="112.5" fill="#729fcf"/> + <rect id="rect3006" stroke-linejoin="round" style="stroke-dasharray:none;" rx="0" ry="0.5" height="1" width="10" stroke="#5b5d59" stroke-miterlimit="4" y="2.5" x="117.5" stroke-width="1" fill="#636561"/> + <rect id="rect3030" rx="1" ry="1" height="3" width="3" stroke="#204a87" y="6.5" x="112.5" fill="#729fcf"/> + <rect id="rect3032" stroke-linejoin="round" style="stroke-dasharray:none;" rx="0" ry="0.5" height="1" width="10" stroke="#5b5d59" stroke-miterlimit="4" y="7.5" x="117.5" stroke-width="1" fill="#636561"/> + <rect id="rect3034" rx="1" ry="1" height="3" width="3" stroke="#204a87" y="11.5" x="112.5" fill="#729fcf"/> + <rect id="rect3036" stroke-linejoin="round" style="stroke-dasharray:none;" rx="0" ry="0.5" height="1" width="10" stroke="#5b5d59" stroke-miterlimit="4" y="12.5" x="117.5" stroke-width="1" fill="#636561"/> + </g> + <g id="g4210" stroke-linecap="butt"> + <path id="path3059" stroke-linejoin="round" d="m51.5,7.5-3,8,2,0,0.34375-1,4.3125,0,0.34375,1,2,0-3-8-3,0zm1,2,1,0,1,3-3,0,1-3z" stroke="#204a87" stroke-width="1px" fill="url(#linearGradient2882)"/> + <g id="g4190"> + <path id="path3867" stroke-linejoin="round" d="m53.5,3.2222,0,5.5556l5-2.7778-5-2.7778z" stroke="#ce5c00" stroke-width="1" fill="#f57900"/> + <path id="path2886" stroke-linejoin="miter" style="stroke-dasharray:none;" d="m54.25,4.5,0,3l2.688-1.5-2.688-1.5z" stroke-opacity="0.31067972" stroke="#FFF" stroke-miterlimit="4" stroke-width="0.5" fill="none"/> + </g> + <g id="g4194"> + <path id="path3869" stroke-linejoin="round" d="m58.5,6-5,2.7778,5,2.7778v-5.556" stroke="#c4a000" stroke-width="1" fill="#edd400"/> + <path id="path3665" stroke-linejoin="miter" d="m55.026,8.7898,2.7192,1.4883-0.01-2.9798-2.7092,1.4915z" stroke-opacity="0.31068019" stroke="#FFF" stroke-miterlimit="4" stroke-width="0.5" fill="none"/> + </g> + <g id="g4198"> + <path id="path3875" stroke-linejoin="round" d="m58.5,6,5,2.7778-5,2.7778v-5.556" stroke="#4e9a06" stroke-width="1" fill="#73d216"/> + <path id="path3662" stroke-linejoin="miter" d="m54.291,4.3995,0.0707,3.099l2.576-1.4985-2.647-1.6005z" stroke-opacity="0.31068019" transform="matrix(-0.5,-0.8660254,-0.8660254,0.5,92.920017,53.60763)" stroke="#FFF" stroke-miterlimit="4" stroke-width="0.5" fill="none"/> + </g> + <g id="g4202"> + <path id="path3873" stroke-linejoin="round" d="m63.5,3.2222,0,5.5556l-5-2.7778,5-2.7778z" stroke="#204a87" stroke-width="1" fill="#3465a4"/> + <path id="path3660" stroke-linejoin="miter" style="stroke-dasharray:none;" d="m54.25,4.5,0,3l2.688-1.5-2.688-1.5z" stroke-opacity="0.31068002" transform="matrix(-1,0,0,1,116.97303,0)" stroke="#FFF" stroke-miterlimit="4" stroke-width="0.5" fill="none"/> + </g> + <g id="g4186"> + <path id="path3865" stroke-linejoin="round" d="M53.5,3.2222,58.5,6v-5.5556l-5,2.7778z" stroke="#C00" stroke-width="1" fill="#ef2929"/> + <path id="path3669" stroke-linejoin="miter" d="m55.026,3.2181,2.7192-1.4883-0.01,2.9798-2.7092-1.4915z" stroke-opacity="0.31068019" stroke="#FFF" stroke-miterlimit="4" stroke-width="0.5" fill="none"/> + </g> + <g id="g4206"> + <path id="path3871" stroke-linejoin="round" d="M63.5,3.2222,58.5,6v-5.5556l5,2.7778z" stroke="#5c3566" stroke-width="1" fill="#75507b"/> + <path id="path3667" stroke-linejoin="miter" d="m61.964,3.2181-2.7192-1.4883,0.01,2.9798,2.7092-1.4915z" stroke-opacity="0.31068019" stroke="#FFF" stroke-miterlimit="4" stroke-width="0.5" fill="none"/> + </g> + </g> +</svg>

1 0

Alexandre Julliard : winex11: Use the subpixel rendering configuration from fontconfig to override the registry options .
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 922e15cbd04fde3d9d4fbb98600f5471420c2daa URL: http://source.winehq.org/git/wine.git/?a=commit;h=922e15cbd04fde3d9d4fbb986… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 17 11:48:12 2010 +0200 winex11: Use the subpixel rendering configuration from fontconfig to override the registry options. --- dlls/winex11.drv/xrender.c | 84 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 84 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index d9735b0..d82cbf6 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -182,6 +182,21 @@ MAKE_FUNCPTR(XRenderSetPictureClipRectangles) MAKE_FUNCPTR(XRenderSetPictureTransform) #endif MAKE_FUNCPTR(XRenderQueryExtension) + +#ifdef SONAME_LIBFONTCONFIG +#include <fontconfig/fontconfig.h> +MAKE_FUNCPTR(FcConfigSubstitute) +MAKE_FUNCPTR(FcDefaultSubstitute) +MAKE_FUNCPTR(FcFontMatch) +MAKE_FUNCPTR(FcInit) +MAKE_FUNCPTR(FcPatternCreate) +MAKE_FUNCPTR(FcPatternDestroy) +MAKE_FUNCPTR(FcPatternAddInteger) +MAKE_FUNCPTR(FcPatternAddString) +MAKE_FUNCPTR(FcPatternGetInteger) +static BOOL fontconfig_installed; +#endif + #undef MAKE_FUNCPTR static CRITICAL_SECTION xrender_cs; @@ -326,6 +341,7 @@ static int load_xrender_formats(void) void X11DRV_XRender_Init(void) { int event_base, i; + void *fontconfig_handle; if (client_side_with_render && wine_dlopen(SONAME_LIBX11, RTLD_NOW|RTLD_GLOBAL, NULL, 0) && @@ -379,6 +395,23 @@ LOAD_OPTIONAL_FUNCPTR(XRenderSetPictureTransform) } } + if ((fontconfig_handle = wine_dlopen(SONAME_LIBFONTCONFIG, RTLD_NOW, NULL, 0))) + { +#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(fontconfig_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;} + LOAD_FUNCPTR(FcConfigSubstitute); + LOAD_FUNCPTR(FcDefaultSubstitute); + LOAD_FUNCPTR(FcFontMatch); + LOAD_FUNCPTR(FcInit); + LOAD_FUNCPTR(FcPatternCreate); + LOAD_FUNCPTR(FcPatternDestroy); + LOAD_FUNCPTR(FcPatternAddInteger); + LOAD_FUNCPTR(FcPatternAddString); + LOAD_FUNCPTR(FcPatternGetInteger); +#undef LOAD_FUNCPTR + fontconfig_installed = pFcInit(); + } + else TRACE( "cannot find the fontconfig library " SONAME_LIBFONTCONFIG "\n" ); + sym_not_found: if(X11DRV_XRender_Installed || client_side_with_core) { @@ -839,6 +872,57 @@ static int GetCacheEntry(X11DRV_PDEVICE *physDev, LFANDSIZE *plfsz) entry->aa_default = AA_None; break; } + +#ifdef SONAME_LIBFONTCONFIG + if (fontconfig_installed) + { + FcPattern *match, *pattern = pFcPatternCreate(); + FcResult result; + char family[LF_FACESIZE * 4]; + + WideCharToMultiByte( CP_UTF8, 0, plfsz->lf.lfFaceName, -1, family, sizeof(family), NULL, NULL ); + pFcPatternAddString( pattern, FC_FAMILY, (FcChar8 *)family ); + if (plfsz->lf.lfWeight != FW_DONTCARE) + { + int weight; + switch (plfsz->lf.lfWeight) + { + case FW_THIN: weight = FC_WEIGHT_THIN; break; + case FW_EXTRALIGHT: weight = FC_WEIGHT_EXTRALIGHT; break; + case FW_LIGHT: weight = FC_WEIGHT_LIGHT; break; + case FW_NORMAL: weight = FC_WEIGHT_NORMAL; break; + case FW_MEDIUM: weight = FC_WEIGHT_MEDIUM; break; + case FW_SEMIBOLD: weight = FC_WEIGHT_SEMIBOLD; break; + case FW_BOLD: weight = FC_WEIGHT_BOLD; break; + case FW_EXTRABOLD: weight = FC_WEIGHT_EXTRABOLD; break; + case FW_HEAVY: weight = FC_WEIGHT_HEAVY; break; + default: weight = (plfsz->lf.lfWeight - 80) / 4; break; + } + pFcPatternAddInteger( pattern, FC_WEIGHT, weight ); + } + pFcPatternAddInteger( pattern, FC_SLANT, plfsz->lf.lfItalic ? FC_SLANT_ITALIC : FC_SLANT_ROMAN ); + pFcConfigSubstitute( NULL, pattern, FcMatchPattern ); + pFcDefaultSubstitute( pattern ); + if ((match = pFcFontMatch( NULL, pattern, &result ))) + { + int rgba; + + if (pFcPatternGetInteger( match, FC_RGBA, 0, &rgba ) == FcResultMatch) + { + switch (rgba) + { + case FC_RGBA_RGB: entry->aa_default = AA_RGB; break; + case FC_RGBA_BGR: entry->aa_default = AA_BGR; break; + case FC_RGBA_VRGB: entry->aa_default = AA_VRGB; break; + case FC_RGBA_VBGR: entry->aa_default = AA_VBGR; break; + case FC_RGBA_NONE: entry->aa_default = AA_None; break; + } + } + pFcPatternDestroy( match ); + } + pFcPatternDestroy( pattern ); + } +#endif /* SONAME_LIBFONTCONFIG */ } else entry->aa_default = AA_None;

1 0

Sven Baars : notepad: Fix Dutch translation.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 6d7d19715cf7856de40780fc9bfc32ab4fef51bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d7d19715cf7856de40780fc9… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun May 16 20:27:12 2010 +0200 notepad: Fix Dutch translation. --- programs/notepad/Nl.rc | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/programs/notepad/Nl.rc b/programs/notepad/Nl.rc index f543b13..ec2e77d 100644 --- a/programs/notepad/Nl.rc +++ b/programs/notepad/Nl.rc @@ -30,9 +30,9 @@ MAIN_MENU MENU MENUITEM "O&pslaan\tCtrl+S", CMD_SAVE MENUITEM "Ops&laan als...", CMD_SAVE_AS MENUITEM SEPARATOR - MENUITEM "&Afdrukken...\tCtrl+P", CMD_PRINT - MENUITEM "Pagina-in&stelling...", CMD_PAGE_SETUP - MENUITEM "Printerinstellingen...", CMD_PRINTER_SETUP + MENUITEM "Af&drukken...\tCtrl+P", CMD_PRINT + MENUITEM "Pa&gina-instellingen...", CMD_PAGE_SETUP + MENUITEM "Printerins&tellingen...", CMD_PRINTER_SETUP MENUITEM SEPARATOR MENUITEM "&Afsluiten", CMD_EXIT } @@ -58,7 +58,7 @@ POPUP "&Zoeken" { POPUP "&Help" { MENUITEM "&Help-onderwerpen", CMD_HELP_CONTENTS MENUITEM "&Zoeken...", CMD_HELP_SEARCH - MENUITEM "&Hulp bij Help", CMD_HELP_ON_HELP + MENUITEM "H&ulp bij Help", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "&Over Notepad", CMD_HELP_ABOUT_NOTEPAD } @@ -69,7 +69,7 @@ POPUP "&Help" { DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Pagina-instelling" +CAPTION "Pagina-instellingen" { LTEXT "&Koptekst:", 0x140, 10, 07, 40, 15 EDITTEXT IDC_PAGESETUP_HEADERVALUE, 60, 05,110, 12, WS_BORDER | WS_TABSTOP @@ -77,7 +77,7 @@ LTEXT "&Voettekst:", 0x142, 10, 24, 40, 15 EDITTEXT IDC_PAGESETUP_FOOTERVALUE, 60, 22,110, 12, WS_BORDER | WS_TABSTOP GROUPBOX "&Marges (millimeter):", 0x144, 10, 43,160, 45 -LTEXT "Li&nks:", 0x145, 20, 55, 30, 10, WS_CHILD +LTEXT "L&inks:", 0x145, 20, 55, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_LEFTVALUE, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP LTEXT "&Boven:", 0x148, 20, 73, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_TOPVALUE, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP @@ -109,7 +109,7 @@ STRING_ERROR, "FOUT" STRING_WARNING, "WAARSCHUWING" STRING_INFO, "Informatie" -STRING_UNTITLED, "(naamloos)" +STRING_UNTITLED, "Naamloos" STRING_ALL_FILES, "Alle bestanden (*.*)" STRING_TEXT_FILES_TXT, "Tekstbestanden (*.txt)" @@ -130,9 +130,9 @@ STRING_UNICODE_LE, "Unicode (UTF-16)" STRING_UNICODE_BE, "Unicode (UTF-16 big-endian)" STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ -Dit bestand bevat Unicode tekens welke verloren zullen gaan\n\ +Dit bestand bevat Unicode tekens die verloren zullen gaan\n\ als dit bestand wordt opgeslagen in de %s codering.\n\ -Om deze tekens te behouden, klikt u op Annuleren en selecteert\n\ -daarna een van de Unicode-opties in de Codering keuzelijst.\n\ +Klik op Annuleren om deze tekens te behouden, en selecteer\n\ +daarna een van de Unicode-opties in de coderingskeuzelijst.\n\ Wilt u doorgaan?" }

1 0

Joel Holdsworth : msiexec: Reused appwiz.cpl icon in msiexec.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: d8688d58468ff69d08a42668fdb52b696e97cae0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8688d58468ff69d08a42668f… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun May 16 23:07:25 2010 +0100 msiexec: Reused appwiz.cpl icon in msiexec. --- programs/msiexec/msiexec.ico | Bin 15086 -> 25214 bytes programs/msiexec/msiexec.svg | 463 +++++++++++++++++++++++------------------- 2 files changed, 254 insertions(+), 209 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d8688d58468ff69d08a42…

1 0

Joel Holdsworth : configure: Fix for icotool version checking regex.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 9571f781fb62f272bbbc863d639941d3506328ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=9571f781fb62f272bbbc863d6… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun May 16 23:07:33 2010 +0100 configure: Fix for icotool version checking regex. --- configure | 4 ++-- configure.ac | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 2ab935b..fa0d59a 100755 --- a/configure +++ b/configure @@ -5121,8 +5121,8 @@ $as_echo_n "checking for recent enough icotool... " >&6; } icotool_version=`icotool --version | head -n1` if test "x$icotool_version" != "x" then - icotool_version_major=`expr "$icotool_version" : '.* $[0-9]*$.[0-9]*'` - icotool_version_minor=`expr "$icotool_version" : '.* [0-9]*.$[0-9]*$'` + icotool_version_major=`expr "$icotool_version" : '.* $[0-9]*$\.[0-9]*'` + icotool_version_minor=`expr "$icotool_version" : '.* [0-9]*\.$[0-9]*$'` if test "$icotool_version_major" -eq 0 -a "$icotool_version_minor" -lt 29 then ICOTOOL=false diff --git a/configure.ac b/configure.ac index df70de6..006a325 100644 --- a/configure.ac +++ b/configure.ac @@ -296,8 +296,8 @@ then icotool_version=`icotool --version | head -n1` if test "x$icotool_version" != "x" then - icotool_version_major=`expr "$icotool_version" : '.* $[[0-9]]*$.[[0-9]]*'` - icotool_version_minor=`expr "$icotool_version" : '.* [[0-9]]*.$[[0-9]]*$'` + icotool_version_major=`expr "$icotool_version" : '.* $[[0-9]]*$\.[[0-9]]*'` + icotool_version_minor=`expr "$icotool_version" : '.* [[0-9]]*\.$[[0-9]]*$'` if test "$icotool_version_major" -eq 0 -a "$icotool_version_minor" -lt 29 then ICOTOOL=false

1 0

Joel Holdsworth : configure: Added a check for ImageMagick v6. 6 or newer in maintainer mode.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: b9eae1ef8ece4eef2ec4a218078cf17be50ff549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9eae1ef8ece4eef2ec4a2180… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun May 16 23:07:40 2010 +0100 configure: Added a check for ImageMagick v6.6 or newer in maintainer mode. --- configure | 28 +++++++++++++++++++++++++++- configure.ac | 26 +++++++++++++++++++++++++- 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/configure b/configure index fa0d59a..9de0946 100755 --- a/configure +++ b/configure @@ -5110,7 +5110,33 @@ if test "${enable_maintainer_mode+set}" = set then if test "$FONTFORGE" = "false"; then as_fn_append wine_warnings "|fontforge is missing, fonts can't be rebuilt."; fi if test "$RSVG" = "false"; then as_fn_append wine_warnings "|rsvg is missing, icons can't be rebuilt."; fi - if test "$CONVERT" = "false"; then as_fn_append wine_warnings "|imagemagick is missing, icons can't be rebuilt."; fi + + if test "$CONVERT" = false + then + as_fn_append wine_warnings "|imagemagick is missing, icons can't be rebuilt." + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for recent enough imagemagick" >&5 +$as_echo_n "checking for recent enough imagemagick... " >&6; } + convert_version=`convert --version | head -n1` + if test "x$convert_version" != "x" + then + convert_version_major=`expr "$convert_version" : '.* $[0-9]*$\.[0-9]*'` + convert_version_minor=`expr "$convert_version" : '.* [0-9]*\.$[0-9]*$'` + if test "$convert_version_major" -eq 6 -a "$convert_version_minor" -lt 6 + then + CONVERT=false + as_fn_append wine_warnings "|imagemagick version 6.6 or newer is needed to rebuild icons." + fi + fi + if test "$CONVERT" = false + then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no ($convert_version_major.$convert_version_minor)" >&5 +$as_echo "no ($convert_version_major.$convert_version_minor)" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($convert_version_major.$convert_version_minor)" >&5 +$as_echo "yes ($convert_version_major.$convert_version_minor)" >&6; } + fi + fi if test "$ICOTOOL" = false then diff --git a/configure.ac b/configure.ac index 006a325..46dca8e 100644 --- a/configure.ac +++ b/configure.ac @@ -285,7 +285,31 @@ if test "${enable_maintainer_mode+set}" = set then if test "$FONTFORGE" = "false"; then WINE_WARNING([fontforge is missing, fonts can't be rebuilt.]); fi if test "$RSVG" = "false"; then WINE_WARNING([rsvg is missing, icons can't be rebuilt.]); fi - if test "$CONVERT" = "false"; then WINE_WARNING([imagemagick is missing, icons can't be rebuilt.]); fi + + dnl Check the imagemagick version + if test "$CONVERT" = false + then + WINE_WARNING([imagemagick is missing, icons can't be rebuilt.]) + else + AC_MSG_CHECKING([for recent enough imagemagick]) + convert_version=`convert --version | head -n1` + if test "x$convert_version" != "x" + then + convert_version_major=`expr "$convert_version" : '.* $[[0-9]]*$\.[[0-9]]*'` + convert_version_minor=`expr "$convert_version" : '.* [[0-9]]*\.$[[0-9]]*$'` + if test "$convert_version_major" -eq 6 -a "$convert_version_minor" -lt 6 + then + CONVERT=false + WINE_WARNING([imagemagick version 6.6 or newer is needed to rebuild icons.]) + fi + fi + if test "$CONVERT" = false + then + AC_MSG_RESULT([no ($convert_version_major.$convert_version_minor)]) + else + AC_MSG_RESULT([yes ($convert_version_major.$convert_version_minor)]) + fi + fi dnl Check the icotool version if test "$ICOTOOL" = false

1 0

Joel Holdsworth : credui: Added a rendering hint to banner.svg.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 0c0e352fe0487138f142fb532cf7e4a73296992a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c0e352fe0487138f142fb532… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun May 16 23:07:46 2010 +0100 credui: Added a rendering hint to banner.svg. --- dlls/credui/banner.svg | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/credui/banner.svg b/dlls/credui/banner.svg index 31aa905..1e7577a 100644 --- a/dlls/credui/banner.svg +++ b/dlls/credui/banner.svg @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?>  -<svg xmlns="http://www.w3.org/2000/svg" height="60" width="320" version="1.0" xmlns:xlink="http://www.w3.org/1999/xlink"> +<svg xmlns="http://www.w3.org/2000/svg" id="bitmap:320-24" height="60" width="320" version="1.0" xmlns:xlink="http://www.w3.org/1999/xlink"> <defs id="defs9903"> <radialGradient id="radialGradient6201" gradientUnits="userSpaceOnUse" cy="2.0625" cx="11.156" gradientTransform="matrix(1,0,0,0.6206897,0,0.7823276)" r="0.90625"> <stop id="stop7584" stop-color="#FFF" offset="0"/>

1 0

Joel Holdsworth : tools: Modified the ICO render script to also render BMPs .
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 465e653940e767637cff9cfac559ffbd0f57f648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=465e653940e767637cff9cfac… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun May 16 23:07:57 2010 +0100 tools: Modified the ICO render script to also render BMPs. --- Make.rules.in | 8 +-- tools/{buildicon => buildimage} | 81 +++++++++++++++++++++++++++++--------- 2 files changed, 65 insertions(+), 24 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index cc6d602..3f5d18e 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -63,7 +63,7 @@ IDLFLAGS = $(INCLUDES) $(DEFS) $(EXTRAIDLFLAGS) TARGETFLAGS = @TARGETFLAGS@ MKINSTALLDIRS= $(TOPSRCDIR)/tools/mkinstalldirs -m 755 WINAPI_CHECK = $(TOPSRCDIR)/tools/winapi/winapi_check -BUILDICON = $(TOPSRCDIR)/tools/buildicon +BUILDIMAGE = $(TOPSRCDIR)/tools/buildimage C2MAN = $(TOPSRCDIR)/tools/c2man.pl RUNTEST = $(TOPSRCDIR)/tools/runtest WINEBUILD = $(TOOLSDIR)/tools/winebuild/winebuild$(TOOLSEXT) @@ -190,12 +190,10 @@ filter: dummy LC_ALL=C sed -e 's,@bindir\@,$(bindir),g' -e 's,@dlldir\@,$(dlldir),g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' $< >$@ || ($(RM) $@ && false) .svg.ico: - CONVERT="$(CONVERT)" ICOTOOL="$(ICOTOOL)" RSVG="$(RSVG)" $(BUILDICON) $< $@ + CONVERT="$(CONVERT)" ICOTOOL="$(ICOTOOL)" RSVG="$(RSVG)" $(BUILDIMAGE) $< $@ .svg.bmp: - $(RSVG) $< $<.png - $(CONVERT) $<.png -alpha off $@ - $(RM) $<.png + CONVERT="$(CONVERT)" ICOTOOL="$(ICOTOOL)" RSVG="$(RSVG)" $(BUILDIMAGE) $< $@ # Rules for IDL files diff --git a/tools/buildicon b/tools/buildimage similarity index 61% rename from tools/buildicon rename to tools/buildimage index eae13dc..b307497 100755 --- a/tools/buildicon +++ b/tools/buildimage @@ -1,6 +1,6 @@ #! /usr/bin/perl -w # -# Render SVG files containing multiple images +# Render SVG files containing one or more images into an ICO or BMP. # # Copyright (C) 2010 Joel Holdsworth # @@ -22,17 +22,21 @@ use strict; use warnings; use XML::Parser; use MIME::Base64; +use File::Copy; # Parse the parameters my $svgFileName = $ARGV[0]; -my $icoFileName = $ARGV[1]; +my $outFileName = $ARGV[1]; + die "Cannot open SVG file" unless defined($svgFileName); -die "Cannot open ICO file" unless defined($icoFileName); +die "Cannot open output file" unless defined($outFileName); -my $renderedSVGFileName = "$svgFileName.ico"; -$icoFileName =~ m/(.*)\.ico/; -my $icoName = $1; +$outFileName =~ m/(.*)\.(.*)/; +my $outName = $1; +my $ext = lc($2); +die "Only BMP and ICO outputs are supported" unless $ext eq "bmp" or $ext eq "ico"; +my $renderedSVGFileName = "$svgFileName.png"; my @pngFiles; # Get the programs from the environment variables @@ -40,6 +44,7 @@ my $convert = $ENV{"CONVERT"} || "convert"; my $rsvg = $ENV{"RSVG"} || "rsvg"; my $icotool = $ENV{"ICOTOOL"} || "icotool"; +# Be ready to abort sub cleanup() { unlink $renderedSVGFileName; @@ -62,19 +67,35 @@ sub svg_element_start { my($expat, $element, %attr) = @_; - # Parse the id for icon format + # Parse the id for icon/bitmap render directives my $id = $attr{'id'}; return unless defined($id); - return unless $id =~ /icon:(\d*)-(\d*)/; - my $size = $1; - my $depth = $2; + + my $size = 0; + my $depth = 0; + + if($ext eq "ico") { + return unless $id =~ /icon:(\d*)-(\d*)/; + $size = $1; + $depth = $2; + } elsif($ext eq "bmp") { + return unless $id =~ /bitmap:(\d*)-(\d*)/; + $size = $1; + $depth = $2; + } + return unless defined($size) and defined($depth); warn "Unexpected icon depth" unless - $depth == 4 or $depth == 8 or $depth == 32; - my $pngFileName = "$icoName-$size-$depth.png"; + $depth == 4 or $depth == 8 or $depth == 24 or $depth == 32; + my $pngFileName = "$outName-$size-$depth.png"; - if($element eq "rect") { + if($element eq "svg") { + + # The whole file is tagged + copy($renderedSVGFileName, $pngFileName) or die "File could not be copied"; + + } elsif($element eq "rect") { # Extract SVG vector images my $x = $attr{'x'}; @@ -116,12 +137,34 @@ my $parser = new XML::Parser( Handlers => {Start => \&svg_element_start}); $parser->parsefile("$svgFileName"); -# Die if no render directives were found -die "No render directives found in icon" unless(@pngFiles); +# If no render directives were found, take the full image as-is +unless(@pngFiles) { + my $pngFileName = "bmp$renderedSVGFileName"; + copy($renderedSVGFileName, $pngFileName) or die "File could not be copied"; + push(@pngFiles, $pngFileName); +} + +# Combine the renderings into the output file +if($ext eq "ico") { + + # Place images into the ICO + shell $icotool, "-c", "-o", $outFileName, @pngFiles; + +} elsif($ext eq "bmp") { + + # Only the first image becomes the final BMP + my $pngFile = $pngFiles[0]; + $pngFile =~ /.*-\d*-(\d*)\.png/; + my $depth = $1; -# Combine them into an ICO file -shell $icotool, "-c", "-o", $icoFileName, @pngFiles; + # Convert it into a bmp + if($depth == 24) { + shell $convert, "png:$pngFile", "+matte", $outFileName; + } else { + shell $convert, "png:$pngFile", $outFileName; + } + +} # Delete the intermediate images -unlink $renderedSVGFileName; -unlink $_ foreach(@pngFiles); +cleanup();

1 0

Joel Holdsworth : comctl32: Replaced idb_view_small. bmp with a Tango compliant tool strip.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: bf08efd2923452221ae64484bb78099924e2e929 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf08efd2923452221ae64484b… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun May 16 23:08:06 2010 +0100 comctl32: Replaced idb_view_small.bmp with a Tango compliant tool strip. --- dlls/comctl32/Makefile.in | 3 + dlls/comctl32/idb_view_small.bmp | Bin 4150 -> 12410 bytes dlls/comctl32/idb_view_small.svg | 180 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 183 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bf08efd2923452221ae64…

1 0

Rico Schüller : d3d10: Add argument check to ID3D10Effect::GetTechniqueByName().
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: af93f1ab33cf0802b77bfc4177893e84be38e358 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af93f1ab33cf0802b77bfc417… Author: Rico Schüller <kgbricola(a)web.de> Date: Sat May 15 22:04:02 2010 +0200 d3d10: Add argument check to ID3D10Effect::GetTechniqueByName(). --- dlls/d3d10/effect.c | 8 ++++++++ dlls/d3d10/tests/effect.c | 39 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 9a6c843..43b94f3 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2299,6 +2299,12 @@ static struct ID3D10EffectTechnique * STDMETHODCALLTYPE d3d10_effect_GetTechniqu TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); + if (!name) + { + WARN("Invalid name specified\n"); + return (ID3D10EffectTechnique *)&null_technique; + } + for (i = 0; i < This->technique_count; ++i) { struct d3d10_effect_technique *t = &This->techniques[i]; @@ -2458,6 +2464,8 @@ static struct ID3D10EffectPass * STDMETHODCALLTYPE d3d10_effect_technique_GetPas TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); + /* Do not check for name==NULL, W7/DX10 crashes in that case. */ + for (i = 0; i < This->pass_count; ++i) { struct d3d10_effect_pass *p = &This->passes[i]; diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index f37f945..a8c5886 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -2648,8 +2648,8 @@ static void test_effect_local_shader(ID3D10Device *device) BOOL ret; ID3D10Effect* effect; ID3D10EffectVariable* v; - ID3D10EffectPass *p, *null_pass; - ID3D10EffectTechnique *t; + ID3D10EffectPass *p, *p2, *null_pass; + ID3D10EffectTechnique *t, *t2, *null_technique; D3D10_PASS_SHADER_DESC pdesc = {0}; D3D10_EFFECT_VARIABLE_DESC vdesc = {0}; ID3D10EffectType *type; @@ -2660,8 +2660,37 @@ static void test_effect_local_shader(ID3D10Device *device) hr = create_effect(fx_local_shader, 0, device, NULL, &effect); ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed!\n"); + null_technique = effect->lpVtbl->GetTechniqueByIndex(effect, 0xffffffff); + null_pass = null_technique->lpVtbl->GetPassByIndex(null_technique, 0xffffffff); + + /* check technique */ + t = effect->lpVtbl->GetTechniqueByName(effect, NULL); + ok(null_technique == t, "GetTechniqueByName got %p, expected %p\n", t, null_technique); + + t = effect->lpVtbl->GetTechniqueByName(effect, "invalid"); + ok(null_technique == t, "GetTechniqueByName got %p, expected %p\n", t, null_technique); + t = effect->lpVtbl->GetTechniqueByIndex(effect, 0); - null_pass = t->lpVtbl->GetPassByIndex(t, 10000); + ok(null_technique != t, "GetTechniqueByIndex failed %p\n", t); + + t2 = effect->lpVtbl->GetTechniqueByName(effect, "Render"); + ok(t2 == t, "GetTechniqueByName got %p, expected %p\n", t2, t); + + /* check invalid pass arguments */ + p = null_technique->lpVtbl->GetPassByName(null_technique, NULL); + ok(null_pass == p, "GetPassByName got %p, expected %p\n", p, null_pass); + + p = null_technique->lpVtbl->GetPassByName(null_technique, "invalid"); + ok(null_pass == p, "GetPassByName got %p, expected %p\n", p, null_pass); + +#if 0 + /* This crashes on W7/DX10, if t is a valid technique and name=NULL. */ + p = t->lpVtbl->GetPassByName(t, NULL); + ok(null_pass == p, "GetPassByName got %p, expected %p\n", p, null_pass); +#endif + + p = t->lpVtbl->GetPassByIndex(t, 0xffffffff); + ok(null_pass == p, "GetPassByIndex got %p, expected %p\n", p, null_pass); /* check for invalid arguments */ hr = null_pass->lpVtbl->GetVertexShaderDesc(null_pass, NULL); @@ -2682,9 +2711,13 @@ static void test_effect_local_shader(ID3D10Device *device) hr = null_pass->lpVtbl->GetGeometryShaderDesc(null_pass, &pdesc); ok(hr == E_FAIL, "GetGeometryShaderDesc got %x, expected %x\n", hr, E_FAIL); + /* check valid pass arguments */ t = effect->lpVtbl->GetTechniqueByIndex(effect, 0); p = t->lpVtbl->GetPassByIndex(t, 0); + p2 = t->lpVtbl->GetPassByName(t, "P0"); + ok(p2 == p, "GetPassByName got %p, expected %p\n", p2, p); + hr = p->lpVtbl->GetVertexShaderDesc(p, NULL); ok(hr == E_INVALIDARG, "GetVertexShaderDesc got %x, expected %x\n", hr, E_INVALIDARG);

1 0