wine-commits September 2012

wine-commits@winehq.org

2 participants
828 discussions

Hans Leidekker : wbemprox: Implement Win32_BIOS.Version.
by Alexandre Julliard 28 Sep '12

28 Sep '12

Module: wine Branch: master Commit: 4734e0ffa5f00f21ccd1c4c412ee19f748436d13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4734e0ffa5f00f21ccd1c4c41… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 28 13:38:34 2012 +0200 wbemprox: Implement Win32_BIOS.Version. --- dlls/wbemprox/builtin.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 1d39896..2718fc7 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -172,6 +172,8 @@ static const WCHAR prop_totalphysicalmemoryW[] = {'T','o','t','a','l','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; static const WCHAR prop_typeW[] = {'T','y','p','e',0}; +static const WCHAR prop_versionW[] = + {'V','e','r','s','i','o','n',0}; static const WCHAR method_enumkeyW[] = {'E','n','u','m','K','e','y',0}; @@ -201,7 +203,8 @@ static const struct column col_bios[] = { prop_descriptionW, CIM_STRING }, { prop_manufacturerW, CIM_STRING }, { prop_releasedateW, CIM_DATETIME }, - { prop_serialnumberW, CIM_STRING } + { prop_serialnumberW, CIM_STRING }, + { prop_versionW, CIM_STRING|COL_FLAG_KEY } }; static const struct column col_compsys[] = { @@ -310,6 +313,8 @@ static const WCHAR bios_releasedateW[] = {'2','0','1','2','0','6','0','8','0','0','0','0','0','0','.','0','0','0','0','0','0','+','0','0','0',0}; static const WCHAR bios_serialnumberW[] = {'0',0}; +static const WCHAR bios_versionW[] = + {'W','I','N','E',' ',' ',' ','-',' ','1',0}; static const WCHAR compsys_descriptionW[] = {'A','T','/','A','T',' ','C','O','M','P','A','T','I','B','L','E',0}; static const WCHAR compsys_manufacturerW[] = @@ -345,6 +350,7 @@ struct record_bios const WCHAR *manufacturer; const WCHAR *releasedate; const WCHAR *serialnumber; + const WCHAR *version; }; struct record_computersystem { @@ -457,7 +463,7 @@ static const struct record_baseboard data_baseboard[] = }; static const struct record_bios data_bios[] = { - { bios_descriptionW, bios_manufacturerW, bios_releasedateW, bios_serialnumberW } + { bios_descriptionW, bios_manufacturerW, bios_releasedateW, bios_serialnumberW, bios_versionW } }; static const struct record_params data_params[] = {

1 0

Hans Leidekker : wbemprox: Add support for WbemAdministrativeLocator.
by Alexandre Julliard 28 Sep '12

28 Sep '12

Module: wine Branch: master Commit: 163c8f31fd94599718029e118affeedfda660bff URL: http://source.winehq.org/git/wine.git/?a=commit;h=163c8f31fd94599718029e118… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 28 13:38:05 2012 +0200 wbemprox: Add support for WbemAdministrativeLocator. --- dlls/wbemprox/builtin.c | 3 ++- dlls/wbemprox/main.c | 4 +++- dlls/wbemprox/services.c | 1 - dlls/wbemprox/wbemprox.idl | 7 +++++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 54de2bb..1d39896 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -27,11 +27,12 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "initguid.h" #include "wbemcli.h" +#include "wbemprov.h" #include "winsock2.h" #include "iphlpapi.h" #include "tlhelp32.h" -#include "initguid.h" #include "d3d10.h" #include "winternl.h" #include "winioctl.h" diff --git a/dlls/wbemprox/main.c b/dlls/wbemprox/main.c index 6455efd..3e26a6f 100644 --- a/dlls/wbemprox/main.c +++ b/dlls/wbemprox/main.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "objbase.h" #include "wbemcli.h" +#include "wbemprov.h" #include "rpcproxy.h" #include "wbemprox_private.h" @@ -140,7 +141,8 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) TRACE("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); - if (IsEqualGUID( rclsid, &CLSID_WbemLocator )) + if (IsEqualGUID( rclsid, &CLSID_WbemLocator ) || + IsEqualGUID( rclsid, &CLSID_WbemAdministrativeLocator )) { cf = &wbem_locator_cf.IClassFactory_iface; } diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 59b6da8..5e9cec0 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -23,7 +23,6 @@ #include "windef.h" #include "winbase.h" -#include "initguid.h" #include "objbase.h" #include "wbemcli.h" diff --git a/dlls/wbemprox/wbemprox.idl b/dlls/wbemprox/wbemprox.idl index 65cdac4..4b19384 100644 --- a/dlls/wbemprox/wbemprox.idl +++ b/dlls/wbemprox/wbemprox.idl @@ -24,3 +24,10 @@ uuid(4590f811-1d3a-11d0-891f-00aa004b2e24) ] coclass WbemLocator { interface IWbemLocator; } + +[ + helpstring("WBEM Administrative Locator"), + threading(both), + uuid(cb8555cc-9128-11d1-ad9b-00c04fd8fdff) +] +coclass WbemAdministrativeLocator { interface IWbemLocator; }

1 0

Hans Leidekker : include: Add wbemprov.idl.
by Alexandre Julliard 28 Sep '12

28 Sep '12

Module: wine Branch: master Commit: 9e88e8104385b825784207cb1c9b3ce5bf457661 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e88e8104385b825784207cb1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 28 13:37:43 2012 +0200 include: Add wbemprov.idl. --- .gitignore | 1 + include/Makefile.in | 1 + include/wbemprov.idl | 28 ++++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 588a98c..6655913 100644 --- a/.gitignore +++ b/.gitignore @@ -247,6 +247,7 @@ include/urlhist.h include/urlmon.h include/vmr9.h include/wbemcli.h +include/wbemprov.h include/wia_lh.h include/wia_xp.h include/wincodec.h diff --git a/include/Makefile.in b/include/Makefile.in index b32e4b9..314b37f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -104,6 +104,7 @@ PUBLIC_IDL_H_SRCS = \ urlmon.idl \ vmr9.idl \ wbemcli.idl \ + wbemprov.idl \ wia_lh.idl \ wia_xp.idl \ wincodec.idl \ diff --git a/include/wbemprov.idl b/include/wbemprov.idl new file mode 100644 index 0000000..bb9f1b1 --- /dev/null +++ b/include/wbemprov.idl @@ -0,0 +1,28 @@ +/* + * Copyright 2012 Hans Leidekker for CodeWeavers + * + * 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 + */ + +[ + uuid(092df710-7010-11d1-ad90-00c04fd8fdff) +] +library WbemProviders_v1 +{ + [ + uuid(cb8555cc-9128-11d1-ad9b-00c04fd8fdff) + ] + coclass WbemAdministrativeLocator { interface IWbemLocator; } +}

1 0

Hans Leidekker : wbemprox: Implement IWbemServices::ExecMethod.
by Alexandre Julliard 28 Sep '12

28 Sep '12

Module: wine Branch: master Commit: 99a3ad06910b4badb519a542ca38ac7670fe2201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99a3ad06910b4badb519a542c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 28 13:37:21 2012 +0200 wbemprox: Implement IWbemServices::ExecMethod. --- dlls/wbemprox/services.c | 20 ++++++++++++++++++-- dlls/wbemprox/table.c | 23 +++++++++++++++++++++++ dlls/wbemprox/wbemprox_private.h | 1 + 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index bf367c7..59b6da8 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -579,8 +579,24 @@ static HRESULT WINAPI wbem_services_ExecMethod( IWbemClassObject **ppOutParams, IWbemCallResult **ppCallResult ) { - FIXME("\n"); - return WBEM_E_FAILED; + const struct table *table; + class_method *func; + struct path *path; + HRESULT hr; + + TRACE("%p, %s, %s, %08x, %p, %p, %p, %p\n", iface, debugstr_w(strObjectPath), + debugstr_w(strMethodName), lFlags, pCtx, pInParams, ppOutParams, ppCallResult); + + if (lFlags) FIXME("flags %08x not supported\n", lFlags); + + if ((hr = parse_path( strObjectPath, &path )) != S_OK) return hr; + + table = get_table( path->class ); + free_path( path ); + if (!table) return WBEM_E_NOT_FOUND; + + if ((hr = get_method( table, strMethodName, &func )) != S_OK) return hr; + return func( pInParams, ppOutParams ); } static HRESULT WINAPI wbem_services_ExecMethodAsync( diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index c6dc845..c0e3eef 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -239,6 +239,29 @@ HRESULT set_value( const struct table *table, UINT row, UINT column, LONGLONG va return S_OK; } +HRESULT get_method( const struct table *table, const WCHAR *name, class_method **func ) +{ + UINT i, j; + + for (i = 0; i < table->num_rows; i++) + { + for (j = 0; j < table->num_cols; j++) + { + if (table->columns[j].type & COL_FLAG_METHOD && !strcmpW( table->columns[j].name, name )) + { + HRESULT hr; + LONGLONG val; + + if ((hr = get_value( table, i, j, &val )) != S_OK) return hr; + *func = (class_method *)(INT_PTR)val; + return S_OK; + } + } + } + return WBEM_E_INVALID_METHOD; + +} + static void clear_table( struct table *table ) { UINT i, j, type; diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 2467a76..b99897e 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -162,6 +162,7 @@ HRESULT get_column_index( const struct table *, const WCHAR *, UINT * ) DECLSPEC HRESULT get_value( const struct table *, UINT, UINT, LONGLONG * ) DECLSPEC_HIDDEN; BSTR get_value_bstr( const struct table *, UINT, UINT ) DECLSPEC_HIDDEN; HRESULT set_value( const struct table *, UINT, UINT, LONGLONG, CIMTYPE ) DECLSPEC_HIDDEN; +HRESULT get_method( const struct table *, const WCHAR *, class_method ** ) DECLSPEC_HIDDEN; HRESULT get_propval( const struct view *, UINT, const WCHAR *, VARIANT *, CIMTYPE *, LONG * ) DECLSPEC_HIDDEN; HRESULT put_propval( const struct view *, UINT, const WCHAR *, VARIANT *, CIMTYPE ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : vbscript: Fixed copy&paste typo in invoke_builtin.
by Alexandre Julliard 28 Sep '12

28 Sep '12

Module: wine Branch: master Commit: c36045dbccc7389dc4378c1c3bd8118bcafd5564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c36045dbccc7389dc4378c1c3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 28 12:48:46 2012 +0200 vbscript: Fixed copy&paste typo in invoke_builtin. --- dlls/vbscript/vbdisp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 4721753..27c4aa3 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -157,7 +157,7 @@ static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD f } break; case DISPATCH_PROPERTYPUT: - if(!(prop->flags & (BP_GET|BP_GETPUT))) { + if(!(prop->flags & BP_GETPUT)) { FIXME("property does not support DISPATCH_PROPERTYPUT\n"); return E_FAIL; }

1 0

Jacek Caban : vbscript: Added StrReverse implementation.
by Alexandre Julliard 28 Sep '12

28 Sep '12

Module: wine Branch: master Commit: 46fbe490692ff88ca3f39e1a8ce90856893d4bff URL: http://source.winehq.org/git/wine.git/?a=commit;h=46fbe490692ff88ca3f39e1a8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 28 11:49:48 2012 +0200 vbscript: Added StrReverse implementation. --- dlls/vbscript/global.c | 21 +++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 9 +++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 9fb6a4d..3f88207 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1187,8 +1187,25 @@ static HRESULT Global_Replace(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, V static HRESULT Global_StrReverse(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + WCHAR *ptr1, *ptr2, ch; + BSTR ret; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + hres = to_string(arg, &ret); + if(FAILED(hres)) + return hres; + + ptr1 = ret; + ptr2 = ret + SysStringLen(ret)-1; + while(ptr1 < ptr2) { + ch = *ptr1; + *ptr1++ = *ptr2; + *ptr2-- = ch; + } + + return return_bstr(res, ret); } static HRESULT Global_InStrRev(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 97ca5e0..9e39a0f 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -196,6 +196,15 @@ Call ok(Space(5.2) = " ", "Space(5.2) = " & Space(5.2) & """") Call ok(Space(5.8) = " ", "Space(5.8) = " & Space(5.8) & """") Call ok(Space(5.5) = " ", "Space(5.5) = " & Space(5.5) & """") +Sub TestStrReverse(str, ex) + Call ok(StrReverse(str) = ex, "StrReverse(" & str & ") = " & StrReverse(str)) +End Sub + +TestStrReverse "test", "tset" +TestStrReverse "", "" +TestStrReverse 123, "321" +if isEnglishLang then TestStrReverse true, "eurT" + Sub TestRound(val, exval, vt) Call ok(Round(val) = exval, "Round(" & val & ") = " & Round(val)) Call ok(getVT(Round(val)) = vt, "getVT(Round(" & val & ")) = " & getVT(Round(val)))

1 0

Jacek Caban : vbscript: Added Now() implementation.
by Alexandre Julliard 28 Sep '12

28 Sep '12

Module: wine Branch: master Commit: 9554e44e470012a2b9d370b9903a41226624cb59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9554e44e470012a2b9d370b99… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 28 11:49:30 2012 +0200 vbscript: Added Now() implementation. --- dlls/vbscript/global.c | 19 +++++++++++++++++-- dlls/vbscript/tests/api.vbs | 2 ++ dlls/vbscript/tests/run.c | 2 ++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index bf423b4..9fb6a4d 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -130,6 +130,15 @@ static inline HRESULT return_null(VARIANT *res) return S_OK; } +static inline HRESULT return_date(VARIANT *res, double date) +{ + if(res) { + V_VT(res) = VT_DATE; + V_DATE(res) = date; + } + return S_OK; +} + static HRESULT to_int(VARIANT *v, int *ret) { switch(V_VT(v)) { @@ -967,8 +976,14 @@ static HRESULT Global_Sgn(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA static HRESULT Global_Now(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + SYSTEMTIME lt; + double date; + + TRACE("\n"); + + GetLocalTime(&lt); + SystemTimeToVariantTime(&lt, &date); + return return_date(res, date); } static HRESULT Global_Date(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 78e4a8b..97ca5e0 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -232,4 +232,6 @@ if isEnglishLang then Call ok(MonthName(12, true) = "Dec", "MonthName(12, true) = " & MonthName(12, true)) end if +Call ok(getVT(Now()) = "VT_DATE", "getVT(Now()) = " & getVT(Now())) + Call reportSuccess() diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 3f68717..8c541bd 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -173,6 +173,8 @@ static const char *vt2a(VARIANT *v) return "VT_I4"; case VT_R8: return "VT_R8"; + case VT_DATE: + return "VT_DATE"; case VT_BSTR: return "VT_BSTR"; case VT_DISPATCH:

1 0

Frédéric Delanoy : cmd: Reuse common string constants.
by Alexandre Julliard 28 Sep '12

28 Sep '12

Module: wine Branch: master Commit: c5a4878f5f9deee7ae3061a3d243fa0398e6c8f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5a4878f5f9deee7ae3061a3d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Sep 28 11:13:16 2012 +0200 cmd: Reuse common string constants. --- programs/cmd/builtins.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 8421194..57ac339 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2241,9 +2241,8 @@ static int WCMD_compare( const void *a, const void *b ) { int r; const WCHAR * const *str_a = a, * const *str_b = b; - static const WCHAR eqW[] = {'=','\0'}; r = CompareStringW( LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - *str_a, strcspnW(*str_a, eqW), *str_b, strcspnW(*str_b, eqW) ); + *str_a, strcspnW(*str_a, equalW), *str_b, strcspnW(*str_b, equalW) ); if( r == CSTR_LESS_THAN ) return -1; if( r == CSTR_GREATER_THAN ) return 1; return 0;

1 0

Frédéric Delanoy : cmd: Spelling fixes.
by Alexandre Julliard 28 Sep '12

28 Sep '12

Module: wine Branch: master Commit: 8b3d4942476b288fa52c07cadd3c3c0367d0c8fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b3d4942476b288fa52c07cad… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Sep 28 11:13:15 2012 +0200 cmd: Spelling fixes. --- programs/cmd/batch.c | 4 ++-- programs/cmd/wcmdmain.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index d24b11e..4926b1f 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -117,7 +117,7 @@ void WCMD_batch (WCHAR *file, WCHAR *command, BOOL called, WCHAR *startLabel, HA * n [I] # of the parameter to return, counted from 0 * start [O] Optional. Pointer to the first char of param n in s * end [O] Optional. Pointer to the last char of param n in s - * raw [I] True to return the parameter in raw format (quotes maintainted) + * raw [I] True to return the parameter in raw format (quotes maintained) * False returns the parameter with quotes stripped * * RETURNS @@ -152,7 +152,7 @@ WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **start, WCHAR **end, BOOL raw) p++; if (*p == '\0') return param; - /* If we have reached the token number we want, remember the beginning of it if it */ + /* If we have reached the token number we want, remember the beginning of it */ if (start != NULL && curParamNb == n) *start = p; /* Return the whole word up to the next delimiter, handling quotes in the middle diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index c0d4925..82ec153 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1852,7 +1852,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE curRedirsLen = 0; curCopyTo = curString; curLen = &curStringLen; - lastWasRedirect = FALSE; /* Required for eg spaces between > and filename */ + lastWasRedirect = FALSE; /* Required e.g. for spaces between > and filename */ /* Parse every character on the line being processed */ while (*curPos != 0x00) { @@ -1864,7 +1864,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE lastWasWhiteSpace, onlyWhiteSpace); */ - /* Prevent overflow caused by the caret escape char*/ + /* Prevent overflow caused by the caret escape char */ if (*curLen >= MAXSTRING) { WINE_ERR("Overflow detected in command\n"); return NULL; @@ -2202,7 +2202,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE if (!WCMD_fgets(extraData, MAXSTRING, readFrom)) break; - /* Edge case for carets - a completely blank line (ie was just + /* Edge case for carets - a completely blank line (i.e. was just CRLF) is oddly added as an LF but then more data is received (but only once more!) */ if (lastWasCaret) {

1 0

Christian Costa : dmusic: Check returned value of GetPortCaps.
by Alexandre Julliard 28 Sep '12

28 Sep '12

Module: wine Branch: master Commit: 58f34f509b926619a512025e89b7299fe8a2d038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58f34f509b926619a512025e8… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Sep 28 08:59:36 2012 +0200 dmusic: Check returned value of GetPortCaps. --- dlls/dmusic/dmusic.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 2977cd9..11968ed 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -395,10 +395,8 @@ static void create_system_ports_list(IDirectMusic8Impl* object) hr = IDirectMusicSynth8_GetPortCaps(synth, &port->caps); IDirectMusicSynth8_Release(synth); } - else - { + if (FAILED(hr)) nb_ports--; - } object->nb_system_ports = nb_ports; }

1 0

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 September 2012