wine-commits July 2012

wine-commits@winehq.org

2 participants
712 discussions

Jacek Caban : oleaut32: Use proper helpers for iface calls.
by Alexandre Julliard 27 Jul '12

27 Jul '12

Module: wine Branch: master Commit: 4a5eca88aaca449296dace8946ce6ea1ab14e1d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a5eca88aaca449296dace894… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 27 13:15:15 2012 +0200 oleaut32: Use proper helpers for iface calls. --- dlls/oleaut32/oleaut.c | 2 +- dlls/oleaut32/olefont.c | 8 ++++---- dlls/oleaut32/tmarshal.c | 12 ++++++------ dlls/oleaut32/typelib.c | 42 ++++++++++++++++++------------------------ dlls/oleaut32/typelib2.c | 12 ++++++------ 5 files changed, 35 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4a5eca88aaca449296dac…

1 0

Jacek Caban : urlmon: Use proper helpers for iface calls.
by Alexandre Julliard 27 Jul '12

27 Jul '12

Module: wine Branch: master Commit: d2fe8b70615efb0e16a0942370ed8d2937d81c2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2fe8b70615efb0e16a094237… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 27 11:15:05 2012 +0200 urlmon: Use proper helpers for iface calls. --- dlls/urlmon/bindctx.c | 30 +++++++++++++++--------------- dlls/urlmon/binding.c | 8 ++++---- dlls/urlmon/download.c | 2 +- dlls/urlmon/file.c | 2 +- dlls/urlmon/ftp.c | 2 +- dlls/urlmon/http.c | 2 +- dlls/urlmon/mk.c | 2 +- dlls/urlmon/sec_mgr.c | 6 +++--- dlls/urlmon/umon.c | 4 ++-- dlls/urlmon/umstream.c | 2 +- 10 files changed, 30 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d2fe8b70615efb0e16a09…

1 0

Jacek Caban : ieframe: Use proper helpers for iface calls.
by Alexandre Julliard 27 Jul '12

27 Jul '12

Module: wine Branch: master Commit: 9114827e7ecf7ad6dd35fed92a830aa0f9f63fb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9114827e7ecf7ad6dd35fed92… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 27 11:00:34 2012 +0200 ieframe: Use proper helpers for iface calls. --- dlls/ieframe/classinfo.c | 6 +++--- dlls/ieframe/client.c | 2 +- dlls/ieframe/ie.c | 6 +++--- dlls/ieframe/iexplore.c | 4 ++-- dlls/ieframe/intshcut.c | 2 +- dlls/ieframe/oleobject.c | 44 ++++++++++++++++++++++---------------------- dlls/ieframe/persist.c | 18 +++++++++--------- dlls/ieframe/taskbarlist.c | 2 +- dlls/ieframe/urlhist.c | 2 +- dlls/ieframe/webbrowser.c | 20 ++++++++++---------- 10 files changed, 53 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9114827e7ecf7ad6dd35f…

1 0

Jacek Caban : mshtml: Grow the buffer faster in BufferBSC_read_data.
by Alexandre Julliard 27 Jul '12

27 Jul '12

Module: wine Branch: master Commit: 16871c4c89390f2df3394629a3a1c914f9652c53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16871c4c89390f2df3394629a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 27 10:51:53 2012 +0200 mshtml: Grow the buffer faster in BufferBSC_read_data. --- dlls/mshtml/navigate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 878117f..8956dfd 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -851,7 +851,7 @@ static HRESULT BufferBSC_read_data(BSCallback *bsc, IStream *stream) } do { - if(This->bsc.readed == This->size) { + if(This->bsc.readed >= This->size) { This->size <<= 1; This->buf = heap_realloc(This->buf, This->size); }

1 0

Jacek Caban : mshtml: Added support for BOM in bind_mon_to_wstr.
by Alexandre Julliard 27 Jul '12

27 Jul '12

Module: wine Branch: master Commit: f98c3bbd9c121d1f427022faf6fb9645de635e7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f98c3bbd9c121d1f427022faf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 27 10:51:39 2012 +0200 mshtml: Added support for BOM in bind_mon_to_wstr. --- dlls/mshtml/binding.h | 1 + dlls/mshtml/navigate.c | 88 +++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 73 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index 892a114..eef6053 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -67,6 +67,7 @@ struct BSCallback { ULONG readed; DWORD bindf; BOOL bindinfo_ready; + int bom; IMoniker *mon; IBinding *binding; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 3827e47..878117f 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -50,6 +50,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static const WCHAR emptyW[] = {0}; static const WCHAR text_htmlW[] = {'t','e','x','t','/','h','t','m','l',0}; +enum { + BOM_NONE, + BOM_UTF8, + BOM_UTF16 +}; + struct nsProtocolStream { nsIInputStream nsIInputStream_iface; @@ -607,6 +613,7 @@ static void init_bscallback(BSCallback *This, const BSCallbackVtbl *vtbl, IMonik This->vtbl = vtbl; This->ref = 1; This->bindf = bindf; + This->bom = BOM_NONE; list_init(&This->entry); @@ -617,11 +624,29 @@ static void init_bscallback(BSCallback *This, const BSCallbackVtbl *vtbl, IMonik static HRESULT read_stream(BSCallback *This, IStream *stream, void *buf, DWORD size, DWORD *ret_size) { - DWORD read_size = 0; + DWORD read_size = 0, skip=0; + BYTE *data = buf; HRESULT hres; hres = IStream_Read(stream, buf, size, &read_size); - This->readed += (*ret_size = read_size); + + if(!This->readed && This->bom == BOM_NONE) { + if(read_size >= 2 && data[0] == 0xff && data[1] == 0xfe) { + This->bom = BOM_UTF16; + skip = 2; + }else if(read_size >= 3 && data[0] == 0xef && data[1] == 0xbb && data[2] == 0xbf) { + This->bom = BOM_UTF8; + skip = 3; + } + if(skip) { + read_size -= skip; + if(read_size) + memmove(data, data+skip, read_size); + } + } + + This->readed += read_size; + *ret_size = read_size; return hres; } @@ -878,8 +903,8 @@ static BufferBSC *create_bufferbsc(IMoniker *mon) HRESULT bind_mon_to_wstr(HTMLInnerWindow *window, IMoniker *mon, WCHAR **ret) { BufferBSC *bsc = create_bufferbsc(mon); + int cp = CP_ACP; WCHAR *text; - DWORD len; HRESULT hres; hres = start_binding(window, &bsc->bsc, NULL); @@ -890,14 +915,47 @@ HRESULT bind_mon_to_wstr(HTMLInnerWindow *window, IMoniker *mon, WCHAR **ret) return hres; } - len = MultiByteToWideChar(CP_ACP, 0, bsc->buf, bsc->bsc.readed, NULL, 0); - text = heap_alloc((len+1)*sizeof(WCHAR)); - if(text) { + if(!bsc->bsc.readed) { + *ret = NULL; + return S_OK; + } + + switch(bsc->bsc.bom) { + case BOM_UTF16: + if(bsc->bsc.readed % sizeof(WCHAR)) { + FIXME("The buffer is not a valid utf16 string\n"); + hres = E_FAIL; + break; + } + + text = heap_alloc(bsc->bsc.readed+sizeof(WCHAR)); + if(!text) { + hres = E_OUTOFMEMORY; + break; + } + + memcpy(text, bsc->buf, bsc->bsc.readed); + text[bsc->bsc.readed/sizeof(WCHAR)] = 0; + break; + + case BOM_UTF8: + cp = CP_UTF8; + /* fallthrough */ + default: { + DWORD len; + + len = MultiByteToWideChar(cp, 0, bsc->buf, bsc->bsc.readed, NULL, 0); + text = heap_alloc((len+1)*sizeof(WCHAR)); + if(!text) { + hres = E_OUTOFMEMORY; + break; + } + MultiByteToWideChar(CP_ACP, 0, bsc->buf, bsc->bsc.readed, text, len); text[len] = 0; - }else { - hres = E_OUTOFMEMORY; } + } + IBindStatusCallback_Release(&bsc->bsc.IBindStatusCallback_iface); if(FAILED(hres)) return hres; @@ -1076,15 +1134,13 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) This->nsstream->buf_size += read; if(first_read) { - if(This->nsstream->buf_size >= 2 - && (BYTE)This->nsstream->buf[0] == 0xff - && (BYTE)This->nsstream->buf[1] == 0xfe) - This->nschannel->charset = heap_strdupA(UTF16_STR); - if(This->nsstream->buf_size >= 3 - && (BYTE)This->nsstream->buf[0] == 0xef - && (BYTE)This->nsstream->buf[1] == 0xbb - && (BYTE)This->nsstream->buf[2] == 0xbf) + switch(This->bsc.bom) { + case BOM_UTF8: This->nschannel->charset = heap_strdupA(UTF8_STR); + break; + case BOM_UTF16: + This->nschannel->charset = heap_strdupA(UTF16_STR); + } if(!This->nschannel->content_type) { WCHAR *mime;

1 0

Jacek Caban : mshtml: Moved conversion to unicode of buffers from binding to navigate.c.
by Alexandre Julliard 27 Jul '12

27 Jul '12

Module: wine Branch: master Commit: 73984d4da898a6e66e43856437950bee3b20b6b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73984d4da898a6e66e4385643… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 27 10:51:24 2012 +0200 mshtml: Moved conversion to unicode of buffers from binding to navigate.c. --- dlls/mshtml/binding.h | 2 ++ dlls/mshtml/mshtml_private.h | 2 -- dlls/mshtml/navigate.c | 32 ++++++++++++++++++++------------ dlls/mshtml/script.c | 11 ++--------- 4 files changed, 24 insertions(+), 23 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index 040fcf2..892a114 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -113,3 +113,5 @@ HRESULT channelbsc_load_stream(HTMLInnerWindow*,IStream*) DECLSPEC_HIDDEN; void channelbsc_set_channel(nsChannelBSC*,nsChannel*,nsIStreamListener*,nsISupports*) DECLSPEC_HIDDEN; IUri *nsuri_get_uri(nsWineURI*) DECLSPEC_HIDDEN; HRESULT create_relative_uri(HTMLOuterWindow*,const WCHAR*,IUri**) DECLSPEC_HIDDEN; + +HRESULT bind_mon_to_wstr(HTMLInnerWindow*,IMoniker*,WCHAR**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 91cbbfe..b636685 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -801,8 +801,6 @@ void abort_window_bindings(HTMLInnerWindow*) DECLSPEC_HIDDEN; void set_download_state(HTMLDocumentObj*,int) DECLSPEC_HIDDEN; void call_docview_84(HTMLDocumentObj*) DECLSPEC_HIDDEN; -HRESULT bind_mon_to_buffer(HTMLInnerWindow*,IMoniker*,void**,DWORD*) DECLSPEC_HIDDEN; - void set_ready_state(HTMLOuterWindow*,READYSTATE) DECLSPEC_HIDDEN; HRESULT HTMLSelectionObject_Create(HTMLDocumentNode*,nsISelection*,IHTMLSelectionObject**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index b32446e..3827e47 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -772,7 +772,7 @@ typedef struct { BSCallback bsc; DWORD size; - BYTE *buf; + char *buf; HRESULT hres; } BufferBSC; @@ -875,27 +875,35 @@ static BufferBSC *create_bufferbsc(IMoniker *mon) return ret; } -HRESULT bind_mon_to_buffer(HTMLInnerWindow *window, IMoniker *mon, void **buf, DWORD *size) +HRESULT bind_mon_to_wstr(HTMLInnerWindow *window, IMoniker *mon, WCHAR **ret) { BufferBSC *bsc = create_bufferbsc(mon); + WCHAR *text; + DWORD len; HRESULT hres; - *buf = NULL; - hres = start_binding(window, &bsc->bsc, NULL); - if(SUCCEEDED(hres)) { + if(SUCCEEDED(hres)) hres = bsc->hres; - if(SUCCEEDED(hres)) { - *buf = bsc->buf; - bsc->buf = NULL; - *size = bsc->bsc.readed; - bsc->size = 0; - } + if(FAILED(hres)) { + IBindStatusCallback_Release(&bsc->bsc.IBindStatusCallback_iface); + return hres; } + len = MultiByteToWideChar(CP_ACP, 0, bsc->buf, bsc->bsc.readed, NULL, 0); + text = heap_alloc((len+1)*sizeof(WCHAR)); + if(text) { + MultiByteToWideChar(CP_ACP, 0, bsc->buf, bsc->bsc.readed, text, len); + text[len] = 0; + }else { + hres = E_OUTOFMEMORY; + } IBindStatusCallback_Release(&bsc->bsc.IBindStatusCallback_iface); + if(FAILED(hres)) + return hres; - return hres; + *ret = text; + return S_OK; } static HRESULT read_post_data_stream(nsChannelBSC *This, nsChannel *nschannel) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 4c94662..55c7872 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -32,6 +32,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "binding.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -661,9 +662,7 @@ static void parse_text(ScriptHost *script_host, LPCWSTR text) static void parse_extern_script(ScriptHost *script_host, LPCWSTR src) { IMoniker *mon; - char *buf; WCHAR *text; - DWORD len, size=0; HRESULT hres; static const WCHAR wine_schemaW[] = {'w','i','n','e',':'}; @@ -675,17 +674,11 @@ static void parse_extern_script(ScriptHost *script_host, LPCWSTR src) if(FAILED(hres)) return; - hres = bind_mon_to_buffer(script_host->window, mon, (void**)&buf, &size); + hres = bind_mon_to_wstr(script_host->window, mon, &text); IMoniker_Release(mon); if(FAILED(hres)) return; - len = MultiByteToWideChar(CP_ACP, 0, buf, size, NULL, 0); - text = heap_alloc((len+1)*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, buf, size, text, len); - heap_free(buf); - text[len] = 0; - parse_text(script_host, text); heap_free(text);

1 0

Jacek Caban : mshtml: Moved IStream::Read calls to separated function.
by Alexandre Julliard 27 Jul '12

27 Jul '12

Module: wine Branch: master Commit: f011ccedea8737812a33f1d967994c2b24887bf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f011ccedea8737812a33f1d96… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 27 10:51:11 2012 +0200 mshtml: Moved IStream::Read calls to separated function. --- dlls/mshtml/navigate.c | 31 ++++++++++++++++++------------- 1 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index e5f515f..b32446e 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -48,6 +48,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define UTF16_STR "utf-16" static const WCHAR emptyW[] = {0}; +static const WCHAR text_htmlW[] = {'t','e','x','t','/','h','t','m','l',0}; struct nsProtocolStream { nsIInputStream nsIInputStream_iface; @@ -614,6 +615,16 @@ static void init_bscallback(BSCallback *This, const BSCallbackVtbl *vtbl, IMonik This->mon = mon; } +static HRESULT read_stream(BSCallback *This, IStream *stream, void *buf, DWORD size, DWORD *ret_size) +{ + DWORD read_size = 0; + HRESULT hres; + + hres = IStream_Read(stream, buf, size, &read_size); + This->readed += (*ret_size = read_size); + return hres; +} + static void parse_content_type(nsChannelBSC *This, const WCHAR *value) { const WCHAR *ptr; @@ -820,9 +831,7 @@ static HRESULT BufferBSC_read_data(BSCallback *bsc, IStream *stream) This->buf = heap_realloc(This->buf, This->size); } - readed = 0; - hres = IStream_Read(stream, This->buf+This->bsc.readed, This->size-This->bsc.readed, &readed); - This->bsc.readed += readed; + hres = read_stream(&This->bsc, stream, This->buf+This->bsc.readed, This->size-This->bsc.readed, &readed); }while(hres == S_OK); return S_OK; @@ -1031,8 +1040,6 @@ static void on_stop_nsrequest(nsChannelBSC *This, HRESULT result) static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) { - static const WCHAR mimeTextHtml[] = {'t','e','x','t','/','h','t','m','l',0}; - DWORD read; nsresult nsres; HRESULT hres; @@ -1041,8 +1048,7 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) BYTE buf[1024]; do { - read = 0; - hres = IStream_Read(stream, buf, sizeof(buf), &read); + hres = read_stream(&This->bsc, stream, buf, sizeof(buf), &read); }while(hres == S_OK && read); return S_OK; @@ -1052,15 +1058,16 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) This->nsstream = create_nsprotocol_stream(); do { - read = 0; - hres = IStream_Read(stream, This->nsstream->buf+This->nsstream->buf_size, + BOOL first_read = !This->bsc.readed; + + hres = read_stream(&This->bsc, stream, This->nsstream->buf+This->nsstream->buf_size, sizeof(This->nsstream->buf)-This->nsstream->buf_size, &read); if(!read) break; This->nsstream->buf_size += read; - if(!This->bsc.readed) { + if(first_read) { if(This->nsstream->buf_size >= 2 && (BYTE)This->nsstream->buf[0] == 0xff && (BYTE)This->nsstream->buf[1] == 0xfe) @@ -1075,7 +1082,7 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) WCHAR *mime; hres = FindMimeFromData(NULL, NULL, This->nsstream->buf, This->nsstream->buf_size, - This->is_doc_channel ? mimeTextHtml : NULL, 0, &mime, 0); + This->is_doc_channel ? text_htmlW : NULL, 0, &mime, 0); if(FAILED(hres)) return hres; @@ -1090,8 +1097,6 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) on_start_nsrequest(This); } - This->bsc.readed += This->nsstream->buf_size; - nsres = nsIStreamListener_OnDataAvailable(This->nslistener, (nsIRequest*)&This->nschannel->nsIHttpChannel_iface, This->nscontext, &This->nsstream->nsIInputStream_iface, This->bsc.readed-This->nsstream->buf_size,

1 0

Francois Gouget : wbemprox: Make some signature table functions static.
by Alexandre Julliard 27 Jul '12

27 Jul '12

Module: wine Branch: master Commit: 9f7e450c4bab75e0c47d03fd555cd1abacc65366 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f7e450c4bab75e0c47d03fd5… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jul 27 10:22:28 2012 +0200 wbemprox: Make some signature table functions static. --- dlls/wbemprox/class.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 293c8c4..801a553 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -471,7 +471,7 @@ static void set_default_value( CIMTYPE type, UINT val, BYTE *ptr ) } } -HRESULT create_signature_columns_and_data( IEnumWbemClassObject *iter, UINT *num_cols, +static HRESULT create_signature_columns_and_data( IEnumWbemClassObject *iter, UINT *num_cols, struct column **cols, BYTE **data ) { static const WCHAR parameterW[] = {'P','a','r','a','m','e','t','e','r',0}; @@ -525,7 +525,7 @@ error: return hr; } -HRESULT create_signature_table( IEnumWbemClassObject *iter, WCHAR *name ) +static HRESULT create_signature_table( IEnumWbemClassObject *iter, WCHAR *name ) { HRESULT hr; struct table *table; @@ -546,7 +546,7 @@ HRESULT create_signature_table( IEnumWbemClassObject *iter, WCHAR *name ) return S_OK; } -WCHAR *build_signature_table_name( const WCHAR *class, const WCHAR *method, enum param_direction dir ) +static WCHAR *build_signature_table_name( const WCHAR *class, const WCHAR *method, enum param_direction dir ) { static const WCHAR fmtW[] = {'_','_','%','s','_','%','s','_','%','s',0}; static const WCHAR outW[] = {'O','U','T',0};

1 0

Francois Gouget : kernel32/tests: Make initonce_callback() static.
by Alexandre Julliard 27 Jul '12

27 Jul '12

Module: wine Branch: master Commit: d0282267e00d504296bf798380a470c2a0080ed1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0282267e00d504296bf79838… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jul 27 10:22:24 2012 +0200 kernel32/tests: Make initonce_callback() static. --- dlls/kernel32/tests/sync.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index ed30e26..5ce8f09 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -1142,7 +1142,7 @@ static void test_WaitForMultipleObjects(void) static BOOL g_initcallback_ret, g_initcallback_called; static void *g_initctxt; -BOOL CALLBACK initonce_callback(INIT_ONCE *initonce, void *parameter, void **ctxt) +static BOOL CALLBACK initonce_callback(INIT_ONCE *initonce, void *parameter, void **ctxt) { g_initcallback_called = TRUE; /* zero bit set means here that initialization is taking place - initialization locked */

1 0

Nikolay Sivov : msxml3: Enable inline wrappers and fix warnings.
by Alexandre Julliard 27 Jul '12

27 Jul '12

Module: wine Branch: master Commit: f14c2f712f0e8b2dd924f52dd960ab8add791da9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f14c2f712f0e8b2dd924f52dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 27 07:53:58 2012 +0400 msxml3: Enable inline wrappers and fix warnings. --- dlls/msxml3/Makefile.in | 1 + dlls/msxml3/attribute.c | 2 +- dlls/msxml3/cdata.c | 2 +- dlls/msxml3/comment.c | 2 +- dlls/msxml3/docfrag.c | 2 +- dlls/msxml3/domdoc.c | 2 +- dlls/msxml3/nodemap.c | 2 +- dlls/msxml3/text.c | 2 +- dlls/msxml3/xmlparser.c | 2 +- dlls/msxml3/xmlview.c | 2 +- 10 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in index acd571f..fcf78b5 100644 --- a/dlls/msxml3/Makefile.in +++ b/dlls/msxml3/Makefile.in @@ -1,6 +1,7 @@ EXTRADEFS = -DCOM_NO_WINDOWS_H MODULE = msxml3.dll IMPORTS = uuid urlmon shlwapi oleaut32 ole32 user32 advapi32 +EXTRADEFS = -DWIDL_C_INLINE_WRAPPERS EXTRALIBS = @XML2LIBS@ EXTRAINCL = @XML2INCL@ @XSLTINCL@ diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 0fa00ec..d461ce1 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -91,7 +91,7 @@ static HRESULT WINAPI domattr_QueryInterface( return E_NOINTERFACE; } - IXMLDOMText_AddRef((IUnknown*)*ppvObject); + IXMLDOMAttribute_AddRef(iface); return S_OK; } diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 1cf3d29..6b3c065 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -91,7 +91,7 @@ static HRESULT WINAPI domcdata_QueryInterface( return E_NOINTERFACE; } - IXMLDOMText_AddRef((IUnknown*)*ppvObject); + IXMLDOMCDATASection_AddRef(iface); return S_OK; } diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 172a1e6..be49e71 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -91,7 +91,7 @@ static HRESULT WINAPI domcomment_QueryInterface( return E_NOINTERFACE; } - IXMLDOMText_AddRef((IUnknown*)*ppvObject); + IXMLDOMComment_AddRef(iface); return S_OK; } diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 46b81b0..f066290 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -90,7 +90,7 @@ static HRESULT WINAPI domfrag_QueryInterface( return E_NOINTERFACE; } - IXMLDOMText_AddRef((IUnknown*)*ppvObject); + IXMLDOMDocumentFragment_AddRef(iface); return S_OK; } diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index c2dbe03..54c601e 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2115,7 +2115,7 @@ static HRESULT WINAPI domdoc_load( if(hr == S_OK) { IPersistStream *pDocStream; - hr = IUnknown_QueryInterface(iface, &IID_IPersistStream, (void**)&pDocStream); + hr = IXMLDOMDocument3_QueryInterface(iface, &IID_IPersistStream, (void**)&pDocStream); if(hr == S_OK) { hr = IPersistStream_Load(pDocStream, pStream); diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index c6be169..94faf9f 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -117,7 +117,7 @@ static HRESULT WINAPI xmlnodemap_QueryInterface( return E_NOINTERFACE; } - IXMLDOMElement_AddRef( iface ); + IXMLDOMNamedNodeMap_AddRef( iface ); return S_OK; } diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 865c1d4..6fb29f9 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -82,7 +82,7 @@ static HRESULT WINAPI domtext_QueryInterface( return E_NOINTERFACE; } - IXMLDOMText_AddRef((IUnknown*)*ppvObject); + IXMLDOMText_AddRef(iface); return S_OK; } diff --git a/dlls/msxml3/xmlparser.c b/dlls/msxml3/xmlparser.c index c51b674..f18f454 100644 --- a/dlls/msxml3/xmlparser.c +++ b/dlls/msxml3/xmlparser.c @@ -75,7 +75,7 @@ static HRESULT WINAPI xmlparser_QueryInterface(IXMLParser* iface, REFIID riid, v return E_NOINTERFACE; } - IXMLParser_AddRef((IUnknown*)*ppvObject); + IXMLParser_AddRef(iface); return S_OK; } diff --git a/dlls/msxml3/xmlview.c b/dlls/msxml3/xmlview.c index f3e7f89..cd7389a 100644 --- a/dlls/msxml3/xmlview.c +++ b/dlls/msxml3/xmlview.c @@ -491,7 +491,7 @@ static inline HRESULT handle_xml_load(BindStatusCallback *This) return display_error_page(This); } - hres = IXMLDOMDocument_transformNode(xml, (IXMLDOMNode*)xsl, &bstr); + hres = IXMLDOMDocument3_transformNode(xml, (IXMLDOMNode*)xsl, &bstr); IXMLDOMDocument3_Release(xsl); IXMLDOMDocument3_Release(xml); if(FAILED(hres))

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2012