November 2012 - Wine-Commits

Hans Leidekker : msi: Fix use of uninitialized variables.
by Alexandre Julliard Nov. 9, 2012

Nov. 9, 2012

Module: wine Branch: master Commit: e15121771cd667083e4325a560440e407851e6cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e15121771cd667083e4325a56… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 9 16:46:52 2012 +0100 msi: Fix use of uninitialized variables. --- dlls/msi/action.c | 2 +- dlls/msi/automation.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index f9ab550..833bc67 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2884,7 +2884,7 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) if (type == REG_MULTI_SZ) { BYTE *new; - if (old_type != REG_MULTI_SZ) + if (old_value && old_type != REG_MULTI_SZ) { msi_free( old_value ); old_value = NULL; diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index e55717a..5df6b95 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -846,7 +846,7 @@ static HRESULT RecordImpl_Invoke( UINT* puArgErr) { WCHAR *szString; - DWORD dwLen; + DWORD dwLen = 0; UINT ret; VARIANTARG varg0, varg1; HRESULT hr;

1 0

Matteo Bruni : wined3d: Pop control frames in disabled if branches ( ARB shader backend).
by Alexandre Julliard Nov. 9, 2012

Nov. 9, 2012

Module: wine Branch: master Commit: a7956c4c4f8f2abd673f9e5cbb159419e1d003be URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7956c4c4f8f2abd673f9e5cb… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 9 15:20:35 2012 +0100 wined3d: Pop control frames in disabled if branches (ARB shader backend). --- dlls/wined3d/arb_program_shader.c | 52 ++++++++++++++++++++++++------------- 1 files changed, 34 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6328fdf..6ea73c0 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5395,6 +5395,29 @@ static void free_recorded_instruction(struct list *list) } } +static void pop_control_frame(const struct wined3d_shader_instruction *ins) +{ + struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; + struct control_frame *control_frame; + + if (ins->handler_idx == WINED3DSIH_ENDLOOP || ins->handler_idx == WINED3DSIH_ENDREP) + { + struct list *e = list_head(&priv->control_frames); + control_frame = LIST_ENTRY(e, struct control_frame, entry); + list_remove(&control_frame->entry); + HeapFree(GetProcessHeap(), 0, control_frame); + priv->loop_depth--; + } + else if (ins->handler_idx == WINED3DSIH_ENDIF) + { + /* Non-ifc ENDIFs were already handled previously. */ + struct list *e = list_head(&priv->control_frames); + control_frame = LIST_ENTRY(e, struct control_frame, entry); + list_remove(&control_frame->entry); + HeapFree(GetProcessHeap(), 0, control_frame); + } +} + static void shader_arb_handle_instruction(const struct wined3d_shader_instruction *ins) { SHADER_HANDLER hw_fct; struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; @@ -5564,6 +5587,8 @@ static void shader_arb_handle_instruction(const struct wined3d_shader_instructio return; /* Instruction is handled. */ } /* In case of an ifc, generate a HW shader instruction */ + if (control_frame->type != IFC) + ERR("Control frame does not match.\n"); } else if(ins->handler_idx == WINED3DSIH_ENDIF) { @@ -5578,9 +5603,16 @@ static void shader_arb_handle_instruction(const struct wined3d_shader_instructio HeapFree(GetProcessHeap(), 0, control_frame); return; /* Instruction is handled */ } + /* In case of an ifc, generate a HW shader instruction */ + if (control_frame->type != IFC) + ERR("Control frame does not match.\n"); } - if(priv->muted) return; + if(priv->muted) + { + pop_control_frame(ins); + return; + } /* Select handler */ hw_fct = shader_arb_instruction_handler_table[ins->handler_idx]; @@ -5593,23 +5625,7 @@ static void shader_arb_handle_instruction(const struct wined3d_shader_instructio } hw_fct(ins); - if(ins->handler_idx == WINED3DSIH_ENDLOOP || ins->handler_idx == WINED3DSIH_ENDREP) - { - struct list *e = list_head(&priv->control_frames); - control_frame = LIST_ENTRY(e, struct control_frame, entry); - list_remove(&control_frame->entry); - HeapFree(GetProcessHeap(), 0, control_frame); - priv->loop_depth--; - } - else if(ins->handler_idx == WINED3DSIH_ENDIF) - { - /* Non-ifc ENDIFs don't reach that place because of the return in the if block above */ - struct list *e = list_head(&priv->control_frames); - control_frame = LIST_ENTRY(e, struct control_frame, entry); - list_remove(&control_frame->entry); - HeapFree(GetProcessHeap(), 0, control_frame); - } - + pop_control_frame(ins); shader_arb_add_instruction_modifiers(ins); }

1 0

Matteo Bruni : wined3d: Ensure GL_FRAGMENT_PROGRAM_ARB is enabled when using ARB shaders.
by Alexandre Julliard Nov. 9, 2012

Nov. 9, 2012

Module: wine Branch: master Commit: b532284a9ec23cd3663761e3dd83d355754cc2cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b532284a9ec23cd3663761e3d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 9 15:20:34 2012 +0100 wined3d: Ensure GL_FRAGMENT_PROGRAM_ARB is enabled when using ARB shaders. --- dlls/wined3d/arb_program_shader.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index aa89d59..6328fdf 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4676,13 +4676,12 @@ static void shader_arb_select(const struct wined3d_context *context, enum wined3 checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, priv->current_fprogram_id);"); if (!priv->use_arbfp_fixed_func) - { priv->fragment_pipe->enable_extension(gl_info, FALSE); - /* Enable OpenGL fragment programs. */ - gl_info->gl_ops.gl.p_glEnable(GL_FRAGMENT_PROGRAM_ARB); - checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB);"); - } + /* Enable OpenGL fragment programs. */ + gl_info->gl_ops.gl.p_glEnable(GL_FRAGMENT_PROGRAM_ARB); + checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB);"); + TRACE("(%p) : Bound fragment program %u and enabled GL_FRAGMENT_PROGRAM_ARB\n", device, priv->current_fprogram_id);

1 0

Frédéric Delanoy : ole32: Fix some leaks ( coverity).
by Alexandre Julliard Nov. 9, 2012

Nov. 9, 2012

Module: wine Branch: master Commit: 780228b6cac5bd3bcc1afd1901924b27283b10b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=780228b6cac5bd3bcc1afd190… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 9 10:17:41 2012 +0100 ole32: Fix some leaks (coverity). --- dlls/ole32/storage32.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index d2e9f69..8498eaf 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -8769,13 +8769,14 @@ HRESULT WINAPI ReadFmtUserTypeStg (LPSTORAGE pstg, CLIPFORMAT* pcf, LPOLESTR* lp /* ok, success... now we just need to store what we found */ if( pcf ) *pcf = RegisterClipboardFormatW( szOleTypeName ); - CoTaskMemFree( szOleTypeName ); if( lplpszUserType ) *lplpszUserType = szCLSIDName; - CoTaskMemFree( szProgIDName ); end: + CoTaskMemFree( szCLSIDName ); + CoTaskMemFree( szOleTypeName ); + CoTaskMemFree( szProgIDName ); IStream_Release( stm ); return r;

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3DTEXTURE2.
by Alexandre Julliard Nov. 9, 2012

Nov. 9, 2012

Module: wine Branch: master Commit: 1b9dcb16ced5a61301c358bab9749abd7c87d1dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b9dcb16ced5a61301c358bab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 8 23:29:15 2012 +0100 ddraw: Avoid LPDIRECT3DTEXTURE2. --- include/d3d.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index a139481..fe79711 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -616,7 +616,7 @@ DECLARE_INTERFACE_(IDirect3DTexture2,IUnknown) /*** IDirect3DTexture2 methods ***/ STDMETHOD(GetHandle)(THIS_ LPDIRECT3DDEVICE2 lpDirect3DDevice2, LPD3DTEXTUREHANDLE lpHandle) PURE; STDMETHOD(PaletteChanged)(THIS_ DWORD dwStart, DWORD dwCount) PURE; - STDMETHOD(Load)(THIS_ LPDIRECT3DTEXTURE2 lpD3DTexture2) PURE; + STDMETHOD(Load)(THIS_ IDirect3DTexture2 *texture) PURE; }; #undef INTERFACE @@ -1026,7 +1026,7 @@ DECLARE_INTERFACE_(IDirect3DDevice2,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DDevice2 methods ***/ STDMETHOD(GetCaps)(THIS_ LPD3DDEVICEDESC lpD3DHWDevDesc, LPD3DDEVICEDESC lpD3DHELDevDesc) PURE; - STDMETHOD(SwapTextureHandles)(THIS_ LPDIRECT3DTEXTURE2 lpD3DTex1, LPDIRECT3DTEXTURE2 lpD3DTex2) PURE; + STDMETHOD(SwapTextureHandles)(THIS_ IDirect3DTexture2 *tex1, IDirect3DTexture2 *tex2) PURE; STDMETHOD(GetStats)(THIS_ LPD3DSTATS lpD3DStats) PURE; STDMETHOD(AddViewport)(THIS_ LPDIRECT3DVIEWPORT2 lpDirect3DViewport2) PURE; STDMETHOD(DeleteViewport)(THIS_ LPDIRECT3DVIEWPORT2 lpDirect3DViewport2) PURE; @@ -1181,8 +1181,8 @@ DECLARE_INTERFACE_(IDirect3DDevice3,IUnknown) STDMETHOD(DrawIndexedPrimitiveVB)(THIS_ D3DPRIMITIVETYPE primitive_type, struct IDirect3DVertexBuffer *vb, WORD *indices, DWORD index_count, DWORD flags) PURE; STDMETHOD(ComputeSphereVisibility)(THIS_ LPD3DVECTOR lpCenters,LPD3DVALUE lpRadii,DWORD dwNumSpheres,DWORD dwFlags,LPDWORD lpdwReturnValues) PURE; - STDMETHOD(GetTexture)(THIS_ DWORD dwStage,LPDIRECT3DTEXTURE2 *lplpTexture2) PURE; - STDMETHOD(SetTexture)(THIS_ DWORD dwStage,LPDIRECT3DTEXTURE2 lpTexture2) PURE; + STDMETHOD(GetTexture)(THIS_ DWORD stage, IDirect3DTexture2 **texture) PURE; + STDMETHOD(SetTexture)(THIS_ DWORD stage, IDirect3DTexture2 *texture) PURE; STDMETHOD(GetTextureStageState)(THIS_ DWORD dwStage,D3DTEXTURESTAGESTATETYPE d3dTexStageStateType,LPDWORD lpdwState) PURE; STDMETHOD(SetTextureStageState)(THIS_ DWORD dwStage,D3DTEXTURESTAGESTATETYPE d3dTexStageStateType,DWORD dwState) PURE; STDMETHOD(ValidateDevice)(THIS_ LPDWORD lpdwPasses) PURE;

1 0

Jacek Caban : mshtml: Added IPersistStream::LoadHistory implementation.
by Alexandre Julliard Nov. 9, 2012

Nov. 9, 2012

Module: wine Branch: master Commit: 26d396252823aa215c29db9ea68e123c29a83a1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=26d396252823aa215c29db9ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 8 18:17:55 2012 +0100 mshtml: Added IPersistStream::LoadHistory implementation. --- dlls/mshtml/binding.h | 2 + dlls/mshtml/navigate.c | 20 ++++++++++++++- dlls/mshtml/persist.c | 60 ++++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 73 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index fda318b..1eee469 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -100,6 +100,7 @@ typedef struct { #define BINDING_NAVIGATED 0x0001 #define BINDING_REPLACE 0x0002 +#define BINDING_FROMHIST 0x0004 HRESULT set_http_header(struct list*,const WCHAR*,int,const WCHAR*,int) DECLSPEC_HIDDEN; HRESULT create_redirect_nschannel(const WCHAR*,nsChannel*,nsChannel**) DECLSPEC_HIDDEN; @@ -111,6 +112,7 @@ HRESULT load_nsuri(HTMLOuterWindow*,nsWineURI*,nsChannelBSC*,DWORD) DECLSPEC_HID HRESULT set_moniker(HTMLDocument*,IMoniker*,IBindCtx*,nsChannelBSC*,BOOL) DECLSPEC_HIDDEN; void prepare_for_binding(HTMLDocument*,IMoniker*,DWORD) DECLSPEC_HIDDEN; HRESULT super_navigate(HTMLOuterWindow*,IUri*,DWORD,const WCHAR*,BYTE*,DWORD) DECLSPEC_HIDDEN; +HRESULT load_uri(HTMLOuterWindow*,IUri*,DWORD) DECLSPEC_HIDDEN; HRESULT navigate_new_window(HTMLOuterWindow*,IUri*,const WCHAR*,IHTMLWindow2**) DECLSPEC_HIDDEN; HRESULT create_channelbsc(IMoniker*,const WCHAR*,BYTE*,DWORD,BOOL,nsChannelBSC**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index e92440e..33ebbca 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2119,7 +2119,8 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, DWORD flags, const WC /* Silently and repeated when real loading starts? */ window->readystate = READYSTATE_LOADING; - call_docview_84(window->doc_obj); + if(!(flags & BINDING_FROMHIST)) + call_docview_84(window->doc_obj); task->window = window; task->bscallback = bsc; @@ -2140,7 +2141,8 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, DWORD flags, const WC /* Why silently? */ window->readystate = READYSTATE_COMPLETE; - call_docview_84(window->doc_obj); + if(!(flags & BINDING_FROMHIST)) + call_docview_84(window->doc_obj); IUri_AddRef(uri); task->window = window; @@ -2301,6 +2303,20 @@ static HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *dis return hres; } +HRESULT load_uri(HTMLOuterWindow *window, IUri *uri, DWORD flags) +{ + BSTR display_uri; + HRESULT hres; + + hres = IUri_GetDisplayUri(uri, &display_uri); + if(FAILED(hres)) + return hres; + + hres = navigate_uri(window, uri, display_uri, flags); + SysFreeString(display_uri); + return hres; +} + HRESULT navigate_url(HTMLOuterWindow *window, const WCHAR *new_url, IUri *base_uri) { BSTR display_uri; diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 2fe1cfe..649c906 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -48,6 +48,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); /* Undocumented notification, see tests */ #define CMDID_EXPLORER_UPDATEHISTORY 38 +static const WCHAR about_blankW[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; + typedef struct { task_t header; HTMLDocumentObj *doc; @@ -339,7 +341,7 @@ void prepare_for_binding(HTMLDocument *This, IMoniker *mon, DWORD flags) hres = IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 63, 0, &var, &out); if(SUCCEEDED(hres)) VariantClear(&out); - }else { + }else if(!(flags & BINDING_FROMHIST)) { V_VT(&var) = VT_I4; V_I4(&var) = 0; IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 37, 0, &var, NULL); @@ -810,8 +812,6 @@ static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, LPSTREAM IMoniker *mon; HRESULT hres; - static const WCHAR about_blankW[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; - TRACE("(%p)->(%p)\n", This, pStm); hres = CreateURLMoniker(NULL, about_blankW, &mon); @@ -869,8 +869,6 @@ static HRESULT WINAPI PersistStreamInit_InitNew(IPersistStreamInit *iface) IMoniker *mon; HRESULT hres; - static const WCHAR about_blankW[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; - TRACE("(%p)\n", This); hres = CreateURLMoniker(NULL, about_blankW, &mon); @@ -936,8 +934,56 @@ static HRESULT WINAPI PersistHistory_GetClassID(IPersistHistory *iface, CLSID *p static HRESULT WINAPI PersistHistory_LoadHistory(IPersistHistory *iface, IStream *pStream, IBindCtx *pbc) { HTMLDocument *This = impl_from_IPersistHistory(iface); - FIXME("(%p)->(%p %p)\n", This, pStream, pbc); - return E_NOTIMPL; + ULONG str_len, read; + WCHAR *uri_str; + IUri *uri; + HRESULT hres; + + TRACE("(%p)->(%p %p)\n", This, pStream, pbc); + + if(!This->window) { + FIXME("No current window\n"); + return E_UNEXPECTED; + } + + if(pbc) + FIXME("pbc not supported\n"); + + if(This->doc_obj->client) { + IOleCommandTarget *cmdtrg = NULL; + + hres = IOleClientSite_QueryInterface(This->doc_obj->client, &IID_IOleCommandTarget, + (void**)&cmdtrg); + if(SUCCEEDED(hres)) { + IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 138, 0, NULL, NULL); + IOleCommandTarget_Release(cmdtrg); + } + } + + hres = IStream_Read(pStream, &str_len, sizeof(str_len), &read); + if(FAILED(hres)) + return hres; + if(read != sizeof(str_len)) + return E_FAIL; + + uri_str = heap_alloc((str_len+1)*sizeof(WCHAR)); + if(!uri_str) + return E_OUTOFMEMORY; + + hres = IStream_Read(pStream, uri_str, str_len*sizeof(WCHAR), &read); + if(SUCCEEDED(hres) && read != str_len*sizeof(WCHAR)) + hres = E_FAIL; + if(SUCCEEDED(hres)) { + uri_str[str_len] = 0; + hres = CreateUri(uri_str, 0, 0, &uri); + } + heap_free(uri_str); + if(FAILED(hres)) + return hres; + + hres = load_uri(This->window, uri, BINDING_FROMHIST); + IUri_Release(uri); + return hres; } static HRESULT WINAPI PersistHistory_SaveHistory(IPersistHistory *iface, IStream *pStream)

1 0

Jacek Caban : jscript: Fixed leak in disp_propget.
by Alexandre Julliard Nov. 9, 2012

Nov. 9, 2012

Module: wine Branch: master Commit: 74a83150aba9dee39eba7a3013560d2d8bc839f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74a83150aba9dee39eba7a301… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 9 11:48:34 2012 +0100 jscript: Fixed leak in disp_propget. --- dlls/jscript/dispex.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index f68a031..8bc4d1d 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1413,7 +1413,9 @@ HRESULT disp_propget(script_ctx_t *ctx, IDispatch *disp, DISPID id, jsval_t *val if(FAILED(hres)) return hres; - return variant_to_jsval(&var, val); + hres = variant_to_jsval(&var, val); + VariantClear(&var); + return hres; } HRESULT jsdisp_delete_idx(jsdisp_t *obj, DWORD idx)

1 0

Jacek Caban : mshtml: Use fregment-less URI in super_navigate.
by Alexandre Julliard Nov. 9, 2012

Nov. 9, 2012

Module: wine Branch: master Commit: 99c34aa9d9bac71a2054fbae467d498d343e50b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99c34aa9d9bac71a2054fbae4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 8 18:17:12 2012 +0100 mshtml: Use fregment-less URI in super_navigate. --- dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/navigate.c | 22 +++++++++++++++++----- dlls/mshtml/nsio.c | 2 +- dlls/mshtml/tests/htmldoc.c | 6 ++---- 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 97cd165..f24354d 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -780,7 +780,6 @@ BOOL is_gecko_path(const char*) DECLSPEC_HIDDEN; void init_node_cc(void); HRESULT nsuri_to_url(LPCWSTR,BOOL,BSTR*) DECLSPEC_HIDDEN; -BOOL compare_ignoring_frag(IUri*,IUri*) DECLSPEC_HIDDEN; HRESULT navigate_url(HTMLOuterWindow*,const WCHAR*,IUri*) DECLSPEC_HIDDEN; HRESULT set_frame_doc(HTMLFrameBase*,nsIDOMDocument*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index e2eecef..18961f6 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2047,10 +2047,15 @@ static HRESULT navigate_fragment(HTMLOuterWindow *window, IUri *uri) HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, const WCHAR *headers, BYTE *post_data, DWORD post_data_size) { nsChannelBSC *bsc; + IUri *uri_nofrag; IMoniker *mon; DWORD scheme; HRESULT hres; + uri_nofrag = get_uri_nofrag(uri); + if(!uri_nofrag) + return E_FAIL; + if(window->doc_obj->client) { IOleCommandTarget *cmdtrg; @@ -2059,7 +2064,7 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, const WCHAR *headers, VARIANT in, out; BSTR url_str; - hres = IUri_GetDisplayUri(uri, &url_str); + hres = IUri_GetDisplayUri(uri_nofrag, &url_str); if(SUCCEEDED(hres)) { V_VT(&in) = VT_BSTR; V_BSTR(&in) = url_str; @@ -2074,12 +2079,19 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, const WCHAR *headers, } } - if(window->uri && !post_data_size && compare_ignoring_frag(window->uri, uri)) { - TRACE("fragment navigate\n"); - return navigate_fragment(window, uri); + if(window->uri_nofrag && !post_data_size) { + BOOL eq; + + hres = IUri_IsEqual(uri_nofrag, window->uri_nofrag, &eq); + if(SUCCEEDED(hres) && eq) { + IUri_Release(uri_nofrag); + TRACE("fragment navigate\n"); + return navigate_fragment(window, uri); + } } - hres = CreateURLMonikerEx2(NULL, uri, &mon, URL_MK_UNIFORM); + hres = CreateURLMonikerEx2(NULL, uri_nofrag, &mon, URL_MK_UNIFORM); + IUri_Release(uri_nofrag); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 204879f..5ce6648 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -121,7 +121,7 @@ IUri *get_uri_nofrag(IUri *uri) return ret; } -BOOL compare_ignoring_frag(IUri *uri1, IUri *uri2) +static BOOL compare_ignoring_frag(IUri *uri1, IUri *uri2) { IUri *uri_nofrag1, *uri_nofrag2; BOOL ret = FALSE; diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 849b517..0e8e0bb 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2835,10 +2835,8 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID CHECK_EXPECT(Exec_ShellDocView_67); ok(pvaIn != NULL, "pvaIn == NULL\n"); ok(V_VT(pvaIn) == VT_BSTR, "V_VT(pvaIn) = %d\n", V_VT(pvaIn)); - if(!loading_hash) - ok(!strcmp_wa(V_BSTR(pvaIn), nav_serv_url), "V_BSTR(pvaIn) = %s, expected %s\n", wine_dbgstr_w(V_BSTR(pvaIn)), nav_serv_url); - else - todo_wine ok(!strcmp_wa(V_BSTR(pvaIn), nav_serv_url), "V_BSTR(pvaIn) = %s, expected %s\n", wine_dbgstr_w(V_BSTR(pvaIn)), nav_serv_url); + ok(!strcmp_wa(V_BSTR(pvaIn), nav_serv_url), "V_BSTR(pvaIn) = %s, expected %s\n", + wine_dbgstr_w(V_BSTR(pvaIn)), nav_serv_url); ok(pvaOut != NULL, "pvaOut == NULL\n"); ok(V_VT(pvaOut) == VT_BOOL, "V_VT(pvaOut) = %d\n", V_VT(pvaOut)); ok(V_BOOL(pvaOut) == VARIANT_TRUE, "V_BOOL(pvaOut) = %x\n", V_BOOL(pvaOut));

1 0

Hans Leidekker : msi: Avoid a string copy when comparing SQL keywords.
by Alexandre Julliard Nov. 9, 2012

Nov. 9, 2012

Module: wine Branch: master Commit: 9c431b67379839d7792aa38549cbf547bb5444c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c431b67379839d7792aa3854… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 9 16:47:09 2012 +0100 msi: Avoid a string copy when comparing SQL keywords. --- dlls/msi/tokenize.c | 169 ++++++++++++++++++++++++++------------------------- 1 files changed, 86 insertions(+), 83 deletions(-) diff --git a/dlls/msi/tokenize.c b/dlls/msi/tokenize.c index 4798917..441a54a 100644 --- a/dlls/msi/tokenize.c +++ b/dlls/msi/tokenize.c @@ -32,103 +32,108 @@ */ typedef struct Keyword Keyword; struct Keyword { - const WCHAR *zName; /* The keyword name */ + const WCHAR *name; /* The keyword name */ + unsigned int len; int tokenType; /* The token value for this keyword */ }; #define MAX_TOKEN_LEN 11 -static const WCHAR ADD_W[] = { 'A','D','D',0 }; -static const WCHAR ALTER_W[] = { 'A','L','T','E','R',0 }; -static const WCHAR AND_W[] = { 'A','N','D',0 }; -static const WCHAR BY_W[] = { 'B','Y',0 }; -static const WCHAR CHAR_W[] = { 'C','H','A','R',0 }; -static const WCHAR CHARACTER_W[] = { 'C','H','A','R','A','C','T','E','R',0 }; -static const WCHAR CREATE_W[] = { 'C','R','E','A','T','E',0 }; -static const WCHAR DELETE_W[] = { 'D','E','L','E','T','E',0 }; -static const WCHAR DISTINCT_W[] = { 'D','I','S','T','I','N','C','T',0 }; -static const WCHAR DROP_W[] = { 'D','R','O','P',0 }; -static const WCHAR FREE_W[] = { 'F','R','E','E',0 }; -static const WCHAR FROM_W[] = { 'F','R','O','M',0 }; -static const WCHAR HOLD_W[] = { 'H','O','L','D',0 }; -static const WCHAR INSERT_W[] = { 'I','N','S','E','R','T',0 }; -static const WCHAR INT_W[] = { 'I','N','T',0 }; -static const WCHAR INTEGER_W[] = { 'I','N','T','E','G','E','R',0 }; -static const WCHAR INTO_W[] = { 'I','N','T','O',0 }; -static const WCHAR IS_W[] = { 'I','S',0 }; -static const WCHAR KEY_W[] = { 'K','E','Y',0 }; -static const WCHAR LIKE_W[] = { 'L','I','K','E',0 }; -static const WCHAR LOCALIZABLE_W[] = { 'L','O','C','A','L','I','Z','A','B','L','E',0 }; -static const WCHAR LONG_W[] = { 'L','O','N','G',0 }; -static const WCHAR LONGCHAR_W[] = { 'L','O','N','G','C','H','A','R',0 }; -static const WCHAR NOT_W[] = { 'N','O','T',0 }; -static const WCHAR NULL_W[] = { 'N','U','L','L',0 }; -static const WCHAR OBJECT_W[] = { 'O','B','J','E','C','T',0 }; -static const WCHAR OR_W[] = { 'O','R',0 }; -static const WCHAR ORDER_W[] = { 'O','R','D','E','R',0 }; -static const WCHAR PRIMARY_W[] = { 'P','R','I','M','A','R','Y',0 }; -static const WCHAR SELECT_W[] = { 'S','E','L','E','C','T',0 }; -static const WCHAR SET_W[] = { 'S','E','T',0 }; -static const WCHAR SHORT_W[] = { 'S','H','O','R','T',0 }; -static const WCHAR TABLE_W[] = { 'T','A','B','L','E',0 }; -static const WCHAR TEMPORARY_W[] = { 'T','E','M','P','O','R','A','R','Y',0 }; -static const WCHAR UPDATE_W[] = { 'U','P','D','A','T','E',0 }; -static const WCHAR VALUES_W[] = { 'V','A','L','U','E','S',0 }; -static const WCHAR WHERE_W[] = { 'W','H','E','R','E',0 }; +static const WCHAR addW[] = {'A','D','D'}; +static const WCHAR alterW[] = {'A','L','T','E','R'}; +static const WCHAR andW[] = {'A','N','D'}; +static const WCHAR byW[] = {'B','Y'}; +static const WCHAR charW[] = {'C','H','A','R'}; +static const WCHAR characterW[] = {'C','H','A','R','A','C','T','E','R'}; +static const WCHAR createW[] = {'C','R','E','A','T','E'}; +static const WCHAR deleteW[] = {'D','E','L','E','T','E'}; +static const WCHAR distinctW[] = {'D','I','S','T','I','N','C','T'}; +static const WCHAR dropW[] = {'D','R','O','P'}; +static const WCHAR freeW[] = {'F','R','E','E'}; +static const WCHAR fromW[] = {'F','R','O','M'}; +static const WCHAR holdW[] = {'H','O','L','D'}; +static const WCHAR insertW[] = {'I','N','S','E','R','T'}; +static const WCHAR intW[] = {'I','N','T'}; +static const WCHAR integerW[] = {'I','N','T','E','G','E','R'}; +static const WCHAR intoW[] = {'I','N','T','O'}; +static const WCHAR isW[] = {'I','S'}; +static const WCHAR keyW[] = {'K','E','Y'}; +static const WCHAR likeW[] = {'L','I','K','E'}; +static const WCHAR localizableW[] = {'L','O','C','A','L','I','Z','A','B','L','E'}; +static const WCHAR longW[] = {'L','O','N','G'}; +static const WCHAR longcharW[] = {'L','O','N','G','C','H','A','R'}; +static const WCHAR notW[] = {'N','O','T'}; +static const WCHAR nullW[] = {'N','U','L','L'}; +static const WCHAR objectW[] = {'O','B','J','E','C','T'}; +static const WCHAR orW[] = {'O','R'}; +static const WCHAR orderW[] = {'O','R','D','E','R'}; +static const WCHAR primaryW[] = {'P','R','I','M','A','R','Y'}; +static const WCHAR selectW[] = {'S','E','L','E','C','T'}; +static const WCHAR setW[] = {'S','E','T'}; +static const WCHAR shortW[] = {'S','H','O','R','T'}; +static const WCHAR tableW[] = {'T','A','B','L','E'}; +static const WCHAR temporaryW[] = {'T','E','M','P','O','R','A','R','Y'}; +static const WCHAR updateW[] = {'U','P','D','A','T','E'}; +static const WCHAR valuesW[] = {'V','A','L','U','E','S'}; +static const WCHAR whereW[] = {'W','H','E','R','E'}; + +#define ARRAY_SIZE(array) (sizeof(array)/sizeof((array)[0])) /* ** These are the keywords ** They MUST be in alphabetical order */ static const Keyword aKeywordTable[] = { - { ADD_W, TK_ADD }, - { ALTER_W, TK_ALTER }, - { AND_W, TK_AND }, - { BY_W, TK_BY }, - { CHAR_W, TK_CHAR }, - { CHARACTER_W, TK_CHAR }, - { CREATE_W, TK_CREATE }, - { DELETE_W, TK_DELETE }, - { DISTINCT_W, TK_DISTINCT }, - { DROP_W, TK_DROP }, - { FREE_W, TK_FREE }, - { FROM_W, TK_FROM }, - { HOLD_W, TK_HOLD }, - { INSERT_W, TK_INSERT }, - { INT_W, TK_INT }, - { INTEGER_W, TK_INT }, - { INTO_W, TK_INTO }, - { IS_W, TK_IS }, - { KEY_W, TK_KEY }, - { LIKE_W, TK_LIKE }, - { LOCALIZABLE_W, TK_LOCALIZABLE }, - { LONG_W, TK_LONG }, - { LONGCHAR_W, TK_LONGCHAR }, - { NOT_W, TK_NOT }, - { NULL_W, TK_NULL }, - { OBJECT_W, TK_OBJECT }, - { OR_W, TK_OR }, - { ORDER_W, TK_ORDER }, - { PRIMARY_W, TK_PRIMARY }, - { SELECT_W, TK_SELECT }, - { SET_W, TK_SET }, - { SHORT_W, TK_SHORT }, - { TABLE_W, TK_TABLE }, - { TEMPORARY_W, TK_TEMPORARY }, - { UPDATE_W, TK_UPDATE }, - { VALUES_W, TK_VALUES }, - { WHERE_W, TK_WHERE }, + { addW, ARRAY_SIZE(addW), TK_ADD }, + { alterW, ARRAY_SIZE(alterW), TK_ALTER }, + { andW, ARRAY_SIZE(andW), TK_AND }, + { byW, ARRAY_SIZE(byW), TK_BY }, + { charW, ARRAY_SIZE(charW), TK_CHAR }, + { characterW, ARRAY_SIZE(characterW), TK_CHAR }, + { createW, ARRAY_SIZE(createW), TK_CREATE }, + { deleteW, ARRAY_SIZE(deleteW), TK_DELETE }, + { distinctW, ARRAY_SIZE(distinctW), TK_DISTINCT }, + { dropW, ARRAY_SIZE(dropW), TK_DROP }, + { freeW, ARRAY_SIZE(freeW), TK_FREE }, + { fromW, ARRAY_SIZE(fromW), TK_FROM }, + { holdW, ARRAY_SIZE(holdW), TK_HOLD }, + { insertW, ARRAY_SIZE(insertW), TK_INSERT }, + { intW, ARRAY_SIZE(intW), TK_INT }, + { integerW, ARRAY_SIZE(integerW), TK_INT }, + { intoW, ARRAY_SIZE(intoW), TK_INTO }, + { isW, ARRAY_SIZE(isW), TK_IS }, + { keyW, ARRAY_SIZE(keyW), TK_KEY }, + { likeW, ARRAY_SIZE(likeW), TK_LIKE }, + { localizableW, ARRAY_SIZE(localizableW), TK_LOCALIZABLE }, + { longW, ARRAY_SIZE(longW), TK_LONG }, + { longcharW, ARRAY_SIZE(longcharW), TK_LONGCHAR }, + { notW, ARRAY_SIZE(notW), TK_NOT }, + { nullW, ARRAY_SIZE(nullW), TK_NULL }, + { objectW, ARRAY_SIZE(objectW), TK_OBJECT }, + { orW, ARRAY_SIZE(orW), TK_OR }, + { orderW, ARRAY_SIZE(orderW), TK_ORDER }, + { primaryW, ARRAY_SIZE(primaryW), TK_PRIMARY }, + { selectW, ARRAY_SIZE(selectW), TK_SELECT }, + { setW, ARRAY_SIZE(setW), TK_SET }, + { shortW, ARRAY_SIZE(shortW), TK_SHORT }, + { tableW, ARRAY_SIZE(tableW), TK_TABLE }, + { temporaryW, ARRAY_SIZE(temporaryW), TK_TEMPORARY }, + { updateW, ARRAY_SIZE(updateW), TK_UPDATE }, + { valuesW, ARRAY_SIZE(valuesW), TK_VALUES }, + { whereW, ARRAY_SIZE(whereW), TK_WHERE }, }; -#define KEYWORD_COUNT ( sizeof aKeywordTable/sizeof (Keyword) ) - /* ** Comparison function for binary search. */ static int compKeyword(const void *m1, const void *m2){ const Keyword *k1 = m1, *k2 = m2; + int ret, len = min( k1->len, k2->len ); - return strcmpiW( k1->zName, k2->zName ); + if ((ret = memicmpW( k1->name, k2->name, len ))) return ret; + if (k1->len < k2->len) return -1; + else if (k1->len > k2->len) return 1; + return 0; } /* @@ -137,17 +142,15 @@ static int compKeyword(const void *m1, const void *m2){ ** returned. If the input is not a keyword, TK_ID is returned. */ static int sqliteKeywordCode(const WCHAR *z, int n){ - WCHAR str[MAX_TOKEN_LEN+1]; Keyword key, *r; if( n>MAX_TOKEN_LEN ) return TK_ID; - memcpy( str, z, n*sizeof (WCHAR) ); - str[n] = 0; key.tokenType = 0; - key.zName = str; - r = bsearch( &key, aKeywordTable, KEYWORD_COUNT, sizeof (Keyword), compKeyword ); + key.name = z; + key.len = n; + r = bsearch( &key, aKeywordTable, ARRAY_SIZE(aKeywordTable), sizeof(Keyword), compKeyword ); if( r ) return r->tokenType; return TK_ID;

1 0

Matteo Bruni : d3dcompiler: Skip stray semicolons outside of functions.
by Alexandre Julliard Nov. 9, 2012

Nov. 9, 2012

Module: wine Branch: master Commit: feda13db337aceacb6f61bccb2b560f3cc094e21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feda13db337aceacb6f61bccb… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 9 15:20:38 2012 +0100 d3dcompiler: Skip stray semicolons outside of functions. --- dlls/d3dcompiler_43/hlsl.y | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index b2740f6..6c360ec 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1065,6 +1065,10 @@ hlsl_prog: /* empty */ | hlsl_prog preproc_directive { } + | hlsl_prog ';' + { + TRACE("Skipping stray semicolon.\n"); + } preproc_directive: PRE_LINE STRING {

1 0