January 2015 - Wine-commits

Gerald Pfeifer : makefiles: Support building with non-default LD.
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: wine Branch: master Commit: 189ffc2e7313e901822caa7f76d1fe3961e922e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=189ffc2e7313e901822caa7f7… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Jan 14 10:52:48 2015 +0100 makefiles: Support building with non-default LD. --- Make.vars.in | 1 + configure | 93 +++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 1 + tools/winegcc/Makefile.in | 1 + tools/winegcc/winegcc.c | 2 + 5 files changed, 98 insertions(+) diff --git a/Make.vars.in b/Make.vars.in index ee8ee39..e825f4b 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -40,6 +40,7 @@ RANLIB = @RANLIB@ STRIP = @STRIP@ LN_S = @LN_S@ TOOLSDIR = @TOOLSDIR@ +LD = @LD@ LDFLAGS = @LDFLAGS@ DLLFLAGS = @DLLFLAGS@ PRELINK = @PRELINK@ diff --git a/configure b/configure index 817ddd7..c0aa93e 100755 --- a/configure +++ b/configure @@ -732,6 +732,7 @@ BISON FLEX TOOLSDIR TARGETFLAGS +LD CPPBIN ac_ct_CXX CXXFLAGS @@ -4737,6 +4738,98 @@ cat >>confdefs.h <<_ACEOF #define EXEEXT "$ac_exeext" _ACEOF +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. +set dummy ${ac_tool_prefix}ld; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_LD+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$LD"; then + ac_cv_prog_LD="$LD" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_LD="${ac_tool_prefix}ld" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +LD=$ac_cv_prog_LD +if test -n "$LD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +$as_echo "$LD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_LD"; then + ac_ct_LD=$LD + # Extract the first word of "ld", so it can be a program name with args. +set dummy ld; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_LD+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_LD"; then + ac_cv_prog_ac_ct_LD="$ac_ct_LD" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_LD="ld" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_LD=$ac_cv_prog_ac_ct_LD +if test -n "$ac_ct_LD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LD" >&5 +$as_echo "$ac_ct_LD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_LD" = x; then + LD="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + LD=$ac_ct_LD + fi +else + LD="$ac_cv_prog_LD" +fi + case $host in *-darwin*) diff --git a/configure.ac b/configure.ac index df3c37b..ab8945a 100644 --- a/configure.ac +++ b/configure.ac @@ -122,6 +122,7 @@ AC_PROG_CXX dnl We can't use AC_PROG_CPP for winegcc, it uses by default $(CC) -E AC_CHECK_TOOL(CPPBIN,cpp,cpp) AC_DEFINE_UNQUOTED(EXEEXT,["$ac_exeext"],[Define to the file extension for executables.]) +AC_CHECK_TOOL(LD,ld) case $host in *-darwin*) diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in index 3975ca5..370a2e4 100644 --- a/tools/winegcc/Makefile.in +++ b/tools/winegcc/Makefile.in @@ -16,6 +16,7 @@ winegcc_EXTRADEFS = \ -DCC="\"$(CC)\"" \ -DCPP="\"$(CPPBIN)\"" \ -DCXX="\"$(CXX)\"" \ + -DLD="\"$(LD)\"" \ -DPRELINK="\"$(PRELINK)\"" winegcc$(EXEEXT): winegcc.o utils.o diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index a2f09d2..3b2794e 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1034,6 +1034,8 @@ static void build(struct options* opts) /* run winebuild to generate the .spec.o file */ spec_args = get_winebuild_args( opts ); strarray_add( spec_args, strmake( "--cc-cmd=%s", build_tool_name( opts, "gcc", CC ))); + strarray_add( spec_args, strmake( "--ld-cmd=%s", build_tool_name( opts, "ld", LD ))); + spec_o_name = get_temp_file(output_name, ".spec.o"); if (opts->force_pointer_size) strarray_add(spec_args, strmake("-m%u", 8 * opts->force_pointer_size ));

1 0

Qian Hong : atl: Improved content type handling of AtlAxCreateControlEx.
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: wine Branch: master Commit: ec52a1f55700989f014851eef0a25641f8bc983a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec52a1f55700989f014851eef… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Jan 16 16:09:36 2015 +0800 atl: Improved content type handling of AtlAxCreateControlEx. --- dlls/atl/Makefile.in | 2 +- dlls/atl/atl_ax.c | 69 +++++++++++++++++++++++++++++++++++++++---------- dlls/atl100/Makefile.in | 2 +- dlls/atl100/tests/atl.c | 8 +++--- dlls/atl110/Makefile.in | 2 +- dlls/atl80/Makefile.in | 2 +- dlls/atl90/Makefile.in | 2 +- 7 files changed, 65 insertions(+), 22 deletions(-) diff --git a/dlls/atl/Makefile.in b/dlls/atl/Makefile.in index 34ae9b8..826a5bf 100644 --- a/dlls/atl/Makefile.in +++ b/dlls/atl/Makefile.in @@ -1,6 +1,6 @@ MODULE = atl.dll IMPORTLIB = atl -IMPORTS = uuid oleaut32 ole32 user32 gdi32 advapi32 +IMPORTS = uuid oleaut32 ole32 user32 gdi32 advapi32 shlwapi EXTRADEFS = -D_ATL_VER=_ATL_VER_30 C_SRCS = \ diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index d16cdfd..15b0550 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -35,6 +35,7 @@ #include "atlbase.h" #include "atliface.h" #include "atlwin.h" +#include "shlwapi.h" #include "wine/unicode.h" @@ -991,6 +992,48 @@ HRESULT WINAPI AtlAxCreateControl(LPCOLESTR lpszName, HWND hWnd, NULL, NULL, NULL ); } +enum content +{ + IsEmpty = 0, + IsGUID = 1, + IsHTML = 2, + IsURL = 3, + IsUnknown = 4 +}; + +static enum content get_content_type(LPCOLESTR name, CLSID *control_id) +{ + WCHAR new_urlW[MAX_PATH]; + DWORD size = MAX_PATH; + WCHAR mshtml_prefixW[] = {'m','s','h','t','m','l',':','\0'}; + + if (!name || !name[0]) + { + WARN("name %s\n", wine_dbgstr_w(name)); + return IsEmpty; + } + + if (CLSIDFromString(name, control_id) == S_OK || + CLSIDFromProgID(name, control_id) == S_OK) + return IsGUID; + + if (PathIsURLW (name) || + UrlApplySchemeW(name, new_urlW, &size, URL_APPLY_GUESSSCHEME|URL_APPLY_GUESSFILE) == S_OK) + { + *control_id = CLSID_WebBrowser; + return IsURL; + } + + if (!strncmpiW(name, mshtml_prefixW, 7)) + { + FIXME("mshtml prefix not implemented\n"); + *control_id = CLSID_WebBrowser; + return IsHTML; + } + + return IsUnknown; +} + /*********************************************************************** * AtlAxCreateControlEx [atl100.@] * @@ -1005,24 +1048,24 @@ HRESULT WINAPI AtlAxCreateControlEx(LPCOLESTR lpszName, HWND hWnd, CLSID controlId; HRESULT hRes; IOleObject *pControl; - IUnknown *pUnkControl; + IUnknown *pUnkControl = NULL; IPersistStreamInit *pPSInit; - IUnknown *pContainer; - enum {IsGUID=0,IsHTML=1,IsURL=2} content; + IUnknown *pContainer = NULL; + enum content content; TRACE("(%s %p %p %p %p %p %p)\n", debugstr_w(lpszName), hWnd, pStream, ppUnkContainer, ppUnkControl, iidSink, punkSink); - hRes = CLSIDFromString( lpszName, &controlId ); - if ( FAILED(hRes) ) - hRes = CLSIDFromProgID( lpszName, &controlId ); - if ( SUCCEEDED( hRes ) ) - content = IsGUID; - else { - /* FIXME - check for MSHTML: prefix! */ - content = IsURL; - controlId = CLSID_WebBrowser; - } + if (ppUnkContainer) *ppUnkContainer = NULL; + if (ppUnkControl) *ppUnkControl = NULL; + + content = get_content_type(lpszName, &controlId); + + if (content == IsEmpty) + return S_OK; + + if (content == IsUnknown) + return CO_E_CLASSSTRING; hRes = CoCreateInstance( &controlId, 0, CLSCTX_ALL, &IID_IOleObject, (void**) &pControl ); diff --git a/dlls/atl100/Makefile.in b/dlls/atl100/Makefile.in index 916bd8e..719afe0 100644 --- a/dlls/atl100/Makefile.in +++ b/dlls/atl100/Makefile.in @@ -1,6 +1,6 @@ MODULE = atl100.dll IMPORTLIB = atl100 -IMPORTS = uuid ole32 oleaut32 user32 gdi32 advapi32 +IMPORTS = uuid ole32 oleaut32 user32 gdi32 advapi32 shlwapi EXTRADEFS = -D_ATL_VER=_ATL_VER_100 PARENTSRC = ../atl diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index 8cf0a32..699af0a 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -643,8 +643,8 @@ static void test_ax_win(void) ok(hwnd != NULL, "CreateWindow failed!\n"); control = (IUnknown *)0xdeadbeef; res = AtlAxGetControl(hwnd, &control); - todo_wine ok(res == E_FAIL, "Expected E_FAIL, returned %08x\n", res); - todo_wine ok(!control, "returned %p\n", control); + ok(res == E_FAIL, "Expected E_FAIL, returned %08x\n", res); + ok(!control, "returned %p\n", control); if (control) IUnknown_Release(control); DestroyWindow(hwnd); @@ -652,8 +652,8 @@ static void test_ax_win(void) ok(hwnd != NULL, "CreateWindow failed!\n"); control = (IUnknown *)0xdeadbeef; res = AtlAxGetControl(hwnd, &control); - todo_wine ok(res == E_FAIL, "Expected E_FAIL, returned %08x\n", res); - todo_wine ok(!control, "returned %p\n", control); + ok(res == E_FAIL, "Expected E_FAIL, returned %08x\n", res); + ok(!control, "returned %p\n", control); if (control) IUnknown_Release(control); DestroyWindow(hwnd); diff --git a/dlls/atl110/Makefile.in b/dlls/atl110/Makefile.in index ced0f18..49ba933 100644 --- a/dlls/atl110/Makefile.in +++ b/dlls/atl110/Makefile.in @@ -1,5 +1,5 @@ MODULE = atl110.dll -IMPORTS = oleaut32 ole32 user32 gdi32 advapi32 uuid +IMPORTS = oleaut32 ole32 user32 gdi32 advapi32 uuid shlwapi EXTRADEFS = -D_ATL_VER=_ATL_VER_110 PARENTSRC = ../atl diff --git a/dlls/atl80/Makefile.in b/dlls/atl80/Makefile.in index 4b7bbd7..b3a5a9c 100644 --- a/dlls/atl80/Makefile.in +++ b/dlls/atl80/Makefile.in @@ -1,6 +1,6 @@ MODULE = atl80.dll IMPORTLIB = atl80 -IMPORTS = oleaut32 user32 ole32 gdi32 advapi32 uuid +IMPORTS = oleaut32 user32 ole32 gdi32 advapi32 uuid shlwapi EXTRADEFS = -D_ATL_VER=_ATL_VER_80 PARENTSRC = ../atl diff --git a/dlls/atl90/Makefile.in b/dlls/atl90/Makefile.in index 5fed63b..d3aebe6 100644 --- a/dlls/atl90/Makefile.in +++ b/dlls/atl90/Makefile.in @@ -1,5 +1,5 @@ MODULE = atl90.dll -IMPORTS = oleaut32 user32 ole32 gdi32 advapi32 uuid +IMPORTS = oleaut32 user32 ole32 gdi32 advapi32 uuid shlwapi EXTRADEFS = -D_ATL_VER=_ATL_VER_90 PARENTSRC = ../atl

1 0

Qian Hong : atl100/tests: Added tests for AtlAxCreateControlEx.
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: wine Branch: master Commit: 412a070e49ae97918ae7fe4a7a9db7547acf89b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=412a070e49ae97918ae7fe4a7… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Jan 16 16:09:50 2015 +0800 atl100/tests: Added tests for AtlAxCreateControlEx. --- dlls/atl100/tests/atl.c | 191 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 173 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=412a070e49ae97918ae7f…

1 0

André Hentschel : odbc32: Add winediag message when no drivers could be found.
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: wine Branch: master Commit: b5732b1c2ee7ca631bdabc0e45483a2ccaefcd40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5732b1c2ee7ca631bdabc0e4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 21 23:16:41 2015 +0100 odbc32: Add winediag message when no drivers could be found. --- dlls/odbc32/proxyodbc.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 89cf154..66b3a65 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -49,6 +49,7 @@ static BOOL ODBC_LoadDriverManager(void); static BOOL ODBC_LoadDMFunctions(void); WINE_DEFAULT_DEBUG_CHANNEL(odbc); +WINE_DECLARE_DEBUG_CHANNEL(winediag); static SQLRETURN (*pSQLAllocConnect)(SQLHENV,SQLHDBC*); static SQLRETURN (*pSQLAllocEnv)(SQLHENV*); @@ -1914,11 +1915,19 @@ SQLRETURN WINAPI SQLDrivers( SQLSMALLINT cbDriverAttrMax, SQLSMALLINT *pcbDriverAttr) { - TRACE("\n"); + SQLRETURN ret; + + TRACE("direction=%d\n", fDirection); if (!pSQLDrivers) return SQL_ERROR; - return pSQLDrivers(henv, fDirection, szDriverDesc, cbDriverDescMax, pcbDriverDesc, - szDriverAttributes, cbDriverAttrMax, pcbDriverAttr); + ret = pSQLDrivers(henv, fDirection, szDriverDesc, cbDriverDescMax, pcbDriverDesc, + szDriverAttributes, cbDriverAttrMax, pcbDriverAttr); + + if (ret == SQL_NO_DATA && fDirection == SQL_FETCH_FIRST) + ERR_(winediag)("No ODBC drivers could be found. " + "Check the settings for your libodbc provider.\n"); + + return ret; } @@ -2647,11 +2656,19 @@ SQLRETURN WINAPI SQLDriversW( SQLSMALLINT cbDriverAttrMax, SQLSMALLINT *pcbDriverAttr) { - TRACE("\n"); + SQLRETURN ret; + + TRACE("direction=%d\n", fDirection); if (!pSQLDriversW) return SQL_ERROR; - return pSQLDriversW(henv, fDirection, szDriverDesc, cbDriverDescMax, pcbDriverDesc, - szDriverAttributes, cbDriverAttrMax, pcbDriverAttr); + ret = pSQLDriversW(henv, fDirection, szDriverDesc, cbDriverDescMax, pcbDriverDesc, + szDriverAttributes, cbDriverAttrMax, pcbDriverAttr); + + if (ret == SQL_NO_DATA && fDirection == SQL_FETCH_FIRST) + ERR_(winediag)("No ODBC drivers could be found. " + "Check the settings for your libodbc provider.\n"); + + return ret; } /*************************************************************************

1 0

Hao Peng : wbemprox: Implement Win32_Processor.ProcessorType.
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: wine Branch: master Commit: fd08da6035d2bfcd11818b9a7c1f2ad86a6172af URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd08da6035d2bfcd11818b9a7… Author: Hao Peng <penghao(a)linuxdeepin.com> Date: Thu Jan 22 12:07:48 2015 +0800 wbemprox: Implement Win32_Processor.ProcessorType. --- dlls/wbemprox/builtin.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 80a1657..f566359 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -240,6 +240,8 @@ static const WCHAR prop_processidW[] = {'P','r','o','c','e','s','s','I','D',0}; static const WCHAR prop_processoridW[] = {'P','r','o','c','e','s','s','o','r','I','d',0}; +static const WCHAR prop_processortypeW[] = + {'P','r','o','c','e','s','s','o','r','T','y','p','e',0}; static const WCHAR prop_productW[] = {'P','r','o','d','u','c','t',0}; static const WCHAR prop_productnameW[] = @@ -481,6 +483,7 @@ static const struct column col_processor[] = { prop_numcoresW, CIM_UINT32, VT_I4 }, { prop_numlogicalprocessorsW, CIM_UINT32, VT_I4 }, { prop_processoridW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_processortypeW, CIM_UINT16, VT_I4 }, { prop_uniqueidW, CIM_STRING } }; static const struct column col_qualifier[] = @@ -809,6 +812,7 @@ struct record_processor UINT32 num_cores; UINT32 num_logical_processors; const WCHAR *processor_id; + UINT16 processortype; const WCHAR *unique_id; }; struct record_qualifier @@ -2121,6 +2125,7 @@ static enum fill_status fill_processor( struct table *table, const struct expr * rec->num_cores = num_cores; rec->num_logical_processors = num_logical_processors; rec->processor_id = heap_strdupW( processor_id ); + rec->processortype = 3; /* central processor */ rec->unique_id = NULL; if (!match_row( table, i, cond, &status )) {

1 0

Hao Peng : wbemprox: Implement Win32_DiskDrive.PNPDeviceID.
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: wine Branch: master Commit: c0020b3ac39712f20f3c040d308dca76ea1a059d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0020b3ac39712f20f3c040d3… Author: Hao Peng <penghao(a)linuxdeepin.com> Date: Thu Jan 22 15:08:38 2015 +0800 wbemprox: Implement Win32_DiskDrive.PNPDeviceID. --- dlls/wbemprox/builtin.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index f566359..922f6c5 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -366,6 +366,7 @@ static const struct column col_diskdrive[] = { prop_manufacturerW, CIM_STRING }, { prop_mediatypeW, CIM_STRING }, { prop_modelW, CIM_STRING }, + { prop_pnpdeviceidW, CIM_STRING }, { prop_serialnumberW, CIM_STRING }, { prop_sizeW, CIM_UINT64 } }; @@ -595,6 +596,8 @@ static const WCHAR diskdrive_mediatype_removableW[] = {'R','e','m','o','v','a','b','l','e',' ','m','e','d','i','a',0}; static const WCHAR diskdrive_modelW[] = {'W','i','n','e',' ','D','i','s','k',' ','D','r','i','v','e',0}; +static const WCHAR diskdrive_pnpdeviceidW[] = + {'I','D','E','\\','D','i','s','k','\\','V','E','N','_','W','I','N','E',0}; static const WCHAR diskdrive_serialW[] = {'W','I','N','E','H','D','I','S','K',0}; static const WCHAR networkadapter_pnpdeviceidW[]= @@ -695,6 +698,7 @@ struct record_diskdrive const WCHAR *manufacturer; const WCHAR *mediatype; const WCHAR *model; + const WCHAR *pnpdevice_id; const WCHAR *serialnumber; UINT64 size; }; @@ -1621,6 +1625,7 @@ static enum fill_status fill_diskdrive( struct table *table, const struct expr * else rec->mediatype = diskdrive_mediatype_removableW; rec->model = diskdrive_modelW; + rec->pnpdevice_id = diskdrive_pnpdeviceidW; rec->serialnumber = diskdrive_serialW; get_freespace( root, &size ); rec->size = size;

1 0

Hao Peng : wbemprox: Implement Win32_BaseBoard.Version.
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: wine Branch: master Commit: d5d4c19226273efe1ce1a11782bfbd70e58a70d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5d4c19226273efe1ce1a1178… Author: Hao Peng <penghao(a)linuxdeepin.com> Date: Thu Jan 22 15:51:40 2015 +0800 wbemprox: Implement Win32_BaseBoard.Version. --- 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 922f6c5..7c22ad8 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -311,7 +311,8 @@ static const struct column col_baseboard[] = { prop_nameW, CIM_STRING }, { prop_productW, CIM_STRING }, { prop_serialnumberW, CIM_STRING }, - { prop_tagW, CIM_STRING|COL_FLAG_KEY } + { prop_tagW, CIM_STRING|COL_FLAG_KEY }, + { prop_versionW, CIM_STRING } }; static const struct column col_bios[] = { @@ -552,6 +553,8 @@ static const WCHAR baseboard_serialnumberW[] = {'N','o','n','e',0}; static const WCHAR baseboard_tagW[] = {'B','a','s','e',' ','B','o','a','r','d',0}; +static const WCHAR baseboard_versionW[] = + {'1','.','0',0}; static const WCHAR bios_descriptionW[] = {'D','e','f','a','u','l','t',' ','S','y','s','t','e','m',' ','B','I','O','S',0}; static const WCHAR bios_manufacturerW[] = @@ -644,6 +647,7 @@ struct record_baseboard const WCHAR *product; const WCHAR *serialnumber; const WCHAR *tag; + const WCHAR *version; }; struct record_bios { @@ -881,7 +885,7 @@ struct record_videocontroller static const struct record_baseboard data_baseboard[] = { - { baseboard_manufacturerW, baseboard_tagW, baseboard_tagW, baseboard_tagW, baseboard_serialnumberW, baseboard_tagW } + { baseboard_manufacturerW, baseboard_tagW, baseboard_tagW, baseboard_tagW, baseboard_serialnumberW, baseboard_versionW } }; static const struct record_bios data_bios[] = {

1 0

Michael Stefaniuc : strmbase: Remove an unused assignment (PVS-Studio).
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: wine Branch: master Commit: 0f2eca579d884a8ffeb4da4459e1f263f5049393 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f2eca579d884a8ffeb4da445… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 22 10:58:17 2015 +0100 strmbase: Remove an unused assignment (PVS-Studio). --- dlls/strmbase/dllfunc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/strmbase/dllfunc.c b/dlls/strmbase/dllfunc.c index d36c919..61ec283 100644 --- a/dlls/strmbase/dllfunc.c +++ b/dlls/strmbase/dllfunc.c @@ -169,7 +169,7 @@ HRESULT WINAPI AMovieDllRegisterServer2(BOOL bRegister) if (bRegister) hr = SetupRegisterAllClasses(g_Templates, g_cTemplates, szFileName, TRUE ); - hr = CoInitialize(NULL); + CoInitialize(NULL); TRACE("Getting IFilterMapper2\r\n"); hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER,

1 0

Michael Stefaniuc : strmbase: Handle the failure of CoCreateInstance ( PVS-Studio).
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: wine Branch: master Commit: 9fb737de34da2a3cc0f8766012fd86227e3f6d16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fb737de34da2a3cc0f876601… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 22 11:01:44 2015 +0100 strmbase: Handle the failure of CoCreateInstance (PVS-Studio). --- dlls/strmbase/pospass.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/strmbase/pospass.c b/dlls/strmbase/pospass.c index b7ba811..e547328 100644 --- a/dlls/strmbase/pospass.c +++ b/dlls/strmbase/pospass.c @@ -236,6 +236,8 @@ HRESULT WINAPI CreatePosPassThru(IUnknown* pUnkOuter, BOOL bRenderer, IPin *pPin ISeekingPassThru *passthru; hr = CoCreateInstance(&CLSID_SeekingPassThru, pUnkOuter, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)ppPassThru); + if (FAILED(hr)) + return hr; IUnknown_QueryInterface(*ppPassThru, &IID_ISeekingPassThru, (void**)&passthru); hr = ISeekingPassThru_Init(passthru, bRenderer, pPin);

1 0

Michael Stefaniuc : user32/tests: Remove an unused assignment (PVS-Studio) .
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: wine Branch: master Commit: 937146ae33b538d582a5ec073321cb0e6ea302eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=937146ae33b538d582a5ec073… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 22 11:05:51 2015 +0100 user32/tests: Remove an unused assignment (PVS-Studio). --- dlls/user32/tests/dde.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index b1a9391..984076b 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -776,7 +776,6 @@ static HDDEDATA CALLBACK server_ddeml_callback(UINT uType, UINT uFmt, HCONV hcon else if (msg_index == 10) { DWORD rsize = 0; - size = 0; size = DdeGetData(hdata, NULL, 0, 0); ok(size == 17, "DdeGetData should have returned 17 not %d\n", size);

1 0