July 2006 - Wine-commits - list.winehq.org

Mike McCormack : include: Remove unnecessary semicolons from idl.
by Alexandre Julliard 20 Jul '06

20 Jul '06

Module: wine Branch: refs/heads/master Commit: 57f8bd057f64815f18e1b782c1176b5cb4dec4ee URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=57f8bd057f64815f18e1b78… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Jul 20 18:22:08 2006 +0900 include: Remove unnecessary semicolons from idl. --- include/amstream.idl | 14 ++++----- include/ddstream.idl | 4 +-- include/dispex.idl | 8 +++-- include/downloadmgr.idl | 2 + include/dyngraph.idl | 2 + include/mlang.idl | 18 ++++++----- include/mmstream.idl | 6 ++-- include/mshtmhst.idl | 4 +-- include/mshtml.idl | 2 + include/msxml.idl | 18 ++++++----- include/msxml2.idl | 74 ++++++++++++++++++++++++----------------------- include/objidl.idl | 12 ++++---- include/tom.idl | 12 ++++---- include/urlmon.idl | 4 +-- include/xmldom.idl | 34 +++++++++++----------- include/xmldso.idl | 4 +-- 16 files changed, 109 insertions(+), 109 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=57f8bd057f64815f18e…

1 0

James Hawkins : msi: Rename SetFeatureStates to match the naming scheme of internal msi functions .
by Alexandre Julliard 20 Jul '06

20 Jul '06

Module: wine Branch: refs/heads/master Commit: 7c7f0bb2c18b23003bd7c63cb9e8b9ab90cf9cec URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7c7f0bb2c18b23003bd7c63… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Jul 19 11:15:37 2006 -0700 msi: Rename SetFeatureStates to match the naming scheme of internal msi functions. --- dlls/msi/action.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 66ff965..d6ca5d7 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1590,7 +1590,7 @@ static BOOL process_state_property (MSIP return TRUE; } -static UINT SetFeatureStates(MSIPACKAGE *package) +static UINT MSI_SetFeatureStates(MSIPACKAGE *package) { int install_level; static const WCHAR szlevel[] = @@ -1935,7 +1935,7 @@ static UINT ACTION_CostFinalize(MSIPACKA ACTION_UpdateInstallStates(package); - return SetFeatureStates(package); + return MSI_SetFeatureStates(package); } /* OK this value is "interpreted" and then formatted based on the

1 0

James Hawkins : msi: Update feature states after changing install levels, as they may have changed.
by Alexandre Julliard 20 Jul '06

20 Jul '06

Module: wine Branch: refs/heads/master Commit: 7bcac31dcf4b37a0780efaf06540351e2c3543b3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7bcac31dcf4b37a0780efaf… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Jul 19 11:17:16 2006 -0700 msi: Update feature states after changing install levels, as they may have changed. --- dlls/msi/action.c | 2 +- dlls/msi/install.c | 6 ++++++ dlls/msi/msipriv.h | 1 + 3 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index d6ca5d7..d7be3b5 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1590,7 +1590,7 @@ static BOOL process_state_property (MSIP return TRUE; } -static UINT MSI_SetFeatureStates(MSIPACKAGE *package) +UINT MSI_SetFeatureStates(MSIPACKAGE *package) { int install_level; static const WCHAR szlevel[] = diff --git a/dlls/msi/install.c b/dlls/msi/install.c index cb43403..38888ef 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -785,6 +785,12 @@ UINT WINAPI MsiSetInstallLevel(MSIHANDLE sprintfW( level, fmt, iInstallLevel ); r = MSI_SetPropertyW( package, szInstallLevel, level ); + if ( r == ERROR_SUCCESS ) + { + r = MSI_SetFeatureStates( package ); + } + msiobj_release( &package->hdr ); + return r; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 999b4ca..a56b9fe 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -339,6 +339,7 @@ extern UINT MSI_InstallPackage( MSIPACKA extern void ACTION_free_package_structures( MSIPACKAGE* ); extern UINT ACTION_DialogBox( MSIPACKAGE*, LPCWSTR); extern UINT MSI_Sequence( MSIPACKAGE *package, LPCWSTR szTable, INT iSequenceMode ); +extern UINT MSI_SetFeatureStates( MSIPACKAGE *package ); /* record internals */ extern UINT MSI_RecordSetIStream( MSIRECORD *, unsigned int, IStream *);

1 0

Mike McCormack : oledb: Add oledb.idl and some idl files it depends on.
by Alexandre Julliard 20 Jul '06

20 Jul '06

Module: wine Branch: refs/heads/master Commit: 6621503322c065bf99b9c5f2dafc5e465b0b2031 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6621503322c065bf99b9c5f… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Jul 20 15:26:18 2006 +0900 oledb: Add oledb.idl and some idl files it depends on. --- include/.gitignore | 1 + include/Makefile.in | 4 ++ include/dbinit.idl | 29 +++++++++++++++ include/dbprop.idl | 65 +++++++++++++++++++++++++++++++++ include/dbs.idl | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/oledb.idl | 28 ++++++++++++++ 6 files changed, 228 insertions(+), 0 deletions(-) create mode 100644 include/dbinit.idl create mode 100644 include/dbprop.idl create mode 100644 include/dbs.idl create mode 100644 include/oledb.idl diff --git a/include/.gitignore b/include/.gitignore index 037d5c0..a267815 100644 --- a/include/.gitignore +++ b/include/.gitignore @@ -26,6 +26,7 @@ /objidl.h /objsafe.h /ocidl.h +/oledb.h /oleidl.h /optary.h /propidl.h diff --git a/include/Makefile.in b/include/Makefile.in index a5ca78f..6ff370d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -32,6 +32,7 @@ WINDOWS_IDL_SRCS = \ objidl.idl \ objsafe.idl \ ocidl.idl \ + oledb.idl \ oleidl.idl \ optary.idl \ propidl.idl \ @@ -54,6 +55,9 @@ WINDOWS_IDL_INCLUDES = \ $(WINDOWS_IDL_SRCS) \ axcore.idl \ axextend.idl \ + dbinit.idl \ + dbprop.idl \ + dbs.idl \ devenum.idl \ dyngraph.idl diff --git a/include/dbinit.idl b/include/dbinit.idl new file mode 100644 index 0000000..e2edd17 --- /dev/null +++ b/include/dbinit.idl @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2006 Mike McCormack + * + * 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 + */ + +[ + object, + uuid(0c733a8b-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IDBInitialize : IUnknown { + [local] HRESULT Initialize(); + [call_as(Initialize)] HRESULT RemoteInitialize( [out] IErrorInfo **ppErrorInfoRem ); + [local] HRESULT Uninitialize(); + [call_as(Uninitialize)] HRESULT RemoteUninitialize( [out] IErrorInfo **ppErrorInfoRem ); +} diff --git a/include/dbprop.idl b/include/dbprop.idl new file mode 100644 index 0000000..5ed5301 --- /dev/null +++ b/include/dbprop.idl @@ -0,0 +1,65 @@ +/* + * Copyright (C) 2006 Mike McCormack + * + * 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 + */ + +[ + object, + uuid(0c733a8a-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IDBProperties : IUnknown { + [local] HRESULT GetProperties( + [in] ULONG cPropertyIDSets, + [in, size_is(cPropertyIDSets)] const DBPROPIDSET rgPropertyIDSets[], + [in, out] ULONG *pcPropertySets, + [out, size_is(,*pcPropertySets)] DBPROPSET **prgPropertySets); + + [call_as(GetProperties)] HRESULT RemoteGetProperties( + [in] ULONG cPropertyIDSets, + [in, size_is(cPropertyIDSets)] const DBPROPIDSET rgPropertyIDSets[], + [in, out] ULONG *pcPropertySets, + [out, size_is(,*pcPropertySets)] DBPROPSET **prgPropertySets, + [out] IErrorInfo **ppErrorInfoRem); + + [local] HRESULT GetPropertyInfo( + [in] ULONG cPropertyIDSets, + [in, size_is(cPropertyIDSets)] const DBPROPIDSET rgPropertyIDSets[], + [in, out] ULONG *pcPropertyInfoSets, + [out, size_is(,*pcPropertyInfoSets)] DBPROPINFOSET **prgPropertyInfoSets); + + [call_as(GetPropertyInfo)] HRESULT RemoteGetPropertyInfo( + [in] ULONG cPropertyIDSets, + [in,size_is(cPropertyIDSets)] const DBPROPIDSET *rgPropertyIDSets, + [in, out] ULONG *pcPropertyInfoSets, + [out, size_is(,*pcPropertyInfoSets)] DBPROPINFOSET **prgPropertyInfoSets, + [in, out] ULONG *pcOffsets, + [out, size_is(,*pcOffsets)] DBBYTEOFFSET **prgDescOffsets, + [in, out] ULONG *pcbDescBuffer, + [out, size_is(,*pcbDescBuffer)] OLECHAR **ppDescBuffer, + [out] IErrorInfo **ppErrorInfoRem); + + [local] HRESULT SetProperties( + [in] ULONG cPropertySets, + [in, out, size_is(cPropertySets)] DBPROPSET rgPropertySets[]); + + [call_as(SetProperties)] HRESULT RemoteSetProperties( + [in] ULONG cPropertySets, + [in, out, size_is(cPropertySets)] DBPROPSET *rgPropertySets, + [in] ULONG cTotalProps, + [out, size_is(cTotalProps)] DBPROPSTATUS *rgPropStatus, + [out] IErrorInfo **ppErrorInfoRem); +} diff --git a/include/dbs.idl b/include/dbs.idl new file mode 100644 index 0000000..19c2997 --- /dev/null +++ b/include/dbs.idl @@ -0,0 +1,101 @@ +/* + * Copyright (C) 2006 Mike McCormack + * + * 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 + */ + +typedef DWORD DBKIND; + +enum DBKINDENUM { + DBKIND_GUID_NAME, + DBKIND_GUID_PROPID, + DBKIND_NAME, + DBKIND_PGUID_NAME, + DBKIND_PGUID_PROPID, + DBKIND_PROPID, + DBKIND_GUID, +}; + +typedef struct tagDBID { + [switch_type(DBKIND), switch_is(eKind)] union + { + [case(DBKIND_GUID_NAME, DBKIND_GUID_PROPID, DBKIND_GUID, DBKIND_NAME, DBKIND_PROPID)] + GUID guid; + [case(DBKIND_PGUID_NAME, DBKIND_PGUID_PROPID)] + GUID *pguid; + [default] + ; + } uGuid; + DBKIND eKind; + [switch_type(DBKIND), switch_is(eKind)] union + { + [case(DBKIND_GUID_NAME, DBKIND_NAME, DBKIND_PGUID_NAME)] + LPOLESTR pwszName; + [case(DBKIND_GUID_PROPID, DBKIND_GUID, DBKIND_PGUID_PROPID, DBKIND_PROPID)] + ULONG ulPropid; + [default] + ; + } uName; +} DBID; + +typedef DWORD DBPROPID; + +typedef struct tagDBPROPIDSET { + [size_is(cPropertyIDs)] DBPROPID *rgPropertyIDs; + ULONG cPropertyIDs; + GUID guidPropertySet; +} DBPROPIDSET; + +typedef DWORD DBPROPOPTIONS; + +enum DBPROPOPTIONENUM { + DBPROPOPTIONS_REQUIRED = 0, + DBPROPOPTIONS_SETIFCHEAP = 1, + DBPROPOPTIONS_OPTIONAL = 1, +}; + +typedef DWORD DBPROPSTATUS; + +typedef struct tagDBPROP { + DBPROPID dwPropertyID; + DBPROPOPTIONS dwOptions; + DBPROPSTATUS dwStatus; + DBID colid; + VARIANT vValue; +} DBPROP; + +typedef struct tagDBPROPSET { + [size_is(cProperties)] DBPROP *rgProperties; + ULONG cProperties; + GUID guidPropertySet; +} DBPROPSET; + +typedef DWORD DBPROPFLAGS; + +typedef struct tagDBPROPINFO { + LPOLESTR pwszDescription; + DBPROPID dwPropertyID; + DBPROPFLAGS dwFlags; + VARTYPE vtType; + VARIANT vValues; +} DBPROPINFO; + +typedef DBPROPINFO *PDBPROPINFO; + +typedef struct tagDBPROPINFOSET { + [size_is(cPropertyInfos)] PDBPROPINFO rgPropertyInfos; + ULONG cPropertyInfos; + GUID guidPropertySet; +} DBPROPINFOSET; diff --git a/include/oledb.idl b/include/oledb.idl new file mode 100644 index 0000000..dd6b218 --- /dev/null +++ b/include/oledb.idl @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2006 Mike McCormack + * + * 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 "oaidl.idl"; +import "ocidl.idl"; +import "propidl.idl"; + +typedef ULONG DBBYTEOFFSET; + +#include "dbinit.idl" +#include "dbs.idl" +#include "dbprop.idl"

1 0

Mike McCormack : configure: Use -fno-builtin to avoid warnings with gcc 4.1 .1.
by Alexandre Julliard 20 Jul '06

20 Jul '06

Module: wine Branch: refs/heads/master Commit: a26dabe345908d95843b24500cd15e3f160dd236 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a26dabe345908d95843b245… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Jul 19 19:16:59 2006 +0900 configure: Use -fno-builtin to avoid warnings with gcc 4.1.1. --- configure | 8 +------- configure.ac | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/configure b/configure index bf2f3c7..9de6bf4 100755 --- a/configure +++ b/configure @@ -15469,13 +15469,7 @@ echo "${ECHO_T}$ac_cv_c_builtin_wchar_ct CFLAGS="$saved_CFLAGS" if test "$ac_cv_c_builtin_wchar_ctype" = "yes" then - BUILTINFLAG="" - for builtin in \ - iswalnum iswalpha iswcntrl iswdigit iswgraph iswlower \ - iswprint iswpunct iswspace iswupper iswxdigit towlower towupper - do - BUILTINFLAG="$BUILTINFLAG -fno-builtin-$builtin" - done + BUILTINFLAG="-fno-builtin" fi fi diff --git a/configure.ac b/configure.ac index 861ed21..95d78b1 100644 --- a/configure.ac +++ b/configure.ac @@ -962,13 +962,7 @@ int main(void) { CFLAGS="$saved_CFLAGS" if test "$ac_cv_c_builtin_wchar_ctype" = "yes" then - BUILTINFLAG="" - for builtin in \ - iswalnum iswalpha iswcntrl iswdigit iswgraph iswlower \ - iswprint iswpunct iswspace iswupper iswxdigit towlower towupper - do - BUILTINFLAG="$BUILTINFLAG -fno-builtin-$builtin" - done + BUILTINFLAG="-fno-builtin" fi fi

1 0

Mike McCormack : include: Semicolons after cpp_quote are a syntax error in midl.
by Alexandre Julliard 20 Jul '06

20 Jul '06

Module: wine Branch: refs/heads/master Commit: 546916f4010764c06628f87c7036d10016ddd4bf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=546916f4010764c06628f87… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Jul 20 15:25:47 2006 +0900 include: Semicolons after cpp_quote are a syntax error in midl. --- include/control.idl | 4 +-- include/hlink.idl | 18 ++++++------- include/indexsvr.idl | 8 +++--- include/mshtmhst.idl | 18 ++++++------- include/objsafe.idl | 12 ++++----- include/propidl.idl | 38 ++++++++++++++------------- include/pstore.idl | 14 +++++----- include/richole.idl | 68 +++++++++++++++++++++++++------------------------ include/shobjidl.idl | 4 +-- include/wine/itss.idl | 4 +-- 10 files changed, 94 insertions(+), 94 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=546916f4010764c0662…

1 0

Hans Leidekker : usp10: Implement and test ScriptCacheGetHeight.
by Alexandre Julliard 20 Jul '06

20 Jul '06

Module: wine Branch: refs/heads/master Commit: 401e32ee38f70414bda9c4a8c47720e259ea5be5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=401e32ee38f70414bda9c4a… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Jul 19 21:45:24 2006 +0200 usp10: Implement and test ScriptCacheGetHeight. --- dlls/usp10/usp10.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/usp10.spec | 2 +- 2 files changed, 46 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index abd9c89..aa39449 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -652,3 +652,48 @@ HRESULT WINAPI ScriptTextOut(const HDC h return hr; } } + +/*********************************************************************** + * ScriptCacheGetHeight (USP10.@) + * + * Retrieve the height of the font in the cache. + * + * PARAMS + * hdc [I] Device context. + * psc [I/O] Opaque pointer to a script cache. + * height [O] Receives font height. + * + * RETURNS + * Success: S_OK + * Failure: Non-zero HRESULT value. + */ +HRESULT WINAPI ScriptCacheGetHeight(HDC hdc, SCRIPT_CACHE *psc, long *height) +{ + HDC phdc; + Scriptcache *pScriptcache; + TEXTMETRICW metric; + + TRACE("(%p, %p, %p)\n", hdc, psc, height); + + if (!psc || !height) + return E_INVALIDARG; + + if (!hdc) return E_PENDING; + + if (!*psc) { + pScriptcache = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(Scriptcache)); + pScriptcache->hdc = hdc; + phdc = hdc; + *psc = pScriptcache; + } else { + pScriptcache = *psc; + phdc = pScriptcache->hdc; + } + + /* FIXME: get this from the cache */ + if (!GetTextMetricsW(phdc, &metric)) + return E_INVALIDARG; + + *height = metric.tmHeight; + return S_OK; +} diff --git a/dlls/usp10/usp10.spec b/dlls/usp10/usp10.spec index c4e47fc..3d0e1ce 100644 --- a/dlls/usp10/usp10.spec +++ b/dlls/usp10/usp10.spec @@ -3,7 +3,7 @@ @ stub ScriptApplyLogicalWidth @ stdcall ScriptBreak(ptr long ptr ptr) @ stdcall ScriptCPtoX(long long long long ptr ptr ptr ptr ptr) -@ stub ScriptCacheGetHeight +@ stdcall ScriptCacheGetHeight(ptr ptr ptr) @ stdcall ScriptFreeCache(ptr) @ stdcall ScriptGetCMap(ptr ptr ptr long long ptr) @ stdcall ScriptGetFontProperties(long ptr ptr)

1 0

Jacek Caban : mshtml: Wrap remaining Heap* functions by inline functions.
by Alexandre Julliard 20 Jul '06

20 Jul '06

Module: wine Branch: refs/heads/master Commit: 21ba0bf3e82c54993a1af879188def34a0983ca2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=21ba0bf3e82c54993a1af87… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 19 23:39:54 2006 +0200 mshtml: Wrap remaining Heap* functions by inline functions. --- dlls/mshtml/conpoint.c | 11 +++++------ dlls/mshtml/hlink.c | 10 +++++----- dlls/mshtml/install.c | 18 +++++++++--------- dlls/mshtml/loadopts.c | 14 +++++++------- dlls/mshtml/navigate.c | 19 +++++++++---------- dlls/mshtml/nsembed.c | 4 ++-- dlls/mshtml/nsio.c | 18 +++++++++--------- dlls/mshtml/persist.c | 2 +- dlls/mshtml/selection.c | 4 ++-- dlls/mshtml/txtrange.c | 4 ++-- dlls/mshtml/view.c | 2 +- 11 files changed, 52 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=21ba0bf3e82c54993a1…

1 0

Jacek Caban : urlmon: Added PARSE_CANONICALIZE implementation in CoInternetParseUrl.
by Alexandre Julliard 20 Jul '06

20 Jul '06

Module: wine Branch: refs/heads/master Commit: e8617b9f1aaf100268e467c80ae4038c7e3b3dfa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e8617b9f1aaf100268e467c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 19 23:40:07 2006 +0200 urlmon: Added PARSE_CANONICALIZE implementation in CoInternetParseUrl. --- dlls/urlmon/internet.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/internet.c b/dlls/urlmon/internet.c index 8ae22e0..9b2f24d 100644 --- a/dlls/urlmon/internet.c +++ b/dlls/urlmon/internet.c @@ -61,6 +61,31 @@ static HRESULT parse_schema(LPCWSTR url, return S_OK; } +static HRESULT parse_canonicalize_url(LPCWSTR url, DWORD flags, LPWSTR result, + DWORD size, DWORD *rsize) +{ + IInternetProtocolInfo *protocol_info; + DWORD prsize = size; + HRESULT hres; + + TRACE("(%s %08lx %p %ld %p)\n", debugstr_w(url), flags, result, size, rsize); + + protocol_info = get_protocol_info(url); + + if(protocol_info) { + hres = IInternetProtocolInfo_ParseUrl(protocol_info, url, PARSE_CANONICALIZE, + flags, result, size, rsize, 0); + if(SUCCEEDED(hres)) + return hres; + } + + hres = UrlCanonicalizeW(url, result, &prsize, flags); + + if(rsize) + *rsize = prsize; + return hres; +} + static HRESULT parse_security_url(LPCWSTR url, DWORD flags, LPWSTR result, DWORD size, DWORD *rsize) { IInternetProtocolInfo *protocol_info; @@ -160,6 +185,8 @@ HRESULT WINAPI CoInternetParseUrl(LPCWST WARN("dwReserved = %ld\n", dwReserved); switch(ParseAction) { + case PARSE_CANONICALIZE: + return parse_canonicalize_url(pwzUrl, dwFlags, pszResult, cchResult, pcchResult); case PARSE_SECURITY_URL: return parse_security_url(pwzUrl, dwFlags, pszResult, cchResult, pcchResult); case PARSE_ENCODE:

1 0

Paul Vriens : wininet: FTP_FtpDeleteFileW expects a LPWININETFTPSESSIONW.
by Alexandre Julliard 20 Jul '06

20 Jul '06

Module: wine Branch: refs/heads/master Commit: 5a086a52103a1336c10e4dd06347d093ea4620d1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5a086a52103a1336c10e4dd… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Wed Jul 19 22:33:17 2006 +0200 wininet: FTP_FtpDeleteFileW expects a LPWININETFTPSESSIONW. --- dlls/wininet/ftp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index c2061fb..62f60c1 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1323,7 +1323,7 @@ BOOL WINAPI FtpDeleteFileW(HINTERNET hFt } else { - r = FTP_FtpDeleteFileW(hFtpSession, lpszFileName); + r = FTP_FtpDeleteFileW(lpwfs, lpszFileName); } lend:

1 0