wine-commits October 2011

wine-commits@winehq.org

3 participants
783 discussions

Marcus Meissner : shlwapi: Fixed bad pointer arithmentic by removing sizeof () (Coverity).
by Alexandre Julliard 18 Oct '11

18 Oct '11

Module: wine Branch: master Commit: c9b6994648c3cce9d3e590cf6406852471834911 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9b6994648c3cce9d3e590cf6… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Oct 18 05:50:26 2011 +0200 shlwapi: Fixed bad pointer arithmentic by removing sizeof() (Coverity). --- dlls/shlwapi/url.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index bcd413c..d43bea5 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -744,7 +744,7 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative, if (base.nScheme == URL_SCHEME_HTTP || base.nScheme == URL_SCHEME_HTTPS) manual_search = TRUE; - else if (work - base.pszSuffix > len_htmW * sizeof(WCHAR)) { + else if (work - base.pszSuffix > len_htmW) { work -= len_htmW; if (strncmpiW(work, htmW, len_htmW) == 0) manual_search = TRUE; @@ -752,7 +752,7 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative, } if (!manual_search && - work - base.pszSuffix > len_htmlW * sizeof(WCHAR)) { + work - base.pszSuffix > len_htmlW) { work -= len_htmlW; if (strncmpiW(work, htmlW, len_htmlW) == 0) manual_search = TRUE;

1 0

Marcus Meissner : ddraw: Lowercase variable names to fix a incorrect sizeof () (Coverity).
by Alexandre Julliard 18 Oct '11

18 Oct '11

Module: wine Branch: master Commit: b08d4f597a7cc11ac2b9630e1e3e78662468c349 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b08d4f597a7cc11ac2b9630e1… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Oct 18 05:40:38 2011 +0200 ddraw: Lowercase variable names to fix a incorrect sizeof() (Coverity). --- dlls/ddraw/main.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 4bead03..08624d1 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -296,27 +296,27 @@ DirectDrawCreate(GUID *GUID, * ***********************************************************************/ HRESULT WINAPI DECLSPEC_HOTPATCH -DirectDrawCreateEx(GUID *GUID, - LPVOID *DD, +DirectDrawCreateEx(GUID *guid, + LPVOID *dd, REFIID iid, IUnknown *UnkOuter) { HRESULT hr; TRACE("driver_guid %s, ddraw %p, interface_iid %s, outer_unknown %p.\n", - debugstr_guid(GUID), DD, debugstr_guid(iid), UnkOuter); + debugstr_guid(guid), dd, debugstr_guid(iid), UnkOuter); if (!IsEqualGUID(iid, &IID_IDirectDraw7)) return DDERR_INVALIDPARAMS; EnterCriticalSection(&ddraw_cs); - hr = DDRAW_Create(GUID, DD, UnkOuter, iid); + hr = DDRAW_Create(guid, dd, UnkOuter, iid); LeaveCriticalSection(&ddraw_cs); if (SUCCEEDED(hr)) { - IDirectDraw7 *ddraw7 = *(IDirectDraw7 **)DD; - hr = IDirectDraw7_Initialize(ddraw7, GUID); + IDirectDraw7 *ddraw7 = *(IDirectDraw7 **)dd; + hr = IDirectDraw7_Initialize(ddraw7, guid); if (FAILED(hr)) IDirectDraw7_Release(ddraw7); }

1 0

Marcus Meissner : directshow: Removed bad sizeof in copy/pasted code ( Coverity).
by Alexandre Julliard 18 Oct '11

18 Oct '11

Module: wine Branch: master Commit: 2a55b09bedc6010c326aa1663f04dda674b89763 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a55b09bedc6010c326aa1663… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Oct 18 05:22:10 2011 +0200 directshow: Removed bad sizeof in copy/pasted code (Coverity). --- dlls/dmband/band.c | 2 +- dlls/dmcompos/chordmap.c | 2 +- dlls/dmime/audiopath.c | 4 ++-- dlls/dmime/graph.c | 4 ++-- dlls/dmime/segment.c | 4 ++-- dlls/dmscript/script.c | 4 ++-- dlls/dmstyle/style.c | 4 ++-- dlls/dmusic/collection.c | 4 ++-- dlls/dswave/dswave.c | 4 ++-- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index 19e3b86..d1b8029 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -173,7 +173,7 @@ static HRESULT WINAPI IDirectMusicBandImpl_IDirectMusicObject_SetDescriptor (LPD This->pDesc->ftDate = pDesc->ftDate; if (pDesc->dwValidData & DMUS_OBJ_MEMORY) { This->pDesc->llMemLength = pDesc->llMemLength; - memcpy (This->pDesc->pbMemData, pDesc->pbMemData, sizeof (pDesc->pbMemData)); + memcpy (This->pDesc->pbMemData, pDesc->pbMemData, pDesc->llMemLength); } if (pDesc->dwValidData & DMUS_OBJ_STREAM) { /* according to MSDN, we copy the stream */ diff --git a/dlls/dmcompos/chordmap.c b/dlls/dmcompos/chordmap.c index 4e2480f..ea751af 100644 --- a/dlls/dmcompos/chordmap.c +++ b/dlls/dmcompos/chordmap.c @@ -163,7 +163,7 @@ static HRESULT WINAPI IDirectMusicChordMapImpl_IDirectMusicObject_SetDescriptor This->pDesc->ftDate = pDesc->ftDate; if (pDesc->dwValidData & DMUS_OBJ_MEMORY) { This->pDesc->llMemLength = pDesc->llMemLength; - memcpy (This->pDesc->pbMemData, pDesc->pbMemData, sizeof (pDesc->pbMemData)); + memcpy (This->pDesc->pbMemData, pDesc->pbMemData, pDesc->llMemLength); } if (pDesc->dwValidData & DMUS_OBJ_STREAM) { /* according to MSDN, we copy the stream */ diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index eede097..735cf43 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -272,8 +272,8 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicObject_SetDescriptor if (pDesc->dwValidData & DMUS_OBJ_DATE) This->pDesc->ftDate = pDesc->ftDate; if (pDesc->dwValidData & DMUS_OBJ_MEMORY) { - memcpy (&This->pDesc->llMemLength, &pDesc->llMemLength, sizeof (pDesc->llMemLength)); - memcpy (This->pDesc->pbMemData, pDesc->pbMemData, sizeof (pDesc->pbMemData)); + This->pDesc->llMemLength = pDesc->llMemLength; + memcpy (This->pDesc->pbMemData, pDesc->pbMemData, pDesc->llMemLength); } if (pDesc->dwValidData & DMUS_OBJ_STREAM) { /* according to MSDN, we copy the stream */ diff --git a/dlls/dmime/graph.c b/dlls/dmime/graph.c index f9e29a3..30edd2a 100644 --- a/dlls/dmime/graph.c +++ b/dlls/dmime/graph.c @@ -237,8 +237,8 @@ static HRESULT WINAPI IDirectMusicGraphImpl_IDirectMusicObject_SetDescriptor (LP if (pDesc->dwValidData & DMUS_OBJ_DATE) This->pDesc->ftDate = pDesc->ftDate; if (pDesc->dwValidData & DMUS_OBJ_MEMORY) { - memcpy (&This->pDesc->llMemLength, &pDesc->llMemLength, sizeof (pDesc->llMemLength)); - memcpy (This->pDesc->pbMemData, pDesc->pbMemData, sizeof (pDesc->pbMemData)); + This->pDesc->llMemLength = pDesc->llMemLength; + memcpy (This->pDesc->pbMemData, pDesc->pbMemData, pDesc->llMemLength); } if (pDesc->dwValidData & DMUS_OBJ_STREAM) { /* according to MSDN, we copy the stream */ diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index df3c2a6..9f968e6 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -563,8 +563,8 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_IDirectMusicObject_SetDescriptor if (pDesc->dwValidData & DMUS_OBJ_DATE) This->pDesc->ftDate = pDesc->ftDate; if (pDesc->dwValidData & DMUS_OBJ_MEMORY) { - memcpy (&This->pDesc->llMemLength, &pDesc->llMemLength, sizeof (pDesc->llMemLength)); - memcpy (This->pDesc->pbMemData, pDesc->pbMemData, sizeof (pDesc->pbMemData)); + This->pDesc->llMemLength = pDesc->llMemLength; + memcpy (This->pDesc->pbMemData, pDesc->pbMemData, pDesc->llMemLength); } if (pDesc->dwValidData & DMUS_OBJ_STREAM) { /* according to MSDN, we copy the stream */ diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c index 57c3f7b..090e0ce 100644 --- a/dlls/dmscript/script.c +++ b/dlls/dmscript/script.c @@ -241,8 +241,8 @@ static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicObject_SetDescriptor (L if (pDesc->dwValidData & DMUS_OBJ_DATE) This->pDesc->ftDate = pDesc->ftDate; if (pDesc->dwValidData & DMUS_OBJ_MEMORY) { - memcpy (&This->pDesc->llMemLength, &pDesc->llMemLength, sizeof (pDesc->llMemLength)); - memcpy (This->pDesc->pbMemData, pDesc->pbMemData, sizeof (pDesc->pbMemData)); + This->pDesc->llMemLength = pDesc->llMemLength; + memcpy (This->pDesc->pbMemData, pDesc->pbMemData, pDesc->llMemLength); } if (pDesc->dwValidData & DMUS_OBJ_STREAM) { /* according to MSDN, we copy the stream */ diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index a7312e4..36ce9bf 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -245,8 +245,8 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicObject_SetDescriptor (L if (pDesc->dwValidData & DMUS_OBJ_DATE) This->pDesc->ftDate = pDesc->ftDate; if (pDesc->dwValidData & DMUS_OBJ_MEMORY) { - memcpy (&This->pDesc->llMemLength, &pDesc->llMemLength, sizeof (pDesc->llMemLength)); - memcpy (This->pDesc->pbMemData, pDesc->pbMemData, sizeof (pDesc->pbMemData)); + This->pDesc->llMemLength = pDesc->llMemLength; + memcpy (This->pDesc->pbMemData, pDesc->pbMemData, pDesc->llMemLength); } if (pDesc->dwValidData & DMUS_OBJ_STREAM) { /* according to MSDN, we copy the stream */ diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 5001072..faafd64 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -209,8 +209,8 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_SetDescripto if (pDesc->dwValidData & DMUS_OBJ_DATE) This->pDesc->ftDate = pDesc->ftDate; if (pDesc->dwValidData & DMUS_OBJ_MEMORY) { - memcpy (&This->pDesc->llMemLength, &pDesc->llMemLength, sizeof (pDesc->llMemLength)); - memcpy (This->pDesc->pbMemData, pDesc->pbMemData, sizeof (pDesc->pbMemData)); + This->pDesc->llMemLength = pDesc->llMemLength; + memcpy (This->pDesc->pbMemData, pDesc->pbMemData, pDesc->llMemLength); } if (pDesc->dwValidData & DMUS_OBJ_STREAM) { /* according to MSDN, we copy the stream */ diff --git a/dlls/dswave/dswave.c b/dlls/dswave/dswave.c index afaece8..f6fbe07 100644 --- a/dlls/dswave/dswave.c +++ b/dlls/dswave/dswave.c @@ -361,8 +361,8 @@ static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicObject_SetDescriptor (LPD if (pDesc->dwValidData & DMUS_OBJ_DATE) This->pDesc->ftDate = pDesc->ftDate; if (pDesc->dwValidData & DMUS_OBJ_MEMORY) { - memcpy (&This->pDesc->llMemLength, &pDesc->llMemLength, sizeof (pDesc->llMemLength)); - memcpy (This->pDesc->pbMemData, pDesc->pbMemData, sizeof (pDesc->pbMemData)); + This->pDesc->llMemLength = pDesc->llMemLength; + memcpy (This->pDesc->pbMemData, pDesc->pbMemData, pDesc->llMemLength); } if (pDesc->dwValidData & DMUS_OBJ_STREAM) { /* according to MSDN, we copy the stream */

1 0

Marcus Meissner : explorerframe: Fixed incorrect sizeof (Coverity).
by Alexandre Julliard 18 Oct '11

18 Oct '11

Module: wine Branch: master Commit: 230f63c3d266d3178e775f30b760e8b358736cf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=230f63c3d266d3178e775f30b… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Oct 18 05:12:52 2011 +0200 explorerframe: Fixed incorrect sizeof (Coverity). --- dlls/explorerframe/nstc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 9a8c75b..00ad1f6 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -1114,7 +1114,7 @@ static HRESULT WINAPI NSTC2_fnGetRootItems(INameSpaceTreeControl2* iface, if(!count) return E_INVALIDARG; - array = HeapAlloc(GetProcessHeap(), 0, sizeof(LPITEMIDLIST*)*count); + array = HeapAlloc(GetProcessHeap(), 0, sizeof(LPITEMIDLIST)*count); i = 0; LIST_FOR_EACH_ENTRY(root, &This->roots, nstc_root, entry)

1 0

Marcus Meissner : gdi32: Remove a incorrect sizeof from pointer arithmetic (Coverity).
by Alexandre Julliard 18 Oct '11

18 Oct '11

Module: wine Branch: master Commit: 06935e9323da56dd28a63da9c1dd59170c270097 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06935e9323da56dd28a63da9c… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Oct 18 05:07:32 2011 +0200 gdi32: Remove a incorrect sizeof from pointer arithmetic (Coverity). --- dlls/gdi32/tests/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index f127743..a17b4c8 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2473,7 +2473,7 @@ static BOOL get_first_last_from_cmap4(void *ptr, DWORD *first, DWORD *last, DWOR + i - seg_count; /* some fonts have broken last segment */ - if ((char *)(glyph_ids + index + sizeof(*glyph_ids)) < (char *)ptr + limit) + if ((char *)(glyph_ids + index + 1) < (char *)ptr + limit) index = GET_BE_WORD(glyph_ids[index]); else {

1 0

Marcus Meissner : mshtml: Adjusted some incorrect sizeofs (Coverity).
by Alexandre Julliard 18 Oct '11

18 Oct '11

Module: wine Branch: master Commit: 59fc063a349a2a10187077dd7404a3d873dd1781 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59fc063a349a2a10187077dd7… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Oct 18 05:05:51 2011 +0200 mshtml: Adjusted some incorrect sizeofs (Coverity). --- dlls/mshtml/htmlelemcol.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index b5dbc0f..c1187a6 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -61,7 +61,7 @@ static void elem_vector_add(elem_vector_t *buf, HTMLElement *elem) { if(buf->len == buf->size) { buf->size <<= 1; - buf->buf = heap_realloc(buf->buf, buf->size*sizeof(HTMLElement**)); + buf->buf = heap_realloc(buf->buf, buf->size*sizeof(HTMLElement*)); } buf->buf[buf->len++] = elem; @@ -73,7 +73,7 @@ static void elem_vector_normalize(elem_vector_t *buf) heap_free(buf->buf); buf->buf = NULL; }else if(buf->size > buf->len) { - buf->buf = heap_realloc(buf->buf, buf->len*sizeof(HTMLElement**)); + buf->buf = heap_realloc(buf->buf, buf->len*sizeof(HTMLElement*)); } buf->size = buf->len; @@ -530,7 +530,7 @@ IHTMLElementCollection *create_all_collection(HTMLDOMNode *node, BOOL include_ro { elem_vector_t buf = {NULL, 0, 8}; - buf.buf = heap_alloc(buf.size*sizeof(HTMLElement**)); + buf.buf = heap_alloc(buf.size*sizeof(HTMLElement*)); if(include_root) elem_vector_add(&buf, elem_from_HTMLDOMNode(node));

1 0

Marcus Meissner : msvcrt: Use correct sizeof to realloc (Coverity).
by Alexandre Julliard 18 Oct '11

18 Oct '11

Module: wine Branch: master Commit: cd51c797f3cf2672423b426dd7297fff257dc503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd51c797f3cf2672423b426dd… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Oct 18 04:48:33 2011 +0200 msvcrt: Use correct sizeof to realloc (Coverity). --- dlls/msvcrt/exit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 19b9fb4..fd22e62 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -83,7 +83,7 @@ MSVCRT__onexit_t CDECL __dllonexit(MSVCRT__onexit_t func, MSVCRT__onexit_t **sta if (++len <= 0) return NULL; - tmp = MSVCRT_realloc(*start, len * sizeof(tmp)); + tmp = MSVCRT_realloc(*start, len * sizeof(*tmp)); if (!tmp) return NULL; *start = tmp;

1 0

Jacek Caban : vbscript: Added support for hex literals not ending with '&'.
by Alexandre Julliard 18 Oct '11

18 Oct '11

Module: wine Branch: master Commit: 76eeca22552aa35b3c09b0c3dafb5a6d01abed14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76eeca22552aa35b3c09b0c3d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 18 12:36:03 2011 +0200 vbscript: Added support for hex literals not ending with '&'. --- dlls/vbscript/lex.c | 6 ++++-- dlls/vbscript/tests/lang.vbs | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 08ab375..81d4517 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -294,12 +294,14 @@ static int parse_hex_literal(parser_ctx_t *ctx, LONG *ret) while((d = hex_to_int(*++ctx->ptr)) != -1) l = l*16 + d; - if(begin + 9 /* max digits+1 */ < ctx->ptr || *ctx->ptr != '&') { + if(begin + 9 /* max digits+1 */ < ctx->ptr || (*ctx->ptr != '&' && is_identifier_char(*ctx->ptr))) { FIXME("invalid literal\n"); return 0; } - ctx->ptr++; + if(*ctx->ptr == '&') + ctx->ptr++; + *ret = l; return (short)l == l ? tShort : tLong; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index de72338..ec552b1 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -43,6 +43,8 @@ Call ok(--1 = 1, "--1 = " & --1) Call ok(-empty = 0, "-empty = " & (-empty)) Call ok(true = -1, "! true = -1") Call ok(false = 0, "false <> 0") +Call ok(&hff = 255, "&hff <> 255") +Call ok(&Hff = 255, "&Hff <> 255") x = "xx" Call ok(x = "xx", "x = " & x & " expected ""xx""")

1 0

Jacek Caban : mshtml: Better error handling in NSContainer initialization.
by Alexandre Julliard 18 Oct '11

18 Oct '11

Module: wine Branch: master Commit: b5a031d8046ff23b049c664f2e51239a8235ef6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5a031d8046ff23b049c664f2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 18 12:27:37 2011 +0200 mshtml: Better error handling in NSContainer initialization. --- dlls/mshtml/htmldoc.c | 6 +- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/nsembed.c | 140 ++++++++++++++++++++++++++--------------- 3 files changed, 93 insertions(+), 55 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 0636a04..9af5c8f 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2377,11 +2377,11 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) doc->usermode = UNKNOWN_USERMODE; - doc->nscontainer = NSContainer_Create(doc, NULL); - if(!doc->nscontainer) { + hres = create_nscontainer(doc, NULL, &doc->nscontainer); + if(FAILED(hres)) { ERR("Failed to init Gecko, returning CLASS_E_CLASSNOTAVAILABLE\n"); htmldoc_release(&doc->basedoc); - return CLASS_E_CLASSNOTAVAILABLE; + return hres; } hres = htmldoc_query_interface(&doc->basedoc, riid, ppvObject); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 9123179..6ee082e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -641,7 +641,7 @@ void ConnectionPoint_Init(ConnectionPoint*,ConnectionPointContainer*,REFIID,cp_s void ConnectionPointContainer_Init(ConnectionPointContainer*,IUnknown*) DECLSPEC_HIDDEN; void ConnectionPointContainer_Destroy(ConnectionPointContainer*) DECLSPEC_HIDDEN; -NSContainer *NSContainer_Create(HTMLDocumentObj*,NSContainer*) DECLSPEC_HIDDEN; +HRESULT create_nscontainer(HTMLDocumentObj*,NSContainer*,NSContainer**) DECLSPEC_HIDDEN; void NSContainer_Release(NSContainer*) DECLSPEC_HIDDEN; nsresult create_chrome_window(nsIWebBrowserChrome*,nsIWebBrowserChrome**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index b6de72f..12c6c15 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1717,105 +1717,108 @@ static const nsISupportsWeakReferenceVtbl nsSupportsWeakReferenceVtbl = { nsresult create_chrome_window(nsIWebBrowserChrome *parent, nsIWebBrowserChrome **ret) { NSContainer *new_container; + HRESULT hres; if(parent->lpVtbl != &nsWebBrowserChromeVtbl) return NS_ERROR_UNEXPECTED; - new_container = NSContainer_Create(NULL, impl_from_nsIWebBrowserChrome(parent)); + hres = create_nscontainer(NULL, impl_from_nsIWebBrowserChrome(parent), &new_container); + if(FAILED(hres)) + return NS_ERROR_FAILURE; + *ret = &new_container->nsIWebBrowserChrome_iface; return NS_OK; } -NSContainer *NSContainer_Create(HTMLDocumentObj *doc, NSContainer *parent) +static HRESULT init_nscontainer(NSContainer *nscontainer) { nsIWebBrowserSetup *wbsetup; nsIScrollable *scrollable; - NSContainer *ret; nsresult nsres; - if(!load_gecko(TRUE)) - return NULL; - - ret = heap_alloc_zero(sizeof(NSContainer)); - - ret->nsIWebBrowserChrome_iface.lpVtbl = &nsWebBrowserChromeVtbl; - ret->nsIContextMenuListener_iface.lpVtbl = &nsContextMenuListenerVtbl; - ret->nsIURIContentListener_iface.lpVtbl = &nsURIContentListenerVtbl; - ret->nsIEmbeddingSiteWindow_iface.lpVtbl = &nsEmbeddingSiteWindowVtbl; - ret->nsITooltipListener_iface.lpVtbl = &nsTooltipListenerVtbl; - ret->nsIInterfaceRequestor_iface.lpVtbl = &nsInterfaceRequestorVtbl; - ret->nsISupportsWeakReference_iface.lpVtbl = &nsSupportsWeakReferenceVtbl; - - ret->doc = doc; - ret->ref = 1; - nsres = nsIComponentManager_CreateInstanceByContractID(pCompMgr, NS_WEBBROWSER_CONTRACTID, - NULL, &IID_nsIWebBrowser, (void**)&ret->webbrowser); + NULL, &IID_nsIWebBrowser, (void**)&nscontainer->webbrowser); if(NS_FAILED(nsres)) { ERR("Creating WebBrowser failed: %08x\n", nsres); - heap_free(ret); - return NULL; + return E_FAIL; } - if(parent) - nsIWebBrowserChrome_AddRef(&parent->nsIWebBrowserChrome_iface); - ret->parent = parent; - - nsres = nsIWebBrowser_SetContainerWindow(ret->webbrowser, &ret->nsIWebBrowserChrome_iface); - if(NS_FAILED(nsres)) + nsres = nsIWebBrowser_SetContainerWindow(nscontainer->webbrowser, &nscontainer->nsIWebBrowserChrome_iface); + if(NS_FAILED(nsres)) { ERR("SetContainerWindow failed: %08x\n", nsres); + return E_FAIL; + } - nsres = nsIWebBrowser_QueryInterface(ret->webbrowser, &IID_nsIBaseWindow, - (void**)&ret->window); - if(NS_FAILED(nsres)) + nsres = nsIWebBrowser_QueryInterface(nscontainer->webbrowser, &IID_nsIBaseWindow, + (void**)&nscontainer->window); + if(NS_FAILED(nsres)) { ERR("Could not get nsIBaseWindow interface: %08x\n", nsres); + return E_FAIL; + } - nsres = nsIWebBrowser_QueryInterface(ret->webbrowser, &IID_nsIWebBrowserSetup, + nsres = nsIWebBrowser_QueryInterface(nscontainer->webbrowser, &IID_nsIWebBrowserSetup, (void**)&wbsetup); if(NS_SUCCEEDED(nsres)) { nsres = nsIWebBrowserSetup_SetProperty(wbsetup, SETUP_IS_CHROME_WRAPPER, FALSE); nsIWebBrowserSetup_Release(wbsetup); - if(NS_FAILED(nsres)) + if(NS_FAILED(nsres)) { ERR("SetProperty(SETUP_IS_CHROME_WRAPPER) failed: %08x\n", nsres); + return E_FAIL; + } }else { ERR("Could not get nsIWebBrowserSetup interface\n"); + return E_FAIL; } - nsres = nsIWebBrowser_QueryInterface(ret->webbrowser, &IID_nsIWebNavigation, - (void**)&ret->navigation); - if(NS_FAILED(nsres)) + nsres = nsIWebBrowser_QueryInterface(nscontainer->webbrowser, &IID_nsIWebNavigation, + (void**)&nscontainer->navigation); + if(NS_FAILED(nsres)) { ERR("Could not get nsIWebNavigation interface: %08x\n", nsres); + return E_FAIL; + } - nsres = nsIWebBrowserFocus_QueryInterface(ret->webbrowser, &IID_nsIWebBrowserFocus, - (void**)&ret->focus); - if(NS_FAILED(nsres)) + nsres = nsIWebBrowserFocus_QueryInterface(nscontainer->webbrowser, &IID_nsIWebBrowserFocus, + (void**)&nscontainer->focus); + if(NS_FAILED(nsres)) { ERR("Could not get nsIWebBrowserFocus interface: %08x\n", nsres); + return E_FAIL; + } - if(!nscontainer_class) + if(!nscontainer_class) { register_nscontainer_class(); + if(!nscontainer_class) + return E_FAIL; + } - ret->hwnd = CreateWindowExW(0, wszNsContainer, NULL, + nscontainer->hwnd = CreateWindowExW(0, wszNsContainer, NULL, WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 100, 100, - GetDesktopWindow(), NULL, hInst, ret); + GetDesktopWindow(), NULL, hInst, nscontainer); + if(!nscontainer->hwnd) { + WARN("Could not create window\n"); + return E_FAIL; + } - nsres = nsIBaseWindow_InitWindow(ret->window, ret->hwnd, NULL, 0, 0, 100, 100); + nsres = nsIBaseWindow_InitWindow(nscontainer->window, nscontainer->hwnd, NULL, 0, 0, 100, 100); if(NS_SUCCEEDED(nsres)) { - nsres = nsIBaseWindow_Create(ret->window); - if(NS_FAILED(nsres)) + nsres = nsIBaseWindow_Create(nscontainer->window); + if(NS_FAILED(nsres)) { WARN("Creating window failed: %08x\n", nsres); + return E_FAIL; + } - nsIBaseWindow_SetVisibility(ret->window, FALSE); - nsIBaseWindow_SetEnabled(ret->window, FALSE); + nsIBaseWindow_SetVisibility(nscontainer->window, FALSE); + nsIBaseWindow_SetEnabled(nscontainer->window, FALSE); }else { ERR("InitWindow failed: %08x\n", nsres); + return E_FAIL; } - nsres = nsIWebBrowser_SetParentURIContentListener(ret->webbrowser, - &ret->nsIURIContentListener_iface); + nsres = nsIWebBrowser_SetParentURIContentListener(nscontainer->webbrowser, + &nscontainer->nsIURIContentListener_iface); if(NS_FAILED(nsres)) ERR("SetParentURIContentListener failed: %08x\n", nsres); - nsres = nsIWebBrowser_QueryInterface(ret->webbrowser, &IID_nsIScrollable, (void**)&scrollable); + nsres = nsIWebBrowser_QueryInterface(nscontainer->webbrowser, &IID_nsIScrollable, (void**)&scrollable); if(NS_SUCCEEDED(nsres)) { nsres = nsIScrollable_SetDefaultScrollbarPreferences(scrollable, ScrollOrientation_Y, Scrollbar_Always); @@ -1832,7 +1835,42 @@ NSContainer *NSContainer_Create(HTMLDocumentObj *doc, NSContainer *parent) ERR("Could not get nsIScrollable: %08x\n", nsres); } - return ret; + return S_OK; +} + +HRESULT create_nscontainer(HTMLDocumentObj *doc, NSContainer *parent, NSContainer **_ret) +{ + NSContainer *ret; + HRESULT hres; + + if(!load_gecko(TRUE)) + return CLASS_E_CLASSNOTAVAILABLE; + + ret = heap_alloc_zero(sizeof(NSContainer)); + if(!ret) + return E_OUTOFMEMORY; + + ret->nsIWebBrowserChrome_iface.lpVtbl = &nsWebBrowserChromeVtbl; + ret->nsIContextMenuListener_iface.lpVtbl = &nsContextMenuListenerVtbl; + ret->nsIURIContentListener_iface.lpVtbl = &nsURIContentListenerVtbl; + ret->nsIEmbeddingSiteWindow_iface.lpVtbl = &nsEmbeddingSiteWindowVtbl; + ret->nsITooltipListener_iface.lpVtbl = &nsTooltipListenerVtbl; + ret->nsIInterfaceRequestor_iface.lpVtbl = &nsInterfaceRequestorVtbl; + ret->nsISupportsWeakReference_iface.lpVtbl = &nsSupportsWeakReferenceVtbl; + + ret->doc = doc; + ret->ref = 1; + + if(parent) + nsIWebBrowserChrome_AddRef(&parent->nsIWebBrowserChrome_iface); + ret->parent = parent; + + hres = init_nscontainer(ret); + if(SUCCEEDED(hres)) + *_ret = ret; + else + nsIWebBrowserChrome_Release(&ret->nsIWebBrowserChrome_iface); + return hres; } void NSContainer_Release(NSContainer *This)

1 0

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard 18 Oct '11

18 Oct '11

Module: wine Branch: master Commit: 32b24db04116335bc7ff858a34f1070454eea386 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32b24db04116335bc7ff858a3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 18 11:14:21 2011 +0200 msvcp: Sync spec files. --- dlls/msvcp60/msvcp60.spec | 36 +++++++++++----------- dlls/msvcp70/msvcp70.spec | 72 ++++++++++++++++++++++---------------------- dlls/msvcp71/msvcp71.spec | 72 ++++++++++++++++++++++---------------------- dlls/msvcp80/msvcp80.spec | 72 ++++++++++++++++++++++---------------------- 4 files changed, 126 insertions(+), 126 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=32b24db04116335bc7ff8…

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
79
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 October 2011