February 2008 - Wine-Commits

Rob Shearman : oleaut32: Fix some memory leaks in the safearray tests.
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: 1b936769137b4eb1133dcb645cbd60e32af42f4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b936769137b4eb1133dcb645… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 31 14:45:52 2008 +0000 oleaut32: Fix some memory leaks in the safearray tests. --- dlls/oleaut32/tests/safearray.c | 34 +++++++++++++++++++++++++++++++--- 1 files changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 1857ab5..2350eb4 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -355,15 +355,24 @@ static void test_safearray(void) SafeArrayPtrOfIndex(a, indices, (void **)&ptr1); ok(*(WORD *)ptr1 == 0x55aa, "Data not preserved when resizing array\n"); + hres = SafeArrayDestroy(a); + ok(hres == S_OK,"SAD faild with hres %x\n", hres); + bounds[0].cElements = 0; bounds[0].lLbound = 1; bounds[1].cElements = 2; bounds[1].lLbound = 23; a = SafeArrayCreate(VT_I4,2,bounds); ok(a != NULL,"SAC(VT_INT32,2,...) with 0 element dim failed.\n"); + + hres = SafeArrayDestroy(a); + ok(hres == S_OK,"SAD faild with hres %x\n", hres); bounds[0].cElements = 1; bounds[0].lLbound = 1; bounds[1].cElements = 0; bounds[1].lLbound = 23; a = SafeArrayCreate(VT_I4,2,bounds); ok(a != NULL,"SAC(VT_INT32,2,...) with 0 element dim failed.\n"); + hres = SafeArrayDestroy(a); + ok(hres == S_OK,"SAD faild with hres %x\n", hres); + bounds[0].cElements = 42; bounds[0].lLbound = 1; bounds[1].cElements = 2; bounds[1].lLbound = 23; a = SafeArrayCreate(VT_I4,2,bounds); @@ -443,6 +452,9 @@ static void test_safearray(void) hres = SafeArrayUnaccessData(a); ok(S_OK == hres, "SAUAD failed with 0x%x\n", hres); + hres = SafeArrayDestroy(a); + ok(hres == S_OK,"SAD faild with hres %x\n", hres); + for (i=0;i<sizeof(vttypes)/sizeof(vttypes[0]);i++) { if ((i == VT_I8 || i == VT_UI8) && HAVE_OLEAUT32_I8) { @@ -513,6 +525,9 @@ static void test_safearray(void) ok(hres == S_OK,"SADD of copy of array with vt %d failed with hres %x\n", vttypes[i].vt, hres); } + hres = SafeArrayDestroy(c); + ok(hres == S_OK,"SAD faild with hres %x\n", hres); + hres = SafeArrayDestroy(a); ok(hres == S_OK,"SAD of array with vt %d failed with hres %x\n", vttypes[i].vt, hres); } @@ -531,6 +546,7 @@ static void test_safearray(void) ok(hres==S_OK, "CTE VT_ARRAY|VT_UI1 -> VT_BSTR failed with %x\n",hres); ok(V_VT(&v) == VT_BSTR,"CTE VT_ARRAY|VT_UI1 -> VT_BSTR did not return VT_BSTR, but %d.v\n",V_VT(&v)); ok(V_BSTR(&v)[0] == 0x6548,"First letter are not 'He', but %x\n", V_BSTR(&v)[0]); + VariantClear(&v); /* check locking functions */ a = SafeArrayCreate(VT_I4, 1, &bound); @@ -560,7 +576,6 @@ static void test_safearray(void) hres = SafeArrayDestroyDescriptor(a); ok(hres == S_OK,"SADD with data in array failed with hres %x\n",hres); - /* IID functions */ /* init a small stack safearray */ if (pSafeArraySetIID) { @@ -574,6 +589,9 @@ static void test_safearray(void) ok((a->fFeatures & FADF_HAVEIID) == 0,"newly allocated descriptor with SAAD should not have FADF_HAVEIID\n"); hres = pSafeArraySetIID(a,&iid); ok(hres == E_INVALIDARG,"SafeArraySetIID of newly allocated descriptor with SAAD should return E_INVALIDARG, but %x\n",hres); + + hres = SafeArrayDestroyDescriptor(a); + ok(hres == S_OK,"SADD failed with hres %x\n",hres); } if (!pSafeArrayAllocDescriptorEx) @@ -692,6 +710,9 @@ static void test_SafeArrayAllocDestroyDescriptor(void) hres = SafeArrayAllocData(sa); ok(hres == S_OK, "SafeArrayAllocData gave hres 0x%x\n", hres); + + hres = SafeArrayDestroy(sa); + ok(hres == S_OK,"SafeArrayDestroy failed with hres %x\n",hres); } static void test_SafeArrayCreateLockDestroy(void) @@ -808,7 +829,7 @@ static void test_SafeArrayCreateLockDestroy(void) ok(hres == S_OK, "Unlock VARTYPE %d (@%d dims) hres 0x%x\n", vt, dimension, hres); - hres = SafeArrayDestroyDescriptor(sa); + hres = SafeArrayDestroy(sa); ok(hres == S_OK, "destroy VARTYPE %d (@%d dims) hres 0x%x\n", vt, dimension, hres); } @@ -829,6 +850,9 @@ static void test_VectorCreateLockDestroy(void) sa = pSafeArrayCreateVector(VT_UI1, 0, 0); ok(sa != NULL, "SACV with 0 elements failed.\n"); + hres = SafeArrayDestroy(sa); + ok(hres == S_OK, "SafeArrayDestroy failed with hres %x\n",hres); + /* Test all VARTYPES in different lengths */ for (element = 1; element <= 101; element += 10) { @@ -861,7 +885,7 @@ static void test_VectorCreateLockDestroy(void) ok(hres == S_OK, "Unlock VARTYPE %d (@%d elements) failed; hres 0x%x\n", vt, element, hres); - hres = SafeArrayDestroyDescriptor(sa); + hres = SafeArrayDestroy(sa); ok(hres == S_OK, "destroy VARTYPE %d (@%d elements) failed; hres 0x%x\n", vt, element, hres); } @@ -1085,6 +1109,8 @@ static void test_SafeArrayGetPutElement_BSTR(void) if (hres == S_OK) ok(SysStringLen(value) == SysStringLen(gotvalue), "Got len %d instead of %d\n", SysStringLen(gotvalue), SysStringLen(value)); SafeArrayDestroy(sa); + SysFreeString(value); + SysFreeString(gotvalue); } static int tunk_xref = 0; @@ -1603,6 +1629,7 @@ static void test_SafeArrayChangeTypeEx(void) hres = VariantChangeTypeEx(&v2, &v, 0, 0, VT_BSTR); ok(hres != S_OK, "CTE VT_ARRAY|VT %d->BSTR succeeded\n", vt); VariantClear(&v2); + VariantClear(&v); } /* Can't change an array of one type into array of another type , even @@ -1630,6 +1657,7 @@ static void test_SafeArrayChangeTypeEx(void) V_ARRAY(&v) = sa; hres = VariantChangeTypeEx(&v2, &v, 0, 0, VT_ARRAY|VT_UI1); ok(hres == S_OK, "CTE VT_ARRAY|VT_UI1->VT_ARRAY|VT_UI1 returned %x\n", hres); + SafeArrayDestroy(sa); } /* NULL/EMPTY */

1 0

Rob Shearman : wine.inf: Make UI effects default to on.
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: e28fe907fa7139f9a3c3f32dcf78a9de8a1e983b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e28fe907fa7139f9a3c3f32dc… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 31 14:47:19 2008 +0000 wine.inf: Make UI effects default to on. This makes SPI_GETUIEFFECTS return TRUE by default. --- tools/wine.inf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index c3cb89c..312d66c 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -206,7 +206,7 @@ HKCU,Software\Wine\Debug,"RelayFromExclude",2,"winex11.drv;user32;gdi32;advapi32 HKCU,%Desktop%,"FontSmoothing",2,"0" HKCU,%Desktop%,"DragFullWindows",2,"0" HKCU,%Desktop%,"SmoothScroll",3,00,00,00,00 -HKCU,%Desktop%,"UserPreferencemask",3,10,00,00,00 +HKCU,%Desktop%,"UserPreferenceMask",3,10,00,00,80 HKCU,%Desktop%,"LowPowerActive",,"0" [Metrics]

1 0

Rob Shearman : advapi32: Fix the size calculation in StartServiceW.
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: b2f4c7737b3a5e6260a95c30ec93add9b97fee76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2f4c7737b3a5e6260a95c30e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 31 14:46:07 2008 +0000 advapi32: Fix the size calculation in StartServiceW. Calculating an open-ended structure using sizeof doesn't yield an accurate size because of alignment. --- dlls/advapi32/service.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 7cfd9ea..9f27c40 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -484,7 +484,7 @@ static BOOL service_send_start_message(HANDLE pipe, LPCWSTR *argv, DWORD argc) for (i=0; i<argc; i++) len += strlenW(argv[i])+1; - ssi = HeapAlloc(GetProcessHeap(),0,sizeof *ssi + (len-1)*sizeof(WCHAR)); + ssi = HeapAlloc(GetProcessHeap(),0,FIELD_OFFSET(service_start_info, str[len])); ssi->cmd = WINESERV_STARTINFO; ssi->size = len; @@ -497,7 +497,7 @@ static BOOL service_send_start_message(HANDLE pipe, LPCWSTR *argv, DWORD argc) } *p=0; - r = WriteFile(pipe, ssi, sizeof *ssi + (len-1)*sizeof(WCHAR), &count, NULL); + r = WriteFile(pipe, ssi, FIELD_OFFSET(service_start_info, str[len]), &count, NULL); if (r) { r = ReadFile(pipe, &result, sizeof result, &count, NULL);

1 0

Rob Shearman : comctl32: In certain circumstances, native comctl32' s animation control accepts negative start positions for the ACM_PLAY message .
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: 8cda4a8d90c771bc677096ac944ea1a9605da696 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cda4a8d90c771bc677096ac9… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 31 14:47:14 2008 +0000 comctl32: In certain circumstances, native comctl32's animation control accepts negative start positions for the ACM_PLAY message. These circumstances seems to be after a seek is performed, but we play it safe and allow negative start positions to be treated as zero always. --- dlls/comctl32/animate.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c index d6c84da..8343389 100644 --- a/dlls/comctl32/animate.c +++ b/dlls/comctl32/animate.c @@ -434,6 +434,10 @@ static LRESULT ANIMATE_Play(ANIMATE_INFO *infoPtr, UINT cRepeat, WORD wFrom, WOR TRACE("(repeat=%d from=%d to=%d);\n", infoPtr->nLoop, infoPtr->nFromFrame, infoPtr->nToFrame); + if (infoPtr->nFromFrame >= infoPtr->mah.dwTotalFrames && + (SHORT)infoPtr->nFromFrame < 0) + infoPtr->nFromFrame = 0; + if (infoPtr->nFromFrame > infoPtr->nToFrame || infoPtr->nToFrame >= infoPtr->mah.dwTotalFrames) return FALSE;

1 0

Rob Shearman : oleaut32: Fix a leak of bmi in OLEPictureImpl_LoadGif.
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: 51e2e1cc4bab2736d37d678e562fc408c6931300 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51e2e1cc4bab2736d37d678e5… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 31 14:45:29 2008 +0000 oleaut32: Fix a leak of bmi in OLEPictureImpl_LoadGif. --- dlls/oleaut32/olepicture.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index d0c5f63..27c2ac9 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1237,6 +1237,7 @@ static HRESULT OLEPictureImpl_LoadGif(OLEPictureImpl *This, BYTE *xbuf, ULONG xr This->desc.picType = PICTYPE_BITMAP; OLEPictureImpl_SetBitmap(This); DGifCloseFile(gif); + HeapFree(GetProcessHeap(),0,bmi); HeapFree(GetProcessHeap(),0,bytes); return S_OK; }

1 0

Rob Shearman : oleaut32: Fix some reference count leaks in the tmarshal test.
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: 4d0881517353a8b304346bc2b3bf6ed3ba7c3f77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d0881517353a8b304346bc2b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 31 14:44:28 2008 +0000 oleaut32: Fix some reference count leaks in the tmarshal test. --- dlls/oleaut32/tests/tmarshal.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 7e958de..98ed428 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -785,6 +785,7 @@ static void test_typelibmarshal(void) hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream); ok_ole_success(hr, CreateStreamOnHGlobal); tid = start_host_object(pStream, &IID_IKindaEnumWidget, (IUnknown *)pKEW, MSHLFLAGS_NORMAL, &thread); + IKindaEnumWidget_Release(pKEW); IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); hr = CoUnmarshalInterface(pStream, &IID_IKindaEnumWidget, (void **)&pKEW); @@ -1163,6 +1164,7 @@ static void test_DispCallFunc(void) VariantClear(&varresult); VariantClear(&vararg[1]); VariantClear(&vararg[2]); + IWidget_Release(pWidget); } START_TEST(tmarshal)

1 0

Rob Shearman : rpcrt4: Fix some incorrect checks in RPCRT4_Receive.
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: 3024b530c9d34728848f7a5d894f716c0480b350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3024b530c9d34728848f7a5d8… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 31 14:45:22 2008 +0000 rpcrt4: Fix some incorrect checks in RPCRT4_Receive. --- dlls/rpcrt4/rpc_message.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index de6f97d..74e0052 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -869,14 +869,14 @@ RPC_STATUS RPCRT4_Receive(RpcConnection *Connection, RpcPktHdr **Header, goto fail; } - if ((CurrentHeader->common.flags & RPC_FLG_FIRST) != first_flag) { + if (CurrentHeader->common.auth_len != auth_length) { WARN("auth_len header field changed from %ld to %d\n", - auth_length, (*Header)->common.auth_len); + auth_length, CurrentHeader->common.auth_len); status = RPC_S_PROTOCOL_ERROR; goto fail; } - if (((*Header)->common.flags & RPC_FLG_FIRST) != first_flag) { + if ((CurrentHeader->common.flags & RPC_FLG_FIRST) != first_flag) { TRACE("invalid packet flags\n"); status = RPC_S_PROTOCOL_ERROR; goto fail;

1 0

Rob Shearman : oleaut32: Fix a memory leak in the olefont tests.
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: 2746baf8f06c66bf2bcb11536226bdcbfd0ff7db URL: http://source.winehq.org/git/wine.git/?a=commit;h=2746baf8f06c66bf2bcb11536… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 31 14:45:42 2008 +0000 oleaut32: Fix a memory leak in the olefont tests. --- dlls/oleaut32/tests/olefont.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 1e6678b..11d6169 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -171,6 +171,7 @@ static void test_type_info(void) ok(hres == S_OK, "GetNames returned 0x%08x instead of S_OK.\n", hres); ok(n == 1, "GetNames returned %d names instead of 1.\n", n); ok(!lstrcmpiW(names[0],name_Name), "DISPID_FONT_NAME doesn't get 'Names'.\n"); + SysFreeString(names[0]); ITypeInfo_Release(pTInfo);

1 0

Rob Shearman : mapi32: Add a stub implementation of HrQueryAllRows@24.
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: 0eaab1add2a2cb3d669510398504889e781948b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eaab1add2a2cb3d669510398… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 31 14:54:23 2008 +0000 mapi32: Add a stub implementation of HrQueryAllRows(a)24. --- dlls/mapi32/mapi32.spec | 2 +- dlls/mapi32/util.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/mapi32/mapi32.spec b/dlls/mapi32/mapi32.spec index bf97415..abf79bf 100644 --- a/dlls/mapi32/mapi32.spec +++ b/dlls/mapi32/mapi32.spec @@ -54,7 +54,7 @@ 72 stdcall FEqualNames(a)8(ptr ptr) FEqualNames 73 stub WrapStoreEntryID(a)24 74 stdcall IsBadBoundedStringPtr(a)8(ptr long) IsBadBoundedStringPtr - 75 stub HrQueryAllRows(a)24 + 75 stdcall HrQueryAllRows(a)24(ptr ptr ptr ptr long ptr) HrQueryAllRows 76 stdcall PropCopyMore(a)16(ptr ptr ptr ptr) PropCopyMore 77 stdcall UlPropSize(a)4(ptr) UlPropSize 78 stdcall FPropContainsProp(a)12(ptr ptr long) FPropContainsProp diff --git a/dlls/mapi32/util.c b/dlls/mapi32/util.c index 6621e6f..76c08ca 100644 --- a/dlls/mapi32/util.c +++ b/dlls/mapi32/util.c @@ -890,3 +890,12 @@ BOOL WINAPI FGetComponentPath(LPCSTR component, LPCSTR qualifier, LPSTR dll_path } return ret; } + +HRESULT WINAPI HrQueryAllRows(LPMAPITABLE lpTable, LPSPropTagArray lpPropTags, + LPSRestriction lpRestriction, LPSSortOrderSet lpSortOrderSet, + LONG crowsMax, LPSRowSet *lppRows) +{ + FIXME("(%p, %p, %p, %p, %d, %p): stub\n", lpTable, lpPropTags, lpRestriction, lpSortOrderSet, crowsMax, lppRows); + *lppRows = NULL; + return MAPI_E_CALL_FAILED; +}

1 0

Rob Shearman : ole32: Add a stub implementation of CreatePointerMoniker.
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: a7234c07c43ad7b160567950aebf7b0336f00f2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7234c07c43ad7b160567950a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 31 14:44:36 2008 +0000 ole32: Add a stub implementation of CreatePointerMoniker. --- dlls/ole32/moniker.c | 24 ++++++++++++++++++++++++ dlls/ole32/ole32.spec | 2 +- 2 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index cc83d95..33ad36c 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -1677,3 +1677,27 @@ void __RPC_USER MIDL_user_free(void *p) { HeapFree(GetProcessHeap(), 0, p); } + +/*********************************************************************** + * CreatePointerMoniker (OLE32.@) + * + * Creates a moniker which represents a pointer. + * + * PARAMS + * punk [I] Pointer to the object to represent. + * ppmk [O] Address that receives the pointer to the created moniker. + * + * RETURNS + * Success: S_OK. + * Failure: Any HRESULT code. + */ +HRESULT WINAPI CreatePointerMoniker(LPUNKNOWN punk, LPMONIKER *ppmk) +{ + FIXME("(%p, %p): stub\n", punk, ppmk); + + if (!ppmk) + return E_INVALIDARG; + + *ppmk = NULL; + return E_NOTIMPL; +} diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 25a1955..e1b2250 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -92,7 +92,7 @@ @ stdcall CreateItemMoniker(wstr wstr ptr) @ stub CreateObjrefMoniker @ stdcall CreateOleAdviseHolder(ptr) -@ stub CreatePointerMoniker #@ stdcall (ptr ptr) return 0,ERR_NOTIMPLEMENTED +@ stdcall CreatePointerMoniker(ptr ptr) @ stdcall CreateStreamOnHGlobal(ptr long ptr) @ stdcall DllDebugObjectRPCHook(long ptr) @ stdcall -private DllGetClassObject (ptr ptr ptr)

1 0