January 2015 - Wine-commits

Mark Harmstone : dsound: Do not use panning to set sound position.
by Alexandre Julliard 07 Jan '15

07 Jan '15

Module: wine Branch: master Commit: 02f9edfd77302eabc0a8a6e45a9423ebe2b1acef URL: http://source.winehq.org/git/wine.git/?a=commit;h=02f9edfd77302eabc0a8a6e45… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Jan 6 19:27:00 2015 +0000 dsound: Do not use panning to set sound position. --- dlls/dsound/sound3d.c | 52 +++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 44 insertions(+), 8 deletions(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 604d19b..329de94 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -114,6 +114,7 @@ static inline D3DVALUE AngleBetweenVectorsRad (const D3DVECTOR *a, const D3DVECT cos = product/(la*lb); angle = acos(cos); + if (cos < 0.0f) { angle -= M_PI; } TRACE("angle between (%f,%f,%f) and (%f,%f,%f) = %f radians (%f degrees)\n", a->x, a->y, a->z, b->x, b->y, b->z, angle, RadToDeg(angle)); return angle; @@ -159,8 +160,10 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) D3DVECTOR vDistance; D3DVALUE flDistance = 0; /* panning related stuff */ - D3DVALUE flAngle; + D3DVALUE flAngle, flAngle2; D3DVECTOR vLeft; + int i; + float a, ingain; /* doppler shift related stuff */ TRACE("(%p)\n",dsb); @@ -241,21 +244,35 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) flAngle, dsb->ds3db_ds3db.dwInsideConeAngle/2, dsb->ds3db_ds3db.dwOutsideConeAngle/2, dsb->ds3db_ds3db.lConeOutsideVolume, lVolume); } dsb->volpan.lVolume = lVolume; + + ingain = pow(2.0, dsb->volpan.lVolume / 600.0) * 0xffff; + + if (dsb->device->pwfx->nChannels == 1) + { + dsb->volpan.dwTotalAmpFactor[0] = ingain; + return; + } /* panning */ if (dsb->device->ds3dl.vPosition.x == dsb->ds3db_ds3db.vPosition.x && dsb->device->ds3dl.vPosition.y == dsb->ds3db_ds3db.vPosition.y && dsb->device->ds3dl.vPosition.z == dsb->ds3db_ds3db.vPosition.z) { - dsb->volpan.lPan = 0; flAngle = 0.0; } else { vDistance = VectorBetweenTwoPoints(&dsb->device->ds3dl.vPosition, &dsb->ds3db_ds3db.vPosition); vLeft = VectorProduct(&dsb->device->ds3dl.vOrientFront, &dsb->device->ds3dl.vOrientTop); - flAngle = AngleBetweenVectorsRad(&vLeft, &vDistance); - /* for now, we'll use "linear formula" (which is probably incorrect); if someone has it in book, correct it */ - dsb->volpan.lPan = 10000*2*flAngle/M_PI - 10000; + flAngle = AngleBetweenVectorsRad(&dsb->device->ds3dl.vOrientFront, &vDistance); + flAngle2 = AngleBetweenVectorsRad(&vLeft, &vDistance); + + /* AngleBetweenVectorsRad performs a dot product, which gives us the cosine of the angle + * between two vectors. Unfortunately, because cos(theta) = cos(-theta), we've no idea from + * this whether the sound is to our left or to our right. We have to perform another dot + * product, with a vector at right angles to the initial one, to get the correct angle. + * The angle should be between -180 degrees and 180 degrees. */ + if (flAngle < 0.0f) { flAngle += M_PI; } + if (flAngle2 > 0.0f) { flAngle = -flAngle; } } TRACE("panning: Angle = %f rad, lPan = %d\n", flAngle, dsb->volpan.lPan); @@ -290,9 +307,28 @@ if(0) DSOUND_RecalcFormat(dsb); } } - - /* time for remix */ - DSOUND_RecalcVolPan(&dsb->volpan); + + for (i = 0; i < dsb->device->pwfx->nChannels; i++) + dsb->volpan.dwTotalAmpFactor[i] = 0; + + /* adapted from OpenAL's Alc/panning.c */ + for (i = 0; i < dsb->device->pwfx->nChannels - 1; i++) + { + if(flAngle >= dsb->device->speaker_angles[i] && flAngle < dsb->device->speaker_angles[i+1]) + { + /* Sound is between speakers i and i+1 */ + a = (flAngle-dsb->device->speaker_angles[i]) / (dsb->device->speaker_angles[i+1]-dsb->device->speaker_angles[i]); + dsb->volpan.dwTotalAmpFactor[dsb->device->speaker_num[i]] = sqrtf(1.0f-a) * ingain; + dsb->volpan.dwTotalAmpFactor[dsb->device->speaker_num[i+1]] = sqrtf(a) * ingain; + return; + } + } + + /* Sound is between last and first speakers */ + if (flAngle < dsb->device->speaker_angles[0]) { flAngle += M_PI*2.0f; } + a = (flAngle-dsb->device->speaker_angles[i]) / (M_PI*2.0f + dsb->device->speaker_angles[0]-dsb->device->speaker_angles[i]); + dsb->volpan.dwTotalAmpFactor[dsb->device->speaker_num[i]] = sqrtf(1.0f-a) * ingain; + dsb->volpan.dwTotalAmpFactor[dsb->device->speaker_num[0]] = sqrtf(a) * ingain; } static void DSOUND_Mix3DBuffer(IDirectSoundBufferImpl *dsb)

1 0

Piotr Caban : user32: Only store dialog focus when window is hidden or inactive.
by Alexandre Julliard 07 Jan '15

07 Jan '15

Module: wine Branch: master Commit: 91eced0ce5279b59715330466742925d89e8d0f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91eced0ce5279b59715330466… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 22 16:36:48 2014 +0100 user32: Only store dialog focus when window is hidden or inactive. --- dlls/user32/defdlg.c | 4 +--- dlls/user32/tests/dialog.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/user32/defdlg.c b/dlls/user32/defdlg.c index e4b55f3..00a73c6 100644 --- a/dlls/user32/defdlg.c +++ b/dlls/user32/defdlg.c @@ -105,9 +105,7 @@ static void DEFDLG_RestoreFocus( HWND hwnd, BOOL justActivate ) SetFocus( infoPtr->hwndFocus ); else DEFDLG_SetFocus( infoPtr->hwndFocus ); - - /* This used to set infoPtr->hwndFocus to NULL for no apparent reason, - sometimes losing focus when receiving WM_SETFOCUS messages. */ + infoPtr->hwndFocus = NULL; } diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index ef72cfe..63e76f7 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1357,6 +1357,24 @@ static void test_SaveRestoreFocus(void) foundId = GetWindowLongPtrA(GetFocus(), GWLP_ID); ok (foundId == 1001, "Second edit box should have gained focus after dialog reactivation. Expected: %d, Found: %ld\n", 1001, foundId); + /* set focus to the dialog */ + SetFocus(hDlg); + + foundId = GetWindowLongPtrA(GetFocus(), GWLP_ID); + ok (foundId == 1000, "First edit box should have gained focus on dialog focus. Expected: %d, Found: %ld\n", 1000, foundId); + + /* select second tabbable item */ + SetFocus(GetNextDlgTabItem(hDlg, GetNextDlgTabItem(hDlg, NULL, FALSE), FALSE)); + + foundId = GetWindowLongPtrA(GetFocus(), GWLP_ID); + ok (foundId == 1001, "Second edit box should have gained focus. Expected: %d, Found: %ld\n", 1001, foundId); + + /* send WM_ACTIVATE message to already active dialog */ + SendMessageA(hDlg, WM_ACTIVATE, MAKEWPARAM(WA_ACTIVE, 0), 0); + + foundId = GetWindowLongPtrA(GetFocus(), GWLP_ID); + ok (foundId == 1001, "Second edit box should have gained focus. Expected: %d, Found: %ld\n", 1001, foundId); + /* disable the 2nd box */ EnableWindow(GetFocus(), FALSE);

1 0

Piotr Caban : msvcp70: Add basic_ifstream(name, mode) constructor implementation.
by Alexandre Julliard 07 Jan '15

07 Jan '15

Module: wine Branch: master Commit: 6ac25d3d8092bd572140b1900baf7e42b12960ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ac25d3d8092bd572140b1900… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 7 18:02:10 2015 +0100 msvcp70: Add basic_ifstream(name, mode) constructor implementation. --- dlls/msvcp70/msvcp70.spec | 12 ++++++------ dlls/msvcp90/ios.c | 27 +++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index 7067efa..053f5e7 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -50,16 +50,16 @@ @ cdecl -arch=win64 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)XZ(ptr long) basic_fstream_short_ctor @ thiscall -arch=win32 ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PBDH@Z(ptr str long long) basic_fstream_wchar_ctor_name_noprot @ thiscall -arch=win32 ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)XZ(ptr long) basic_fstream_wchar_ctor -@ stub -arch=win32 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDH@Z -@ stub -arch=win64 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBDH@Z +@ thiscall -arch=win32 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDH@Z(ptr str long long) basic_ifstream_char_ctor_name_old +@ cdecl -arch=win64 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBDH@Z(ptr str long long) basic_ifstream_char_ctor_name_old @ thiscall -arch=win32 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)XZ(ptr long) basic_ifstream_char_ctor @ cdecl -arch=win64 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)XZ(ptr long) basic_ifstream_char_ctor -@ stub -arch=win32 ??0?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PBDH@Z -@ stub -arch=win64 ??0?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEBDH@Z +@ thiscall -arch=win32 ??0?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PBDH@Z(ptr str long long) basic_ifstream_short_ctor_name_old +@ cdecl -arch=win64 ??0?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEBDH@Z(ptr str long long) basic_ifstream_short_ctor_name_old @ thiscall -arch=win32 ??0?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)XZ(ptr long) basic_ifstream_short_ctor @ cdecl -arch=win64 ??0?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)XZ(ptr long) basic_ifstream_short_ctor -@ stub -arch=win32 ??0?$basic_ifstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PBDH@Z -@ stub -arch=win64 ??0?$basic_ifstream(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)PEBDH@Z +@ thiscall -arch=win32 ??0?$basic_ifstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PBDH@Z(ptr str long long) basic_ifstream_wchar_ctor_name_old +@ cdecl -arch=win64 ??0?$basic_ifstream(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)PEBDH@Z(ptr str long long) basic_ifstream_wchar_ctor_name_old @ thiscall -arch=win32 ??0?$basic_ifstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)XZ(ptr long) basic_ifstream_wchar_ctor @ cdecl -arch=win64 ??0?$basic_ifstream(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)XZ(ptr long) basic_ifstream_wchar_ctor @ thiscall -arch=i386 ??0?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@IAE(a)XZ(ptr) basic_ios_char_ctor diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 7308729..39c59b6 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -11335,6 +11335,15 @@ basic_ifstream_char* __thiscall basic_ifstream_char_ctor_name(basic_ifstream_cha return this; } +/* ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDH@Z */ +/* ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBDH@Z */ +DEFINE_THISCALL_WRAPPER(basic_ifstream_char_ctor_name_old, 16) +basic_ifstream_char* __thiscall basic_ifstream_char_ctor_name_old(basic_ifstream_char *this, + const char *name, int mode, MSVCP_bool virt_init) +{ + return basic_ifstream_char_ctor_name(this, name, mode, _SH_DENYNO, virt_init); +} + /* ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBGHH@Z */ /* ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBGHH@Z */ /* ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PB_WHH@Z */ @@ -11588,6 +11597,24 @@ basic_ifstream_wchar* __thiscall basic_ifstream_short_ctor_name(basic_ifstream_w return this; } +/* ??0?$basic_ifstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PBDH@Z */ +/* ??0?$basic_ifstream(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)PEBDH@Z */ +DEFINE_THISCALL_WRAPPER(basic_ifstream_wchar_ctor_name_old, 16) +basic_ifstream_wchar* __thiscall basic_ifstream_wchar_ctor_name_old(basic_ifstream_wchar *this, + const char *name, int mode, MSVCP_bool virt_init) +{ + return basic_ifstream_wchar_ctor_name(this, name, mode, _SH_DENYNO, virt_init); +} + +/* ??0?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PBDH@Z */ +/* ??0?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEBDH@Z */ +DEFINE_THISCALL_WRAPPER(basic_ifstream_short_ctor_name_old, 16) +basic_ifstream_wchar* __thiscall basic_ifstream_short_ctor_name_old(basic_ifstream_wchar *this, + const char *name, int mode, MSVCP_bool virt_init) +{ + return basic_ifstream_short_ctor_name(this, name, mode, _SH_DENYNO, virt_init); +} + /* ??0?$basic_ifstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PBGHH@Z */ /* ??0?$basic_ifstream(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)PEBGHH@Z */ /* ??0?$basic_ifstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PB_WHH@Z */

1 0

Nikolay Sivov : dwrite: Create fontface instance for each run.
by Alexandre Julliard 07 Jan '15

07 Jan '15

Module: wine Branch: master Commit: fdd8e011ed30d31d0bd39de5e2e2c32213db4793 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdd8e011ed30d31d0bd39de5e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 6 23:57:15 2015 +0300 dwrite: Create fontface instance for each run. --- dlls/dwrite/layout.c | 57 +++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 50 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index e788c6a..c430b2a 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -229,6 +229,8 @@ static void free_layout_runs(struct dwrite_textlayout *layout) struct layout_run *cur, *cur2; LIST_FOR_EACH_ENTRY_SAFE(cur, cur2, &layout->runs, struct layout_run, entry) { list_remove(&cur->entry); + if (cur->run.fontFace) + IDWriteFontFace_Release(cur->run.fontFace); heap_free(cur); } } @@ -297,11 +299,14 @@ static HRESULT layout_update_breakpoints_range(struct dwrite_textlayout *layout, return S_OK; } +static struct layout_range *get_layout_range_by_pos(struct dwrite_textlayout *layout, UINT32 pos); + static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) { IDWriteTextAnalyzer *analyzer; - struct layout_range *cur; - HRESULT hr = S_OK; + struct layout_range *range; + struct layout_run *run; + HRESULT hr; free_layout_runs(layout); @@ -309,10 +314,10 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) if (FAILED(hr)) return hr; - LIST_FOR_EACH_ENTRY(cur, &layout->ranges, struct layout_range, entry) { + LIST_FOR_EACH_ENTRY(range, &layout->ranges, struct layout_range, entry) { /* inline objects override actual text in a range */ - if (cur->object) { - hr = layout_update_breakpoints_range(layout, cur); + if (range->object) { + hr = layout_update_breakpoints_range(layout, range); if (FAILED(hr)) return hr; continue; @@ -320,17 +325,55 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) /* initial splitting by script */ hr = IDWriteTextAnalyzer_AnalyzeScript(analyzer, &layout->IDWriteTextAnalysisSource_iface, - cur->range.startPosition, cur->range.length, &layout->IDWriteTextAnalysisSink_iface); + range->range.startPosition, range->range.length, &layout->IDWriteTextAnalysisSink_iface); if (FAILED(hr)) break; /* this splits it further */ hr = IDWriteTextAnalyzer_AnalyzeBidi(analyzer, &layout->IDWriteTextAnalysisSource_iface, - cur->range.startPosition, cur->range.length, &layout->IDWriteTextAnalysisSink_iface); + range->range.startPosition, range->range.length, &layout->IDWriteTextAnalysisSink_iface); if (FAILED(hr)) break; } + /* fill run info */ + LIST_FOR_EACH_ENTRY(run, &layout->runs, struct layout_run, entry) { + IDWriteFontFamily *family; + IDWriteFont *font; + BOOL exists = TRUE; + UINT32 index; + + range = get_layout_range_by_pos(layout, run->descr.textPosition); + + hr = IDWriteFontCollection_FindFamilyName(range->collection, range->fontfamily, &index, &exists); + if (FAILED(hr) || !exists) { + WARN("[%u,%u]: family %s not found in collection %p\n", run->descr.textPosition, run->descr.textPosition+run->descr.stringLength, + debugstr_w(range->fontfamily), range->collection); + continue; + } + + hr = IDWriteFontCollection_GetFontFamily(range->collection, index, &family); + if (FAILED(hr)) + continue; + + hr = IDWriteFontFamily_GetFirstMatchingFont(family, range->weight, range->stretch, range->style, &font); + IDWriteFontFamily_Release(family); + if (FAILED(hr)) { + WARN("[%u,%u]: failed to get a matching font\n", run->descr.textPosition, run->descr.textPosition+run->descr.stringLength); + continue; + } + + hr = IDWriteFont_CreateFontFace(font, &run->run.fontFace); + IDWriteFont_Release(font); + if (FAILED(hr)) + continue; + + run->run.fontEmSize = range->fontsize; + run->descr.localeName = range->locale; + + /* FIXME: set glyph indices, cluster map, advances */ + } + IDWriteTextAnalyzer_Release(analyzer); return hr; }

1 0

Hans Leidekker : wbemdisp: Add a stub implementation of ISWbemServices.
by Alexandre Julliard 07 Jan '15

07 Jan '15

Module: wine Branch: master Commit: 57fc6e58f14af643614c5fc8c4b0f68ec3e5f5df URL: http://source.winehq.org/git/wine.git/?a=commit;h=57fc6e58f14af643614c5fc8c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 7 10:58:07 2015 +0100 wbemdisp: Add a stub implementation of ISWbemServices. --- dlls/wbemdisp/locator.c | 397 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 396 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=57fc6e58f14af643614c5…

1 0

Michael Stefaniuc : netapi32: Remove always true conditional expression ( PVS-Studio).
by Alexandre Julliard 07 Jan '15

07 Jan '15

Module: wine Branch: master Commit: 7883bb072b8fed8a271970ce9a8df7012039ba03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7883bb072b8fed8a271970ce9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 7 12:06:36 2015 +0100 netapi32: Remove always true conditional expression (PVS-Studio). --- dlls/netapi32/nbt.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/netapi32/nbt.c b/dlls/netapi32/nbt.c index 2a871de..0f593d5 100644 --- a/dlls/netapi32/nbt.c +++ b/dlls/netapi32/nbt.c @@ -560,8 +560,7 @@ static UCHAR NetBTinetResolve(const UCHAR name[NCBNAMSZ], if ((host = gethostbyname(toLookup)) != NULL) { - for (i = 0; ret == NRC_GOODRET && host->h_addr_list && - host->h_addr_list[i]; i++) + for (i = 0; host->h_addr_list && host->h_addr_list[i]; i++) ; if (host->h_addr_list && host->h_addr_list[0]) {

1 0

Piotr Caban : msvcr120: Add _fdtest function implementation.
by Alexandre Julliard 07 Jan '15

07 Jan '15

Module: wine Branch: master Commit: 1109672f13e22afb11272ad716d9c027ae54e1f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1109672f13e22afb11272ad71… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 7 15:16:23 2015 +0100 msvcr120: Add _fdtest function implementation. --- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcrt/math.c | 24 ++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 355fe17..c675436 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1111,7 +1111,7 @@ @ stub _dpcomp @ stub _dsign @ extern _dstbias MSVCRT__dstbias -@ stub _dtest +@ cdecl _dtest(ptr) MSVCR120__dtest @ cdecl _dup(long) MSVCRT__dup @ cdecl _dup2(long long) MSVCRT__dup2 @ cdecl _dupenv_s(ptr ptr str) @@ -1144,7 +1144,7 @@ @ cdecl _fdopen(long str) MSVCRT__fdopen @ stub _fdpcomp @ stub _fdsign -@ stub _fdtest +@ cdecl _fdtest(ptr) MSVCR120__fdtest @ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock @ cdecl _fgetc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _fgetchar() MSVCRT__fgetchar @@ -1392,7 +1392,7 @@ @ cdecl _ldclass(double) MSVCR120__ldclass @ stub _ldpcomp @ stub _ldsign -@ stub _ldtest +@ cdecl _ldtest(ptr) MSVCR120__ldtest @ cdecl _lfind(ptr ptr ptr long ptr) @ stub _lfind_s @ cdecl -arch=i386 _libm_sse2_acos_precise() __libm_sse2_acos diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index dd440c9..760f8f9 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1052,7 +1052,7 @@ @ stub _dpcomp @ stub _dsign @ extern _dstbias msvcr120._dstbias -@ stub _dtest +@ cdecl _dtest(ptr) msvcr120._dtest @ cdecl _dup(long) msvcr120._dup @ cdecl _dup2(long long) msvcr120._dup2 @ cdecl _ecvt(double long ptr ptr) msvcr120._ecvt @@ -1074,7 +1074,7 @@ @ cdecl _fdopen(long str) msvcr120._fdopen @ stub _fdpcomp @ stub _fdsign -@ stub _fdtest +@ cdecl _fdtest(ptr) msvcr120._fdtest @ cdecl _fflush_nolock(ptr) msvcr120._fflush_nolock @ cdecl _fgetc_nolock(ptr) msvcr120._fgetc_nolock @ cdecl _fgetchar() msvcr120._fgetchar @@ -1258,7 +1258,7 @@ @ cdecl _ldclass(double) msvcr120._ldclass @ stub _ldpcomp @ stub _ldsign -@ stub _ldtest +@ cdecl _ldtest(ptr) msvcr120._ldtest @ cdecl _lfind(ptr ptr ptr long ptr) msvcr120._lfind @ stub _lfind_s @ cdecl -arch=i386 _libm_sse2_acos_precise() msvcr120._libm_sse2_acos_precise diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 9b75d36..284924a 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2567,3 +2567,27 @@ short CDECL MSVCR120__ldclass(LDOUBLE x) { return MSVCR120__dclass(x); } + +/********************************************************************* + * _dtest (MSVCR120.@) + */ +short CDECL MSVCR120__dtest(double *x) +{ + return MSVCR120__dclass(*x); +} + +/********************************************************************* + * _fdtest (MSVCR120.@) + */ +short CDECL MSVCR120__fdtest(float *x) +{ + return MSVCR120__dclass(*x); +} + +/********************************************************************* + * _ldtest (MSVCR120.@) + */ +short CDECL MSVCR120__ldtest(LDOUBLE *x) +{ + return MSVCR120__dclass(*x); +}

1 0

Hans Leidekker : wbemprox: Implement Win32_SoundDevice::StatusInfo.
by Alexandre Julliard 07 Jan '15

07 Jan '15

Module: wine Branch: master Commit: 112027a76e28919e72abdbfc86a8b0f1e375e24c URL: http://source.winehq.org/git/wine.git/?a=commit;h=112027a76e28919e72abdbfc8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 7 15:26:16 2015 +0100 wbemprox: Implement Win32_SoundDevice::StatusInfo. --- dlls/wbemprox/builtin.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 3158c0e..e1d74e8 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -257,6 +257,8 @@ static const WCHAR prop_startingoffsetW[] = {'S','t','a','r','t','i','n','g','O','f','f','s','e','t',0}; static const WCHAR prop_stateW[] = {'S','t','a','t','e',0}; +static const WCHAR prop_statusinfoW[] = + {'S','t','a','t','u','s','I','n','f','o',0}; static const WCHAR prop_strvalueW[] = {'S','t','r','i','n','g','V','a','l','u','e',0}; static const WCHAR prop_suitemaskW[] = @@ -491,7 +493,8 @@ static const struct column col_service[] = static const struct column col_sounddevice[] = { { prop_nameW, CIM_STRING }, - { prop_productnameW, CIM_STRING } + { prop_productnameW, CIM_STRING }, + { prop_statusinfoW, CIM_UINT16 } }; static const struct column col_stdregprov[] = { @@ -806,6 +809,7 @@ struct record_sounddevice { const WCHAR *name; const WCHAR *productname; + UINT16 statusinfo; }; struct record_stdregprov { @@ -885,7 +889,7 @@ static const struct record_qualifier data_qualifier[] = }; static const struct record_sounddevice data_sounddevice[] = { - { sounddevice_productnameW, sounddevice_productnameW } + { sounddevice_productnameW, sounddevice_productnameW, 3 /* enabled */ } }; static const struct record_stdregprov data_stdregprov[] = {

1 0

Hans Leidekker : wbemprox: Implement Win32_VideoController:: VideoProcessor.
by Alexandre Julliard 07 Jan '15

07 Jan '15

Module: wine Branch: master Commit: 3986a6cda6397027e4c601e3c86a92478a8bf6d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3986a6cda6397027e4c601e3c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 7 15:26:34 2015 +0100 wbemprox: Implement Win32_VideoController::VideoProcessor. --- dlls/wbemprox/builtin.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index e1d74e8..3f51f7d 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -283,6 +283,8 @@ static const WCHAR prop_varianttypeW[] = {'V','a','r','i','a','n','t','T','y','p','e',0}; static const WCHAR prop_versionW[] = {'V','e','r','s','i','o','n',0}; +static const WCHAR prop_videoprocessorW[] = + {'V','i','d','e','o','P','r','o','c','e','s','s','o','r',0}; static const WCHAR prop_volumenameW[] = {'V','o','l','u','m','e','N','a','m','e',0}; static const WCHAR prop_volumeserialnumberW[] = @@ -518,7 +520,8 @@ static const struct column col_videocontroller[] = { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_deviceidW, CIM_STRING|COL_FLAG_KEY }, { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_pnpdeviceidW, CIM_STRING|COL_FLAG_DYNAMIC } + { prop_pnpdeviceidW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_videoprocessorW, CIM_STRING|COL_FLAG_DYNAMIC } }; static const WCHAR baseboard_manufacturerW[] = @@ -834,6 +837,7 @@ struct record_videocontroller const WCHAR *device_id; const WCHAR *name; const WCHAR *pnpdevice_id; + const WCHAR *videoprocessor; }; #include "poppack.h" @@ -2417,6 +2421,7 @@ done: rec->device_id = videocontroller_deviceidW; rec->name = heap_strdupW( name ); rec->pnpdevice_id = get_pnpdeviceid( &desc ); + rec->videoprocessor = heap_strdupW( name ); if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++;

1 0

Hans Leidekker : wbemprox: Implement Win32_NetworkAdapterConfiguration.DNSHostName.
by Alexandre Julliard 07 Jan '15

07 Jan '15

Module: wine Branch: master Commit: 0052695426db398b6a5da99196a1f7e88af86c46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0052695426db398b6a5da9919… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 7 15:26:50 2015 +0100 wbemprox: Implement Win32_NetworkAdapterConfiguration.DNSHostName. --- dlls/wbemprox/Makefile.in | 2 +- dlls/wbemprox/builtin.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index b5127cb..0307e0e 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -1,5 +1,5 @@ MODULE = wbemprox.dll -IMPORTS = version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 +IMPORTS = version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 ws2_32 C_SRCS = \ builtin.c \ diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 3f51f7d..0c37c39 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -28,6 +28,7 @@ #include "windef.h" #include "winbase.h" #include "winsock2.h" +#include "ws2tcpip.h" #include "initguid.h" #include "wbemcli.h" #include "wbemprov.h" @@ -149,6 +150,8 @@ static const WCHAR prop_displaynameW[] = {'D','i','s','p','l','a','y','N','a','m','e',0}; static const WCHAR prop_diskindexW[] = {'D','i','s','k','I','n','d','e','x',0}; +static const WCHAR prop_dnshostnameW[] = + {'D','N','S','H','o','s','t','N','a','m','e',0}; static const WCHAR prop_domainW[] = {'D','o','m','a','i','n',0}; static const WCHAR prop_domainroleW[] = @@ -389,6 +392,7 @@ static const struct column col_networkadapter[] = }; static const struct column col_networkadapterconfig[] = { + { prop_dnshostnameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_indexW, CIM_UINT32|COL_FLAG_KEY, VT_I4 }, { prop_ipconnectionmetricW, CIM_UINT32, VT_I4 }, { prop_ipenabledW, CIM_BOOLEAN }, @@ -705,6 +709,7 @@ struct record_networkadapter }; struct record_networkadapterconfig { + const WCHAR *dnshostname; UINT32 index; UINT32 ipconnectionmetric; int ipenabled; @@ -1829,6 +1834,17 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e return status; } +static WCHAR *get_dnshostname( IP_ADAPTER_UNICAST_ADDRESS *addr ) +{ + const SOCKET_ADDRESS *sa = &addr->Address; + WCHAR buf[NI_MAXHOST]; + + if (!addr) return NULL; + if (GetNameInfoW( sa->lpSockaddr, sa->iSockaddrLength, buf, sizeof(buf)/sizeof(buf[0]), NULL, + 0, NI_NAMEREQD )) return NULL; + return heap_strdupW( buf ); +} + static enum fill_status fill_networkadapterconfig( struct table *table, const struct expr *cond ) { struct record_networkadapterconfig *rec; @@ -1860,6 +1876,7 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st if (aa->IfType == IF_TYPE_SOFTWARE_LOOPBACK) continue; rec = (struct record_networkadapterconfig *)(table->data + offset); + rec->dnshostname = get_dnshostname( aa->FirstUnicastAddress ); rec->index = aa->u.s.IfIndex; rec->ipconnectionmetric = 20; rec->ipenabled = -1;

1 0