March 2009 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Fix the indentation in tex_coordindex().
by Alexandre Julliard March 25, 2009

March 25, 2009

Module: wine Branch: master Commit: f63313fe3ea9d42b758c358b686d77e4992da129 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f63313fe3ea9d42b758c358b6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 25 10:12:26 2009 +0100 wined3d: Fix the indentation in tex_coordindex(). The indentation here is pretty horrible. Also removes a couple of fairly useless comments. --- dlls/wined3d/state.c | 128 ++++++++++++++++++++++++-------------------------- 1 files changed, 62 insertions(+), 66 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 257feb2..5f07452 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3118,26 +3118,22 @@ static void tex_coordindex(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine * state. We do not (yet) support the WINED3DRENDERSTATE_WRAPx values, nor tie them up * to the TEXCOORDINDEX value */ + switch (stateblock->textureState[stage][WINED3DTSS_TEXCOORDINDEX] & 0xffff0000) + { + case WINED3DTSS_TCI_PASSTHRU: + /* Use the specified texture coordinates contained within the + * vertex format. This value resolves to zero. */ + glDisable(GL_TEXTURE_GEN_S); + glDisable(GL_TEXTURE_GEN_T); + glDisable(GL_TEXTURE_GEN_R); + glDisable(GL_TEXTURE_GEN_Q); + checkGLcall("glDisable(GL_TEXTURE_GEN_S,T,R,Q)"); + break; - /* - * Be careful the value of the mask 0xF0000 come from d3d8types.h infos - */ - switch (stateblock->textureState[stage][WINED3DTSS_TEXCOORDINDEX] & 0xFFFF0000) { - case WINED3DTSS_TCI_PASSTHRU: - /*Use the specified texture coordinates contained within the vertex format. This value resolves to zero.*/ - glDisable(GL_TEXTURE_GEN_S); - glDisable(GL_TEXTURE_GEN_T); - glDisable(GL_TEXTURE_GEN_R); - glDisable(GL_TEXTURE_GEN_Q); - checkGLcall("glDisable(GL_TEXTURE_GEN_S,T,R,Q)"); - break; - - case WINED3DTSS_TCI_CAMERASPACEPOSITION: - /* CameraSpacePosition means use the vertex position, transformed to camera space, - * as the input texture coordinates for this stage's texture transformation. This - * equates roughly to EYE_LINEAR - */ - { + case WINED3DTSS_TCI_CAMERASPACEPOSITION: + /* CameraSpacePosition means use the vertex position, transformed to camera space, + * as the input texture coordinates for this stage's texture transformation. This + * equates roughly to EYE_LINEAR */ TRACE("WINED3DTSS_TCI_CAMERASPACEPOSITION - Set eye plane\n"); glMatrixMode(GL_MODELVIEW); @@ -3162,42 +3158,46 @@ static void tex_coordindex(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine checkGLcall("glEnable(GL_TEXTURE_GEN_R)"); glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR); checkGLcall("glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR)"); - } - break; + break; - case WINED3DTSS_TCI_CAMERASPACENORMAL: - { - if (GL_SUPPORT(NV_TEXGEN_REFLECTION)) { - TRACE("WINED3DTSS_TCI_CAMERASPACENORMAL - Set eye plane\n"); - - glMatrixMode(GL_MODELVIEW); - glPushMatrix(); - glLoadIdentity(); - glTexGenfv(GL_S, GL_EYE_PLANE, s_plane); - glTexGenfv(GL_T, GL_EYE_PLANE, t_plane); - glTexGenfv(GL_R, GL_EYE_PLANE, r_plane); - glTexGenfv(GL_Q, GL_EYE_PLANE, q_plane); - glPopMatrix(); - - glEnable(GL_TEXTURE_GEN_S); - checkGLcall("glEnable(GL_TEXTURE_GEN_S)"); - glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP_NV); - checkGLcall("glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP_NV)"); - glEnable(GL_TEXTURE_GEN_T); - checkGLcall("glEnable(GL_TEXTURE_GEN_T)"); - glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP_NV); - checkGLcall("glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP_NV)"); - glEnable(GL_TEXTURE_GEN_R); - checkGLcall("glEnable(GL_TEXTURE_GEN_R)"); - glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP_NV); - checkGLcall("glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP_NV)"); + case WINED3DTSS_TCI_CAMERASPACENORMAL: + if (!GL_SUPPORT(NV_TEXGEN_REFLECTION)) + { + break; + } + + TRACE("WINED3DTSS_TCI_CAMERASPACENORMAL - Set eye plane\n"); + + glMatrixMode(GL_MODELVIEW); + glPushMatrix(); + glLoadIdentity(); + glTexGenfv(GL_S, GL_EYE_PLANE, s_plane); + glTexGenfv(GL_T, GL_EYE_PLANE, t_plane); + glTexGenfv(GL_R, GL_EYE_PLANE, r_plane); + glTexGenfv(GL_Q, GL_EYE_PLANE, q_plane); + glPopMatrix(); + + glEnable(GL_TEXTURE_GEN_S); + checkGLcall("glEnable(GL_TEXTURE_GEN_S)"); + glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP_NV); + checkGLcall("glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP_NV)"); + glEnable(GL_TEXTURE_GEN_T); + checkGLcall("glEnable(GL_TEXTURE_GEN_T)"); + glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP_NV); + checkGLcall("glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP_NV)"); + glEnable(GL_TEXTURE_GEN_R); + checkGLcall("glEnable(GL_TEXTURE_GEN_R)"); + glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP_NV); + checkGLcall("glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP_NV)"); + + break; + + case WINED3DTSS_TCI_CAMERASPACEREFLECTIONVECTOR: + if (!GL_SUPPORT(NV_TEXGEN_REFLECTION)) + { + break; } - } - break; - case WINED3DTSS_TCI_CAMERASPACEREFLECTIONVECTOR: - { - if (GL_SUPPORT(NV_TEXGEN_REFLECTION)) { TRACE("WINED3DTSS_TCI_CAMERASPACEREFLECTIONVECTOR - Set eye plane\n"); glMatrixMode(GL_MODELVIEW); @@ -3221,20 +3221,16 @@ static void tex_coordindex(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine checkGLcall("glEnable(GL_TEXTURE_GEN_R)"); glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP_NV); checkGLcall("glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP_NV)"); - } - } - break; - - /* Unhandled types: */ - default: - /* Todo: */ - /* ? disable GL_TEXTURE_GEN_n ? */ - glDisable(GL_TEXTURE_GEN_S); - glDisable(GL_TEXTURE_GEN_T); - glDisable(GL_TEXTURE_GEN_R); - glDisable(GL_TEXTURE_GEN_Q); - FIXME("Unhandled WINED3DTSS_TEXCOORDINDEX %x\n", stateblock->textureState[stage][WINED3DTSS_TEXCOORDINDEX]); - break; + + break; + + default: + glDisable(GL_TEXTURE_GEN_S); + glDisable(GL_TEXTURE_GEN_T); + glDisable(GL_TEXTURE_GEN_R); + glDisable(GL_TEXTURE_GEN_Q); + FIXME("Unhandled WINED3DTSS_TEXCOORDINDEX %x\n", stateblock->textureState[stage][WINED3DTSS_TEXCOORDINDEX]); + break; } /* Update the texture matrix */

1 0

Alexandre Julliard : wineps.drv: Set the line join and cap styles based on the selected pen.
by Alexandre Julliard March 25, 2009

March 25, 2009

Module: wine Branch: master Commit: 36a41abb9fa0c8544d0ba4662b4938c19f7e8dbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=36a41abb9fa0c8544d0ba4662… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 24 15:24:06 2009 +0100 wineps.drv: Set the line join and cap styles based on the selected pen. --- dlls/wineps.drv/pen.c | 16 ++++++++++++++++ dlls/wineps.drv/ps.c | 6 +++--- dlls/wineps.drv/psdrv.h | 4 +++- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/wineps.drv/pen.c b/dlls/wineps.drv/pen.c index ab7bc5b..529c738 100644 --- a/dlls/wineps.drv/pen.c +++ b/dlls/wineps.drv/pen.c @@ -70,6 +70,22 @@ HPEN CDECL PSDRV_SelectPen( PSDRV_PDEVICE *physDev, HPEN hpen ) if(physDev->pen.width < 0) physDev->pen.width = -physDev->pen.width; } + switch (logpen.lopnStyle & PS_JOIN_MASK) + { + default: + case PS_JOIN_ROUND: physDev->pen.join = 1; break; + case PS_JOIN_BEVEL: physDev->pen.join = 2; break; + case PS_JOIN_MITER: physDev->pen.join = 0; break; + } + + switch (logpen.lopnStyle & PS_ENDCAP_MASK) + { + default: + case PS_ENDCAP_ROUND: physDev->pen.endcap = 1; break; + case PS_ENDCAP_SQUARE: physDev->pen.endcap = 2; break; + case PS_ENDCAP_FLAT: physDev->pen.endcap = 0; break; + } + PSDRV_CreateColor(physDev, &physDev->pen.color, logpen.lopnColor); physDev->pen.style = logpen.lopnStyle & PS_STYLE_MASK; diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index fdebf46..1fa4f44 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -129,8 +129,8 @@ static const char pssetfont[] = /* fontname, xscale, yscale, ascent, escapement "matrix concatmatrix\n" "makefont setfont\n"; -static const char pssetlinewidth[] = /* width */ -"%d setlinewidth\n"; +static const char pssetline[] = /* width, join, endcap */ +"%d setlinewidth %u setlinejoin %u setlinecap\n"; static const char pssetdash[] = /* dash, offset */ "[%s] %d setdash\n"; @@ -581,7 +581,7 @@ BOOL PSDRV_WriteSetPen(PSDRV_PDEVICE *physDev) { char buf[256]; - sprintf(buf, pssetlinewidth, physDev->pen.width); + sprintf(buf, pssetline, physDev->pen.width, physDev->pen.join, physDev->pen.endcap); PSDRV_WriteSpool(physDev, buf, strlen(buf)); if(physDev->pen.dash) { diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 0661fdf..efc8460 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -326,7 +326,9 @@ typedef struct { typedef struct { INT style; - INT width; + INT width; + BYTE join; + BYTE endcap; const char* dash; PSCOLOR color; BOOL set;

1 0

Alexandre Julliard : configure: Always set LDPATH, rpath support is broken on many platforms.
by Alexandre Julliard March 25, 2009

March 25, 2009

Module: wine Branch: master Commit: 6e89fd183242feb7b5b9979aeb8d5cde78328c78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e89fd183242feb7b5b9979ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 24 15:23:33 2009 +0100 configure: Always set LDPATH, rpath support is broken on many platforms. --- configure | 5 ----- configure.ac | 6 ------ 2 files changed, 0 insertions(+), 11 deletions(-) diff --git a/configure b/configure index a4808b5..ec14172 100755 --- a/configure +++ b/configure @@ -18069,11 +18069,6 @@ case $build_os in ;; darwin*|macosx*) ;; - linux*|solaris*) if test -z "$LDRPATH_LOCAL" - then - LDPATH="LD_LIBRARY_PATH=\"\$(TOOLSDIR)/libs/wine:\$\$LD_LIBRARY_PATH\"" - fi - ;; *) LDPATH="LD_LIBRARY_PATH=\"\$(TOOLSDIR)/libs/wine:\$\$LD_LIBRARY_PATH\"" ;; diff --git a/configure.ac b/configure.ac index 78ea5db..d4064e5 100644 --- a/configure.ac +++ b/configure.ac @@ -1403,12 +1403,6 @@ case $build_os in ;; darwin*|macosx*) ;; - linux*|solaris*) dnl FIXME: What other platforms support $ORIGIN? - if test -z "$LDRPATH_LOCAL" - then - LDPATH="LD_LIBRARY_PATH=\"\$(TOOLSDIR)/libs/wine:\$\$LD_LIBRARY_PATH\"" - fi - ;; *) LDPATH="LD_LIBRARY_PATH=\"\$(TOOLSDIR)/libs/wine:\$\$LD_LIBRARY_PATH\"" ;;

1 0

Kirill K. Smirnov : mciavi32: Fix typo.
by Alexandre Julliard March 24, 2009

March 24, 2009

Module: wine Branch: master Commit: e66e4894178d0926f4b3f2b2cd82d3781f6a9694 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e66e4894178d0926f4b3f2b2c… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Sat Mar 14 02:18:10 2009 +0300 mciavi32: Fix typo. --- dlls/mciavi32/mmoutput.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mciavi32/mmoutput.c b/dlls/mciavi32/mmoutput.c index f7118ff..f9d1ddd 100644 --- a/dlls/mciavi32/mmoutput.c +++ b/dlls/mciavi32/mmoutput.c @@ -328,7 +328,7 @@ BOOL MCIAVI_GetInfo(WINE_MCIAVI* wma) WARN("ignoring another video stream\n"); else { - wma->ash_audio = strh; + wma->ash_video = strh; if (!MCIAVI_GetInfoVideo(wma, &mmckList, &mmckStream)) return FALSE; @@ -342,7 +342,7 @@ BOOL MCIAVI_GetInfo(WINE_MCIAVI* wma) WARN("ignoring another audio stream\n"); else { - wma->ash_video = strh; + wma->ash_audio = strh; if (!MCIAVI_GetInfoAudio(wma, &mmckList, &mmckStream)) return FALSE;

1 0

Vincent Povirk : gdiplus: Support line gradient brushes in GdipFillPath.
by Alexandre Julliard March 24, 2009

March 24, 2009

Module: wine Branch: master Commit: 68dba4eff3cd3e696d964142637b0c03c496aa66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68dba4eff3cd3e696d9641426… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Mar 16 12:51:04 2009 -0500 gdiplus: Support line gradient brushes in GdipFillPath. --- dlls/gdiplus/graphics.c | 161 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 159 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 9df9e21..5d1cbd6 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -172,6 +172,164 @@ static void transform_and_round_points(GpGraphics *graphics, POINT *pti, } } +static ARGB blend_colors(ARGB start, ARGB end, int current, int total) +{ + ARGB result=0; + ARGB i; + for (i=0xff; i<=0xff0000; i = i << 8) + result |= (((start&i)*(total - current)+(end&i)*(current))/total)&i; + return result; +} + +static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) +{ + switch (brush->bt) + { + case BrushTypeLinearGradient: + { + GpLineGradient *line = (GpLineGradient*)brush; + RECT rc; + int num_steps = 255; + + SelectClipPath(graphics->hdc, RGN_AND); + if (GetClipBox(graphics->hdc, &rc) != NULLREGION) + { + GpPointF endpointsf[2]; + POINT endpointsi[2]; + POINT poly[4]; + + SelectObject(graphics->hdc, GetStockObject(NULL_PEN)); + + /* fill with starting color */ + FillRect(graphics->hdc, &rc, brush->gdibrush); + + endpointsf[0] = line->startpoint; + endpointsf[1] = line->endpoint; + transform_and_round_points(graphics, endpointsi, endpointsf, 2); + + if (abs(endpointsi[0].x-endpointsi[1].x) > abs(endpointsi[0].y-endpointsi[1].y)) + { + /* vertical-ish gradient */ + int endborderx; /* vertical rectangle boundary near endpoint */ + int startx, endx; /* x co-ordinates of endpoints shifted to intersect the top of the visible rectangle */ + int startbottomx, endbottomx; /* x co-ordinate of endpoints shifted to intersect the bottom of the visible rectangle */ + int width; + COLORREF col; + HBRUSH hbrush, hprevbrush; + int i; + + if (endpointsi[1].x > endpointsi[0].x) + endborderx = rc.right; + else + endborderx = rc.left; + + startx = roundr((rc.top - endpointsf[0].Y) * (endpointsf[1].Y - endpointsf[0].Y) / (endpointsf[0].X - endpointsf[1].X) + endpointsf[0].X); + endx = roundr((rc.top - endpointsf[1].Y) * (endpointsf[1].Y - endpointsf[0].Y) / (endpointsf[0].X - endpointsf[1].X) + endpointsf[1].X); + width = endx - startx; + startbottomx = roundr((rc.bottom - endpointsf[0].Y) * (endpointsf[1].Y - endpointsf[0].Y) / (endpointsf[0].X - endpointsf[1].X) + endpointsf[0].X); + endbottomx = startbottomx+width; + + if (num_steps > abs(width)) num_steps = abs(width); + + poly[0].x = endborderx; + poly[0].y = rc.bottom; + poly[1].x = endborderx; + poly[1].y = rc.top; + poly[2].y = rc.top; + poly[3].y = rc.bottom; + + for (i=1; i<num_steps; i++) + { + ARGB argb = blend_colors(line->startcolor, line->endcolor, i, num_steps); + int ofs = width * i / num_steps; + col = ARGB2COLORREF(argb); + hbrush = CreateSolidBrush(col); + hprevbrush = SelectObject(graphics->hdc, hbrush); + poly[2].x = startx + ofs; + poly[3].x = startbottomx + ofs; + Polygon(graphics->hdc, poly, 4); + SelectObject(graphics->hdc, hprevbrush); + DeleteObject(hbrush); + } + + poly[2].x = endx; + poly[3].x = endbottomx; + + /* draw the ending color */ + col = ARGB2COLORREF(line->endcolor); + hbrush = CreateSolidBrush(col); + hprevbrush = SelectObject(graphics->hdc, hbrush); + Polygon(graphics->hdc, poly, 4); + SelectObject(graphics->hdc, hprevbrush); + DeleteObject(hbrush); + } + else if (endpointsi[0].y != endpointsi[1].y) + { + /* horizontal-ish gradient */ + int endbordery; /* horizontal rectangle boundary near endpoint */ + int starty, endy; /* y co-ordinates of endpoints shifted to intersect the left of the visible rectangle */ + int startrighty, endrighty; /* y co-ordinate of endpoints shifted to intersect the right of the visible rectangle */ + int height; + COLORREF col; + HBRUSH hbrush, hprevbrush; + int i; + + if (endpointsi[1].y > endpointsi[0].y) + endbordery = rc.bottom; + else + endbordery = rc.top; + + starty = roundr((rc.left - endpointsf[0].X) * (endpointsf[0].X - endpointsf[1].X) / (endpointsf[1].Y - endpointsf[0].Y) + endpointsf[0].Y); + endy = roundr((rc.left - endpointsf[1].X) * (endpointsf[0].X - endpointsf[1].X) / (endpointsf[1].Y - endpointsf[0].Y) + endpointsf[1].Y); + height = endy - starty; + startrighty = roundr((rc.right - endpointsf[0].X) * (endpointsf[0].X - endpointsf[1].X) / (endpointsf[1].Y - endpointsf[0].Y) + endpointsf[0].Y); + endrighty = startrighty+height; + + if (num_steps > abs(height)) num_steps = abs(height); + + poly[0].x = rc.right; + poly[0].y = endbordery; + poly[1].x = rc.left; + poly[1].y = endbordery; + poly[2].x = rc.left; + poly[3].x = rc.right; + + for (i=1; i<num_steps; i++) + { + ARGB argb = blend_colors(line->startcolor, line->endcolor, i, num_steps); + int ofs = height * i / num_steps; + col = ARGB2COLORREF(argb); + hbrush = CreateSolidBrush(col); + hprevbrush = SelectObject(graphics->hdc, hbrush); + poly[2].y = starty + ofs; + poly[3].y = startrighty + ofs; + Polygon(graphics->hdc, poly, 4); + SelectObject(graphics->hdc, hprevbrush); + DeleteObject(hbrush); + } + + poly[2].y = endy; + poly[3].y = endrighty; + + /* draw the ending color */ + col = ARGB2COLORREF(line->endcolor); + hbrush = CreateSolidBrush(col); + hprevbrush = SelectObject(graphics->hdc, hbrush); + Polygon(graphics->hdc, poly, 4); + SelectObject(graphics->hdc, hprevbrush); + DeleteObject(hbrush); + } + /* else startpoint == endpoint */ + } + break; + } + default: + SelectObject(graphics->hdc, brush->gdibrush); + FillPath(graphics->hdc); + break; + } +} + /* GdipDrawPie/GdipFillPie helper function */ static void draw_pie(GpGraphics *graphics, REAL x, REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle) @@ -2086,7 +2244,6 @@ GpStatus WINGDIPAPI GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath *p save_state = SaveDC(graphics->hdc); EndPath(graphics->hdc); - SelectObject(graphics->hdc, brush->gdibrush); SetPolyFillMode(graphics->hdc, (path->fill == FillModeAlternate ? ALTERNATE : WINDING)); @@ -2098,7 +2255,7 @@ GpStatus WINGDIPAPI GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath *p goto end; EndPath(graphics->hdc); - FillPath(graphics->hdc); + brush_fill_path(graphics, brush); retval = Ok;

1 0

Lei Zhang : oleaut32: Fix some corner cases in VarBstrCmp.
by Alexandre Julliard March 24, 2009

March 24, 2009

Module: wine Branch: master Commit: 25c2e283d87b2a8112f14fc7add0dbd37d2cee66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25c2e283d87b2a8112f14fc7a… Author: Lei Zhang <thestig(a)google.com> Date: Fri Mar 20 15:37:07 2009 -0700 oleaut32: Fix some corner cases in VarBstrCmp. --- dlls/oleaut32/tests/vartype.c | 20 ++++++++++++++++++++ dlls/oleaut32/vartype.c | 18 +++++++++++++----- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index eba0bc1..0b4f301 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4983,6 +4983,8 @@ static void test_VarBstrCmp(void) static const WCHAR s2[] = { 'a',0,'b' }; static const char sb1[] = {1,0,1}; static const char sb2[] = {1,0,2}; + static const char sbchr0[] = {0,0}; + static const char sbchr00[] = {0,0,0}; BSTR bstr, bstrempty, bstr2; CHECKPTR(VarBstrCmp); @@ -5021,6 +5023,15 @@ static void test_VarBstrCmp(void) SysFreeString(bstr); + bstr = SysAllocStringByteLen(sbchr0, sizeof(sbchr0)); + bstr2 = SysAllocStringByteLen(sbchr0, sizeof(sbchr00)); + VARBSTRCMP(bstr,bstrempty,0,VARCMP_GT); + VARBSTRCMP(bstrempty,bstr,0,VARCMP_LT); + VARBSTRCMP(bstr2,bstrempty,0,VARCMP_GT); + VARBSTRCMP(bstr2,bstr,0,VARCMP_EQ); + SysFreeString(bstr2); + SysFreeString(bstr); + /* When (LCID == 0) it should be a binary comparison * so these two strings could not match. */ @@ -5030,6 +5041,15 @@ static void test_VarBstrCmp(void) VARBSTRCMP(bstr,bstr2,0,VARCMP_LT); SysFreeString(bstr2); SysFreeString(bstr); + + bstr = SysAllocStringByteLen(sbchr0, sizeof(sbchr0)); + bstr2 = SysAllocStringByteLen(sbchr0, sizeof(sbchr00)); + VARBSTRCMP(bstr,bstrempty,0,VARCMP_GT); + VARBSTRCMP(bstrempty,bstr,0,VARCMP_LT); + VARBSTRCMP(bstr2,bstrempty,0,VARCMP_GT); + VARBSTRCMP(bstr2,bstr,0,VARCMP_GT); + SysFreeString(bstr2); + SysFreeString(bstr); } /* Get the internal representation of a BSTR */ diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 6d972a2..7843a7b 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -6957,9 +6957,8 @@ HRESULT WINAPI VarBstrCmp(BSTR pbstrLeft, BSTR pbstrRight, LCID lcid, DWORD dwFl if (!pbstrLeft || !*pbstrLeft) { - if (!pbstrRight || !*pbstrRight) - return VARCMP_EQ; - return VARCMP_LT; + if (pbstrRight && *pbstrRight) + return VARCMP_LT; } else if (!pbstrRight || !*pbstrRight) return VARCMP_GT; @@ -6981,8 +6980,17 @@ HRESULT WINAPI VarBstrCmp(BSTR pbstrLeft, BSTR pbstrRight, LCID lcid, DWORD dwFl } else { - hres = CompareStringW(lcid, dwFlags, pbstrLeft, SysStringLen(pbstrLeft), - pbstrRight, SysStringLen(pbstrRight)) - 1; + unsigned int lenLeft = SysStringLen(pbstrLeft); + unsigned int lenRight = SysStringLen(pbstrRight); + + if (lenLeft == 0 || lenRight == 0) + { + if (lenLeft == 0 && lenRight == 0) return VARCMP_EQ; + return lenLeft < lenRight ? VARCMP_LT : VARCMP_GT; + } + + hres = CompareStringW(lcid, dwFlags, pbstrLeft, lenLeft, + pbstrRight, lenRight) - 1; TRACE("%d\n", hres); return hres; }

1 0

Austin English : winegcc: Fix a compiler warning on PC-BSD.
by Alexandre Julliard March 24, 2009

March 24, 2009

Module: wine Branch: master Commit: 0aebd4f300496ec98195aee7418d78522a67074f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aebd4f300496ec98195aee74… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Mar 13 16:13:13 2009 -0400 winegcc: Fix a compiler warning on PC-BSD. --- tools/winegcc/winegcc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 327366c..9588bbf 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -284,7 +284,7 @@ static char* get_temp_file(const char* prefix, const char* suffix) static const strarray* get_translator(struct options *opts) { - const char *str; + const char *str = NULL; strarray *ret; switch(opts->processor)

1 0

Hans Leidekker : winspool: Support special environment value "all" in EnumPrinterDrivers.
by Alexandre Julliard March 24, 2009

March 24, 2009

Module: wine Branch: master Commit: a01ba785467c8f8218b1cfd5afcbb1b10870efcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a01ba785467c8f8218b1cfd5a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 24 10:27:01 2009 +0100 winspool: Support special environment value "all" in EnumPrinterDrivers. A custom action in the sp1 installer passes this value. --- dlls/winspool.drv/info.c | 68 +++++++++++++++++++++++++++++++-------- dlls/winspool.drv/tests/info.c | 19 +++++++++++ 2 files changed, 73 insertions(+), 14 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index c96bac0..8160957 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -267,6 +267,12 @@ static const DWORD pi_sizeof[] = {0, sizeof(PRINTER_INFO_1W), sizeof(PRINTER_INF sizeof(PRINTER_INFO_7W), sizeof(PRINTER_INFO_8W), sizeof(PRINTER_INFO_9W)}; +static const printenv_t env_x64 = {envname_x64W, subdir_x64W, 3, Version3_RegPathW, Version3_SubdirW}; +static const printenv_t env_x86 = {envname_x86W, subdir_x86W, 3, Version3_RegPathW, Version3_SubdirW}; +static const printenv_t env_win40 = {envname_win40W, subdir_win40W, 0, Version0_RegPathW, Version0_SubdirW}; + +static const printenv_t * const all_printenv[] = {&env_x86, &env_x64, &env_win40}; + /****************************************************************** * validate the user-supplied printing-environment [internal] * @@ -285,15 +291,6 @@ static const DWORD pi_sizeof[] = {0, sizeof(PRINTER_INFO_1W), sizeof(PRINTER_INF static const printenv_t * validate_envW(LPCWSTR env) { - static const printenv_t env_x64 = {envname_x64W, subdir_x64W, - 3, Version3_RegPathW, Version3_SubdirW}; - static const printenv_t env_x86 = {envname_x86W, subdir_x86W, - 3, Version3_RegPathW, Version3_SubdirW}; - static const printenv_t env_win40 = {envname_win40W, subdir_win40W, - 0, Version0_RegPathW, Version0_SubdirW}; - - static const printenv_t * const all_printenv[]={&env_x86, &env_x64, &env_win40}; - const printenv_t *result = NULL; unsigned int i; @@ -5169,7 +5166,7 @@ static BOOL WINSPOOL_EnumPrinterDrivers(LPWSTR pName, LPCWSTR pEnvironment, RegCloseKey(hkeyDrivers); return FALSE; } - (*pcbNeeded) += needed; + *pcbNeeded += needed; } RegCloseKey(hkeyDrivers); @@ -5192,6 +5189,29 @@ BOOL WINAPI EnumPrinterDriversW(LPWSTR pName, LPWSTR pEnvironment, DWORD Level, LPBYTE pDriverInfo, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) { + static const WCHAR allW[] = {'a','l','l',0}; + + if (pEnvironment && !strcmpW(pEnvironment, allW)) + { + BOOL ret; + DWORD i, needed, returned, bufsize = cbBuf; + + for (i = 0; i < sizeof(all_printenv)/sizeof(all_printenv[0]); i++) + { + needed = returned = 0; + ret = WINSPOOL_EnumPrinterDrivers(pName, all_printenv[i]->envname, Level, + pDriverInfo, bufsize, &needed, &returned, TRUE); + if (!ret && GetLastError() != ERROR_INSUFFICIENT_BUFFER) return FALSE; + else if (ret) + { + bufsize -= needed; + if (pDriverInfo) pDriverInfo += needed; + if (pcReturned) *pcReturned += returned; + } + if (pcbNeeded) *pcbNeeded += needed; + } + return ret; + } return WINSPOOL_EnumPrinterDrivers(pName, pEnvironment, Level, pDriverInfo, cbBuf, pcbNeeded, pcReturned, TRUE); } @@ -5204,16 +5224,36 @@ BOOL WINAPI EnumPrinterDriversW(LPWSTR pName, LPWSTR pEnvironment, DWORD Level, BOOL WINAPI EnumPrinterDriversA(LPSTR pName, LPSTR pEnvironment, DWORD Level, LPBYTE pDriverInfo, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) -{ BOOL ret; +{ + BOOL ret; UNICODE_STRING pNameW, pEnvironmentW; PWSTR pwstrNameW, pwstrEnvironmentW; pwstrNameW = asciitounicode(&pNameW, pName); pwstrEnvironmentW = asciitounicode(&pEnvironmentW, pEnvironment); - ret = WINSPOOL_EnumPrinterDrivers(pwstrNameW, pwstrEnvironmentW, - Level, pDriverInfo, cbBuf, pcbNeeded, - pcReturned, FALSE); + if (pEnvironment && !strcmp(pEnvironment, "all")) + { + DWORD i, needed, returned, bufsize = cbBuf; + + for (i = 0; i < sizeof(all_printenv)/sizeof(all_printenv[0]); i++) + { + needed = returned = 0; + ret = WINSPOOL_EnumPrinterDrivers(pwstrNameW, all_printenv[i]->envname, Level, + pDriverInfo, bufsize, &needed, &returned, FALSE); + if (!ret && GetLastError() != ERROR_INSUFFICIENT_BUFFER) break; + else if (ret) + { + bufsize -= needed; + if (pDriverInfo) pDriverInfo += needed; + if (pcReturned) *pcReturned += returned; + } + if (pcbNeeded) *pcbNeeded += needed; + } + } + else ret = WINSPOOL_EnumPrinterDrivers(pwstrNameW, pwstrEnvironmentW, + Level, pDriverInfo, cbBuf, pcbNeeded, + pcReturned, FALSE); RtlFreeUnicodeString(&pNameW); RtlFreeUnicodeString(&pEnvironmentW); diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 9ac82e1..897a622 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -1107,6 +1107,8 @@ static void test_EnumPorts(void) static void test_EnumPrinterDrivers(void) { + static char env_all[] = "all"; + DWORD res; LPBYTE buffer; DWORD cbBuf; @@ -1210,6 +1212,23 @@ static void test_EnumPrinterDrivers(void) HeapFree(GetProcessHeap(), 0, buffer); } /* for(level ... */ + + pcbNeeded = 0; + pcReturned = 0; + SetLastError(0xdeadbeef); + res = EnumPrinterDriversA(NULL, env_all, 1, NULL, 0, &pcbNeeded, &pcReturned); + if (res) + { + skip("no printer drivers found\n"); + return; + } + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "unexpected error %u\n", GetLastError()); + + buffer = HeapAlloc(GetProcessHeap(), 0, pcbNeeded); + res = EnumPrinterDriversA(NULL, env_all, 1, buffer, pcbNeeded, &pcbNeeded, &pcReturned); + ok(res, "EnumPrinterDriversA failed %u\n", GetLastError()); + + HeapFree(GetProcessHeap(), 0, buffer); } /* ########################### */

1 0

Hans Leidekker : msi: Add stub implementations of MsiDeterminePatchSequenceA/W.
by Alexandre Julliard March 24, 2009

March 24, 2009

Module: wine Branch: master Commit: 201e291e5d3a22c24c9dceca9aa3ea3cba836c30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=201e291e5d3a22c24c9dceca9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 24 10:24:46 2009 +0100 msi: Add stub implementations of MsiDeterminePatchSequenceA/W. --- dlls/msi/msi.c | 18 ++++++++++++++++++ dlls/msi/msi.spec | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index be1eafd..2f2938c 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -395,6 +395,24 @@ UINT WINAPI MsiDetermineApplicablePatchesW(LPCWSTR szProductPackagePath, return ERROR_CALL_NOT_IMPLEMENTED; } +UINT MsiDeterminePatchSequenceA(LPCSTR szProductCode, LPCSTR szUserSid, + MSIINSTALLCONTEXT dwContext, DWORD cPatchInfo, PMSIPATCHSEQUENCEINFOA pPatchInfo) +{ + FIXME("(%s, %s, %d, %d, %p): stub!\n", debugstr_a(szProductCode), + debugstr_a(szUserSid), dwContext, cPatchInfo, pPatchInfo); + + return ERROR_CALL_NOT_IMPLEMENTED; +} + +UINT MsiDeterminePatchSequenceW(LPCWSTR szProductCode, LPCWSTR szUserSid, + MSIINSTALLCONTEXT dwContext, DWORD cPatchInfo, PMSIPATCHSEQUENCEINFOW pPatchInfo) +{ + FIXME("(%s, %s, %d, %d, %p): stub!\n", debugstr_w(szProductCode), + debugstr_w(szUserSid), dwContext, cPatchInfo, pPatchInfo); + + return ERROR_CALL_NOT_IMPLEMENTED; +} + static UINT msi_open_package(LPCWSTR product, MSIINSTALLCONTEXT context, MSIPACKAGE **package) { diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index e1644be..7f0627a 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -246,8 +246,8 @@ 250 stdcall MsiQueryComponentStateW(wstr wstr long wstr ptr) 251 stub MsiQueryFeatureStateExA 252 stub MsiQueryFeatureStateExW -253 stub MsiDeterminePatchSequenceA -254 stub MsiDeterminePatchSequenceW +253 stdcall MsiDeterminePatchSequenceA(str str long long ptr) +254 stdcall MsiDeterminePatchSequenceW(wstr wstr long long ptr) 255 stdcall MsiSourceListAddSourceExA(str str long long str long) 256 stdcall MsiSourceListAddSourceExW(wstr wstr long long wstr long) 257 stdcall MsiSourceListClearSourceA(str str long long str)

1 0

Hans Leidekker : msi: Add stub implementations of MsiSourceListClearAllExA/ W.
by Alexandre Julliard March 24, 2009

March 24, 2009

Module: wine Branch: master Commit: c844582177ba7653c0e912702c0d5f7ad3edcd69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c844582177ba7653c0e912702… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 24 10:25:54 2009 +0100 msi: Add stub implementations of MsiSourceListClearAllExA/W. --- dlls/msi/msi.spec | 4 ++-- dlls/msi/source.c | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 7f0627a..14178e8 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -252,8 +252,8 @@ 256 stdcall MsiSourceListAddSourceExW(wstr wstr long long wstr long) 257 stdcall MsiSourceListClearSourceA(str str long long str) 258 stdcall MsiSourceListClearSourceW(wstr wstr long long wstr) -259 stub MsiSourceListClearAllExA -260 stub MsiSourceListClearAllExW +259 stdcall MsiSourceListClearAllExA(str str long long) +260 stdcall MsiSourceListClearAllExW(wstr wstr long long) 261 stub MsiSourceListForceResolutionExA 262 stub MsiSourceListForceResolutionExW 263 stdcall MsiSourceListEnumSourcesA(str str long long long ptr ptr) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 7d61618..df5905d 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -1320,6 +1320,28 @@ UINT WINAPI MsiSourceListClearAllW( LPCWSTR szProduct, LPCWSTR szUserName, DWORD } /****************************************************************** + * MsiSourceListClearAllExA (MSI.@) + */ +UINT WINAPI MsiSourceListClearAllExA( LPCSTR szProduct, LPCSTR szUserSid, + MSIINSTALLCONTEXT dwContext, DWORD dwOptions ) +{ + FIXME("(%s %s %d %08x)\n", debugstr_a(szProduct), debugstr_a(szUserSid), + dwContext, dwOptions); + return ERROR_SUCCESS; +} + +/****************************************************************** + * MsiSourceListClearAllExW (MSI.@) + */ +UINT WINAPI MsiSourceListClearAllExW( LPCWSTR szProduct, LPCWSTR szUserSid, + MSIINSTALLCONTEXT dwContext, DWORD dwOptions ) +{ + FIXME("(%s %s %d %08x)\n", debugstr_w(szProduct), debugstr_w(szUserSid), + dwContext, dwOptions); + return ERROR_SUCCESS; +} + +/****************************************************************** * MsiSourceListClearSourceA (MSI.@) */ UINT WINAPI MsiSourceListClearSourceA(LPCSTR szProductCodeOrPatchCode, LPCSTR szUserSid,

1 0