Piotr Caban : vbscript: Added IRegExp2::Pattern implementation.
Alexandre Julliard
julliard at winehq.org
Fri Feb 15 11:19:17 CST 2013
Module: wine
Branch: master
Commit: 7246f7f3aa97ef5e0a6554846fe600d309bb61f4
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7246f7f3aa97ef5e0a6554846fe600d309bb61f4
Author: Piotr Caban <piotr at codeweavers.com>
Date: Fri Feb 15 15:10:53 2013 +0100
vbscript: Added IRegExp2::Pattern implementation.
---
dlls/vbscript/vbregexp.c | 40 ++++++++++++++++++++++++++++++++++++----
1 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c
index 1afe44b..ffd110d 100644
--- a/dlls/vbscript/vbregexp.c
+++ b/dlls/vbscript/vbregexp.c
@@ -84,6 +84,8 @@ typedef struct {
IRegExp IRegExp_iface;
LONG ref;
+
+ WCHAR *pattern;
} RegExp2;
static inline RegExp2 *impl_from_IRegExp2(IRegExp2 *iface)
@@ -135,6 +137,7 @@ static ULONG WINAPI RegExp2_Release(IRegExp2 *iface)
TRACE("(%p) ref=%d\n", This, ref);
if(!ref) {
+ heap_free(This->pattern);
heap_free(This);
}
@@ -186,15 +189,44 @@ static HRESULT WINAPI RegExp2_Invoke(IRegExp2 *iface, DISPID dispIdMember,
static HRESULT WINAPI RegExp2_get_Pattern(IRegExp2 *iface, BSTR *pPattern)
{
RegExp2 *This = impl_from_IRegExp2(iface);
- FIXME("(%p)->(%p)\n", This, pPattern);
- return E_NOTIMPL;
+
+ TRACE("(%p)->(%p)\n", This, pPattern);
+
+ if(!pPattern)
+ return E_POINTER;
+
+ if(!This->pattern) {
+ *pPattern = NULL;
+ return S_OK;
+ }
+
+ *pPattern = SysAllocString(This->pattern);
+ return *pPattern ? S_OK : E_OUTOFMEMORY;
}
static HRESULT WINAPI RegExp2_put_Pattern(IRegExp2 *iface, BSTR pattern)
{
RegExp2 *This = impl_from_IRegExp2(iface);
- FIXME("(%p)->(%s)\n", This, wine_dbgstr_w(pattern));
- return E_NOTIMPL;
+ WCHAR *p;
+ DWORD size;
+
+ TRACE("(%p)->(%s)\n", This, wine_dbgstr_w(pattern));
+
+ if(!pattern) {
+ heap_free(This->pattern);
+ This->pattern = NULL;
+ return S_OK;
+ }
+
+ size = (SysStringLen(pattern)+1) * sizeof(WCHAR);
+ p = heap_alloc(size);
+ if(!p)
+ return E_OUTOFMEMORY;
+
+ heap_free(This->pattern);
+ This->pattern = p;
+ memcpy(p, pattern, size);
+ return S_OK;
}
static HRESULT WINAPI RegExp2_get_IgnoreCase(IRegExp2 *iface, VARIANT_BOOL *pIgnoreCase)
More information about the wine-cvs
mailing list