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

Jacek Caban : vbscript: Round half to even in to_int.
by Alexandre Julliard May 16, 2013

May 16, 2013

Module: wine Branch: master Commit: 48a862306288d69d3623d5ecdc0f5a5a40addafe URL: http://source.winehq.org/git/wine.git/?a=commit;h=48a862306288d69d3623d5ecd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 16 11:26:17 2013 +0200 vbscript: Round half to even in to_int. Spotted by Zhan Jianyu. --- dlls/vbscript/global.c | 12 ++++++++++-- dlls/vbscript/tests/api.vbs | 9 +++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 4a5a277..392b88f 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -150,12 +150,20 @@ static HRESULT to_int(VARIANT *v, int *ret) *ret = V_I4(v); break; case VT_R8: { - double n = round(V_R8(v)); + double n = floor(V_R8(v)+0.5); + INT32 i; + if(!is_int32(n)) { FIXME("%lf is out of int range\n", n); return E_FAIL; } - *ret = n; + + /* Round half to even */ + i = n; + if(i%2 && n-V_R8(v) == 0.5) + i--; + + *ret = i; break; } case VT_BOOL: diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 0aaeefb..b6d8cd5 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -134,6 +134,8 @@ Call ok(getVT(Chr(120)) = "VT_BSTR", "getVT(Chr(120)) = " & getVT(Chr(120))) Call ok(getVT(Chr(255)) = "VT_BSTR", "getVT(Chr(255)) = " & getVT(Chr(255))) Call ok(Chr(120) = "x", "Chr(120) = " & Chr(120)) Call ok(Chr(0) <> "", "Chr(0) = """"") +Call ok(Chr(120.5) = "x", "Chr(120.5) = " & Chr(120.5)) +Call ok(Chr(119.5) = "x", "Chr(119.5) = " & Chr(119.5)) Call ok(isObject(new EmptyClass), "isObject(new EmptyClass) is not true?") Set x = new EmptyClass @@ -292,6 +294,9 @@ Call ok(Space(5) = " ", "Space(5) = " & Space(5) & """") Call ok(Space(5.2) = " ", "Space(5.2) = " & Space(5.2) & """") Call ok(Space(5.8) = " ", "Space(5.8) = " & Space(5.8) & """") Call ok(Space(5.5) = " ", "Space(5.5) = " & Space(5.5) & """") +Call ok(Space(4.5) = " ", "Space(4.5) = " & Space(4.5) & """") +Call ok(Space(0.5) = "", "Space(0.5) = " & Space(0.5) & """") +Call ok(Space(1.5) = " ", "Space(1.5) = " & Space(1.5) & """") Sub TestStrReverse(str, ex) Call ok(StrReverse(str) = ex, "StrReverse(" & str & ") = " & StrReverse(str)) @@ -310,6 +315,8 @@ TestLeft "test", 2, "te" TestLeft "test", 5, "test" TestLeft "test", 0, "" TestLeft 123, 2, "12" +TestLeft "123456", 1.5, "12" +TestLeft "123456", 2.5, "12" if isEnglishLang then TestLeft true, 2, "Tr" Sub TestRight(str, len, ex) @@ -383,6 +390,8 @@ if isEnglishLang then Call ok(WeekDayName(1, 10) = "Sun", "WeekDayName(1, 10) = " & WeekDayName(1, 10)) Call ok(WeekDayName(1, true, 0) = "Sun", "WeekDayName(1, true, 0) = " & WeekDayName(1, true, 0)) Call ok(WeekDayName(1, true, 2) = "Mon", "WeekDayName(1, true, 2) = " & WeekDayName(1, true, 2)) + Call ok(WeekDayName(1, true, 2.5) = "Mon", "WeekDayName(1, true, 2.5) = " & WeekDayName(1, true, 2.5)) + Call ok(WeekDayName(1, true, 1.5) = "Mon", "WeekDayName(1, true, 1.5) = " & WeekDayName(1, true, 1.5)) Call ok(WeekDayName(1, true, 7) = "Sat", "WeekDayName(1, true, 7) = " & WeekDayName(1, true, 7)) Call ok(WeekDayName(1, true, 7.1) = "Sat", "WeekDayName(1, true, 7.1) = " & WeekDayName(1, true, 7.1))

1 0

Alexandre Julliard : mlang: Don' t bother to free thread local storage at process exit.
by Alexandre Julliard May 16, 2013

May 16, 2013

Module: wine Branch: master Commit: ed8a38d4001f9cad04194bcc31e0bfd51e8d12f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed8a38d4001f9cad04194bcc3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 12:51:26 2013 +0200 mlang: Don't bother to free thread local storage at process exit. --- dlls/mlang/mlang.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 6ebe627..d28f811 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -888,6 +888,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) DisableThreadLibraryCalls(hInstDLL); break; case DLL_PROCESS_DETACH: + if (lpv) break; TlsFree(MLANG_tls_index); break; }

1 0

Alexandre Julliard : dsound: Don' t bother to delete critical sections at process exit.
by Alexandre Julliard May 16, 2013

May 16, 2013

Module: wine Branch: master Commit: 5c8ffb795a476f4a7209c492c6e3f6bd6618944a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c8ffb795a476f4a7209c492c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 12:53:33 2013 +0200 dsound: Don't bother to delete critical sections at process exit. --- dlls/dsound/dsound_main.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 3c47423..7a16366 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -796,20 +796,16 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { case DLL_PROCESS_ATTACH: - TRACE("DLL_PROCESS_ATTACH\n"); instance = hInstDLL; DisableThreadLibraryCalls(hInstDLL); /* Increase refcount on dsound by 1 */ GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCWSTR)hInstDLL, &hInstDLL); break; case DLL_PROCESS_DETACH: - TRACE("DLL_PROCESS_DETACH\n"); + if (lpvReserved) break; DeleteCriticalSection(&DSOUND_renderers_lock); DeleteCriticalSection(&DSOUND_capturers_lock); break; - default: - TRACE("UNKNOWN REASON\n"); - break; } return TRUE; }

1 0

Hans Leidekker : wbemprox: Add support for asynchronous queries.
by Alexandre Julliard May 16, 2013

May 16, 2013

Module: wine Branch: master Commit: 46cbc36041278dc19c9ea14223325987e629c4c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46cbc36041278dc19c9ea1422… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 16 12:04:03 2013 +0200 wbemprox: Add support for asynchronous queries. --- dlls/wbemprox/services.c | 216 +++++++++++++++++++++++++++++++++++++++++-- dlls/wbemprox/tests/query.c | 36 +++++++- include/wbemcli.idl | 7 ++ 3 files changed, 248 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=46cbc36041278dc19c9ea…

1 0

Jacek Caban : mshtml: Keep reference to document node in onload event handler.
by Alexandre Julliard May 15, 2013

May 15, 2013

Module: wine Branch: master Commit: 503032749b0b9091dfbde69385888bc39d733672 URL: http://source.winehq.org/git/wine.git/?a=commit;h=503032749b0b9091dfbde6938… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 15 12:52:52 2013 +0200 mshtml: Keep reference to document node in onload event handler. --- dlls/mshtml/nsevents.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 297ef8c..fc6504b 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -235,6 +235,7 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event HTMLDocumentNode *doc = This->This->doc; nsIDOMHTMLElement *nsbody = NULL; HTMLDocumentObj *doc_obj = NULL; + nsresult nsres = NS_OK; TRACE("(%p)\n", doc); @@ -245,6 +246,8 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event connect_scripts(doc->window); + htmldoc_addref(&doc->basedoc); + if(doc_obj) handle_docobj_load(doc_obj); @@ -264,18 +267,19 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event IDocObjectService_FireDocumentComplete(doc_obj->doc_object_service, &doc->basedoc.window->base.IHTMLWindow2_iface, 0); - if(!doc->nsdoc) { + if(doc->nsdoc) { + nsIDOMHTMLDocument_GetBody(doc->nsdoc, &nsbody); + if(nsbody) { + fire_event(doc, EVENTID_LOAD, TRUE, (nsIDOMNode*)nsbody, event, (IDispatch*)&doc->window->base.IDispatchEx_iface); + nsIDOMHTMLElement_Release(nsbody); + } + }else { ERR("NULL nsdoc\n"); - return NS_ERROR_FAILURE; + nsres = NS_ERROR_FAILURE; } - nsIDOMHTMLDocument_GetBody(doc->nsdoc, &nsbody); - if(nsbody) { - fire_event(doc, EVENTID_LOAD, TRUE, (nsIDOMNode*)nsbody, event, (IDispatch*)&doc->window->base.IDispatchEx_iface); - nsIDOMHTMLElement_Release(nsbody); - } - - return NS_OK; + htmldoc_release(&doc->basedoc); + return nsres; } static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent *event)

1 0

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

May 15, 2013

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

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

May 15, 2013

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

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

May 15, 2013

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 : msisys.ocx: Remove ununsed DllMain function.
by Alexandre Julliard May 15, 2013

May 15, 2013

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

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

May 15, 2013

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