November 2009 - Wine-commits

Paul Vriens : advapi32/tests: Skip some tests on Win9x and WinMe.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 3912286aad5aa0531c586de885f0a6f85032d65a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3912286aad5aa0531c586de88… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 17 08:51:02 2009 +0100 advapi32/tests: Skip some tests on Win9x and WinMe. --- dlls/advapi32/tests/security.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 2986ef5..94be18a 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3284,6 +3284,11 @@ static void test_EqualSid(void) SetLastError(0xdeadbeef); ret = AllocateAndInitializeSid(&SIDAuthNT, 2, SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &sid1); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("AllocateAndInitializeSid is not implemented\n"); + return; + } ok(ret, "AllocateAndInitializeSid failed with error %d\n", GetLastError()); ok(GetLastError() == 0xdeadbeef, "AllocateAndInitializeSid shouldn't have set last error to %d\n",

1 0

Paul Vriens : advapi32/tests: Fix some test failures on NT4.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: bfa2479d4d9a9a7974b7d410dcbee8ddf26f850c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfa2479d4d9a9a7974b7d410d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 17 09:48:44 2009 +0100 advapi32/tests: Fix some test failures on NT4. --- dlls/advapi32/tests/security.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 94be18a..a327c53 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3301,7 +3301,8 @@ static void test_EqualSid(void) SetLastError(0xdeadbeef); ret = EqualSid(sid1, sid2); ok(!ret, "World and domain admins sids shouldn't have been equal\n"); - ok(GetLastError() == ERROR_SUCCESS, + ok(GetLastError() == ERROR_SUCCESS || + broken(GetLastError() == 0xdeadbeef), /* NT4 */ "EqualSid should have set last error to ERROR_SUCCESS instead of %d\n", GetLastError()); @@ -3319,7 +3320,8 @@ static void test_EqualSid(void) SetLastError(0xdeadbeef); ret = EqualSid(sid1, sid2); ok(ret, "Same sids should have been equal\n"); - ok(GetLastError() == ERROR_SUCCESS, + ok(GetLastError() == ERROR_SUCCESS || + broken(GetLastError() == 0xdeadbeef), /* NT4 */ "EqualSid should have set last error to ERROR_SUCCESS instead of %d\n", GetLastError()); @@ -3327,7 +3329,8 @@ static void test_EqualSid(void) SetLastError(0xdeadbeef); ret = EqualSid(sid1, sid2); ok(!ret, "EqualSid with invalid sid should have returned FALSE\n"); - ok(GetLastError() == ERROR_SUCCESS, + ok(GetLastError() == ERROR_SUCCESS || + broken(GetLastError() == 0xdeadbeef), /* NT4 */ "EqualSid should have set last error to ERROR_SUCCESS instead of %d\n", GetLastError()); ((SID *)sid2)->Revision = SID_REVISION;

1 0

Owen Rudge : comctl32/tests: Add test of IImageList_Merge function.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 9adc1b8fd67a3ac44fc515de41c4bbe75225f28f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9adc1b8fd67a3ac44fc515de4… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Nov 16 13:27:20 2009 -0600 comctl32/tests: Add test of IImageList_Merge function. --- dlls/comctl32/tests/imagelist.c | 77 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 77 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index b97ca9a..f35a641 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1451,6 +1451,82 @@ static void DoTest3_v6(void) DestroyWindow(hwndfortest); } +static void testMerge_v6(void) +{ + HIMAGELIST himl1, himl2; + IImageList *imgl1, *imgl2, *merge; + HICON hicon1; + HWND hwnd = create_a_window(); + HRESULT hr; + int ret; + + himl1 = ImageList_Create(32,32,0,0,3); + ok(himl1 != NULL,"failed to create himl1\n"); + + himl2 = ImageList_Create(32,32,0,0,3); + ok(himl2 != NULL,"failed to create himl2\n"); + + hicon1 = CreateIcon(hinst, 32, 32, 1, 1, icon_bits, icon_bits); + ok(hicon1 != NULL, "failed to create hicon1\n"); + + if (!himl1 || !himl2 || !hicon1) + return; + + /* cast to IImageList */ + imgl1 = (IImageList *) himl1; + imgl2 = (IImageList *) himl2; + + ok(SUCCEEDED(IImageList_ReplaceIcon(imgl2, -1, hicon1, &ret)) && (ret == 0),"add icon1 to himl2 failed\n"); + + /* If himl1 has no images, merge still succeeds */ + hr = IImageList_Merge(imgl1, -1, (IUnknown *) imgl2, 0, 0, 0, &IID_IImageList, (void **) &merge); + ok(SUCCEEDED(hr), "merge himl1,-1 failed\n"); + if (SUCCEEDED(hr)) IImageList_Release(merge); + + hr = IImageList_Merge(imgl1, 0, (IUnknown *) imgl2, 0, 0, 0, &IID_IImageList, (void **) &merge); + ok(SUCCEEDED(hr), "merge himl1,0 failed\n"); + if (SUCCEEDED(hr)) IImageList_Release(merge); + + /* Same happens if himl2 is empty */ + IImageList_Release(imgl2); + himl2 = ImageList_Create(32,32,0,0,3); + ok(himl2 != NULL,"failed to recreate himl2\n"); + + imgl2 = (IImageList *) himl2; + + hr = IImageList_Merge(imgl1, -1, (IUnknown *) imgl2, -1, 0, 0, &IID_IImageList, (void **) &merge); + ok(SUCCEEDED(hr), "merge himl2,-1 failed\n"); + if (SUCCEEDED(hr)) IImageList_Release(merge); + + hr = IImageList_Merge(imgl1, -1, (IUnknown *) imgl2, 0, 0, 0, &IID_IImageList, (void **) &merge); + ok(SUCCEEDED(hr), "merge himl2,0 failed\n"); + if (SUCCEEDED(hr)) IImageList_Release(merge); + + /* Now try merging an image with itself */ + ok(SUCCEEDED(IImageList_ReplaceIcon(imgl2, -1, hicon1, &ret)) && (ret == 0),"re-add icon1 to himl2 failed\n"); + + hr = IImageList_Merge(imgl2, 0, (IUnknown *) imgl2, 0, 0, 0, &IID_IImageList, (void **) &merge); + ok(SUCCEEDED(hr), "merge himl2 with itself failed\n"); + if (SUCCEEDED(hr)) IImageList_Release(merge); + + /* Try merging 2 different image lists */ + ok(SUCCEEDED(IImageList_ReplaceIcon(imgl1, -1, hicon1, &ret)) && (ret == 0),"add icon1 to himl1 failed\n"); + + hr = IImageList_Merge(imgl1, 0, (IUnknown *) imgl2, 0, 0, 0, &IID_IImageList, (void **) &merge); + ok(SUCCEEDED(hr), "merge himl1 with himl2 failed\n"); + if (SUCCEEDED(hr)) IImageList_Release(merge); + + hr = IImageList_Merge(imgl1, 0, (IUnknown *) imgl2, 0, 8, 16, &IID_IImageList, (void **) &merge); + ok(SUCCEEDED(hr), "merge himl1 with himl2 8,16 failed\n"); + if (SUCCEEDED(hr)) IImageList_Release(merge); + + IImageList_Release(imgl1); + IImageList_Release(imgl2); + + DestroyIcon(hicon1); + DestroyWindow(hwnd); +} + START_TEST(imagelist) { ULONG_PTR ctx_cookie; @@ -1497,6 +1573,7 @@ START_TEST(imagelist) test_iimagelist(); DoTest1_v6(); DoTest3_v6(); + testMerge_v6(); CoUninitialize();

1 0

Owen Rudge : comctl32: Implement GetImageRect, Get/SetIconSize, Get/ SetBkColor.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 2e9a6e96e3058749d3beaae5b276555a36d5f56c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e9a6e96e3058749d3beaae5b… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Nov 16 13:27:21 2009 -0600 comctl32: Implement GetImageRect, Get/SetIconSize, Get/SetBkColor. --- dlls/comctl32/imagelist.c | 34 ++++++++++++++++++++++++---------- 1 files changed, 24 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index cc92486..ff2eff8 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -3162,22 +3162,30 @@ static HRESULT WINAPI ImageListImpl_Clone(IImageList *iface, REFIID riid, static HRESULT WINAPI ImageListImpl_GetImageRect(IImageList *iface, int i, RECT *prc) { - FIXME("STUB: %p %d %p\n", iface, i, prc); - return E_NOTIMPL; + HIMAGELIST This = (HIMAGELIST) iface; + IMAGEINFO info; + + if (!prc) + return E_FAIL; + + if (!ImageList_GetImageInfo(This, i, &info)) + return E_FAIL; + + return CopyRect(prc, &info.rcImage) ? S_OK : E_FAIL; } static HRESULT WINAPI ImageListImpl_GetIconSize(IImageList *iface, int *cx, int *cy) { - FIXME("STUB: %p %p %p\n", iface, cx, cy); - return E_NOTIMPL; + HIMAGELIST This = (HIMAGELIST) iface; + + return ImageList_GetIconSize(This, cx, cy) ? S_OK : E_FAIL; } static HRESULT WINAPI ImageListImpl_SetIconSize(IImageList *iface, int cx, int cy) { - FIXME("STUB: %p %d %d\n", iface, cx, cy); - return E_NOTIMPL; + return ImageList_SetIconSize((HIMAGELIST) iface, cx, cy) ? S_OK : E_FAIL; } static HRESULT WINAPI ImageListImpl_GetImageCount(IImageList *iface, int *pi) @@ -3198,14 +3206,20 @@ static HRESULT WINAPI ImageListImpl_SetImageCount(IImageList *iface, static HRESULT WINAPI ImageListImpl_SetBkColor(IImageList *iface, COLORREF clrBk, COLORREF *pclr) { - FIXME("STUB: %p %x %p\n", iface, clrBk, pclr); - return E_NOTIMPL; + if (!pclr) + return E_FAIL; + + *pclr = ImageList_SetBkColor((HIMAGELIST) iface, clrBk); + return *pclr == CLR_NONE ? E_FAIL : S_OK; } static HRESULT WINAPI ImageListImpl_GetBkColor(IImageList *iface, COLORREF *pclr) { - FIXME("STUB: %p %p\n", iface, pclr); - return E_NOTIMPL; + if (!pclr) + return E_FAIL; + + *pclr = ImageList_GetBkColor((HIMAGELIST) iface); + return S_OK; } static HRESULT WINAPI ImageListImpl_BeginDrag(IImageList *iface, int iTrack,

1 0

Owen Rudge : comctl32: Implement imagelist drag functions, GetOverlayImage.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 341e6ed533754297c658381ea9d2c9770784dba9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=341e6ed533754297c658381ea… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Nov 16 13:27:28 2009 -0600 comctl32: Implement imagelist drag functions, GetOverlayImage. --- dlls/comctl32/imagelist.c | 72 +++++++++++++++++++++++++++++++++------------ 1 files changed, 53 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index ff2eff8..9f310c3 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -3225,54 +3225,74 @@ static HRESULT WINAPI ImageListImpl_GetBkColor(IImageList *iface, COLORREF *pclr static HRESULT WINAPI ImageListImpl_BeginDrag(IImageList *iface, int iTrack, int dxHotspot, int dyHotspot) { - FIXME("STUB: %p %d %d %d\n", iface, iTrack, dxHotspot, dyHotspot); - return E_NOTIMPL; + return ImageList_BeginDrag((HIMAGELIST) iface, iTrack, dxHotspot, dyHotspot) ? S_OK : E_FAIL; } static HRESULT WINAPI ImageListImpl_EndDrag(IImageList *iface) { - FIXME("STUB: %p\n", iface); - return E_NOTIMPL; + ImageList_EndDrag(); + return S_OK; } static HRESULT WINAPI ImageListImpl_DragEnter(IImageList *iface, HWND hwndLock, int x, int y) { - FIXME("STUB: %p %p %d %d\n", iface, hwndLock, x, y); - return E_NOTIMPL; + return ImageList_DragEnter(hwndLock, x, y) ? S_OK : E_FAIL; } static HRESULT WINAPI ImageListImpl_DragLeave(IImageList *iface, HWND hwndLock) { - FIXME("STUB: %p %p\n", iface, hwndLock); - return E_NOTIMPL; + return ImageList_DragLeave(hwndLock) ? S_OK : E_FAIL; } static HRESULT WINAPI ImageListImpl_DragMove(IImageList *iface, int x, int y) { - FIXME("STUB: %p %d %d\n", iface, x, y); - return E_NOTIMPL; + return ImageList_DragMove(x, y) ? S_OK : E_FAIL; } static HRESULT WINAPI ImageListImpl_SetDragCursorImage(IImageList *iface, IUnknown *punk, int iDrag, int dxHotspot, int dyHotspot) { - FIXME("STUB: %p %p %d %d %d\n", iface, punk, iDrag, dxHotspot, dyHotspot); - return E_NOTIMPL; + IImageList *iml2 = NULL; + HRESULT ret; + + if (!punk) + return E_FAIL; + + /* TODO: Add test for IID_ImageList2 too */ + if (!SUCCEEDED(IImageList_QueryInterface(punk, &IID_IImageList, + (void **) &iml2))) + return E_FAIL; + + ret = ImageList_SetDragCursorImage((HIMAGELIST) iml2, iDrag, dxHotspot, + dyHotspot); + + IImageList_Release(iml2); + + return ret ? S_OK : E_FAIL; } static HRESULT WINAPI ImageListImpl_DragShowNolock(IImageList *iface, BOOL fShow) { - FIXME("STUB: %p %d\n", iface, fShow); - return E_NOTIMPL; + return ImageList_DragShowNolock(fShow) ? S_OK : E_FAIL; } static HRESULT WINAPI ImageListImpl_GetDragImage(IImageList *iface, POINT *ppt, POINT *pptHotspot, REFIID riid, PVOID *ppv) { - FIXME("STUB: %p %p %p %s %p\n", iface, ppt, pptHotspot, debugstr_guid(riid), - ppv); - return E_NOTIMPL; + HRESULT ret = E_FAIL; + HIMAGELIST hNew; + + if (!ppv) + return E_FAIL; + + hNew = ImageList_GetDragImage(ppt, pptHotspot); + + /* Get the interface for the new image list */ + if (hNew) + ret = HIMAGELIST_QueryInterface(hNew, riid, ppv); + + return ret; } static HRESULT WINAPI ImageListImpl_GetItemFlags(IImageList *iface, int i, @@ -3285,8 +3305,22 @@ static HRESULT WINAPI ImageListImpl_GetItemFlags(IImageList *iface, int i, static HRESULT WINAPI ImageListImpl_GetOverlayImage(IImageList *iface, int iOverlay, int *piIndex) { - FIXME("STUB: %p %d %p\n", iface, iOverlay, piIndex); - return E_NOTIMPL; + HIMAGELIST This = (HIMAGELIST) iface; + int i; + + if ((iOverlay < 0) || (iOverlay > This->cCurImage)) + return E_FAIL; + + for (i = 0; i < MAX_OVERLAYIMAGE; i++) + { + if (This->nOvlIdx[i] == iOverlay) + { + *piIndex = i + 1; + return S_OK; + } + } + + return E_FAIL; }

1 0

Owen Rudge : comctl32/tests: Add hotspot/drag test for IImageList.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: c0a6c5cd3ffa50cfce82cfdd8a9a1134269c36e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0a6c5cd3ffa50cfce82cfdd8… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Nov 16 13:27:30 2009 -0600 comctl32/tests: Add hotspot/drag test for IImageList. --- dlls/comctl32/tests/imagelist.c | 77 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 77 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index f35a641..36d0aea 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1306,6 +1306,81 @@ static void test_iimagelist(void) ImageList_Destroy(himl); } +static void testHotspot_v6(void) +{ + struct hotspot { + int dx; + int dy; + }; + +#define SIZEX1 47 +#define SIZEY1 31 +#define SIZEX2 11 +#define SIZEY2 17 +#define HOTSPOTS_MAX 4 /* Number of entries in hotspots */ + static const struct hotspot hotspots[HOTSPOTS_MAX] = { + { 10, 7 }, + { SIZEX1, SIZEY1 }, + { -9, -8 }, + { -7, 35 } + }; + int i, j; + HIMAGELIST himl1 = createImageList(SIZEX1, SIZEY1); + HIMAGELIST himl2 = createImageList(SIZEX2, SIZEY2); + IImageList *imgl1, *imgl2; + HRESULT hr; + + /* cast to IImageList */ + imgl1 = (IImageList *) himl1; + imgl2 = (IImageList *) himl2; + + for (i = 0; i < HOTSPOTS_MAX; i++) { + for (j = 0; j < HOTSPOTS_MAX; j++) { + int dx1 = hotspots[i].dx; + int dy1 = hotspots[i].dy; + int dx2 = hotspots[j].dx; + int dy2 = hotspots[j].dy; + int correctx, correcty, newx, newy; + char loc[256]; + IImageList *imglNew; + POINT ppt; + + hr = IImageList_BeginDrag(imgl1, 0, dx1, dy1); + ok(SUCCEEDED(hr), "BeginDrag failed for { %d, %d }\n", dx1, dy1); + sprintf(loc, "BeginDrag (%d,%d)\n", i, j); + + /* check merging the dragged image with a second image */ + hr = IImageList_SetDragCursorImage(imgl2, (IUnknown *) imgl2, 0, dx2, dy2); + ok(SUCCEEDED(hr), "SetDragCursorImage failed for {%d, %d}{%d, %d}\n", + dx1, dy1, dx2, dy2); + sprintf(loc, "SetDragCursorImage (%d,%d)\n", i, j); + + /* check new hotspot, it should be the same like the old one */ + hr = IImageList_GetDragImage(imgl2, NULL, &ppt, &IID_IImageList, (PVOID *) &imglNew); + ok(SUCCEEDED(hr), "GetDragImage failed\n"); + ok(ppt.x == dx1 && ppt.y == dy1, + "Expected drag hotspot [%d,%d] got [%d,%d]\n", + dx1, dy1, ppt.x, ppt.y); + /* check size of new dragged image */ + IImageList_GetIconSize(imglNew, &newx, &newy); + correctx = max(SIZEX1, max(SIZEX2 + dx2, SIZEX1 - dx2)); + correcty = max(SIZEY1, max(SIZEY2 + dy2, SIZEY1 - dy2)); + ok(newx == correctx && newy == correcty, + "Expected drag image size [%d,%d] got [%d,%d]\n", + correctx, correcty, newx, newy); + sprintf(loc, "GetDragImage (%d,%d)\n", i, j); + IImageList_EndDrag(imgl2); + } + } +#undef SIZEX1 +#undef SIZEY1 +#undef SIZEX2 +#undef SIZEY2 +#undef HOTSPOTS_MAX + IImageList_Release(imgl2); + IImageList_Release(imgl1); +} + static void DoTest1_v6(void) { IImageList *imgl; @@ -1571,6 +1646,8 @@ START_TEST(imagelist) test_ImageList_DrawIndirect(); test_shell_imagelist(); test_iimagelist(); + + testHotspot_v6(); DoTest1_v6(); DoTest3_v6(); testMerge_v6();

1 0

Vincent Povirk : ole32: Rename property variables in internal storage functions.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: f1861166bbe4f784a82426314d8fdb2fee03d782 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1861166bbe4f784a82426314… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 12 14:47:07 2009 -0600 ole32: Rename property variables in internal storage functions. --- dlls/ole32/storage32.c | 112 ++++++++++++++++++++++++------------------------ 1 files changed, 56 insertions(+), 56 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 0c27f0d..587a555 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1093,8 +1093,8 @@ static HRESULT createDirEntry( const DirEntry *newData, ULONG *index) { - ULONG currentPropertyIndex = 0; - ULONG newPropertyIndex = DIRENTRY_NULL; + ULONG currentEntryIndex = 0; + ULONG newEntryIndex = DIRENTRY_NULL; HRESULT hr = S_OK; BYTE currentData[RAW_DIRENTRY_SIZE]; WORD sizeOfNameString; @@ -1102,7 +1102,7 @@ static HRESULT createDirEntry( do { hr = StorageImpl_ReadRawDirEntry(storage, - currentPropertyIndex, + currentEntryIndex, currentData); if (SUCCEEDED(hr)) @@ -1115,79 +1115,79 @@ static HRESULT createDirEntry( if (sizeOfNameString == 0) { /* - * The property existis and is available, we found it. + * The entry exists and is available, we found it. */ - newPropertyIndex = currentPropertyIndex; + newEntryIndex = currentEntryIndex; } } else { /* - * We exhausted the property list, we will create more space below + * We exhausted the directory entries, we will create more space below */ - newPropertyIndex = currentPropertyIndex; + newEntryIndex = currentEntryIndex; } - currentPropertyIndex++; + currentEntryIndex++; - } while (newPropertyIndex == DIRENTRY_NULL); + } while (newEntryIndex == DIRENTRY_NULL); /* - * grow the property chain + * grow the directory stream */ if (FAILED(hr)) { BYTE emptyData[RAW_DIRENTRY_SIZE]; ULARGE_INTEGER newSize; - ULONG propertyIndex; - ULONG lastProperty = 0; + ULONG entryIndex; + ULONG lastEntry = 0; ULONG blockCount = 0; /* - * obtain the new count of property blocks + * obtain the new count of blocks in the directory stream */ blockCount = BlockChainStream_GetCount( storage->rootBlockChain)+1; /* - * initialize the size used by the property stream + * initialize the size used by the directory stream */ newSize.u.HighPart = 0; newSize.u.LowPart = storage->bigBlockSize * blockCount; /* - * add a property block to the property chain + * add a block to the directory stream */ BlockChainStream_SetSize(storage->rootBlockChain, newSize); /* - * memset the empty property in order to initialize the unused newly - * created property + * memset the empty entry in order to initialize the unused newly + * created entries */ memset(&emptyData, 0, RAW_DIRENTRY_SIZE); /* * initialize them */ - lastProperty = storage->bigBlockSize / RAW_DIRENTRY_SIZE * blockCount; + lastEntry = storage->bigBlockSize / RAW_DIRENTRY_SIZE * blockCount; for( - propertyIndex = newPropertyIndex + 1; - propertyIndex < lastProperty; - propertyIndex++) + entryIndex = newEntryIndex + 1; + entryIndex < lastEntry; + entryIndex++) { StorageImpl_WriteRawDirEntry( storage, - propertyIndex, + entryIndex, emptyData); } } UpdateRawDirEntry(currentData, newData); - hr = StorageImpl_WriteRawDirEntry(storage, newPropertyIndex, currentData); + hr = StorageImpl_WriteRawDirEntry(storage, newEntryIndex, currentData); if (SUCCEEDED(hr)) - *index = newPropertyIndex; + *index = newEntryIndex; return hr; } @@ -1245,7 +1245,7 @@ static LONG entryNameCmp( * * Internal Method * - * Properly link this new element in the property chain. + * Add a directory entry to a storage */ static HRESULT insertIntoTree( StorageImpl *This, @@ -1256,14 +1256,14 @@ static HRESULT insertIntoTree( DirEntry newEntry; /* - * Read the inserted property + * Read the inserted entry */ StorageImpl_ReadDirEntry(This, newEntryIndex, &newEntry); /* - * Read the root property + * Read the storage entry */ StorageImpl_ReadDirEntry(This, parentStorageIndex, @@ -1279,7 +1279,7 @@ static HRESULT insertIntoTree( ULONG current, next, previous, currentEntryId; /* - * Keep the DirEntry sequence number of the storage first property + * Keep a reference to the root of the storage's element tree */ currentEntryId = currentEntry.dirRootEntry; @@ -1350,7 +1350,7 @@ static HRESULT insertIntoTree( else { /* - * The root storage is empty, link the new property to its dir property + * The storage is empty, make the new entry the root of its element tree */ currentEntry.dirRootEntry = newEntryIndex; StorageImpl_WriteDirEntry(This, @@ -1944,18 +1944,18 @@ static HRESULT deleteStreamContents( return S_OK; } -static void setPropertyLink(DirEntry *property, ULONG relation, ULONG new_target) +static void setEntryLink(DirEntry *entry, ULONG relation, ULONG new_target) { switch (relation) { case DIRENTRY_RELATION_PREVIOUS: - property->leftChild = new_target; + entry->leftChild = new_target; break; case DIRENTRY_RELATION_NEXT: - property->rightChild = new_target; + entry->rightChild = new_target; break; case DIRENTRY_RELATION_DIR: - property->dirRootEntry = new_target; + entry->dirRootEntry = new_target; break; default: assert(0); @@ -1976,69 +1976,69 @@ static HRESULT removeFromTree( { HRESULT hr = S_OK; BOOL res = TRUE; - DirEntry propertyToDelete; - DirEntry parentProperty; - ULONG parentPropertyId; + DirEntry entryToDelete; + DirEntry parentEntry; + ULONG parentEntryRef; ULONG typeOfRelation; - res = StorageImpl_ReadDirEntry(This, deletedIndex, &propertyToDelete); + res = StorageImpl_ReadDirEntry(This, deletedIndex, &entryToDelete); /* - * Find the property that links to the one we want to delete. + * Find the element that links to the one we want to delete. */ - hr = findTreeParent(This, parentStorageIndex, propertyToDelete.name, - &parentProperty, &parentPropertyId, &typeOfRelation); + hr = findTreeParent(This, parentStorageIndex, entryToDelete.name, + &parentEntry, &parentEntryRef, &typeOfRelation); if (hr != S_OK) return hr; - if (propertyToDelete.leftChild != DIRENTRY_NULL) + if (entryToDelete.leftChild != DIRENTRY_NULL) { /* * Replace the deleted entry with its left child */ - setPropertyLink(&parentProperty, typeOfRelation, propertyToDelete.leftChild); + setEntryLink(&parentEntry, typeOfRelation, entryToDelete.leftChild); res = StorageImpl_WriteDirEntry( This, - parentPropertyId, - &parentProperty); + parentEntryRef, + &parentEntry); if(!res) { return E_FAIL; } - if (propertyToDelete.rightChild != DIRENTRY_NULL) + if (entryToDelete.rightChild != DIRENTRY_NULL) { /* * We need to reinsert the right child somewhere. We already know it and * its children are greater than everything in the left tree, so we * insert it at the rightmost point in the left tree. */ - ULONG newRightChildParent = propertyToDelete.leftChild; - DirEntry newRightChildParentProperty; + ULONG newRightChildParent = entryToDelete.leftChild; + DirEntry newRightChildParentEntry; do { res = StorageImpl_ReadDirEntry( This, newRightChildParent, - &newRightChildParentProperty); + &newRightChildParentEntry); if (!res) { return E_FAIL; } - if (newRightChildParentProperty.rightChild != DIRENTRY_NULL) - newRightChildParent = newRightChildParentProperty.rightChild; - } while (newRightChildParentProperty.rightChild != DIRENTRY_NULL); + if (newRightChildParentEntry.rightChild != DIRENTRY_NULL) + newRightChildParent = newRightChildParentEntry.rightChild; + } while (newRightChildParentEntry.rightChild != DIRENTRY_NULL); - newRightChildParentProperty.rightChild = propertyToDelete.rightChild; + newRightChildParentEntry.rightChild = entryToDelete.rightChild; res = StorageImpl_WriteDirEntry( This, newRightChildParent, - &newRightChildParentProperty); + &newRightChildParentEntry); if (!res) { return E_FAIL; @@ -2050,12 +2050,12 @@ static HRESULT removeFromTree( /* * Replace the deleted entry with its right child */ - setPropertyLink(&parentProperty, typeOfRelation, propertyToDelete.rightChild); + setEntryLink(&parentEntry, typeOfRelation, entryToDelete.rightChild); res = StorageImpl_WriteDirEntry( This, - parentPropertyId, - &parentProperty); + parentEntryRef, + &parentEntry); if(!res) { return E_FAIL;

1 0

Vincent Povirk : ole32: Rename property variables in StorageImpl_Construct.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 26acdb3efd28074c91e33d8c53d70e3a3a24cfe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26acdb3efd28074c91e33d8c5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 12 14:51:34 2009 -0600 ole32: Rename property variables in StorageImpl_Construct. --- dlls/ole32/storage32.c | 56 ++++++++++++++++++++++++------------------------ 1 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 587a555..0050814 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2128,9 +2128,9 @@ static HRESULT StorageImpl_Construct( BOOL create) { HRESULT hr = S_OK; - DirEntry currentProperty; + DirEntry currentEntry; BOOL readSuccessful; - ULONG currentPropertyIndex; + ULONG currentEntryRef; if ( FAILED( validateSTGM(openFlags) )) return STG_E_INVALIDFLAG; @@ -2183,7 +2183,7 @@ static HRESULT StorageImpl_Construct( /* * Initialize all header variables: * - The big block depot consists of one block and it is at block 0 - * - The properties start at block 1 + * - The directory table starts at block 1 * - There is no small block depot */ memset( This->bigBlockDepotStart, @@ -2202,7 +2202,7 @@ static HRESULT StorageImpl_Construct( StorageImpl_SaveFileHeader(This); /* - * Add one block for the big block depot and one block for the properties + * Add one block for the big block depot and one block for the directory table */ size.u.HighPart = 0; size.u.LowPart = This->bigBlockSize * 3; @@ -2254,51 +2254,51 @@ static HRESULT StorageImpl_Construct( return STG_E_READFAULT; /* - * Write the root property (memory only) + * Write the root storage entry (memory only) */ if (create) { - DirEntry rootProp; + DirEntry rootEntry; /* - * Initialize the property chain + * Initialize the directory table */ - memset(&rootProp, 0, sizeof(rootProp)); - MultiByteToWideChar( CP_ACP, 0, rootEntryName, -1, rootProp.name, - sizeof(rootProp.name)/sizeof(WCHAR) ); - rootProp.sizeOfNameString = (strlenW(rootProp.name)+1) * sizeof(WCHAR); - rootProp.stgType = STGTY_ROOT; - rootProp.leftChild = DIRENTRY_NULL; - rootProp.rightChild = DIRENTRY_NULL; - rootProp.dirRootEntry = DIRENTRY_NULL; - rootProp.startingBlock = BLOCK_END_OF_CHAIN; - rootProp.size.u.HighPart = 0; - rootProp.size.u.LowPart = 0; + memset(&rootEntry, 0, sizeof(rootEntry)); + MultiByteToWideChar( CP_ACP, 0, rootEntryName, -1, rootEntry.name, + sizeof(rootEntry.name)/sizeof(WCHAR) ); + rootEntry.sizeOfNameString = (strlenW(rootEntry.name)+1) * sizeof(WCHAR); + rootEntry.stgType = STGTY_ROOT; + rootEntry.leftChild = DIRENTRY_NULL; + rootEntry.rightChild = DIRENTRY_NULL; + rootEntry.dirRootEntry = DIRENTRY_NULL; + rootEntry.startingBlock = BLOCK_END_OF_CHAIN; + rootEntry.size.u.HighPart = 0; + rootEntry.size.u.LowPart = 0; - StorageImpl_WriteDirEntry(This, 0, &rootProp); + StorageImpl_WriteDirEntry(This, 0, &rootEntry); } /* - * Find the ID of the root in the property sets. + * Find the ID of the root storage. */ - currentPropertyIndex = 0; + currentEntryRef = 0; do { readSuccessful = StorageImpl_ReadDirEntry( This, - currentPropertyIndex, - &currentProperty); + currentEntryRef, + &currentEntry); if (readSuccessful) { - if ( (currentProperty.sizeOfNameString != 0 ) && - (currentProperty.stgType == STGTY_ROOT) ) + if ( (currentEntry.sizeOfNameString != 0 ) && + (currentEntry.stgType == STGTY_ROOT) ) { - This->base.storageDirEntry = currentPropertyIndex; + This->base.storageDirEntry = currentEntryRef; } } - currentPropertyIndex++; + currentEntryRef++; } while (readSuccessful && (This->base.storageDirEntry == DIRENTRY_NULL) );

1 0

Vincent Povirk : ole32: Rename property variables in internal StorageImpl methods.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: d21d690ac5be777f4cefd0571b1e96f1c4402276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d21d690ac5be777f4cefd0571… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 12 14:54:23 2009 -0600 ole32: Rename property variables in internal StorageImpl methods. --- dlls/ole32/storage32.c | 52 ++++++++++++++++++++++++------------------------ 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 0050814..f975ca3 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2988,7 +2988,7 @@ static void StorageImpl_SaveFileHeader( * * This method will read the raw data from a directory entry in the file. * - * buffer must be PROPSET_BLOCK_SIZE bytes long. + * buffer must be RAW_DIRENTRY_SIZE bytes long. */ HRESULT StorageImpl_ReadRawDirEntry(StorageImpl *This, ULONG index, BYTE *buffer) { @@ -3014,7 +3014,7 @@ HRESULT StorageImpl_ReadRawDirEntry(StorageImpl *This, ULONG index, BYTE *buffer * * This method will write the raw data from a directory entry in the file. * - * buffer must be PROPSET_BLOCK_SIZE bytes long. + * buffer must be RAW_DIRENTRY_SIZE bytes long. */ HRESULT StorageImpl_WriteRawDirEntry(StorageImpl *This, ULONG index, const BYTE *buffer) { @@ -3040,7 +3040,7 @@ HRESULT StorageImpl_WriteRawDirEntry(StorageImpl *This, ULONG index, const BYTE * * Update raw directory entry data from the fields in newData. * - * buffer must be PROPSET_BLOCK_SIZE bytes long. + * buffer must be RAW_DIRENTRY_SIZE bytes long. */ void UpdateRawDirEntry(BYTE *buffer, const DirEntry *newData) { @@ -3110,87 +3110,87 @@ void UpdateRawDirEntry(BYTE *buffer, const DirEntry *newData) } /****************************************************************************** - * Storage32Impl_ReadProperty + * Storage32Impl_ReadDirEntry * - * This method will read the specified property from the property chain. + * This method will read the specified directory entry. */ BOOL StorageImpl_ReadDirEntry( StorageImpl* This, ULONG index, DirEntry* buffer) { - BYTE currentProperty[RAW_DIRENTRY_SIZE]; + BYTE currentEntry[RAW_DIRENTRY_SIZE]; HRESULT readRes; - readRes = StorageImpl_ReadRawDirEntry(This, index, currentProperty); + readRes = StorageImpl_ReadRawDirEntry(This, index, currentEntry); if (SUCCEEDED(readRes)) { /* replace the name of root entry (often "Root Entry") by the file name */ - WCHAR *propName = (index == This->base.storageDirEntry) ? - This->filename : (WCHAR *)currentProperty+OFFSET_PS_NAME; + WCHAR *entryName = (index == This->base.storageDirEntry) ? + This->filename : (WCHAR *)currentEntry+OFFSET_PS_NAME; memset(buffer->name, 0, sizeof(buffer->name)); memcpy( buffer->name, - propName, + entryName, DIRENTRY_NAME_BUFFER_LEN ); TRACE("storage name: %s\n", debugstr_w(buffer->name)); - memcpy(&buffer->stgType, currentProperty + OFFSET_PS_STGTYPE, 1); + memcpy(&buffer->stgType, currentEntry + OFFSET_PS_STGTYPE, 1); StorageUtl_ReadWord( - currentProperty, + currentEntry, OFFSET_PS_NAMELENGTH, &buffer->sizeOfNameString); StorageUtl_ReadDWord( - currentProperty, + currentEntry, OFFSET_PS_LEFTCHILD, &buffer->leftChild); StorageUtl_ReadDWord( - currentProperty, + currentEntry, OFFSET_PS_RIGHTCHILD, &buffer->rightChild); StorageUtl_ReadDWord( - currentProperty, + currentEntry, OFFSET_PS_DIRROOT, &buffer->dirRootEntry); StorageUtl_ReadGUID( - currentProperty, + currentEntry, OFFSET_PS_GUID, &buffer->clsid); StorageUtl_ReadDWord( - currentProperty, + currentEntry, OFFSET_PS_CTIMELOW, &buffer->ctime.dwLowDateTime); StorageUtl_ReadDWord( - currentProperty, + currentEntry, OFFSET_PS_CTIMEHIGH, &buffer->ctime.dwHighDateTime); StorageUtl_ReadDWord( - currentProperty, + currentEntry, OFFSET_PS_MTIMELOW, &buffer->mtime.dwLowDateTime); StorageUtl_ReadDWord( - currentProperty, + currentEntry, OFFSET_PS_MTIMEHIGH, &buffer->mtime.dwHighDateTime); StorageUtl_ReadDWord( - currentProperty, + currentEntry, OFFSET_PS_STARTBLOCK, &buffer->startingBlock); StorageUtl_ReadDWord( - currentProperty, + currentEntry, OFFSET_PS_SIZE, &buffer->size.u.LowPart); @@ -3201,19 +3201,19 @@ BOOL StorageImpl_ReadDirEntry( } /********************************************************************* - * Write the specified property into the property chain + * Write the specified directory entry to the file */ BOOL StorageImpl_WriteDirEntry( StorageImpl* This, ULONG index, const DirEntry* buffer) { - BYTE currentProperty[RAW_DIRENTRY_SIZE]; + BYTE currentEntry[RAW_DIRENTRY_SIZE]; HRESULT writeRes; - UpdateRawDirEntry(currentProperty, buffer); + UpdateRawDirEntry(currentEntry, buffer); - writeRes = StorageImpl_WriteRawDirEntry(This, index, currentProperty); + writeRes = StorageImpl_WriteRawDirEntry(This, index, currentEntry); return SUCCEEDED(writeRes) ? TRUE : FALSE; }

1 0

Vincent Povirk : ole32: Rename property variables in block chain conversion functions.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 54781b657f253512f289ca70cc3214b6d71584d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54781b657f253512f289ca70c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 12 14:59:09 2009 -0600 ole32: Rename property variables in block chain conversion functions. --- dlls/ole32/storage32.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index f975ca3..c2460e1 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3298,17 +3298,17 @@ BlockChainStream* Storage32Impl_SmallBlocksToBigBlocks( ULARGE_INTEGER size, offset; ULONG cbRead, cbWritten; ULARGE_INTEGER cbTotalRead; - ULONG propertyIndex; + ULONG streamEntryRef; HRESULT resWrite = S_OK; HRESULT resRead; - DirEntry chainProperty; + DirEntry streamEntry; BYTE *buffer; BlockChainStream *bbTempChain = NULL; BlockChainStream *bigBlockChain = NULL; /* * Create a temporary big block chain that doesn't have - * an associated property. This temporary chain will be + * an associated directory entry. This temporary chain will be * used to copy data from small blocks to big blocks. */ bbTempChain = BlockChainStream_Construct(This, @@ -3372,29 +3372,29 @@ BlockChainStream* Storage32Impl_SmallBlocksToBigBlocks( /* * Destroy the small block chain. */ - propertyIndex = (*ppsbChain)->ownerDirEntry; + streamEntryRef = (*ppsbChain)->ownerDirEntry; SmallBlockChainStream_SetSize(*ppsbChain, size); SmallBlockChainStream_Destroy(*ppsbChain); *ppsbChain = 0; /* - * Change the property information. This chain is now a big block chain + * Change the directory entry. This chain is now a big block chain * and it doesn't reside in the small blocks chain anymore. */ - StorageImpl_ReadDirEntry(This, propertyIndex, &chainProperty); + StorageImpl_ReadDirEntry(This, streamEntryRef, &streamEntry); - chainProperty.startingBlock = bbHeadOfChain; + streamEntry.startingBlock = bbHeadOfChain; - StorageImpl_WriteDirEntry(This, propertyIndex, &chainProperty); + StorageImpl_WriteDirEntry(This, streamEntryRef, &streamEntry); /* - * Destroy the temporary propertyless big block chain. - * Create a new big block chain associated with this property. + * Destroy the temporary entryless big block chain. + * Create a new big block chain associated with this entry. */ BlockChainStream_Destroy(bbTempChain); bigBlockChain = BlockChainStream_Construct(This, NULL, - propertyIndex); + streamEntryRef); return bigBlockChain; } @@ -3410,9 +3410,9 @@ SmallBlockChainStream* Storage32Impl_BigBlocksToSmallBlocks( BlockChainStream** ppbbChain) { ULARGE_INTEGER size, offset, cbTotalRead; - ULONG cbRead, cbWritten, propertyIndex, sbHeadOfChain = BLOCK_END_OF_CHAIN; + ULONG cbRead, cbWritten, streamEntryRef, sbHeadOfChain = BLOCK_END_OF_CHAIN; HRESULT resWrite = S_OK, resRead; - DirEntry chainProperty; + DirEntry streamEntry; BYTE* buffer; SmallBlockChainStream* sbTempChain; @@ -3467,17 +3467,17 @@ SmallBlockChainStream* Storage32Impl_BigBlocksToSmallBlocks( } /* destroy the original big block chain */ - propertyIndex = (*ppbbChain)->ownerDirEntry; + streamEntryRef = (*ppbbChain)->ownerDirEntry; BlockChainStream_SetSize(*ppbbChain, size); BlockChainStream_Destroy(*ppbbChain); *ppbbChain = NULL; - StorageImpl_ReadDirEntry(This, propertyIndex, &chainProperty); - chainProperty.startingBlock = sbHeadOfChain; - StorageImpl_WriteDirEntry(This, propertyIndex, &chainProperty); + StorageImpl_ReadDirEntry(This, streamEntryRef, &streamEntry); + streamEntry.startingBlock = sbHeadOfChain; + StorageImpl_WriteDirEntry(This, streamEntryRef, &streamEntry); SmallBlockChainStream_Destroy(sbTempChain); - return SmallBlockChainStream_Construct(This, NULL, propertyIndex); + return SmallBlockChainStream_Construct(This, NULL, streamEntryRef); } static void StorageInternalImpl_Destroy( StorageBaseImpl *iface)

1 0