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

Rob Shearman : oleaut32: Fix testing of HRESULT types with not operator instead of comparing against S_OK .
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: e57697a04b702adec26b196868fb767f7d6b8ed0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e57697a04b702adec26b19686… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Aug 17 18:31:17 2008 +0100 oleaut32: 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/oleaut32/variant.c | 4 ++-- dlls/oleaut32/vartype.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index e6191d1..5c094e1 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1191,7 +1191,7 @@ INT WINAPI DosDateTimeToVariantTime(USHORT wDosDate, USHORT wDosTime, ud.st.wSecond = DOS_SECOND(wDosTime); ud.st.wDayOfWeek = ud.st.wMilliseconds = 0; - return !VarDateFromUdate(&ud, 0, pDateOut); + return VarDateFromUdate(&ud, 0, pDateOut) == S_OK; } /********************************************************************** @@ -1255,7 +1255,7 @@ INT WINAPI SystemTimeToVariantTime(LPSYSTEMTIME lpSt, double *pDateOut) return FALSE; ud.st = *lpSt; - return !VarDateFromUdate(&ud, 0, pDateOut); + return VarDateFromUdate(&ud, 0, pDateOut) == S_OK; } /*********************************************************************** diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index daeac85..318a58a 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -5179,7 +5179,7 @@ static HRESULT VARIANT_DI_div(const VARIANT_DI * dividend, const VARIANT_DI * di to multiply quotient by 10 (without overflowing), while adjusting the scale, until scale is 0. If this cannot be done, it is a real overflow. */ - while (!r_overflow && quotientscale < 0) { + while (r_overflow == S_OK && quotientscale < 0) { memset(remainderplusquotient, 0, sizeof(remainderplusquotient)); memcpy(remainderplusquotient, quotient->bitsnum, sizeof(quotient->bitsnum)); VARIANT_int_mulbychar(remainderplusquotient, sizeof(remainderplusquotient)/sizeof(DWORD), 10); @@ -5189,7 +5189,7 @@ static HRESULT VARIANT_DI_div(const VARIANT_DI * dividend, const VARIANT_DI * di memcpy(quotient->bitsnum, remainderplusquotient, sizeof(quotient->bitsnum)); } else r_overflow = DISP_E_OVERFLOW; } - if (!r_overflow) { + if (r_overflow == S_OK) { if (quotientscale <= 255) quotient->scale = quotientscale; else VARIANT_DI_clear(quotient); }

1 0

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

18 Aug '08

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 : comctl32: Fix use of arithmetic operator on Boolean type in TREEVIEW_ComputeItemInternalMetrics .
by Alexandre Julliard 18 Aug '08

18 Aug '08

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 18 Aug '08

18 Aug '08

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 : msi: Fix handle leak in ITERATE_SelfRegModules.
by Alexandre Julliard 18 Aug '08

18 Aug '08

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 : include: Remove superfluous semi-colons from wine/wined3d_gl .h.
by Alexandre Julliard 18 Aug '08

18 Aug '08

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 GdipPathIterNextSubpathPath with tests .
by Alexandre Julliard 18 Aug '08

18 Aug '08

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 GdipResetWorldTransform.
by Alexandre Julliard 18 Aug '08

18 Aug '08

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

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

18 Aug '08

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

Jeff Latimer : user32/tests: Add tests for for invalid DDE conditions.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: 544c1e5cd131ce34277b97f8cec337be8c0e5a7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=544c1e5cd131ce34277b97f8c… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue Aug 5 22:18:27 2008 +1000 user32/tests: Add tests for for invalid DDE conditions. --- dlls/user32/tests/dde.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 92ce3a9..d41ccdd 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -1372,6 +1372,53 @@ todo_wine { DestroyWindow(hwnd_server); } +static void test_initialisation(void) +{ + UINT ret; + DWORD res; + HDDEDATA hdata; + HSZ server, topic, item; + DWORD client_pid; + HCONV conversation; + + /* Initialise without a valid server window. */ + client_pid = 0; + ret = DdeInitializeA(&client_pid, client_ddeml_callback, APPCMD_CLIENTONLY, 0); + ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret); + + + server = DdeCreateStringHandleA(client_pid, "TestDDEService", CP_WINANSI); + topic = DdeCreateStringHandleA(client_pid, "TestDDETopic", CP_WINANSI); + + DdeGetLastError(client_pid); + + /* There is no server window so no conversation can be extracted */ + conversation = DdeConnect(client_pid, server, topic, NULL); + ok(conversation == NULL, "Expected NULL conversation, %p\n", conversation); + ret = DdeGetLastError(client_pid); + ok(ret == DMLERR_NO_CONV_ESTABLISHED, "Expected DMLERR_NO_CONV_ESTABLISHED, got %d\n", ret); + + DdeFreeStringHandle(client_pid, server); + + item = DdeCreateStringHandleA(client_pid, "request", CP_WINANSI); + + /* There is no converstation so an invalild parameter results */ + res = 0xdeadbeef; + DdeGetLastError(client_pid); + hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res); + ret = DdeGetLastError(client_pid); +todo_wine + ok(ret == DMLERR_INVALIDPARAMETER, "Expected DMLERR_INVALIDPARAMETER, got %d\n", ret); + ok(res == 0xdeadbeef, "Expected 0xdeadbeef, got %08x\n", res); + + DdeFreeStringHandle(client_pid, server); + ret = DdeDisconnect(conversation); + ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + + ret = DdeUninitialize(client_pid); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); +} + static void test_DdeCreateStringHandleW(DWORD dde_inst, int codepage) { static const WCHAR dde_string[] = {'D','D','E',' ','S','t','r','i','n','g',0}; @@ -2088,6 +2135,8 @@ START_TEST(dde) return; } + test_initialisation(); + ZeroMemory(&startup, sizeof(STARTUPINFO)); sprintf(buffer, "%s dde ddeml", argv[0]); startup.cb = sizeof(startup);

1 0