September 2009 - Wine-commits

Juan Lang : ntdll: Don't allow setting a zero thread affinity.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 2e92c726aa906a9715ee4011d9ff42866a0aa2fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e92c726aa906a9715ee4011d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 28 08:25:16 2009 -0700 ntdll: Don't allow setting a zero thread affinity. --- dlls/ntdll/tests/info.c | 1 - dlls/ntdll/thread.c | 1 + 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 37895ef..6495acc 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -920,7 +920,6 @@ static void test_affinity(void) "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); thread_affinity = 0; status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) ); - todo_wine ok( status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 07e063a..dab1c1d 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1216,6 +1216,7 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, const ULONG_PTR *paff = data; if (length != sizeof(ULONG_PTR)) return STATUS_INVALID_PARAMETER; if (*paff & ~affinity_mask) return STATUS_INVALID_PARAMETER; + if (!*paff) return STATUS_INVALID_PARAMETER; SERVER_START_REQ( set_thread_info ) { req->handle = wine_server_obj_handle( handle );

1 0

Jacek Caban : jscript: Added ActiveXObject constructor stub implementation.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 2ea23923a72a93642fdb8b4aebf564dc23e753bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ea23923a72a93642fdb8b4ae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 29 00:10:50 2009 +0200 jscript: Added ActiveXObject constructor stub implementation. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/activex.c | 50 +++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/global.c | 11 +++++++-- dlls/jscript/jscript.h | 2 + dlls/jscript/tests/api.js | 3 ++ 5 files changed, 64 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index 241ef4b..d9d490a 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -16,6 +16,7 @@ RC_SRCS = \ rsrc.rc C_SRCS = \ + activex.c \ array.c \ bool.c \ date.c \ diff --git a/dlls/jscript/activex.c b/dlls/jscript/activex.c new file mode 100644 index 0000000..eada0c2 --- /dev/null +++ b/dlls/jscript/activex.c @@ -0,0 +1,50 @@ +/* + * Copyright 2009 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 + */ + +#include "config.h" +#include "wine/port.h" + +#include "jscript.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(jscript); + +static HRESULT ActiveXObject_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +HRESULT create_activex_constr(script_ctx_t *ctx, DispatchEx **ret) +{ + DispatchEx *prototype; + HRESULT hres; + + static const WCHAR ActiveXObjectW[] = {'A','c','t','i','v','e','X','O','b','j','e','c','t',0}; + + hres = create_object(ctx, NULL, &prototype); + if(FAILED(hres)) + return hres; + + hres = create_builtin_function(ctx, ActiveXObject_value, ActiveXObjectW, NULL, PROPF_CONSTR, prototype, ret); + + jsdisp_release(prototype); + return hres; +} diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index d9c54db..bc39940 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -274,8 +274,9 @@ static HRESULT JSGlobal_RegExp(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, D static HRESULT JSGlobal_ActiveXObject(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + return constructor_call(ctx->activex_constr, flags, dp, retv, ei, sp); } static HRESULT JSGlobal_VBArray(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, @@ -770,7 +771,7 @@ static HRESULT JSGlobal_encodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags } static const builtin_prop_t JSGlobal_props[] = { - {ActiveXObjectW, JSGlobal_ActiveXObject, PROPF_METHOD}, + {ActiveXObjectW, JSGlobal_ActiveXObject, PROPF_CONSTR}, {ArrayW, JSGlobal_Array, PROPF_CONSTR}, {BooleanW, JSGlobal_Boolean, PROPF_CONSTR}, {CollectGarbageW, JSGlobal_CollectGarbage, PROPF_METHOD}, @@ -828,6 +829,10 @@ static HRESULT init_constructors(script_ctx_t *ctx, DispatchEx *object_prototype if(FAILED(hres)) return hres; + hres = create_activex_constr(ctx, &ctx->activex_constr); + if(FAILED(hres)) + return hres; + hres = create_array_constr(ctx, object_prototype, &ctx->array_constr); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index bbf929d..9190110 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -268,6 +268,7 @@ struct _script_ctx_t { DispatchEx *global; DispatchEx *function_constr; + DispatchEx *activex_constr; DispatchEx *array_constr; DispatchEx *bool_constr; DispatchEx *date_constr; @@ -296,6 +297,7 @@ HRESULT init_global(script_ctx_t*); HRESULT init_function_constr(script_ctx_t*,DispatchEx*); HRESULT create_object_prototype(script_ctx_t*,DispatchEx**); +HRESULT create_activex_constr(script_ctx_t*,DispatchEx**); HRESULT create_array_constr(script_ctx_t*,DispatchEx*,DispatchEx**); HRESULT create_bool_constr(script_ctx_t*,DispatchEx*,DispatchEx**); HRESULT create_date_constr(script_ctx_t*,DispatchEx*,DispatchEx**); diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 2e4b0aa..ae118c2 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1532,6 +1532,9 @@ ok(bool.toString() === "true", "bool.toString() = " + bool.toString()); ok(bool.valueOf() === Boolean(1), "bool.valueOf() = " + bool.valueOf()); ok(bool.toLocaleString() === bool.toString(), "bool.toLocaleString() = " + bool.toLocaleString()); +ok(ActiveXObject instanceof Function, "ActiveXObject is not instance of Function"); +ok(ActiveXObject.prototype instanceof Object, "ActiveXObject.prototype is not instance of Object"); + ok(Error.prototype !== TypeError.prototype, "Error.prototype === TypeError.prototype"); ok(RangeError.prototype !== TypeError.prototype, "RangeError.prototype === TypeError.prototype"); ok(Error.prototype.toLocaleString === Object.prototype.toLocaleString,

1 0

Peter Oberndorfer : shlwapi: Remove pointer check in IStream::Clone, it also crashes on Windows.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: a35fd4f496fcd2898b15051fa2b96598c5581cfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a35fd4f496fcd2898b15051fa… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Mon Sep 28 22:24:10 2009 +0200 shlwapi: Remove pointer check in IStream::Clone, it also crashes on Windows. Add comments to functions that are not implemented. --- dlls/shlwapi/regstream.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index cd48d93..c167843 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -234,6 +234,8 @@ static HRESULT WINAPI IStream_fnCopyTo (IStream * iface, IStream* pstm, ULARGE_I pcbRead->QuadPart = 0; if (pcbWritten) pcbWritten->QuadPart = 0; + + /* TODO implement */ return E_NOTIMPL; } @@ -246,6 +248,7 @@ static HRESULT WINAPI IStream_fnCommit (IStream * iface, DWORD grfCommitFlags) TRACE("(%p)\n",This); + /* commit not supported by this stream */ return E_NOTIMPL; } @@ -258,6 +261,7 @@ static HRESULT WINAPI IStream_fnRevert (IStream * iface) TRACE("(%p)\n",This); + /* revert not supported by this stream */ return E_NOTIMPL; } @@ -270,6 +274,7 @@ static HRESULT WINAPI IStream_fnLockUnlockRegion (IStream * iface, ULARGE_INTEGE TRACE("(%p)\n",This); + /* lock/unlock not supported by this stream */ return E_NOTIMPL; } @@ -308,8 +313,9 @@ static HRESULT WINAPI IStream_fnClone (IStream * iface, IStream** ppstm) ISHRegStream *This = (ISHRegStream *)iface; TRACE("(%p)\n",This); - if (ppstm) - *ppstm = NULL; + *ppstm = NULL; + + /* clone not supported by this stream */ return E_NOTIMPL; }

1 0

Peter Oberndorfer : shlwapi: Allow SHOpenRegStream2 A/ W to work with not existing values.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 90e800cf9b3c60b41f38ee85b30570cff9e8631e URL: http://source.winehq.org/git/wine.git/?a=commit;h=90e800cf9b3c60b41f38ee85b… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Mon Sep 28 22:24:12 2009 +0200 shlwapi: Allow SHOpenRegStream2 A/W to work with not existing values. When mode is STGM_WRITE or STGM_READWRITE make sure key key exists. Only read data in STGM_READ or STGM_READWRITE mode. Do not depend on value type being REG_BINARY. Succeed when reading not existing values. --- dlls/shlwapi/regstream.c | 80 ++++++++++++++++++++++++++++++++++----------- 1 files changed, 60 insertions(+), 20 deletions(-) diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index c167843..275827d 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -440,21 +440,41 @@ static IStream *IStream_Create(HKEY hKey, LPBYTE pbBuffer, DWORD dwLength) IStream * WINAPI SHOpenRegStream2A(HKEY hKey, LPCSTR pszSubkey, LPCSTR pszValue,DWORD dwMode) { + IStream *tmp; HKEY hStrKey = NULL; LPBYTE lpBuff = NULL; - DWORD dwLength, dwType; + DWORD dwLength = 0; + LONG ret; TRACE("(%p,%s,%s,0x%08x)\n", hKey, pszSubkey, pszValue, dwMode); - /* Open the key, read in binary data and create stream */ - if (!RegOpenKeyExA (hKey, pszSubkey, 0, KEY_READ, &hStrKey) && - !RegQueryValueExA (hStrKey, pszValue, 0, 0, 0, &dwLength) && - (lpBuff = HeapAlloc (GetProcessHeap(), 0, dwLength)) && - !RegQueryValueExA (hStrKey, pszValue, 0, &dwType, lpBuff, &dwLength) && - dwType == REG_BINARY) - return IStream_Create(hStrKey, lpBuff, dwLength); + if (dwMode == STGM_READ) + ret = RegOpenKeyExA(hKey, pszSubkey, 0, KEY_READ, &hStrKey); + else /* in write mode we make sure the subkey exits */ + ret = RegCreateKeyExA(hKey, pszSubkey, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &hStrKey, NULL); - HeapFree (GetProcessHeap(), 0, lpBuff); + if (ret == ERROR_SUCCESS) + { + if (dwMode == STGM_READ || dwMode == STGM_READWRITE) + { + /* read initial data */ + ret = RegQueryValueExA(hStrKey, pszValue, 0, 0, 0, &dwLength); + if (ret == ERROR_SUCCESS && dwLength) + { + lpBuff = HeapAlloc(GetProcessHeap(), 0, dwLength); + RegQueryValueExA(hStrKey, pszValue, 0, 0, lpBuff, &dwLength); + } + } + + if (!dwLength) + lpBuff = HeapAlloc(GetProcessHeap(), 0, dwLength); + + tmp = IStream_Create(hStrKey, lpBuff, dwLength); + + return tmp; + } + + HeapFree(GetProcessHeap(), 0, lpBuff); if (hStrKey) RegCloseKey(hStrKey); return NULL; @@ -468,22 +488,42 @@ IStream * WINAPI SHOpenRegStream2A(HKEY hKey, LPCSTR pszSubkey, IStream * WINAPI SHOpenRegStream2W(HKEY hKey, LPCWSTR pszSubkey, LPCWSTR pszValue, DWORD dwMode) { + IStream *tmp; HKEY hStrKey = NULL; LPBYTE lpBuff = NULL; - DWORD dwLength, dwType; + DWORD dwLength = 0; + LONG ret; TRACE("(%p,%s,%s,0x%08x)\n", hKey, debugstr_w(pszSubkey), debugstr_w(pszValue), dwMode); - /* Open the key, read in binary data and create stream */ - if (!RegOpenKeyExW (hKey, pszSubkey, 0, KEY_READ, &hStrKey) && - !RegQueryValueExW (hStrKey, pszValue, 0, 0, 0, &dwLength) && - (lpBuff = HeapAlloc (GetProcessHeap(), 0, dwLength)) && - !RegQueryValueExW (hStrKey, pszValue, 0, &dwType, lpBuff, &dwLength) && - dwType == REG_BINARY) - return IStream_Create(hStrKey, lpBuff, dwLength); + if (dwMode == STGM_READ) + ret = RegOpenKeyExW(hKey, pszSubkey, 0, KEY_READ, &hStrKey); + else /* in write mode we make sure the subkey exits */ + ret = RegCreateKeyExW(hKey, pszSubkey, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &hStrKey, NULL); + + if (ret == ERROR_SUCCESS) + { + if (dwMode == STGM_READ || dwMode == STGM_READWRITE) + { + /* read initial data */ + ret = RegQueryValueExW(hStrKey, pszValue, 0, 0, 0, &dwLength); + if (ret == ERROR_SUCCESS && dwLength) + { + lpBuff = HeapAlloc(GetProcessHeap(), 0, dwLength); + RegQueryValueExW(hStrKey, pszValue, 0, 0, lpBuff, &dwLength); + } + } + + if (!dwLength) + lpBuff = HeapAlloc(GetProcessHeap(), 0, dwLength); + + tmp = IStream_Create(hStrKey, lpBuff, dwLength); + + return tmp; + } - HeapFree (GetProcessHeap(), 0, lpBuff); + HeapFree(GetProcessHeap(), 0, lpBuff); if (hStrKey) RegCloseKey(hStrKey); return NULL;

1 0

Peter Oberndorfer : shlwapi: Write back data to registry when closing reg stream.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: cb83957e3c6b445a8e1a48d35ca1cd5f50f39685 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb83957e3c6b445a8e1a48d35… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Mon Sep 28 22:24:13 2009 +0200 shlwapi: Write back data to registry when closing reg stream. --- dlls/shlwapi/regstream.c | 81 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 69 insertions(+), 12 deletions(-) diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index 275827d..eb906a7 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -43,6 +43,12 @@ typedef struct LPBYTE pbBuffer; DWORD dwLength; DWORD dwPos; + DWORD dwMode; + union { + LPSTR keyNameA; + LPWSTR keyNameW; + }u; + BOOL bUnicode; } ISHRegStream; /************************************************************************** @@ -98,11 +104,34 @@ static ULONG WINAPI IStream_fnRelease(IStream *iface) { TRACE(" destroying SHReg IStream (%p)\n",This); - HeapFree(GetProcessHeap(),0,This->pbBuffer); - if (This->hKey) + { + /* write back data in REG_BINARY */ + if (This->dwMode == STGM_READWRITE || This->dwMode == STGM_WRITE) + { + if (This->dwLength) + { + if (This->bUnicode) + RegSetValueExW(This->hKey, This->u.keyNameW, 0, REG_BINARY, + (const BYTE *) This->pbBuffer, This->dwLength); + else + RegSetValueExA(This->hKey, This->u.keyNameA, 0, REG_BINARY, + (const BYTE *) This->pbBuffer, This->dwLength); + } + else + { + if (This->bUnicode) + RegDeleteValueW(This->hKey, This->u.keyNameW); + else + RegDeleteValueA(This->hKey, This->u.keyNameA); + } + } + RegCloseKey(This->hKey); + } + HeapFree(GetProcessHeap(),0,This->u.keyNameA); + HeapFree(GetProcessHeap(),0,This->pbBuffer); HeapFree(GetProcessHeap(),0,This); return 0; } @@ -296,7 +325,7 @@ static HRESULT WINAPI IStream_fnStat (IStream * iface, STATSTG* pstatstg, DWORD pstatstg->ctime.dwLowDateTime = 0; pstatstg->atime.dwHighDateTime = 0; pstatstg->atime.dwLowDateTime = 0; - pstatstg->grfMode = STGM_READWRITE; + pstatstg->grfMode = This->dwMode; pstatstg->grfLocksSupported = 0; pstatstg->clsid = CLSID_NULL; pstatstg->grfStateBits = 0; @@ -395,7 +424,10 @@ static ISHRegStream rsDummyRegStream = NULL, NULL, 0, - 0 + 0, + STGM_READWRITE, + {NULL}, + FALSE }; /************************************************************************** @@ -403,7 +435,7 @@ static ISHRegStream rsDummyRegStream = * * Internal helper: Create and initialise a new registry stream object. */ -static IStream *IStream_Create(HKEY hKey, LPBYTE pbBuffer, DWORD dwLength) +static ISHRegStream *IStream_Create(HKEY hKey, LPBYTE pbBuffer, DWORD dwLength) { ISHRegStream* regStream; @@ -417,9 +449,12 @@ static IStream *IStream_Create(HKEY hKey, LPBYTE pbBuffer, DWORD dwLength) regStream->pbBuffer = pbBuffer; regStream->dwLength = dwLength; regStream->dwPos = 0; + regStream->dwMode = STGM_READWRITE; + regStream->u.keyNameA = NULL; + regStream->bUnicode = FALSE; } TRACE ("Returning %p\n", regStream); - return (IStream *)regStream; + return regStream; } /************************************************************************* @@ -440,7 +475,7 @@ static IStream *IStream_Create(HKEY hKey, LPBYTE pbBuffer, DWORD dwLength) IStream * WINAPI SHOpenRegStream2A(HKEY hKey, LPCSTR pszSubkey, LPCSTR pszValue,DWORD dwMode) { - IStream *tmp; + ISHRegStream *tmp; HKEY hStrKey = NULL; LPBYTE lpBuff = NULL; DWORD dwLength = 0; @@ -470,8 +505,19 @@ IStream * WINAPI SHOpenRegStream2A(HKEY hKey, LPCSTR pszSubkey, lpBuff = HeapAlloc(GetProcessHeap(), 0, dwLength); tmp = IStream_Create(hStrKey, lpBuff, dwLength); + if(tmp) + { + if(pszValue) + { + int len = lstrlenA(pszValue) + 1; + tmp->u.keyNameA = HeapAlloc(GetProcessHeap(), 0, len); + memcpy(tmp->u.keyNameA, pszValue, len); + } - return tmp; + tmp->dwMode = dwMode; + tmp->bUnicode = FALSE; + return (IStream *)tmp; + } } HeapFree(GetProcessHeap(), 0, lpBuff); @@ -488,7 +534,7 @@ IStream * WINAPI SHOpenRegStream2A(HKEY hKey, LPCSTR pszSubkey, IStream * WINAPI SHOpenRegStream2W(HKEY hKey, LPCWSTR pszSubkey, LPCWSTR pszValue, DWORD dwMode) { - IStream *tmp; + ISHRegStream *tmp; HKEY hStrKey = NULL; LPBYTE lpBuff = NULL; DWORD dwLength = 0; @@ -519,8 +565,19 @@ IStream * WINAPI SHOpenRegStream2W(HKEY hKey, LPCWSTR pszSubkey, lpBuff = HeapAlloc(GetProcessHeap(), 0, dwLength); tmp = IStream_Create(hStrKey, lpBuff, dwLength); + if(tmp) + { + if(pszValue) + { + int len = lstrlenW(pszValue) + 1; + tmp->u.keyNameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + memcpy(tmp->u.keyNameW, pszValue, len * sizeof(WCHAR)); + } - return tmp; + tmp->dwMode = dwMode; + tmp->bUnicode = TRUE; + return (IStream *)tmp; + } } HeapFree(GetProcessHeap(), 0, lpBuff); @@ -604,7 +661,7 @@ IStream * WINAPI SHCreateMemStream(const BYTE *lpbData, UINT dwDataLen) if (lpbDup) { memcpy(lpbDup, lpbData, dwDataLen); - iStrmRet = IStream_Create(NULL, lpbDup, dwDataLen); + iStrmRet = (IStream *)IStream_Create(NULL, lpbDup, dwDataLen); if (!iStrmRet) HeapFree(GetProcessHeap(), 0, lpbDup); @@ -642,7 +699,7 @@ HRESULT WINAPI SHCreateStreamWrapper(LPBYTE lpbData, DWORD dwDataLen, if(dwReserved || !lppStream) return E_INVALIDARG; - lpStream = IStream_Create(NULL, lpbData, dwDataLen); + lpStream = (IStream *)IStream_Create(NULL, lpbData, dwDataLen); if(!lpStream) return E_OUTOFMEMORY;

1 0

Andrew Eikum : wininet: Always extract #fragments in InternetCrackUrl.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 0250eab25e220193645a065c5a45c2f0d35e14f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0250eab25e220193645a065c5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Sep 28 15:49:16 2009 -0500 wininet: Always extract #fragments in InternetCrackUrl. --- dlls/wininet/internet.c | 5 ++++- dlls/wininet/tests/url.c | 7 ++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 1a77fd8..1f08c49 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1424,8 +1424,11 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lpszUrl_orig, DWORD dwUrlLength_orig, DWOR lpUC->nPort = INTERNET_INVALID_PORT_NUMBER; /* Parse <params> */ - if (!(lpszParam = memchrW(lpszap, ';', dwUrlLength - (lpszap - lpszUrl)))) + lpszParam = memchrW(lpszap, ';', dwUrlLength - (lpszap - lpszUrl)); + if(!lpszParam) lpszParam = memchrW(lpszap, '?', dwUrlLength - (lpszap - lpszUrl)); + if(!lpszParam) + lpszParam = memchrW(lpszap, '#', dwUrlLength - (lpszap - lpszUrl)); SetUrlComponentValueW(&lpUC->lpszExtraInfo, &lpUC->dwExtraInfoLength, lpszParam, lpszParam ? dwUrlLength-(lpszParam-lpszUrl) : 0); diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 39c0286..18df392 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -30,9 +30,10 @@ #include "wine/test.h" -#define TEST_URL "http://www.winehq.org/site/about" +#define TEST_URL "http://www.winehq.org/site/about#hi" #define TEST_URL_HOST "www.winehq.org" #define TEST_URL_PATH "/site/about" +#define TEST_URL_HASH "#hi" #define TEST_URL2 "http://www.myserver.com/myscript.php?arg=1" #define TEST_URL2_SERVER "www.myserver.com" #define TEST_URL2_PATH "/myscript.php" @@ -147,10 +148,10 @@ static void InternetCrackUrl_test(void) ok(urlComponents.nScheme == INTERNET_SCHEME_HTTP,"urlComponents->nScheme should have been INTERNET_SCHEME_HTTP instead of %d\n", urlComponents.nScheme); ok(!urlComponents.lpszUserName, ".lpszUserName should have been set to NULL\n"); ok(!urlComponents.lpszPassword, ".lpszPassword should have been set to NULL\n"); - ok(!urlComponents.lpszExtraInfo, ".lpszExtraInfo should have been set to NULL\n"); + ok(urlComponents.dwExtraInfoLength == strlen(TEST_URL_HASH),".dwExtraInfoLength should be %d, but is %d\n", lstrlenA(TEST_URL_HASH), urlComponents.dwExtraInfoLength); + ok(!strncmp(urlComponents.lpszExtraInfo,TEST_URL_HASH,strlen(TEST_URL_HASH)), ".lpszExtraInfo should be %s but is %s\n", TEST_URL_HASH, urlComponents.lpszExtraInfo); ok(!urlComponents.dwUserNameLength,".dwUserNameLength should be 0, but is %d\n", urlComponents.dwUserNameLength); ok(!urlComponents.dwPasswordLength,".dwPasswordLength should be 0, but is %d\n", urlComponents.dwPasswordLength); - ok(!urlComponents.dwExtraInfoLength,".dwExtraInfoLength should be 0, but is %d\n", urlComponents.dwExtraInfoLength); /*3. Check for %20 */ copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 1024, 2048, 1024);

1 0

Allan Tong : d3d9: Don' t release the parent device before destroying its children.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 5d56eddb7c17db867817def582e8f8316d7a6c20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d56eddb7c17db867817def58… Author: Allan Tong <actong88(a)gmail.com> Date: Sat Sep 26 09:56:16 2009 -0400 d3d9: Don't release the parent device before destroying its children. Releasing the device earlier may cause the underlying wineD3D device to be freed before the child object has had a chance to clean up. --- dlls/d3d9/cubetexture.c | 6 +++++- dlls/d3d9/indexbuffer.c | 6 +++++- dlls/d3d9/pixelshader.c | 6 +++++- dlls/d3d9/surface.c | 6 +++++- dlls/d3d9/swapchain.c | 6 +++++- dlls/d3d9/texture.c | 6 +++++- dlls/d3d9/vertexbuffer.c | 6 +++++- dlls/d3d9/vertexdeclaration.c | 6 +++++- dlls/d3d9/vertexshader.c | 6 +++++- dlls/d3d9/volumetexture.c | 6 +++++- 10 files changed, 50 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/cubetexture.c b/dlls/d3d9/cubetexture.c index 4bab9df..10336b5 100644 --- a/dlls/d3d9/cubetexture.c +++ b/dlls/d3d9/cubetexture.c @@ -67,12 +67,16 @@ static ULONG WINAPI IDirect3DCubeTexture9Impl_Release(LPDIRECT3DCUBETEXTURE9 ifa TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { + IDirect3DDevice9Ex *parentDevice = This->parentDevice; + TRACE("Releasing child %p\n", This->wineD3DCubeTexture); - IDirect3DDevice9Ex_Release(This->parentDevice); wined3d_mutex_lock(); IWineD3DCubeTexture_Release(This->wineD3DCubeTexture); wined3d_mutex_unlock(); + + /* Release the device last, as it may cause the device to be destroyed. */ + IDirect3DDevice9Ex_Release(parentDevice); } return ref; } diff --git a/dlls/d3d9/indexbuffer.c b/dlls/d3d9/indexbuffer.c index e089bea..2748abb 100644 --- a/dlls/d3d9/indexbuffer.c +++ b/dlls/d3d9/indexbuffer.c @@ -65,10 +65,14 @@ static ULONG WINAPI IDirect3DIndexBuffer9Impl_Release(LPDIRECT3DINDEXBUFFER9 ifa TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { - IDirect3DDevice9Ex_Release(This->parentDevice); + IDirect3DDevice9Ex *parentDevice = This->parentDevice; + wined3d_mutex_lock(); IWineD3DBuffer_Release(This->wineD3DIndexBuffer); wined3d_mutex_unlock(); + + /* Release the device last, as it may cause the device to be destroyed. */ + IDirect3DDevice9Ex_Release(parentDevice); } return ref; } diff --git a/dlls/d3d9/pixelshader.c b/dlls/d3d9/pixelshader.c index 547dc74..1c42142 100644 --- a/dlls/d3d9/pixelshader.c +++ b/dlls/d3d9/pixelshader.c @@ -64,10 +64,14 @@ static ULONG WINAPI IDirect3DPixelShader9Impl_Release(LPDIRECT3DPIXELSHADER9 ifa TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { - IDirect3DDevice9Ex_Release(This->parentDevice); + IDirect3DDevice9Ex *parentDevice = This->parentDevice; + wined3d_mutex_lock(); IWineD3DPixelShader_Release(This->wineD3DPixelShader); wined3d_mutex_unlock(); + + /* Release the device last, as it may cause the device to be destroyed. */ + IDirect3DDevice9Ex_Release(parentDevice); } return ref; } diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index f9b2794..0c277b9 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -82,10 +82,14 @@ static ULONG WINAPI IDirect3DSurface9Impl_Release(LPDIRECT3DSURFACE9 iface) { TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { - if (This->parentDevice) IDirect3DDevice9Ex_Release(This->parentDevice); + IDirect3DDevice9Ex *parentDevice = This->parentDevice; + wined3d_mutex_lock(); IWineD3DSurface_Release(This->wineD3DSurface); wined3d_mutex_unlock(); + + /* Release the device last, as it may cause the device to be destroyed. */ + if (parentDevice) IDirect3DDevice9Ex_Release(parentDevice); } return ref; diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index e63e343..461db37 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -60,7 +60,8 @@ static ULONG WINAPI IDirect3DSwapChain9Impl_Release(LPDIRECT3DSWAPCHAIN9 iface) TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { - if (This->parentDevice) IDirect3DDevice9Ex_Release(This->parentDevice); + IDirect3DDevice9Ex *parentDevice = This->parentDevice; + if (!This->isImplicit) { wined3d_mutex_lock(); IWineD3DSwapChain_Destroy(This->wineD3DSwapChain); @@ -68,6 +69,9 @@ static ULONG WINAPI IDirect3DSwapChain9Impl_Release(LPDIRECT3DSWAPCHAIN9 iface) HeapFree(GetProcessHeap(), 0, This); } + + /* Release the device last, as it may cause the device to be destroyed. */ + if (parentDevice) IDirect3DDevice9Ex_Release(parentDevice); } return ref; } diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 9818c26..c63bb25 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -67,10 +67,14 @@ static ULONG WINAPI IDirect3DTexture9Impl_Release(LPDIRECT3DTEXTURE9 iface) { TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { - IDirect3DDevice9Ex_Release(This->parentDevice); + IDirect3DDevice9Ex *parentDevice = This->parentDevice; + wined3d_mutex_lock(); IWineD3DTexture_Release(This->wineD3DTexture); wined3d_mutex_unlock(); + + /* Release the device last, as it may cause the device to be destroyed. */ + IDirect3DDevice9Ex_Release(parentDevice); } return ref; } diff --git a/dlls/d3d9/vertexbuffer.c b/dlls/d3d9/vertexbuffer.c index c46f8b3..d1d7b54 100644 --- a/dlls/d3d9/vertexbuffer.c +++ b/dlls/d3d9/vertexbuffer.c @@ -66,10 +66,14 @@ static ULONG WINAPI IDirect3DVertexBuffer9Impl_Release(LPDIRECT3DVERTEXBUFFER9 i TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { - IDirect3DDevice9Ex_Release(This->parentDevice); + IDirect3DDevice9Ex *parentDevice = This->parentDevice; + wined3d_mutex_lock(); IWineD3DBuffer_Release(This->wineD3DVertexBuffer); wined3d_mutex_unlock(); + + /* Release the device last, as it may cause the device to be destroyed. */ + IDirect3DDevice9Ex_Release(parentDevice); } return ref; } diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index 1234bff..63b257c 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -248,10 +248,14 @@ static ULONG WINAPI IDirect3DVertexDeclaration9Impl_Release(LPDIRECT3DVERTEXDECL TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { - IDirect3DDevice9Ex_Release(This->parentDevice); + IDirect3DDevice9Ex *parentDevice = This->parentDevice; + if(!This->convFVF) { IDirect3DVertexDeclaration9Impl_Destroy(iface); } + + /* Release the device last, as it may cause the device to be destroyed. */ + IDirect3DDevice9Ex_Release(parentDevice); } return ref; } diff --git a/dlls/d3d9/vertexshader.c b/dlls/d3d9/vertexshader.c index 8b775de..9293c20 100644 --- a/dlls/d3d9/vertexshader.c +++ b/dlls/d3d9/vertexshader.c @@ -64,10 +64,14 @@ static ULONG WINAPI IDirect3DVertexShader9Impl_Release(LPDIRECT3DVERTEXSHADER9 i TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { - IDirect3DDevice9Ex_Release(This->parentDevice); + IDirect3DDevice9Ex *parentDevice = This->parentDevice; + wined3d_mutex_lock(); IWineD3DVertexShader_Release(This->wineD3DVertexShader); wined3d_mutex_unlock(); + + /* Release the device last, as it may cause the device to be destroyed. */ + IDirect3DDevice9Ex_Release(parentDevice); } return ref; } diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c index 3adab63..7a47e4a 100644 --- a/dlls/d3d9/volumetexture.c +++ b/dlls/d3d9/volumetexture.c @@ -66,10 +66,14 @@ static ULONG WINAPI IDirect3DVolumeTexture9Impl_Release(LPDIRECT3DVOLUMETEXTURE9 TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { - IDirect3DDevice9Ex_Release(This->parentDevice); + IDirect3DDevice9Ex *parentDevice = This->parentDevice; + wined3d_mutex_lock(); IWineD3DVolumeTexture_Release(This->wineD3DVolumeTexture); wined3d_mutex_unlock(); + + /* Release the device last, as it may cause the device to be destroyed. */ + IDirect3DDevice9Ex_Release(parentDevice); } return ref; }

1 0

Allan Tong : d3d8: Don' t release the parent device before destroying its children.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 6792bb88430a619b5f3c3e2107396df337bc1a79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6792bb88430a619b5f3c3e210… Author: Allan Tong <actong88(a)gmail.com> Date: Mon Sep 28 12:50:15 2009 -0400 d3d8: Don't release the parent device before destroying its children. --- dlls/d3d8/cubetexture.c | 6 +++++- dlls/d3d8/indexbuffer.c | 6 +++++- dlls/d3d8/surface.c | 5 ++++- dlls/d3d8/texture.c | 6 +++++- dlls/d3d8/vertexbuffer.c | 6 +++++- dlls/d3d8/volumetexture.c | 6 +++++- 6 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index d3ec98c..24417df 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -64,12 +64,16 @@ static ULONG WINAPI IDirect3DCubeTexture8Impl_Release(LPDIRECT3DCUBETEXTURE8 ifa TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { + IDirect3DDevice8 *parentDevice = This->parentDevice; + TRACE("Releasing child %p\n", This->wineD3DCubeTexture); - IUnknown_Release(This->parentDevice); wined3d_mutex_lock(); IWineD3DCubeTexture_Release(This->wineD3DCubeTexture); wined3d_mutex_unlock(); + + /* Release the device last, as it may cause the device to be destroyed. */ + IDirect3DDevice8_Release(parentDevice); } return ref; } diff --git a/dlls/d3d8/indexbuffer.c b/dlls/d3d8/indexbuffer.c index 4939122..bb62c39 100644 --- a/dlls/d3d8/indexbuffer.c +++ b/dlls/d3d8/indexbuffer.c @@ -64,10 +64,14 @@ static ULONG WINAPI IDirect3DIndexBuffer8Impl_Release(LPDIRECT3DINDEXBUFFER8 ifa TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { - IDirect3DDevice8_Release(This->parentDevice); + IDirect3DDevice8 *parentDevice = This->parentDevice; + wined3d_mutex_lock(); IWineD3DBuffer_Release(This->wineD3DIndexBuffer); wined3d_mutex_unlock(); + + /* Release the device last, as it may cause the device to be destroyed. */ + IDirect3DDevice8_Release(parentDevice); } return ref; } diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 2d00fce..8923dd8 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -79,11 +79,14 @@ static ULONG WINAPI IDirect3DSurface8Impl_Release(LPDIRECT3DSURFACE8 iface) { TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { - if (This->parentDevice) IUnknown_Release(This->parentDevice); + IDirect3DDevice8 *parentDevice = This->parentDevice; + /* Implicit surfaces are destroyed with the device, not if refcount reaches 0. */ wined3d_mutex_lock(); IWineD3DSurface_Release(This->wineD3DSurface); wined3d_mutex_unlock(); + + if (parentDevice) IDirect3DDevice8_Release(parentDevice); } return ref; diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index e377fff..000b078 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -65,10 +65,14 @@ static ULONG WINAPI IDirect3DTexture8Impl_Release(LPDIRECT3DTEXTURE8 iface) { TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { - IDirect3DDevice8_Release(This->parentDevice); + IDirect3DDevice8 *parentDevice = This->parentDevice; + wined3d_mutex_lock(); IWineD3DTexture_Release(This->wineD3DTexture); wined3d_mutex_unlock(); + + /* Release the device last, as it may cause the device to be destroyed. */ + IDirect3DDevice8_Release(parentDevice); } return ref; } diff --git a/dlls/d3d8/vertexbuffer.c b/dlls/d3d8/vertexbuffer.c index 99e8304..a798afd 100644 --- a/dlls/d3d8/vertexbuffer.c +++ b/dlls/d3d8/vertexbuffer.c @@ -65,10 +65,14 @@ static ULONG WINAPI IDirect3DVertexBuffer8Impl_Release(LPDIRECT3DVERTEXBUFFER8 i TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { - IDirect3DDevice8_Release(This->parentDevice); + IDirect3DDevice8 *parentDevice = This->parentDevice; + wined3d_mutex_lock(); IWineD3DBuffer_Release(This->wineD3DVertexBuffer); wined3d_mutex_unlock(); + + /* Release the device last, as it may cause the device to be destroyed. */ + IDirect3DDevice8_Release(parentDevice); } return ref; diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index 46c1ec5..d31c156 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -65,10 +65,14 @@ static ULONG WINAPI IDirect3DVolumeTexture8Impl_Release(LPDIRECT3DVOLUMETEXTURE8 TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { - IUnknown_Release(This->parentDevice); + IDirect3DDevice8 *parentDevice = This->parentDevice; + wined3d_mutex_lock(); IWineD3DVolumeTexture_Release(This->wineD3DVolumeTexture); wined3d_mutex_unlock(); + + /* Release the device last, as it may cause the device to be destroyed. */ + IDirect3DDevice8_Release(parentDevice); } return ref; }

1 0

Aurimas Fišeras : jscript: Update Lithuanian translation.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 9ef3dfdd24ea26ecee63f4a6379a98c5ab7bb53d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ef3dfdd24ea26ecee63f4a63… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Sep 24 19:21:50 2009 +0300 jscript: Update Lithuanian translation. --- dlls/jscript/jscript_Lt.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Lt.rc b/dlls/jscript/jscript_Lt.rc index bb09228..83c0680 100644 --- a/dlls/jscript/jscript_Lt.rc +++ b/dlls/jscript/jscript_Lt.rc @@ -44,4 +44,5 @@ STRINGTABLE DISCARDABLE IDS_JSCRIPT_EXPECTED "Tikėtasi JScript objekto" IDS_REGEXP_SYNTAX_ERROR "Sintaksės klaida reguliariajame reiškinyje" IDS_INVALID_LENGTH "Masyvo dydis turi būti teigiamas sveikasis skaičius" + IDS_ARRAY_EXPECTED "Tikėtasi masyvo objekto" }

1 0

Andrew Eikum : mshtml: Check for null pointers in IHTMLLocation_get*.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 3b5ed104bf358bb0ecd876e7f170f458ddc52249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b5ed104bf358bb0ecd876e7f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Sep 28 13:31:08 2009 -0500 mshtml: Check for null pointers in IHTMLLocation_get*. --- dlls/mshtml/htmllocation.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 470d679..67ebf99 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -168,6 +168,10 @@ static HRESULT WINAPI HTMLLocation_get_protocol(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = HTMLLOCATION_THIS(iface); FIXME("(%p)->(%p)\n", This, p); + + if(!p) + return E_POINTER; + return E_NOTIMPL; } @@ -182,6 +186,10 @@ static HRESULT WINAPI HTMLLocation_get_host(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = HTMLLOCATION_THIS(iface); FIXME("(%p)->(%p)\n", This, p); + + if(!p) + return E_POINTER; + return E_NOTIMPL; } @@ -196,6 +204,10 @@ static HRESULT WINAPI HTMLLocation_get_hostname(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = HTMLLOCATION_THIS(iface); FIXME("(%p)->(%p)\n", This, p); + + if(!p) + return E_POINTER; + return E_NOTIMPL; } @@ -210,6 +222,10 @@ static HRESULT WINAPI HTMLLocation_get_port(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = HTMLLOCATION_THIS(iface); FIXME("(%p)->(%p)\n", This, p); + + if(!p) + return E_POINTER; + return E_NOTIMPL; } @@ -231,6 +247,9 @@ static HRESULT WINAPI HTMLLocation_get_pathname(IHTMLLocation *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); + if(!p) + return E_POINTER; + hres = get_url(This, &doc_url); if(FAILED(hres)) return hres; @@ -271,6 +290,10 @@ static HRESULT WINAPI HTMLLocation_get_search(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = HTMLLOCATION_THIS(iface); FIXME("(%p)->(%p)\n", This, p); + + if(!p) + return E_POINTER; + return E_NOTIMPL; } @@ -285,6 +308,10 @@ static HRESULT WINAPI HTMLLocation_get_hash(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = HTMLLOCATION_THIS(iface); FIXME("(%p)->(%p)\n", This, p); + + if(!p) + return E_POINTER; + return E_NOTIMPL; }

1 0