October 2009 - Wine-commits

Vincent Povirk : ole32: Write the new data in getFreeProperty and rename the function.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 37f3f3d92a8854104de0ef6774bc54f4a1400354 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37f3f3d92a8854104de0ef677… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 28 13:42:42 2009 -0500 ole32: Write the new data in getFreeProperty and rename the function. This is to avoid calling WriteProperty with an index to a directory entry that has not yet been reserved in the file. We reserve the entry by writing the new data to it. --- dlls/ole32/storage32.c | 73 +++++++++++++++++++---------------------------- 1 files changed, 30 insertions(+), 43 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 3e00cf6..89ae657 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -180,8 +180,10 @@ static HRESULT adjustPropertyChain( * Declaration of the functions used to manipulate StgProperty */ -static ULONG getFreeProperty( - StorageImpl *storage); +static HRESULT createDirEntry( + StorageImpl *storage, + const StgProperty *newData, + ULONG *index); static void updatePropertyChain( StorageImpl *storage, @@ -757,17 +759,9 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement( */ /* - * Obtain a free property in the property chain - */ - renamedPropertyIndex = getFreeProperty(This->ancestorStorage); - - /* - * Save the new property into the new property spot + * Save the new property into a new property spot */ - StorageImpl_WriteProperty( - This->ancestorStorage, - renamedPropertyIndex, - &renamedProperty); + createDirEntry(This->ancestorStorage, &renamedProperty, &renamedPropertyIndex); /* * Find a spot in the property chain for our newly created property. @@ -945,17 +939,9 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( /* newStreamProperty.propertyUniqueID */ /* - * Get a free property or create a new one + * Save the new property into a new property spot */ - newPropertyIndex = getFreeProperty(This->ancestorStorage); - - /* - * Save the new property into the new property spot - */ - StorageImpl_WriteProperty( - This->ancestorStorage, - newPropertyIndex, - &newStreamProperty); + createDirEntry(This->ancestorStorage, &newStreamProperty, &newPropertyIndex); /* * Find a spot in the property chain for our newly created property. @@ -1136,17 +1122,9 @@ static HRESULT WINAPI StorageImpl_CreateStorage( /* newStorageProperty.propertyUniqueID */ /* - * Obtain a free property in the property chain + * Save the new property into a new property spot */ - newPropertyIndex = getFreeProperty(This->base.ancestorStorage); - - /* - * Save the new property into the new property spot - */ - StorageImpl_WriteProperty( - This->base.ancestorStorage, - newPropertyIndex, - &newProperty); + createDirEntry(This->base.ancestorStorage, &newProperty, &newPropertyIndex); /* * Find a spot in the property chain for our newly created property. @@ -1175,24 +1153,26 @@ static HRESULT WINAPI StorageImpl_CreateStorage( * * Internal Method * - * Get a free property or create a new one. + * Reserve a directory entry in the file and initialize it. */ -static ULONG getFreeProperty( - StorageImpl *storage) +static HRESULT createDirEntry( + StorageImpl *storage, + const StgProperty *newData, + ULONG *index) { ULONG currentPropertyIndex = 0; ULONG newPropertyIndex = PROPERTY_NULL; - HRESULT readRes = S_OK; + HRESULT hr = S_OK; BYTE currentData[PROPSET_BLOCK_SIZE]; WORD sizeOfNameString; do { - readRes = StorageImpl_ReadRawDirEntry(storage->base.ancestorStorage, - currentPropertyIndex, - currentData); + hr = StorageImpl_ReadRawDirEntry(storage->base.ancestorStorage, + currentPropertyIndex, + currentData); - if (SUCCEEDED(readRes)) + if (SUCCEEDED(hr)) { StorageUtl_ReadWord( currentData, @@ -1221,7 +1201,7 @@ static ULONG getFreeProperty( /* * grow the property chain */ - if (!SUCCEEDED(readRes)) + if (FAILED(hr)) { BYTE emptyData[PROPSET_BLOCK_SIZE]; ULARGE_INTEGER newSize; @@ -1258,7 +1238,7 @@ static ULONG getFreeProperty( lastProperty = storage->bigBlockSize / PROPSET_BLOCK_SIZE * blockCount; for( - propertyIndex = newPropertyIndex; + propertyIndex = newPropertyIndex + 1; propertyIndex < lastProperty; propertyIndex++) { @@ -1269,7 +1249,14 @@ static ULONG getFreeProperty( } } - return newPropertyIndex; + UpdateRawDirEntry(currentData, newData); + + hr = StorageImpl_WriteRawDirEntry(storage, newPropertyIndex, currentData); + + if (SUCCEEDED(hr)) + *index = newPropertyIndex; + + return hr; } /****************************************************************************

1 0

Dmitry Timoshkov : msi: Limit the progress to its maximal value, use MulDiv for better results.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: df8780356bdde662dc743ea51753fe8bb13abeab URL: http://source.winehq.org/git/wine.git/?a=commit;h=df8780356bdde662dc743ea51… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Oct 29 20:46:34 2009 +0800 msi: Limit the progress to its maximal value, use MulDiv for better results. --- dlls/msi/dialog.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 3f1b571..88cdfa9 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -606,6 +606,8 @@ void msi_dialog_handle_event( msi_dialog* dialog, LPCWSTR control, func = MSI_RecordGetInteger( rec , 1 ); val = MSI_RecordGetInteger( rec , 2 ); + TRACE("progress: func %u, val %u\n", func, val); + switch (func) { case 0: /* init */ @@ -618,10 +620,12 @@ void msi_dialog_handle_event( msi_dialog* dialog, LPCWSTR control, break; case 2: /* move */ ctrl->progress_current += val; - SendMessageW(ctrl->hwnd, PBM_SETPOS, 100*(ctrl->progress_current/ctrl->progress_max), 0); + if (ctrl->progress_current > ctrl->progress_max) + ctrl->progress_current = ctrl->progress_max; + SendMessageW(ctrl->hwnd, PBM_SETPOS, MulDiv(100, ctrl->progress_current, ctrl->progress_max), 0); break; default: - ERR("Unknown progress message %d\n", func); + FIXME("Unknown progress message %u\n", func); break; } }

1 0

Dmitry Timoshkov : msi: Add support for msidbControlAttributesProgress95.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 0513f3c4e61f8f4bb74765c533297589f6231c49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0513f3c4e61f8f4bb74765c53… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Oct 29 20:46:47 2009 +0800 msi: Add support for msidbControlAttributesProgress95. --- dlls/msi/dialog.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 88cdfa9..59ef8c3 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -685,6 +685,10 @@ static msi_control *msi_dialog_add_control( msi_dialog *dialog, name = MSI_RecordGetString( rec, 2 ); attributes = MSI_RecordGetInteger( rec, 8 ); text = MSI_RecordGetString( rec, 10 ); + + TRACE("%s, %s, %08x, %s, %08x\n", debugstr_w(szCls), debugstr_w(name), + attributes, debugstr_w(text), style); + if( attributes & msidbControlAttributesVisible ) style |= WS_VISIBLE; if( ~attributes & msidbControlAttributesEnabled ) @@ -1575,8 +1579,14 @@ end: static UINT msi_dialog_progress_bar( msi_dialog *dialog, MSIRECORD *rec ) { msi_control *control; + DWORD attributes, style; + + style = WS_VISIBLE; + attributes = MSI_RecordGetInteger( rec, 8 ); + if( !(attributes & msidbControlAttributesProgress95) ) + style |= PBS_SMOOTH; - control = msi_dialog_add_control( dialog, rec, PROGRESS_CLASSW, WS_VISIBLE ); + control = msi_dialog_add_control( dialog, rec, PROGRESS_CLASSW, style ); if( !control ) return ERROR_FUNCTION_FAILED;

1 0

Damjan Jovanovic : wia: Add rudimentary wia headers.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 290c5de8d97ee7b0dbcc7cefc4380ac4b5a16cf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=290c5de8d97ee7b0dbcc7cefc… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Oct 29 15:15:09 2009 +0200 wia: Add rudimentary wia headers. --- .gitignore | 2 + include/Makefile.in | 3 + include/wia.h | 24 ++++++++++ include/wia_lh.idl | 127 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/wia_xp.idl | 127 +++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 283 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 2ac3a69..50aa0b3 100644 --- a/.gitignore +++ b/.gitignore @@ -194,6 +194,8 @@ include/urlhist.h include/urlmon.h include/vmr9.h include/wbemcli.h +include/wia_lh.h +include/wia_xp.h include/wincodec.h include/wine/itss.h include/wine/svcctl.h diff --git a/include/Makefile.in b/include/Makefile.in index eb2cabe..83e4358 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -81,6 +81,8 @@ PUBLIC_IDL_H_SRCS = \ urlmon.idl \ vmr9.idl \ wbemcli.idl \ + wia_lh.idl \ + wia_xp.idl \ wincodec.idl \ wine/itss.idl \ wine/svcctl.idl \ @@ -455,6 +457,7 @@ SRCDIR_INCLUDES = \ vfwmsgs.h \ vmrender.idl \ wfext.h \ + wia.h \ winbase.h \ wincon.h \ wincred.h \ diff --git a/include/wia.h b/include/wia.h new file mode 100644 index 0000000..300f28a --- /dev/null +++ b/include/wia.h @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2009 Damjan Jovanovic + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +#if (_WIN32_WINNT >= 0x0600) +#include <wia_lh.h> +#elif (_WIN32_WINNT >= 0x0501) +#include <wia_xp.h> +#endif diff --git a/include/wia_lh.idl b/include/wia_lh.idl new file mode 100644 index 0000000..5024787 --- /dev/null +++ b/include/wia_lh.idl @@ -0,0 +1,127 @@ +/* + * Copyright 2009 Damjan Jovanovic + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "wtypes.idl"; +import "objidl.idl"; + +interface IEnumWIA_DEV_INFO; +interface IWiaItem; +interface IWiaEventCallback; + +cpp_quote("DEFINE_GUID(CLSID_WiaDevMgr, 0xa1f4e726,0x8cf1,0x11d1,0xbf,0x92,0x00,0x60,0x08,0x1e,0xd8,0x11);") + +[ + object, + uuid(5eb2502a-8cf1-11d1-bf92-0060081ed811) +] +interface IWiaDevMgr : IUnknown +{ + HRESULT EnumDeviceInfo( + [in] LONG lFlag, + [retval, out] IEnumWIA_DEV_INFO **ppIEnum); + + HRESULT CreateDevice( + [in] BSTR bstrDeviceID, + [out] IWiaItem **ppWiaItemRoot); + + HRESULT SelectDeviceDlg( + [in] HWND hwndParent, + [in] LONG lDeviceType, + [in] LONG lFlags, + [in, out] BSTR *pbstrDeviceID, + [retval, out] IWiaItem **ppItemRoot); + + HRESULT SelectDeviceDlgID( + [in] HWND hwndParent, + [in] LONG lDeviceType, + [in] LONG lFlags, + [retval, out] BSTR *pbstrDeviceID); + + HRESULT GetImageDlg( + [in] HWND hwndParent, + [in] LONG lDeviceType, + [in] LONG lFlags, + [in] LONG lIntent, + [in] IWiaItem *pItemRoot, + [in] BSTR bstrFilename, + [in, out] GUID *pguidFormat); + + HRESULT RegisterEventCallbackProgram( + [in] LONG lFlags, + [in] BSTR bstrDeviceID, + [in] const GUID *pEventGUID, + [in] BSTR bstrCommandline, + [in] BSTR bstrName, + [in] BSTR bstrDescription, + [in] BSTR bstrIcon); + + HRESULT RegisterEventCallbackInterface( + [in] LONG lFlags, + [in] BSTR bstrDeviceID, + [in] const GUID *pEventGUID, + [unique, in] IWiaEventCallback *pIWiaEventCallback, + [out] IUnknown **pEventObject); + + HRESULT RegisterEventCallbackCLSID( + [in] LONG lFlags, + [in] BSTR bstrDeviceID, + [in] const GUID *pEventGUID, + [unique, in] const GUID *pClsID, + [in] BSTR bstrName, + [in] BSTR bstrDescription, + [in] BSTR bstrIcon); + + HRESULT AddDeviceDlg( + [in] HWND hwndParent, + [in] LONG lFlags); +} + +[ + object, + uuid(5e38b83c-8cf1-11d1-bf92-0060081ed811) +] +interface IEnumWIA_DEV_INFO : IUnknown +{ + /* fill in */ +} + +[ + object, + uuid(4db1ad10-3391-11d2-9a33-00c04fa36145) +] +interface IWiaItem : IUnknown +{ + /* FIXME: fill in */ +} + +[ + object, + uuid(ae6287b0-0084-11d2-973b-00a0c9068f2e) +] +interface IWiaEventCallback : IUnknown +{ + HRESULT ImageEventCallback( + [in] const GUID *pEventGUID, + [in] BSTR bstrEventDescription, + [in] BSTR bstrDeviceID, + [in] BSTR bstrDeviceDescription, + [in] DWORD dwDeviceType, + [in] BSTR bstrFullItemName, + [in,out] ULONG *pulEventType, + [in] ULONG ulReserved); +} diff --git a/include/wia_xp.idl b/include/wia_xp.idl new file mode 100644 index 0000000..5024787 --- /dev/null +++ b/include/wia_xp.idl @@ -0,0 +1,127 @@ +/* + * Copyright 2009 Damjan Jovanovic + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "wtypes.idl"; +import "objidl.idl"; + +interface IEnumWIA_DEV_INFO; +interface IWiaItem; +interface IWiaEventCallback; + +cpp_quote("DEFINE_GUID(CLSID_WiaDevMgr, 0xa1f4e726,0x8cf1,0x11d1,0xbf,0x92,0x00,0x60,0x08,0x1e,0xd8,0x11);") + +[ + object, + uuid(5eb2502a-8cf1-11d1-bf92-0060081ed811) +] +interface IWiaDevMgr : IUnknown +{ + HRESULT EnumDeviceInfo( + [in] LONG lFlag, + [retval, out] IEnumWIA_DEV_INFO **ppIEnum); + + HRESULT CreateDevice( + [in] BSTR bstrDeviceID, + [out] IWiaItem **ppWiaItemRoot); + + HRESULT SelectDeviceDlg( + [in] HWND hwndParent, + [in] LONG lDeviceType, + [in] LONG lFlags, + [in, out] BSTR *pbstrDeviceID, + [retval, out] IWiaItem **ppItemRoot); + + HRESULT SelectDeviceDlgID( + [in] HWND hwndParent, + [in] LONG lDeviceType, + [in] LONG lFlags, + [retval, out] BSTR *pbstrDeviceID); + + HRESULT GetImageDlg( + [in] HWND hwndParent, + [in] LONG lDeviceType, + [in] LONG lFlags, + [in] LONG lIntent, + [in] IWiaItem *pItemRoot, + [in] BSTR bstrFilename, + [in, out] GUID *pguidFormat); + + HRESULT RegisterEventCallbackProgram( + [in] LONG lFlags, + [in] BSTR bstrDeviceID, + [in] const GUID *pEventGUID, + [in] BSTR bstrCommandline, + [in] BSTR bstrName, + [in] BSTR bstrDescription, + [in] BSTR bstrIcon); + + HRESULT RegisterEventCallbackInterface( + [in] LONG lFlags, + [in] BSTR bstrDeviceID, + [in] const GUID *pEventGUID, + [unique, in] IWiaEventCallback *pIWiaEventCallback, + [out] IUnknown **pEventObject); + + HRESULT RegisterEventCallbackCLSID( + [in] LONG lFlags, + [in] BSTR bstrDeviceID, + [in] const GUID *pEventGUID, + [unique, in] const GUID *pClsID, + [in] BSTR bstrName, + [in] BSTR bstrDescription, + [in] BSTR bstrIcon); + + HRESULT AddDeviceDlg( + [in] HWND hwndParent, + [in] LONG lFlags); +} + +[ + object, + uuid(5e38b83c-8cf1-11d1-bf92-0060081ed811) +] +interface IEnumWIA_DEV_INFO : IUnknown +{ + /* fill in */ +} + +[ + object, + uuid(4db1ad10-3391-11d2-9a33-00c04fa36145) +] +interface IWiaItem : IUnknown +{ + /* FIXME: fill in */ +} + +[ + object, + uuid(ae6287b0-0084-11d2-973b-00a0c9068f2e) +] +interface IWiaEventCallback : IUnknown +{ + HRESULT ImageEventCallback( + [in] const GUID *pEventGUID, + [in] BSTR bstrEventDescription, + [in] BSTR bstrDeviceID, + [in] BSTR bstrDeviceDescription, + [in] DWORD dwDeviceType, + [in] BSTR bstrFullItemName, + [in,out] ULONG *pulEventType, + [in] ULONG ulReserved); +}

1 0

Vincent Povirk : ole32: Reduce duplicated code in adjustPropertyChain.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: a7e69339dcda3d3360f3b03bac5272f9c1c0176d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7e69339dcda3d3360f3b03ba… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Oct 27 16:48:39 2009 -0500 ole32: Reduce duplicated code in adjustPropertyChain. Most of the work is the same regardless of relation type, so bring those parts out of the relation type test. --- dlls/ole32/storage32.c | 106 +++++++++-------------------------------------- 1 files changed, 21 insertions(+), 85 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index fe74fb9..470dc83 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2135,107 +2135,43 @@ static HRESULT adjustPropertyChain( HRESULT hr = S_OK; BOOL res = TRUE; - if (typeOfRelation == PROPERTY_RELATION_PREVIOUS) + if (propertyToDelete.leftChild != PROPERTY_NULL) { - if (propertyToDelete.leftChild != PROPERTY_NULL) - { - /* - * Set the parent previous to the property to delete previous - */ - newLinkProperty = propertyToDelete.leftChild; + /* + * Replace the deleted entry with its left child + */ + newLinkProperty = propertyToDelete.leftChild; - if (propertyToDelete.rightChild != PROPERTY_NULL) - { - /* - * We also need to find a storage for the other link, setup variables - * to do this at the end... - */ - needToFindAPlaceholder = TRUE; - storeNode = propertyToDelete.leftChild; - toStoreNode = propertyToDelete.rightChild; - relationType = PROPERTY_RELATION_NEXT; - } - } - else if (propertyToDelete.rightChild != PROPERTY_NULL) + if (propertyToDelete.rightChild != PROPERTY_NULL) { /* - * Set the parent previous to the property to delete next + * We also need to find a place for the other link, setup variables + * to do this at the end... */ - newLinkProperty = propertyToDelete.rightChild; + needToFindAPlaceholder = TRUE; + storeNode = propertyToDelete.leftChild; + toStoreNode = propertyToDelete.rightChild; + relationType = PROPERTY_RELATION_NEXT; } - + } + else if (propertyToDelete.rightChild != PROPERTY_NULL) + { /* - * Link it for real... + * Replace the deleted entry with its right child */ - parentProperty.leftChild = newLinkProperty; + newLinkProperty = propertyToDelete.rightChild; + } + if (typeOfRelation == PROPERTY_RELATION_PREVIOUS) + { + parentProperty.leftChild = newLinkProperty; } else if (typeOfRelation == PROPERTY_RELATION_NEXT) { - if (propertyToDelete.leftChild != PROPERTY_NULL) - { - /* - * Set the parent next to the property to delete next previous - */ - newLinkProperty = propertyToDelete.leftChild; - - if (propertyToDelete.rightChild != PROPERTY_NULL) - { - /* - * We also need to find a storage for the other link, setup variables - * to do this at the end... - */ - needToFindAPlaceholder = TRUE; - storeNode = propertyToDelete.leftChild; - toStoreNode = propertyToDelete.rightChild; - relationType = PROPERTY_RELATION_NEXT; - } - } - else if (propertyToDelete.rightChild != PROPERTY_NULL) - { - /* - * Set the parent next to the property to delete next - */ - newLinkProperty = propertyToDelete.rightChild; - } - - /* - * Link it for real... - */ parentProperty.rightChild = newLinkProperty; } else /* (typeOfRelation == PROPERTY_RELATION_DIR) */ { - if (propertyToDelete.leftChild != PROPERTY_NULL) - { - /* - * Set the parent dir to the property to delete previous - */ - newLinkProperty = propertyToDelete.leftChild; - - if (propertyToDelete.rightChild != PROPERTY_NULL) - { - /* - * We also need to find a storage for the other link, setup variables - * to do this at the end... - */ - needToFindAPlaceholder = TRUE; - storeNode = propertyToDelete.leftChild; - toStoreNode = propertyToDelete.rightChild; - relationType = PROPERTY_RELATION_NEXT; - } - } - else if (propertyToDelete.rightChild != PROPERTY_NULL) - { - /* - * Set the parent dir to the property to delete next - */ - newLinkProperty = propertyToDelete.rightChild; - } - - /* - * Link it for real... - */ parentProperty.dirProperty = newLinkProperty; }

1 0

Vincent Povirk : ole32: Further simplify adjustPropertyChain and fold in findPlaceholder.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 5d550cdc45e1c0989785a1a3ced0ae039a16b0f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d550cdc45e1c0989785a1a3c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Oct 27 17:34:49 2009 -0500 ole32: Further simplify adjustPropertyChain and fold in findPlaceholder. The logic is unchanged from the original version. --- dlls/ole32/storage32.c | 204 +++++++++++++++--------------------------------- 1 files changed, 64 insertions(+), 140 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 470dc83..64039cc 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -169,12 +169,6 @@ static HRESULT deleteStreamProperty( ULONG foundPropertyIndexToDelete, StgProperty propertyToDelete); -static HRESULT findPlaceholder( - StorageImpl *storage, - ULONG propertyIndexToStore, - ULONG storagePropertyIndex, - INT typeOfRelation); - static HRESULT adjustPropertyChain( StorageImpl *This, StgProperty propertyToDelete, @@ -2025,92 +2019,22 @@ static HRESULT deleteStreamProperty( return S_OK; } -/********************************************************************* - * - * Internal Method - * - * Finds a placeholder for the StgProperty within the Storage - * - */ -static HRESULT findPlaceholder( - StorageImpl *storage, - ULONG propertyIndexToStore, - ULONG storePropertyIndex, - INT typeOfRelation) +static void setPropertyLink(StgProperty *property, ULONG relation, ULONG new_target) { - StgProperty storeProperty; - BOOL res = TRUE; - - /* - * Read the storage property - */ - res = StorageImpl_ReadProperty( - storage->base.ancestorStorage, - storePropertyIndex, - &storeProperty); - - if(! res) - { - return E_FAIL; - } - - if (typeOfRelation == PROPERTY_RELATION_PREVIOUS) - { - if (storeProperty.leftChild != PROPERTY_NULL) - { - return findPlaceholder( - storage, - propertyIndexToStore, - storeProperty.leftChild, - typeOfRelation); - } - else - { - storeProperty.leftChild = propertyIndexToStore; - } - } - else if (typeOfRelation == PROPERTY_RELATION_NEXT) - { - if (storeProperty.rightChild != PROPERTY_NULL) - { - return findPlaceholder( - storage, - propertyIndexToStore, - storeProperty.rightChild, - typeOfRelation); - } - else - { - storeProperty.rightChild = propertyIndexToStore; - } - } - else if (typeOfRelation == PROPERTY_RELATION_DIR) - { - if (storeProperty.dirProperty != PROPERTY_NULL) - { - return findPlaceholder( - storage, - propertyIndexToStore, - storeProperty.dirProperty, - typeOfRelation); - } - else - { - storeProperty.dirProperty = propertyIndexToStore; - } - } - - res = StorageImpl_WriteProperty( - storage->base.ancestorStorage, - storePropertyIndex, - &storeProperty); - - if(!res) + switch (relation) { - return E_FAIL; + case PROPERTY_RELATION_PREVIOUS: + property->leftChild = new_target; + break; + case PROPERTY_RELATION_NEXT: + property->rightChild = new_target; + break; + case PROPERTY_RELATION_DIR: + property->dirProperty = new_target; + break; + default: + assert(0); } - - return S_OK; } /************************************************************************* @@ -2127,11 +2051,6 @@ static HRESULT adjustPropertyChain( ULONG parentPropertyId, INT typeOfRelation) { - ULONG newLinkProperty = PROPERTY_NULL; - BOOL needToFindAPlaceholder = FALSE; - ULONG storeNode = PROPERTY_NULL; - ULONG toStoreNode = PROPERTY_NULL; - INT relationType = 0; HRESULT hr = S_OK; BOOL res = TRUE; @@ -2140,64 +2059,69 @@ static HRESULT adjustPropertyChain( /* * Replace the deleted entry with its left child */ - newLinkProperty = propertyToDelete.leftChild; + setPropertyLink(&parentProperty, typeOfRelation, propertyToDelete.leftChild); + + res = StorageImpl_WriteProperty( + This->base.ancestorStorage, + parentPropertyId, + &parentProperty); + if(!res) + { + return E_FAIL; + } if (propertyToDelete.rightChild != PROPERTY_NULL) { /* - * We also need to find a place for the other link, setup variables - * to do this at the end... + * 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. */ - needToFindAPlaceholder = TRUE; - storeNode = propertyToDelete.leftChild; - toStoreNode = propertyToDelete.rightChild; - relationType = PROPERTY_RELATION_NEXT; + ULONG newRightChildParent = propertyToDelete.leftChild; + StgProperty newRightChildParentProperty; + + do + { + res = StorageImpl_ReadProperty( + This->base.ancestorStorage, + newRightChildParent, + &newRightChildParentProperty); + if (!res) + { + return E_FAIL; + } + + if (newRightChildParentProperty.rightChild != PROPERTY_NULL) + newRightChildParent = newRightChildParentProperty.rightChild; + } while (newRightChildParentProperty.rightChild != PROPERTY_NULL); + + newRightChildParentProperty.rightChild = propertyToDelete.rightChild; + + res = StorageImpl_WriteProperty( + This->base.ancestorStorage, + newRightChildParent, + &newRightChildParentProperty); + if (!res) + { + return E_FAIL; + } } } - else if (propertyToDelete.rightChild != PROPERTY_NULL) + else { /* * Replace the deleted entry with its right child */ - newLinkProperty = propertyToDelete.rightChild; - } + setPropertyLink(&parentProperty, typeOfRelation, propertyToDelete.rightChild); - if (typeOfRelation == PROPERTY_RELATION_PREVIOUS) - { - parentProperty.leftChild = newLinkProperty; - } - else if (typeOfRelation == PROPERTY_RELATION_NEXT) - { - parentProperty.rightChild = newLinkProperty; - } - else /* (typeOfRelation == PROPERTY_RELATION_DIR) */ - { - parentProperty.dirProperty = newLinkProperty; - } - - /* - * Write back the parent property - */ - res = StorageImpl_WriteProperty( - This->base.ancestorStorage, - parentPropertyId, - &parentProperty); - if(! res) - { - return E_FAIL; - } - - /* - * If a placeholder is required for the other link, then, find one and - * get out of here... - */ - if (needToFindAPlaceholder) - { - hr = findPlaceholder( - This, - toStoreNode, - storeNode, - relationType); + res = StorageImpl_WriteProperty( + This->base.ancestorStorage, + parentPropertyId, + &parentProperty); + if(!res) + { + return E_FAIL; + } } return hr;

1 0

Vincent Povirk : ole32: Move the low-level functionality of ReadProperty to a new function.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 56622de95182863cf374eb850afaef6ce08ca39d URL: http://source.winehq.org/git/wine.git/?a=commit;h=56622de95182863cf374eb850… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 28 11:37:30 2009 -0500 ole32: Move the low-level functionality of ReadProperty to a new function. --- dlls/ole32/storage32.c | 38 +++++++++++++++++++++++++++----------- dlls/ole32/storage32.h | 5 +++++ 2 files changed, 32 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 64039cc..4ff9f89 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3046,6 +3046,32 @@ static void StorageImpl_SaveFileHeader( } /****************************************************************************** + * StorageImpl_ReadRawDirEntry + * + * This method will read the raw data from a directory entry in the file. + * + * buffer must be PROPSET_BLOCK_SIZE bytes long. + */ +HRESULT StorageImpl_ReadRawDirEntry(StorageImpl *This, ULONG index, BYTE *buffer) +{ + ULARGE_INTEGER offset; + HRESULT hr; + ULONG bytesRead; + + offset.u.HighPart = 0; + offset.u.LowPart = index * PROPSET_BLOCK_SIZE; + + hr = BlockChainStream_ReadAt( + This->rootBlockChain, + offset, + PROPSET_BLOCK_SIZE, + buffer, + &bytesRead); + + return hr; +} + +/****************************************************************************** * Storage32Impl_ReadProperty * * This method will read the specified property from the property chain. @@ -3056,19 +3082,9 @@ BOOL StorageImpl_ReadProperty( StgProperty* buffer) { BYTE currentProperty[PROPSET_BLOCK_SIZE]; - ULARGE_INTEGER offsetInPropSet; HRESULT readRes; - ULONG bytesRead; - offsetInPropSet.u.HighPart = 0; - offsetInPropSet.u.LowPart = index * PROPSET_BLOCK_SIZE; - - readRes = BlockChainStream_ReadAt( - This->rootBlockChain, - offsetInPropSet, - PROPSET_BLOCK_SIZE, - currentProperty, - &bytesRead); + readRes = StorageImpl_ReadRawDirEntry(This, index, currentProperty); if (SUCCEEDED(readRes)) { diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 8dd44fa..281948e 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -290,6 +290,11 @@ struct StorageImpl BigBlockFile* bigBlockFile; }; +HRESULT StorageImpl_ReadRawDirEntry( + StorageImpl *This, + ULONG index, + BYTE *buffer); + BOOL StorageImpl_ReadProperty( StorageImpl* This, ULONG index,

1 0

Hans Leidekker : winhttp: Accept empty headers parameter in WinHttpSendRequest.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 39b1dbed7a9f60f9a85be08d153926173019f7ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=39b1dbed7a9f60f9a85be08d1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 29 11:12:22 2009 +0100 winhttp: Accept empty headers parameter in WinHttpSendRequest. --- dlls/winhttp/request.c | 1 + dlls/winhttp/tests/winhttp.c | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index ea0ecda..d504ea5 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -411,6 +411,7 @@ BOOL add_request_headers( request_t *request, LPCWSTR headers, DWORD len, DWORD header_t *header; if (len == ~0u) len = strlenW( headers ); + if (!len) return TRUE; if (!(buffer = heap_alloc( (len + 1) * sizeof(WCHAR) ))) return FALSE; strcpyW( buffer, headers ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 24bdbb8..2f842f2 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -221,6 +221,30 @@ static void test_OpenRequest (void) } +static void test_empty_headers_param(void) +{ + static const WCHAR winehq[] = {'w','i','n','e','h','q','.','o','r','g',0}; + static const WCHAR empty[] = {0}; + HANDLE ses, con, req; + BOOL ret; + + ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); + ok(ses != NULL, "failed to open session %u\n", GetLastError()); + + con = WinHttpConnect(ses, winehq, 80, 0); + ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + + req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); + ok(req != NULL, "failed to open a request %u\n", GetLastError()); + + ret = WinHttpSendRequest(req, empty, 0, NULL, 0, 0, 0); + ok(ret, "failed to send request %u\n", GetLastError()); + + WinHttpCloseHandle(req); + WinHttpCloseHandle(con); + WinHttpCloseHandle(ses); +} + static void test_SendRequest (void) { HINTERNET session, request, connection; @@ -978,4 +1002,5 @@ START_TEST (winhttp) test_request_parameter_defaults(); test_QueryOption(); test_set_default_proxy_config(); + test_empty_headers_param(); }

1 0

Hans Leidekker : winhttp: Implement WinHttpQueryHeaders( WINHTTP_QUERY_VERSION).
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 846cc2b157cba07d33416276fd1f4c2faa301374 URL: http://source.winehq.org/git/wine.git/?a=commit;h=846cc2b157cba07d33416276f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 29 11:12:45 2009 +0100 winhttp: Implement WinHttpQueryHeaders(WINHTTP_QUERY_VERSION). --- dlls/winhttp/request.c | 18 ++++++++++++++++++ dlls/winhttp/tests/winhttp.c | 16 +++++++++++++++- 2 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index d504ea5..4d5be84 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -652,6 +652,24 @@ static BOOL query_headers( request_t *request, DWORD level, LPCWSTR name, LPVOID if (request_only) heap_free( headers ); return ret; } + case WINHTTP_QUERY_VERSION: + { + DWORD len = (strlenW( request->version ) + 1) * sizeof(WCHAR); + if (len > *buflen) + { + set_last_error( ERROR_INSUFFICIENT_BUFFER ); + *buflen = len; + return FALSE; + } + else if (buffer) + { + strcpyW( buffer, request->version ); + TRACE("returning string: %s\n", debugstr_w(buffer)); + ret = TRUE; + } + *buflen = len - sizeof(WCHAR); + return ret; + } default: { if (attr >= sizeof(attribute_table)/sizeof(attribute_table[0]) || !attribute_table[attr]) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 2f842f2..fe9bb05 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -816,7 +816,8 @@ static void test_request_parameter_defaults(void) static const WCHAR codeweavers[] = {'c','o','d','e','w','e','a','v','e','r','s','.','c','o','m',0}; HANDLE ses, con, req; - DWORD size, status; + DWORD size, status, error; + WCHAR *version; BOOL ret; ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); @@ -850,6 +851,19 @@ static void test_request_parameter_defaults(void) ret = WinHttpReceiveResponse(req, NULL); ok(ret, "failed to receive response %u\n", GetLastError()); + size = 0; + SetLastError(0xdeadbeef); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_VERSION, NULL, NULL, &size, NULL); + error = GetLastError(); + ok(!ret, "succeeded unexpectedly\n"); + ok(error == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", error); + + version = HeapAlloc(GetProcessHeap(), 0, size); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_VERSION, NULL, version, &size, NULL); + ok(ret, "failed unexpectedly %u\n", GetLastError()); + ok(lstrlenW(version) == size / sizeof(WCHAR), "unexpected size %u\n", size); + HeapFree(GetProcessHeap(), 0, version); + size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed unexpectedly %u\n", GetLastError());

1 0

Huw Davies : include: Add row.idl.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 4f6c58dcd8b7981312ed6e6df3db785b366df153 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f6c58dcd8b7981312ed6e6df… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 13:44:06 2009 +0000 include: Add row.idl. --- include/Makefile.in | 1 + include/oledb.idl | 1 + include/row.idl | 42 ++++++++++++++++++++++++++++++++++++++++++ tools/make_makefiles | 1 + 4 files changed, 45 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index f8fbfc9..c32137f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -395,6 +395,7 @@ SRCDIR_INCLUDES = \ regstr.h \ richedit.h \ rmxfguid.h \ + row.idl \ rpc.h \ rpcasync.h \ rpcdce.h \ diff --git a/include/oledb.idl b/include/oledb.idl index 3f524eb..1aeacd7 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -56,6 +56,7 @@ typedef DWORD DBHASHVALUE; #include "dbdsad.idl" #include "sesprp.idl" #include "opnrst.idl" +#include "row.idl" #include "binres.idl" #include "crtrow.idl" diff --git a/include/row.idl b/include/row.idl new file mode 100644 index 0000000..f56eade --- /dev/null +++ b/include/row.idl @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2009 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +[ + local, + object, + uuid(0c733ab4-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IRow : IUnknown +{ + [local] + HRESULT GetColumns([in] DBORDINAL cColumns, + [in, out, size_is(cColumns), annotation("__inout_ecount(cColumns)")] DBCOLUMNACCESS rgColumns[]); + + + HRESULT GetSourceRowset([in, annotation("__in")] REFIID riid, + [out, iid_is(riid), annotation("__deref_opt_out_opt")] IUnknown **ppRowset, + [out, annotation("__out_opt")] HROW *phRow); + + HRESULT Open([in, unique, annotation("__in_opt")] IUnknown *pUnkOuter, + [in, annotation("__in")] DBID *pColumnID, + [in, annotation("__in")] REFGUID rguidColumnType, + [in] DWORD dwBindFlags, + [in, annotation("__in")] REFIID riid, + [out, iid_is(riid), annotation("__deref_opt_out")] IUnknown **ppUnk); +} diff --git a/tools/make_makefiles b/tools/make_makefiles index 28c1e1c..f707564 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -125,6 +125,7 @@ my %private_idl_headers = ( "devenum.idl" => 1, "dyngraph.idl" => 1, "opnrst.idl" => 1, + "row.idl" => 1, "rstbas.idl" => 1, "rstinf.idl" => 1, "rstloc.idl" => 1,

1 0