January 2015 - Wine-Commits

Mark Harmstone : dsound: Parse speaker config.
by Alexandre Julliard Jan. 7, 2015

Jan. 7, 2015

Module: wine Branch: master Commit: c4e3079766aed0b68f356ac571d449cc08d1321e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4e3079766aed0b68f356ac57… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Jan 6 19:26:47 2015 +0000 dsound: Parse speaker config. --- dlls/dsound/dsound.c | 28 ++++++++++++++++++++++++++++ dlls/dsound/dsound_private.h | 5 +++++ dlls/dsound/primary.c | 27 ++++++++++++++++++++------- 3 files changed, 53 insertions(+), 7 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 66c9d91..c5c6e8a 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -23,6 +23,7 @@ #include <assert.h> #include <stdarg.h> #include <stdio.h> +#include <math.h> #define COBJMACROS #define NONAMELESSSTRUCT @@ -585,6 +586,31 @@ HRESULT WINAPI DirectSoundCreate8( return hr; } +void DSOUND_ParseSpeakerConfig(DirectSoundDevice *device) +{ + switch (DSSPEAKER_CONFIG(device->speaker_config)) { + case DSSPEAKER_MONO: + device->speaker_angles[0] = M_PI/180.0f * 0.0f; + device->speaker_num[0] = 0; + device->num_speakers = 1; + device->lfe_channel = -1; + break; + + case DSSPEAKER_STEREO: + case DSSPEAKER_HEADPHONE: + device->speaker_angles[0] = M_PI/180.0f * -90.0f; + device->speaker_angles[1] = M_PI/180.0f * 90.0f; + device->speaker_num[0] = 0; /* Left */ + device->speaker_num[1] = 1; /* Right */ + device->num_speakers = 2; + device->lfe_channel = -1; + break; + + default: + WARN("unknown speaker_config %u\n", device->speaker_config); + } +} + /******************************************************************************* * DirectSoundDevice */ @@ -605,6 +631,8 @@ static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice) device->state = STATE_STOPPED; device->speaker_config = DSSPEAKER_COMBINED(DSSPEAKER_STEREO, DSSPEAKER_GEOMETRY_WIDE); + DSOUND_ParseSpeakerConfig(device); + /* 3D listener initial parameters */ device->ds3dl.dwSize = sizeof(DS3DLISTENER); device->ds3dl.vPosition.x = 0.0; diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 66af81a..5320d30 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -78,6 +78,10 @@ struct DirectSoundDevice CRITICAL_SECTION mixlock; IDirectSoundBufferImpl *primary; DWORD speaker_config; + float speaker_angles[DS_MAX_CHANNELS]; + int speaker_num[DS_MAX_CHANNELS]; + int num_speakers; + int lfe_channel; float *mix_buffer, *tmp_buffer; DWORD tmp_buffer_len, mix_buffer_len; @@ -199,6 +203,7 @@ HRESULT IKsPrivatePropertySetImpl_Create(REFIID riid, void **ppv) DECLSPEC_HIDDE HRESULT DSOUND_Create(REFIID riid, void **ppv) DECLSPEC_HIDDEN; HRESULT DSOUND_Create8(REFIID riid, void **ppv) DECLSPEC_HIDDEN; HRESULT IDirectSoundImpl_Create(IUnknown *outer_unk, REFIID riid, void **ppv, BOOL has_ds8) DECLSPEC_HIDDEN; +void DSOUND_ParseSpeakerConfig(DirectSoundDevice *device) DECLSPEC_HIDDEN; /* primary.c */ diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index ea4559c..86ebba8 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -58,6 +58,21 @@ static DWORD DSOUND_fraglen(DirectSoundDevice *device) return ret; } +static DWORD speaker_config_to_channel_mask(DWORD speaker_config) +{ + switch (DSSPEAKER_CONFIG(speaker_config)) { + case DSSPEAKER_MONO: + return SPEAKER_FRONT_LEFT; + + case DSSPEAKER_STEREO: + case DSSPEAKER_HEADPHONE: + return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; + } + + WARN("unknown speaker_config %u\n", speaker_config); + return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; +} + static HRESULT DSOUND_WaveFormat(DirectSoundDevice *device, IAudioClient *client, BOOL forcewave, WAVEFORMATEX **wfx) { @@ -72,15 +87,11 @@ static HRESULT DSOUND_WaveFormat(DirectSoundDevice *device, IAudioClient *client if (FAILED(hr)) return hr; - if (mixwfe->Format.nChannels > 2) { - static int once; - if (!once++) - FIXME("Limiting channels to 2 due to lack of multichannel support\n"); - - mixwfe->Format.nChannels = 2; + if (mixwfe->Format.nChannels > device->num_speakers) { + mixwfe->Format.nChannels = device->num_speakers; mixwfe->Format.nBlockAlign = mixwfe->Format.nChannels * mixwfe->Format.wBitsPerSample / 8; mixwfe->Format.nAvgBytesPerSec = mixwfe->Format.nSamplesPerSec * mixwfe->Format.nBlockAlign; - mixwfe->dwChannelMask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; + mixwfe->dwChannelMask = speaker_config_to_channel_mask(device->speaker_config); } if (!IsEqualGUID(&mixwfe->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)) { @@ -226,6 +237,8 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) device->speaker_config = DSOUND_FindSpeakerConfig(device->mmdevice); + DSOUND_ParseSpeakerConfig(device); + hres = DSOUND_WaveFormat(device, device->client, forcewave, &wfx); if (FAILED(hres)) { IAudioClient_Release(device->client);

1 0

Hans Leidekker : xcopy: Ignore the /V option.
by Alexandre Julliard Jan. 7, 2015

Jan. 7, 2015

Module: wine Branch: master Commit: 90fd0285f04fcc5d2d44c016d2d51370f518eca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90fd0285f04fcc5d2d44c016d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 7 15:28:14 2015 +0100 xcopy: Ignore the /V option. --- programs/xcopy/xcopy.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 2134a5e..486e5b1 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -826,6 +826,9 @@ static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, case '?': XCOPY_wprintf(XCOPY_LoadMessage(STRING_HELP)); rc = RC_HELP; goto out; + case 'V': + WINE_FIXME("ignoring /V\n"); + break; default: WINE_TRACE("Unhandled parameter '%s'\n", wine_dbgstr_w(word)); XCOPY_wprintf(XCOPY_LoadMessage(STRING_INVPARM), word);

1 0

Piotr Caban : msvcp70: Add basic_ifstream(name, mode) constructor implementation.
by Alexandre Julliard Jan. 7, 2015

Jan. 7, 2015

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

Hans Leidekker : wbemprox: Implement Win32_VideoController:: VideoProcessor.
by Alexandre Julliard Jan. 7, 2015

Jan. 7, 2015

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_ComputerSystemProduct.UUID.
by Alexandre Julliard Jan. 7, 2015

Jan. 7, 2015

Module: wine Branch: master Commit: c007b5f94c3d430cc0ad414fa72d94e4b7d8255c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c007b5f94c3d430cc0ad414fa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 7 15:27:13 2015 +0100 wbemprox: Implement Win32_ComputerSystemProduct.UUID. --- dlls/wbemprox/builtin.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 0c37c39..5f61f4a 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -53,6 +53,8 @@ static const WCHAR class_cdromdriveW[] = {'W','i','n','3','2','_','C','D','R','O','M','D','r','i','v','e',0}; static const WCHAR class_compsysW[] = {'W','i','n','3','2','_','C','o','m','p','u','t','e','r','S','y','s','t','e','m',0}; +static const WCHAR class_compsysproductW[] = + {'W','i','n','3','2','_','C','o','m','p','u','t','e','r','S','y','s','t','e','m','P','r','o','d','u','c','t',0}; static const WCHAR class_datafileW[] = {'C','I','M','_','D','a','t','a','F','i','l','e',0}; static const WCHAR class_directoryW[] = @@ -282,6 +284,8 @@ static const WCHAR prop_typeW[] = {'T','y','p','e',0}; static const WCHAR prop_uniqueidW[] = {'U','n','i','q','u','e','I','d',0}; +static const WCHAR prop_uuidW[] = + {'U','U','I','D',0}; static const WCHAR prop_varianttypeW[] = {'V','a','r','i','a','n','t','T','y','p','e',0}; static const WCHAR prop_versionW[] = @@ -332,6 +336,10 @@ static const struct column col_compsys[] = { prop_numprocessorsW, CIM_UINT32, VT_I4 }, { prop_totalphysicalmemoryW, CIM_UINT64 } }; +static const struct column col_compsysproduct[] = +{ + { prop_uuidW, CIM_STRING } +}; static const struct column col_datafile[] = { { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, @@ -563,6 +571,9 @@ static const WCHAR compsys_manufacturerW[] = {'T','h','e',' ','W','i','n','e',' ','P','r','o','j','e','c','t',0}; static const WCHAR compsys_modelW[] = {'W','i','n','e',0}; +static const WCHAR compsysproduct_uuidW[] = + {'0','0','0','0','0','0','0','0','-','0','0','0','0','-','0','0','0','0','-','0','0','0','0','-', + '0','0','0','0','0','0','0','0','0','0','0','0',0}; static const WCHAR diskdrive_interfacetypeW[] = {'I','D','E',0}; static const WCHAR diskdrive_manufacturerW[] = @@ -649,6 +660,10 @@ struct record_computersystem UINT32 num_processors; UINT64 total_physical_memory; }; +struct record_computersystemproduct +{ + const WCHAR *uuid; +}; struct record_datafile { const WCHAR *name; @@ -855,6 +870,10 @@ static const struct record_bios data_bios[] = { bios_descriptionW, bios_descriptionW, bios_manufacturerW, bios_releasedateW, bios_serialnumberW, bios_smbiosbiosversionW, bios_versionW } }; +static const struct record_computersystemproduct data_compsysproduct[] = +{ + { compsysproduct_uuidW } +}; static const struct record_param data_param[] = { { class_processW, method_getownerW, -1, param_returnvalueW, CIM_UINT32, VT_I4 }, @@ -2456,6 +2475,7 @@ static struct table builtin_classes[] = { class_biosW, SIZEOF(col_bios), col_bios, SIZEOF(data_bios), 0, (BYTE *)data_bios }, { class_cdromdriveW, SIZEOF(col_cdromdrive), col_cdromdrive, 0, 0, NULL, fill_cdromdrive }, { class_compsysW, SIZEOF(col_compsys), col_compsys, 0, 0, NULL, fill_compsys }, + { class_compsysproductW, SIZEOF(col_compsysproduct), col_compsysproduct, SIZEOF(data_compsysproduct), 0, (BYTE *)data_compsysproduct }, { class_datafileW, SIZEOF(col_datafile), col_datafile, 0, 0, NULL, fill_datafile }, { class_directoryW, SIZEOF(col_directory), col_directory, 0, 0, NULL, fill_directory }, { class_diskdriveW, SIZEOF(col_diskdrive), col_diskdrive, 0, 0, NULL, fill_diskdrive }, @@ -2463,8 +2483,7 @@ static struct table builtin_classes[] = { class_logicaldiskW, SIZEOF(col_logicaldisk), col_logicaldisk, 0, 0, NULL, fill_logicaldisk }, { class_logicaldisk2W, SIZEOF(col_logicaldisk), col_logicaldisk, 0, 0, NULL, fill_logicaldisk }, { class_networkadapterW, SIZEOF(col_networkadapter), col_networkadapter, 0, 0, NULL, fill_networkadapter }, - { class_networkadapterconfigW, SIZEOF(col_networkadapterconfig), col_networkadapterconfig, 0, 0, NULL, - fill_networkadapterconfig }, + { class_networkadapterconfigW, SIZEOF(col_networkadapterconfig), col_networkadapterconfig, 0, 0, NULL, fill_networkadapterconfig }, { class_osW, SIZEOF(col_os), col_os, 0, 0, NULL, fill_os }, { class_paramsW, SIZEOF(col_param), col_param, SIZEOF(data_param), 0, (BYTE *)data_param }, { class_physicalmediaW, SIZEOF(col_physicalmedia), col_physicalmedia, SIZEOF(data_physicalmedia), 0, (BYTE *)data_physicalmedia },

1 0

Michael Stefaniuc : netapi32: Remove always true conditional expression ( PVS-Studio).
by Alexandre Julliard Jan. 7, 2015

Jan. 7, 2015

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 Jan. 7, 2015

Jan. 7, 2015

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 Jan. 7, 2015

Jan. 7, 2015

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

Nikolay Sivov : dwrite: Create fontface instance for each run.
by Alexandre Julliard Jan. 7, 2015

Jan. 7, 2015

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 Jan. 7, 2015

Jan. 7, 2015

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