September 2009 - Wine-Commits

Huw Davies : wine.inf: Register msdaps.dll.
by Alexandre Julliard Sept. 2, 2009

Sept. 2, 2009

Module: wine Branch: master Commit: 6be5ab78b9dd3e7d16c59d2674861314dc2b431b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6be5ab78b9dd3e7d16c59d267… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 2 12:25:58 2009 +0100 wine.inf: Register msdaps.dll. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 8be3246..a3d968a 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2413,6 +2413,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,jscript.dll,1 11,,mlang.dll,1 11,,msctf.dll,1 +11,,msdaps.dll,1 11,,mshtml.dll,1 11,,msi.dll,1 11,,msiexec.exe,1

1 0

Huw Davies : oledb32: Add a stub implementation of the conversion library class.
by Alexandre Julliard Sept. 2, 2009

Sept. 2, 2009

Module: wine Branch: master Commit: f2490c50d9896bc27e4cf1737812003fc7686931 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2490c50d9896bc27e4cf1737… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 2 12:13:12 2009 +0100 oledb32: Add a stub implementation of the conversion library class. --- .gitignore | 2 + dlls/oledb32/Makefile.in | 5 +- dlls/oledb32/convert.c | 166 ++++++++++++++++++++++++++++++++++++++++++ dlls/oledb32/convert.idl | 1 + dlls/oledb32/main.c | 99 +++++++++++++++++++++++++ dlls/oledb32/oledb32.spec | 2 +- dlls/oledb32/oledb_private.h | 20 +++++ 7 files changed, 293 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f2490c50d9896bc27e4cf…

1 0

Huw Davies : oledb32: Add a stub oledb32.dll.
by Alexandre Julliard Sept. 2, 2009

Sept. 2, 2009

Module: wine Branch: master Commit: bcfce0592bd44b483ca36cfed9a5c719b2c8bba6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcfce0592bd44b483ca36cfed… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 2 12:02:39 2009 +0100 oledb32: Add a stub oledb32.dll. --- configure | 9 +++++++++ configure.ac | 1 + dlls/oledb32/Makefile.in | 14 ++++++++++++++ dlls/oledb32/main.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/oledb32/oledb32.spec | 4 ++++ 5 files changed, 65 insertions(+), 0 deletions(-) diff --git a/configure b/configure index d8db56d..5ae5fbb 100755 --- a/configure +++ b/configure @@ -15914,6 +15914,14 @@ dlls/olecli32/Makefile: dlls/olecli32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/olecli32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/oledb32/Makefile" +test "x$enable_oledb32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + oledb32" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/oledb32/Makefile: dlls/oledb32/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/oledb32/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/oledlg/Makefile" test "x$enable_oledlg" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ oledlg" @@ -18841,6 +18849,7 @@ do "dlls/oleaut32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/oleaut32/tests/Makefile" ;; "dlls/olecli.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/olecli.dll16/Makefile" ;; "dlls/olecli32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/olecli32/Makefile" ;; + "dlls/oledb32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/oledb32/Makefile" ;; "dlls/oledlg/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/oledlg/Makefile" ;; "dlls/olepro32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/olepro32/Makefile" ;; "dlls/olesvr.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/olesvr.dll16/Makefile" ;; diff --git a/configure.ac b/configure.ac index 5c753c0..0d2e860 100644 --- a/configure.ac +++ b/configure.ac @@ -2340,6 +2340,7 @@ WINE_CONFIG_MAKEFILE([dlls/oleaut32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_D WINE_CONFIG_MAKEFILE([dlls/oleaut32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/olecli.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/olecli32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/oledb32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/oledlg/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/olepro32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/olesvr.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) diff --git a/dlls/oledb32/Makefile.in b/dlls/oledb32/Makefile.in new file mode 100644 index 0000000..5381503 --- /dev/null +++ b/dlls/oledb32/Makefile.in @@ -0,0 +1,14 @@ +EXTRADEFS = -DCOM_NO_WINDOWS_H +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = oledb32.dll +IMPORTS = oleaut32 ole32 user32 advapi32 kernel32 + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/oledb32/main.c b/dlls/oledb32/main.c new file mode 100644 index 0000000..46c5438 --- /dev/null +++ b/dlls/oledb32/main.c @@ -0,0 +1,37 @@ +/* OLE DB Initialization + * + * Copyright 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 + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID lpv) +{ + switch(reason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinst); + break; + + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} diff --git a/dlls/oledb32/oledb32.spec b/dlls/oledb32/oledb32.spec new file mode 100644 index 0000000..c5fc87a --- /dev/null +++ b/dlls/oledb32/oledb32.spec @@ -0,0 +1,4 @@ +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer

1 0

Hans Leidekker : wininet: Destroy authorization info on failure in HTTP_DoAuthorization.
by Alexandre Julliard Sept. 2, 2009

Sept. 2, 2009

Module: wine Branch: master Commit: 50fef74131352520e8e09efd34fafee61cd02ede URL: http://source.winehq.org/git/wine.git/?a=commit;h=50fef74131352520e8e09efd3… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Wed Sep 2 11:44:43 2009 +0200 wininet: Destroy authorization info on failure in HTTP_DoAuthorization. This makes sure the app can retry authorization, e.g. when username and password are not supplied upfront and there are no cached credentials. --- dlls/wininet/http.c | 44 ++++++++++++++++++-------------------------- 1 files changed, 18 insertions(+), 26 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 681658e..e94e5cc 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -503,6 +503,20 @@ static inline BOOL is_basic_auth_value( LPCWSTR pszAuthValue ) ((pszAuthValue[ARRAYSIZE(szBasic)] == ' ') || !pszAuthValue[ARRAYSIZE(szBasic)]); } +static void destroy_authinfo( struct HttpAuthInfo *authinfo ) +{ + if (!authinfo) return; + + if (SecIsValidHandle(&authinfo->ctx)) + DeleteSecurityContext(&authinfo->ctx); + if (SecIsValidHandle(&authinfo->cred)) + FreeCredentialsHandle(&authinfo->cred); + + HeapFree(GetProcessHeap(), 0, authinfo->auth_data); + HeapFree(GetProcessHeap(), 0, authinfo->scheme); + HeapFree(GetProcessHeap(), 0, authinfo); +} + static BOOL HTTP_DoAuthorization( http_request_t *lpwhr, LPCWSTR pszAuthValue, struct HttpAuthInfo **ppAuthInfo, LPWSTR domain_and_username, LPWSTR password ) @@ -706,8 +720,9 @@ static BOOL HTTP_DoAuthorization( http_request_t *lpwhr, LPCWSTR pszAuthValue, else { ERR("InitializeSecurityContextW returned error 0x%08x\n", sec_status); - pAuthInfo->finished = TRUE; HeapFree(GetProcessHeap(), 0, out.pvBuffer); + destroy_authinfo(pAuthInfo); + *ppAuthInfo = NULL; return FALSE; } } @@ -1507,31 +1522,8 @@ static void HTTPREQ_Destroy(object_header_t *hdr) DeleteCriticalSection( &lpwhr->read_section ); WININET_Release(&lpwhr->lpHttpSession->hdr); - if (lpwhr->pAuthInfo) - { - if (SecIsValidHandle(&lpwhr->pAuthInfo->ctx)) - DeleteSecurityContext(&lpwhr->pAuthInfo->ctx); - if (SecIsValidHandle(&lpwhr->pAuthInfo->cred)) - FreeCredentialsHandle(&lpwhr->pAuthInfo->cred); - - HeapFree(GetProcessHeap(), 0, lpwhr->pAuthInfo->auth_data); - HeapFree(GetProcessHeap(), 0, lpwhr->pAuthInfo->scheme); - HeapFree(GetProcessHeap(), 0, lpwhr->pAuthInfo); - lpwhr->pAuthInfo = NULL; - } - - if (lpwhr->pProxyAuthInfo) - { - if (SecIsValidHandle(&lpwhr->pProxyAuthInfo->ctx)) - DeleteSecurityContext(&lpwhr->pProxyAuthInfo->ctx); - if (SecIsValidHandle(&lpwhr->pProxyAuthInfo->cred)) - FreeCredentialsHandle(&lpwhr->pProxyAuthInfo->cred); - - HeapFree(GetProcessHeap(), 0, lpwhr->pProxyAuthInfo->auth_data); - HeapFree(GetProcessHeap(), 0, lpwhr->pProxyAuthInfo->scheme); - HeapFree(GetProcessHeap(), 0, lpwhr->pProxyAuthInfo); - lpwhr->pProxyAuthInfo = NULL; - } + destroy_authinfo(lpwhr->pAuthInfo); + destroy_authinfo(lpwhr->pProxyAuthInfo); HeapFree(GetProcessHeap(), 0, lpwhr->lpszPath); HeapFree(GetProcessHeap(), 0, lpwhr->lpszVerb);

1 0

Hans Leidekker : msi: Add a partial implementation of MsiDetermineApplicablePatchesW.
by Alexandre Julliard Sept. 2, 2009

Sept. 2, 2009

Module: wine Branch: master Commit: 05e9a1fce826d9bc2ca3895dd40e42d9cba1a3ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=05e9a1fce826d9bc2ca3895dd… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Wed Sep 2 11:44:17 2009 +0200 msi: Add a partial implementation of MsiDetermineApplicablePatchesW. --- dlls/msi/action.c | 2 +- dlls/msi/msi.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++-- dlls/msi/msipriv.h | 2 + include/msi.h | 2 + 4 files changed, 81 insertions(+), 4 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 85d95a6..881c4a2 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -501,7 +501,7 @@ static UINT msi_apply_substorage_transform( MSIPACKAGE *package, return ERROR_SUCCESS; } -static UINT msi_check_patch_applicable( MSIPACKAGE *package, MSISUMMARYINFO *si ) +UINT msi_check_patch_applicable( MSIPACKAGE *package, MSISUMMARYINFO *si ) { static const WCHAR szProdCode[] = { 'P','r','o','d','u','c','t','C','o','d','e',0 }; LPWSTR guid_list, *guids, product_code; diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index be1ad93..ba9d8bf 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -489,13 +489,86 @@ UINT WINAPI MsiDetermineApplicablePatchesA(LPCSTR szProductPackagePath, return ERROR_CALL_NOT_IMPLEMENTED; } +static UINT MSI_ApplicablePatchW( MSIPACKAGE *package, LPCWSTR patch ) +{ + MSISUMMARYINFO *si; + MSIDATABASE *patch_db; + UINT r = ERROR_SUCCESS; + + r = MSI_OpenDatabaseW( patch, MSIDBOPEN_READONLY, &patch_db ); + if (r != ERROR_SUCCESS) + { + WARN("failed to open patch file %s\n", debugstr_w(patch)); + return r; + } + + si = MSI_GetSummaryInformationW( patch_db->storage, 0 ); + if (!si) + { + r = ERROR_FUNCTION_FAILED; + goto done; + } + + r = msi_check_patch_applicable( package, si ); + if (r != ERROR_SUCCESS) + TRACE("patch not applicable\n"); + +done: + msiobj_release( &patch_db->hdr ); + msiobj_release( &si->hdr ); + return r; +} + UINT WINAPI MsiDetermineApplicablePatchesW(LPCWSTR szProductPackagePath, DWORD cPatchInfo, PMSIPATCHSEQUENCEINFOW pPatchInfo) { - FIXME("(%s, %d, %p): stub!\n", debugstr_w(szProductPackagePath), - cPatchInfo, pPatchInfo); + UINT i, r, ret = ERROR_FUNCTION_FAILED; + MSIPACKAGE *package; - return ERROR_CALL_NOT_IMPLEMENTED; + TRACE("(%s, %d, %p)\n", debugstr_w(szProductPackagePath), cPatchInfo, pPatchInfo); + + r = MSI_OpenPackageW( szProductPackagePath, &package ); + if (r != ERROR_SUCCESS) + { + ERR("failed to open package %u\n", r); + return r; + } + + for (i = 0; i < cPatchInfo; i++) + { + switch (pPatchInfo[i].ePatchDataType) + { + case MSIPATCH_DATATYPE_PATCHFILE: + { + FIXME("patch ordering not supported\n"); + r = MSI_ApplicablePatchW( package, pPatchInfo[i].szPatchData ); + if (r != ERROR_SUCCESS) + { + pPatchInfo[i].dwOrder = ~0u; + pPatchInfo[i].uStatus = ERROR_PATCH_TARGET_NOT_FOUND; + } + else + { + pPatchInfo[i].dwOrder = i; + pPatchInfo[i].uStatus = ret = ERROR_SUCCESS; + } + break; + } + default: + { + FIXME("patch data type %u not supported\n", pPatchInfo[i].ePatchDataType); + pPatchInfo[i].dwOrder = ~0u; + pPatchInfo[i].uStatus = ERROR_PATCH_TARGET_NOT_FOUND; + break; + } + } + + TRACE(" szPatchData: %s\n", debugstr_w(pPatchInfo[i].szPatchData)); + TRACE("ePatchDataType: %u\n", pPatchInfo[i].ePatchDataType); + TRACE(" dwOrder: %u\n", pPatchInfo[i].dwOrder); + TRACE(" uStatus: %u\n", pPatchInfo[i].uStatus); + } + return ret; } UINT WINAPI MsiDeterminePatchSequenceA(LPCSTR szProductCode, LPCSTR szUserSid, diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index b61d7b6..23756fa 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -683,6 +683,8 @@ extern UINT MSI_DatabaseApplyTransformW( MSIDATABASE *db, LPCWSTR szTransformFile, int iErrorCond ); extern void append_storage_to_db( MSIDATABASE *db, IStorage *stg ); +extern UINT msi_check_patch_applicable( MSIPACKAGE *package, MSISUMMARYINFO *si ); + /* action internals */ extern UINT MSI_InstallPackage( MSIPACKAGE *, LPCWSTR, LPCWSTR ); extern void ACTION_free_package_structures( MSIPACKAGE* ); diff --git a/include/msi.h b/include/msi.h index 5e68fdc..2c0a37f 100644 --- a/include/msi.h +++ b/include/msi.h @@ -237,6 +237,8 @@ typedef struct tagMSIPATCHSEQUENCEINFOW #define MAX_FEATURE_CHARS 38 +#define ERROR_PATCH_TARGET_NOT_FOUND 1642 + /* Strings defined in msi.h */ /* Advertised Information */

1 0

Hans Leidekker : msi: Set REINSTALL property when the product is already installed and the command line is empty .
by Alexandre Julliard Sept. 2, 2009

Sept. 2, 2009

Module: wine Branch: master Commit: 1169aa9a58563d5182f2e301b77d35610306254e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1169aa9a58563d5182f2e301b… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Wed Sep 2 11:43:45 2009 +0200 msi: Set REINSTALL property when the product is already installed and the command line is empty. --- dlls/msi/action.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index c824904..85d95a6 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -789,6 +789,9 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, static const WCHAR szUILevel[] = {'U','I','L','e','v','e','l',0}; static const WCHAR szAction[] = {'A','C','T','I','O','N',0}; static const WCHAR szInstall[] = {'I','N','S','T','A','L','L',0}; + static const WCHAR szReinstall[] = {'R','E','I','N','S','T','A','L','L',0}; + static const WCHAR szInstalled[] = {'I','n','s','t','a','l','l','e','d',0}; + static const WCHAR szAll[] = {'A','L','L',0}; MSI_SetPropertyW(package, szAction, szInstall); @@ -837,6 +840,12 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, msi_apply_transforms( package ); msi_apply_patches( package ); + if (!szCommandLine && msi_get_property_int( package, szInstalled, 0 )) + { + TRACE("setting reinstall property\n"); + MSI_SetPropertyW( package, szReinstall, szAll ); + } + /* properties may have been added by a transform */ msi_clone_properties( package ); msi_set_context( package );

1 0

Hans Leidekker : mscms/tests: Remove code that mixes up color space IDs and standard color space IDs.
by Alexandre Julliard Sept. 2, 2009

Sept. 2, 2009

Module: wine Branch: master Commit: 82aa18f666cf178b3cc71e38db630a860af69d84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82aa18f666cf178b3cc71e38d… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Wed Sep 2 11:43:13 2009 +0200 mscms/tests: Remove code that mixes up color space IDs and standard color space IDs. --- dlls/mscms/tests/profile.c | 303 ++++++++++---------------------------------- 1 files changed, 69 insertions(+), 234 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=82aa18f666cf178b3cc71…

1 0

Hans Leidekker : mscms: Use correct standard color space constants in GetStandardColorSpaceProfileW .
by Alexandre Julliard Sept. 2, 2009

Sept. 2, 2009

Module: wine Branch: master Commit: b6ffca256ef9985ec18f5d00e699cf341b770b8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6ffca256ef9985ec18f5d00e… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Wed Sep 2 11:42:34 2009 +0200 mscms: Use correct standard color space constants in GetStandardColorSpaceProfileW. --- dlls/mscms/profile.c | 5 +++-- include/wingdi.h | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 1c6811e..c9a5b42 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -660,8 +660,9 @@ BOOL WINAPI GetStandardColorSpaceProfileW( PCWSTR machine, DWORD id, PWSTR profi GetColorDirectoryW( machine, rgbprofile, &len ); switch (id) - { - case SPACE_RGB: /* 'RGB ' */ + case LCS_sRGB: + case LCS_WINDOWS_COLOR_SPACE: /* FIXME */ + { lstrcatW( rgbprofile, rgbprofilefile ); len = lstrlenW( rgbprofile ) * sizeof(WCHAR); diff --git a/include/wingdi.h b/include/wingdi.h index 0e5d5e6..99fd2bc 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -151,6 +151,9 @@ typedef LONG FXPT2DOT30, *LPFXPT2DOT30; typedef LONG LCSCSTYPE; typedef LONG LCSGAMUTMATCH; +#define LCS_sRGB 0x73524742 /* 'sRGB' */ +#define LCS_WINDOWS_COLOR_SPACE 0x57696e20 /* 'Win ' */ + #define LCS_CALIBRATED_RGB 0x00000000L #define LCS_DEVICE_RGB 0x00000001L #define LCS_DEVICE_CMYK 0x00000002L

1 0

Piotr Caban : jscript: Added JSGlobal_unescape implementation.
by Alexandre Julliard Sept. 2, 2009

Sept. 2, 2009

Module: wine Branch: master Commit: 51d40d823a151435ade261d01b0b6ec9fcfbcbe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51d40d823a151435ade261d01… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Sep 2 12:33:39 2009 +0200 jscript: Added JSGlobal_unescape implementation. --- dlls/jscript/global.c | 78 +++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/tests/api.js | 11 ++++++ 2 files changed, 87 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index e843fac..6e932ef 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -576,11 +576,85 @@ static HRESULT JSGlobal_parseFloat(DispatchEx *dispex, LCID lcid, WORD flags, DI return S_OK; } +static inline int hex_to_int(const WCHAR wch) { + if(toupperW(wch)>='A' && toupperW(wch)<='F') return toupperW(wch)-'A'+10; + if(isdigitW(wch)) return wch-'0'; + return -1; +} + static HRESULT JSGlobal_unescape(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + BSTR ret, str; + const WCHAR *ptr; + DWORD len = 0; + HRESULT hres; + + TRACE("\n"); + + if(!arg_cnt(dp)) { + if(retv) { + ret = SysAllocString(undefinedW); + if(!ret) + return E_OUTOFMEMORY; + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = ret; + } + + return S_OK; + } + + hres = to_string(dispex->ctx, get_arg(dp, 0), ei, &str); + if(FAILED(hres)) + return hres; + + for(ptr=str; *ptr; ptr++) { + if(*ptr == '%') { + if(hex_to_int(*(ptr+1))!=-1 && hex_to_int(*(ptr+2))!=-1) + ptr += 2; + else if(*(ptr+1)=='u' && hex_to_int(*(ptr+2))!=-1 && hex_to_int(*(ptr+3))!=-1 + && hex_to_int(*(ptr+4))!=-1 && hex_to_int(*(ptr+5))!=-1) + ptr += 5; + } + + len++; + } + + ret = SysAllocStringLen(NULL, len); + if(!ret) + return E_OUTOFMEMORY; + + len = 0; + for(ptr=str; *ptr; ptr++) { + if(*ptr == '%') { + if(hex_to_int(*(ptr+1))!=-1 && hex_to_int(*(ptr+2))!=-1) { + ret[len] = (hex_to_int(*(ptr+1))<<4) + hex_to_int(*(ptr+2)); + ptr += 2; + } + else if(*(ptr+1)=='u' && hex_to_int(*(ptr+2))!=-1 && hex_to_int(*(ptr+3))!=-1 + && hex_to_int(*(ptr+4))!=-1 && hex_to_int(*(ptr+5))!=-1) { + ret[len] = (hex_to_int(*(ptr+2))<<12) + (hex_to_int(*(ptr+3))<<8) + + (hex_to_int(*(ptr+4))<<4) + hex_to_int(*(ptr+5)); + ptr += 5; + } + else + ret[len] = *ptr; + } + else + ret[len] = *ptr; + + len++; + } + + if(retv) { + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = ret; + } + else + SysFreeString(ret); + + return S_OK; } static HRESULT JSGlobal_GetObject(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index d6e8827..136db61 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -58,6 +58,17 @@ ok(tmp === "undefined", "encodeURI() = " + tmp); tmp = encodeURI("abc", "test"); ok(tmp === "abc", "encodeURI('abc') = " + tmp); +tmp = unescape("abc"); +ok(tmp === "abc", "unescape('abc') = " + tmp); +tmp = unescape(""); +ok(tmp === "", "unescape('') = " + tmp); +tmp = unescape("%%%"); +ok(tmp === "%%%", "unescape('%%%') = " + tmp); +tmp = unescape(); +ok(tmp === "undefined", "unescape() = " + tmp); +tmp = unescape("%54%65s%u0074"); +ok(tmp === "Test", "unescape('%54%65s%u0074') = " + tmp); + tmp = "" + new Object(); ok(tmp === "[object Object]", "'' + new Object() = " + tmp); (tmp = new Array).f = Object.prototype.toString;

1 0

Piotr Caban : jscript: Throw 'Object expected' error in call_expression_eval.
by Alexandre Julliard Sept. 2, 2009

Sept. 2, 2009

Module: wine Branch: master Commit: 2e97b1f07f1abd119bced7a1307684648f8b046c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e97b1f07f1abd119bced7a13… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Sep 2 12:33:08 2009 +0200 jscript: Throw 'Object expected' error in call_expression_eval. --- dlls/jscript/engine.c | 13 ++++++++----- dlls/jscript/jscript_En.rc | 1 + dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 1 + 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index cbd2797..3931fff 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1570,16 +1570,19 @@ HRESULT call_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, if(SUCCEEDED(hres)) { switch(exprval.type) { case EXPRVAL_VARIANT: - if(V_VT(&exprval.u.var) != VT_DISPATCH) - return throw_type_error(ctx->var_disp->ctx, ei, IDS_NO_PROPERTY, NULL); - - hres = disp_call(V_DISPATCH(&exprval.u.var), DISPID_VALUE, ctx->parser->script->lcid, - DISPATCH_METHOD, &dp, flags & EXPR_NOVAL ? NULL : &var, ei, NULL/*FIXME*/); + if(V_VT(&exprval.u.var) == VT_DISPATCH) + hres = disp_call(V_DISPATCH(&exprval.u.var), DISPID_VALUE, ctx->parser->script->lcid, + DISPATCH_METHOD, &dp, flags & EXPR_NOVAL ? NULL : &var, ei, NULL/*FIXME*/); + else + hres = throw_type_error(ctx->var_disp->ctx, ei, IDS_NO_PROPERTY, NULL); break; case EXPRVAL_IDREF: hres = disp_call(exprval.u.idref.disp, exprval.u.idref.id, ctx->parser->script->lcid, DISPATCH_METHOD, &dp, flags & EXPR_NOVAL ? NULL : &var, ei, NULL/*FIXME*/); break; + case EXPRVAL_INVALID: + hres = throw_type_error(ctx->var_disp->ctx, ei, IDS_OBJECT_EXPECTED, NULL); + break; default: FIXME("unimplemented type %d\n", exprval.type); hres = E_NOTIMPL; diff --git a/dlls/jscript/jscript_En.rc b/dlls/jscript/jscript_En.rc index 697c1ab..eca9bc8 100644 --- a/dlls/jscript/jscript_En.rc +++ b/dlls/jscript/jscript_En.rc @@ -34,6 +34,7 @@ STRINGTABLE DISCARDABLE IDS_NOT_FUNC "Function expected" IDS_NOT_DATE "'[object]' is not a date object" IDS_NOT_NUM "Number expected" + IDS_OBJECT_EXPECTED "Object expected" IDS_ILLEGAL_ASSIGN "Illegal assignment" IDS_UNDEFINED "'|' is undefined" IDS_NOT_BOOL "Boolean object expected" diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index f7e94b9..c3e58cb 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -30,6 +30,7 @@ #define IDS_NOT_FUNC 0x138A #define IDS_NOT_DATE 0x138E #define IDS_NOT_NUM 0x1389 +#define IDS_OBJECT_EXPECTED 0x128F #define IDS_ILLEGAL_ASSIGN 0x1390 #define IDS_UNDEFINED 0x1391 #define IDS_NOT_BOOL 0x1392 diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 3b5e834..d6e8827 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1481,6 +1481,7 @@ exception_test(function() {eval("for(i=0;i<10")}, "SyntaxError", -2146827284); exception_test(function() {eval("while(")}, "SyntaxError", -2146827286); exception_test(function() {eval("if(")}, "SyntaxError", -2146827286); exception_test(function() {eval("'unterminated")}, "SyntaxError", -2146827273); +exception_test(function() {eval("nonexistingfunc()")}, "TypeError", -2146823537); function testObjectInherit(obj, constr, ts, tls, vo) { ok(obj instanceof Object, "obj is not instance of Object");

1 0