November 2013 - Wine-Commits

Nikolay Sivov : shlwapi: Implement PathUnExpandEnvStrings.
by Alexandre Julliard Nov. 4, 2013

Nov. 4, 2013

Module: wine Branch: master Commit: 7513b58329c5decd8b6502f579c9772f1e214ce9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7513b58329c5decd8b6502f57… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 4 13:39:09 2013 +0400 shlwapi: Implement PathUnExpandEnvStrings. --- dlls/shlwapi/path.c | 117 +++++++++++++++++++++++++++++++++++--- dlls/shlwapi/tests/path.c | 136 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 243 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7513b58329c5decd8b650…

1 0

Nikolay Sivov : msxml3: Implement url() property of IXMLDOMDocument.
by Alexandre Julliard Nov. 4, 2013

Nov. 4, 2013

Module: wine Branch: master Commit: e0344e1a28db14ff7f194055f88558e1d846cde7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0344e1a28db14ff7f194055f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 4 14:17:12 2013 +0400 msxml3: Implement url() property of IXMLDOMDocument. --- dlls/msxml3/bsc.c | 2 +- dlls/msxml3/domdoc.c | 31 ++++++++++++++++++++++++++--- dlls/msxml3/tests/domdoc.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/bsc.c b/dlls/msxml3/bsc.c index c8683d5..d9519f3 100644 --- a/dlls/msxml3/bsc.c +++ b/dlls/msxml3/bsc.c @@ -259,7 +259,7 @@ HRESULT create_moniker_from_url(LPCWSTR url, IMoniker **mon) return E_FAIL; } - if(FAILED(UrlCreateFromPathW(url, fileUrl, &needed, 0))) + if(FAILED(UrlCreateFromPathW(fullpath, fileUrl, &needed, 0))) { ERR("can't create url from path\n"); return E_FAIL; diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 26a2dad..e3dd792 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -131,7 +131,9 @@ struct domdoc domdoc_properties* properties; HRESULT error; - /* IObjectWithSite*/ + WCHAR *url; + + /* IObjectWithSite */ IUnknown *site; /* IObjectSafety */ @@ -946,6 +948,7 @@ static ULONG WINAPI domdoc_Release( IXMLDOMDocument3 *iface ) for (eid = 0; eid < EVENTID_LAST; eid++) if (This->events[eid]) IDispatch_Release(This->events[eid]); + CoTaskMemFree(This->url); release_namespaces(This); heap_free(This); } @@ -2199,10 +2202,15 @@ static HRESULT WINAPI domdoc_load( { IMoniker *mon; + CoTaskMemFree(This->url); + This->url = NULL; + hr = create_moniker_from_url( filename, &mon); if ( SUCCEEDED(hr) ) { hr = domdoc_load_moniker( This, mon ); + if (hr == S_OK) + IMoniker_GetDisplayName(mon, NULL, NULL, &This->url); IMoniker_Release(mon); } @@ -2265,11 +2273,25 @@ static HRESULT WINAPI domdoc_get_parseError( static HRESULT WINAPI domdoc_get_url( IXMLDOMDocument3 *iface, - BSTR* urlString ) + BSTR* url ) { domdoc *This = impl_from_IXMLDOMDocument3(iface); - FIXME("(%p)->(%p)\n", This, urlString); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, url); + + if (!url) + return E_INVALIDARG; + + if (This->url) + { + *url = SysAllocString(This->url); + if (!*url) + return E_OUTOFMEMORY; + + return S_OK; + } + else + return return_null_bstr(url); } @@ -3546,6 +3568,7 @@ HRESULT get_domdoc_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document) doc->safeopt = 0; doc->cp_list = NULL; doc->namespaces = NULL; + doc->url = NULL; memset(doc->events, 0, sizeof(doc->events)); /* events connection points */ diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 3a18f9f..8e17885 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1258,6 +1258,11 @@ if (0) ok( b == VARIANT_FALSE, "succeeded in loading XML string\n"); SysFreeString( str ); + str = (BSTR)0x1; + hr = IXMLDOMDocument_get_url(doc, &str); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(str == NULL, "got %p\n", str); + /* try load an empty document */ b = VARIANT_TRUE; str = SysAllocString( szEmpty ); @@ -9583,6 +9588,11 @@ static void test_load(void) EXPECT_HR(hr, S_OK); ok(b == VARIANT_TRUE, "got %d\n", b); + bstr1 = NULL; + hr = IXMLDOMDocument_get_url(doc, &bstr1); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(bstr1); + /* load from a path: VT_BSTR|VT_BYREF */ V_VT(&src) = VT_BSTR | VT_BYREF; V_BSTRREF(&src) = &path; @@ -9590,6 +9600,11 @@ static void test_load(void) EXPECT_HR(hr, S_OK); ok(b == VARIANT_TRUE, "got %d\n", b); + bstr1 = NULL; + hr = IXMLDOMDocument_get_url(doc, &bstr1); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(bstr1); + /* load from a path: VT_BSTR|VT_BYREF, null ptr */ V_VT(&src) = VT_BSTR | VT_BYREF; V_BSTRREF(&src) = NULL; @@ -9597,6 +9612,11 @@ static void test_load(void) EXPECT_HR(hr, E_INVALIDARG); ok(b == VARIANT_FALSE, "got %d\n", b); + bstr1 = NULL; + hr = IXMLDOMDocument_get_url(doc, &bstr1); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(bstr1); + DeleteFileA("test.xml"); /* load from existing path, no xml content */ @@ -9609,6 +9629,11 @@ static void test_load(void) ok(hr == S_FALSE, "got 0x%08x\n", hr); ok(b == VARIANT_FALSE, "got %d\n", b); + bstr1 = (BSTR)0x1; + hr = IXMLDOMDocument_get_url(doc, &bstr1); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(bstr1 == NULL, "got %p\n", bstr1); + DeleteFileA("test.xml"); IXMLDOMDocument_Release(doc); @@ -11737,6 +11762,25 @@ static void test_create_attribute(void) free_bstrs(); } +static void test_url(void) +{ + IXMLDOMDocument *doc; + HRESULT hr; + BSTR s; + + doc = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_get_url(doc, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + s = (BSTR)0x1; + hr = IXMLDOMDocument_get_url(doc, &s); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(s == NULL, "got %s\n", wine_dbgstr_w(s)); + + IXMLDOMDocument_Release(doc); +} + START_TEST(domdoc) { HRESULT hr; @@ -11815,6 +11859,7 @@ START_TEST(domdoc) test_putref_schemas(); test_namedmap_newenum(); test_xmlns_attribute(); + test_url(); test_xsltemplate(); test_xsltext();

1 0

Nikolay Sivov : msxml3/tests: Consolidate check for available class versions.
by Alexandre Julliard Nov. 4, 2013

Nov. 4, 2013

Module: wine Branch: master Commit: 61c8a4e6eac55c5e8f2d4578d9d884f55812fac2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61c8a4e6eac55c5e8f2d4578d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 4 14:16:55 2013 +0400 msxml3/tests: Consolidate check for available class versions. --- dlls/msxml3/tests/domdoc.c | 245 +++++++++++++++++++++++--------------------- 1 files changed, 129 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=61c8a4e6eac55c5e8f2d4…

1 0

Alexandre Julliard : explorer: Remove SWP_NOACTIVATE to ensure that the foreground window is set to the desktop .
by Alexandre Julliard Nov. 4, 2013

Nov. 4, 2013

Module: wine Branch: master Commit: 1483bfa21d4945a1f62d957edafbd179cd518865 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1483bfa21d4945a1f62d957ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 4 19:40:13 2013 +0100 explorer: Remove SWP_NOACTIVATE to ensure that the foreground window is set to the desktop. --- programs/explorer/desktop.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index c3abe6d..1a8db99 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -839,7 +839,7 @@ void manage_desktop( WCHAR *arg ) if (name) set_desktop_window_title( hwnd, name ); SetWindowPos( hwnd, 0, GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN), GetSystemMetrics(SM_CXVIRTUALSCREEN), GetSystemMetrics(SM_CYVIRTUALSCREEN), - SWP_NOZORDER | SWP_NOACTIVATE | SWP_SHOWWINDOW ); + SWP_SHOWWINDOW ); SystemParametersInfoW( SPI_SETDESKWALLPAPER, 0, NULL, FALSE ); ClipCursor( NULL ); initialize_display_settings();

1 0

Andrey Zhezherun : msvcp: Added missing casts to unsigned char in streambuf functions.
by Alexandre Julliard Nov. 4, 2013

Nov. 4, 2013

Module: wine Branch: master Commit: c1a5b06d49e5e39c649b5f9aa231ad4c89aae54f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1a5b06d49e5e39c649b5f9aa… Author: Andrey Zhezherun <zhezherun(a)yandex.ru> Date: Thu Oct 31 23:38:29 2013 +0000 msvcp: Added missing casts to unsigned char in streambuf functions. --- dlls/msvcp100/ios.c | 2 +- dlls/msvcp60/ios.c | 6 +++--- dlls/msvcp71/ios.c | 6 +++--- dlls/msvcp80/ios.c | 6 +++--- dlls/msvcp90/ios.c | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/msvcp100/ios.c b/dlls/msvcp100/ios.c index c5cc200..8ebdb6a 100644 --- a/dlls/msvcp100/ios.c +++ b/dlls/msvcp100/ios.c @@ -978,7 +978,7 @@ int __thiscall basic_streambuf_char_sputc(basic_streambuf_char *this, char ch) { TRACE("(%p %d)\n", this, ch); return basic_streambuf_char__Pnavail(this) ? - (*basic_streambuf_char__Pninc(this) = ch) : + (unsigned char)(*basic_streambuf_char__Pninc(this) = ch) : call_basic_streambuf_char_overflow(this, (unsigned char)ch); } diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index aa024bf..693c376 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -1409,7 +1409,7 @@ int __thiscall basic_streambuf_char_sputc(basic_streambuf_char *this, char ch) { TRACE("(%p %d)\n", this, ch); return basic_streambuf_char__Pnavail(this) ? - (*basic_streambuf_char__Pninc(this) = ch) : + (unsigned char)(*basic_streambuf_char__Pninc(this) = ch) : call_basic_streambuf_char_overflow(this, (unsigned char)ch); } @@ -3447,7 +3447,7 @@ int __thiscall basic_stringbuf_char_overflow(basic_stringbuf_char *this, int met this->seekhigh, basic_streambuf_char_epptr(&this->base)); if(ptr && ptr<basic_streambuf_char_epptr(&this->base)) - return (*basic_streambuf_char__Pninc(&this->base) = meta); + return (unsigned char)(*basic_streambuf_char__Pninc(&this->base) = meta); oldsize = (ptr ? basic_streambuf_char_epptr(&this->base)-basic_streambuf_char_eback(&this->base): 0); size = oldsize|0xf; @@ -3484,7 +3484,7 @@ int __thiscall basic_stringbuf_char_overflow(basic_stringbuf_char *this, int met MSVCRT_operator_delete(ptr); } - return (*basic_streambuf_char__Pninc(&this->base) = meta); + return (unsigned char)(*basic_streambuf_char__Pninc(&this->base) = meta); } /* ?pbackfail@?$basic_stringbuf(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@MAEHH(a)Z */ diff --git a/dlls/msvcp71/ios.c b/dlls/msvcp71/ios.c index 9bf86af..b651099 100644 --- a/dlls/msvcp71/ios.c +++ b/dlls/msvcp71/ios.c @@ -1451,7 +1451,7 @@ int __thiscall basic_streambuf_char_sputc(basic_streambuf_char *this, char ch) { TRACE("(%p %d)\n", this, ch); return basic_streambuf_char__Pnavail(this) ? - (*basic_streambuf_char__Pninc(this) = ch) : + (unsigned char)(*basic_streambuf_char__Pninc(this) = ch) : call_basic_streambuf_char_overflow(this, (unsigned char)ch); } @@ -3697,7 +3697,7 @@ int __thiscall basic_stringbuf_char_overflow(basic_stringbuf_char *this, int met this->seekhigh, basic_streambuf_char_epptr(&this->base)); if(ptr && ptr<basic_streambuf_char_epptr(&this->base)) - return (*basic_streambuf_char__Pninc(&this->base) = meta); + return (unsigned char)(*basic_streambuf_char__Pninc(&this->base) = meta); oldsize = (ptr ? basic_streambuf_char_epptr(&this->base)-basic_streambuf_char_eback(&this->base): 0); size = oldsize|0xf; @@ -3734,7 +3734,7 @@ int __thiscall basic_stringbuf_char_overflow(basic_stringbuf_char *this, int met MSVCRT_operator_delete(ptr); } - return (*basic_streambuf_char__Pninc(&this->base) = meta); + return (unsigned char)(*basic_streambuf_char__Pninc(&this->base) = meta); } /* ?pbackfail@?$basic_stringbuf(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@MAEHH(a)Z */ diff --git a/dlls/msvcp80/ios.c b/dlls/msvcp80/ios.c index 9cdaf1d..3fe65bd 100644 --- a/dlls/msvcp80/ios.c +++ b/dlls/msvcp80/ios.c @@ -1406,7 +1406,7 @@ int __thiscall basic_streambuf_char_sputc(basic_streambuf_char *this, char ch) { TRACE("(%p %d)\n", this, ch); return basic_streambuf_char__Pnavail(this) ? - (*basic_streambuf_char__Pninc(this) = ch) : + (unsigned char)(*basic_streambuf_char__Pninc(this) = ch) : call_basic_streambuf_char_overflow(this, (unsigned char)ch); } @@ -3702,7 +3702,7 @@ int __thiscall basic_stringbuf_char_overflow(basic_stringbuf_char *this, int met this->seekhigh, basic_streambuf_char_epptr(&this->base)); if(ptr && ptr<basic_streambuf_char_epptr(&this->base)) - return (*basic_streambuf_char__Pninc(&this->base) = meta); + return (unsigned char)(*basic_streambuf_char__Pninc(&this->base) = meta); oldsize = (ptr ? basic_streambuf_char_epptr(&this->base)-basic_streambuf_char_eback(&this->base): 0); size = oldsize|0xf; @@ -3739,7 +3739,7 @@ int __thiscall basic_stringbuf_char_overflow(basic_stringbuf_char *this, int met MSVCRT_operator_delete(ptr); } - return (*basic_streambuf_char__Pninc(&this->base) = meta); + return (unsigned char)(*basic_streambuf_char__Pninc(&this->base) = meta); } /* ?pbackfail@?$basic_stringbuf(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@MAEHH(a)Z */ diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 71e92f3..90a051c 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -1406,7 +1406,7 @@ int __thiscall basic_streambuf_char_sputc(basic_streambuf_char *this, char ch) { TRACE("(%p %d)\n", this, ch); return basic_streambuf_char__Pnavail(this) ? - (*basic_streambuf_char__Pninc(this) = ch) : + (unsigned char)(*basic_streambuf_char__Pninc(this) = ch) : call_basic_streambuf_char_overflow(this, (unsigned char)ch); } @@ -3702,7 +3702,7 @@ int __thiscall basic_stringbuf_char_overflow(basic_stringbuf_char *this, int met this->seekhigh, basic_streambuf_char_epptr(&this->base)); if(ptr && ptr<basic_streambuf_char_epptr(&this->base)) - return (*basic_streambuf_char__Pninc(&this->base) = meta); + return (unsigned char)(*basic_streambuf_char__Pninc(&this->base) = meta); oldsize = (ptr ? basic_streambuf_char_epptr(&this->base)-basic_streambuf_char_eback(&this->base): 0); size = oldsize|0xf; @@ -3739,7 +3739,7 @@ int __thiscall basic_stringbuf_char_overflow(basic_stringbuf_char *this, int met MSVCRT_operator_delete(ptr); } - return (*basic_streambuf_char__Pninc(&this->base) = meta); + return (unsigned char)(*basic_streambuf_char__Pninc(&this->base) = meta); } /* ?pbackfail@?$basic_stringbuf(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@MAEHH(a)Z */

1 0

Andrey Zhezherun : msvcp: Fixed char_traits<char>::to_int_type.
by Alexandre Julliard Nov. 4, 2013

Nov. 4, 2013

Module: wine Branch: master Commit: 43d31483572dd5d17f3fa300738c813ef169a8f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43d31483572dd5d17f3fa3007… Author: Andrey Zhezherun <zhezherun(a)yandex.ru> Date: Thu Oct 31 23:35:21 2013 +0000 msvcp: Fixed char_traits<char>::to_int_type. --- dlls/msvcp71/string.c | 2 +- dlls/msvcp90/string.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp71/string.c b/dlls/msvcp71/string.c index 534d7e7..f4e96ef 100644 --- a/dlls/msvcp71/string.c +++ b/dlls/msvcp71/string.c @@ -162,7 +162,7 @@ char CDECL MSVCP_char_traits_char_to_char_type(const int *i) /* ?to_int_type@?$char_traits(a)D@std@@SAHAEBD(a)Z */ int CDECL MSVCP_char_traits_char_to_int_type(const char *ch) { - return (int)*ch; + return (unsigned char)*ch; } /* ?eq_int_type@?$char_traits(a)D@std@@SA_NABH0(a)Z */ diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 0772ade..055150c 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -162,7 +162,7 @@ char CDECL MSVCP_char_traits_char_to_char_type(const int *i) /* ?to_int_type@?$char_traits(a)D@std@@SAHAEBD(a)Z */ int CDECL MSVCP_char_traits_char_to_int_type(const char *ch) { - return (int)*ch; + return (unsigned char)*ch; } /* ?eq_int_type@?$char_traits(a)D@std@@SA_NABH0(a)Z */

1 0

Michael Stefaniuc : winmm/tests: Use the explicit CreateEventW() and don' t bother testing it.
by Alexandre Julliard Nov. 4, 2013

Nov. 4, 2013

Module: wine Branch: master Commit: a749f27ab311cfb4b84bf46bd33a889572bdd567 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a749f27ab311cfb4b84bf46bd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 3 23:30:00 2013 +0100 winmm/tests: Use the explicit CreateEventW() and don't bother testing it. --- dlls/winmm/tests/capture.c | 7 +------ dlls/winmm/tests/mixer.c | 3 +-- dlls/winmm/tests/wave.c | 9 ++------- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index d3d60db..b4d7170 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -130,7 +130,7 @@ static void check_position(int device, HWAVEIN win, DWORD bytes, static void wave_in_test_deviceIn(int device, LPWAVEFORMATEX pwfx, DWORD format, DWORD flags, LPWAVEINCAPS pcaps) { HWAVEIN win; - HANDLE hevent; + HANDLE hevent = CreateEventW(NULL, FALSE, FALSE, NULL); WAVEHDR frag; MMRESULT rc; DWORD res; @@ -139,11 +139,6 @@ static void wave_in_test_deviceIn(int device, LPWAVEFORMATEX pwfx, DWORD format, WORD wBitsPerSample = pwfx->wBitsPerSample; DWORD nSamplesPerSec = pwfx->nSamplesPerSec; - hevent=CreateEvent(NULL,FALSE,FALSE,NULL); - ok(hevent!=NULL,"CreateEvent(): error=%d\n",GetLastError()); - if (hevent==NULL) - return; - win=NULL; rc=waveInOpen(&win,device,pwfx,(DWORD_PTR)hevent,0,CALLBACK_EVENT|flags); /* Note: Win9x doesn't know WAVE_FORMAT_DIRECT */ diff --git a/dlls/winmm/tests/mixer.c b/dlls/winmm/tests/mixer.c index 2f483db..c00f9fc 100644 --- a/dlls/winmm/tests/mixer.c +++ b/dlls/winmm/tests/mixer.c @@ -1069,8 +1069,7 @@ static void test_mixerOpen(void) if (rc == MMSYSERR_NOERROR) test_mixerClose(mix); - event = CreateEvent(NULL, FALSE, FALSE, NULL); - ok(event != NULL, "CreateEvent(): error=%d\n", GetLastError()); + event = CreateEventW(NULL, FALSE, FALSE, NULL); /* NOTSUPPORTED is not broken, but it enables the todo_wine marker. */ rc = mixerOpen(&mix, d, (DWORD_PTR)event, 0, CALLBACK_EVENT); diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 8e33b69..4b061ed 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -598,7 +598,7 @@ static void wave_out_test_deviceOut(int device, double duration, BOOL interactive, BOOL sine, BOOL pause) { HWAVEOUT wout; - HANDLE hevent; + HANDLE hevent = CreateEventW(NULL, FALSE, FALSE, NULL); WAVEHDR *frags = 0; MMRESULT rc; DWORD volume; @@ -616,11 +616,6 @@ static void wave_out_test_deviceOut(int device, double duration, DWORD frag_length; int i, j; - hevent=CreateEvent(NULL,FALSE,FALSE,NULL); - ok(hevent!=NULL,"CreateEvent(): error=%d\n",GetLastError()); - if (hevent==NULL) - return; - if ((flags & CALLBACK_TYPEMASK) == CALLBACK_EVENT) { callback = (DWORD_PTR)hevent; callback_instance = 0; @@ -1532,7 +1527,7 @@ static void test_fragmentsize(void) fmt.nAvgBytesPerSec = fmt.nBlockAlign * fmt.nSamplesPerSec; fmt.cbSize = sizeof(WAVEFORMATEX); - hevent = CreateEvent(NULL, FALSE, FALSE, NULL); + hevent = CreateEventW(NULL, FALSE, FALSE, NULL); g_tid = GetCurrentThreadId(); rc = waveOutOpen(&wout, WAVE_MAPPER, &fmt, (DWORD_PTR)callback_func,

1 0

Frédéric Delanoy : wordpad: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 4, 2013

Nov. 4, 2013

Module: wine Branch: master Commit: 4ef76cd75c53682638390fd634467a4804a69355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ef76cd75c53682638390fd63… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Nov 2 14:34:15 2013 +0100 wordpad: Use BOOL type where appropriate. --- programs/wordpad/wordpad.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 8468148..9eb0700 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -1154,7 +1154,7 @@ static void dialog_viewproperties(void) static void HandleCommandLine(LPWSTR cmdline) { WCHAR delimiter; - int opt_print = 0; + BOOL opt_print = FALSE; /* skip white space */ while (*cmdline == ' ') cmdline++; @@ -1178,7 +1178,7 @@ static void HandleCommandLine(LPWSTR cmdline) { case 'P': case 'p': - opt_print = 1; + opt_print = TRUE; cmdline += 2; continue; }

1 0

Henri Verbeet : wined3d: Mark the context valid if making it current on the "backup" window worked.
by Alexandre Julliard Nov. 4, 2013

Nov. 4, 2013

Module: wine Branch: master Commit: f4aab54ca15d0447e1336cea7844fdabbb975339 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4aab54ca15d0447e1336cea7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 4 10:02:44 2013 +0100 wined3d: Mark the context valid if making it current on the "backup" window worked. --- dlls/wined3d/context.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a604088..07f81e5 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -814,6 +814,8 @@ static BOOL context_set_gl_context(struct wined3d_context *ctx) context_set_current(NULL); return FALSE; } + + ctx->valid = 1; } return TRUE; }

1 0

Aric Stewart : usp10: Implement resolveResolved (L1) for Unicode 6.3.
by Alexandre Julliard Nov. 4, 2013

Nov. 4, 2013

Module: wine Branch: master Commit: 9ccfebd6155af026572beaabb172345793aadc37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ccfebd6155af026572beaabb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Nov 1 12:01:05 2013 -0500 usp10: Implement resolveResolved (L1) for Unicode 6.3. --- dlls/usp10/bidi.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index 242ad91..ceb498e 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -793,6 +793,37 @@ static void resolveImplicit(const WORD * pcls, WORD *plevel, int sos, int eos) } } +static void resolveResolved(unsigned baselevel, const WORD * pcls, WORD *plevel, int sos, int eos) +{ + int i; + + /* L1 */ + for (i = sos; i <= eos; i++) + { + if (pcls[i] == B || pcls[i] == S) + { + int j = i -1; + while (i > sos && j >= sos && + (pcls[j] == WS || pcls[j] == FSI || pcls[j] == LRI || pcls[j] == RLI || + pcls[j] == PDI || pcls[j] == LRE || pcls[j] == RLE || pcls[j] == LRO || + pcls[j] == RLO || pcls[j] == PDF || pcls[j] == BN)) + plevel[j--] = baselevel; + plevel[i] = baselevel; + } + if (i == eos && + (pcls[i] == WS || pcls[i] == FSI || pcls[i] == LRI || pcls[i] == RLI || + pcls[i] == PDI || pcls[i] == LRE || pcls[i] == RLE || pcls[i] == LRO || + pcls[i] == RLO || pcls[i] == PDF || pcls[i] == BN )) + { + int j = i; + while (j >= sos && (pcls[j] == WS || pcls[j] == FSI || pcls[j] == LRI || pcls[j] == RLI || + pcls[j] == PDI || pcls[j] == LRE || pcls[j] == RLE || pcls[j] == LRO || + pcls[j] == RLO || pcls[j] == PDF || pcls[j] == BN)) + plevel[j--] = baselevel; + } + } +} + static void computeIsolatingRunsSet(unsigned baselevel, WORD *pcls, WORD *pLevel, int uCount, struct list *set) { int run_start, run_end, i; @@ -972,6 +1003,10 @@ BOOL BIDI_DetermineLevels( /* resolveImplicit */ resolveImplicit(chartype, lpOutLevels, 0, uCount-1); + /* resolveResolvedLevels*/ + classify(lpString, chartype, uCount, c); + resolveResolved(baselevel, chartype, lpOutLevels, 0, uCount-1); + HeapFree(GetProcessHeap(), 0, chartype); return TRUE; }

1 0