May 2013 - Wine-commits - list.winehq.org

Alexandre Julliard : wininet: Don't bother to free memory at process exit.
by Alexandre Julliard 15 May '13

15 May '13

Module: wine Branch: master Commit: a9175e6a6541bd952512af4a6612d8e50c8cb4d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9175e6a6541bd952512af4a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 10:32:40 2013 +0200 wininet: Don't bother to free memory at process exit. --- dlls/wininet/internet.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 856eb73..a54a3df 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -313,6 +313,7 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) break; case DLL_PROCESS_DETACH: + if (lpvReserved) break; collect_connections(COLLECT_CLEANUP); NETCON_unload(); free_urlcache();

1 0

Alexandre Julliard : ws2_32: Don't bother to free memory at process exit.
by Alexandre Julliard 15 May '13

15 May '13

Module: wine Branch: master Commit: f38cbfc99d0e3c1962db6c8850158e1a4d66df6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f38cbfc99d0e3c1962db6c885… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 10:34:26 2013 +0200 ws2_32: Don't bother to free memory at process exit. --- dlls/ws2_32/socket.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a6a1b4c..80b317a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -897,9 +897,9 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad) case DLL_PROCESS_ATTACH: break; case DLL_PROCESS_DETACH: + if (fImpLoad) break; free_per_thread_data(); DeleteCriticalSection(&csWSgetXXXbyYYY); - num_startup = 0; break; case DLL_THREAD_DETACH: free_per_thread_data();

1 0

Alexandre Julliard : wshom.ocx: Don't bother to free memory at process exit .
by Alexandre Julliard 15 May '13

15 May '13

Module: wine Branch: master Commit: 0ef01edfd02ce608ed0b52417a815ca5b9b88ab3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ef01edfd02ce608ed0b52417… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 10:34:57 2013 +0200 wshom.ocx: Don't bother to free memory at process exit. --- dlls/wshom.ocx/wshom_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wshom.ocx/wshom_main.c b/dlls/wshom.ocx/wshom_main.c index c253b61..0f40a0a 100644 --- a/dlls/wshom.ocx/wshom_main.c +++ b/dlls/wshom.ocx/wshom_main.c @@ -161,6 +161,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) DisableThreadLibraryCalls(wshom_instance); break; case DLL_PROCESS_DETACH: + if (lpv) break; release_typelib(); break; }

1 0

Alexandre Julliard : msisys.ocx: Remove ununsed DllMain function.
by Alexandre Julliard 15 May '13

15 May '13

Module: wine Branch: master Commit: cd556855ca82a36fffe9a72d123a14794e9f4fb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd556855ca82a36fffe9a72d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 10:35:19 2013 +0200 msisys.ocx: Remove ununsed DllMain function. --- dlls/msisys.ocx/msisys.c | 44 -------------------------------------------- 1 files changed, 0 insertions(+), 44 deletions(-) diff --git a/dlls/msisys.ocx/msisys.c b/dlls/msisys.ocx/msisys.c index 056699e..e4b0df0 100644 --- a/dlls/msisys.ocx/msisys.c +++ b/dlls/msisys.ocx/msisys.c @@ -35,50 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msisys); /*********************************************************************** - * MSISYS_InitProcess (internal) - */ -static BOOL MSISYS_InitProcess( void ) -{ - TRACE("()\n"); - - return TRUE; -} - -/*********************************************************************** - * MSISYS_UninitProcess (internal) - */ -static void MSISYS_UninitProcess( void ) -{ - TRACE("()\n"); -} - -/*********************************************************************** - * DllMain for MSISYS - */ -BOOL WINAPI DllMain( - HINSTANCE hInstDLL, - DWORD fdwReason, - LPVOID lpvReserved ) -{ - TRACE("(%p,%d,%p)\n",hInstDLL,fdwReason,lpvReserved); - - switch ( fdwReason ) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); - if ( !MSISYS_InitProcess() ) - return FALSE; - break; - case DLL_PROCESS_DETACH: - MSISYS_UninitProcess(); - break; - } - - return TRUE; -} - - -/*********************************************************************** * DllCanUnloadNow (MSISYS.@) * * RETURNS

1 0

Nikolay Sivov : msxml3: Fix ignorable whitespace detection in case of formatting text nodes.
by Alexandre Julliard 15 May '13

15 May '13

Module: wine Branch: master Commit: e5261f03e6bf85b895e875c854b494d146291456 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5261f03e6bf85b895e875c85… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 15 00:18:07 2013 +0400 msxml3: Fix ignorable whitespace detection in case of formatting text nodes. --- dlls/msxml3/domdoc.c | 12 +++++++++--- dlls/msxml3/tests/domdoc.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index e98fa72..4c7237a 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -416,20 +416,26 @@ static void sax_characters(void *ctx, const xmlChar *ch, int len) if (ctxt->node) { + xmlChar cur = *(ctxt->input->cur); + /* Characters are reported with multiple calls, for example each charref is reported with a separate call and then parser appends it to a single text node or creates a new node if not created. It's not possible to tell if it's ignorable data or not just looking at data itself cause it could be - a space chars that separate charrefs or similar case. We only need to skip leading and trailing spaces, + space chars that separate charrefs or similar case. We only need to skip leading and trailing spaces, or whole node if it has nothing but space chars, so to detect leading space node->last is checked that contains text node pointer if already created, trailing spaces are detected directly looking at parser input - for next '<' opening bracket - similar logic is used by libxml2 itself. + for next '<' opening bracket - similar logic is used by libxml2 itself. Basically 'cur' == '<' means the last + chunk of char data, in case it's not the last chunk we check for previously added node type and if it's not + a text node it's safe to ignore. Note that during domdoc_loadXML() the xmlDocPtr->_private data is not available. */ + if (!This->properties->preserving && !is_preserving_whitespace(ctxt->node) && strn_isspace(ch, len) && (!ctxt->node->last || - ((ctxt->node->last && (*ctxt->input->cur) == '<')))) + ((ctxt->node->last && (cur == '<' || ctxt->node->last->type != XML_TEXT_NODE)) + ))) return; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index cc79d4b..20b9609 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -385,6 +385,15 @@ static const WCHAR szComplete6[] = { '<','o','p','e','n','>','<','/','o','p','e','n','>','\n',0 }; +static const char complete7[] = { + "<?xml version=\"1.0\"?>\n\t" + "<root>\n" + "\t<a/>\n" + "\t<b/>\n" + "\t<c/>\n" + "</root>" +}; + #define DECL_WIN_1252 \ "<?xml version=\"1.0\" encoding=\"Windows-1252\"?>" @@ -4212,7 +4221,11 @@ static void test_preserve_charref(IXMLDOMDocument2 *doc, VARIANT_BOOL preserve) static void test_whitespace(void) { IXMLDOMDocument2 *doc1, *doc2, *doc3, *doc4; + IXMLDOMNodeList *list; + IXMLDOMElement *root; VARIANT_BOOL b; + HRESULT hr; + LONG len; doc1 = create_document(&IID_IXMLDOMDocument2); doc2 = create_document(&IID_IXMLDOMDocument2); @@ -4286,6 +4299,26 @@ static void test_whitespace(void) /* text with char references */ test_preserve_charref(doc1, VARIANT_TRUE); test_preserve_charref(doc1, VARIANT_FALSE); + + /* formatting whitespaces */ + hr = IXMLDOMDocument2_put_preserveWhiteSpace(doc1, VARIANT_FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument2_loadXML(doc1, _bstr_(complete7), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(b == VARIANT_TRUE, "for %x\n", b); + + hr = IXMLDOMDocument2_get_documentElement(doc1, &root); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMElement_get_childNodes(root, &list); + ok(hr == S_OK, "got 0x%08x\n", hr); + len = 0; + hr = IXMLDOMNodeList_get_length(list, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == 3, "got %d\n", len); + IXMLDOMNodeList_Release(list); + IXMLDOMElement_Release(root); + IXMLDOMDocument2_Release(doc1); free_bstrs();

1 0

Alistair Leslie-Hughes : oledb32: Implement DataConvert DBTYPE_BYTES-> VARIANT.
by Alexandre Julliard 15 May '13

15 May '13

Module: wine Branch: master Commit: cb4cef123173a894363003e28c44ac2996cbaa47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb4cef123173a894363003e28… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue May 14 13:47:18 2013 +1000 oledb32: Implement DataConvert DBTYPE_BYTES->VARIANT. --- dlls/oledb32/convert.c | 26 ++++++++++++++++++++++++++ dlls/oledb32/tests/convert.c | 9 +++++++++ 2 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 1f50202..904f3cc 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -790,6 +790,32 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, V_CY(v) = *(CY*)src; hr = S_OK; break; + case DBTYPE_BYTES: + { + LONG i; + LONG size; + SAFEARRAY *psa = NULL; + SAFEARRAYBOUND rgsabound[1]; + unsigned char *p = src; + + size = min(src_len, dst_max_len); + + rgsabound[0].lLbound = 0; + rgsabound[0].cElements = size; + + psa = SafeArrayCreate(VT_UI1,1,rgsabound); + for(i =0; i < size; i++,p++) + { + hr = SafeArrayPutElement(psa, &i, &p); + if(FAILED(hr)) + return hr; + } + + V_VT(v) = VT_ARRAY|VT_UI1; + V_ARRAY(v) = psa; + hr = S_OK; + break; + } default: FIXME("Unimplemented conversion %04x -> VARIANT\n", src_type); return E_NOTIMPL; } break; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index b4331b1..dfd0df1 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2450,6 +2450,7 @@ static void test_converttobytes(void) static void test_converttovar(void) { static WCHAR strW[] = {'t','e','s','t',0}; + BYTE byte_src[5] = {1, 2, 3, 4, 5}; double dvalue = 123.56; DBSTATUS dst_status; DBLENGTH dst_len; @@ -2548,6 +2549,14 @@ static void test_converttovar(void) cy2 = V_CY(&dst); ok(S(cy2).Lo == S(cy).Lo && S(cy2).Hi == S(cy).Hi, "got %d,%d\n", S(cy2).Lo, S(cy2).Hi); + + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_VARIANT, 0, &dst_len, &byte_src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(V_VT(&dst) == (VT_ARRAY|VT_UI1), "got %d\n", V_VT(&dst)); + VariantClear(&dst); } START_TEST(convert)

1 0

Stefan Dösinger : wined3d: Don' t log the device pointer in shader_arb_select.
by Alexandre Julliard 15 May '13

15 May '13

Module: wine Branch: master Commit: b12ec91c098434d4141b5752d5e0c2f167e59b41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b12ec91c098434d4141b5752d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 14 23:46:00 2013 +0200 wined3d: Don't log the device pointer in shader_arb_select. --- dlls/wined3d/arb_program_shader.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ccd8ee3..6a901e3 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4604,7 +4604,6 @@ static void find_arb_vs_compile_args(const struct wined3d_state *state, static void shader_arb_select(void *shader_priv, const struct wined3d_context *context, const struct wined3d_state *state) { - struct wined3d_device *device = context->swapchain->device; struct shader_arb_priv *priv = shader_priv; const struct wined3d_gl_info *gl_info = context->gl_info; int i; @@ -4633,8 +4632,7 @@ static void shader_arb_select(void *shader_priv, const struct wined3d_context *c 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); + TRACE("Bound fragment program %u and enabled GL_FRAGMENT_PROGRAM_ARB\n", priv->current_fprogram_id); /* Pixel Shader 1.x constants are clamped to [-1;1], Pixel Shader 2.0 constants are not. If switching between * a 1.x and newer shader, reload the first 8 constants @@ -4706,7 +4704,7 @@ static void shader_arb_select(void *shader_priv, const struct wined3d_context *c /* Enable OpenGL vertex programs */ gl_info->gl_ops.gl.p_glEnable(GL_VERTEX_PROGRAM_ARB); checkGLcall("glEnable(GL_VERTEX_PROGRAM_ARB);"); - TRACE("(%p) : Bound vertex program %u and enabled GL_VERTEX_PROGRAM_ARB\n", device, priv->current_vprogram_id); + TRACE("Bound vertex program %u and enabled GL_VERTEX_PROGRAM_ARB\n", priv->current_vprogram_id); shader_arb_vs_local_constants(compiled, context, state); if(priv->last_vs_color_unclamp != compiled->need_color_unclamp) {

1 0

Stefan Dösinger : wined3d: Initialize the gl_info pointer from the context.
by Alexandre Julliard 15 May '13

15 May '13

Module: wine Branch: master Commit: 121bd9d20108178fb14d1f335c95eb6ddb917edf URL: http://source.winehq.org/git/wine.git/?a=commit;h=121bd9d20108178fb14d1f335… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 14 23:46:01 2013 +0200 wined3d: Initialize the gl_info pointer from the context. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6a901e3..405a123 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7042,7 +7042,7 @@ static void upload_palette(const struct wined3d_surface *surface, struct wined3d { BYTE table[256][4]; struct wined3d_device *device = surface->resource.device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_gl_info *gl_info = context->gl_info; struct arbfp_blit_priv *priv = device->blit_priv; BOOL colorkey = (surface->CKeyFlags & WINEDDSD_CKSRCBLT) != 0;

1 0

Stefan Dösinger : wined3d: Don' t pass the device to atifs_free_ffpshader.
by Alexandre Julliard 15 May '13

15 May '13

Module: wine Branch: master Commit: 6621b11ad1e92660c3ca757d951b6b7497463084 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6621b11ad1e92660c3ca757d9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 14 23:46:02 2013 +0200 wined3d: Don't pass the device to atifs_free_ffpshader. --- dlls/wined3d/ati_fragment_shader.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index d219111..980f657 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1167,10 +1167,9 @@ static void *atifs_alloc(const struct wined3d_shader_backend_ops *shader_backend } /* Context activation is done by the caller. */ -static void atifs_free_ffpshader(struct wine_rb_entry *entry, void *context) +static void atifs_free_ffpshader(struct wine_rb_entry *entry, void *cb_ctx) { - struct wined3d_device *device = context; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_gl_info *gl_info = cb_ctx; struct atifs_ffp_desc *entry_ati = WINE_RB_ENTRY_VALUE(entry, struct atifs_ffp_desc, parent.entry); GL_EXTCALL(glDeleteFragmentShaderATI(entry_ati->shader)); @@ -1183,7 +1182,7 @@ static void atifs_free(struct wined3d_device *device) { struct atifs_private_data *priv = device->fragment_priv; - wine_rb_destroy(&priv->fragment_shaders, atifs_free_ffpshader, device); + wine_rb_destroy(&priv->fragment_shaders, atifs_free_ffpshader, &device->adapter->gl_info); HeapFree(GetProcessHeap(), 0, priv); device->fragment_priv = NULL;

1 0

Jacek Caban : ieframe: Keep reference to ShellObject while calling DocumentComplete event.
by Alexandre Julliard 15 May '13

15 May '13

Module: wine Branch: master Commit: 3a1ce6a864acfe3e0143b1c1bea663be15d6ddeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a1ce6a864acfe3e0143b1c1b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 15 12:52:41 2013 +0200 ieframe: Keep reference to ShellObject while calling DocumentComplete event. --- dlls/ieframe/shellbrowser.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index 944c7bc..55763db 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -824,12 +824,18 @@ static HRESULT WINAPI DocObjectService_FireDocumentComplete( V_VT(&url_var) = VT_BSTR; V_BSTR(&url_var) = url; + /* Keep reference to This. It may be released in event handler. */ + IShellBrowser_AddRef(&This->IShellBrowser_iface); + TRACE(">>>\n"); call_sink(This->doc_host->cps.wbe2, DISPID_DOCUMENTCOMPLETE, &dp); TRACE("<<<\n"); SysFreeString(url); - This->doc_host->busy = VARIANT_FALSE; + if(This->doc_host) + This->doc_host->busy = VARIANT_FALSE; + + IShellBrowser_Release(&This->IShellBrowser_iface); return S_OK; }

1 0