February 2010 - Wine-commits

André Hentschel : oleaut32: Fix rounding.
by Alexandre Julliard 22 Feb '10

22 Feb '10

Module: wine Branch: master Commit: 77acdcc016cd8954b07bbed1dca337323d368097 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77acdcc016cd8954b07bbed1d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Feb 21 19:46:38 2010 +0100 oleaut32: Fix rounding. --- dlls/oleaut32/tests/varformat.c | 10 ++++++++-- dlls/oleaut32/varformat.c | 11 ++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index 9d15fd9..d0975ed 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -381,8 +381,14 @@ static void test_VarFormat(void) VARFMT(VT_R8,V_R8,-0.1,".#",S_OK,"-.1"); VARFMT(VT_R8,V_R8,0.099,"#.#",S_OK,".1"); VARFMT(VT_R8,V_R8,0.0999,"#.##",S_OK,".1"); - /* for large negative exponents, wine truncates instead of rounding */ - todo_wine VARFMT(VT_R8,V_R8,0.099,"#.##",S_OK,".1"); + VARFMT(VT_R8,V_R8,0.099,"#.##",S_OK,".1"); + VARFMT(VT_R8,V_R8,0.0099,"#.##",S_OK,".01"); + VARFMT(VT_R8,V_R8,0.0049,"#.##",S_OK,"."); + VARFMT(VT_R8,V_R8,0.0094,"#.##",S_OK,".01"); + VARFMT(VT_R8,V_R8,0.00099,"#.##",S_OK,"."); + VARFMT(VT_R8,V_R8,0.0995,"#.##",S_OK,".1"); + VARFMT(VT_R8,V_R8,8.0995,"#.##",S_OK,"8.1"); + VARFMT(VT_R8,V_R8,0.0994,"#.##",S_OK,".1"); /* 'out' is not cleared */ diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index f6c142d..370b4f0 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -1285,12 +1285,21 @@ static HRESULT VARIANT_FormatNumber(LPVARIANT pVarIn, LPOLESTR lpszFormat, have_frac = -pad; pad = 0; } + if(exponent < 0 && exponent > (-256 + have_int + have_frac)) + { + /* Remove exponent notation */ + memmove(rgbDig - exponent, rgbDig, have_int + have_frac); + ZeroMemory(rgbDig, -exponent); + have_frac -= exponent; + exponent = 0; + } } /* Rounding the number */ if (have_frac > need_frac) { - prgbDig = &rgbDig[have_int + need_frac]; + prgbDig = &rgbDig[have_int + need_frac ? need_frac + 1 : 0]; + if (*prgbDig < 5) prgbDig--; have_frac = need_frac; if (*prgbDig >= 5) {

1 0

Alexandre Julliard : configure: Define AS_VAR_APPEND if necessary for older autoconf versions.
by Alexandre Julliard 22 Feb '10

22 Feb '10

Module: wine Branch: master Commit: bc82a78635e924c8cd49bf5eff39b2e143036dc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc82a78635e924c8cd49bf5ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 20 10:59:04 2010 +0100 configure: Define AS_VAR_APPEND if necessary for older autoconf versions. --- configure.ac | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index ba54bcd..d5649f3 100644 --- a/configure.ac +++ b/configure.ac @@ -11,6 +11,10 @@ AC_CONFIG_SRCDIR(server/atom.c) AC_CONFIG_HEADERS(include/config.h) AC_CONFIG_AUX_DIR(tools) +dnl autoconf versions before 2.63b don't have AS_VAR_APPEND +m4_ifdef([AS_VAR_APPEND],,[as_fn_append () { eval $[1]=\$$[1]\$[2]; } +AC_DEFUN([AS_VAR_APPEND],[as_fn_append $1 $2])])dnl + dnl **** Command-line arguments **** AC_ARG_ENABLE(win16, AS_HELP_STRING([--disable-win16],[do not include Win16 support]))

1 0

Alexandre Julliard : makefiles: Make sure that dependencies are always updated when regenerating makefiles .
by Alexandre Julliard 22 Feb '10

22 Feb '10

Module: wine Branch: master Commit: d59227e5803c24c644d87d6f7b6c6a7eda2f2a32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d59227e5803c24c644d87d6f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 20 12:36:04 2010 +0100 makefiles: Make sure that dependencies are always updated when regenerating makefiles. --- Makefile.in | 9 +- aclocal.m4 | 6 +- configure | 2691 +++++++++++++++++++++++++++++++++++------------------------ 3 files changed, 1622 insertions(+), 1084 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d59227e5803c24c644d87…

1 0

Alexandre Julliard : makefiles: Use the standard C_SRCS variable as the list of test files.
by Alexandre Julliard 22 Feb '10

22 Feb '10

1 0

Alexandre Julliard : Wine release 1.1.39
by Alexandre Julliard 19 Feb '10

19 Feb '10

Module: website Branch: master Commit: 68c2332e284312b08e088dc64a53cc62c24fdf89 URL: http://source.winehq.org/git/website.git/?a=commit;h=68c2332e284312b08e088d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 19 19:32:25 2010 +0100 Wine release 1.1.39 --- news/en/2010021901.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2010021901.xml b/news/en/2010021901.xml new file mode 100644 index 0000000..168c7c2 --- /dev/null +++ b/news/en/2010021901.xml @@ -0,0 +1,17 @@ +<news> +<date>February 19, 2010</date> +<title>Wine 1.1.39 Released</title> +<body> + The Wine development release 1.1.39 is now available. + <a href="{$root}/announce/1.1.39">What's new</a> in this release: +<ul> + <li>Support for registry symbolic links.</li> + <li>Many MSI fixes.</li> + <li>Build process improvements.</li> + <li>MSXML cleanups and fixes.</li> + <li>A number of MSHTML improvements.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.39.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.1.39.
by Alexandre Julliard 19 Feb '10

19 Feb '10

Module: wine Branch: master Commit: e1437c5231b0ed2647ace43abef1ac97386ce1af URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1437c5231b0ed2647ace43ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 19 19:23:45 2010 +0100 Release 1.1.39. --- ANNOUNCE | 1116 +++++++++++++++++++++++++------------------------------------ VERSION | 2 +- configure | 18 +- 3 files changed, 459 insertions(+), 677 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e1437c5231b0ed2647ace…

1 0

Tag wine-1.1.39 : Alexandre Julliard : Release 1.1.39
by Alexandre Julliard 19 Feb '10

19 Feb '10

Module: wine Branch: refs/tags/wine-1.1.39 Tag: 069f515ca6dbd597ee44ddd2e2f59f95f958ed13 URL: http://source.winehq.org/git/wine.git/?a=tag;h=069f515ca6dbd597ee44ddd2e2f5… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 19 19:23:46 2010 +0100 Release 1.1.39

1 0

Nikolay Sivov : msxml3: Accept IObjectSafety for query from IXMLDOMDocument , fix its implementation.
by Alexandre Julliard 19 Feb '10

19 Feb '10

Module: wine Branch: master Commit: b679a690b4c0841eb98983e977a0b629c0b2e10f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b679a690b4c0841eb98983e97… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Feb 19 13:46:16 2010 +0300 msxml3: Accept IObjectSafety for query from IXMLDOMDocument, fix its implementation. --- dlls/msxml3/domdoc.c | 14 ++++---- dlls/msxml3/tests/domdoc.c | 69 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index e3e9651..41c1f41 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -471,6 +471,10 @@ static HRESULT WINAPI domdoc_QueryInterface( IXMLDOMDocument2 *iface, REFIID rii { *ppvObject = &(This->lpvtblIObjectWithSite); } + else if (IsEqualGUID(&IID_IObjectSafety, riid)) + { + *ppvObject = &(This->lpvtblIObjectSafety); + } else if( IsEqualGUID( riid, &IID_ISupportErrorInfo )) { *ppvObject = &This->lpvtblISupportErrorInfo; @@ -2210,7 +2214,7 @@ static ULONG WINAPI xmldoc_Safety_Release(IObjectSafety *iface) return IXMLDocument_Release((IXMLDocument *)This); } -#define SUPPORTED_OPTIONS (INTERFACESAFE_FOR_UNTRUSTED_CALLER|INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_SECURITY_MANAGER) +#define SAFETY_SUPPORTED_OPTIONS (INTERFACESAFE_FOR_UNTRUSTED_CALLER|INTERFACESAFE_FOR_UNTRUSTED_DATA) static HRESULT WINAPI xmldoc_Safety_GetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid, DWORD *pdwSupportedOptions, DWORD *pdwEnabledOptions) @@ -2222,7 +2226,7 @@ static HRESULT WINAPI xmldoc_Safety_GetInterfaceSafetyOptions(IObjectSafety *ifa if(!pdwSupportedOptions || !pdwEnabledOptions) return E_POINTER; - *pdwSupportedOptions = SUPPORTED_OPTIONS; + *pdwSupportedOptions = SAFETY_SUPPORTED_OPTIONS; *pdwEnabledOptions = This->safeopt; return S_OK; @@ -2232,13 +2236,9 @@ static HRESULT WINAPI xmldoc_Safety_SetInterfaceSafetyOptions(IObjectSafety *ifa DWORD dwOptionSetMask, DWORD dwEnabledOptions) { domdoc *This = impl_from_IObjectSafety(iface); - TRACE("(%p)->(%s %x %x)\n", This, debugstr_guid(riid), dwOptionSetMask, dwEnabledOptions); - if(dwOptionSetMask & ~SUPPORTED_OPTIONS) - return E_FAIL; - - This->safeopt = dwEnabledOptions & dwEnabledOptions; + This->safeopt = dwEnabledOptions & dwOptionSetMask & SAFETY_SUPPORTED_OPTIONS; return S_OK; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index e7c9008..e2de5df 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -24,6 +24,7 @@ #include "windows.h" #include "ole2.h" +#include "objsafe.h" #include "xmldom.h" #include "msxml2.h" #include "msxml2did.h" @@ -33,6 +34,10 @@ #include "wine/test.h" +#include "initguid.h" + +DEFINE_GUID(IID_IObjectSafety, 0xcb5bdc81, 0x93c1, 0x11cf, 0x8f,0x20, 0x00,0x80,0x5f,0x2c,0xd0,0x64); + static const WCHAR szEmpty[] = { 0 }; static const WCHAR szIncomplete[] = { '<','?','x','m','l',' ', @@ -5284,6 +5289,69 @@ static void test_put_nodeValue(void) IXMLDOMDocument_Release(doc); } +static void test_document_IObjectSafety(void) +{ + IXMLDOMDocument *doc; + IObjectSafety *safety; + DWORD enabled = 0, supported = 0; + HRESULT hr; + + hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc ); + if( hr != S_OK ) + return; + + hr = IXMLDOMDocument_QueryInterface(doc, &IID_IObjectSafety, (void**)&safety); + ok(hr == S_OK, "ret %08x\n", hr ); + + /* get */ + hr = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, NULL, &enabled); + ok(hr == E_POINTER, "ret %08x\n", hr ); + hr = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, &supported, NULL); + ok(hr == E_POINTER, "ret %08x\n", hr ); + + hr = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, &supported, &enabled); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(supported == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA), + "Expected (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA)," + "got %08x\n", supported); + ok(enabled == 0, "Expected 0, got %08x\n", enabled); + /* set */ + hr = IObjectSafety_SetInterfaceSafetyOptions(safety, NULL, + INTERFACESAFE_FOR_UNTRUSTED_CALLER, + INTERFACESAFE_FOR_UNTRUSTED_CALLER); + ok(hr == S_OK, "ret %08x\n", hr ); + hr = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, &supported, &enabled); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(enabled == INTERFACESAFE_FOR_UNTRUSTED_CALLER, + "Expected INTERFACESAFE_FOR_UNTRUSTED_CALLER, got %08x\n", enabled); + /* set unsupported */ + hr = IObjectSafety_SetInterfaceSafetyOptions(safety, NULL, + INTERFACE_USES_SECURITY_MANAGER | + INTERFACESAFE_FOR_UNTRUSTED_CALLER, + INTERFACE_USES_SECURITY_MANAGER); + ok(hr == S_OK, "ret %08x\n", hr ); + hr = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, &supported, &enabled); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(enabled == 0, "Expected 0, got %08x\n", enabled); + + hr = IObjectSafety_SetInterfaceSafetyOptions(safety, NULL, + INTERFACESAFE_FOR_UNTRUSTED_CALLER, + INTERFACESAFE_FOR_UNTRUSTED_CALLER); + ok(hr == S_OK, "ret %08x\n", hr ); + hr = IObjectSafety_SetInterfaceSafetyOptions(safety, NULL, + INTERFACESAFE_FOR_UNTRUSTED_DATA, + INTERFACESAFE_FOR_UNTRUSTED_DATA); + ok(hr == S_OK, "ret %08x\n", hr ); + hr = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, &supported, &enabled); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(enabled == INTERFACESAFE_FOR_UNTRUSTED_DATA, + "Expected INTERFACESAFE_FOR_UNTRUSTED_DATA, got %08x\n", enabled); + + IObjectSafety_Release(safety); + + IXMLDOMDocument_Release(doc); +} + START_TEST(domdoc) { HRESULT r; @@ -5315,6 +5383,7 @@ START_TEST(domdoc) test_NodeTypeValue(); test_TransformWithLoadingLocalFile(); test_put_nodeValue(); + test_document_IObjectSafety(); CoUninitialize(); }

1 0

Nikolay Sivov : msxml3: Avoid direct vtable members internal usage.
by Alexandre Julliard 19 Feb '10

19 Feb '10

Module: wine Branch: master Commit: 7a38ecb0d6eee6752d1e638bfe1ccf95ee1f7d25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a38ecb0d6eee6752d1e638bf… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Feb 19 14:45:48 2010 +0300 msxml3: Avoid direct vtable members internal usage. --- dlls/msxml3/node.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index b981bcc..ac97681 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -947,8 +947,6 @@ static HRESULT WINAPI xmlnode_get_definition( return E_NOTIMPL; } -static HRESULT WINAPI xmlnode_get_dataType(IXMLDOMNode*, VARIANT*); - static inline BYTE hex_to_byte(xmlChar c) { if(c <= '9') return c-'0'; @@ -1149,10 +1147,10 @@ static HRESULT WINAPI xmlnode_get_nodeTypedValue( if(This->node->type == XML_ELEMENT_NODE || This->node->type == XML_TEXT_NODE || This->node->type == XML_ENTITY_REF_NODE) - hres = xmlnode_get_dataType(iface, &type); + hres = IXMLDOMNode_get_dataType(iface, &type); if(hres != S_OK && This->node->type != XML_ELEMENT_NODE) - return xmlnode_get_nodeValue(iface, typedValue); + return IXMLDOMNode_get_nodeValue(iface, typedValue); content = xmlNodeGetContent(This->node); hres = VARIANT_from_xmlChar(content, typedValue,

1 0

Jörg Höhle : winmm: dwBytesRecorded controls how much is played, not dwBufferLength.
by Alexandre Julliard 19 Feb '10

19 Feb '10

Module: wine Branch: master Commit: a956086e1892f7ac44e1f42975dfd1f9cbc9b253 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a956086e1892f7ac44e1f4297… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Feb 16 09:08:46 2010 +0100 winmm: dwBytesRecorded controls how much is played, not dwBufferLength. --- dlls/winmm/winmm.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index d201d12..46a3c06 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1530,9 +1530,9 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI */ lpMidiHdr = (LPMIDIHDR)msg->lParam; lpData = (LPBYTE)lpMidiHdr->lpData; - TRACE("Adding %s lpMidiHdr=%p [lpData=0x%p dwBufferLength=%u/%u dwFlags=0x%08x size=%lu]\n", + TRACE("Adding %s lpMidiHdr=%p [lpData=0x%p dwBytesRecorded=%u/%u dwFlags=0x%08x size=%lu]\n", (lpMidiHdr->dwFlags & MHDR_ISSTRM) ? "stream" : "regular", lpMidiHdr, - lpMidiHdr, lpMidiHdr->dwBufferLength, lpMidiHdr->dwBytesRecorded, + lpMidiHdr, lpMidiHdr->dwBytesRecorded, lpMidiHdr->dwBufferLength, lpMidiHdr->dwFlags, msg->wParam); #if 0 /* dumps content of lpMidiHdr->lpData @@ -1686,7 +1686,7 @@ static DWORD CALLBACK MMSYSTEM_MidiStream_Player(LPVOID pmt) lpMidiHdr->dwOffset += sizeof(MIDIEVENT) - sizeof(me->dwParms); if (me->dwEvent & MEVT_F_LONG) lpMidiHdr->dwOffset += (MEVT_EVENTPARM(me->dwEvent) + 3) & ~3; - if (lpMidiHdr->dwOffset >= lpMidiHdr->dwBufferLength) { + if (lpMidiHdr->dwOffset >= lpMidiHdr->dwBytesRecorded) { /* done with this header */ lpMidiHdr->dwFlags |= MHDR_DONE; lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; @@ -1817,8 +1817,11 @@ MMRESULT WINAPI midiStreamOut(HMIDISTRM hMidiStrm, LPMIDIHDR lpMidiHdr, TRACE("(%p, %p, %u)!\n", hMidiStrm, lpMidiHdr, cbMidiHdr); - if (cbMidiHdr < sizeof(MIDIHDR) || !lpMidiHdr || !lpMidiHdr->lpData) + if (cbMidiHdr < sizeof(MIDIHDR) || !lpMidiHdr || !lpMidiHdr->lpData + || lpMidiHdr->dwBufferLength < lpMidiHdr->dwBytesRecorded) return MMSYSERR_INVALPARAM; + /* FIXME: Native additionaly checks if the MIDIEVENTs in lpData + * exactly fit dwBytesRecorded. */ if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) return MIDIERR_UNPREPARED;

1 0