wine-commits November 2015

wine-commits@winehq.org

2 participants
623 discussions

Julian Rüger : po: Update German translation.
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: 468fa3e1252858d1afa729376aff1622c95feeb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=468fa3e1252858d1afa729376… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Nov 24 19:32:52 2015 +0100 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 48 +++++++++++++++++------------------------------- 1 file changed, 17 insertions(+), 31 deletions(-) diff --git a/po/de.po b/po/de.po index c9de142..86d59d4 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-11-06 12:55+0100\n" +"PO-Revision-Date: 2015-11-24 19:33+0100\n" "Last-Translator: Julian Rüger\n" "Language-Team: German\n" "Language: de\n" @@ -3191,7 +3191,7 @@ msgstr "Anzeigen" #: hhctrl.rc:43 winemac.rc:34 msgid "Hide" -msgstr "Verstecken" +msgstr "Ausblenden" #: hhctrl.rc:44 ieframe.rc:68 shdoclc.rc:167 shdoclc.rc:191 msgid "Stop" @@ -8592,58 +8592,44 @@ msgid "Wine" msgstr "Wine" #: winemac.rc:33 -#, fuzzy -#| msgid "Hide" msgid "Hide %@" -msgstr "Verstecken" +msgstr "%@ ausblenden" #: winemac.rc:35 -#, fuzzy -#| msgid "Other" msgid "Hide Others" -msgstr "Andere" +msgstr "Andere ausblenden" #: winemac.rc:36 -#, fuzzy -#| msgid "Show" msgid "Show All" -msgstr "Anzeigen" +msgstr "Alle anzeigen" #: winemac.rc:37 msgid "Quit %@" -msgstr "" +msgstr "%@ beenden" #: winemac.rc:38 msgid "Quit" -msgstr "" +msgstr "Beenden" #: winemac.rc:40 -#, fuzzy -#| msgid "&Window" msgid "Window" -msgstr "&Fenster" +msgstr "Fenster" #: winemac.rc:41 -#, fuzzy -#| msgid "&Minimize" msgid "Minimize" -msgstr "&Minimieren" +msgstr "Minimieren" #: winemac.rc:42 -#, fuzzy -#| msgid "Zoom in" msgid "Zoom" -msgstr "Ver&größern" +msgstr "Zoom" #: winemac.rc:43 msgid "Enter Full Screen" -msgstr "" +msgstr "Vollbildmodus" #: winemac.rc:44 -#, fuzzy -#| msgid "&Bring To Front" msgid "Bring All to Front" -msgstr "&In den Vordergrund holen" +msgstr "Alle in den Vordergrund holen" #: wineps.rc:31 msgid "Paper Si&ze:" @@ -11300,11 +11286,11 @@ msgstr "" #: oleview.rc:122 msgid "Show or hide the toolbar" -msgstr "Symbolleiste zeigen oder verstecken" +msgstr "Symbolleiste anzeigen oder ausblenden" #: oleview.rc:123 msgid "Show or hide the status bar" -msgstr "Statusleiste zeigen oder verstecken" +msgstr "Statusleiste anzeigen oder ausblenden" #: oleview.rc:124 msgid "Refresh all lists" @@ -11909,7 +11895,7 @@ msgstr "Entfernt Schlüssel aus den Favoriten" #: regedit.rc:166 msgid "Shows or hides the status bar" -msgstr "Zeigt oder versteckt die Statusleiste" +msgstr "Blendet die Statusleiste ein oder aus" #: regedit.rc:167 msgid "Change position of split between two panes" @@ -12199,7 +12185,7 @@ msgstr "Nach Programmstart &minimieren" #: taskmgr.rc:47 msgid "&Hide When Minimized" -msgstr "&Verstecken, wenn minimiert" +msgstr "&Ausblenden, wenn minimiert" #: taskmgr.rc:49 taskmgr.rc:257 msgid "&Show 16-bit tasks" @@ -12678,7 +12664,7 @@ msgstr "" #: taskmgr.rc:191 msgid "Hide the Task Manager when it is minimized" -msgstr "Versteckt den Task-Manager, wenn er minimiert ist" +msgstr "Blendet den Task-Manager aus, wenn er minimiert ist" #: taskmgr.rc:192 msgid "Force Task Manager to update now, regardless of Update Speed setting"

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: 78888687d59a3b16355bf4a851f648c56a043649 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78888687d59a3b16355bf4a85… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Tue Nov 24 20:22:17 2015 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 34 ++++++++++------------------------ 1 file changed, 10 insertions(+), 24 deletions(-) diff --git a/po/fi.po b/po/fi.po index 84fe32a..fba8b42 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8566,58 +8566,44 @@ msgid "Wine" msgstr "Wine" #: winemac.rc:33 -#, fuzzy -#| msgid "Hide" msgid "Hide %@" -msgstr "Piilota" +msgstr "Piilota %@" #: winemac.rc:35 -#, fuzzy -#| msgid "Other" msgid "Hide Others" -msgstr "Muu" +msgstr "Piilota muut" #: winemac.rc:36 -#, fuzzy -#| msgid "Show" msgid "Show All" -msgstr "Näytä" +msgstr "Näytä kaikki" #: winemac.rc:37 msgid "Quit %@" -msgstr "" +msgstr "Lopeta %@" #: winemac.rc:38 msgid "Quit" -msgstr "" +msgstr "Lopeta" #: winemac.rc:40 -#, fuzzy -#| msgid "&Window" msgid "Window" -msgstr "&Ikkuna" +msgstr "Ikkuna" #: winemac.rc:41 -#, fuzzy -#| msgid "&Minimize" msgid "Minimize" -msgstr "P&ienennä" +msgstr "Pienennä" #: winemac.rc:42 -#, fuzzy -#| msgid "Zoom in" msgid "Zoom" -msgstr "Lähennä" +msgstr "Zoomaa" #: winemac.rc:43 msgid "Enter Full Screen" -msgstr "" +msgstr "Siirry kokoruututilaan" #: winemac.rc:44 -#, fuzzy -#| msgid "&Bring To Front" msgid "Bring All to Front" -msgstr "Tuo &eteen" +msgstr "Tuo kaikki eteen" #: wineps.rc:31 msgid "Paper Si&ze:"

1 0

Henri Verbeet : dxgi: Implement dxgi_output_GetDesc().
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: af196e5f25daf99cc7bf6f2dc1fe5d48dc992e19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af196e5f25daf99cc7bf6f2dc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 24 18:06:17 2015 +0100 dxgi: Implement dxgi_output_GetDesc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/directx.c | 13 +++++++--- dlls/d3d9/directx.c | 13 +++++++--- dlls/ddraw/main.c | 6 +++-- dlls/dxgi/output.c | 28 +++++++++++++++++++-- dlls/dxgi/tests/device.c | 56 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/directx.c | 35 ++++++++++++++++++++------ dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 12 ++++++++- 9 files changed, 146 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af196e5f25daf99cc7bf6…

1 0

Bruno Jesus : msacm32/tests: Add some acmStreamPrepareHeader and acmStreamConvert tests.
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: cb5ba51f94eb6e61e50763d149154d210df8bf65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb5ba51f94eb6e61e50763d14… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Nov 24 17:08:00 2015 +0800 msacm32/tests: Add some acmStreamPrepareHeader and acmStreamConvert tests. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/tests/msacm.c | 92 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 91 insertions(+), 1 deletion(-) diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 4c9dca0..bb4ccc5 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -527,7 +527,7 @@ static void test_prepareheader(void) WAVEFORMATEX dst; MMRESULT mr; ACMSTREAMHEADER hdr; - BYTE buf[sizeof(WAVEFORMATEX) + 32], pcm[512], input[512]; + BYTE buf[sizeof(WAVEFORMATEX) + 32], pcm[2048], input[512]; ADPCMCOEFSET *coef; src = (ADPCMWAVEFORMAT*)buf; @@ -567,6 +567,7 @@ static void test_prepareheader(void) mr = acmStreamOpen(&has, NULL, (WAVEFORMATEX*)src, &dst, NULL, 0, 0, 0); ok(mr == MMSYSERR_NOERROR, "open failed: 0x%x\n", mr); + memset(input, 0, sizeof(input)); memset(&hdr, 0, sizeof(hdr)); hdr.cbStruct = sizeof(hdr); hdr.pbSrc = input; @@ -594,6 +595,95 @@ static void test_prepareheader(void) ok(mr == MMSYSERR_NOERROR, "prepare failed: 0x%x\n", mr); ok(hdr.fdwStatus == (ACMSTREAMHEADER_STATUSF_PREPARED | ACMSTREAMHEADER_STATUSF_DONE), "header wasn't prepared: 0x%x\n", hdr.fdwStatus); + hdr.cbSrcLengthUsed = 12345; + hdr.cbDstLengthUsed = 12345; + hdr.fdwStatus &= ~ACMSTREAMHEADER_STATUSF_DONE; + mr = acmStreamConvert(has, &hdr, ACM_STREAMCONVERTF_BLOCKALIGN); + ok(mr == MMSYSERR_NOERROR, "convert failed: 0x%x\n", mr); + ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "conversion was not done: 0x%x\n", hdr.fdwStatus); + ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "expected %d, got %d\n", hdr.cbSrcLength, hdr.cbSrcLengthUsed); +todo_wine + ok(hdr.cbDstLengthUsed == 1010, "expected 1010, got %d\n", hdr.cbDstLengthUsed); + + mr = acmStreamUnprepareHeader(has, &hdr, 0); + ok(mr == MMSYSERR_NOERROR, "unprepare failed: 0x%x\n", mr); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_DONE, "header wasn't unprepared: 0x%x\n", hdr.fdwStatus); + + /* The 2 next tests are related to Lost Horizon (bug 24723) */ + memset(&hdr, 0, sizeof(hdr)); + hdr.cbStruct = sizeof(hdr); + hdr.pbSrc = input; + hdr.cbSrcLength = sizeof(input); + hdr.pbDst = pcm; + hdr.cbDstLength = -4; + + mr = acmStreamPrepareHeader(has, &hdr, 0); + if (sizeof(void *) == 4) /* 64 bit fails on this test */ + { + ok(mr == MMSYSERR_NOERROR, "prepare failed: 0x%x\n", mr); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_PREPARED, "header wasn't prepared: 0x%x\n", hdr.fdwStatus); + + hdr.cbSrcLengthUsed = 12345; + hdr.cbDstLengthUsed = 12345; + hdr.fdwStatus &= ~ACMSTREAMHEADER_STATUSF_DONE; + mr = acmStreamConvert(has, &hdr, ACM_STREAMCONVERTF_BLOCKALIGN); + ok(mr == MMSYSERR_NOERROR, "convert failed: 0x%x\n", mr); + ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "conversion was not done: 0x%x\n", hdr.fdwStatus); + ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "expected %d, got %d\n", hdr.cbSrcLength, hdr.cbSrcLengthUsed); +todo_wine + ok(hdr.cbDstLengthUsed == 1010, "expected 1010, got %d\n", hdr.cbDstLengthUsed); + + mr = acmStreamUnprepareHeader(has, &hdr, 0); + ok(mr == MMSYSERR_NOERROR, "unprepare failed: 0x%x\n", mr); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_DONE, "header wasn't unprepared: 0x%x\n", hdr.fdwStatus); + } + else + ok(mr == MMSYSERR_INVALPARAM, "expected 11, got %d\n", mr); + + memset(&hdr, 0, sizeof(hdr)); + hdr.cbStruct = sizeof(hdr); + hdr.pbSrc = input; + hdr.cbSrcLength = 24; + hdr.pbDst = pcm; + hdr.cbDstLength = -4; + mr = acmStreamPrepareHeader(has, &hdr, 0); +todo_wine { + ok(mr == ACMERR_NOTPOSSIBLE, "expected 0x200, got 0x%x\n", mr); + ok(hdr.fdwStatus == 0, "expected 0, got 0x%x\n", hdr.fdwStatus); + + hdr.cbSrcLengthUsed = 12345; + hdr.cbDstLengthUsed = 12345; + mr = acmStreamConvert(has, &hdr, ACM_STREAMCONVERTF_BLOCKALIGN); + ok(mr == ACMERR_UNPREPARED, "expected 0x202, got 0x%x\n", mr); + ok(hdr.cbSrcLengthUsed == 12345, "expected 12345, got %d\n", hdr.cbSrcLengthUsed); + ok(hdr.cbDstLengthUsed == 12345, "expected 12345, got %d\n", hdr.cbDstLengthUsed); + + mr = acmStreamUnprepareHeader(has, &hdr, 0); + ok(mr == ACMERR_UNPREPARED, "expected 0x202, got 0x%x\n", mr); +} + /* Less output space than required */ + memset(&hdr, 0, sizeof(hdr)); + hdr.cbStruct = sizeof(hdr); + hdr.pbSrc = input; + hdr.cbSrcLength = sizeof(input); + hdr.pbDst = pcm; + hdr.cbDstLength = 32; + + mr = acmStreamPrepareHeader(has, &hdr, 0); + ok(mr == MMSYSERR_NOERROR, "prepare failed: 0x%x\n", mr); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_PREPARED, "header wasn't prepared: 0x%x\n", hdr.fdwStatus); + + hdr.cbSrcLengthUsed = 12345; + hdr.cbDstLengthUsed = 12345; + hdr.fdwStatus &= ~ACMSTREAMHEADER_STATUSF_DONE; + mr = acmStreamConvert(has, &hdr, ACM_STREAMCONVERTF_BLOCKALIGN); + ok(mr == MMSYSERR_NOERROR, "convert failed: 0x%x\n", mr); + ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "conversion was not done: 0x%x\n", hdr.fdwStatus); +todo_wine + ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "expected %d, got %d\n", hdr.cbSrcLength, hdr.cbSrcLengthUsed); +todo_wine + ok(hdr.cbDstLengthUsed == hdr.cbDstLength, "expected %d, got %d\n", hdr.cbDstLength, hdr.cbDstLengthUsed); + mr = acmStreamUnprepareHeader(has, &hdr, 0); ok(mr == MMSYSERR_NOERROR, "unprepare failed: 0x%x\n", mr); ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_DONE, "header wasn't unprepared: 0x%x\n", hdr.fdwStatus);

1 0

Francois Gouget : xaudio2_7: Make some functions static.
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: c9a040b5106c5b3ac21eaadb39186d69b5608401 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9a040b5106c5b3ac21eaadb3… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Nov 18 14:59:01 2015 +0100 xaudio2_7: Make some functions static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/compat.c | 14 +++++++------- dlls/xaudio2_7/xapofx.c | 2 +- dlls/xaudio2_7/xaudio_dll.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/xaudio2_7/compat.c b/dlls/xaudio2_7/compat.c index 8eb0efc..ffe6531 100644 --- a/dlls/xaudio2_7/compat.c +++ b/dlls/xaudio2_7/compat.c @@ -94,7 +94,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); -XA2SourceImpl *impl_from_IXAudio27SourceVoice(IXAudio27SourceVoice *iface) +static XA2SourceImpl *impl_from_IXAudio27SourceVoice(IXAudio27SourceVoice *iface) { return CONTAINING_RECORD(iface, XA2SourceImpl, IXAudio27SourceVoice_iface); } @@ -581,7 +581,7 @@ const IXAudio27Vtbl XAudio27_Vtbl = { XA27_SetDebugConfiguration }; -XA2SourceImpl *impl_from_IXAudio23SourceVoice(IXAudio23SourceVoice *iface) +static XA2SourceImpl *impl_from_IXAudio23SourceVoice(IXAudio23SourceVoice *iface) { return CONTAINING_RECORD(iface, XA2SourceImpl, IXAudio23SourceVoice_iface); } @@ -830,7 +830,7 @@ const IXAudio23SourceVoiceVtbl XAudio23SourceVoice_Vtbl = { XA23SRC_GetFrequencyRatio, }; -XA2SubmixImpl *impl_from_IXAudio23SubmixVoice(IXAudio23SubmixVoice *iface) +static XA2SubmixImpl *impl_from_IXAudio23SubmixVoice(IXAudio23SubmixVoice *iface) { return CONTAINING_RECORD(iface, XA2SubmixImpl, IXAudio23SubmixVoice_iface); } @@ -1007,7 +1007,7 @@ const IXAudio23SubmixVoiceVtbl XAudio23SubmixVoice_Vtbl = { XA23SUB_DestroyVoice }; -IXAudio2Impl *impl_from_IXAudio23MasteringVoice(IXAudio23MasteringVoice *iface) +static IXAudio2Impl *impl_from_IXAudio23MasteringVoice(IXAudio23MasteringVoice *iface) { return CONTAINING_RECORD(iface, IXAudio2Impl, IXAudio23MasteringVoice_iface); } @@ -1436,7 +1436,7 @@ const IXAudio22Vtbl XAudio22_Vtbl = { XA22_SetDebugConfiguration }; -XA2SourceImpl *impl_from_IXAudio20SourceVoice(IXAudio20SourceVoice *iface) +static XA2SourceImpl *impl_from_IXAudio20SourceVoice(IXAudio20SourceVoice *iface) { return CONTAINING_RECORD(iface, XA2SourceImpl, IXAudio20SourceVoice_iface); } @@ -1686,7 +1686,7 @@ const IXAudio20SourceVoiceVtbl XAudio20SourceVoice_Vtbl = { XA20SRC_GetFrequencyRatio, }; -XA2SubmixImpl *impl_from_IXAudio20SubmixVoice(IXAudio20SubmixVoice *iface) +static XA2SubmixImpl *impl_from_IXAudio20SubmixVoice(IXAudio20SubmixVoice *iface) { return CONTAINING_RECORD(iface, XA2SubmixImpl, IXAudio20SubmixVoice_iface); } @@ -1864,7 +1864,7 @@ const IXAudio20SubmixVoiceVtbl XAudio20SubmixVoice_Vtbl = { XA20SUB_DestroyVoice }; -IXAudio2Impl *impl_from_IXAudio20MasteringVoice(IXAudio20MasteringVoice *iface) +static IXAudio2Impl *impl_from_IXAudio20MasteringVoice(IXAudio20MasteringVoice *iface) { return CONTAINING_RECORD(iface, IXAudio2Impl, IXAudio20MasteringVoice_iface); } diff --git a/dlls/xaudio2_7/xapofx.c b/dlls/xaudio2_7/xapofx.c index 0fd008a..e4e4bf8 100644 --- a/dlls/xaudio2_7/xapofx.c +++ b/dlls/xaudio2_7/xapofx.c @@ -648,7 +648,7 @@ struct xapo_cf { const CLSID *class; }; -struct xapo_cf *xapo_impl_from_IClassFactory(IClassFactory *iface) +static struct xapo_cf *xapo_impl_from_IClassFactory(IClassFactory *iface) { return CONTAINING_RECORD(iface, struct xapo_cf, IClassFactory_iface); } diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 15b3ab9..73cf63d 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1801,7 +1801,7 @@ struct xaudio2_cf { DWORD version; }; -struct xaudio2_cf *impl_from_IClassFactory(IClassFactory *iface) +static struct xaudio2_cf *impl_from_IClassFactory(IClassFactory *iface) { return CONTAINING_RECORD(iface, struct xaudio2_cf, IClassFactory_iface); }

1 0

Stefan Dösinger : d3dx9_36: Replace powf(2, unsigned int) with (1u << unsigned int).
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: 1e7825710964d3c654815c780cd09e21e114a580 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e7825710964d3c654815c780… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Nov 22 01:00:57 2015 +0100 d3dx9_36: Replace powf(2, unsigned int) with (1u << unsigned int). Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/math.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 09c055e..5e8d51a 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -2138,21 +2138,21 @@ unsigned short float_32_to_16(const float in) if (isnan(in)) return (sign ? 0xffff : 0x7fff); if (in == 0.0f) return (sign ? 0x8000 : 0x0000); - if (tmp < powf(2, 10)) + if (tmp < (float)(1u << 10)) { do { tmp *= 2.0f; exp--; - } while (tmp < powf(2, 10)); + } while (tmp < (float)(1u << 10)); } - else if (tmp >= powf(2, 11)) + else if (tmp >= (float)(1u << 11)) { do { tmp /= 2.0f; exp++; - } while (tmp >= powf(2, 11)); + } while (tmp >= (float)(1u << 11)); } exp += 10; /* Normalize the mantissa */ @@ -2190,7 +2190,7 @@ unsigned short float_32_to_16(const float in) exp = origexp; /* the 13 extra bits from single precision are used for rounding */ - mantissa = (unsigned int)(tmp * powf(2, 13)); + mantissa = (unsigned int)(tmp * (1u << 13)); mantissa >>= 1 - exp; /* denormalize */ mantissa -= ~(mantissa >> 13) & 1; /* round half to even */

1 0

Alistair Leslie-Hughes : include: Add d3dx10async.h.
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: 66f4015781f9b36036ca232167affef04ea15e2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=66f4015781f9b36036ca23216… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Nov 19 17:48:00 2015 +1100 include: Add d3dx10async.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/d3dx10.h | 1 + include/d3dx10async.h | 43 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 27f0ef6..ea0e3fd 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -246,6 +246,7 @@ HEADER_SRCS = \ d3dtypes.h \ d3dvec.inl \ d3dx10.h \ + d3dx10async.h \ d3dx9.h \ d3dx9anim.h \ d3dx9core.h \ diff --git a/include/d3dx10.h b/include/d3dx10.h index 6333349..df7cdb1 100644 --- a/include/d3dx10.h +++ b/include/d3dx10.h @@ -28,5 +28,6 @@ #include "d3d10.h" #include "d3dx10core.h" +#include "d3dx10async.h" #endif diff --git a/include/d3dx10async.h b/include/d3dx10async.h new file mode 100644 index 0000000..85219d2 --- /dev/null +++ b/include/d3dx10async.h @@ -0,0 +1,43 @@ +/* + * Copyright 2015 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __D3DX10ASYNC_H__ +#define __D3DX10ASYNC_H__ + + +HRESULT WINAPI D3DX10CreateEffectFromFileA(const char *filename, const D3D10_SHADER_MACRO *defines, + ID3D10Include *include, const char *profile, UINT hlslflags, UINT fxflags, ID3D10Device *device, + ID3D10EffectPool *effectpool, ID3DX10ThreadPump *pump, ID3D10Effect **effect, ID3D10Blob **errors, + HRESULT *hresult); + +HRESULT WINAPI D3DX10CreateEffectFromFileW(const WCHAR *filename, const D3D10_SHADER_MACRO *defines, + ID3D10Include *include, const char *profile, UINT hlslflags, UINT fxflags, ID3D10Device *device, + ID3D10EffectPool *effectpool, ID3DX10ThreadPump *pump, ID3D10Effect **effect, ID3D10Blob **errors, + HRESULT *hresult); + +HRESULT WINAPI D3DX10CreateEffectFromMemory(const void *data, SIZE_T datasize, const char *filename, + const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *profile, UINT hlslflags, + UINT fxflags, ID3D10Device *device, ID3D10EffectPool *effectpool, ID3DX10ThreadPump *pump, + ID3D10Effect **effect, ID3D10Blob **errors, HRESULT *hresult); + +HRESULT WINAPI D3DX10CreateEffectPoolFromMemory(const void *data, SIZE_T datasize, const char *filename, + const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *profile, UINT hlslflags, + UINT fxflags, ID3D10Device *device, ID3DX10ThreadPump *pump, ID3D10EffectPool **effectpool, + ID3D10Blob **errors, HRESULT *hresult); + +#endif

1 0

Alexandre Julliard : patches: Display the total number of regressions.
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: tools Branch: master Commit: 99a65af2dfa0881dde9b0b8aa8aee6d77b6c80e6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=99a65af2dfa0881dde9b0b8a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 25 21:50:03 2015 +0900 patches: Display the total number of regressions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/update-regressions | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/patches/update-regressions b/patches/update-regressions index 65eb263..5e39075 100755 --- a/patches/update-regressions +++ b/patches/update-regressions @@ -129,7 +129,8 @@ print OUTPUT "<div id=\"tabs\"><ul>", "<li><a href=\"//appdb.winehq.org/\">AppDB</a></li>", "<li><a href=\"//bugs.winehq.org/\">Bugzilla</a></li>", "<li><a href=\"//forum.winehq.org/\">Forums</a></li></ul></div>\n"; -print OUTPUT "<div id=\"logo_blurb\">Wine source repository – Regressions</div>\n"; +printf OUTPUT "<div id=\"logo_blurb\">Wine source repository – Regressions (total %u)</div>\n", + $count + scalar @unknown; print OUTPUT "<div id=\"main_content\"><div id=\"content\"><div class=\"main\">\n"; printf OUTPUT "<h2>%u bisected regressions</h2>\n", $count;

1 0

Piotr Caban : shell32: Improved IDataObject::QueryGetData implementation.
by Alexandre Julliard 24 Nov '15

24 Nov '15

Module: wine Branch: master Commit: 3a6ac6055511b14a7e26ba0200f36da418f80723 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a6ac6055511b14a7e26ba020… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 24 15:34:17 2015 +0100 shell32: Improved IDataObject::QueryGetData implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/dataobject.c | 2 +- dlls/shell32/tests/shlfolder.c | 58 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/dataobject.c b/dlls/shell32/dataobject.c index 64a9401..cc7b63e 100644 --- a/dlls/shell32/dataobject.c +++ b/dlls/shell32/dataobject.c @@ -349,7 +349,7 @@ static HRESULT WINAPI IDataObject_fnQueryGetData(IDataObject *iface, LPFORMATETC for (i=0; i<MAX_FORMATS; i++) { if ((This->pFormatEtc[i].cfFormat == pformatetc->cfFormat) - && (This->pFormatEtc[i].tymed == pformatetc->tymed)) + && (This->pFormatEtc[i].tymed & pformatetc->tymed)) { return S_OK; } diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 822acf6..7a53621 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -5224,6 +5224,63 @@ static void test_SHCreateShellFolderViewEx(void) IShellFolder_Release(desktop); } +static void test_DataObject(void) +{ + IShellFolder *desktop; + IDataObject *data_obj; + HRESULT hres; + IEnumIDList *peidl; + LPITEMIDLIST apidl; + FORMATETC fmt; + DWORD cf_shellidlist; + STGMEDIUM medium; + + SHGetDesktopFolder(&desktop); + + hres = IShellFolder_EnumObjects(desktop, NULL, + SHCONTF_NONFOLDERS|SHCONTF_FOLDERS|SHCONTF_INCLUDEHIDDEN, &peidl); + ok(hres == S_OK, "got %x\n", hres); + + if(IEnumIDList_Next(peidl, 1, &apidl, NULL) != S_OK) { + skip("no files on desktop - skipping GetDataObject tests\n"); + IEnumIDList_Release(peidl); + IShellFolder_Release(desktop); + return; + } + IEnumIDList_Release(peidl); + + hres = IShellFolder_GetUIObjectOf(desktop, NULL, 1, (LPCITEMIDLIST*)&apidl, + &IID_IDataObject, NULL, (void**)&data_obj); + ok(hres == S_OK, "got %x\n", hres); + pILFree(apidl); + IShellFolder_Release(desktop); + + cf_shellidlist = RegisterClipboardFormatW(CFSTR_SHELLIDLISTW); + fmt.cfFormat = cf_shellidlist; + fmt.ptd = NULL; + fmt.dwAspect = DVASPECT_CONTENT; + fmt.lindex = -1; + fmt.tymed = TYMED_HGLOBAL; + hres = IDataObject_QueryGetData(data_obj, &fmt); + ok(hres == S_OK, "got %x\n", hres); + + fmt.tymed = TYMED_HGLOBAL | TYMED_ISTREAM; + hres = IDataObject_QueryGetData(data_obj, &fmt); + ok(hres == S_OK, "got %x\n", hres); + + fmt.tymed = TYMED_ISTREAM; + hres = IDataObject_QueryGetData(data_obj, &fmt); + todo_wine ok(hres == S_FALSE, "got %x\n", hres); + + fmt.tymed = TYMED_HGLOBAL | TYMED_ISTREAM; + hres = IDataObject_GetData(data_obj, &fmt, &medium); + ok(hres == S_OK, "got %x\n", hres); + ok(medium.tymed == TYMED_HGLOBAL, "medium.tymed = %x\n", medium.tymed); + ReleaseStgMedium(&medium); + + IDataObject_Release(data_obj); +} + START_TEST(shlfolder) { init_function_pointers(); @@ -5264,6 +5321,7 @@ START_TEST(shlfolder) test_SHCreateDefaultContextMenu(); test_SHCreateShellFolderView(); test_SHCreateShellFolderViewEx(); + test_DataObject(); OleUninitialize(); }

1 0

Dmitry Timoshkov : oleaut32: Implement a better stub for IPicture:: SaveAsFile.
by Alexandre Julliard 24 Nov '15

24 Nov '15

Module: wine Branch: master Commit: 212dd9c226c7f20c28697592468b3e631c250809 URL: http://source.winehq.org/git/wine.git/?a=commit;h=212dd9c226c7f20c286975924… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 24 17:27:38 2015 +0800 oleaut32: Implement a better stub for IPicture::SaveAsFile. Based on OLEPictureImpl_Save implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/olepicture.c | 92 ++++++++++++++++++++++++++++++++++------ dlls/oleaut32/tests/olepicture.c | 9 ---- 2 files changed, 79 insertions(+), 22 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 5ce83e0..47430e3 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -834,19 +834,6 @@ static HRESULT WINAPI OLEPictureImpl_PictureChanged(IPicture *iface) } /************************************************************************ - * OLEPictureImpl_SaveAsFile - */ -static HRESULT WINAPI OLEPictureImpl_SaveAsFile(IPicture *iface, - IStream *pstream, - BOOL SaveMemCopy, - LONG *pcbSize) -{ - OLEPictureImpl *This = impl_from_IPicture(iface); - FIXME("(%p)->(%p, %d, %p), hacked stub.\n", This, pstream, SaveMemCopy, pcbSize); - return IStream_Write(pstream,This->data,This->datalen,(ULONG*)pcbSize); -} - -/************************************************************************ * OLEPictureImpl_get_Attributes */ static HRESULT WINAPI OLEPictureImpl_get_Attributes(IPicture *iface, @@ -1859,6 +1846,85 @@ static HRESULT WINAPI OLEPictureImpl_GetSizeMax( return E_NOTIMPL; } +/************************************************************************ + * OLEPictureImpl_SaveAsFile + */ +static HRESULT WINAPI OLEPictureImpl_SaveAsFile(IPicture *iface, + IStream *stream, BOOL mem_copy, LONG *size) +{ + OLEPictureImpl *This = impl_from_IPicture(iface); + void *data; + unsigned data_size; + ULONG written; + HRESULT hr; + + FIXME("(%p)->(%p,%d,%p): semi-stub\n", This, stream, mem_copy, size); + + switch (This->desc.picType) + { + case PICTYPE_NONE: + return S_OK; + + case PICTYPE_ICON: + if (!mem_copy) return E_FAIL; + + if (This->bIsDirty || !This->data) + { + if (!serializeIcon(This->desc.u.icon.hicon, &data, &data_size)) + return E_FAIL; + HeapFree(GetProcessHeap(), 0, This->data); + This->data = data; + This->datalen = data_size; + } + hr = IStream_Write(stream, This->data, This->datalen, &written); + if (hr == S_OK && size) *size = written; + return hr; + + case PICTYPE_BITMAP: + if (!mem_copy) return E_FAIL; + + if (This->bIsDirty || !This->data) + { + switch (This->keepOrigFormat ? This->loadtime_format : BITMAP_FORMAT_BMP) + { + case BITMAP_FORMAT_BMP: + if (!serializeBMP(This->desc.u.bmp.hbitmap, &data, &data_size)) + return E_FAIL; + break; + case BITMAP_FORMAT_JPEG: + FIXME("BITMAP_FORMAT_JPEG is not implemented\n"); + return E_NOTIMPL; + case BITMAP_FORMAT_GIF: + FIXME("BITMAP_FORMAT_GIF is not implemented\n"); + return E_NOTIMPL; + case BITMAP_FORMAT_PNG: + FIXME("BITMAP_FORMAT_PNG is not implemented\n"); + return E_NOTIMPL; + default: + FIXME("PICTYPE_BITMAP/%#x is not implemented\n", This->loadtime_format); + return E_NOTIMPL; + } + + HeapFree(GetProcessHeap(), 0, This->data); + This->data = data; + This->datalen = data_size; + } + hr = IStream_Write(stream, This->data, This->datalen, &written); + if (hr == S_OK && size) *size = written; + return hr; + + case PICTYPE_METAFILE: + FIXME("PICTYPE_METAFILE is not implemented\n"); + return E_NOTIMPL; + case PICTYPE_ENHMETAFILE: + FIXME("ENHMETAFILE is not implemented\n"); + return E_NOTIMPL; + default: + FIXME("%#x is not implemented\n", This->desc.picType); + break; + } + return E_NOTIMPL; +} /************************************************************************ * IDispatch diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 0903298..0c69cbd 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -1079,18 +1079,14 @@ static void test_load_save_bmp(void) size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, TRUE, &size); ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); -todo_wine ok(size == 66, "expected 66, got %d\n", size); mem = GlobalLock(hmem); -todo_wine ok(!memcmp(&mem[0], "BM", 2), "got wrong bmp header %04x\n", mem[0]); GlobalUnlock(hmem); size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); -todo_wine ok(hr == E_FAIL, "expected E_FAIL, got %#x\n", hr); -todo_wine ok(size == -1, "expected -1, got %d\n", size); offset.QuadPart = 0; @@ -1157,15 +1153,12 @@ static void test_load_save_icon(void) todo_wine ok(size == 766, "expected 766, got %d\n", size); mem = GlobalLock(hmem); -todo_wine ok(mem[0] == 0x00010000, "got wrong icon header %04x\n", mem[0]); GlobalUnlock(hmem); size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); -todo_wine ok(hr == E_FAIL, "expected E_FAIL, got %#x\n", hr); -todo_wine ok(size == -1, "expected -1, got %d\n", size); offset.QuadPart = 0; @@ -1231,13 +1224,11 @@ static void test_load_save_empty_picture(void) size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, TRUE, &size); ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); -todo_wine ok(size == -1, "expected -1, got %d\n", size); size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); -todo_wine ok(size == -1, "expected -1, got %d\n", size); hr = IPicture_QueryInterface(pic, &IID_IPersistStream, (void **)&src_stream);

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2015