November 2007 - Wine-Commits

Rob Shearman : server: Fix a typo in the enumeration of the ACE' s in sd_to_mode.
by Alexandre Julliard Nov. 20, 2007

Nov. 20, 2007

Module: wine Branch: master Commit: 6753fdc3b739b30749b29360d274fb623c6d29c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6753fdc3b739b30749b29360d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Nov 20 10:47:11 2007 +0000 server: Fix a typo in the enumeration of the ACE's in sd_to_mode. This caused only the first ACE to be examined, causing permissions to always be set to ----???---. --- server/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/file.c b/server/file.c index 7f34c02..58973c0 100644 --- a/server/file.c +++ b/server/file.c @@ -421,7 +421,7 @@ static mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner { const ACE_HEADER *ace = (const ACE_HEADER *)(dacl + 1); ULONG i; - for (i = 0; i < dacl->AceCount; i++, ace_next( ace )) + for (i = 0; i < dacl->AceCount; i++, ace = ace_next( ace )) { const ACCESS_ALLOWED_ACE *aa_ace; const ACCESS_DENIED_ACE *ad_ace;

1 0

Jacek Caban : mshtml: Change FIXME that is usually invalid to TRACE.
by Alexandre Julliard Nov. 20, 2007

Nov. 20, 2007

Module: wine Branch: master Commit: b61bc4b92ec2951bdf2f3c2c23726f3d03e4efcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b61bc4b92ec2951bdf2f3c2c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 20 01:51:41 2007 +0100 mshtml: Change FIXME that is usually invalid to TRACE. --- dlls/mshtml/navigate.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 5e05a64..96369cb 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -647,8 +647,8 @@ static HRESULT WINAPI BSCServiceProvider_QueryService(IServiceProvider *iface, REFGUID guidService, REFIID riid, void **ppv) { BSCallback *This = SERVPROV_THIS(iface); - FIXME("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); - return E_NOTIMPL; + TRACE("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); + return E_NOINTERFACE; } #undef SERVPROV_THIS

1 0

Jacek Caban : mshtml: Added more loading tests.
by Alexandre Julliard Nov. 20, 2007

Nov. 20, 2007

Module: wine Branch: master Commit: 843703030af9344989944a01e8ba6bfbcab6367f URL: http://source.winehq.org/git/wine.git/?a=commit;h=843703030af9344989944a01e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 20 01:51:30 2007 +0100 mshtml: Added more loading tests. --- dlls/mshtml/tests/htmldoc.c | 169 ++++++++++++++++++++++++++++--------------- 1 files changed, 109 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=843703030af9344989944…

1 0

Jacek Caban : mshtml: Always initialize output in exec_fontname.
by Alexandre Julliard Nov. 20, 2007

Nov. 20, 2007

Module: wine Branch: master Commit: 2702dfffbf40f473aafb7c4d26f842edc93af47d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2702dfffbf40f473aafb7c4d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 20 01:50:19 2007 +0100 mshtml: Always initialize output in exec_fontname. --- dlls/mshtml/editor.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 827fa07..53938e9 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -586,6 +586,9 @@ static HRESULT exec_fontname(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, DWORD len; nsresult nsres; + V_VT(out) = VT_BSTR; + V_BSTR(out) = NULL; + nsparam = create_nscommand_params(); nsres = get_ns_command_state(This->nscontainer, NSCMD_FONTFACE, nsparam); @@ -600,7 +603,6 @@ static HRESULT exec_fontname(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, MultiByteToWideChar(CP_ACP, 0, stra, -1, strw, -1); nsfree(stra); - V_VT(out) = VT_BSTR; V_BSTR(out) = SysAllocString(strw); mshtml_free(strw); }

1 0

Jacek Caban : mshtml: Reload page in exec_editmode if available.
by Alexandre Julliard Nov. 20, 2007

Nov. 20, 2007

Module: wine Branch: master Commit: 5d9e64554b69d7bb4065738985fbdfe4529c11cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d9e64554b69d7bb406573898… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 20 01:51:03 2007 +0100 mshtml: Reload page in exec_editmode if available. --- dlls/mshtml/olecmd.c | 35 +++++++++++++++++++++++++++-------- 1 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index db2d629..326b0b0 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -534,8 +534,6 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, IMoniker *mon; HRESULT hres; - static const WCHAR wszAboutBlank[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; - TRACE("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); if(in || out) @@ -546,9 +544,20 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, This->usermode = EDITMODE; + if(This->mon) { + CLSID clsid = IID_NULL; + hres = IMoniker_GetClassID(This->mon, &clsid); + if(SUCCEEDED(hres)) { + /* We should use IMoniker::Save here */ + FIXME("Use CLSID %s\n", debugstr_guid(&clsid)); + } + } + if(This->frame) IOleInPlaceFrame_SetStatusText(This->frame, NULL); + This->readystate = READYSTATE_UNINITIALIZED; + if(This->client) { IOleCommandTarget *cmdtrg; @@ -581,14 +590,24 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, if(This->nscontainer) set_ns_editmode(This->nscontainer); - hres = CreateURLMoniker(NULL, wszAboutBlank, &mon); - if(FAILED(hres)) { - FIXME("CreateURLMoniker failed: %08x\n", hres); - return hres; - } - update_doc(This, UPDATE_UI); + if(This->mon) { + /* FIXME: We should find nicer way to do this */ + remove_doc_tasks(This); + + mon = This->mon; + IMoniker_AddRef(mon); + }else { + static const WCHAR about_blankW[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; + + hres = CreateURLMoniker(NULL, about_blankW, &mon); + if(FAILED(hres)) { + FIXME("CreateURLMoniker failed: %08x\n", hres); + return hres; + } + } + hres = IPersistMoniker_Load(PERSISTMON(This), TRUE, mon, NULL, 0); IMoniker_Release(mon); if(FAILED(hres))

1 0

Jacek Caban : mshtml: Use call_set_active_object in exec_editmode.
by Alexandre Julliard Nov. 20, 2007

Nov. 20, 2007

Module: wine Branch: master Commit: ebc89a02d37dd0447bc2d4425b76ffd0fca9f886 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebc89a02d37dd0447bc2d4425… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 20 01:49:50 2007 +0100 mshtml: Use call_set_active_object in exec_editmode. --- dlls/mshtml/olecmd.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index b76ea31..db2d629 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -595,11 +595,10 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, return hres; if(This->ui_active) { - OLECHAR wszHTMLDocument[30]; RECT rcBorderWidths; if(This->ip_window) - IOleInPlaceUIWindow_SetActiveObject(This->ip_window, NULL, NULL); + call_set_active_object(This->ip_window, NULL); if(This->hostui) IDocHostUIHandler_HideUI(This->hostui); @@ -607,11 +606,8 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, IDocHostUIHandler_ShowUI(This->hostui, DOCHOSTUITYPE_AUTHOR, ACTOBJ(This), CMDTARGET(This), This->frame, This->ip_window); - LoadStringW(hInst, IDS_HTMLDOCUMENT, wszHTMLDocument, - sizeof(wszHTMLDocument)/sizeof(WCHAR)); - if(This->ip_window) - IOleInPlaceUIWindow_SetActiveObject(This->ip_window, ACTOBJ(This), wszHTMLDocument); + call_set_active_object(This->ip_window, ACTOBJ(This)); memset(&rcBorderWidths, 0, sizeof(rcBorderWidths)); IOleInPlaceFrame_SetBorderSpace(This->frame, &rcBorderWidths);

1 0

Jacek Caban : mshtml: Move IOleInPlaceFrame:: SetActiveObject call to separated function.
by Alexandre Julliard Nov. 20, 2007

Nov. 20, 2007

Module: wine Branch: master Commit: 3f444cae92f5269ce3972abdfc8934ba7cbce83d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f444cae92f5269ce3972abdf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 20 01:49:36 2007 +0100 mshtml: Move IOleInPlaceFrame::SetActiveObject call to separated function. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/view.c | 24 ++++++++++++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a35347e..2bf926b 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -398,6 +398,7 @@ BOOL install_wine_gecko(BOOL); void hlink_frame_navigate(HTMLDocument*,IHlinkFrame*,LPCWSTR,nsIInputStream*,DWORD); void call_property_onchanged(ConnectionPoint*,DISPID); +HRESULT call_set_active_object(IOleInPlaceUIWindow*,IOleInPlaceActiveObject*); void *nsalloc(size_t); void nsfree(void*); diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index e1f13dc..5872091 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -415,6 +415,18 @@ void hide_tooltip(HTMLDocument *This) SendMessageW(This->tooltips_hwnd, TTM_ACTIVATE, FALSE, 0); } +HRESULT call_set_active_object(IOleInPlaceUIWindow *window, IOleInPlaceActiveObject *act_obj) +{ + static WCHAR html_documentW[30]; + + if(act_obj && !html_documentW[0]) { + LoadStringW(hInst, IDS_HTMLDOCUMENT, html_documentW, + sizeof(html_documentW)/sizeof(WCHAR)); + } + + return IOleInPlaceFrame_SetActiveObject(window, act_obj, act_obj ? html_documentW : NULL); +} + /********************************************************** * IOleDocumentView implementation */ @@ -564,7 +576,6 @@ static HRESULT WINAPI OleDocumentView_UIActivate(IOleDocumentView *iface, BOOL f } if(fUIActivate) { - OLECHAR wszHTMLDocument[30]; RECT rcBorderWidths; if(This->ui_active) @@ -583,12 +594,9 @@ static HRESULT WINAPI OleDocumentView_UIActivate(IOleDocumentView *iface, BOOL f update_doc(This, UPDATE_UI); - LoadStringW(hInst, IDS_HTMLDOCUMENT, wszHTMLDocument, - sizeof(wszHTMLDocument)/sizeof(WCHAR)); - hres = IOleInPlaceSite_OnUIActivate(This->ipsite); if(SUCCEEDED(hres)) { - IOleInPlaceFrame_SetActiveObject(This->frame, ACTOBJ(This), wszHTMLDocument); + call_set_active_object((IOleInPlaceUIWindow*)This->frame, ACTOBJ(This)); }else { FIXME("OnUIActivate failed: %08x\n", hres); IOleInPlaceFrame_Release(This->frame); @@ -604,7 +612,7 @@ static HRESULT WINAPI OleDocumentView_UIActivate(IOleDocumentView *iface, BOOL f IDocHostUIHandler_HideUI(This->hostui); if(This->ip_window) - IOleInPlaceUIWindow_SetActiveObject(This->ip_window, ACTOBJ(This), wszHTMLDocument); + call_set_active_object(This->ip_window, ACTOBJ(This)); memset(&rcBorderWidths, 0, sizeof(rcBorderWidths)); IOleInPlaceFrame_SetBorderSpace(This->frame, &rcBorderWidths); @@ -614,9 +622,9 @@ static HRESULT WINAPI OleDocumentView_UIActivate(IOleDocumentView *iface, BOOL f if(This->ui_active) { This->ui_active = FALSE; if(This->ip_window) - IOleInPlaceUIWindow_SetActiveObject(This->ip_window, NULL, NULL); + call_set_active_object(This->ip_window, NULL); if(This->frame) - IOleInPlaceFrame_SetActiveObject(This->frame, NULL, NULL); + call_set_active_object((IOleInPlaceUIWindow*)This->frame, NULL); if(This->hostui) IDocHostUIHandler_HideUI(This->hostui); if(This->ipsite)

1 0

Stefan Dösinger : d3d9: Free the converted declaration data after creating the declaration.
by Alexandre Julliard Nov. 20, 2007

Nov. 20, 2007

Module: wine Branch: master Commit: 22ac3704ba892edc58b63823a522ef733097bf9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=22ac3704ba892edc58b63823a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 16 19:06:58 2007 +0100 d3d9: Free the converted declaration data after creating the declaration. --- dlls/d3d9/device.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 261a3ff..f4024a2 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1128,6 +1128,7 @@ IDirect3DVertexDeclaration9 *getConvertedDecl(IDirect3DDevice9Impl *This, DWORD if (hr != S_OK) return NULL; hr = IDirect3DDevice9Impl_CreateVertexDeclaration((IDirect3DDevice9 *) This, elements, &pDecl); + HeapFree(GetProcessHeap(), 0, elements); /* CreateVertexDeclaration makes a copy */ if (hr != S_OK) return NULL; if(This->declArraySize == This->numConvertedDecls) {

1 0

Stefan Dösinger : d3d8: Release the vertex declarations array when destroying the device.
by Alexandre Julliard Nov. 20, 2007

Nov. 20, 2007

Module: wine Branch: master Commit: 6cecaa9852197de869af11a232e3a2699065f33a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cecaa9852197de869af11a23… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 16 17:25:12 2007 +0100 d3d8: Release the vertex declarations array when destroying the device. --- dlls/d3d8/device.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 205120e..55ebe83 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -106,6 +106,7 @@ static ULONG WINAPI IDirect3DDevice8Impl_Release(LPDIRECT3DDEVICE8 iface) { for(i = 0; i < This->numConvertedDecls; i++) { IWineD3DVertexDeclaration_Release(This->decls[i].decl); } + HeapFree(GetProcessHeap(), 0, This->decls); IWineD3DDevice_Uninit3D(This->WineD3DDevice, D3D8CB_DestroyDepthStencilSurface, D3D8CB_DestroySwapChain); IWineD3DDevice_Release(This->WineD3DDevice);

1 0

Stefan Dösinger : wined3d: Free the shader function when freeing the shader.
by Alexandre Julliard Nov. 20, 2007

Nov. 20, 2007

Module: wine Branch: master Commit: 7a97d4e2ec0ee9a77217203cd8b94fd162ebc0bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a97d4e2ec0ee9a77217203cd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 16 21:02:29 2007 +0100 wined3d: Free the shader function when freeing the shader. --- dlls/wined3d/baseshader.c | 1 + dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index ff78a49..35d8d32 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -1119,6 +1119,7 @@ ULONG WINAPI IWineD3DBaseShaderImpl_Release(IWineD3DBaseShader *iface) { TRACE("(%p) : Releasing from %d\n", This, This->baseShader.ref); ref = InterlockedDecrement(&This->baseShader.ref); if (ref == 0) { + HeapFree(GetProcessHeap(), 0, This->baseShader.function); shader_delete_constant_list(&This->baseShader.constantsF); shader_delete_constant_list(&This->baseShader.constantsB); shader_delete_constant_list(&This->baseShader.constantsI); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 62fb834..dbcff48 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1884,7 +1884,7 @@ typedef struct IWineD3DBaseShaderClass SHADER_LIMITS limits; SHADER_PARSE_STATE parse_state; CONST SHADER_OPCODE *shader_ins; - CONST DWORD *function; + DWORD *function; UINT functionLength; GLuint prgId; BOOL is_compiled;

1 0