November 2012 - Wine-Commits

Piotr Caban : msvcp60: Fixed basic_string::_Tidy implementation.
by Alexandre Julliard Nov. 19, 2012

Nov. 19, 2012

Module: wine Branch: master Commit: 3a7a1d7125378aaca255149792c0d3b1ce39193e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a7a1d7125378aaca25514979… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Nov 18 21:44:17 2012 +0100 msvcp60: Fixed basic_string::_Tidy implementation. --- dlls/msvcp60/string.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 2b890fa..5b0b358 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -166,7 +166,7 @@ void __thiscall basic_string_char__Tidy(basic_string_char *this, MSVCP_bool buil if(!this->ptr || !built); else if(!this->ptr[-1] || (unsigned char)this->ptr[-1]==FROZEN) - MSVCP_allocator_char_deallocate(NULL, this->ptr, this->res+2); + MSVCP_allocator_char_deallocate(NULL, this->ptr-1, this->res+2); else this->ptr[-1]--; @@ -1882,7 +1882,7 @@ void __thiscall basic_string_wchar__Tidy(basic_string_wchar *this, MSVCP_bool bu if(!this->ptr || !built); else if(!this->ptr[-1] || (unsigned short)this->ptr[-1]==FROZEN) - MSVCP_allocator_wchar_deallocate(NULL, this->ptr, this->res+2); + MSVCP_allocator_wchar_deallocate(NULL, this->ptr-1, this->res+2); else this->ptr[-1]--;

1 0

Piotr Caban : msvcp60: Fixed basic_string::_Copy implementation.
by Alexandre Julliard Nov. 19, 2012

Nov. 19, 2012

Module: wine Branch: master Commit: 0569947da09328d033fbe234587fcd31ab624ad2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0569947da09328d033fbe2345… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Nov 18 21:44:26 2012 +0100 msvcp60: Fixed basic_string::_Copy implementation. --- dlls/msvcp60/string.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 5b0b358..6fe2780 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -260,9 +260,8 @@ void __thiscall basic_string_char__Copy(basic_string_char *this, MSVCP_size_t co { TRACE("%p %lu\n", this, copy_len); - if(!basic_string_char__Grow(this, copy_len, FALSE)) + if(!basic_string_char__Grow(this, copy_len, TRUE)) return; - basic_string_char__Eos(this, copy_len); } /* ?_Pdif@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@CAIPBD0(a)Z */ @@ -1976,9 +1975,8 @@ void __thiscall basic_string_wchar__Copy(basic_string_wchar *this, MSVCP_size_t { TRACE("%p %lu\n", this, copy_len); - if(!basic_string_wchar__Grow(this, copy_len, FALSE)) + if(!basic_string_wchar__Grow(this, copy_len, TRUE)) return; - basic_string_wchar__Eos(this, copy_len); } /* ?_Pdif@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@CAIPBG0(a)Z */

1 0

Nikolay Sivov : msxml3: Make it clear when encoded buffer is created.
by Alexandre Julliard Nov. 19, 2012

Nov. 19, 2012

Module: wine Branch: master Commit: f6d22b06c6e58fe250cb7bd375df19277e58b551 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6d22b06c6e58fe250cb7bd37… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 18 23:48:29 2012 -0500 msxml3: Make it clear when encoded buffer is created. --- dlls/msxml3/mxwriter.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index f03ceb0..d62e6a3 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -288,7 +288,9 @@ static HRESULT alloc_output_buffer(xml_encoding encoding, output_buffer **buffer return hr; } - if (ret->code_page == CP_UTF8) { + /* currently we always create a default output buffer that is UTF-16 only, + but it's possible to allocate with specific encoding too */ + if (encoding != XmlEncoding_UTF16) { hr = init_encoded_buffer(&ret->encoded); if (hr != S_OK) { free_encoded_buffer(&ret->utf16);

1 0

Hans Leidekker : msi: Don' t set the REINSTALL property if the product will be patched.
by Alexandre Julliard Nov. 19, 2012

Nov. 19, 2012

Module: wine Branch: master Commit: ed4ce217d3fef4446fcb7a2108056953bf21cefb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed4ce217d3fef4446fcb7a210… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 19 15:49:02 2012 +0100 msi: Don't set the REINSTALL property if the product will be patched. --- dlls/msi/action.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 246b90c..076d1b3 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7727,7 +7727,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, static const WCHAR szDisableRollback[] = {'D','I','S','A','B','L','E','R','O','L','L','B','A','C','K',0}; static const WCHAR szAction[] = {'A','C','T','I','O','N',0}; static const WCHAR szInstall[] = {'I','N','S','T','A','L','L',0}; - WCHAR *reinstall, *remove; + WCHAR *reinstall, *remove, *patch; BOOL ui_exists; UINT rc; @@ -7778,9 +7778,10 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, msi_apply_transforms( package ); msi_apply_patches( package ); + patch = msi_dup_property( package->db, szPatch ); remove = msi_dup_property( package->db, szRemove ); reinstall = msi_dup_property( package->db, szReinstall ); - if (msi_get_property_int( package->db, szInstalled, 0 ) && !remove && !reinstall) + if (msi_get_property_int( package->db, szInstalled, 0 ) && !remove && !reinstall && !patch) { TRACE("setting REINSTALL property to ALL\n"); msi_set_property( package->db, szReinstall, szAll, -1 ); @@ -7841,6 +7842,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, } msi_free( reinstall ); msi_free( remove ); + msi_free( patch ); if (rc == ERROR_SUCCESS && package->need_reboot_at_end) return ERROR_SUCCESS_REBOOT_REQUIRED;

1 0

Alexandre Julliard : user32: Reimplement system color handling using standard system parameter entries.
by Alexandre Julliard Nov. 19, 2012

Nov. 19, 2012

Module: wine Branch: master Commit: 65e480d7018a22281cab82f915de56f682da2b7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=65e480d7018a22281cab82f91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 19 15:18:44 2012 +0100 user32: Reimplement system color handling using standard system parameter entries. --- dlls/user32/sysparams.c | 408 ++++++++++++++++++++++------------------------- 1 files changed, 190 insertions(+), 218 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=65e480d7018a22281cab8…

1 0

Nikolay Sivov : msxml3: AddRef() typeinfo pointers only when we have to.
by Alexandre Julliard Nov. 19, 2012

Nov. 19, 2012

Module: wine Branch: master Commit: 6e566ce6c24186174ab9c5370a3ffbeccb8389a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e566ce6c24186174ab9c5370… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 19 13:50:04 2012 -0500 msxml3: AddRef() typeinfo pointers only when we have to. --- dlls/msxml3/dispex.c | 14 ++++++-------- dlls/msxml3/httprequest.c | 30 ++++++++++++------------------ dlls/msxml3/mxwriter.c | 17 ++++++++--------- dlls/msxml3/node.c | 14 ++++---------- dlls/msxml3/saxreader.c | 28 ++++++++-------------------- dlls/msxml3/xmldoc.c | 15 ++++++--------- dlls/msxml3/xmlelem.c | 14 ++++---------- 7 files changed, 48 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6e566ce6c24186174ab9c…

1 0

Nikolay Sivov : xmllite: Keep stream reference in reader input instead of reader itself.
by Alexandre Julliard Nov. 19, 2012

Nov. 19, 2012

Module: wine Branch: master Commit: 6f7624f5d9d329d24542035760426dda91a923fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f7624f5d9d329d2454203576… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 17 14:12:53 2012 -0500 xmllite: Keep stream reference in reader input instead of reader itself. --- dlls/xmllite/reader.c | 68 +++++++++++++++++++++++------------------- dlls/xmllite/tests/reader.c | 2 +- 2 files changed, 38 insertions(+), 32 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 3c259e5..880e5fa 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -64,15 +64,11 @@ typedef struct unsigned int written; } encoded_buffer; -static HRESULT xmlreaderinput_query_for_stream(IXmlReaderInput *iface, void **pObj); - typedef struct _xmlreader { IXmlReader IXmlReader_iface; LONG ref; IXmlReaderInput *input; - ISequentialStream *stream;/* stored as sequential stream, cause currently - optimizations possible with IStream aren't implemented */ IMalloc *imalloc; XmlReadState state; DtdProcessing dtdmode; @@ -85,8 +81,13 @@ typedef struct _xmlreaderinput { IXmlReaderInput IXmlReaderInput_iface; LONG ref; - IUnknown *input; /* reference passed on IXmlReaderInput creation */ + /* reference passed on IXmlReaderInput creation, is kept when input is created */ + IUnknown *input; IMalloc *imalloc; + /* stream reference set after SetInput() call from reader, + stored as sequential stream, cause currently + optimizations possible with IStream aren't implemented */ + ISequentialStream *stream; input_buffer *buffer; } xmlreaderinput; @@ -225,6 +226,31 @@ static void free_input_buffer(input_buffer *buffer) readerinput_free(buffer->input, buffer); } +static void xmlreaderinput_release_stream(IXmlReaderInput *iface) +{ + xmlreaderinput *This = impl_from_IXmlReaderInput(iface); + + if (This->stream) { + ISequentialStream_Release(This->stream); + This->stream = NULL; + } +} + +/* Queries already stored interface for IStream/ISequentialStream. + Interface supplied on creation will be overwritten */ +static HRESULT xmlreaderinput_query_for_stream(IXmlReaderInput *iface) +{ + xmlreaderinput *This = impl_from_IXmlReaderInput(iface); + HRESULT hr; + + xmlreaderinput_release_stream(iface); + hr = IUnknown_QueryInterface(This->input, &IID_IStream, (void**)&This->stream); + if (hr != S_OK) + hr = IUnknown_QueryInterface(This->input, &IID_ISequentialStream, (void**)&This->stream); + + return hr; +} + static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, void** ppvObject) { xmlreader *This = impl_from_IXmlReader(iface); @@ -266,7 +292,6 @@ static ULONG WINAPI xmlreader_Release(IXmlReader *iface) { IMalloc *imalloc = This->imalloc; if (This->input) IUnknown_Release(This->input); - if (This->stream) ISequentialStream_Release(This->stream); reader_free(This, This); if (imalloc) IMalloc_Release(imalloc); } @@ -283,14 +308,9 @@ static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input) if (This->input) { + xmlreaderinput_release_stream(This->input); IUnknown_Release(This->input); - This->input = NULL; - } - - if (This->stream) - { - ISequentialStream_Release(This->stream); - This->stream = NULL; + This->input = NULL; } This->line = This->pos = 0; @@ -313,7 +333,7 @@ static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input) } /* set stream for supplied IXmlReaderInput */ - hr = xmlreaderinput_query_for_stream(This->input, (void**)&This->stream); + hr = xmlreaderinput_query_for_stream(This->input); if (hr == S_OK) This->state = XmlReadState_Initial; @@ -545,21 +565,6 @@ static const struct IXmlReaderVtbl xmlreader_vtbl = }; /** IXmlReaderInput **/ - -/* Queries already stored interface for IStream/ISequentialStream. - Interface supplied on creation will be overwritten */ -static HRESULT xmlreaderinput_query_for_stream(IXmlReaderInput *iface, void **pObj) -{ - xmlreaderinput *This = impl_from_IXmlReaderInput(iface); - HRESULT hr; - - hr = IUnknown_QueryInterface(This->input, &IID_IStream, pObj); - if (hr != S_OK) - hr = IUnknown_QueryInterface(This->input, &IID_ISequentialStream, pObj); - - return hr; -} - static HRESULT WINAPI xmlreaderinput_QueryInterface(IXmlReaderInput *iface, REFIID riid, void** ppvObject) { xmlreaderinput *This = impl_from_IXmlReaderInput(iface); @@ -573,7 +578,7 @@ static HRESULT WINAPI xmlreaderinput_QueryInterface(IXmlReaderInput *iface, REFI } else { - FIXME("interface %s not implemented\n", debugstr_guid(riid)); + WARN("interface %s not implemented\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -601,6 +606,7 @@ static ULONG WINAPI xmlreaderinput_Release(IXmlReaderInput *iface) { IMalloc *imalloc = This->imalloc; if (This->input) IUnknown_Release(This->input); + if (This->stream) ISequentialStream_Release(This->stream); if (This->buffer) free_input_buffer(This->buffer); readerinput_free(This, This); if (imalloc) IMalloc_Release(imalloc); @@ -636,7 +642,6 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) reader->IXmlReader_iface.lpVtbl = &xmlreader_vtbl; reader->ref = 1; - reader->stream = NULL; reader->input = NULL; reader->state = XmlReadState_Closed; reader->dtdmode = DtdProcessing_Prohibit; @@ -675,6 +680,7 @@ HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, readerinput->IXmlReaderInput_iface.lpVtbl = &xmlreaderinput_vtbl; readerinput->ref = 1; readerinput->imalloc = imalloc; + readerinput->stream = NULL; if (imalloc) IMalloc_AddRef(imalloc); hr = alloc_input_buffer(readerinput, XmlEncoding_UTF16); diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index f013e37..582ad48 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -432,7 +432,7 @@ static void test_readerinput(void) IStream_Release(stream); /* try ::SetInput() with valid IXmlReaderInput */ - hr = pCreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); + hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ref = IUnknown_AddRef(reader_input);

1 0

Nikolay Sivov : xmllite: Add stub for reader input buffer.
by Alexandre Julliard Nov. 19, 2012

Nov. 19, 2012

Module: wine Branch: master Commit: 522ae3ca0e5a3290f88e710ce083ebfd3aeef702 URL: http://source.winehq.org/git/wine.git/?a=commit;h=522ae3ca0e5a3290f88e710ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 17 13:54:16 2012 -0500 xmllite: Add stub for reader input buffer. --- dlls/xmllite/reader.c | 128 +++++++++++++++++++++++++++++++++++++++++++ dlls/xmllite/tests/reader.c | 8 ++- 2 files changed, 135 insertions(+), 1 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index e81bfa3..3c259e5 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -35,6 +35,35 @@ WINE_DEFAULT_DEBUG_CHANNEL(xmllite); /* not defined in public headers */ DEFINE_GUID(IID_IXmlReaderInput, 0x0b3ccc9b, 0x9214, 0x428b, 0xa2, 0xae, 0xef, 0x3a, 0xa8, 0x71, 0xaf, 0xda); +typedef enum +{ + XmlEncoding_UTF16, + XmlEncoding_UTF8, + XmlEncoding_Unknown +} xml_encoding; + +static const WCHAR utf16W[] = {'U','T','F','-','1','6',0}; +static const WCHAR utf8W[] = {'U','T','F','-','8',0}; + +struct xml_encoding_data +{ + const WCHAR *encoding; + xml_encoding enc; + UINT cp; +}; + +static const struct xml_encoding_data xml_encoding_map[] = { + { utf16W, XmlEncoding_UTF16, ~0 }, + { utf8W, XmlEncoding_UTF8, CP_UTF8 } +}; + +typedef struct +{ + char *data; + unsigned int allocated; + unsigned int written; +} encoded_buffer; + static HRESULT xmlreaderinput_query_for_stream(IXmlReaderInput *iface, void **pObj); typedef struct _xmlreader @@ -50,14 +79,25 @@ typedef struct _xmlreader UINT line, pos; /* reader position in XML stream */ } xmlreader; +typedef struct input_buffer input_buffer; + typedef struct _xmlreaderinput { IXmlReaderInput IXmlReaderInput_iface; LONG ref; IUnknown *input; /* reference passed on IXmlReaderInput creation */ IMalloc *imalloc; + input_buffer *buffer; } xmlreaderinput; +struct input_buffer +{ + encoded_buffer utf16; + encoded_buffer encoded; + UINT code_page; + xmlreaderinput *input; +}; + static inline xmlreader *impl_from_IXmlReader(IXmlReader *iface) { return CONTAINING_RECORD(iface, xmlreader, IXmlReader_iface); @@ -106,6 +146,85 @@ static inline void readerinput_free(xmlreaderinput *input, void *mem) return m_free(input->imalloc, mem); } +static HRESULT init_encoded_buffer(xmlreaderinput *input, encoded_buffer *buffer) +{ + const int initial_len = 0x2000; + buffer->data = readerinput_alloc(input, initial_len); + if (!buffer->data) return E_OUTOFMEMORY; + + memset(buffer->data, 0, 4); + buffer->allocated = initial_len; + buffer->written = 0; + + return S_OK; +} + +static void free_encoded_buffer(xmlreaderinput *input, encoded_buffer *buffer) +{ + readerinput_free(input, buffer->data); +} + +static HRESULT get_code_page(xml_encoding encoding, UINT *cp) +{ + const struct xml_encoding_data *data; + + if (encoding == XmlEncoding_Unknown) + { + FIXME("unsupported encoding %d\n", encoding); + return E_NOTIMPL; + } + + data = &xml_encoding_map[encoding]; + *cp = data->cp; + + return S_OK; +} + +static HRESULT alloc_input_buffer(xmlreaderinput *input, xml_encoding encoding) +{ + input_buffer *buffer; + HRESULT hr; + + input->buffer = NULL; + + buffer = readerinput_alloc(input, sizeof(*buffer)); + if (!buffer) return E_OUTOFMEMORY; + + buffer->input = input; + hr = get_code_page(encoding, &buffer->code_page); + if (hr != S_OK) { + readerinput_free(input, buffer); + return hr; + } + + hr = init_encoded_buffer(input, &buffer->utf16); + if (hr != S_OK) { + readerinput_free(input, buffer); + return hr; + } + + if (encoding != XmlEncoding_UTF16) { + hr = init_encoded_buffer(input, &buffer->encoded); + if (hr != S_OK) { + free_encoded_buffer(input, &buffer->utf16); + readerinput_free(input, buffer); + return hr; + } + } + else + memset(&buffer->encoded, 0, sizeof(buffer->encoded)); + + input->buffer = buffer; + return S_OK; +} + +static void free_input_buffer(input_buffer *buffer) +{ + free_encoded_buffer(buffer->input, &buffer->encoded); + free_encoded_buffer(buffer->input, &buffer->utf16); + readerinput_free(buffer->input, buffer); +} + static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, void** ppvObject) { xmlreader *This = impl_from_IXmlReader(iface); @@ -482,6 +601,7 @@ static ULONG WINAPI xmlreaderinput_Release(IXmlReaderInput *iface) { IMalloc *imalloc = This->imalloc; if (This->input) IUnknown_Release(This->input); + if (This->buffer) free_input_buffer(This->buffer); readerinput_free(This, This); if (imalloc) IMalloc_Release(imalloc); } @@ -539,6 +659,7 @@ HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, IXmlReaderInput **ppInput) { xmlreaderinput *readerinput; + HRESULT hr; FIXME("%p %p %s %d %s %p: stub\n", stream, imalloc, wine_dbgstr_w(encoding), hint, wine_dbgstr_w(base_uri), ppInput); @@ -555,6 +676,13 @@ HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, readerinput->ref = 1; readerinput->imalloc = imalloc; if (imalloc) IMalloc_AddRef(imalloc); + + hr = alloc_input_buffer(readerinput, XmlEncoding_UTF16); + if (hr != S_OK) + { + readerinput_free(readerinput, readerinput); + return hr; + } IUnknown_QueryInterface(stream, &IID_IUnknown, (void**)&readerinput->input); *ppInput = &readerinput->IXmlReaderInput_iface; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 39a7618..f013e37 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -402,7 +402,7 @@ static void test_readerinput(void) IXmlReaderInput *reader_input; IXmlReader *reader, *reader2; IUnknown *obj, *input; - IStream *stream; + IStream *stream, *stream2; HRESULT hr; LONG ref; @@ -420,6 +420,12 @@ static void test_readerinput(void) hr = pCreateXmlReaderInputWithEncodingName((IUnknown*)stream, NULL, NULL, FALSE, NULL, &reader_input); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + hr = IUnknown_QueryInterface(reader_input, &IID_IStream, (void**)&stream2); + ok(hr == E_NOINTERFACE, "Expected S_OK, got %08x\n", hr); + + hr = IUnknown_QueryInterface(reader_input, &IID_ISequentialStream, (void**)&stream2); + ok(hr == E_NOINTERFACE, "Expected S_OK, got %08x\n", hr); + /* IXmlReaderInput grabs a stream reference */ ref = IStream_AddRef(stream); ok(ref == 3, "Expected 3, got %d\n", ref);

1 0

Nikolay Sivov : xmllite: Use application defined IMalloc for reader input.
by Alexandre Julliard Nov. 19, 2012

Nov. 19, 2012

Module: wine Branch: master Commit: a2213cdbd7b09aa3073be15053cf0713bcec0c17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2213cdbd7b09aa3073be1505… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 17 11:40:46 2012 -0500 xmllite: Use application defined IMalloc for reader input. --- dlls/xmllite/reader.c | 61 ++++++++++++++++++++++++++++++++++++------------- 1 files changed, 45 insertions(+), 16 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 226b0f9..e81bfa3 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -55,6 +55,7 @@ typedef struct _xmlreaderinput IXmlReaderInput IXmlReaderInput_iface; LONG ref; IUnknown *input; /* reference passed on IXmlReaderInput creation */ + IMalloc *imalloc; } xmlreaderinput; static inline xmlreader *impl_from_IXmlReader(IXmlReader *iface) @@ -67,23 +68,44 @@ static inline xmlreaderinput *impl_from_IXmlReaderInput(IXmlReaderInput *iface) return CONTAINING_RECORD(iface, xmlreaderinput, IXmlReaderInput_iface); } -/* reader memory allocation functions */ -static inline void *reader_alloc(xmlreader *reader, size_t len) +static inline void *m_alloc(IMalloc *imalloc, size_t len) { - if (reader->imalloc) - return IMalloc_Alloc(reader->imalloc, len); + if (imalloc) + return IMalloc_Alloc(imalloc, len); else return heap_alloc(len); } -static inline void reader_free(xmlreader *reader, void *mem) +static inline void m_free(IMalloc *imalloc, void *mem) { - if (reader->imalloc) - IMalloc_Free(reader->imalloc, mem); + if (imalloc) + IMalloc_Free(imalloc, mem); else heap_free(mem); } +/* reader memory allocation functions */ +static inline void *reader_alloc(xmlreader *reader, size_t len) +{ + return m_alloc(reader->imalloc, len); +} + +static inline void reader_free(xmlreader *reader, void *mem) +{ + return m_free(reader->imalloc, mem); +} + +/* reader input memory allocation functions */ +static inline void *readerinput_alloc(xmlreaderinput *input, size_t len) +{ + return m_alloc(input->imalloc, len); +} + +static inline void readerinput_free(xmlreaderinput *input, void *mem) +{ + return m_free(input->imalloc, mem); +} + static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, void** ppvObject) { xmlreader *This = impl_from_IXmlReader(iface); @@ -444,22 +466,24 @@ static HRESULT WINAPI xmlreaderinput_QueryInterface(IXmlReaderInput *iface, REFI static ULONG WINAPI xmlreaderinput_AddRef(IXmlReaderInput *iface) { xmlreaderinput *This = impl_from_IXmlReaderInput(iface); - TRACE("%p\n", This); - return InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; } static ULONG WINAPI xmlreaderinput_Release(IXmlReaderInput *iface) { xmlreaderinput *This = impl_from_IXmlReaderInput(iface); - LONG ref; + LONG ref = InterlockedDecrement(&This->ref); - TRACE("%p\n", This); + TRACE("(%p)->(%d)\n", This, ref); - ref = InterlockedDecrement(&This->ref); if (ref == 0) { + IMalloc *imalloc = This->imalloc; if (This->input) IUnknown_Release(This->input); - heap_free(This); + readerinput_free(This, This); + if (imalloc) IMalloc_Release(imalloc); } return ref; @@ -508,7 +532,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) } HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, - IMalloc *pMalloc, + IMalloc *imalloc, LPCWSTR encoding, BOOL hint, LPCWSTR base_uri, @@ -516,16 +540,21 @@ HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, { xmlreaderinput *readerinput; - FIXME("%p %p %s %d %s %p: stub\n", stream, pMalloc, wine_dbgstr_w(encoding), + FIXME("%p %p %s %d %s %p: stub\n", stream, imalloc, wine_dbgstr_w(encoding), hint, wine_dbgstr_w(base_uri), ppInput); if (!stream || !ppInput) return E_INVALIDARG; - readerinput = heap_alloc(sizeof(*readerinput)); + if (imalloc) + readerinput = IMalloc_Alloc(imalloc, sizeof(*readerinput)); + else + readerinput = heap_alloc(sizeof(*readerinput)); if(!readerinput) return E_OUTOFMEMORY; readerinput->IXmlReaderInput_iface.lpVtbl = &xmlreaderinput_vtbl; readerinput->ref = 1; + readerinput->imalloc = imalloc; + if (imalloc) IMalloc_AddRef(imalloc); IUnknown_QueryInterface(stream, &IID_IUnknown, (void**)&readerinput->input); *ppInput = &readerinput->IXmlReaderInput_iface;

1 0

Nikolay Sivov : xmllite: Support application defined IMalloc for reader.
by Alexandre Julliard Nov. 19, 2012

Nov. 19, 2012

Module: wine Branch: master Commit: c88cdc6e38329e3eab9fbb38aa2f81a4dd0ce337 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c88cdc6e38329e3eab9fbb38a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 17 11:22:47 2012 -0500 xmllite: Support application defined IMalloc for reader. --- dlls/xmllite/reader.c | 54 ++++++++++++++++++++++++++++----------- dlls/xmllite/xmllite_private.h | 35 ++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 15 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index f4c0e94..226b0f9 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -26,6 +26,7 @@ #include "initguid.h" #include "objbase.h" #include "xmllite.h" +#include "xmllite_private.h" #include "wine/debug.h" @@ -43,6 +44,7 @@ typedef struct _xmlreader IXmlReaderInput *input; ISequentialStream *stream;/* stored as sequential stream, cause currently optimizations possible with IStream aren't implemented */ + IMalloc *imalloc; XmlReadState state; DtdProcessing dtdmode; UINT line, pos; /* reader position in XML stream */ @@ -65,6 +67,23 @@ static inline xmlreaderinput *impl_from_IXmlReaderInput(IXmlReaderInput *iface) return CONTAINING_RECORD(iface, xmlreaderinput, IXmlReaderInput_iface); } +/* reader memory allocation functions */ +static inline void *reader_alloc(xmlreader *reader, size_t len) +{ + if (reader->imalloc) + return IMalloc_Alloc(reader->imalloc, len); + else + return heap_alloc(len); +} + +static inline void reader_free(xmlreader *reader, void *mem) +{ + if (reader->imalloc) + IMalloc_Free(reader->imalloc, mem); + else + heap_free(mem); +} + static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, void** ppvObject) { xmlreader *This = impl_from_IXmlReader(iface); @@ -90,23 +109,25 @@ static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, v static ULONG WINAPI xmlreader_AddRef(IXmlReader *iface) { xmlreader *This = impl_from_IXmlReader(iface); - TRACE("%p\n", This); - return InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; } static ULONG WINAPI xmlreader_Release(IXmlReader *iface) { xmlreader *This = impl_from_IXmlReader(iface); - LONG ref; + LONG ref = InterlockedDecrement(&This->ref); - TRACE("%p\n", This); + TRACE("(%p)->(%d)\n", This, ref); - ref = InterlockedDecrement(&This->ref); if (ref == 0) { + IMalloc *imalloc = This->imalloc; if (This->input) IUnknown_Release(This->input); if (This->stream) ISequentialStream_Release(This->stream); - HeapFree(GetProcessHeap(), 0, This); + reader_free(This, This); + if (imalloc) IMalloc_Release(imalloc); } return ref; @@ -438,7 +459,7 @@ static ULONG WINAPI xmlreaderinput_Release(IXmlReaderInput *iface) if (ref == 0) { if (This->input) IUnknown_Release(This->input); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); } return ref; @@ -451,13 +472,11 @@ static const struct IUnknownVtbl xmlreaderinput_vtbl = xmlreaderinput_Release }; -HRESULT WINAPI CreateXmlReader(REFIID riid, void **pObject, IMalloc *pMalloc) +HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) { xmlreader *reader; - TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), pObject, pMalloc); - - if (pMalloc) FIXME("custom IMalloc not supported yet\n"); + TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), obj, imalloc); if (!IsEqualGUID(riid, &IID_IXmlReader)) { @@ -465,7 +484,10 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **pObject, IMalloc *pMalloc) return E_FAIL; } - reader = HeapAlloc(GetProcessHeap(), 0, sizeof (*reader)); + if (imalloc) + reader = IMalloc_Alloc(imalloc, sizeof(*reader)); + else + reader = heap_alloc(sizeof(*reader)); if(!reader) return E_OUTOFMEMORY; reader->IXmlReader_iface.lpVtbl = &xmlreader_vtbl; @@ -475,10 +497,12 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **pObject, IMalloc *pMalloc) reader->state = XmlReadState_Closed; reader->dtdmode = DtdProcessing_Prohibit; reader->line = reader->pos = 0; + reader->imalloc = imalloc; + if (imalloc) IMalloc_AddRef(imalloc); - *pObject = &reader->IXmlReader_iface; + *obj = &reader->IXmlReader_iface; - TRACE("returning iface %p\n", *pObject); + TRACE("returning iface %p\n", *obj); return S_OK; } @@ -497,7 +521,7 @@ HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, if (!stream || !ppInput) return E_INVALIDARG; - readerinput = HeapAlloc(GetProcessHeap(), 0, sizeof (*readerinput)); + readerinput = heap_alloc(sizeof(*readerinput)); if(!readerinput) return E_OUTOFMEMORY; readerinput->IXmlReaderInput_iface.lpVtbl = &xmlreaderinput_vtbl; diff --git a/dlls/xmllite/xmllite_private.h b/dlls/xmllite/xmllite_private.h new file mode 100644 index 0000000..1677e5c --- /dev/null +++ b/dlls/xmllite/xmllite_private.h @@ -0,0 +1,35 @@ +/* + * XMLLite private things + * + * Copyright 2012 Nikolay Sivov 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 + */ + +#ifndef __XMLLITE_PRIVATE__ +#define __XMLLITE_PRIVATE__ + +/* memory allocation functions */ +static inline void *heap_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} + +#endif /* __XMLLITE_PRIVATE__ */

1 0