October 2013 - Wine-commits

André Hentschel : Wine 1.7.5 freigegeben
by Jeremy Newman 28 Oct '13

28 Oct '13

Module: website Branch: master Commit: 4027f6427e341cc5d2f95b86ed7109ffbd02e211 URL: http://source.winehq.org/git/website.git/?a=commit;h=4027f6427e341cc5d2f95b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 27 14:44:52 2013 +0100 Wine 1.7.5 freigegeben --- news/de/2013102501.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/de/2013102501.xml b/news/de/2013102501.xml new file mode 100644 index 0000000..80cd1b5 --- /dev/null +++ b/news/de/2013102501.xml @@ -0,0 +1,16 @@ +<news> +<date>25. Oktober 2013</date> +<title>Wine 1.7.5 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.5 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.5">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für registrierungsfreies COM mit Activation Contexts.</li> + <li>Verbesserte Unterstützung für simulierte fett gedruckte Schriften.</li> + <li>Unicode Daten wurden auf Unicode 6.3 geupdatet.</li> + <li>Bessere Unterstützung für Typelib Registrierung unter 64-Bit.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.5.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.7.5
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: website Branch: master Commit: 023a32ffdced3af5c57b0f618166d7e08b09fbe2 URL: http://source.winehq.org/git/website.git/?a=commit;h=023a32ffdced3af5c57b0f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 25 19:53:58 2013 +0200 Wine release 1.7.5 --- news/en/2013102501.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/en/2013102501.xml b/news/en/2013102501.xml new file mode 100644 index 0000000..ff76580 --- /dev/null +++ b/news/en/2013102501.xml @@ -0,0 +1,16 @@ +<news> +<date>October 25, 2013</date> +<title>Wine 1.7.5 Released</title> +<body> + The Wine development release 1.7.5 is now available. + <a href="{$root}/announce/1.7.5">What's new</a> in this release: +<ul> + <li>Support for registration-free COM using activation contexts.</li> + <li>Improved support for simulated bold fonts.</li> + <li>Unicode data updated to Unicode 6.3.</li> + <li>Better support for typelib registration on 64-bit.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.5.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.7.5.
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: wine Branch: master Commit: 4b9465f41686d2314ce4d1c95b782db81695ff7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b9465f41686d2314ce4d1c95… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 25 19:45:30 2013 +0200 Release 1.7.5. --- ANNOUNCE | 828 +++++++++++++++++++++++++++++++++---------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +- 4 files changed, 462 insertions(+), 390 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b9465f41686d2314ce4d…

1 0

Tag wine-1.7.5 : Alexandre Julliard : Release 1.7.5
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: wine Branch: refs/tags/wine-1.7.5 Tag: 25e56f72edb0f83c0ef56865a2e7844bc3faf675 URL: http://source.winehq.org/git/wine.git/?a=tag;h=25e56f72edb0f83c0ef56865a2e7… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 25 19:45:31 2013 +0200 Release 1.7.5

1 0

Qian Hong : winmm: Fixed mixerGetControlDetails with null paDetails.
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: wine Branch: master Commit: 78b2fd8399dc05ec8ff5dbf90aabe687c35b423d URL: http://source.winehq.org/git/wine.git/?a=commit;h=78b2fd8399dc05ec8ff5dbf90… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Oct 25 05:41:53 2013 +0800 winmm: Fixed mixerGetControlDetails with null paDetails. --- dlls/winmm/tests/mixer.c | 9 ++++++++- dlls/winmm/waveform.c | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/mixer.c b/dlls/winmm/tests/mixer.c index da27b16..2f483db 100644 --- a/dlls/winmm/tests/mixer.c +++ b/dlls/winmm/tests/mixer.c @@ -197,10 +197,17 @@ static void mixer_test_controlA(HMIXER mix, LPMIXERCONTROLA control) details.dwControlID = control->dwControlID; details.cChannels = 1; U(details).cMultipleItems = 0; - details.paDetails = &value; details.cbDetails = sizeof(value); + /* test NULL paDetails */ + details.paDetails = NULL; + rc=mixerGetControlDetails((HMIXEROBJ)mix,&details,MIXER_GETCONTROLDETAILSF_VALUE); + ok(rc==MMSYSERR_INVALPARAM, + "mixerGetDevCapsA: MMSYSERR_INVALPARAM expected, got %s\n", + mmsys_error(rc)); + /* read the current control value */ + details.paDetails = &value; rc=mixerGetControlDetails((HMIXEROBJ)mix,&details,MIXER_GETCONTROLDETAILSF_VALUE); ok(rc==MMSYSERR_NOERROR,"mixerGetControlDetails(MIXER_GETCONTROLDETAILSF_VALUE): " "MMSYSERR_NOERROR expected, got %s\n", diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 23adfc0..8da547c 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -3849,7 +3849,7 @@ UINT WINAPI mixerGetControlDetailsW(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcdW if(FAILED(hr)) return MMSYSERR_NODRIVER; - if(!lpmcdW) + if(!lpmcdW || !lpmcdW->paDetails) return MMSYSERR_INVALPARAM; TRACE("dwControlID: %u\n", lpmcdW->dwControlID);

1 0

Frédéric Delanoy : dwrite/tests: Use BOOL type where appropriate.
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: wine Branch: master Commit: 02f5ebd062ac60dfb57b732fd125e60537933b2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=02f5ebd062ac60dfb57b732fd… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 25 00:19:05 2013 +0200 dwrite/tests: Use BOOL type where appropriate. --- dlls/dwrite/tests/analyzer.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index d9daa03..7a920b2 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -59,7 +59,7 @@ struct call_entry { struct testcontext { enum analysis_kind kind; - int todo; + BOOL todo; int *failcount; const char *file; int line; @@ -138,7 +138,7 @@ static void test_uint(UINT32 actual, UINT32 expected, const char *name, const st } static void ok_sequence_(struct call_sequence **seq, int sequence_index, - const struct call_entry *expected, const char *context, int todo, + const struct call_entry *expected, const char *context, BOOL todo, const char *file, int line) { struct call_sequence *call_seq = seq[sequence_index];

1 0

Frédéric Delanoy : mscoree: Use BOOL type where appropriate.
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: wine Branch: master Commit: 38adec4ac558b4e49f285b9caeb75975e194d127 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38adec4ac558b4e49f285b9ca… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 25 00:19:06 2013 +0200 mscoree: Use BOOL type where appropriate. --- dlls/mscoree/assembly.c | 6 +++--- dlls/mscoree/metahost.c | 4 ++-- dlls/mscoree/mscoree_main.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mscoree/assembly.c b/dlls/mscoree/assembly.c index 13e7f03..7cfc359 100644 --- a/dlls/mscoree/assembly.c +++ b/dlls/mscoree/assembly.c @@ -63,7 +63,7 @@ typedef struct tagCLRTABLE struct tagASSEMBLY { - int is_mapped_file; + BOOL is_mapped_file; /* mapped files */ LPWSTR path; @@ -213,7 +213,7 @@ HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file) if (!assembly) return E_OUTOFMEMORY; - assembly->is_mapped_file = 1; + assembly->is_mapped_file = TRUE; assembly->path = strdupW(file); if (!assembly->path) @@ -267,7 +267,7 @@ HRESULT assembly_from_hmodule(ASSEMBLY **out, HMODULE hmodule) if (!assembly) return E_OUTOFMEMORY; - assembly->is_mapped_file = 0; + assembly->is_mapped_file = FALSE; assembly->data = (BYTE*)hmodule; diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 4264f3a..7e99bbe 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -648,7 +648,7 @@ static BOOL get_mono_path(LPWSTR path) WCHAR base_path[MAX_PATH]; const char *unix_data_dir; WCHAR *dos_data_dir; - int build_tree=0; + BOOL build_tree = FALSE; static WCHAR* (CDECL *wine_get_dos_file_name)(const char*); /* First try c:\windows\mono */ @@ -664,7 +664,7 @@ static BOOL get_mono_path(LPWSTR path) if (!unix_data_dir) { unix_data_dir = wine_get_build_dir(); - build_tree = 1; + build_tree = TRUE; } if (unix_data_dir) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 7b655b9..5b4a2c7 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -647,7 +647,7 @@ static void parse_msi_version_string(const char *version, int *parts) static BOOL install_wine_mono(void) { - BOOL is_wow64=0; + BOOL is_wow64 = FALSE; HMODULE hmsi; UINT (WINAPI *pMsiGetProductInfoA)(LPCSTR,LPCSTR,LPSTR,DWORD*); char versionstringbuf[15];

1 0

Frédéric Delanoy : quartz: Use BOOL type where appropriate.
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: wine Branch: master Commit: ec5da171e684a10e7dc2abd8e354b31f4e1593e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec5da171e684a10e7dc2abd8e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 25 00:19:07 2013 +0200 quartz: Use BOOL type where appropriate. --- dlls/quartz/avisplit.c | 10 +++++----- dlls/quartz/filtergraph.c | 2 +- dlls/quartz/videorenderer.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 3d67a18..6cd28da 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -64,7 +64,7 @@ typedef struct StreamData DWORD entries; AVISTDINDEX **stdindex; DWORD frames; - DWORD seek; + BOOL seek; /* Position, in index units */ DWORD pos, pos_next, index, index_next; @@ -448,7 +448,7 @@ static HRESULT AVISplitter_first_request(LPVOID iface) stream->index_next = stream->index; /* This was sent after stopped->paused or stopped->playing, so set seek */ - stream->seek = 1; + stream->seek = TRUE; /* There should be a packet queued from AVISplitter_next_request last time * It needs to be done now because this is the only way to ensure that every @@ -973,7 +973,7 @@ static HRESULT AVISplitter_InitializeStreams(AVISplitterImpl *This) DWORD y; DWORD64 frames = 0; - stream->seek = 1; + stream->seek = TRUE; if (stream->stdindex) { @@ -1320,7 +1320,7 @@ static HRESULT WINAPI AVISplitter_seek(IMediaSeeking *iface) pin->dwSamplesProcessed = 0; stream->index = 0; stream->pos = 0; - stream->seek = 1; + stream->seek = TRUE; if (stream->stdindex) { DWORD y, z = 0; @@ -1396,7 +1396,7 @@ static HRESULT WINAPI AVISplitter_seek(IMediaSeeking *iface) stream->index = 0; } stream->preroll = preroll; - stream->seek = 1; + stream->seek = TRUE; } LeaveCriticalSection(&This->Parser.filter.csFilter); diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 862a0c4..cca746b 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -88,7 +88,7 @@ static int EventsQueue_Destroy(EventsQueue* omr) return TRUE; } -static int EventsQueue_PutEvent(EventsQueue* omr, const Event* evt) +static BOOL EventsQueue_PutEvent(EventsQueue* omr, const Event* evt) { EnterCriticalSection(&omr->msg_crst); if (omr->msg_toget == ((omr->msg_tosave + 1) % omr->ring_buffer_size)) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 9afa7bf..4e8f359 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -1031,7 +1031,7 @@ HRESULT VideoRenderer_create(IUnknown *pUnkOuter, void **ppv) pVideoRenderer->IUnknown_inner.lpVtbl = &IInner_VTable; pVideoRenderer->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl; - pVideoRenderer->init = 0; + pVideoRenderer->init = FALSE; ZeroMemory(&pVideoRenderer->SourceRect, sizeof(RECT)); ZeroMemory(&pVideoRenderer->DestRect, sizeof(RECT)); ZeroMemory(&pVideoRenderer->WindowPos, sizeof(RECT));

1 0

Frédéric Delanoy : quartz/tests: Use BOOL type where appropriate.
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: wine Branch: master Commit: 4b94239a3b6df4af6529afcb223b38c617eb8d29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b94239a3b6df4af6529afcb2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 25 00:19:08 2013 +0200 quartz/tests: Use BOOL type where appropriate. --- dlls/quartz/tests/avisplitter.c | 2 +- dlls/quartz/tests/dsoundrender.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/avisplitter.c b/dlls/quartz/tests/avisplitter.c index ad01906..f9da610 100644 --- a/dlls/quartz/tests/avisplitter.c +++ b/dlls/quartz/tests/avisplitter.c @@ -57,7 +57,7 @@ static int count_threads(void) return threads; } -static int create_avisplitter(void) +static BOOL create_avisplitter(void) { HRESULT hr; diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index a3e4778..745a32f 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -39,7 +39,7 @@ static IUnknown *pDSRender = NULL; -static int create_dsound_renderer(void) +static BOOL create_dsound_renderer(void) { HRESULT hr;

1 0

Dmitry Timoshkov : kernel32/tests: Accept the case when WriteFile is able to complete the request immediately for an overlapped COM-port write .
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: wine Branch: master Commit: b46bd115bbd0dea1d17bc1de351e454b4f67f3f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b46bd115bbd0dea1d17bc1de3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Oct 25 12:14:24 2013 +0900 kernel32/tests: Accept the case when WriteFile is able to complete the request immediately for an overlapped COM-port write. The behaviour depends on the driver and hardware used. --- dlls/kernel32/tests/comm.c | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index cf1c0c2..844c86d 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -840,10 +840,9 @@ static void test_waittxempty(void) SetLastError(0xdeadbeef); res = WriteFile(hcom, tbuf, sizeof(tbuf), &bytes, &ovl_write); after = GetTickCount(); -todo_wine - ok(!res && GetLastError() == ERROR_IO_PENDING, "WriteFile returned %d, error %d\n", res, GetLastError()); -todo_wine - ok(!bytes, "expected 0, got %u\n", bytes); + ok((!res && GetLastError() == ERROR_IO_PENDING) || (res && bytes == sizeof(tbuf)), + "WriteFile returned %d, written %u bytes, error %d\n", res, bytes, GetLastError()); + if (!res) ok(!bytes, "expected 0, got %u\n", bytes); ok(after - before < 30, "WriteFile took %d ms to write %d Bytes at %d Baud\n", after - before, bytes, baud); /* don't wait for WriteFile completion */ @@ -915,10 +914,9 @@ todo_wine before = GetTickCount(); SetLastError(0xdeadbeef); res = WriteFile(hcom, tbuf, sizeof(tbuf), &bytes, &ovl_write); -todo_wine - ok(!res && GetLastError() == ERROR_IO_PENDING, "WriteFile returned %d, error %d\n", res, GetLastError()); -todo_wine - ok(!bytes, "expected 0, got %u\n", bytes); + ok((!res && GetLastError() == ERROR_IO_PENDING) || (res && bytes == sizeof(tbuf)), + "WriteFile returned %d, written %u bytes, error %d\n", res, bytes, GetLastError()); + if (!res) ok(!bytes, "expected 0, got %u\n", bytes); ClearCommError(hcom, &errors, &stat); ok(stat.cbInQue == 0, "InQueue should be empty, got %d bytes\n", stat.cbInQue); @@ -2089,8 +2087,7 @@ static void test_read_write(void) iob.Information = -1; offset.QuadPart = 0; status = pNtWriteFile(hcom, 0, NULL, NULL, &iob, atz, sizeof(atz), &offset, NULL); -todo_wine - ok(status == STATUS_PENDING, "expected STATUS_PENDING, got %#x\n", status); + ok(status == STATUS_PENDING || status == STATUS_SUCCESS, "expected STATUS_PENDING or STATUS_SUCCESS, got %#x\n", status); /* Under Windows checking IO_STATUS_BLOCK right after the call leads * to races, iob.Status is either -1 or STATUS_SUCCESS, which means * that it's set only when the operation completes.

1 0