January 2010 - Wine-Commits

Michael Stefaniuc : msi: Avoid using HIWORD() on string pointers.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: a0774cababdfd3eb2543160f4f6b360cd13c7273 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0774cababdfd3eb2543160f4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 29 15:01:17 2010 +0100 msi: Avoid using HIWORD() on string pointers. --- dlls/msi/database.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index b0966a2..7855fea 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -51,6 +51,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); * Any binary data in a table is a reference to a stream. */ +#define IS_INTMSIDBOPEN(x) (((ULONG_PTR)(x) >> 16) == 0) + typedef struct tagMSITRANSFORM { struct list entry; IStorage *stg; @@ -306,7 +308,7 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) save_path = szDBPath; szMode = szPersist; - if( HIWORD( szPersist ) ) + if( !IS_INTMSIDBOPEN(szPersist) ) { if (!CopyFileW( szDBPath, szPersist, FALSE )) return ERROR_OPEN_FAILED; @@ -459,7 +461,7 @@ UINT WINAPI MsiOpenDatabaseA(LPCSTR szDBPath, LPCSTR szPersist, MSIHANDLE *phDB) goto end; } - if( HIWORD(szPersist) ) + if( !IS_INTMSIDBOPEN(szPersist) ) { szwPersist = strdupAtoW( szPersist ); if( !szwPersist ) @@ -471,7 +473,7 @@ UINT WINAPI MsiOpenDatabaseA(LPCSTR szDBPath, LPCSTR szPersist, MSIHANDLE *phDB) r = MsiOpenDatabaseW( szwDBPath, szwPersist, phDB ); end: - if( HIWORD(szPersist) ) + if( !IS_INTMSIDBOPEN(szPersist) ) msi_free( szwPersist ); msi_free( szwDBPath );

1 0

Christian Costa : d3drm: Add stubbed implementation of IDirect3DRMMeshBuilder.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: 5b6eada53f08e483c0f73eddfa6985fff3c12f4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b6eada53f08e483c0f73eddf… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Jan 29 12:16:25 2010 +0100 d3drm: Add stubbed implementation of IDirect3DRMMeshBuilder. --- dlls/d3drm/Makefile.in | 3 +- dlls/d3drm/d3drm.c | 4 +- dlls/d3drm/d3drm_private.h | 1 + dlls/d3drm/meshbuilder.c | 575 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 580 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b6eada53f08e483c0f73…

1 0

Maarten Lankhorst : kernel32: Work around safety check on siglongjmp.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: 3d7aabd887ddf1190798e4f7dea31040a16a16d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d7aabd887ddf1190798e4f7d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Jan 26 13:05:28 2010 +0100 kernel32: Work around safety check on siglongjmp. --- dlls/kernel32/fiber.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/fiber.c b/dlls/kernel32/fiber.c index c866661..f6bebf8 100644 --- a/dlls/kernel32/fiber.c +++ b/dlls/kernel32/fiber.c @@ -21,6 +21,10 @@ * - proper handling of 16-bit stack and signal stack */ +/* Fortify source chokes on siglongjmp stack switching, so disable it */ +#undef _FORTIFY_SOURCE +#define _FORTIFY_SOURCE 0 + #include "config.h" #include "wine/port.h"

1 0

Stefan Dösinger : ddraw: Convert VB lock flags to wined3d flags.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: a9f969094c4e3c03d0d31704aa8ab7097a3786ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9f969094c4e3c03d0d31704a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 27 23:29:34 2010 +0100 ddraw: Convert VB lock flags to wined3d flags. --- dlls/ddraw/vertexbuffer.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index df7528b..f16cf12 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -236,8 +236,17 @@ IDirect3DVertexBufferImpl_Lock(IDirect3DVertexBuffer7 *iface, IDirect3DVertexBufferImpl *This = (IDirect3DVertexBufferImpl *)iface; WINED3DBUFFER_DESC Desc; HRESULT hr; + DWORD wined3d_flags = 0; TRACE("(%p)->(%08x,%p,%p)\n", This, Flags, Data, Size); + /* Writeonly: Pointless. Event: Unsupported by native according to the sdk + * nosyslock: Not applicable + */ + if(!(Flags & DDLOCK_WAIT)) wined3d_flags |= WINED3DLOCK_DONOTWAIT; + if(Flags & DDLOCK_READONLY) wined3d_flags |= WINED3DLOCK_READONLY; + if(Flags & DDLOCK_NOOVERWRITE) wined3d_flags |= WINED3DLOCK_NOOVERWRITE; + if(Flags & DDLOCK_DISCARDCONTENTS) wined3d_flags |= WINED3DLOCK_DISCARD; + EnterCriticalSection(&ddraw_cs); if(Size) { @@ -253,7 +262,7 @@ IDirect3DVertexBufferImpl_Lock(IDirect3DVertexBuffer7 *iface, } hr = IWineD3DBuffer_Map(This->wineD3DVertexBuffer, 0 /* OffsetToLock */, - 0 /* SizeToLock, 0 == Full lock */, (BYTE **)Data, Flags); + 0 /* SizeToLock, 0 == Full lock */, (BYTE **)Data, wined3d_flags); LeaveCriticalSection(&ddraw_cs); return hr; }

1 0

Stefan Dösinger : wined3d: Catch invalid buffer map parameters.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: d499073c10da4a91053508205a73eaebc968a776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d499073c10da4a91053508205… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 27 23:04:01 2010 +0100 wined3d: Catch invalid buffer map parameters. --- dlls/wined3d/buffer.c | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index e38a861..e0cefc9 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -56,7 +56,13 @@ static inline BOOL buffer_add_dirty_area(struct wined3d_buffer *This, UINT offse } } - if(!offset && !size) + if(offset > This->resource.size || offset + size > This->resource.size) + { + WARN("Invalid range dirtified, marking entire buffer dirty\n"); + offset = 0; + size = This->resource.size; + } + else if(!offset && !size) { size = This->resource.size; } @@ -1026,6 +1032,32 @@ static WINED3DRESOURCETYPE STDMETHODCALLTYPE buffer_GetType(IWineD3DBuffer *ifac /* IWineD3DBuffer methods */ +static DWORD buffer_sanitize_flags(DWORD flags) +{ + /* Not all flags make sense together, but Windows never returns an error. Catch the + * cases that could cause issues */ + if(flags & WINED3DLOCK_READONLY) + { + if(flags & WINED3DLOCK_DISCARD) + { + WARN("WINED3DLOCK_READONLY combined with WINED3DLOCK_DISCARD, ignoring flags\n"); + return 0; + } + if(flags & WINED3DLOCK_NOOVERWRITE) + { + WARN("WINED3DLOCK_READONLY combined with WINED3DLOCK_NOOVERWRITE, ignoring flags\n"); + return 0; + } + } + else if((flags & (WINED3DLOCK_DISCARD | WINED3DLOCK_NOOVERWRITE)) == (WINED3DLOCK_DISCARD | WINED3DLOCK_NOOVERWRITE)) + { + WARN("WINED3DLOCK_DISCARD and WINED3DLOCK_NOOVERWRITE used together, ignoring\n"); + return 0; + } + + return flags; +} + static HRESULT STDMETHODCALLTYPE buffer_Map(IWineD3DBuffer *iface, UINT offset, UINT size, BYTE **data, DWORD flags) { struct wined3d_buffer *This = (struct wined3d_buffer *)iface; @@ -1033,6 +1065,7 @@ static HRESULT STDMETHODCALLTYPE buffer_Map(IWineD3DBuffer *iface, UINT offset, TRACE("iface %p, offset %u, size %u, data %p, flags %#x\n", iface, offset, size, data, flags); + flags = buffer_sanitize_flags(flags); if (!buffer_add_dirty_area(This, offset, size)) return E_OUTOFMEMORY; count = InterlockedIncrement(&This->lock_count);

1 0

Dylan Smith : wordpad: Fixed spacing calculations for print preview.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: aaabd9f2f3994b052ca9ece4cec08d715f7e38c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaabd9f2f3994b052ca9ece4c… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Jan 29 03:02:37 2010 -0500 wordpad: Fixed spacing calculations for print preview. --- programs/wordpad/print.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index a6bdf40..18a6de1 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -690,7 +690,7 @@ LRESULT print_preview(HWND hMainWnd) float ratioWidth, ratioHeight, ratio; int xOffset, yOffset; int barheight; - float spacing = 20.0; + float spacing = 10.0; HWND hReBar = GetDlgItem(hMainWnd, IDC_REBAR); PAINTSTRUCT ps; @@ -752,12 +752,12 @@ LRESULT print_preview(HWND hMainWnd) } barheight = SendMessageW(hReBar, RB_GETBARHEIGHT, 0, 0); - ratioHeight = ((float)window.bottom - spacing - (float)barheight) / (float)bmHeight; + ratioHeight = (window.bottom - spacing * 2 - barheight) / (float)bmHeight; if(preview.hdc2) - ratioWidth = ((float)window.right / 2.0 - spacing * 2.0) / (float)bmWidth; + ratioWidth = ((window.right - spacing * 3) / 2.0) / (float)bmWidth; else - ratioWidth = ((float)window.right - spacing * 3.0) / (float)bmWidth; + ratioWidth = (window.right - spacing * 2) / (float)bmWidth; if(ratioWidth > ratioHeight) ratio = ratioHeight; @@ -772,7 +772,7 @@ LRESULT print_preview(HWND hMainWnd) if(!preview.hdc2) xOffset = (window.right - bmNewWidth) / 2; else - xOffset = (window.right - bmNewWidth * 2) / 2; + xOffset = (window.right - bmNewWidth * 2) / 3; window.top = barheight; FillRect(hdc, &window, GetStockObject(GRAY_BRUSH)); @@ -790,8 +790,8 @@ LRESULT print_preview(HWND hMainWnd) if(preview.hdc2) { - background.left += bmNewWidth + spacing; - background.right += bmNewWidth + spacing; + background.left += bmNewWidth + xOffset; + background.right += bmNewWidth + xOffset; FillRect(hdc, &background, GetStockObject(BLACK_BRUSH)); @@ -803,7 +803,7 @@ LRESULT print_preview(HWND hMainWnd) if(preview.hdc2) { - BitBlt(hdc, xOffset + bmNewWidth + spacing, yOffset, bmNewWidth, bmNewHeight, preview.hdcSized2, 0, 0, SRCCOPY); + BitBlt(hdc, xOffset * 2 + bmNewWidth, yOffset, bmNewWidth, bmNewHeight, preview.hdcSized2, 0, 0, SRCCOPY); } DeleteDC(fr.hdcTarget);

1 0

Stefan Dösinger : ddraw: Test invalid buffer lock parameters.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: f0266ee51980ffa64ed4a431b91e0eb25308949c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0266ee51980ffa64ed4a431b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 27 23:15:23 2010 +0100 ddraw: Test invalid buffer lock parameters. --- dlls/ddraw/tests/d3d.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 5f08929..2d17487 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3172,6 +3172,58 @@ done: UnregisterClassA("d3d7_test_wndproc_wc", GetModuleHandleA(NULL)); } +static void VertexBufferLockRest(void) +{ + D3DVERTEXBUFFERDESC desc; + IDirect3DVertexBuffer7 *buffer; + HRESULT hr; + unsigned int i; + void *data; + const struct + { + DWORD flags; + const char *debug_string; + HRESULT result; + } + test_data[] = + { + {0, "(none)", D3D_OK }, + {DDLOCK_WAIT, "DDLOCK_WAIT", D3D_OK }, + {DDLOCK_EVENT, "DDLOCK_EVENT", D3D_OK }, + {DDLOCK_READONLY, "DDLOCK_READONLY", D3D_OK }, + {DDLOCK_WRITEONLY, "DDLOCK_WRITEONLY", D3D_OK }, + {DDLOCK_NOSYSLOCK, "DDLOCK_NOSYSLOCK", D3D_OK }, + {DDLOCK_NOOVERWRITE, "DDLOCK_NOOVERWRITE", D3D_OK }, + {DDLOCK_DISCARDCONTENTS, "DDLOCK_DISCARDCONTENTS", D3D_OK }, + + {DDLOCK_READONLY | DDLOCK_WRITEONLY, "DDLOCK_READONLY | DDLOCK_WRITEONLY", D3D_OK }, + {DDLOCK_READONLY | DDLOCK_DISCARDCONTENTS, "DDLOCK_READONLY | DDLOCK_DISCARDCONTENTS", D3D_OK }, + {0xdeadbeef, "0xdeadbeef", D3D_OK }, + }; + + memset(&desc, 0 , sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwCaps = 0; + desc.dwFVF = D3DFVF_XYZ; + desc.dwNumVertices = 64; + hr = IDirect3D7_CreateVertexBuffer(lpD3D, &desc, &buffer, 0); + ok(hr == D3D_OK, "IDirect3D7_CreateVertexBuffer failed, 0x%08x\n", hr); + + for(i = 0; i < (sizeof(test_data) / sizeof(*test_data)); i++) + { + hr = IDirect3DVertexBuffer7_Lock(buffer, test_data[i].flags, &data, NULL); + ok(hr == test_data[i].result, "Lock flags %s returned 0x%08x, expected 0x%08x\n", + test_data[i].debug_string, hr, test_data[i].result); + if(SUCCEEDED(hr)) + { + hr = IDirect3DVertexBuffer7_Unlock(buffer); + ok(hr == D3D_OK, "IDirect3DVertexBuffer7_Unlock failed, 0x%08x\n", hr); + } + } + + IDirect3DVertexBuffer7_Release(buffer); +} + START_TEST(d3d) { init_function_pointers(); @@ -3196,6 +3248,7 @@ START_TEST(d3d) D3D7_OldRenderStateTest(); DeviceLoadTest(); SetRenderTargetTest(); + VertexBufferLockRest(); ReleaseDirect3D(); }

1 0

Dylan Smith : wordpad: Implement zooming in for print preview.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: 0c46da86bf5f5bb44ca7e1e4a8e21c38579a7f25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c46da86bf5f5bb44ca7e1e4a… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Jan 29 03:02:41 2010 -0500 wordpad: Implement zooming in for print preview. The preview is now drawn onto it's own window rather directly onto the client area of the top level window. This is done to allow for scrollbars, since the page won't usually fit in the window when zoomed in. Refactoring was needed as a result of this, and in order to provide more granularity for updates to avoid EM_FORMATRANGE messages being sent when the page the same page is being displayed. --- programs/wordpad/Da.rc | 2 + programs/wordpad/De.rc | 2 + programs/wordpad/En.rc | 2 + programs/wordpad/Fr.rc | 2 + programs/wordpad/Hu.rc | 2 + programs/wordpad/Ja.rc | 2 + programs/wordpad/Ko.rc | 2 + programs/wordpad/Lt.rc | 2 + programs/wordpad/Nl.rc | 2 + programs/wordpad/No.rc | 2 + programs/wordpad/Pl.rc | 2 + programs/wordpad/Pt.rc | 2 + programs/wordpad/Ru.rc | 2 + programs/wordpad/Si.rc | 2 + programs/wordpad/Sv.rc | 2 + programs/wordpad/Tr.rc | 2 + programs/wordpad/Zh.rc | 2 + programs/wordpad/print.c | 421 +++++++++++++++++++++++++++++++++---------- programs/wordpad/wordpad.c | 21 ++- programs/wordpad/wordpad.h | 15 ++- 20 files changed, 385 insertions(+), 106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0c46da86bf5f5bb44ca7e…

1 0

Jacek Caban : mshtml: Optimize more nsAString handling.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: 456e53bcf9122a2ea7a791831af492de642a803a URL: http://source.winehq.org/git/wine.git/?a=commit;h=456e53bcf9122a2ea7a791831… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 28 23:55:51 2010 +0100 mshtml: Optimize more nsAString handling. --- dlls/mshtml/editor.c | 12 ++++++------ dlls/mshtml/htmlbody.c | 13 ++++--------- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmldoc3.c | 11 +++++------ dlls/mshtml/htmldoc5.c | 2 +- dlls/mshtml/htmlelemcol.c | 2 +- dlls/mshtml/htmlevent.c | 2 +- 7 files changed, 19 insertions(+), 25 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 568e127..961bb91 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -298,7 +298,7 @@ static void get_font_size(HTMLDocument *This, WCHAR *ret) TRACE("found font tag %p\n", elem); - nsAString_Init(&size_str, sizeW); + nsAString_InitDepend(&size_str, sizeW); nsAString_Init(&val_str, NULL); nsIDOMElement_GetAttribute(elem, &size_str, &val_str); @@ -360,10 +360,11 @@ static void set_font_size(HTMLDocument *This, LPCWSTR size) create_nselem(This->doc_node, fontW, &elem); - nsAString_Init(&size_str, sizeW); - nsAString_Init(&val_str, size); + nsAString_InitDepend(&size_str, sizeW); + nsAString_InitDepend(&val_str, size); nsIDOMElement_SetAttribute(elem, &size_str, &val_str); + nsAString_Finish(&val_str); nsISelection_GetRangeAt(nsselection, 0, &range); nsISelection_GetIsCollapsed(nsselection, &collapsed); @@ -384,7 +385,6 @@ static void set_font_size(HTMLDocument *This, LPCWSTR size) nsIDOMElement_Release(elem); nsAString_Finish(&size_str); - nsAString_Finish(&val_str); set_dirty(This, VARIANT_TRUE); } @@ -1167,8 +1167,8 @@ static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, /* create an element for the link */ create_nselem(This->doc_node, aW, &anchor_elem); - nsAString_Init(&href_str, hrefW); - nsAString_Init(&ns_url, url); + nsAString_InitDepend(&href_str, hrefW); + nsAString_InitDepend(&ns_url, url); nsIDOMElement_SetAttribute(anchor_elem, &href_str, &ns_url); nsAString_Finish(&href_str); diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 5c0f7ca..5c66e65 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -252,23 +252,18 @@ static HRESULT WINAPI HTMLBodyElement_Invoke(IHTMLBodyElement *iface, DISPID dis static HRESULT WINAPI HTMLBodyElement_put_background(IHTMLBodyElement *iface, BSTR v) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - HRESULT hr = S_OK; nsAString nsstr; nsresult nsres; TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - nsAString_Init(&nsstr, v); - + nsAString_InitDepend(&nsstr, v); nsres = nsIDOMHTMLBodyElement_SetBackground(This->nsbody, &nsstr); - if(!NS_SUCCEEDED(nsres)) - { - hr = E_FAIL; - } - nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) + return E_FAIL; - return hr; + return S_OK; } static HRESULT WINAPI HTMLBodyElement_get_background(IHTMLBodyElement *iface, BSTR *p) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index ac67a84..538a02f 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -348,7 +348,7 @@ static HRESULT WINAPI HTMLDocument_put_title(IHTMLDocument2 *iface, BSTR v) return E_UNEXPECTED; } - nsAString_Init(&nsstr, v); + nsAString_InitDepend(&nsstr, v); nsres = nsIDOMHTMLDocument_SetTitle(This->doc_node->nsdoc, &nsstr); nsAString_Finish(&nsstr); if(NS_FAILED(nsres)) diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index de32302..9079bbc 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -116,7 +116,7 @@ static HRESULT WINAPI HTMLDocument3_createTextNode(IHTMLDocument3 *iface, BSTR t return E_UNEXPECTED; } - nsAString_Init(&text_str, text); + nsAString_InitDepend(&text_str, text); nsres = nsIDOMHTMLDocument_CreateTextNode(This->doc_node->nsdoc, &text_str, &nstext); nsAString_Finish(&text_str); if(NS_FAILED(nsres)) { @@ -443,7 +443,7 @@ static HRESULT WINAPI HTMLDocument3_getElementById(IHTMLDocument3 *iface, BSTR v return E_UNEXPECTED; } - nsAString_Init(&id_str, v); + nsAString_InitDepend(&id_str, v); /* get element by id attribute */ nsres = nsIDOMHTMLDocument_GetElementById(This->doc_node->nsdoc, &id_str, &nselem); if(FAILED(nsres)) { @@ -455,9 +455,9 @@ static HRESULT WINAPI HTMLDocument3_getElementById(IHTMLDocument3 *iface, BSTR v /* get first element by name attribute */ nsres = nsIDOMHTMLDocument_GetElementsByName(This->doc_node->nsdoc, &id_str, &nsnode_list); + nsAString_Finish(&id_str); if(FAILED(nsres)) { ERR("getElementsByName failed: %08x\n", nsres); - nsAString_Finish(&id_str); if(nsnode_by_id) nsIDOMNode_Release(nsnode_by_id); return E_FAIL; @@ -465,7 +465,6 @@ static HRESULT WINAPI HTMLDocument3_getElementById(IHTMLDocument3 *iface, BSTR v nsIDOMNodeList_Item(nsnode_list, 0, &nsnode_by_name); nsIDOMNodeList_Release(nsnode_list); - nsAString_Finish(&id_str); if(nsnode_by_name && nsnode_by_id) { nsIDOM3Node *node3; @@ -528,8 +527,8 @@ static HRESULT WINAPI HTMLDocument3_getElementsByTagName(IHTMLDocument3 *iface, return E_UNEXPECTED; } - nsAString_Init(&id_str, v); - nsAString_Init(&ns_str, str); + nsAString_InitDepend(&id_str, v); + nsAString_InitDepend(&ns_str, str); nsres = nsIDOMHTMLDocument_GetElementsByTagNameNS(This->doc_node->nsdoc, &ns_str, &id_str, &nslist); nsAString_Finish(&id_str); nsAString_Finish(&ns_str); diff --git a/dlls/mshtml/htmldoc5.c b/dlls/mshtml/htmldoc5.c index e3b1423..12742f6 100644 --- a/dlls/mshtml/htmldoc5.c +++ b/dlls/mshtml/htmldoc5.c @@ -136,7 +136,7 @@ static HRESULT WINAPI HTMLDocument5_createComment(IHTMLDocument5 *iface, BSTR bs return E_UNEXPECTED; } - nsAString_Init(&str, bstrdata); + nsAString_InitDepend(&str, bstrdata); nsres = nsIDOMHTMLDocument_CreateComment(This->doc_node->nsdoc, &str, &nscomment); nsAString_Finish(&str); if(NS_FAILED(nsres)) { diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index c973707..9c0fedd 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -245,7 +245,7 @@ static BOOL is_elem_name(HTMLElement *elem, LPCWSTR name) return TRUE; } - nsAString_Init(&nsname, nameW); + nsAString_InitDepend(&nsname, nameW); nsres = nsIDOMHTMLElement_GetAttribute(elem->nselem, &nsname, &nsstr); nsAString_Finish(&nsname); if(NS_SUCCEEDED(nsres)) { diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 5184391..3ff41a6 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -743,7 +743,7 @@ static IHTMLEventObj *create_event(HTMLDOMNode *target, eventid_t eid, nsIDOMEve if(NS_SUCCEEDED(nsres)) { nsAString type_str; - nsAString_Init(&type_str, event_types[event_info[eid].type]); + nsAString_InitDepend(&type_str, event_types[event_info[eid].type]); nsres = nsIDOMDocumentEvent_CreateEvent(doc_event, &type_str, &ret->nsevent); nsAString_Finish(&type_str); nsIDOMDocumentEvent_Release(doc_event);

1 0

Jacek Caban : mshtml: Optimize and clean up HTMLFormElement_get_dispid implementation.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: 248db8d8068cef1fa4a2ef0529f3151dca51af1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=248db8d8068cef1fa4a2ef052… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 29 14:56:19 2010 +0100 mshtml: Optimize and clean up HTMLFormElement_get_dispid implementation. --- dlls/mshtml/htmlform.c | 47 ++++++++++++++++++++--------------------------- 1 files changed, 20 insertions(+), 27 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 75dcf90..05486f4 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -343,10 +343,12 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, { HTMLFormElement *This = HTMLFORM_NODE_THIS(iface); nsIDOMHTMLCollection *elements; + nsAString nsname, nsstr; PRUint32 len, i; - static const PRUnichar nameW[] = {'n','a','m','e',0}; - nsAString nsname; nsresult nsres; + HRESULT hres = DISP_E_UNKNOWNNAME; + + static const PRUnichar nameW[] = {'n','a','m','e',0}; TRACE("(%p)->(%s %x %p)\n", This, wine_dbgstr_w(name), grfdex, pid); @@ -363,72 +365,63 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, return E_FAIL; } - nsAString_Init(&nsname, nameW); + nsAString_InitDepend(&nsname, nameW); + nsAString_Init(&nsstr, NULL); for(i = 0; i < len; ++i) { nsIDOMNode *nsitem; nsIDOMHTMLElement *nshtml_elem; - nsAString nsstr; const PRUnichar *str; nsres = nsIDOMHTMLCollection_Item(elements, i, &nsitem); if(NS_FAILED(nsres)) { FIXME("Item failed: 0x%08x\n", nsres); - nsAString_Finish(&nsname); - nsIDOMHTMLCollection_Release(elements); - return E_FAIL; + hres = E_FAIL; + break; } nsres = nsIDOMNode_QueryInterface(nsitem, &IID_nsIDOMHTMLElement, (void**)&nshtml_elem); nsIDOMNode_Release(nsitem); if(NS_FAILED(nsres)) { FIXME("Failed to get nsIDOMHTMLNode interface: 0x%08x\n", nsres); - nsAString_Finish(&nsname); - nsIDOMHTMLCollection_Release(elements); - return E_FAIL; + hres = E_FAIL; + break; } /* compare by id attr */ - nsAString_Init(&nsstr, NULL); nsres = nsIDOMHTMLElement_GetId(nshtml_elem, &nsstr); if(NS_FAILED(nsres)) { FIXME("GetId failed: 0x%08x\n", nsres); - nsAString_Finish(&nsname); nsIDOMHTMLElement_Release(nshtml_elem); - nsIDOMHTMLCollection_Release(elements); - return E_FAIL; + hres = E_FAIL; + break; } nsAString_GetData(&nsstr, &str); if(!strcmpiW(str, name)) { + nsIDOMHTMLElement_Release(nshtml_elem); /* FIXME: using index for dispid */ *pid = MSHTML_DISPID_CUSTOM_MIN + i; - nsAString_Finish(&nsname); - nsAString_Finish(&nsstr); - nsIDOMHTMLElement_Release(nshtml_elem); - nsIDOMHTMLCollection_Release(elements); - return S_OK; + hres = S_OK; + break; } /* compare by name attr */ nsres = nsIDOMHTMLElement_GetAttribute(nshtml_elem, &nsname, &nsstr); + nsIDOMHTMLElement_Release(nshtml_elem); nsAString_GetData(&nsstr, &str); if(!strcmpiW(str, name)) { /* FIXME: using index for dispid */ *pid = MSHTML_DISPID_CUSTOM_MIN + i; - nsAString_Finish(&nsname); - nsAString_Finish(&nsstr); - nsIDOMHTMLElement_Release(nshtml_elem); - nsIDOMHTMLCollection_Release(elements); - return S_OK; + hres = S_OK; + break; } nsAString_Finish(&nsstr); - - nsIDOMHTMLElement_Release(nshtml_elem); } nsAString_Finish(&nsname); + nsAString_Finish(&nsstr); nsIDOMHTMLCollection_Release(elements); - return DISP_E_UNKNOWNNAME; + return hres; } static HRESULT HTMLFormElement_invoke(HTMLDOMNode *iface,

1 0