February 2013 - Wine-commits

Piotr Caban : hlink: Call BindToObject with IID_IUnknown in IHlink_fnNavigate.
by Alexandre Julliard 26 Feb '13

26 Feb '13

Module: wine Branch: master Commit: f8e0d2f5db73ad3ab6742e13b7a3435a04b0779b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8e0d2f5db73ad3ab6742e13b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 26 17:20:42 2013 +0100 hlink: Call BindToObject with IID_IUnknown in IHlink_fnNavigate. --- dlls/hlink/link.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index 97164eb..1957cb0 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -487,15 +487,19 @@ static HRESULT WINAPI IHlink_fnNavigate(IHlink* iface, DWORD grfHLNF, LPBC pbc, if (SUCCEEDED(r)) { IBindCtx *bcxt; - IHlinkTarget *target = NULL; + IUnknown *unk = NULL; + IHlinkTarget *target; CreateBindCtx(0, &bcxt); RegisterBindStatusCallback(bcxt, pbsc, NULL, 0); - r = IMoniker_BindToObject(mon, bcxt, NULL, &IID_IHlinkTarget, - (LPVOID*)&target); - TRACE("IHlinkTarget returned 0x%x\n", r); + r = IMoniker_BindToObject(mon, bcxt, NULL, &IID_IUnknown, (void**)&unk); + if (r == S_OK) + { + r = IUnknown_QueryInterface(unk, &IID_IHlinkTarget, (void**)&target); + IUnknown_Release(unk); + } if (r == S_OK) { IHlinkTarget_SetBrowseContext(target, phbc);

1 0

Piotr Caban : hlink: Return value returned by IHlinkTarget_Navigate in IHlink_fnNavigate.
by Alexandre Julliard 26 Feb '13

26 Feb '13

Module: wine Branch: master Commit: e0b7aadb92f98f95982244487f5e9fc8ea5d4359 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0b7aadb92f98f95982244487… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 26 17:20:56 2013 +0100 hlink: Return value returned by IHlinkTarget_Navigate in IHlink_fnNavigate. --- dlls/hlink/link.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index 1957cb0..6f4ac12 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -503,7 +503,7 @@ static HRESULT WINAPI IHlink_fnNavigate(IHlink* iface, DWORD grfHLNF, LPBC pbc, if (r == S_OK) { IHlinkTarget_SetBrowseContext(target, phbc); - IHlinkTarget_Navigate(target, grfHLNF, This->Location); + r = IHlinkTarget_Navigate(target, grfHLNF, This->Location); IHlinkTarget_Release(target); } else

1 0

Piotr Caban : hlink: Added basic Hlink::Navigate tests.
by Alexandre Julliard 26 Feb '13

26 Feb '13

Module: wine Branch: master Commit: 0159558560e6823f1390e1a62febc161ebebaac7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0159558560e6823f1390e1a62… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 26 17:21:31 2013 +0100 hlink: Added basic Hlink::Navigate tests. --- dlls/hlink/tests/hlink.c | 303 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 298 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0159558560e6823f1390e…

1 0

Andrew Talbot : shell32: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 26 Feb '13

26 Feb '13

Module: wine Branch: master Commit: 1a190a9da3bb9616ade6966865901296800c5426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a190a9da3bb9616ade696686… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Feb 25 21:14:00 2013 +0000 shell32: Avoid signed-unsigned integer comparisons. --- dlls/shell32/shlview_cmenu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index b46820c..92f671a 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -574,7 +574,7 @@ HRESULT ItemMenu_Constructor(IShellFolder *parent, LPCITEMIDLIST pidl, const LPC { ContextMenu* This; HRESULT hr; - int i; + UINT i; This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (!This) return E_OUTOFMEMORY;

1 0

Andrew Talbot : rpcrt4: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 26 Feb '13

26 Feb '13

Module: wine Branch: master Commit: 49992c3a5e5b0b8022942de19c29d85db6c35d5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=49992c3a5e5b0b8022942de19… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Feb 25 21:13:56 2013 +0000 rpcrt4: Avoid signed-unsigned integer comparisons. --- dlls/rpcrt4/rpc_transport.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index e3e428b..fc81bbe 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -3117,7 +3117,7 @@ RPC_STATUS WINAPI RpcProtseqVectorFreeA(RPC_PROTSEQ_VECTORA **protseqs) if (*protseqs) { - int i; + unsigned int i; for (i = 0; i < (*protseqs)->Count; i++) HeapFree(GetProcessHeap(), 0, (*protseqs)->Protseq[i]); HeapFree(GetProcessHeap(), 0, *protseqs); @@ -3135,7 +3135,7 @@ RPC_STATUS WINAPI RpcProtseqVectorFreeW(RPC_PROTSEQ_VECTORW **protseqs) if (*protseqs) { - int i; + unsigned int i; for (i = 0; i < (*protseqs)->Count; i++) HeapFree(GetProcessHeap(), 0, (*protseqs)->Protseq[i]); HeapFree(GetProcessHeap(), 0, *protseqs); @@ -3150,7 +3150,7 @@ RPC_STATUS WINAPI RpcProtseqVectorFreeW(RPC_PROTSEQ_VECTORW **protseqs) RPC_STATUS WINAPI RpcNetworkInqProtseqsW( RPC_PROTSEQ_VECTORW** protseqs ) { RPC_PROTSEQ_VECTORW *pvector; - int i = 0; + unsigned int i; RPC_STATUS status = RPC_S_OUT_OF_MEMORY; TRACE("(%p)\n", protseqs); @@ -3183,7 +3183,7 @@ end: RPC_STATUS WINAPI RpcNetworkInqProtseqsA(RPC_PROTSEQ_VECTORA** protseqs) { RPC_PROTSEQ_VECTORA *pvector; - int i = 0; + unsigned int i; RPC_STATUS status = RPC_S_OUT_OF_MEMORY; TRACE("(%p)\n", protseqs);

1 0

Andrew Talbot : sane.ds: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 26 Feb '13

26 Feb '13

Module: wine Branch: master Commit: 57b28bce0b485b080ab677a00b8ae77b32275176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57b28bce0b485b080ab677a00… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Feb 25 21:13:58 2013 +0000 sane.ds: Avoid signed-unsigned integer comparisons. --- dlls/sane.ds/capability.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 1381220..ee7435d 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -174,7 +174,7 @@ static TW_UINT16 TWAIN_GetSupportedCaps(pTW_CAPABILITY pCapability) if (pCapability->hContainer) { UINT16 *u; - int i; + TW_UINT32 i; a = GlobalLock (pCapability->hContainer); a->ItemType = TWTY_UINT16; a->NumItems = sizeof(supported_caps) / sizeof(supported_caps[0]); @@ -924,7 +924,7 @@ static TW_UINT16 SANE_ICAPSupportedSizes (pTW_CAPABILITY pCapability, TW_UINT16 #ifdef SONAME_LIBSANE static TW_UINT32 possible_values[SUPPORTED_SIZE_COUNT]; - int i; + unsigned int i; TW_UINT32 val; TW_UINT16 default_size = get_default_paper_size(supported_sizes, SUPPORTED_SIZE_COUNT); TW_UINT16 current_size = get_current_paper_size(supported_sizes, SUPPORTED_SIZE_COUNT);

1 0

Michael Stefaniuc : shell32: COM clean up for IShellFolder2 in ShellFSFolder.
by Alexandre Julliard 26 Feb '13

26 Feb '13

Module: wine Branch: master Commit: febda816df5523c22497f8c5a778584a3f313eb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=febda816df5523c22497f8c5a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Feb 25 23:44:51 2013 +0100 shell32: COM clean up for IShellFolder2 in ShellFSFolder. --- dlls/shell32/shfldr_fs.c | 52 ++++++++++++++++------------------------------ 1 files changed, 18 insertions(+), 34 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 1ccd2ef..23e9dcc 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -61,7 +61,7 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); typedef struct { IUnknown IUnknown_inner; LONG ref; - const IShellFolder2Vtbl *lpvtblShellFolder; + IShellFolder2 IShellFolder2_iface; const IPersistFolder3Vtbl *lpvtblPersistFolder3; const IDropTargetVtbl *lpvtblDropTarget; const ISFHelperVtbl *lpvtblSFHelper; @@ -88,9 +88,9 @@ static inline IGenericSFImpl *impl_from_IUnknown(IUnknown *iface) return CONTAINING_RECORD(iface, IGenericSFImpl, IUnknown_inner); } -static inline IGenericSFImpl *impl_from_IShellFolder2( IShellFolder2 *iface ) +static inline IGenericSFImpl *impl_from_IShellFolder2(IShellFolder2 *iface) { - return (IGenericSFImpl *)((char*)iface - FIELD_OFFSET(IGenericSFImpl, lpvtblShellFolder)); + return CONTAINING_RECORD(iface, IGenericSFImpl, IShellFolder2_iface); } static inline IGenericSFImpl *impl_from_IPersistFolder3( IPersistFolder3 *iface ) @@ -112,8 +112,6 @@ static inline IGenericSFImpl *impl_from_ISFHelper( ISFHelper *iface ) /* converts This to an interface pointer */ -#define _IShellFolder_(This) ((IShellFolder*)&(This)->lpvtblShellFolder) -#define _IShellFolder2_(This) ((IShellFolder2*)&(This)->lpvtblShellFolder) #define _IPersist_(This) (&(This)->lpvtblPersistFolder3) #define _IPersistFolder_(This) (&(This)->lpvtblPersistFolder3) #define _IPersistFolder2_(This) (&(This)->lpvtblPersistFolder3) @@ -146,10 +144,8 @@ static HRESULT WINAPI IUnknown_fnQueryInterface(IUnknown *iface, REFIID riid, vo if (IsEqualIID (riid, &IID_IUnknown)) *ppvObj = &This->IUnknown_inner; - else if (IsEqualIID (riid, &IID_IShellFolder)) - *ppvObj = _IShellFolder_ (This); - else if (IsEqualIID (riid, &IID_IShellFolder2)) - *ppvObj = _IShellFolder_ (This); + else if (IsEqualIID(riid, &IID_IShellFolder) || IsEqualIID(riid, &IID_IShellFolder2)) + *ppvObj = &This->IShellFolder2_iface; else if (IsEqualIID (riid, &IID_IPersist)) *ppvObj = _IPersist_ (This); else if (IsEqualIID (riid, &IID_IPersistFolder)) @@ -241,7 +237,7 @@ IFSFolder_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) sf->ref = 0; sf->IUnknown_inner.lpVtbl = &unkvt; - sf->lpvtblShellFolder = &sfvt; + sf->IShellFolder2_iface.lpVtbl = &sfvt; sf->lpvtblPersistFolder3 = &vt_FSFldr_PersistFolder3; sf->lpvtblDropTarget = &dtvt; sf->lpvtblSFHelper = &shvt; @@ -259,44 +255,32 @@ IFSFolder_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) /************************************************************************** * IShellFolder_fnQueryInterface - * - * PARAMETERS - * REFIID riid [in ] Requested InterfaceID - * LPVOID* ppvObject [out] Interface* to hold the result */ -static HRESULT WINAPI -IShellFolder_fnQueryInterface (IShellFolder2 * iface, REFIID riid, - LPVOID * ppvObj) +static HRESULT WINAPI IShellFolder_fnQueryInterface(IShellFolder2 *iface, REFIID riid, + void **ppvObj) { IGenericSFImpl *This = impl_from_IShellFolder2(iface); - TRACE ("(%p)->(%s,%p)\n", This, shdebugstr_guid (riid), ppvObj); - return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); } /************************************************************************** * IShellFolder_AddRef */ - -static ULONG WINAPI IShellFolder_fnAddRef (IShellFolder2 * iface) +static ULONG WINAPI IShellFolder_fnAddRef(IShellFolder2 *iface) { IGenericSFImpl *This = impl_from_IShellFolder2(iface); - TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_AddRef(This->outer_unk); } /************************************************************************** * IShellFolder_fnRelease */ -static ULONG WINAPI IShellFolder_fnRelease (IShellFolder2 * iface) +static ULONG WINAPI IShellFolder_fnRelease(IShellFolder2 *iface) { IGenericSFImpl *This = impl_from_IShellFolder2(iface); - TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_Release(This->outer_unk); } @@ -420,8 +404,8 @@ IShellFolder_fnParseDisplayName (IShellFolder2 * iface, } else { /* it's the last element */ if (pdwAttributes && *pdwAttributes) { - hr = SHELL32_GetItemAttributes (_IShellFolder_ (This), - pidlTemp, pdwAttributes); + hr = SHELL32_GetItemAttributes((IShellFolder *)&This->IShellFolder2_iface, + pidlTemp, pdwAttributes); } } } @@ -519,7 +503,7 @@ IShellFolder_fnCompareIDs (IShellFolder2 * iface, LPARAM lParam, int nReturn; TRACE ("(%p)->(0x%08lx,pidl1=%p,pidl2=%p)\n", This, lParam, pidl1, pidl2); - nReturn = SHELL32_CompareIDs (_IShellFolder_ (This), lParam, pidl1, pidl2); + nReturn = SHELL32_CompareIDs((IShellFolder *)&This->IShellFolder2_iface, lParam, pidl1, pidl2); TRACE ("-- %i\n", nReturn); return nReturn; } @@ -600,7 +584,7 @@ IShellFolder_fnGetAttributesOf (IShellFolder2 * iface, UINT cidl, else { while (cidl > 0 && *apidl) { pdump (*apidl); - SHELL32_GetItemAttributes (_IShellFolder_ (This), *apidl, rgfInOut); + SHELL32_GetItemAttributes((IShellFolder *)&This->IShellFolder2_iface, *apidl, rgfInOut); apidl++; cidl--; } @@ -1182,8 +1166,8 @@ ISFHelper_fnGetUniqueName (ISFHelper * iface, LPWSTR pwszName, UINT uLen) lstrcpynW (pwszName, wszNewFolder, uLen); - hr = IShellFolder_fnEnumObjects (_IShellFolder2_ (This), 0, - SHCONTF_FOLDERS | SHCONTF_NONFOLDERS | SHCONTF_INCLUDEHIDDEN, &penum); + hr = IShellFolder2_EnumObjects(&This->IShellFolder2_iface, 0, + SHCONTF_FOLDERS | SHCONTF_NONFOLDERS | SHCONTF_INCLUDEHIDDEN, &penum); if (penum) { LPITEMIDLIST pidl; DWORD dwFetched; @@ -1237,8 +1221,8 @@ ISFHelper_fnAddFolder (ISFHelper * iface, HWND hwnd, LPCWSTR pwszName, lstrcpyW(wszNewDir, pwszName); - hres = IShellFolder_ParseDisplayName((IShellFolder*)&This->lpvtblShellFolder, - hwnd, NULL, wszNewDir, NULL, &relPidl, NULL); + hres = IShellFolder2_ParseDisplayName(&This->IShellFolder2_iface, hwnd, NULL, wszNewDir, + NULL, &relPidl, NULL); if (SUCCEEDED(hres)) { LPITEMIDLIST fullPidl;

1 0

Michael Stefaniuc : shell32: Pass an IShellFolder2 to SHELL32_CompareIDs() to avoid casts.
by Alexandre Julliard 26 Feb '13

26 Feb '13

Module: wine Branch: master Commit: 89e187d3bd45322101c1e5294586bc5a881b4d2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=89e187d3bd45322101c1e5294… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Feb 25 23:46:57 2013 +0100 shell32: Pass an IShellFolder2 to SHELL32_CompareIDs() to avoid casts. --- dlls/shell32/cpanelfolder.c | 2 +- dlls/shell32/shfldr.h | 2 +- dlls/shell32/shfldr_desktop.c | 3 +-- dlls/shell32/shfldr_fs.c | 2 +- dlls/shell32/shfldr_mycomp.c | 2 +- dlls/shell32/shfldr_netplaces.c | 2 +- dlls/shell32/shlfolder.c | 12 +++++------- 7 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index 7d2b9ff..29439c5 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -499,7 +499,7 @@ static HRESULT WINAPI ISF_ControlPanel_fnCompareIDs(IShellFolder2 *iface, LPARAM int nReturn; TRACE("(%p)->(0x%08lx,pidl1=%p,pidl2=%p)\n", This, lParam, pidl1, pidl2); - nReturn = SHELL32_CompareIDs((IShellFolder *)&This->IShellFolder2_iface, lParam, pidl1, pidl2); + nReturn = SHELL32_CompareIDs(&This->IShellFolder2_iface, lParam, pidl1, pidl2); TRACE("-- %i\n", nReturn); return nReturn; } diff --git a/dlls/shell32/shfldr.h b/dlls/shell32/shfldr.h index 052b040..b6ebfb2 100644 --- a/dlls/shell32/shfldr.h +++ b/dlls/shell32/shfldr.h @@ -46,7 +46,7 @@ HRESULT SHELL32_GetDisplayNameOfChild (IShellFolder2 * psf, LPCITEMIDLIST pidl, HRESULT SHELL32_BindToChild (LPCITEMIDLIST pidlRoot, LPCWSTR pathRoot, LPCITEMIDLIST pidlComplete, REFIID riid, LPVOID * ppvOut) DECLSPEC_HIDDEN; -HRESULT SHELL32_CompareIDs (IShellFolder * iface, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) DECLSPEC_HIDDEN; +HRESULT SHELL32_CompareIDs(IShellFolder2 *iface, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) DECLSPEC_HIDDEN; LPITEMIDLIST SHELL32_CreatePidlFromBindCtx(IBindCtx *pbc, LPCWSTR path) DECLSPEC_HIDDEN; HRESULT SHELL32_CreateExtensionUIObject(IShellFolder2 *iface, LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppvOut) DECLSPEC_HIDDEN; diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index c22335a..227982e 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -396,11 +396,10 @@ static HRESULT WINAPI ISF_Desktop_fnCompareIDs (IShellFolder2 *iface, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) { IDesktopFolderImpl *This = impl_from_IShellFolder2(iface); - IShellFolder *shell_folder = (IShellFolder*)iface; HRESULT hr; TRACE ("(%p)->(0x%08lx,pidl1=%p,pidl2=%p)\n", This, lParam, pidl1, pidl2); - hr = SHELL32_CompareIDs ( shell_folder, lParam, pidl1, pidl2); + hr = SHELL32_CompareIDs(iface, lParam, pidl1, pidl2); TRACE ("-- 0x%08x\n", hr); return hr; } diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 23e9dcc..0d52156 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -503,7 +503,7 @@ IShellFolder_fnCompareIDs (IShellFolder2 * iface, LPARAM lParam, int nReturn; TRACE ("(%p)->(0x%08lx,pidl1=%p,pidl2=%p)\n", This, lParam, pidl1, pidl2); - nReturn = SHELL32_CompareIDs((IShellFolder *)&This->IShellFolder2_iface, lParam, pidl1, pidl2); + nReturn = SHELL32_CompareIDs(&This->IShellFolder2_iface, lParam, pidl1, pidl2); TRACE ("-- %i\n", nReturn); return nReturn; } diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index 77a1c01..766e8d8 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -410,7 +410,7 @@ static HRESULT WINAPI ISF_MyComputer_fnCompareIDs (IShellFolder2 *iface, HRESULT hr; TRACE ("(%p)->(0x%08lx,pidl1=%p,pidl2=%p)\n", This, lParam, pidl1, pidl2); - hr = SHELL32_CompareIDs ((IShellFolder*)&This->IShellFolder2_iface, lParam, pidl1, pidl2); + hr = SHELL32_CompareIDs(&This->IShellFolder2_iface, lParam, pidl1, pidl2); TRACE ("-- 0x%08x\n", hr); return hr; } diff --git a/dlls/shell32/shfldr_netplaces.c b/dlls/shell32/shfldr_netplaces.c index a75efef..1cff18d 100644 --- a/dlls/shell32/shfldr_netplaces.c +++ b/dlls/shell32/shfldr_netplaces.c @@ -298,7 +298,7 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnCompareIDs (IShellFolder2 * iface, int nReturn; TRACE ("(%p)->(0x%08lx,pidl1=%p,pidl2=%p)\n", This, lParam, pidl1, pidl2); - nReturn = SHELL32_CompareIDs ((IShellFolder *)&This->IShellFolder2_iface, lParam, pidl1, pidl2); + nReturn = SHELL32_CompareIDs(&This->IShellFolder2_iface, lParam, pidl1, pidl2); TRACE ("-- %i\n", nReturn); return nReturn; } diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index 4d9f036..1b53edf 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -482,16 +482,14 @@ HRESULT SHELL32_GetItemAttributes (IShellFolder * psf, LPCITEMIDLIST pidl, LPDWO /*********************************************************************** * SHELL32_CompareIDs */ -HRESULT SHELL32_CompareIDs (IShellFolder * iface, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) +HRESULT SHELL32_CompareIDs(IShellFolder2 *sf, LPARAM lParam, LPCITEMIDLIST pidl1, + LPCITEMIDLIST pidl2) { - int type1, - type2; + int type1, type2; char szTemp1[MAX_PATH]; char szTemp2[MAX_PATH]; HRESULT nReturn; - LPITEMIDLIST firstpidl, - nextpidl1, - nextpidl2; + LPITEMIDLIST firstpidl, nextpidl1, nextpidl2; IShellFolder *psf; /* test for empty pidls */ @@ -539,7 +537,7 @@ HRESULT SHELL32_CompareIDs (IShellFolder * iface, LPARAM lParam, LPCITEMIDLIST p } else if (isEmpty2) { return MAKE_HRESULT( SEVERITY_SUCCESS, 0, 1 ); /* optimizing end */ - } else if (SUCCEEDED (IShellFolder_BindToObject (iface, firstpidl, NULL, &IID_IShellFolder, (LPVOID *) & psf))) { + } else if (SUCCEEDED(IShellFolder2_BindToObject(sf, firstpidl, NULL, &IID_IShellFolder, (void **)&psf))) { nReturn = IShellFolder_CompareIDs (psf, lParam, nextpidl1, nextpidl2); IShellFolder_Release (psf); }

1 0

Nikolay Sivov : msxml3: Fail to insert a node of unsupported type to a document.
by Alexandre Julliard 25 Feb '13

25 Feb '13

Module: wine Branch: master Commit: de9250537dd87ceea070a37318cd77f4650470a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de9250537dd87ceea070a3731… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 24 18:04:02 2013 +0400 msxml3: Fail to insert a node of unsupported type to a document. --- dlls/msxml3/domdoc.c | 18 ++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 58 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 7a3543f..f1915a3 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1115,12 +1115,26 @@ static HRESULT WINAPI domdoc_insertBefore( IXMLDOMNode** outNewChild ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); + DOMNodeType type; + HRESULT hr; TRACE("(%p)->(%p %s %p)\n", This, newChild, debugstr_variant(&refChild), outNewChild); - return node_insert_before(&This->node, newChild, &refChild, outNewChild); -} + hr = IXMLDOMNode_get_nodeType(newChild, &type); + if (hr != S_OK) return hr; + TRACE("new node type %d\n", type); + switch (type) + { + case NODE_ATTRIBUTE: + case NODE_DOCUMENT: + case NODE_CDATA_SECTION: + if (outNewChild) *outNewChild = NULL; + return E_FAIL; + default: + return node_insert_before(&This->node, newChild, &refChild, outNewChild); + } +} static HRESULT WINAPI domdoc_replaceChild( IXMLDOMDocument3 *iface, diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 23ee499..2ff78c2 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8270,15 +8270,30 @@ todo_wine { static void test_insertBefore(void) { - IXMLDOMDocument *doc, *doc2; + IXMLDOMDocument *doc, *doc2, *doc3; IXMLDOMAttribute *attr; IXMLDOMElement *elem1, *elem2, *elem3, *elem4, *elem5; - IXMLDOMNode *node, *newnode; + IXMLDOMNode *node, *newnode, *cdata; HRESULT hr; VARIANT v; BSTR p; doc = create_document(&IID_IXMLDOMDocument); + doc3 = create_document(&IID_IXMLDOMDocument); + + /* document to document */ + V_VT(&v) = VT_NULL; + node = (void*)0xdeadbeef; + hr = IXMLDOMDocument_insertBefore(doc, (IXMLDOMNode*)doc3, v, &node); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(node == NULL, "got %p\n", node); + + /* document to itself */ + V_VT(&v) = VT_NULL; + node = (void*)0xdeadbeef; + hr = IXMLDOMDocument_insertBefore(doc, (IXMLDOMNode*)doc, v, &node); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(node == NULL, "got %p\n", node); /* insertBefore behaviour for attribute node */ V_VT(&v) = VT_I4; @@ -8289,6 +8304,31 @@ static void test_insertBefore(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(attr != NULL, "got %p\n", attr); + /* attribute to document */ + V_VT(&v) = VT_NULL; + node = (void*)0xdeadbeef; + hr = IXMLDOMDocument_insertBefore(doc3, (IXMLDOMNode*)attr, v, &node); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(node == NULL, "got %p\n", node); + + /* cdata to document */ + V_VT(&v) = VT_I4; + V_I4(&v) = NODE_CDATA_SECTION; + + cdata = NULL; + hr = IXMLDOMDocument_createNode(doc3, v, _bstr_("cdata"), NULL, &cdata); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(cdata != NULL, "got %p\n", cdata); + + V_VT(&v) = VT_NULL; + node = (void*)0xdeadbeef; + hr = IXMLDOMDocument_insertBefore(doc3, cdata, v, &node); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(node == NULL, "got %p\n", node); + + IXMLDOMNode_Release(cdata); + IXMLDOMDocument_Release(doc3); + /* attribute to attribute */ V_VT(&v) = VT_I4; V_I4(&v) = NODE_ATTRIBUTE;

1 0

Huw Davies : riched20: Change ME_FindRunInRow to fill out a cursor structure.
by Alexandre Julliard 25 Feb '13

25 Feb '13

Module: wine Branch: master Commit: 0730db2b999a31b360e5beb9e5fb129f5d944e27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0730db2b999a31b360e5beb9e… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 25 12:59:24 2013 +0000 riched20: Change ME_FindRunInRow to fill out a cursor structure. --- dlls/riched20/caret.c | 41 +++++++++++++++++++++-------------------- 1 files changed, 21 insertions(+), 20 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index ddaa37a..0905700 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1177,28 +1177,32 @@ void ME_MouseMove(ME_TextEditor *editor, int x, int y) ME_SendSelChange(editor); } -static ME_DisplayItem *ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pRow, - int x, int *pOffset, int *pbCaretAtEnd) +static void ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pRow, + int x, ME_Cursor *cursor, int *pbCaretAtEnd) { ME_DisplayItem *pNext, *pLastRun; pNext = ME_FindItemFwd(pRow, diRunOrStartRow); assert(pNext->type == diRun); if (pbCaretAtEnd) *pbCaretAtEnd = FALSE; - if (pOffset) *pOffset = 0; + cursor->nOffset = 0; do { int run_x = pNext->member.run.pt.x; int width = pNext->member.run.nWidth; if (x < run_x) { - return pNext; + cursor->pRun = pNext; + cursor->pPara = ME_GetParagraph( cursor->pRun ); + return; } if (x >= run_x && x < run_x+width) { int ch = ME_CharFromPoint(editor, x-run_x, &pNext->member.run, TRUE); - if (ch < pNext->member.run.len) { - if (pOffset) - *pOffset = ch; - return pNext; + if (ch < pNext->member.run.len) + { + cursor->nOffset = ch; + cursor->pRun = pNext; + cursor->pPara = ME_GetParagraph( cursor->pRun ); + return; } } pLastRun = pNext; @@ -1207,12 +1211,14 @@ static ME_DisplayItem *ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pR if ((pLastRun->member.run.nFlags & MERF_ENDPARA) == 0) { - pNext = ME_FindItemFwd(pNext, diRun); + cursor->pRun = ME_FindItemFwd(pNext, diRun); if (pbCaretAtEnd) *pbCaretAtEnd = TRUE; - return pNext; - } else { - return pLastRun; } + else + cursor->pRun = pLastRun; + + cursor->pPara = ME_GetParagraph( cursor->pRun ); + return; } static int ME_GetXForArrow(ME_TextEditor *editor, ME_Cursor *pCursor) @@ -1313,8 +1319,7 @@ ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs) /* row not found - ignore */ return; } - pCursor->pRun = ME_FindRunInRow(editor, pItem, x, &pCursor->nOffset, &editor->bCaretAtEnd); - pCursor->pPara = ME_GetParagraph(pCursor->pRun); + ME_FindRunInRow(editor, pItem, x, pCursor, &editor->bCaretAtEnd); assert(pCursor->pRun); assert(pCursor->pRun->type == diRun); } @@ -1367,9 +1372,7 @@ static void ME_ArrowPageUp(ME_TextEditor *editor, ME_Cursor *pCursor) pLast = p; } while(1); - pCursor->pRun = ME_FindRunInRow(editor, pLast, x, &pCursor->nOffset, - &editor->bCaretAtEnd); - pCursor->pPara = ME_GetParagraph(pCursor->pRun); + ME_FindRunInRow(editor, pLast, x, pCursor, &editor->bCaretAtEnd); } assert(pCursor->pRun); assert(pCursor->pRun->type == diRun); @@ -1427,9 +1430,7 @@ static void ME_ArrowPageDown(ME_TextEditor *editor, ME_Cursor *pCursor) pLast = p; } while(1); - pCursor->pRun = ME_FindRunInRow(editor, pLast, x, &pCursor->nOffset, - &editor->bCaretAtEnd); - pCursor->pPara = ME_GetParagraph(pCursor->pRun); + ME_FindRunInRow(editor, pLast, x, pCursor, &editor->bCaretAtEnd); } assert(pCursor->pRun); assert(pCursor->pRun->type == diRun);

1 0