July 2007 - Wine-commits - list.winehq.org

appdb/include util.php
by WineHQ 23 Jul '07

23 Jul '07

ChangeSet ID: 31262 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/23 15:15:21 Modified files: include : util.php Log message: Edwin Smulders <edwin.smulders(a)gmail.com> Fix a   that had a missing ; in the page selector code Patch: http://cvs.winehq.org/patch.py?id=31262 Old revision New revision Changes Path 1.97 1.98 +2 -2 appdb/include/util.php Index: appdb/include/util.php diff -u -p appdb/include/util.php:1.97 appdb/include/util.php:1.98 --- appdb/include/util.php:1.97 23 Jul 2007 20:15:21 -0000 +++ appdb/include/util.php 23 Jul 2007 20:15:21 -0000 @@ -667,9 +667,9 @@ function display_page_range($iCurrentPag if($iCurrentPage != 1) { - echo "<a href='".$sLinkurl."&iPage=1'>|&lt</a>&nbsp"; + echo "<a href='".$sLinkurl."&iPage=1'>|&lt</a> "; $iPreviousPage = $iCurrentPage - 1; - echo "<a href='".$sLinkurl."&iPage=$iPreviousPage'>&lt</a>&nbsp"; + echo "<a href='".$sLinkurl."&iPage=$iPreviousPage'>&lt</a> "; } else { echo "|&lt &lt ";

1 0

appdb/include testData.php
by WineHQ 23 Jul '07

23 Jul '07

ChangeSet ID: 31261 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/23 15:02:24 Modified files: include : testData.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix testData::objectGetEntriesCount() for queued maintainers. Same fix was applied to testData::objectGetEntries() Patch: http://cvs.winehq.org/patch.py?id=31261 Old revision New revision Changes Path 1.68 1.69 +2 -0 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.68 appdb/include/testData.php:1.69 --- appdb/include/testData.php:1.68 23 Jul 2007 20: 2:24 -0000 +++ appdb/include/testData.php 23 Jul 2007 20: 2:24 -0000 @@ -860,6 +860,8 @@ class testData{ AND appMaintainers.userId = '?' AND + appMaintainers.queued = 'false' + AND ( ( appMaintainers.superMaintainer = '1'

1 0

appdb/ ./appbrowse.php ./browse_by_rating.php ...
by WineHQ 23 Jul '07

23 Jul '07

ChangeSet ID: 31260 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/23 14:56:43 Modified files: . : appbrowse.php browse_by_rating.php browse_downloadable.php contact.php preferences.php votestats.php include : application.php browse_newest_apps.php distribution.php form_edit.php html.php incl.php maintainer.php menu.php objectManager.php tableve.php testData.php util.php vendor.php version.php Added files: include : table.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Programmatic table support. Enhances several tables with highlightable and clickable rows and cleans up the existing table row highlight and click code. Patch: http://cvs.winehq.org/patch.py?id=31260 Old revision New revision Changes Path 1.25 1.26 +72 -32 appdb/appbrowse.php 1.4 1.5 +114 -50 appdb/browse_by_rating.php 1.6 1.7 +39 -15 appdb/browse_downloadable.php 1.2 1.3 +30 -15 appdb/contact.php 1.36 1.37 +61 -17 appdb/preferences.php 1.32 1.33 +35 -9 appdb/votestats.php 1.117 1.118 +34 -27 appdb/include/application.php 1.1 1.2 +13 -7 appdb/include/browse_newest_apps.php 1.37 1.38 +14 -7 appdb/include/distribution.php 1.12 1.13 +34 -22 appdb/include/form_edit.php 1.14 1.15 +0 -10 appdb/include/html.php 1.43 1.44 +1 -0 appdb/include/incl.php 1.47 1.48 +9 -8 appdb/include/maintainer.php 1.8 1.9 +21 -8 appdb/include/menu.php 1.36 1.37 +28 -47 appdb/include/objectManager.php 1.14 1.15 +15 -10 appdb/include/tableve.php 1.67 1.68 +86 -49 appdb/include/testData.php 1.96 1.97 +66 -22 appdb/include/util.php 1.33 1.34 +55 -21 appdb/include/vendor.php 1.136 1.137 +187 -86 appdb/include/version.php Added 1.1 +0 -0 appdb/include/table.php

1 0

Vitaliy Margolen : dinput: Use more messages as a possible indication of the foreground window changes .
by Alexandre Julliard 23 Jul '07

23 Jul '07

Module: wine Branch: master Commit: 94e08ec5bea2bdb6ceafbdbba3a350ad9aea726b URL: http://source.winehq.org/git/wine.git/?a=commit;h=94e08ec5bea2bdb6ceafbdbba… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jul 22 22:17:09 2007 -0600 dinput: Use more messages as a possible indication of the foreground window changes. --- dlls/dinput/dinput_main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 4f15c58..9562d78 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -854,7 +854,8 @@ static LRESULT CALLBACK callwndproc_proc( int code, WPARAM wparam, LPARAM lparam IDirectInputImpl *dinput; HWND foreground; - if (code != HC_ACTION || msg->message != WM_KILLFOCUS) + if (code != HC_ACTION || (msg->message != WM_KILLFOCUS && + msg->message != WM_ACTIVATEAPP && msg->message != WM_ACTIVATE)) return CallNextHookEx( 0, code, wparam, lparam ); foreground = GetForegroundWindow();

1 0

Evan Stade : gdiplus: Change atan2 to gdiplus_arctan2.
by Alexandre Julliard 23 Jul '07

23 Jul '07

Module: wine Branch: master Commit: 818051de2c8769029049ce3d36c6b856f47496c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=818051de2c8769029049ce3d3… Author: Evan Stade <estade(a)gmail.com> Date: Fri Jul 20 17:50:14 2007 -0700 gdiplus: Change atan2 to gdiplus_arctan2. --- dlls/gdiplus/gdiplus.c | 11 ++++++++++- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 11 ++++------- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index e821b18..ee1c49b 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -154,7 +154,7 @@ static void unstretch_angle(REAL * angle, REAL rad_x, REAL rad_y) if(cos(*angle) == 0 || sin(*angle) == 0) return; - stretched = atan2(sin(*angle) / rad_y, cos(*angle) / rad_x); + stretched = gdiplus_atan2(sin(*angle) / rad_y, cos(*angle) / rad_x); revs_off = roundr(*angle / (2.0 * M_PI)) - roundr(stretched / (2.0 * M_PI)); stretched += ((REAL)revs_off) * M_PI * 2.0; *angle = stretched; @@ -212,3 +212,12 @@ COLORREF ARGB2COLORREF(ARGB color) (color & 0x00ff00) + ((color & 0xff0000) >> 16); } + +/* Like atan2, but puts angle in correct quadrant if dx is 0. */ +FLOAT gdiplus_atan2(FLOAT dy, FLOAT dx) +{ + if((dx == 0.0) && (dy != 0.0)) + return dy > 0.0 ? M_PI_2 : -M_PI_2; + + return atan2(dy, dx); +} diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 71cfe39..c872481 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -30,6 +30,7 @@ COLORREF ARGB2COLORREF(ARGB color); extern INT arc2polybezier(GpPointF * points, REAL x1, REAL y1, REAL x2, REAL y2, REAL startAngle, REAL sweepAngle); +extern FLOAT gdiplus_atan2(FLOAT dy, FLOAT dx); static inline INT roundr(REAL x) { diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b12ddf8..0594c57 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -146,14 +146,11 @@ static void draw_cap(HDC hdc, COLORREF color, GpLineCap cap, REAL size, INT i, count; LOGBRUSH lb; - if(x2 != x1) - theta = atan2(y2 - y1, x2 - x1); - else if(y2 != y1){ - theta = M_PI_2 * (y2 > y1 ? 1.0 : -1.0); - } - else + if((x1 == x2) && (y1 == y2)) return; + theta = gdiplus_atan2(y2 - y1, x2 - x1); + brush = CreateSolidBrush(color); lb.lbStyle = BS_SOLID; lb.lbColor = color; @@ -327,7 +324,7 @@ static void shorten_line_percent(REAL x1, REAL y1, REAL *x2, REAL *y2, REAL per return; dist = sqrt((*x2 - x1) * (*x2 - x1) + (*y2 - y1) * (*y2 - y1)) * -percent; - theta = (*x2 == x1 ? M_PI_2 : atan2((*y2 - y1), (*x2 - x1))); + theta = gdiplus_atan2((*y2 - y1), (*x2 - x1)); dx = cos(theta) * dist; dy = sin(theta) * dist;

1 0

Evan Stade : gdiplus: Added startcap rendering.
by Alexandre Julliard 23 Jul '07

23 Jul '07

Module: wine Branch: master Commit: a84b567cba203a3191e03efcdecd4593e64104ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=a84b567cba203a3191e03efcd… Author: Evan Stade <estade(a)gmail.com> Date: Fri Jul 20 17:50:11 2007 -0700 gdiplus: Added startcap rendering. --- dlls/gdiplus/graphics.c | 211 +++++++++++++++++++++++++++++++---------------- 1 files changed, 141 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a84b567cba203a3191e03…

1 0

Evan Stade : gdiplus: Use base inset for custom line caps.
by Alexandre Julliard 23 Jul '07

23 Jul '07

Module: wine Branch: master Commit: f56fa321f53e70825b00fc5eeaf71d4e2de4ea95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f56fa321f53e70825b00fc5ee… Author: Evan Stade <estade(a)gmail.com> Date: Fri Jul 20 17:50:07 2007 -0700 gdiplus: Use base inset for custom line caps. --- dlls/gdiplus/graphics.c | 46 ++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 38 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a7383ab..0418451 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -317,7 +317,8 @@ custend: } /* Shortens the line by the given percent by changing x2, y2. - * If percent is > 1.0 then the line will change direction. */ + * If percent is > 1.0 then the line will change direction. + * If percent is negative it can lengthen the line. */ static void shorten_line_percent(REAL x1, REAL y1, REAL *x2, REAL *y2, REAL percent) { REAL dist, theta, dx, dy; @@ -325,17 +326,18 @@ static void shorten_line_percent(REAL x1, REAL y1, REAL *x2, REAL *y2, REAL per if((y1 == *y2) && (x1 == *x2)) return; - dist = sqrt((*x2 - x1) * (*x2 - x1) + (*y2 - y1) * (*y2 - y1)) * percent; - theta = (*x2 == x1 ? M_PI_2 : atan((*y2 - y1) / (*x2 - x1))); + dist = sqrt((*x2 - x1) * (*x2 - x1) + (*y2 - y1) * (*y2 - y1)) * -percent; + theta = (*x2 == x1 ? M_PI_2 : atan2((*y2 - y1), (*x2 - x1))); dx = cos(theta) * dist; dy = sin(theta) * dist; - *x2 = *x2 + fabs(dx) * (*x2 > x1 ? -1.0 : 1.0); - *y2 = *y2 + fabs(dy) * (*y2 > y1 ? -1.0 : 1.0); + *x2 = *x2 + dx; + *y2 = *y2 + dy; } /* Shortens the line by the given amount by changing x2, y2. - * If the amount is greater than the distance, the line will become length 0. */ + * If the amount is greater than the distance, the line will become length 0. + * If the amount is negative, it can lengthen the line. */ static void shorten_line_amt(REAL x1, REAL y1, REAL *x2, REAL *y2, REAL amt) { REAL dx, dy, percent; @@ -378,6 +380,9 @@ static GpStatus draw_polyline(HDC hdc, GpPen *pen, GDIPCONST GpPointF * pt, if(caps){ if(pen->endcap == LineCapArrowAnchor) shorten_line_amt(pt[count-2].X, pt[count-2].Y, &x, &y, pen->width); + else if((pen->endcap == LineCapCustom) && pen->customend) + shorten_line_amt(pt[count-2].X, pt[count-2].Y, &x, &y, + pen->customend->inset * pen->width); draw_cap(hdc, pen->color, pen->endcap, pen->width, pen->customend, pt[count-2].X, pt[count-2].Y, pt[count - 1].X, pt[count - 1].Y); @@ -437,9 +442,10 @@ static void shorten_bezier_amt(GpPointF * pt, REAL amt) static GpStatus draw_polybezier(HDC hdc, GpPen *pen, GDIPCONST GpPointF * pt, INT count, BOOL caps) { - POINT *pti; + POINT *pti, curpos; GpPointF *ptf; INT i; + REAL x, y; GpStatus status = GenericError; if(!count) @@ -458,6 +464,18 @@ static GpStatus draw_polybezier(HDC hdc, GpPen *pen, GDIPCONST GpPointF * pt, if(caps){ if(pen->endcap == LineCapArrowAnchor) shorten_bezier_amt(ptf, pen->width); + /* FIXME The following is seemingly correct only for baseinset < 0 or + * baseinset > ~3. With smaller baseinsets, windows actually + * lengthens the bezier line instead of shortening it. */ + else if((pen->endcap == LineCapCustom) && pen->customend){ + x = pt[count - 1].X; + y = pt[count - 1].Y; + shorten_line_amt(pt[count - 2].X, pt[count - 2].Y, &x, &y, + pen->width * pen->customend->inset); + MoveToEx(hdc, roundr(pt[count - 1].X), roundr(pt[count - 1].Y), &curpos); + LineTo(hdc, roundr(x), roundr(y)); + MoveToEx(hdc, curpos.x, curpos.y, NULL); + } /* the direction of the line cap is parallel to the direction at the * end of the bezier (which, if it has been shortened, is not the same @@ -492,7 +510,7 @@ end: static GpStatus draw_poly(HDC hdc, GpPen *pen, GDIPCONST GpPointF * pt, GDIPCONST BYTE * types, INT count, BOOL caps) { - POINT *pti = GdipAlloc(count * sizeof(POINT)); + POINT *pti = GdipAlloc(count * sizeof(POINT)), curpos; BYTE *tp = GdipAlloc(count); GpPointF *ptf = NULL; REAL x = pt[count - 1].X, y = pt[count - 1].Y; @@ -538,6 +556,15 @@ static GpStatus draw_poly(HDC hdc, GpPen *pen, GDIPCONST GpPointF * pt, if(pen->endcap == LineCapArrowAnchor) shorten_bezier_amt(ptf, pen->width); + else if((pen->endcap == LineCapCustom) && pen->customend){ + x = pt[count - 1].X; + y = pt[count - 1].Y; + shorten_line_amt(pt[count - 2].X, pt[count - 2].Y, &x, &y, + pen->width * pen->customend->inset); + MoveToEx(hdc, roundr(pt[count - 1].X), roundr(pt[count - 1].Y), &curpos); + LineTo(hdc, roundr(x), roundr(y)); + MoveToEx(hdc, curpos.x, curpos.y, NULL); + } draw_cap(hdc, pen->color, pen->endcap, pen->width, pen->customend, pt[count - 1].X - (ptf[3].X - ptf[2].X), @@ -555,6 +582,9 @@ static GpStatus draw_poly(HDC hdc, GpPen *pen, GDIPCONST GpPointF * pt, if(pen->endcap == LineCapArrowAnchor) shorten_line_amt(pt[count - 2].X, pt[count - 2].Y, &x, &y, pen->width); + else if((pen->endcap == LineCapCustom) && pen->customend) + shorten_line_amt(pt[count - 2].X, pt[count - 2].Y, &x, &y, + pen->customend->inset * pen->width); draw_cap(hdc, pen->color, pen->endcap, pen->width, pen->customend, pt[count - 2].X, pt[count - 2].Y, pt[count - 1].X,

1 0

Hans Leidekker : pdh: Implement and test PdhAddEnglishCounter{A, W} and PdhCollectQueryDataWithTime.
by Alexandre Julliard 23 Jul '07

23 Jul '07

Module: wine Branch: master Commit: 1cec4e3b6e03a1cd213556d663668b2c98626e3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cec4e3b6e03a1cd213556d66… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Jul 21 15:08:15 2007 +0200 pdh: Implement and test PdhAddEnglishCounter{A, W} and PdhCollectQueryDataWithTime. --- dlls/pdh/pdh.spec | 5 ++ dlls/pdh/pdh_main.c | 43 +++++++++++++++++ dlls/pdh/tests/pdh.c | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/pdh.h | 4 ++ 4 files changed, 179 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1cec4e3b6e03a1cd21355…

1 0

Evan Stade : gdiplus: Added rendering of fill-path type custom line caps.
by Alexandre Julliard 23 Jul '07

23 Jul '07

Module: wine Branch: master Commit: 8c5bcef9f3e5082f00387e49be7f6a56d6557ff6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c5bcef9f3e5082f00387e49b… Author: Evan Stade <estade(a)gmail.com> Date: Fri Jul 20 17:50:02 2007 -0700 gdiplus: Added rendering of fill-path type custom line caps. --- dlls/gdiplus/customlinecap.c | 7 +++++++ dlls/gdiplus/graphics.c | 20 ++++++++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/customlinecap.c b/dlls/gdiplus/customlinecap.c index 76e2c1d..aadea5f 100644 --- a/dlls/gdiplus/customlinecap.c +++ b/dlls/gdiplus/customlinecap.c @@ -23,6 +23,9 @@ #include "gdiplus.h" #include "gdiplus_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); GpStatus WINGDIPAPI GdipCloneCustomLineCap(GpCustomLineCap* from, GpCustomLineCap** to) @@ -52,11 +55,15 @@ GpStatus WINGDIPAPI GdipCloneCustomLineCap(GpCustomLineCap* from, return Ok; } +/* FIXME: Sometimes when fillPath is non-null and stroke path is null, the native + * version of this function returns NotImplemented. I cannot figure out why. */ GpStatus WINGDIPAPI GdipCreateCustomLineCap(GpPath* fillPath, GpPath* strokePath, GpLineCap baseCap, REAL baseInset, GpCustomLineCap **customCap) { GpPathData *pathdata; + TRACE("%p %p %d %f %p\n", fillPath, strokePath, baseCap, baseInset, customCap); + if(!customCap || !(fillPath || strokePath)) return InvalidParameter; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 4a581d1..a7383ab 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -130,7 +130,8 @@ static void calc_curve_bezier_endp(REAL xend, REAL yend, REAL xadj, REAL yadj, } /* Draws the linecap the specified color and size on the hdc. The linecap is in - * direction of the line from x1, y1 to x2, y2 and is anchored on x2, y2. */ + * direction of the line from x1, y1 to x2, y2 and is anchored on x2, y2. Probably + * should not be called on an hdc that has a path you care about. */ static void draw_cap(HDC hdc, COLORREF color, GpLineCap cap, REAL size, const GpCustomLineCap *custom, REAL x1, REAL y1, REAL x2, REAL y2) { @@ -158,7 +159,8 @@ static void draw_cap(HDC hdc, COLORREF color, GpLineCap cap, REAL size, lb.lbColor = color; lb.lbHatch = 0; pen = ExtCreatePen(PS_GEOMETRIC | PS_SOLID | PS_ENDCAP_FLAT, - (cap == LineCapCustom ? size : 1), &lb, 0, NULL); + ((cap == LineCapCustom) && custom && (custom->fill)) ? size : 1, + &lb, 0, NULL); oldbrush = SelectObject(hdc, brush); oldpen = SelectObject(hdc, pen); @@ -267,11 +269,6 @@ static void draw_cap(HDC hdc, COLORREF color, GpLineCap cap, REAL size, if(!custom) break; - if(custom->fill){ - FIXME("fill-path custom line caps not implemented\n"); - break; - } - count = custom->pathdata.Count; custptf = GdipAlloc(count * sizeof(PointF)); custpt = GdipAlloc(count * sizeof(POINT)); @@ -294,7 +291,14 @@ static void draw_cap(HDC hdc, COLORREF color, GpLineCap cap, REAL size, tp[i] = convert_path_point_type(custom->pathdata.Types[i]); } - PolyDraw(hdc, custpt, tp, count); + if(custom->fill){ + BeginPath(hdc); + PolyDraw(hdc, custpt, tp, count); + EndPath(hdc); + StrokeAndFillPath(hdc); + } + else + PolyDraw(hdc, custpt, tp, count); custend: GdipFree(custptf);

1 0

Hans Leidekker : pdh: Add more tests and make them pass.
by Alexandre Julliard 23 Jul '07

23 Jul '07

Module: wine Branch: master Commit: 75a9146268b75d7f5b8c5da223762f90fbcb3f16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75a9146268b75d7f5b8c5da22… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Jul 21 15:07:50 2007 +0200 pdh: Add more tests and make them pass. --- dlls/pdh/pdh_main.c | 10 ++- dlls/pdh/tests/pdh.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 154 insertions(+), 10 deletions(-) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 0c5a70e..5517bf7 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -253,13 +253,13 @@ PDH_STATUS WINAPI PdhAddCounterW( PDH_HQUERY hquery, LPCWSTR path, PDH_STATUS WINAPI PdhCloseQuery( PDH_HQUERY handle ) { struct query *query = handle; - struct list *item; + struct list *item, *next; TRACE("%p\n", handle); if (!query || (query->magic != PDH_MAGIC_QUERY)) return PDH_INVALID_HANDLE; - LIST_FOR_EACH( item, &query->counters ) + LIST_FOR_EACH_SAFE( item, next, &query->counters ) { struct counter *counter = LIST_ENTRY( item, struct counter, entry ); @@ -269,7 +269,9 @@ PDH_STATUS WINAPI PdhCloseQuery( PDH_HQUERY handle ) pdh_free( counter ); } + query->magic = 0; pdh_free( query ); + return ERROR_SUCCESS; } @@ -338,8 +340,8 @@ PDH_STATUS WINAPI PdhGetCounterInfoW( PDH_HCOUNTER handle, BOOLEAN text, LPDWORD TRACE("%p %d %p %p\n", handle, text, size, info); - if (!size) return PDH_INVALID_ARGUMENT; if (!counter) return PDH_INVALID_HANDLE; + if (!size) return PDH_INVALID_ARGUMENT; if (*size < sizeof(PDH_COUNTER_INFO_W)) { @@ -356,7 +358,7 @@ PDH_STATUS WINAPI PdhGetCounterInfoW( PDH_HCOUNTER handle, BOOLEAN text, LPDWORD info->dwUserData = counter->user; info->dwQueryUserData = counter->queryuser; - *size = sizeof(PDH_COUNTER_INFO_A); + *size = sizeof(PDH_COUNTER_INFO_W); return ERROR_SUCCESS; } diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index 12770ed..8a3b6f3 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -27,7 +27,15 @@ #include "wine/test.h" -static void test_open_close_query( void ) +static const WCHAR system_uptime[] = + {'\\','S','y','s','t','e','m','\\','S','y','s','t','e','m',' ','U','p',' ','T','i','m','e',0}; +static const WCHAR system_downtime[] = /* does not exist */ + {'\\','S','y','s','t','e','m','\\','S','y','s','t','e','m',' ','D','o','w','n',' ','T','i','m','e',0}; +static const WCHAR percentage_processor_time[] = + {'\\','P','r','o','c','e','s','s','o','r','(','_','T','o','t','a','l',')', + '\\','%',' ','P','r','o','c','e','s','s','o','r',' ','T','i','m','e',0}; + +static void test_PdhOpenQueryA( void ) { PDH_STATUS ret; PDH_HQUERY query; @@ -46,9 +54,36 @@ static void test_open_close_query( void ) ret = PdhCloseQuery( query ); ok(ret == ERROR_SUCCESS, "PdhCloseQuery failed 0x%08x\n", ret); + + ret = PdhCloseQuery( query ); + ok(ret == PDH_INVALID_HANDLE, "PdhCloseQuery failed 0x%08x\n", ret); +} + +static void test_PdhOpenQueryW( void ) +{ + PDH_STATUS ret; + PDH_HQUERY query; + + ret = PdhOpenQueryW( NULL, 0, NULL ); + ok(ret == PDH_INVALID_ARGUMENT, "PdhOpenQueryW failed 0x%08x\n", ret); + + ret = PdhOpenQueryW( NULL, 0, &query ); + ok(ret == ERROR_SUCCESS, "PdhOpenQueryW failed 0x%08x\n", ret); + + ret = PdhCloseQuery( NULL ); + ok(ret == PDH_INVALID_HANDLE, "PdhCloseQuery failed 0x%08x\n", ret); + + ret = PdhCloseQuery( &query ); + ok(ret == PDH_INVALID_HANDLE, "PdhCloseQuery failed 0x%08x\n", ret); + + ret = PdhCloseQuery( query ); + ok(ret == ERROR_SUCCESS, "PdhCloseQuery failed 0x%08x\n", ret); + + ret = PdhCloseQuery( query ); + ok(ret == PDH_INVALID_HANDLE, "PdhCloseQuery failed 0x%08x\n", ret); } -static void test_add_remove_counter( void ) +static void test_PdhAddCounterA( void ) { PDH_STATUS ret; PDH_HQUERY query; @@ -95,6 +130,53 @@ static void test_add_remove_counter( void ) ok(ret == ERROR_SUCCESS, "PdhCloseQuery failed 0x%08x\n", ret); } +static void test_PdhAddCounterW( void ) +{ + PDH_STATUS ret; + PDH_HQUERY query; + PDH_HCOUNTER counter; + + ret = PdhOpenQueryW( NULL, 0, &query ); + ok(ret == ERROR_SUCCESS, "PdhOpenQueryW failed 0x%08x\n", ret); + + ret = PdhAddCounterW( NULL, percentage_processor_time, 0, NULL ); + ok(ret == PDH_INVALID_ARGUMENT, "PdhAddCounterW failed 0x%08x\n", ret); + + ret = PdhAddCounterW( NULL, percentage_processor_time, 0, &counter ); + ok(ret == PDH_INVALID_HANDLE, "PdhAddCounterW failed 0x%08x\n", ret); + + ret = PdhAddCounterW( query, NULL, 0, &counter ); + ok(ret == PDH_INVALID_ARGUMENT, "PdhAddCounterW failed 0x%08x\n", ret); + + ret = PdhAddCounterW( query, percentage_processor_time, 0, NULL ); + ok(ret == PDH_INVALID_ARGUMENT, "PdhAddCounterW failed 0x%08x\n", ret); + + ret = PdhAddCounterW( query, system_downtime, 0, &counter ); + ok(ret == PDH_CSTATUS_NO_COUNTER, "PdhAddCounterW failed 0x%08x\n", ret); + ok(!counter, "PdhAddCounterW failed %p\n", counter); + + ret = PdhAddCounterW( query, percentage_processor_time, 0, &counter ); + ok(ret == ERROR_SUCCESS, "PdhAddCounterW failed 0x%08x\n", ret); + + ret = PdhCollectQueryData( NULL ); + ok(ret == PDH_INVALID_HANDLE, "PdhCollectQueryData failed 0x%08x\n", ret); + + ret = PdhCollectQueryData( counter ); + ok(ret == PDH_INVALID_HANDLE, "PdhCollectQueryData failed 0x%08x\n", ret); + + ret = PdhCollectQueryData( query ); + ok(ret == ERROR_SUCCESS, "PdhCollectQueryData failed 0x%08x\n", ret); + + ret = PdhRemoveCounter( NULL ); + ok(ret == PDH_INVALID_HANDLE, "PdhRemoveCounter failed 0x%08x\n", ret); + + ret = PdhRemoveCounter( counter ); + ok(ret == ERROR_SUCCESS, "PdhRemoveCounter failed 0x%08x\n", ret); + + ret = PdhCloseQuery( query ); + ok(ret == ERROR_SUCCESS, "PdhCloseQuery failed 0x%08x\n", ret); +} + static void test_PdhGetFormattedCounterValue( void ) { PDH_STATUS ret; @@ -242,7 +324,7 @@ static void test_PdhGetCounterTimeBase( void ) ok(ret == ERROR_SUCCESS, "PdhCloseQuery failed 0x%08x\n", ret); } -static void test_PdhGetCounterInfo( void ) +static void test_PdhGetCounterInfoA( void ) { PDH_STATUS ret; PDH_HQUERY query; @@ -296,13 +378,73 @@ static void test_PdhGetCounterInfo( void ) ok(ret == ERROR_SUCCESS, "PdhCloseQuery failed 0x%08x\n", ret); } +static void test_PdhGetCounterInfoW( void ) +{ + PDH_STATUS ret; + PDH_HQUERY query; + PDH_HCOUNTER counter; + PDH_COUNTER_INFO_W info; + DWORD size; + + ret = PdhOpenQueryW( NULL, 0, &query ); + ok(ret == ERROR_SUCCESS, "PdhOpenQueryW failed 0x%08x\n", ret); + + ret = PdhAddCounterW( query, percentage_processor_time, 0, &counter ); + ok(ret == ERROR_SUCCESS, "PdhAddCounterW failed 0x%08x\n", ret); + + ret = PdhGetCounterInfoW( NULL, 0, NULL, NULL ); + ok(ret == PDH_INVALID_HANDLE, "PdhGetCounterInfoW failed 0x%08x\n", ret); + + ret = PdhGetCounterInfoW( counter, 0, NULL, NULL ); + ok(ret == PDH_INVALID_ARGUMENT, "PdhGetCounterInfoW failed 0x%08x\n", ret); + + ret = PdhGetCounterInfoW( counter, 0, NULL, &info ); + ok(ret == PDH_INVALID_ARGUMENT, "PdhGetCounterInfoW failed 0x%08x\n", ret); + + size = sizeof(info) - 1; + ret = PdhGetCounterInfoW( counter, 0, &size, NULL ); + ok(ret == PDH_MORE_DATA, "PdhGetCounterInfoW failed 0x%08x\n", ret); + + size = sizeof(info); + ret = PdhGetCounterInfoW( counter, 0, &size, &info ); + ok(ret == ERROR_SUCCESS, "PdhGetCounterInfoW failed 0x%08x\n", ret); + ok(size == sizeof(info), "PdhGetCounterInfoW failed %d\n", size); + + ret = PdhGetCounterInfoW( counter, 0, &size, &info ); + ok(ret == ERROR_SUCCESS, "PdhGetCounterInfoW failed 0x%08x\n", ret); + ok(info.lScale == 0, "lScale %d\n", info.lScale); + + ret = PdhSetCounterScaleFactor( counter, 0 ); + ok(ret == ERROR_SUCCESS, "PdhSetCounterScaleFactor failed 0x%08x\n", ret); + + ret = PdhGetCounterInfoW( counter, 0, &size, &info ); + ok(ret == ERROR_SUCCESS, "PdhGetCounterInfoW failed 0x%08x\n", ret); + ok(info.lScale == 0, "lScale %d\n", info.lScale); + + ret = PdhSetCounterScaleFactor( counter, -5 ); + ok(ret == ERROR_SUCCESS, "PdhSetCounterScaleFactor failed 0x%08x\n", ret); + + ret = PdhGetCounterInfoW( counter, 0, &size, &info ); + ok(ret == ERROR_SUCCESS, "PdhGetCounterInfoW failed 0x%08x\n", ret); + ok(info.lScale == -5, "lScale %d\n", info.lScale); + + ret = PdhCloseQuery( query ); + ok(ret == ERROR_SUCCESS, "PdhCloseQuery failed 0x%08x\n", ret); +} + START_TEST(pdh) { - test_open_close_query(); - test_add_remove_counter(); + test_PdhOpenQueryA(); + test_PdhOpenQueryW(); + + test_PdhAddCounterA(); + test_PdhAddCounterW(); + test_PdhGetFormattedCounterValue(); test_PdhGetRawCounterValue(); test_PdhSetCounterScaleFactor(); test_PdhGetCounterTimeBase(); - test_PdhGetCounterInfo(); + + test_PdhGetCounterInfoA(); + test_PdhGetCounterInfoW(); }

1 0