August 2008 - Wine-Commits - list.winehq.org

Rob Shearman : ole32: Fix testing of HRESULT types with not operator instead of comparing against S_OK .
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: 064b6fce0c45c7267118cb11466a303d8534819f URL: http://source.winehq.org/git/wine.git/?a=commit;h=064b6fce0c45c7267118cb114… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Aug 17 18:30:59 2008 +0100 ole32: Fix testing of HRESULT types with not operator instead of comparing against S_OK. This makes it more obvious what the code is doing. --- dlls/ole32/compobj.c | 4 ++-- dlls/ole32/oleproxy.c | 6 +++--- dlls/ole32/storage32.c | 5 ++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 64a99ec..69f42fc 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1391,7 +1391,7 @@ HRESULT WINAPI StringFromCLSID(REFCLSID id, LPOLESTR *idstr) return ret; ret=WINE_StringFromCLSID(id,buf); - if (!ret) { + if (ret == S_OK) { DWORD len = MultiByteToWideChar( CP_ACP, 0, buf, -1, NULL, 0 ); *idstr = IMalloc_Alloc( mllc, len * sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, buf, -1, *idstr, len ); @@ -2806,7 +2806,7 @@ HRESULT WINAPI CoTreatAsClass(REFCLSID clsidOld, REFCLSID clsidNew) if (!memcmp( clsidOld, clsidNew, sizeof(*clsidOld) )) { if (!RegQueryValueW(hkey, wszAutoTreatAs, auto_treat_as, &auto_treat_as_size) && - !CLSIDFromString(auto_treat_as, &id)) + CLSIDFromString(auto_treat_as, &id) == S_OK) { if (RegSetValueW(hkey, wszTreatAs, REG_SZ, auto_treat_as, sizeof(auto_treat_as))) { diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index 015d3fc..1add5e0 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -585,7 +585,7 @@ static HRESULT WINAPI RemUnkStub_Invoke(LPRPCSTUBBUFFER iface, pMsg->cbBuffer = cIids * sizeof(HRESULT); IRpcChannelBuffer_GetBuffer(pChannel, pMsg, &IID_IRemUnknown); - if (!hr) + if (hr == S_OK) { buf = pMsg->Buffer; memcpy(buf, pResults, cIids * sizeof(HRESULT)); @@ -964,12 +964,12 @@ PSFacBuf_CreateStub( if (IsEqualIID(&IID_IClassFactory, riid) || IsEqualIID(&IID_IUnknown, riid) /* FIXME: fixup stub manager and remove this*/) { hres = CFStub_Construct(ppStub); - if (!hres) + if (hres == S_OK) IRpcStubBuffer_Connect((*ppStub),pUnkServer); return hres; } else if (IsEqualIID(&IID_IRemUnknown,riid)) { hres = RemUnkStub_Construct(ppStub); - if (!hres) + if (hres == S_OK) IRpcStubBuffer_Connect((*ppStub),pUnkServer); return hres; } diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 7d79a39..565146b 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2100,7 +2100,6 @@ static HRESULT findPlaceholder( INT typeOfRelation) { StgProperty storeProperty; - HRESULT hr = S_OK; BOOL res = TRUE; /* @@ -2162,12 +2161,12 @@ static HRESULT findPlaceholder( } } - hr = StorageImpl_WriteProperty( + res = StorageImpl_WriteProperty( storage->base.ancestorStorage, storePropertyIndex, &storeProperty); - if(! hr) + if(!res) { return E_FAIL; }

1 0

Rob Shearman : msi: Fix handle leak in ITERATE_SelfRegModules.
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: cda469c89029487b8d717891b82f5c24db8b769e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cda469c89029487b8d717891b… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Aug 17 18:29:11 2008 +0100 msi: Fix handle leak in ITERATE_SelfRegModules. --- dlls/msi/action.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 2d2fe6c..2c4ff14 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3771,7 +3771,11 @@ static UINT ITERATE_SelfRegModules(MSIRECORD *row, LPVOID param) &si, &info); if (brc) + { + CloseHandle(info.hThread); msi_dialog_check_messages(info.hProcess); + CloseHandle(info.hProcess); + } msi_free(FullName);

1 0

Rob Shearman : comctl32: Fix use of arithmetic operator on Boolean type in TREEVIEW_ComputeItemInternalMetrics .
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: 6181419b6432c37d9086ff8aed49c40b3a2d95d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6181419b6432c37d9086ff8ae… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Aug 17 18:28:46 2008 +0100 comctl32: Fix use of arithmetic operator on Boolean type in TREEVIEW_ComputeItemInternalMetrics. Use a conditional operator to get the same result, but improving readability of the code. --- dlls/comctl32/treeview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 51e11bf..a77792d 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -859,7 +859,7 @@ TREEVIEW_ComputeItemInternalMetrics(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM > TVS_LINESATROOT); #endif - item->linesOffset = infoPtr->uIndent * (item->iLevel + lar - 1) + item->linesOffset = infoPtr->uIndent * (lar ? item->iLevel : item->iLevel - 1) - infoPtr->scrollX; item->stateOffset = item->linesOffset + infoPtr->uIndent; item->imageOffset = item->stateOffset

1 0

Rob Shearman : msrle32: Fix uses of arithmetic operators on Boolean types in MSRLE32_CompressRLE4Line and MSRLE32_CompressRLE8Line .
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: 88a97daa718ae30bacf05f1e2682ec13e032ac96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88a97daa718ae30bacf05f1e2… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Aug 17 18:29:02 2008 +0100 msrle32: Fix uses of arithmetic operators on Boolean types in MSRLE32_CompressRLE4Line and MSRLE32_CompressRLE8Line. The "extra_byte" variable is used as though it contains an integer rather than a TRUE/FALSE value so make it into an integer. --- dlls/msrle32/msrle32.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 4f0226a..e5d2d5b 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -395,7 +395,7 @@ static INT MSRLE32_CompressRLE4Line(const CodecInfo *pi, const WORD *lpP, INT i; INT size = min(count, 254); int bytes = ((size + 1) & (~1)) / 2; - BOOL extra_byte = bytes & 0x01; + int extra_byte = bytes & 0x01; *lpSizeImage += 2 + bytes + extra_byte; assert(((*lpSizeImage) % 2) == 0); @@ -488,7 +488,7 @@ static INT MSRLE32_CompressRLE8Line(const CodecInfo *pi, const WORD *lpP, while (count > 2) { INT i; INT size = min(count, 255); - BOOL extra_byte = size % 2; + int extra_byte = size % 2; *lpSizeImage += 2 + size + extra_byte; count -= size;

1 0

Rob Shearman : hhctl.ocx: Fix reference count leak in InPlace_OnPosRectChange.
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: 602b58ba73f9042f88d5cc7074bfe33217576a54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=602b58ba73f9042f88d5cc707… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Aug 17 18:28:24 2008 +0100 hhctl.ocx: Fix reference count leak in InPlace_OnPosRectChange. Also compare the result of IOleObject_QueryInterface with S_OK instead of using not operator so it is more clear what the code is doing. --- dlls/hhctrl.ocx/webbrowser.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/webbrowser.c b/dlls/hhctrl.ocx/webbrowser.c index c9caa38..5033197 100644 --- a/dlls/hhctrl.ocx/webbrowser.c +++ b/dlls/hhctrl.ocx/webbrowser.c @@ -365,8 +365,12 @@ static HRESULT STDMETHODCALLTYPE InPlace_OnPosRectChange(IOleInPlaceSite *iface, ICOM_THIS_MULTI(IOleClientSiteImpl, lpvtblOleInPlaceSite, iface); IOleInPlaceObject *inplace; - if (!IOleObject_QueryInterface(This->pBrowserObject, &IID_IOleInPlaceObject, (void **)&inplace)) + if (IOleObject_QueryInterface(This->pBrowserObject, &IID_IOleInPlaceObject, + (void **)&inplace) == S_OK) + { IOleInPlaceObject_SetObjectRects(inplace, lprcPosRect, lprcPosRect); + IOleInPlaceObject_Release(inplace); + } return S_OK; }

1 0

Rob Shearman : include: Remove superfluous semi-colons from wine/wined3d_gl .h.
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: 24c5df3dc141dce6788ae6f9db4ba904197e294d URL: http://source.winehq.org/git/wine.git/?a=commit;h=24c5df3dc141dce6788ae6f9d… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Aug 17 18:27:58 2008 +0100 include: Remove superfluous semi-colons from wine/wined3d_gl.h. --- include/wine/wined3d_gl.h | 548 ++++++++++++++++++++++---------------------- 1 files changed, 274 insertions(+), 274 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=24c5df3dc141dce6788ae…

1 0

Nikolay Sivov : gdiplus: Implemented GdipResetWorldTransform.
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: 169e87d87933bd43565948b97e1536968187b9b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=169e87d87933bd43565948b97… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Aug 6 18:36:16 2008 +0400 gdiplus: Implemented GdipResetWorldTransform. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 15 +++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 5ac1f1a..d3eaeb6 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -482,7 +482,7 @@ @ stub GdipResetPathGradientTransform @ stub GdipResetPenTransform @ stub GdipResetTextureTransform -@ stub GdipResetWorldTransform +@ stdcall GdipResetWorldTransform(ptr) @ stdcall GdipRestoreGraphics(ptr long) @ stdcall GdipReversePath(ptr) @ stub GdipRotateLineTransform diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 2450b47..3a7ffce 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2343,6 +2343,21 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, return Ok; } +GpStatus WINGDIPAPI GdipResetWorldTransform(GpGraphics *graphics) +{ + if(!graphics) + return InvalidParameter; + + graphics->worldtrans->matrix[0] = 1.0; + graphics->worldtrans->matrix[1] = 0.0; + graphics->worldtrans->matrix[2] = 0.0; + graphics->worldtrans->matrix[3] = 1.0; + graphics->worldtrans->matrix[4] = 0.0; + graphics->worldtrans->matrix[5] = 0.0; + + return Ok; +} + GpStatus WINGDIPAPI GdipRestoreGraphics(GpGraphics *graphics, GraphicsState state) { static int calls; diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index c0be696..3fc7657 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -166,6 +166,7 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics*, GDIPCONST WCHAR*, GpRegion**); GpStatus WINGDIPAPI GdipReleaseDC(GpGraphics*,HDC); +GpStatus WINGDIPAPI GdipResetWorldTransform(GpGraphics*); GpStatus WINGDIPAPI GdipRestoreGraphics(GpGraphics*,GraphicsState); GpStatus WINGDIPAPI GdipRotateWorldTransform(GpGraphics*,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipSaveGraphics(GpGraphics*,GraphicsState*);

1 0

Nikolay Sivov : gdiplus: Implemented GdipPathIterNextSubpathPath with tests .
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: ef889d94a345b7d637604e5bc9c95b8c5be70d93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef889d94a345b7d637604e5bc… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Aug 5 20:56:30 2008 +0400 gdiplus: Implemented GdipPathIterNextSubpathPath with tests. --- dlls/gdiplus/gdiplus.c | 33 +++++++++ dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/gdiplus_private.h | 2 + dlls/gdiplus/graphicspath.c | 33 --------- dlls/gdiplus/pathiterator.c | 28 +++++++- dlls/gdiplus/tests/pathiterator.c | 140 +++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 7 files changed, 204 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ef889d94a345b7d637604…

1 0

Nikolay Sivov : gdiplus: Implemented GdipPathIterIsValid with tests.
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: 09950e3ab5cfe17754de486be25cfc4db121693c URL: http://source.winehq.org/git/wine.git/?a=commit;h=09950e3ab5cfe17754de486be… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Aug 5 20:56:17 2008 +0400 gdiplus: Implemented GdipPathIterIsValid with tests. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pathiterator.c | 10 ++++++++ dlls/gdiplus/tests/pathiterator.c | 42 +++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 4 files changed, 54 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 57f9734..625c5a0 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -455,7 +455,7 @@ @ stdcall GdipPathIterGetCount(ptr ptr) @ stdcall GdipPathIterGetSubpathCount(ptr ptr) @ stdcall GdipPathIterHasCurve(ptr ptr) -@ stub GdipPathIterIsValid +@ stdcall GdipPathIterIsValid(ptr ptr) @ stdcall GdipPathIterNextMarker(ptr ptr ptr ptr) @ stub GdipPathIterNextMarkerPath @ stub GdipPathIterNextPathType diff --git a/dlls/gdiplus/pathiterator.c b/dlls/gdiplus/pathiterator.c index 95f1774..5269b0c 100644 --- a/dlls/gdiplus/pathiterator.c +++ b/dlls/gdiplus/pathiterator.c @@ -225,3 +225,13 @@ GpStatus WINGDIPAPI GdipPathIterEnumerate(GpPathIterator* iterator, INT* resultC return GdipPathIterCopyData(iterator, resultCount, points, types, 0, count-1); } + +GpStatus WINGDIPAPI GdipPathIterIsValid(GpPathIterator* iterator, BOOL* valid) +{ + if(!iterator || !valid) + return InvalidParameter; + + *valid = TRUE; + + return Ok; +} diff --git a/dlls/gdiplus/tests/pathiterator.c b/dlls/gdiplus/tests/pathiterator.c index a6adb19..d318360 100644 --- a/dlls/gdiplus/tests/pathiterator.c +++ b/dlls/gdiplus/tests/pathiterator.c @@ -214,6 +214,47 @@ static void test_getsubpathcount(void) GdipDeletePath(path); } +static void test_isvalid(void) +{ + GpPath *path; + GpPathIterator *iter; + GpStatus stat; + BOOL isvalid; + INT start, end, result; + + GdipCreatePath(FillModeAlternate, &path); + + /* NULL args */ + GdipCreatePathIter(&iter, path); + stat = GdipPathIterIsValid(NULL, NULL); + expect(InvalidParameter, stat); + stat = GdipPathIterIsValid(iter, NULL); + expect(InvalidParameter, stat); + stat = GdipPathIterIsValid(NULL, &isvalid); + expect(InvalidParameter, stat); + GdipDeletePathIter(iter); + + /* on empty path */ + GdipCreatePathIter(&iter, path); + isvalid = FALSE; + stat = GdipPathIterIsValid(iter, &isvalid); + expect(Ok, stat); + expect(TRUE, isvalid); + GdipDeletePathIter(iter); + + /* no markers */ + GdipAddPathLine(path, 50.0, 50.0, 110.0, 40.0); + GdipCreatePathIter(&iter, path); + GdipPathIterNextMarker(iter, &result, &start, &end); + isvalid = FALSE; + stat = GdipPathIterIsValid(iter, &isvalid); + expect(Ok, stat); + expect(TRUE, isvalid); + GdipDeletePathIter(iter); + + GdipDeletePath(path); +} + START_TEST(pathiterator) { struct GdiplusStartupInput gdiplusStartupInput; @@ -230,6 +271,7 @@ START_TEST(pathiterator) test_hascurve(); test_nextmarker(); test_getsubpathcount(); + test_isvalid(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index ed88096..d7baf52 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -333,6 +333,7 @@ GpStatus WINGDIPAPI GdipPathIterGetCount(GpPathIterator*,INT*); GpStatus WINGDIPAPI GdipPathIterGetSubpathCount(GpPathIterator*,INT*); GpStatus WINGDIPAPI GdipPathIterEnumerate(GpPathIterator*,INT*,GpPointF*,BYTE*,INT); GpStatus WINGDIPAPI GdipPathIterHasCurve(GpPathIterator*,BOOL*); +GpStatus WINGDIPAPI GdipPathIterIsValid(GpPathIterator*,BOOL*); GpStatus WINGDIPAPI GdipCloneCustomLineCap(GpCustomLineCap*,GpCustomLineCap**); GpStatus WINGDIPAPI GdipCreateCustomLineCap(GpPath*,GpPath*,GpLineCap,REAL,

1 0

Jeff Latimer : user32: DdeClientTransaction should check that pData is not NULL for XTYP_REQUEST.
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: 70ebae341d35f4de2928a0b432759dc347ac52a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70ebae341d35f4de2928a0b43… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue Aug 5 22:16:01 2008 +1000 user32: DdeClientTransaction should check that pData is not NULL for XTYP_REQUEST. --- dlls/user32/dde_client.c | 5 +++++ dlls/user32/tests/dde.c | 5 +---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index 69b18d5..738d511 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -1154,6 +1154,11 @@ HDDEDATA WINAPI DdeClientTransaction(LPBYTE pData, DWORD cbData, HCONV hConv, HS { case XTYP_EXECUTE: /* Windows simply ignores hszItem and wFmt in this case */ + if (pData == NULL) + { + pConv->instance->lastError = DMLERR_INVALIDPARAMETER; + return 0; + } pXAct = WDML_ClientQueueExecute(pConv, pData, cbData); break; case XTYP_POKE: diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 082a8bf..92ce3a9 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -433,10 +433,7 @@ todo_wine ret = DdeGetLastError(client_pid); ok(op == NULL, "Expected NULL, got %p\n", op); ok(res == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", res); - todo_wine - { - ok(ret == DMLERR_INVALIDPARAMETER, "Expected DMLERR_INVALIDPARAMETER, got %d\n", ret); - } + ok(ret == DMLERR_INVALIDPARAMETER, "Expected DMLERR_INVALIDPARAMETER, got %d\n", ret); DdeFreeStringHandle(client_pid, topic); DdeFreeDataHandle(hdata);

1 0