March 2008 - Wine-commits - list.winehq.org

Alexandre Julliard : makefiles: Consider all .res files as object files.
by Alexandre Julliard 13 Mar '08

13 Mar '08

Module: wine Branch: master Commit: 1137f4bf318f8f4053f9e1c74f46b52cf7d32292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1137f4bf318f8f4053f9e1c74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 13 11:47:23 2008 +0100 makefiles: Consider all .res files as object files. --- .gitignore | 150 +------------------------------------------------- Make.rules.in | 5 +- tools/make_makefiles | 3 +- 3 files changed, 4 insertions(+), 154 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1137f4bf318f8f4053f9e…

1 0

Rob Shearman : wininet: Fix local variable shadowing in URLCacheContainer_OpenIndex.
by Alexandre Julliard 12 Mar '08

12 Mar '08

Module: wine Branch: master Commit: bcfb47e85bed0a37046914a4128a06dcec8002eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcfb47e85bed0a37046914a41… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Mar 12 17:40:39 2008 +0000 wininet: Fix local variable shadowing in URLCacheContainer_OpenIndex. --- dlls/wininet/urlcache.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index ab63ac7..d42192a 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -375,8 +375,6 @@ static BOOL URLCacheContainer_OpenIndex(URLCACHECONTAINER * pContainer) if (CreateDirectoryW(wszDirPath, 0)) { - int k; - /* The following is OK because we generated an * 8 character directory name made from characters * [A-Z0-9], which are equivalent for all code

1 0

Jacek Caban : jscript: Added Dll[Un]RegisterServer implementation.
by Alexandre Julliard 12 Mar '08

12 Mar '08

Module: wine Branch: master Commit: 66c728dec1a37f10c6e039f0a63558c05590ab9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=66c728dec1a37f10c6e039f0a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 12 18:41:11 2008 +0100 jscript: Added Dll[Un]RegisterServer implementation. --- dlls/jscript/Makefile.in | 2 + dlls/jscript/jscript.inf | 97 +++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/jscript_main.c | 86 ++++++++++++++++++++++++++++++++++++-- dlls/jscript/rsrc.rc | 20 +++++++++ 4 files changed, 200 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index c1ce428..f314abb 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -6,6 +6,8 @@ MODULE = jscript.dll IMPORTS = kernel32 EXTRALIBS = -luuid +RC_SRCS = rsrc.rc + C_SRCS = \ jscript_main.c diff --git a/dlls/jscript/jscript.inf b/dlls/jscript/jscript.inf new file mode 100644 index 0000000..bdec721 --- /dev/null +++ b/dlls/jscript/jscript.inf @@ -0,0 +1,97 @@ +[version] +Signature="$CHICAGO$" + + +[RegisterDll] +AddReg=Classes.Reg + + +[UnregisterDll] +DelReg=Classes.Reg + + +[Classes.Reg] +HKCR,"CLSID\%CLSID_JScript%",,,"JScript Language" +HKCR,"CLSID\%CLSID_JScript%\Implemented Categories\%CATID_ActiveScript%",,, +HKCR,"CLSID\%CLSID_JScript%\Implemented Categories\%CATID_ActiveScriptParse%",,, +HKCR,"CLSID\%CLSID_JScript%\InprocServer32",,,"%MODULE%" +HKCR,"CLSID\%CLSID_JScript%\InprocServer32","ThreadingModel",,"Both" +HKCR,"CLSID\%CLSID_JScript%\OLEScript",,, +HKCR,"CLSID\%CLSID_JScript%\ProgID",,,"JScript" + +HKCR,"CLSID\%CLSID_JScriptAuthor%",,,"JScript Language Authoring" +HKCR,"CLSID\%CLSID_JScriptAuthor%\Implemented Categories\%CATID_ActiveScriptAuthor%",,, +HKCR,"CLSID\%CLSID_JScriptAuthor%\InprocServer32",,,"%MODULE%" +HKCR,"CLSID\%CLSID_JScriptAuthor%\InprocServer32","ThreadingModel",,"Both" +HKCR,"CLSID\%CLSID_JScriptAuthor%\OLEScript",,, +HKCR,"CLSID\%CLSID_JScriptAuthor%\ProgID",,,"JScript Author" + +HKCR,"CLSID\%CLSID_JScriptEncode%",,,"JScript Language Encoding" +HKCR,"CLSID\%CLSID_JScriptEncode%\Implemented Categories\%CATID_ActiveScript%",,, +HKCR,"CLSID\%CLSID_JScriptEncode%\Implemented Categories\%CATID_ActiveScriptParse%",,, +HKCR,"CLSID\%CLSID_JScriptEncode%\Implemented Categories\%CATID_ActiveScriptEncode%",,, +HKCR,"CLSID\%CLSID_JScriptEncode%\InprocServer32",,,"%MODULE%" +HKCR,"CLSID\%CLSID_JScriptEncode%\InprocServer32","ThreadingModel",,"Both" +HKCR,"CLSID\%CLSID_JScriptEncode%\OLEScript",,, +HKCR,"CLSID\%CLSID_JScriptEncode%\ProgID",,,"JScript.Encode" + +HKCR,"Component Categories\%CATID_ActiveScriptAuthor%","409",,"Active Scripting Engine with Authoring" +HKCR,"Component Categories\%CATID_ActiveScript%","409",,"Active Scripting Engine" +HKCR,"Component Categories\%CATID_ActiveScriptParse%","409",,"Active Scripting Engine with Parsing" +HKCR,"Component Categories\%CATID_ActiveScriptEncode%","409",,"Active Scripting Engine with Encoding" + +HKCR,"ECMAScript",,,"JScript Language" +HKCR,"ECMAScript\CLSID",,,"%CLSID_JScript%" +HKCR,"ECMAScript\OLEScript",,, + +HKCR,"JavaScript",,,"JScript Language" +HKCR,"JavaScript\CLSID",,,"%CLSID_JScript%" +HKCR,"JavaScript\OLEScript",,, + +HKCR,"JavaScript Author",,,"JScript Language Authoring" +HKCR,"JavaScript Author\CLSID",,,"%CLSID_JScriptAuthor%" +HKCR,"JavaScript Author\OLEScript",,, + +HKCR,"JavaScript1.1",,,"JScript Language" +HKCR,"JavaScript1.1\CLSID",,,"%CLSID_JScript%" +HKCR,"JavaScript1.1\OLEScript",,, + +HKCR,"JavaScript1.1 Author",,,"JScript Language Authoring" +HKCR,"JavaScript1.1 Author\CLSID",,,"%CLSID_JScriptAuthor%" +HKCR,"JavaScript1.1 Author\OLEScript",,, + +HKCR,"JavaScript1.2",,,"JScript Language" +HKCR,"JavaScript1.2\CLSID",,,"%CLSID_JScript%" +HKCR,"JavaScript1.2\OLEScript",,, + +HKCR,"JavaScript1.2 Author",,,"JScript Language Authoring" +HKCR,"JavaScript1.2 Author\CLSID",,,"%CLSID_JScriptAuthor%" +HKCR,"JavaScript1.2 Author\OLEScript",,, + +HKCR,"JavaScript1.3",,,"JScript Language" +HKCR,"JavaScript1.3\CLSID",,,"%CLSID_JScript%" +HKCR,"JavaScript1.3\OLEScript",,, + +HKCR,"JScript",,,"JScript Language" +HKCR,"JScript\CLSID",,,"%CLSID_JScript%" +HKCR,"JScript\OLEScript",,, + +HKCR,"JScript Author",,,"JScript Language Authoring" +HKCR,"JScript Author\CLSID",,,"%CLSID_JScriptAuthor%" +HKCR,"JScript Author\OLEScript",,, + +HKCR,"JScript.Encode",,,"JScript Language Encoding" +HKCR,"JScript.Encode\CLSID",,,"%CLSID_JScriptEncode%" +HKCR,"JScript.Encode\OLEScript",,, + +HKCR,"LiveScript",,,"JScript Language" +HKCR,"LiveScript\CLSID",,,"%CLSID_JScript%" +HKCR,"LiveScript\OLEScript",,, + +HKCR,"LiveScript Author",,,"JScript Language Authoring" +HKCR,"LiveScript Author\CLSID",,,"%CLSID_JScriptAuthor%" +HKCR,"LiveScript Author\OLEScript",,, + + +[Strings] +MODULE="jscript.dll" diff --git a/dlls/jscript/jscript_main.c b/dlls/jscript/jscript_main.c index 807a821..dea26ca 100644 --- a/dlls/jscript/jscript_main.c +++ b/dlls/jscript/jscript_main.c @@ -19,16 +19,34 @@ #include "config.h" #include <stdarg.h> +#include <stdio.h> #define COBJMACROS #include "windef.h" #include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "ole2.h" +#include "advpub.h" + +#include "initguid.h" +#include "activscp.h" +#include "activaut.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(jscript); +static const CLSID CLSID_JScript = + {0xf414c260,0x6ac0,0x11cf,{0xb6,0xd1,0x00,0xaa,0x00,0xbb,0xbb,0x58}}; +static const CLSID CLSID_JScriptAuthor = + {0xf414c261,0x6ac0,0x11cf,{0xb6,0xd1,0x00,0xaa,0x00,0xbb,0xbb,0x58}}; +static const CLSID CLSID_JScriptEncode = + {0xf414c262,0x6ac0,0x11cf,{0xb6,0xd1,0x00,0xaa,0x00,0xbb,0xbb,0x58}}; + +static HINSTANCE jscript_hinstance; + /****************************************************************** * DllMain (jscript.@) */ @@ -41,7 +59,8 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); + DisableThreadLibraryCalls(hInstDLL); + jscript_hinstance = hInstDLL; break; } @@ -67,12 +86,69 @@ HRESULT WINAPI DllCanUnloadNow(void) } /*********************************************************************** + * register_inf + */ + +#define INF_SET_ID(id) \ + do \ + { \ + static CHAR name[] = #id; \ + \ + pse[i].pszName = name; \ + clsids[i++] = &id; \ + } while (0) + +static HRESULT register_inf(BOOL doregister) +{ + HRESULT hres; + HMODULE hAdvpack; + HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); + STRTABLEA strtable; + STRENTRYA pse[7]; + static CLSID const *clsids[7]; + int i = 0; + + static const WCHAR advpackW[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; + + INF_SET_ID(CLSID_JScript); + INF_SET_ID(CLSID_JScriptAuthor); + INF_SET_ID(CLSID_JScriptEncode); + INF_SET_ID(CATID_ActiveScript); + INF_SET_ID(CATID_ActiveScriptParse); + INF_SET_ID(CATID_ActiveScriptEncode); + INF_SET_ID(CATID_ActiveScriptAuthor); + + for(i = 0; i < sizeof(pse)/sizeof(pse[0]); i++) { + pse[i].pszValue = HeapAlloc(GetProcessHeap(), 0, 39); + sprintf(pse[i].pszValue, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + clsids[i]->Data1, clsids[i]->Data2, clsids[i]->Data3, clsids[i]->Data4[0], + clsids[i]->Data4[1], clsids[i]->Data4[2], clsids[i]->Data4[3], clsids[i]->Data4[4], + clsids[i]->Data4[5], clsids[i]->Data4[6], clsids[i]->Data4[7]); + } + + strtable.cEntries = sizeof(pse)/sizeof(pse[0]); + strtable.pse = pse; + + hAdvpack = LoadLibraryW(advpackW); + pRegInstall = (void *)GetProcAddress(hAdvpack, "RegInstall"); + + hres = pRegInstall(jscript_hinstance, doregister ? "RegisterDll" : "UnregisterDll", &strtable); + + for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++) + HeapFree(GetProcessHeap(), 0, pse[i].pszValue); + + return hres; +} + +#undef INF_SET_CLSID + +/*********************************************************************** * DllRegisterServer (jscript.@) */ HRESULT WINAPI DllRegisterServer(void) { - FIXME("()\n"); - return S_OK; + TRACE("()\n"); + return register_inf(TRUE); } /*********************************************************************** @@ -80,6 +156,6 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllUnregisterServer(void) { - FIXME("()\n"); - return S_OK; + TRACE("()\n"); + return register_inf(FALSE); } diff --git a/dlls/jscript/rsrc.rc b/dlls/jscript/rsrc.rc new file mode 100644 index 0000000..7a08b79 --- /dev/null +++ b/dlls/jscript/rsrc.rc @@ -0,0 +1,20 @@ +/* + * Copyright 2008 Jacek Caban for CodeWeavers + * + * 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 + */ + +/* @makedep: jscript.inf */ +REGINST REGINST jscript.inf

1 0

Rob Shearman : oleaut32: Split the methods for opening different sources of typelibs out of TLB_ReadTypeLib .
by Alexandre Julliard 12 Mar '08

12 Mar '08

Module: wine Branch: master Commit: 0ec1e2842ae3e4de3db843d3e06d972d91a58fc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ec1e2842ae3e4de3db843d3e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Mar 12 13:29:58 2008 +0000 oleaut32: Split the methods for opening different sources of typelibs out of TLB_ReadTypeLib. --- dlls/oleaut32/typelib.c | 256 +++++++++++++++++++++++++++++++++++++---------- 1 files changed, 202 insertions(+), 54 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index f251d70..70f8a0d 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2217,6 +2217,188 @@ static CRITICAL_SECTION_DEBUG cache_section_debug = static CRITICAL_SECTION cache_section = { &cache_section_debug, -1, 0, 0, 0, 0 }; +typedef struct TLB_PEFile +{ + const IUnknownVtbl *lpvtbl; + LONG refs; + HMODULE dll; + HRSRC typelib_resource; + HGLOBAL typelib_global; + LPVOID typelib_base; +} TLB_PEFile; + +static HRESULT WINAPI TLB_PEFile_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + if (IsEqualIID(riid, &IID_IUnknown)) + { + *ppv = iface; + IUnknown_AddRef(iface); + return S_OK; + } + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI TLB_PEFile_AddRef(IUnknown *iface) +{ + TLB_PEFile *This = (TLB_PEFile *)iface; + return InterlockedIncrement(&This->refs); +} + +static ULONG WINAPI TLB_PEFile_Release(IUnknown *iface) +{ + TLB_PEFile *This = (TLB_PEFile *)iface; + ULONG refs = InterlockedDecrement(&This->refs); + if (!refs) + { + if (This->typelib_global) + FreeResource(This->typelib_global); + if (This->dll) + FreeLibrary(This->dll); + HeapFree(GetProcessHeap(), 0, This); + } + return refs; +} + +static const IUnknownVtbl TLB_PEFile_Vtable = +{ + TLB_PEFile_QueryInterface, + TLB_PEFile_AddRef, + TLB_PEFile_Release +}; + +static HRESULT TLB_PEFile_Open(LPCWSTR path, INT index, LPVOID *ppBase, DWORD *pdwTLBLength, IUnknown **ppFile) +{ + TLB_PEFile *This; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) + return E_OUTOFMEMORY; + + This->lpvtbl = &TLB_PEFile_Vtable; + This->refs = 1; + This->dll = NULL; + This->typelib_resource = NULL; + This->typelib_global = NULL; + This->typelib_base = NULL; + + This->dll = LoadLibraryExW(path, 0, DONT_RESOLVE_DLL_REFERENCES | + LOAD_LIBRARY_AS_DATAFILE | LOAD_WITH_ALTERED_SEARCH_PATH); + + if (This->dll) + { + static const WCHAR TYPELIBW[] = {'T','Y','P','E','L','I','B',0}; + This->typelib_resource = FindResourceW(This->dll, MAKEINTRESOURCEW(index), TYPELIBW); + if (This->typelib_resource) + { + This->typelib_global = LoadResource(This->dll, This->typelib_resource); + if (This->typelib_global) + { + This->typelib_base = LockResource(This->typelib_global); + + if (This->typelib_base) + { + *pdwTLBLength = SizeofResource(This->dll, This->typelib_resource); + *ppBase = This->typelib_base; + *ppFile = (IUnknown *)&This->lpvtbl; + return S_OK; + } + } + } + } + + TLB_PEFile_Release((IUnknown *)&This->lpvtbl); + return TYPE_E_CANTLOADLIBRARY; +} + + +typedef struct TLB_Mapping +{ + const IUnknownVtbl *lpvtbl; + LONG refs; + HANDLE file; + HANDLE mapping; + LPVOID typelib_base; +} TLB_Mapping; + +static HRESULT WINAPI TLB_Mapping_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + if (IsEqualIID(riid, &IID_IUnknown)) + { + *ppv = iface; + IUnknown_AddRef(iface); + return S_OK; + } + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI TLB_Mapping_AddRef(IUnknown *iface) +{ + TLB_Mapping *This = (TLB_Mapping *)iface; + return InterlockedIncrement(&This->refs); +} + +static ULONG WINAPI TLB_Mapping_Release(IUnknown *iface) +{ + TLB_Mapping *This = (TLB_Mapping *)iface; + ULONG refs = InterlockedDecrement(&This->refs); + if (!refs) + { + if (This->typelib_base) + UnmapViewOfFile(This->typelib_base); + if (This->mapping) + CloseHandle(This->mapping); + if (This->file != INVALID_HANDLE_VALUE) + CloseHandle(This->file); + HeapFree(GetProcessHeap(), 0, This); + } + return refs; +} + +static const IUnknownVtbl TLB_Mapping_Vtable = +{ + TLB_Mapping_QueryInterface, + TLB_Mapping_AddRef, + TLB_Mapping_Release +}; + +static HRESULT TLB_Mapping_Open(LPCWSTR path, LPVOID *ppBase, DWORD *pdwTLBLength, IUnknown **ppFile) +{ + TLB_Mapping *This; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) + return E_OUTOFMEMORY; + + This->lpvtbl = &TLB_Mapping_Vtable; + This->refs = 1; + This->file = INVALID_HANDLE_VALUE; + This->mapping = NULL; + This->typelib_base = NULL; + + This->file = CreateFileW(path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + if (INVALID_HANDLE_VALUE != This->file) + { + This->mapping = CreateFileMappingW(This->file, NULL, PAGE_READONLY | SEC_COMMIT, 0, 0, NULL); + if (This->mapping) + { + This->typelib_base = MapViewOfFile(This->mapping, FILE_MAP_READ, 0, 0, 0); + if(This->typelib_base) + { + /* retrieve file size */ + *pdwTLBLength = GetFileSize(This->file, NULL); + *ppBase = This->typelib_base; + *ppFile = (IUnknown *)&This->lpvtbl; + return S_OK; + } + } + } + + IUnknown_Release((IUnknown *)&This->lpvtbl); + return TYPE_E_CANTLOADLIBRARY; +} + /**************************************************************************** * TLB_ReadTypeLib * @@ -2228,10 +2410,12 @@ static CRITICAL_SECTION cache_section = { &cache_section_debug, -1, 0, 0, 0, 0 } static int TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath, ITypeLib2 **ppTypeLib) { ITypeLibImpl *entry; - int ret = TYPE_E_CANTLOADLIBRARY; + HRESULT ret; INT index = 1; - HINSTANCE hinstDLL; LPWSTR index_str, file = (LPWSTR)pszFileName; + LPVOID pBase = NULL; + DWORD dwTLBLength = 0; + IUnknown *pFile = NULL; *ppTypeLib = NULL; @@ -2285,63 +2469,27 @@ static int TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath, IT /* now actually load and parse the typelib */ - hinstDLL = LoadLibraryExW(pszPath, 0, DONT_RESOLVE_DLL_REFERENCES | - LOAD_LIBRARY_AS_DATAFILE | LOAD_WITH_ALTERED_SEARCH_PATH); - - if (hinstDLL) + ret = TLB_PEFile_Open(pszPath, index, &pBase, &dwTLBLength, &pFile); + if (ret == TYPE_E_CANTLOADLIBRARY) + ret = TLB_Mapping_Open(pszPath, &pBase, &dwTLBLength, &pFile); + if (SUCCEEDED(ret)) { - static const WCHAR TYPELIBW[] = {'T','Y','P','E','L','I','B',0}; - HRSRC hrsrc = FindResourceW(hinstDLL, MAKEINTRESOURCEW(index), TYPELIBW); - if (hrsrc) + if (dwTLBLength >= 4) { - HGLOBAL hGlobal = LoadResource(hinstDLL, hrsrc); - if (hGlobal) - { - LPVOID pBase = LockResource(hGlobal); - DWORD dwTLBLength = SizeofResource(hinstDLL, hrsrc); - - if (pBase) - { - /* try to load as incore resource */ - DWORD dwSignature = FromLEDWord(*((DWORD*) pBase)); - if (dwSignature == MSFT_SIGNATURE) - *ppTypeLib = ITypeLib2_Constructor_MSFT(pBase, dwTLBLength); - else if (dwSignature == SLTG_SIGNATURE) - *ppTypeLib = ITypeLib2_Constructor_SLTG(pBase, dwTLBLength); - else - FIXME("Header type magic 0x%08x not supported.\n",dwSignature); - } - FreeResource( hGlobal ); - } - } - FreeLibrary(hinstDLL); - } - else - { - HANDLE hFile = CreateFileW(pszPath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); - if (INVALID_HANDLE_VALUE != hFile) - { - HANDLE hMapping = CreateFileMappingW( hFile, NULL, PAGE_READONLY | SEC_COMMIT, 0, 0, NULL ); - if (hMapping) + DWORD dwSignature = FromLEDWord(*((DWORD*) pBase)); + if (dwSignature == MSFT_SIGNATURE) + *ppTypeLib = ITypeLib2_Constructor_MSFT(pBase, dwTLBLength); + else if (dwSignature == SLTG_SIGNATURE) + *ppTypeLib = ITypeLib2_Constructor_SLTG(pBase, dwTLBLength); + else { - LPVOID pBase = MapViewOfFile(hMapping, FILE_MAP_READ, 0, 0, 0); - if(pBase) - { - /* retrieve file size */ - DWORD dwTLBLength = GetFileSize(hFile, NULL); - DWORD dwSignature = FromLEDWord(*((DWORD*) pBase)); - - if (dwSignature == MSFT_SIGNATURE) - *ppTypeLib = ITypeLib2_Constructor_MSFT(pBase, dwTLBLength); - else if (dwSignature == SLTG_SIGNATURE) - *ppTypeLib = ITypeLib2_Constructor_SLTG(pBase, dwTLBLength); - - UnmapViewOfFile(pBase); - } - CloseHandle(hMapping); + FIXME("Header type magic 0x%08x not supported.\n",dwSignature); + ret = TYPE_E_CANTLOADLIBRARY; } - CloseHandle(hFile); } + else + ret = TYPE_E_CANTLOADLIBRARY; + IUnknown_Release(pFile); } if(*ppTypeLib) {

1 0

Rob Shearman : msi: Fix typos which caused joins of three or more tables to not work properly.
by Alexandre Julliard 12 Mar '08

12 Mar '08

Module: wine Branch: master Commit: dd31a1eac4dbbac2e7a14099a26189fc54cb5029 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd31a1eac4dbbac2e7a14099a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Mar 12 15:12:01 2008 +0000 msi: Fix typos which caused joins of three or more tables to not work properly. In JOIN_fetch_int and JOIN_fetch_stream, prev_rows should be multiplied by the rows encountered in the current table so that prev_rows contains all of counts of the rows encountered multiplied together, rather than just the count of the rows in the last table encountered. --- dlls/msi/join.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/join.c b/dlls/msi/join.c index 7d25217..e24eace 100644 --- a/dlls/msi/join.c +++ b/dlls/msi/join.c @@ -77,7 +77,7 @@ static UINT JOIN_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT *v break; } - prev_rows = table->rows; + prev_rows *= table->rows; cols += table->columns; } @@ -108,7 +108,7 @@ static UINT JOIN_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, IStr break; } - prev_rows = table->rows; + prev_rows *= table->rows; cols += table->columns; }

1 0

Rob Shearman : msi: Passing NULL for szBuffer and NULL for pcchValueBuf into MsiGetProductInfo{A , W} shouldn't crash.
by Alexandre Julliard 12 Mar '08

12 Mar '08

Module: wine Branch: master Commit: 58130dde08396f2b93481e9166f6ecae4a4446e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58130dde08396f2b93481e916… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Mar 12 17:40:51 2008 +0000 msi: Passing NULL for szBuffer and NULL for pcchValueBuf into MsiGetProductInfo{A, W} shouldn't crash. Add a test for this. --- dlls/msi/msi.c | 27 ++++++++++++++++----------- dlls/msi/tests/msi.c | 4 ++++ 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 85446e8..32a4173 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -722,20 +722,25 @@ static UINT WINAPI MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, goto done; } - save = *pcchValueBuf; + if (pcchValueBuf) + { + save = *pcchValueBuf; - if (lstrlenW(val) < *pcchValueBuf) - r = msi_strcpy_to_awstring(val, szValue, pcchValueBuf); - else if (szValue->str.a || szValue->str.w) - r = ERROR_MORE_DATA; + if (lstrlenW(val) < *pcchValueBuf) + r = msi_strcpy_to_awstring(val, szValue, pcchValueBuf); + else if (szValue->str.a || szValue->str.w) + r = ERROR_MORE_DATA; - if (!badconfig) - *pcchValueBuf = lstrlenW(val); - else if (r == ERROR_SUCCESS) - { - *pcchValueBuf = save; - r = ERROR_BAD_CONFIGURATION; + if (!badconfig) + *pcchValueBuf = lstrlenW(val); + else if (r == ERROR_SUCCESS) + { + *pcchValueBuf = save; + r = ERROR_BAD_CONFIGURATION; + } } + else if (badconfig) + r = ERROR_BAD_CONFIGURATION; if (val != empty) msi_free(val); diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index f82a9a9..5da8673 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -2233,6 +2233,10 @@ static void test_MsiGetProductInfo(void) ok(!lstrcmpA(buf, "link"), "Expected \"link\", got \"%s\"\n", buf); ok(sz == 4, "Expected 4, got %d\n", sz); + /* pcchBuf is NULL */ + r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINK, NULL, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + /* lpValueBuf is NULL */ sz = MAX_PATH; r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINK, NULL, &sz);

1 0

Jacek Caban : secur32: Fixed dynamic loading in schannel test.
by Alexandre Julliard 12 Mar '08

12 Mar '08

Module: wine Branch: master Commit: d11e30e484785dad780d2254a7af80affc6a0d18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d11e30e484785dad780d2254a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 12 18:34:55 2008 +0100 secur32: Fixed dynamic loading in schannel test. --- dlls/secur32/tests/schannel.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index dec9368..b19590a 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -28,14 +28,15 @@ #include "wine/test.h" static HMODULE secdll, crypt32dll; -static SECURITY_STATUS (SEC_ENTRY * pAcquireCredentialsHandleA)(SEC_CHAR*, SEC_CHAR*, - ULONG, PLUID, PVOID, SEC_GET_KEY_FN, PVOID, PCredHandle, PTimeStamp); + +static ACQUIRE_CREDENTIALS_HANDLE_FN_A pAcquireCredentialsHandleA; +static FREE_CREDENTIALS_HANDLE_FN pFreeCredentialsHandle; + static PCCERT_CONTEXT (WINAPI *pCertCreateCertificateContext)(DWORD,const BYTE*,DWORD); static BOOL (WINAPI *pCertFreeCertificateContext)(PCCERT_CONTEXT); static BOOL (WINAPI *pCertSetCertificateContextProperty)(PCCERT_CONTEXT,DWORD,DWORD,const void*); -static SECURITY_STATUS (SEC_ENTRY * pFreeCredentialsHandle)(PCredHandle); -static BOOL (WINAPI * pCryptAcquireContextW)(HCRYPTPROV*, LPCWSTR, LPCWSTR, DWORD, DWORD); +static BOOL (WINAPI *pCryptAcquireContextW)(HCRYPTPROV*, LPCWSTR, LPCWSTR, DWORD, DWORD); static BOOL (WINAPI *pCryptDestroyKey)(HCRYPTKEY); static BOOL (WINAPI *pCryptImportKey)(HCRYPTPROV,CONST BYTE*,DWORD,HCRYPTKEY,DWORD,HCRYPTKEY*); static BOOL (WINAPI *pCryptReleaseContext)(HCRYPTPROV,ULONG_PTR); @@ -105,12 +106,13 @@ static const BYTE selfSignedCert[] = { static void InitFunctionPtrs(void) { - HMODULE advapi32dll = GetModuleHandleA("advapi32.dll"); + HMODULE advapi32dll; crypt32dll = LoadLibraryA("crypt32.dll"); secdll = LoadLibraryA("secur32.dll"); if(!secdll) secdll = LoadLibraryA("security.dll"); + advapi32dll = GetModuleHandleA("advapi32.dll"); #define GET_PROC(h, func) p ## func = (void*)GetProcAddress(h, #func) @@ -127,6 +129,7 @@ static void InitFunctionPtrs(void) GET_PROC(crypt32dll, CertFreeCertificateContext); GET_PROC(crypt32dll, CertSetCertificateContextProperty); + GET_PROC(crypt32dll, CertCreateCertificateContext); #undef GET_PROC }

1 0

Jacek Caban : secur32: Improve SECPKG_ATTR_CIPHER_STRENGTHS stub.
by Alexandre Julliard 12 Mar '08

12 Mar '08

Module: wine Branch: master Commit: 87368bb623849b500e6238903ac7e6dffb018e5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=87368bb623849b500e6238903… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 12 18:35:10 2008 +0100 secur32: Improve SECPKG_ATTR_CIPHER_STRENGTHS stub. --- dlls/secur32/schannel.c | 12 ++++++++---- dlls/secur32/tests/schannel.c | 15 +++++++++++++++ 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index b74e54c..742cdb3 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -39,7 +39,7 @@ static SECURITY_STATUS schan_QueryCredentialsAttributes( if (pBuffer) { /* FIXME: get from CryptoAPI */ - FIXME("%d: stub\n", ulAttribute); + FIXME("SECPKG_ATTR_SUPPORTED_ALGS: stub\n"); ret = SEC_E_UNSUPPORTED_FUNCTION; } else @@ -48,9 +48,13 @@ static SECURITY_STATUS schan_QueryCredentialsAttributes( case SECPKG_ATTR_CIPHER_STRENGTHS: if (pBuffer) { + SecPkgCred_CipherStrengths *r = (SecPkgCred_CipherStrengths*)pBuffer; + /* FIXME: get from CryptoAPI */ - FIXME("%d: stub\n", ulAttribute); - ret = SEC_E_UNSUPPORTED_FUNCTION; + FIXME("SECPKG_ATTR_CIPHER_STRENGTHS: semi-stub\n"); + r->dwMinimumCipherStrength = 40; + r->dwMaximumCipherStrength = 168; + ret = SEC_E_OK; } else ret = SEC_E_INTERNAL_ERROR; @@ -59,7 +63,7 @@ static SECURITY_STATUS schan_QueryCredentialsAttributes( if (pBuffer) { /* FIXME: get from OpenSSL? */ - FIXME("%d: stub\n", ulAttribute); + FIXME("SECPKG_ATTR_SUPPORTED_PROTOCOLS: stub\n"); ret = SEC_E_UNSUPPORTED_FUNCTION; } else diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index b19590a..2fc793b 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -31,6 +31,7 @@ static HMODULE secdll, crypt32dll; static ACQUIRE_CREDENTIALS_HANDLE_FN_A pAcquireCredentialsHandleA; static FREE_CREDENTIALS_HANDLE_FN pFreeCredentialsHandle; +static QUERY_CREDENTIALS_ATTRIBUTES_FN_A pQueryCredentialsAttributesA; static PCCERT_CONTEXT (WINAPI *pCertCreateCertificateContext)(DWORD,const BYTE*,DWORD); static BOOL (WINAPI *pCertFreeCertificateContext)(PCCERT_CONTEXT); @@ -120,6 +121,7 @@ static void InitFunctionPtrs(void) { GET_PROC(secdll, AcquireCredentialsHandleA); GET_PROC(secdll, FreeCredentialsHandle); + GET_PROC(secdll, QueryCredentialsAttributesA); } GET_PROC(advapi32dll, CryptAcquireContextW); @@ -134,6 +136,18 @@ static void InitFunctionPtrs(void) #undef GET_PROC } +static void test_strength(PCredHandle handle) +{ + SecPkgCred_CipherStrengths strength = {-1,-1}; + SECURITY_STATUS st; + + st = pQueryCredentialsAttributesA(handle, SECPKG_ATTR_CIPHER_STRENGTHS, &strength); + ok(st == SEC_E_OK, "QueryCredentialsAttributesA failed: %u\n", GetLastError()); + ok(strength.dwMinimumCipherStrength, "dwMinimumCipherStrength not changed\n"); + ok(strength.dwMaximumCipherStrength, "dwMaximumCipherStrength not changed\n"); + trace("strength %d - %d\n", strength.dwMinimumCipherStrength, strength.dwMaximumCipherStrength); +} + static void testAcquireSecurityContext(void) { SECURITY_STATUS st; @@ -347,6 +361,7 @@ static void testAcquireSecurityContext(void) st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, NULL, &schanCred, NULL, NULL, &cred, NULL); ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", st); + test_strength(&cred); pFreeCredentialsHandle(&cred); /* How about more than one cert? */

1 0

Rob Shearman : wininet: Fix URLCache_LocalFileNameToPathA to return a full path, rather than just the container path.
by Alexandre Julliard 12 Mar '08

12 Mar '08

Module: wine Branch: master Commit: cdd135c2f3024835192d7fef55e3a0e9e2bbfd73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdd135c2f3024835192d7fef5… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Mar 12 15:36:00 2008 +0000 wininet: Fix URLCache_LocalFileNameToPathA to return a full path, rather than just the container path. This was caused by path_len including the nul-terminator and so the rest of the string was being added after the nul-terminator, which is incorrect. This is fixed by making path_len not include the nul-terminator. Also fix a few other issues with the function, like not passing a correct length into the second call to WideCharToMultiByte, nRequired being calculated incorrectly and the string not always being nul-terminated. Add a test for this function by testing the lpszLocalFileName field obtained from RetrieveUrlCacheEntryFileA. --- dlls/wininet/tests/urlcache.c | 1 + dlls/wininet/urlcache.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 572420a..3d82caf 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -70,6 +70,7 @@ static void test_urlcacheA(void) ok(lpCacheEntryInfo->dwStructSize == sizeof(*lpCacheEntryInfo), "lpCacheEntryInfo->dwStructSize was %d\n", lpCacheEntryInfo->dwStructSize); ok(!strcmp(lpCacheEntryInfo->lpszSourceUrlName, TEST_URL), "lpCacheEntryInfo->lpszSourceUrlName should be %s instead of %s\n", TEST_URL, lpCacheEntryInfo->lpszSourceUrlName); + ok(!strcmp(lpCacheEntryInfo->lpszLocalFileName, filename), "lpCacheEntryInfo->lpszLocalFileName should be %s instead of %s\n", filename, lpCacheEntryInfo->lpszLocalFileName); HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 90c0d58..2f24b15 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -909,14 +909,14 @@ static BOOL URLCache_LocalFileNameToPathA( return FALSE; } - path_len = WideCharToMultiByte(CP_ACP, 0, pContainer->path, -1, NULL, 0, NULL, NULL); - file_name_len = strlen(szLocalFileName); + path_len = WideCharToMultiByte(CP_ACP, 0, pContainer->path, -1, NULL, 0, NULL, NULL) - 1; + file_name_len = strlen(szLocalFileName) + 1 /* for nul-terminator */; dir_len = DIR_LENGTH; - nRequired = (path_len + dir_len + 1 + file_name_len) * sizeof(WCHAR); + nRequired = (path_len + dir_len + 1 + file_name_len) * sizeof(char); if (nRequired < *lpBufferSize) { - WideCharToMultiByte(CP_ACP, 0, pContainer->path, -1, szPath, -1, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, pContainer->path, -1, szPath, path_len, NULL, NULL); memcpy(szPath+path_len, pHeader->directory_data[Directory].filename, dir_len); szPath[path_len + dir_len] = '\\'; memcpy(szPath + path_len + dir_len + 1, szLocalFileName, file_name_len);

1 0

Rob Shearman : wininet: The URL in CommitUrlCacheEntryInternal shouldn' t be restricted to MAX_PATH chars in length.
by Alexandre Julliard 12 Mar '08

12 Mar '08

Module: wine Branch: master Commit: fee165ae47781e1a1ff9f6bbb4f56166c2d5c43b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fee165ae47781e1a1ff9f6bbb… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Mar 12 16:40:58 2008 +0000 wininet: The URL in CommitUrlCacheEntryInternal shouldn't be restricted to MAX_PATH chars in length. Dynamically allocate it and consolidate cleanup at the end of the function. --- dlls/wininet/urlcache.c | 51 ++++++++++++++++++++++++++++++---------------- 1 files changed, 33 insertions(+), 18 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 2f24b15..4ef881f 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2216,9 +2216,11 @@ static BOOL WINAPI CommitUrlCacheEntryInternal( DWORD dwFileSizeLow = 0; DWORD dwFileSizeHigh = 0; BYTE cDirectory = 0; + int len; char achFile[MAX_PATH]; - char achUrl[MAX_PATH]; + LPSTR lpszUrlNameA = NULL; char *pchLocalFileName = 0; + DWORD error = ERROR_SUCCESS; TRACE("(%s, %s, ..., ..., %x, %p, %d, %s, %s)\n", debugstr_w(lpszUrlName), @@ -2264,17 +2266,23 @@ static BOOL WINAPI CommitUrlCacheEntryInternal( if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) return FALSE; - WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, achUrl, -1, NULL, NULL); + len = WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, NULL, 0, NULL, NULL); + lpszUrlNameA = HeapAlloc(GetProcessHeap(), 0, len * sizeof(char)); + if (!lpszUrlNameA) + { + error = GetLastError(); + goto cleanup; + } + WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, lpszUrlNameA, len, NULL, NULL); - if (URLCache_FindHash(pHeader, achUrl, &pHashEntry)) + if (URLCache_FindHash(pHeader, lpszUrlNameA, &pHashEntry)) { - URLCacheContainer_UnlockIndex(pContainer, pHeader); FIXME("entry already in cache - don't know what to do!\n"); /* * SetLastError(ERROR_FILE_NOT_FOUND); * return FALSE; */ - return TRUE; + goto cleanup; } if (lpszLocalFileName) @@ -2283,10 +2291,9 @@ static BOOL WINAPI CommitUrlCacheEntryInternal( if (strncmpW(lpszLocalFileName, pContainer->path, lstrlenW(pContainer->path))) { - URLCacheContainer_UnlockIndex(pContainer, pHeader); ERR("path %s must begin with cache content path %s\n", debugstr_w(lpszLocalFileName), debugstr_w(pContainer->path)); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + error = ERROR_INVALID_PARAMETER; + goto cleanup; } /* skip container path prefix */ @@ -2306,18 +2313,18 @@ static BOOL WINAPI CommitUrlCacheEntryInternal( if (!bFound) { - URLCacheContainer_UnlockIndex(pContainer, pHeader); ERR("cache directory not found in path %s\n", debugstr_w(lpszLocalFileName)); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + error = ERROR_INVALID_PARAMETER; + goto cleanup; } lpszLocalFileName += (DIR_LENGTH + 1); /* "1234WXYZ\" */ } - dwBytesNeeded = DWORD_ALIGN(dwBytesNeeded + strlen(achUrl) + 1); + dwBytesNeeded = DWORD_ALIGN(dwBytesNeeded + strlen(lpszUrlNameA) + 1); if (lpszLocalFileName) { + len = WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, NULL, 0, NULL, NULL); dwOffsetLocalFileName = dwBytesNeeded; dwBytesNeeded = DWORD_ALIGN(dwBytesNeeded + strlen(pchLocalFileName) + 1); } @@ -2336,10 +2343,9 @@ static BOOL WINAPI CommitUrlCacheEntryInternal( if (!URLCache_FindFirstFreeEntry(pHeader, dwBytesNeeded / BLOCKSIZE, &pEntry)) { - URLCacheContainer_UnlockIndex(pContainer, pHeader); ERR("no free entries\n"); - SetLastError(ERROR_DISK_FULL); - return FALSE; + error = ERROR_DISK_FULL; + goto cleanup; } /* FindFirstFreeEntry fills in blocks used */ @@ -2375,22 +2381,31 @@ static BOOL WINAPI CommitUrlCacheEntryInternal( pUrlEntry->dwUnknown8 = 0; - strcpy((LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, achUrl); + strcpy((LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, lpszUrlNameA); if (dwOffsetLocalFileName) strcpy((LPSTR)((LPBYTE)pUrlEntry + dwOffsetLocalFileName), pchLocalFileName + DIR_LENGTH + 1); if (dwOffsetHeader) memcpy((LPBYTE)pUrlEntry + dwOffsetHeader, lpHeaderInfo, dwHeaderSize); - if (!URLCache_AddEntryToHash(pHeader, achUrl, (DWORD)((LPBYTE)pUrlEntry - (LPBYTE)pHeader))) + if (!URLCache_AddEntryToHash(pHeader, lpszUrlNameA, (DWORD)((LPBYTE)pUrlEntry - (LPBYTE)pHeader))) { URLCache_DeleteEntry(pHeader, &pUrlEntry->CacheFileEntry); URLCacheContainer_UnlockIndex(pContainer, pHeader); + HeapFree(GetProcessHeap(), 0, lpszUrlNameA); return FALSE; } +cleanup: URLCacheContainer_UnlockIndex(pContainer, pHeader); + HeapFree(GetProcessHeap(), 0, lpszUrlNameA); - return TRUE; + if (error == ERROR_SUCCESS) + return TRUE; + else + { + SetLastError(error); + return FALSE; + } } /***********************************************************************

1 0