October 2009 - Wine-commits

Jacek Caban : mshtml: Get rid of update_nsdocument call in SetStatus hack.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 5b5528f299b69c329a2ff5568213bee6cfe9e089 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b5528f299b69c329a2ff5568… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 21 21:29:01 2009 +0200 mshtml: Get rid of update_nsdocument call in SetStatus hack. --- dlls/mshtml/nsembed.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 463c4ee..256c09a 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -958,13 +958,7 @@ static nsresult NSAPI nsWebBrowserChrome_SetStatus(nsIWebBrowserChrome *iface, PRUint32 statusType, const PRUnichar *status) { NSContainer *This = NSWBCHROME_THIS(iface); - TRACE("(%p)->(%d %s)\n", This, statusType, debugstr_w(status)); - - /* FIXME: This hack should be removed when we'll load all pages by URLMoniker */ - if(This->doc) - update_nsdocument(This->doc); - return NS_OK; }

1 0

Jacek Caban : mshtml: Moved HTMLDocumentNode creating to HTMLWindow_Create.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 23891357a34d47f29e4ebb8e9de96221359dc269 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23891357a34d47f29e4ebb8e9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 21 21:29:36 2009 +0200 mshtml: Moved HTMLDocumentNode creating to HTMLWindow_Create. --- dlls/mshtml/htmldoc.c | 6 ++++- dlls/mshtml/htmliframe.c | 17 +------------- dlls/mshtml/htmlwindow.c | 47 +++++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 3 +- dlls/mshtml/navigate.c | 2 +- dlls/mshtml/nsembed.c | 52 ------------------------------------------ dlls/mshtml/nsevents.c | 1 - 7 files changed, 54 insertions(+), 74 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 5e34ced..3e07924 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1998,7 +1998,11 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) return hres; } - update_nsdocument(doc); + if(!doc->basedoc.doc_node && doc->basedoc.window->doc) { + doc->basedoc.doc_node = doc->basedoc.window->doc; + htmldoc_addref(&doc->basedoc.doc_node->basedoc); + } + get_thread_hwnd(); return S_OK; diff --git a/dlls/mshtml/htmliframe.c b/dlls/mshtml/htmliframe.c index 7af0070..dc514d8 100644 --- a/dlls/mshtml/htmliframe.c +++ b/dlls/mshtml/htmliframe.c @@ -353,9 +353,7 @@ static HRESULT WINAPI HTMLIFrameBase2_get_contentWindow(IHTMLFrameBase2 *iface, if(!This->content_window) { nsIDOMHTMLDocument *nshtmldoc; - HTMLDocumentNode *content_doc; nsIDOMDocument *nsdoc; - HTMLWindow *window; nsresult nsres; HRESULT hres; @@ -377,23 +375,10 @@ static HRESULT WINAPI HTMLIFrameBase2_get_contentWindow(IHTMLFrameBase2 *iface, return E_FAIL; } - hres = create_content_window(This, nshtmldoc, &window); - if(FAILED(hres)) { - nsIDOMHTMLDocument_Release(nshtmldoc); - return E_FAIL; - } - - hres = create_doc_from_nsdoc(nshtmldoc, This->element.node.doc->basedoc.doc_obj, window, &content_doc); + hres = create_content_window(This, nshtmldoc, &This->content_window); nsIDOMHTMLDocument_Release(nshtmldoc); - if(SUCCEEDED(hres)) - window_set_docnode(window, content_doc); - else - IHTMLWindow2_Release(HTMLWINDOW2(window)); - htmldoc_release(&content_doc->basedoc); if(FAILED(hres)) return hres; - - This->content_window = window; } IHTMLWindow2_AddRef(HTMLWINDOW2(This->content_window)); diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index fe7444a..91e0e34 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static struct list window_list = LIST_INIT(window_list); -void window_set_docnode(HTMLWindow *window, HTMLDocumentNode *doc_node) +static void window_set_docnode(HTMLWindow *window, HTMLDocumentNode *doc_node) { if(window->doc) { window->doc->basedoc.window = NULL; @@ -45,6 +45,14 @@ void window_set_docnode(HTMLWindow *window, HTMLDocumentNode *doc_node) window->doc = doc_node; if(doc_node) htmldoc_addref(&doc_node->basedoc); + + if(window->doc_obj && window->doc_obj->basedoc.window == window) { + if(window->doc_obj->basedoc.doc_node) + htmldoc_release(&window->doc_obj->basedoc.doc_node->basedoc); + window->doc_obj->basedoc.doc_node = doc_node; + if(doc_node) + htmldoc_addref(&doc_node->basedoc); + } } #define HTMLWINDOW2_THIS(iface) DEFINE_THIS(HTMLWindow, HTMLWindow2, iface) @@ -1516,12 +1524,49 @@ HRESULT HTMLWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, HTML window->scriptmode = SCRIPTMODE_GECKO; list_init(&window->script_hosts); + update_window_doc(window); + list_add_head(&window_list, &window->entry); *ret = window; return S_OK; } +void update_window_doc(HTMLWindow *window) +{ + nsIDOMHTMLDocument *nshtmldoc; + nsIDOMDocument *nsdoc; + nsresult nsres; + + nsres = nsIDOMWindow_GetDocument(window->nswindow, &nsdoc); + if(NS_FAILED(nsres) || !nsdoc) { + ERR("GetDocument failed: %08x\n", nsres); + return; + } + + nsres = nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMHTMLDocument, (void**)&nshtmldoc); + nsIDOMDocument_Release(nsdoc); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMHTMLDocument iface: %08x\n", nsres); + return; + } + + if(!window->doc || window->doc->nsdoc != nshtmldoc) { + HTMLDocumentNode *doc; + HRESULT hres; + + hres = create_doc_from_nsdoc(nshtmldoc, window->doc_obj, window, &doc); + if(SUCCEEDED(hres)) { + window_set_docnode(window, doc); + htmldoc_release(&doc->basedoc); + }else { + ERR("create_doc_from_nsdoc failed: %08x\n", hres); + } + } + + nsIDOMHTMLDocument_Release(nshtmldoc); +} + HTMLWindow *nswindow_to_window(const nsIDOMWindow *nswindow) { HTMLWindow *iter; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 85421d1..8fc9b01 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -572,7 +572,7 @@ HRESULT HTMLLoadOptions_Create(IUnknown*,REFIID,void**); HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument*,HTMLDocumentObj*,HTMLWindow*,HTMLDocumentNode**); HRESULT HTMLWindow_Create(HTMLDocumentObj*,nsIDOMWindow*,HTMLWindow**); -void window_set_docnode(HTMLWindow*,HTMLDocumentNode*); +void update_window_doc(HTMLWindow*); HTMLWindow *nswindow_to_window(const nsIDOMWindow*); HTMLOptionElementFactory *HTMLOptionElementFactory_Create(HTMLWindow*); HTMLImageElementFactory *HTMLImageElementFactory_Create(HTMLWindow*); @@ -647,7 +647,6 @@ void get_editor_controller(NSContainer*); void init_nsevents(NSContainer*); void add_nsevent_listener(HTMLWindow*,LPCWSTR); nsresult get_nsinterface(nsISupports*,REFIID,void**); -void update_nsdocument(HTMLDocumentObj*); void set_document_bscallback(HTMLDocument*,nsChannelBSC*); void set_current_mon(HTMLDocument*,IMoniker*); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 951b04d..33bf1c1 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -952,7 +952,7 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) /* events are reset when a new document URI is loaded, so re-initialise them here */ if(This->bsc.doc && This->bsc.doc->doc_obj->bscallback == This && This->bsc.doc->doc_obj->nscontainer) { - update_nsdocument(This->bsc.doc->doc_obj); + update_window_doc(This->bsc.doc->window); init_nsevents(This->bsc.doc->doc_obj->nscontainer); } } diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 256c09a..f6efd26 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -807,58 +807,6 @@ void set_ns_editmode(NSContainer *This) nsIWebBrowser_SetParentURIContentListener(This->webbrowser, NSURICL(This)); } -void update_nsdocument(HTMLDocumentObj *doc) -{ - HTMLDocumentNode *doc_node; - nsIDOMHTMLDocument *nsdoc; - nsIDOMDocument *nsdomdoc; - nsresult nsres; - HRESULT hres; - - if(!doc->nscontainer || !doc->nscontainer->navigation) - return; - - nsres = nsIWebNavigation_GetDocument(doc->nscontainer->navigation, &nsdomdoc); - if(NS_FAILED(nsres) || !nsdomdoc) { - ERR("GetDocument failed: %08x\n", nsres); - return; - } - - nsres = nsIDOMDocument_QueryInterface(nsdomdoc, &IID_nsIDOMHTMLDocument, (void**)&nsdoc); - nsIDOMDocument_Release(nsdomdoc); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMHTMLDocument iface: %08x\n", nsres); - return; - } - - if(doc->basedoc.doc_node && nsdoc == doc->basedoc.doc_node->nsdoc) { - nsIDOMHTMLDocument_Release(nsdoc); - return; - } - - if(doc->basedoc.doc_node && doc->basedoc.doc_node->nsdoc) { - doc_node = doc->basedoc.doc_node; - doc_node->basedoc.doc_obj = NULL; - IHTMLDocument2_Release(HTMLDOC(&doc_node->basedoc)); - doc->basedoc.doc_node = NULL; - } - - if(!nsdoc) { - doc->basedoc.doc_node = NULL; - window_set_docnode(doc->basedoc.window, NULL); - return; - } - - hres = create_doc_from_nsdoc(nsdoc, doc, doc->basedoc.window, &doc_node); - if(FAILED(hres)) { - ERR("Could not create document: %08x\n", hres); - return; - } - - doc->basedoc.doc_node = doc_node; - window_set_docnode(doc->basedoc.window, doc_node); -} - void close_gecko(void) { TRACE("()\n"); diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 2a0130a..e2758ce 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -137,7 +137,6 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event if(!This->doc) return NS_OK; - update_nsdocument(This->doc); connect_scripts(This->doc->basedoc.window); if(This->editor_controller) {

1 0

Jacek Caban : mshtml: Initialize iframe windows when added to document.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 3263ace6866db867d57e30aec99326eddfb32639 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3263ace6866db867d57e30aec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 21 21:30:20 2009 +0200 mshtml: Initialize iframe windows when added to document. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmliframe.c | 53 +++++++-------------------------------- dlls/mshtml/htmlwindow.c | 55 +++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 6 ++++- dlls/mshtml/mutation.c | 50 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 120 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3263ace6866db867d57e3…

1 0

Jacek Caban : jscript: Fixed a test that depends on time zone.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 0c8794614de23a691ab37fe1ac6e936f24f658a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c8794614de23a691ab37fe1a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 21 22:44:39 2009 +0200 jscript: Fixed a test that depends on time zone. --- dlls/jscript/tests/api.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index cc13f03..da32da4 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1595,7 +1595,7 @@ ok(err.toString === Error.prototype.toString, "err.toString !== Error.prototype. ok(err.message === "", "err.message != ''"); err.message = date; ok(err.message === date, "err.message != date"); -ok(err.toString() === (invokeVersion < 2 ? "[object Error]" : "EvalError: Fri Aug 17 22:50:50 UTC+0200 85"), +ok(err.toString().substring(0,21) === (invokeVersion < 2 ? "[object Error]" : "EvalError: Fri Aug 17"), "err.toString() = " + err.toString()); ok(err.toString !== Object.prototype.toString, "err.toString === Object.prototype.toString"); err = new RangeError();

1 0

Jacek Caban : jscript: Fixed replace string parsing.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 571125455eb97fc6473e9e16b9598f24204e64a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=571125455eb97fc6473e9e16b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 21 22:45:30 2009 +0200 jscript: Fixed replace string parsing. Reported by Dan Kegel. --- dlls/jscript/string.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 2e48d5b..97c807f 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -965,7 +965,7 @@ static HRESULT String_replace(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI } idx = ptr2[1] - '0'; - if(isdigitW(ptr[3]) && idx*10 + (ptr[2]-'0') <= parens_cnt) { + if(isdigitW(ptr2[2]) && idx*10 + (ptr2[2]-'0') <= parens_cnt) { idx = idx*10 + (ptr[2]-'0'); ptr = ptr2+3; }else if(idx && idx <= parens_cnt) {

1 0

Henri Verbeet : wined3d: Fix some GLINFO_LOCATION abuse.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 55047f811ab3c0a9d0c22243e66bcfbbcc18db98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55047f811ab3c0a9d0c22243e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 22 10:09:53 2009 +0200 wined3d: Fix some GLINFO_LOCATION abuse. --- dlls/wined3d/arb_program_shader.c | 12 ++++++------ dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/glsl_shader.c | 14 +++++++------- dlls/wined3d/state.c | 2 +- dlls/wined3d/surface.c | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1141d4c..38d3fd2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -53,7 +53,7 @@ static BOOL need_mova_const(IWineD3DBaseShader *shader, const struct wined3d_gl_ static inline BOOL use_nv_clip(const struct wined3d_gl_info *gl_info) { return GL_SUPPORT(NV_VERTEX_PROGRAM2_OPTION) && - !(GLINFO_LOCATION.quirks & WINED3D_QUIRK_NV_CLIP_BROKEN); + !(gl_info->quirks & WINED3D_QUIRK_NV_CLIP_BROKEN); } static BOOL need_helper_const(const struct wined3d_gl_info *gl_info) @@ -3394,8 +3394,8 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, struct } /* Base Declarations */ - next_local = shader_generate_arb_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, - lconst_map, NULL, &priv_ctx); + next_local = shader_generate_arb_declarations((IWineD3DBaseShader *)This, + reg_maps, buffer, gl_info, lconst_map, NULL, &priv_ctx); for (i = 0, map = reg_maps->bumpmat; map; map >>= 1, ++i) { @@ -3867,8 +3867,8 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, struct shader_addline(buffer, "TEMP TA;\n"); /* Base Declarations */ - next_local = shader_generate_arb_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, - lconst_map, &priv_ctx.vs_clipplanes, &priv_ctx); + next_local = shader_generate_arb_declarations((IWineD3DBaseShader *)This, + reg_maps, buffer, gl_info, lconst_map, &priv_ctx.vs_clipplanes, &priv_ctx); for(i = 0; i < MAX_CONST_I; i++) { @@ -3909,7 +3909,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, struct if(!GL_SUPPORT(NV_VERTEX_PROGRAM)) { shader_addline(buffer, "MOV result.color.secondary, -helper_const.wwwy;\n"); - if ((GLINFO_LOCATION).quirks & WINED3D_QUIRK_SET_TEXCOORD_W && !device->frag_pipe->ffp_proj_control) + if (gl_info->quirks & WINED3D_QUIRK_SET_TEXCOORD_W && !device->frag_pipe->ffp_proj_control) { int i; for(i = 0; i < min(8, MAX_REG_TEXCRD); i++) { diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index aea942c..bba85f6 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -821,7 +821,7 @@ static void set_tex_op_atifs(DWORD state, IWineD3DStateBlockImpl *stateblock, st } memcpy(&new_desc->parent.settings, &settings, sizeof(settings)); - new_desc->shader = gen_ati_shader(settings.op, &GLINFO_LOCATION); + new_desc->shader = gen_ati_shader(settings.op, context->gl_info); add_ffp_frag_shader(&priv->fragment_shaders, &new_desc->parent); TRACE("Allocated fixed function replacement shader descriptor %p\n", new_desc); desc = new_desc; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 396edca..2d0004e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1108,7 +1108,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSwapChain(IWineD3DDevice *iface, object->orig_width = Mode.Width; object->orig_height = Mode.Height; object->orig_fmt = Mode.Format; - format_desc = getFormatDescEntry(Mode.Format, &GLINFO_LOCATION); + format_desc = getFormatDescEntry(Mode.Format, &This->adapter->gl_info); if (pPresentationParameters->Windowed && ((pPresentationParameters->BackBufferWidth == 0) || @@ -2135,7 +2135,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetDisplayMode(IWineD3DDevice *iface, U DEVMODEW devmode; IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; LONG ret; - const struct GlPixelFormatDesc *format_desc = getFormatDescEntry(pMode->Format, &GLINFO_LOCATION); + const struct GlPixelFormatDesc *format_desc = getFormatDescEntry(pMode->Format, &This->adapter->gl_info); RECT clip_rc; TRACE("(%p)->(%d,%p) Mode=%dx%dx@%d, %s\n", This, iSwapChain, pMode, pMode->Width, pMode->Height, pMode->RefreshRate, debug_d3dformat(pMode->Format)); @@ -6285,7 +6285,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetCursorProperties(IWineD3DDevice* i if (SUCCEEDED(IWineD3DSurface_LockRect(pCursorBitmap, &rect, NULL, WINED3DLOCK_READONLY))) { const struct GlPixelFormatDesc *glDesc = - getFormatDescEntry(WINED3DFMT_B8G8R8A8_UNORM, &GLINFO_LOCATION); + getFormatDescEntry(WINED3DFMT_B8G8R8A8_UNORM, &This->adapter->gl_info); char *mem, *bits = rect.pBits; GLint intfmt = glDesc->glInternal; GLint format = glDesc->glFormat; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 37e325d..6a074b1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -862,7 +862,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont */ max_constantsF -= count_bits(This->baseShader.reg_maps.boolean_constants); /* Set by driver quirks in directx.c */ - max_constantsF -= GLINFO_LOCATION.reserved_glsl_constants; + max_constantsF -= gl_info->reserved_glsl_constants; } else { max_constantsF = GL_LIMITS(vs_glsl_constantsF); } @@ -3575,7 +3575,7 @@ static GLhandleARB generate_param_reorder_function(struct wined3d_shader_buffer * Take care about the texcoord .w fixup though if we're using the fixed function fragment pipeline */ device = (IWineD3DDeviceImpl *) vs->baseShader.device; - if (((GLINFO_LOCATION).quirks & WINED3D_QUIRK_SET_TEXCOORD_W) + if ((gl_info->quirks & WINED3D_QUIRK_SET_TEXCOORD_W) && ps_major == 0 && vs_major > 0 && !device->frag_pipe->ffp_proj_control) { shader_addline(buffer, "void order_ps_input() {\n"); @@ -3622,7 +3622,7 @@ static GLhandleARB generate_param_reorder_function(struct wined3d_shader_buffer { if (semantic_idx < 8) { - if (!((GLINFO_LOCATION).quirks & WINED3D_QUIRK_SET_TEXCOORD_W) || ps_major > 0) + if (!(gl_info->quirks & WINED3D_QUIRK_SET_TEXCOORD_W) || ps_major > 0) write_mask |= WINED3DSP_WRITEMASK_3; shader_addline(buffer, "gl_TexCoord[%u]%s = OUT[%u]%s;\n", @@ -3809,7 +3809,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context TRACE("Compiling shader object %u\n", shader_obj); GL_EXTCALL(glShaderSourceARB(shader_obj, 1, (const char**)&buffer->buffer, NULL)); GL_EXTCALL(glCompileShaderARB(shader_obj)); - print_glsl_info_log(&GLINFO_LOCATION, shader_obj); + print_glsl_info_log(gl_info, shader_obj); /* Store the shader object */ return shader_obj; @@ -3878,7 +3878,7 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context TRACE("Compiling shader object %u\n", shader_obj); GL_EXTCALL(glShaderSourceARB(shader_obj, 1, (const char**)&buffer->buffer, NULL)); GL_EXTCALL(glCompileShaderARB(shader_obj)); - print_glsl_info_log(&GLINFO_LOCATION, shader_obj); + print_glsl_info_log(gl_info, shader_obj); return shader_obj; } @@ -4130,7 +4130,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, /* Link the program */ TRACE("Linking GLSL shader program %u\n", programId); GL_EXTCALL(glLinkProgramARB(programId)); - print_glsl_info_log(&GLINFO_LOCATION, programId); + print_glsl_info_log(gl_info, programId); entry->vuniformF_locations = HeapAlloc(GetProcessHeap(), 0, sizeof(GLhandleARB) * GL_LIMITS(vs_glsl_constantsF)); for (i = 0; i < GL_LIMITS(vs_glsl_constantsF); ++i) { @@ -4278,7 +4278,7 @@ static GLhandleARB create_glsl_blt_shader(const struct wined3d_gl_info *gl_info, GL_EXTCALL(glAttachObjectARB(program_id, pshader_id)); GL_EXTCALL(glLinkProgramARB(program_id)); - print_glsl_info_log(&GLINFO_LOCATION, program_id); + print_glsl_info_log(gl_info, program_id); /* Once linked we can mark the shaders for deletion. They will be deleted once the program * is destroyed diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 194cb9e..822c269 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4322,7 +4322,7 @@ static void loadVertexData(const struct wined3d_context *context, IWineD3DStateB curVBO = e->buffer_object; } - if(format != 4 || (GLINFO_LOCATION.quirks & WINED3D_QUIRK_ALLOWS_SPECULAR_ALPHA)) + if (format != 4 || (context->gl_info->quirks & WINED3D_QUIRK_ALLOWS_SPECULAR_ALPHA)) { /* Usually specular colors only allow 3 components, since they have no alpha. In D3D, the specular alpha * contains the fog coordinate, which is passed to GL with GL_EXT_fog_coord. However, the fixed function diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9d69c96..c0e0e10 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -126,7 +126,7 @@ HRESULT surface_init(IWineD3DSurfaceImpl *surface, WINED3DSURFTYPE surface_type, WINED3DPOOL pool, IUnknown *parent, const struct wined3d_parent_ops *parent_ops) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - const struct GlPixelFormatDesc *format_desc = getFormatDescEntry(format, &GLINFO_LOCATION); + const struct GlPixelFormatDesc *format_desc = getFormatDescEntry(format, gl_info); void (*cleanup)(IWineD3DSurfaceImpl *This); unsigned int resource_size; HRESULT hr;

1 0

Hans Leidekker : winhttp: Fix two memory leaks.
by Alexandre Julliard 21 Oct '09

21 Oct '09

Module: wine Branch: master Commit: ec0a0b372ef7e30b2a52ec09754c7d238ae90de7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec0a0b372ef7e30b2a52ec097… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 21 13:19:42 2009 +0200 winhttp: Fix two memory leaks. Found by valgrind. --- dlls/winhttp/cookie.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/winhttp/cookie.c b/dlls/winhttp/cookie.c index 6c0f8b4..af881ea 100644 --- a/dlls/winhttp/cookie.c +++ b/dlls/winhttp/cookie.c @@ -39,7 +39,7 @@ static domain_t *add_domain( session_t *session, WCHAR *name ) list_init( &domain->entry ); list_init( &domain->cookies ); - domain->name = name; + domain->name = strdupW( name ); list_add_tail( &session->cookie_cache, &domain->entry ); TRACE("%s\n", debugstr_w(domain->name)); @@ -120,7 +120,7 @@ static BOOL add_cookie( session_t *session, cookie_t *cookie, WCHAR *domain_name } else if ((old_cookie = find_cookie( domain, path, cookie->name ))) delete_cookie( old_cookie ); - cookie->path = path; + cookie->path = strdupW( path ); list_add_tail( &domain->cookies, &cookie->entry ); TRACE("domain %s path %s <- %s=%s\n", debugstr_w(domain_name), debugstr_w(cookie->path), @@ -230,12 +230,9 @@ BOOL set_cookies( request_t *request, const WCHAR *cookies ) ret = add_cookie( session, cookie, cookie_domain, cookie_path ); end: - if (!ret) - { - free_cookie( cookie ); - heap_free( cookie_domain ); - heap_free( cookie_path ); - } + if (!ret) free_cookie( cookie ); + heap_free( cookie_domain ); + heap_free( cookie_path ); heap_free( buffer ); return ret; }

1 0

Hans Leidekker : msi: Avoid accessing uninitialized memory.
by Alexandre Julliard 21 Oct '09

21 Oct '09

Module: wine Branch: master Commit: a15e6cbb1afcc3a7094720572456caa6dbc80714 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a15e6cbb1afcc3a7094720572… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 21 13:20:04 2009 +0200 msi: Avoid accessing uninitialized memory. Found by valgrind. --- dlls/msi/action.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index b9b8199..a6af7cc 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5037,7 +5037,7 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) goto done; } - size = (lstrlenW(value) + 1 + size) * sizeof(WCHAR); + size += (lstrlenW(value) + 1) * sizeof(WCHAR); newval = msi_alloc(size); ptr = newval; if (!newval)

1 0

Dan Kegel : kernel32: Fix two little leaks in heap test.
by Alexandre Julliard 21 Oct '09

21 Oct '09

Module: wine Branch: master Commit: 4696a53679cdaabd858f51d214c6fbd024e5d975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4696a53679cdaabd858f51d21… Author: Dan Kegel <dank(a)kegel.com> Date: Wed Oct 21 05:57:26 2009 -0700 kernel32: Fix two little leaks in heap test. Found by valgrind. --- dlls/kernel32/tests/heap.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index c59d304..56f9744 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -72,6 +72,7 @@ static void test_heap(void) /* Heap*() functions */ mem = HeapAlloc(GetProcessHeap(), 0, 0); ok(mem != NULL, "memory not allocated for size 0\n"); + HeapFree(GetProcessHeap(), 0, mem); mem = HeapReAlloc(GetProcessHeap(), 0, NULL, 10); ok(mem == NULL, "memory allocated by HeapReAlloc\n"); @@ -249,6 +250,8 @@ static void test_heap(void) "Expected ERROR_INVALID_HANDLE or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); } + GlobalFree(gbl); + /* ####################################### */ /* Local*() functions */ gbl = LocalAlloc(LMEM_MOVEABLE, 0);

1 0

Alexandre Julliard : kernel32: Return the appropriate binary type for 64-bit PE files.
by Alexandre Julliard 21 Oct '09

21 Oct '09

Module: wine Branch: master Commit: 11b0b0658d888a7fadc79a5102b7798e6c1953f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11b0b0658d888a7fadc79a510… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 21 18:02:30 2009 +0200 kernel32: Return the appropriate binary type for 64-bit PE files. --- dlls/kernel32/module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 05d5add..8b5231b 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -443,7 +443,7 @@ BOOL WINAPI GetBinaryTypeW( LPCWSTR lpApplicationName, LPDWORD lpBinaryType ) break; } case BINARY_PE: - *lpBinaryType = SCS_32BIT_BINARY; + *lpBinaryType = (binary_type & BINARY_FLAG_64BIT) ? SCS_64BIT_BINARY : SCS_32BIT_BINARY; ret = TRUE; break; case BINARY_WIN16:

1 0