July 2013 - Wine-Commits - list.winehq.org

Vincent Povirk : advpack/tests: Add test for LaunchINFSectionEx with quoted filename.
by Alexandre Julliard July 29, 2013

July 29, 2013

Module: wine Branch: master Commit: 17f6609702c71a53d26c30e60e20578fb1e3531c URL: http://source.winehq.org/git/wine.git/?a=commit;h=17f6609702c71a53d26c30e60… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jul 22 14:46:12 2013 -0500 advpack/tests: Add test for LaunchINFSectionEx with quoted filename. --- dlls/advpack/tests/install.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/advpack/tests/install.c b/dlls/advpack/tests/install.c index 4876d71..932f2da 100644 --- a/dlls/advpack/tests/install.c +++ b/dlls/advpack/tests/install.c @@ -237,6 +237,13 @@ static void test_LaunchINFSectionEx(void) hr = pLaunchINFSectionEx(NULL, NULL, cmdline, 0); ok(hr == 0, "Expected 0, got %d\n", hr); + /* try quoting the parameters */ + lstrcpy(cmdline, "\""); + lstrcat(cmdline, CURR_DIR); + lstrcat(cmdline, "\\test.inf\",\"DefaultInstall\",\"c:,imacab.cab\",\"4\""); + hr = pLaunchINFSectionEx(NULL, NULL, cmdline, 0); + todo_wine ok(hr == 0, "Expected 0, got %d\n", hr); + /* The 'No UI' flag seems to have no effect whatsoever on Windows. * So only do this test in interactive mode. */

1 0

Christian Costa : d3dx9_36: Release shader if getting constant table fails in D3DXCompileShader.
by Alexandre Julliard July 29, 2013

July 29, 2013

Module: wine Branch: master Commit: a8728893b7ed793a1f57f47e948f838244cdd95b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8728893b7ed793a1f57f47e9… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Jul 23 08:20:30 2013 +0200 d3dx9_36: Release shader if getting constant table fails in D3DXCompileShader. --- dlls/d3dx9_36/shader.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 15dbb7a..457036b 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -368,7 +368,14 @@ HRESULT WINAPI D3DXCompileShader(const char *data, UINT length, const D3DXMACRO function, profile, flags, 0, (ID3DBlob **)shader, (ID3DBlob **)error_msgs); if (SUCCEEDED(hr) && constant_table) + { hr = D3DXGetShaderConstantTable(ID3DXBuffer_GetBufferPointer(*shader), constant_table); + if (FAILED(hr)) + { + ID3DXBuffer_Release(*shader); + *shader = NULL; + } + } return hr; }

1 0

Alistair Leslie-Hughes : oledb32: Add support for IErrorRecords.
by Alexandre Julliard July 29, 2013

July 29, 2013

Module: wine Branch: master Commit: a32391ab6b8857215b8d0f8ca0392958f4a4e8bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a32391ab6b8857215b8d0f8ca… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 18 10:22:57 2013 +1000 oledb32: Add support for IErrorRecords. --- dlls/msdaps/usrmarshal.c | 183 ++++++++++++++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/errrec.idl | 78 ++++++++++++++++++++ include/oledb.idl | 1 + tools/make_makefiles | 1 + 5 files changed, 264 insertions(+), 0 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 7bbaa7b..b93340e 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1096,3 +1096,186 @@ HRESULT __RPC_STUB ISourcesRowset_GetSourcesRowset_Stub(ISourcesRowset* This, IU return hr; } + +HRESULT CALLBACK IErrorRecords_GetRecordCount_Proxy(IErrorRecords* This, ULONG *records) +{ + HRESULT hr; + IErrorInfo *error; + + TRACE("(%p)->%p\n", This, records); + + hr = IErrorRecords_RemoteGetRecordCount_Proxy(This, records, &error); + if(error) + { + SetErrorInfo(0, error); + IErrorInfo_Release(error); + } + + return hr; +} + +HRESULT __RPC_STUB IErrorRecords_GetRecordCount_Stub(IErrorRecords* This, ULONG *pcRecords, IErrorInfo **ppErrorInfoRem) +{ + HRESULT hr; + + TRACE("(%p)->%p %p\n", This, pcRecords, ppErrorInfoRem); + + *ppErrorInfoRem = NULL; + hr = IErrorRecords_GetRecordCount(This, pcRecords); + if(FAILED(hr)) + GetErrorInfo(0, ppErrorInfoRem); + + return hr; +} + +HRESULT CALLBACK IErrorRecords_GetErrorParameters_Proxy(IErrorRecords* This, ULONG ulRecordNum, DISPPARAMS *pdispparams) +{ + HRESULT hr; + IErrorInfo *error; + + TRACE("(%p)->%d %p\n", This, ulRecordNum, pdispparams); + + hr = IErrorRecords_RemoteGetErrorParameters_Proxy(This, ulRecordNum, pdispparams, &error); + if(error) + { + SetErrorInfo(0, error); + IErrorInfo_Release(error); + } + + return hr; +} + +HRESULT __RPC_STUB IErrorRecords_GetErrorParameters_Stub(IErrorRecords* This, ULONG ulRecordNum, DISPPARAMS *pdispparams, + IErrorInfo **ppErrorInfoRem) +{ + HRESULT hr; + + TRACE("(%p)->%d %p %p\n", This, ulRecordNum, pdispparams, ppErrorInfoRem); + + *ppErrorInfoRem = NULL; + hr = IErrorRecords_GetErrorParameters(This, ulRecordNum, pdispparams); + if(FAILED(hr)) + GetErrorInfo(0, ppErrorInfoRem); + + return hr; +} + +HRESULT CALLBACK IErrorRecords_GetErrorInfo_Proxy(IErrorRecords* This, ULONG ulRecordNum, LCID lcid, IErrorInfo **ppErrorInfo) +{ + HRESULT hr; + IErrorInfo *error; + + TRACE("(%p)->%d %d %p\n", This, ulRecordNum, lcid, ppErrorInfo); + + hr = IErrorRecords_RemoteGetErrorInfo_Proxy(This, ulRecordNum, lcid, ppErrorInfo, &error); + if(error) + { + SetErrorInfo(0, error); + IErrorInfo_Release(error); + } + + return hr; +} + +HRESULT __RPC_STUB IErrorRecords_GetErrorInfo_Stub(IErrorRecords* This, ULONG ulRecordNum, LCID lcid, + IErrorInfo **ppErrorInfo, IErrorInfo **ppErrorInfoRem) +{ + HRESULT hr; + + TRACE("(%p)->%d %d %p %p\n", This, ulRecordNum, lcid, ppErrorInfo, ppErrorInfoRem); + + *ppErrorInfoRem = NULL; + hr = IErrorRecords_GetErrorInfo(This, ulRecordNum, lcid, ppErrorInfo); + if(FAILED(hr)) + GetErrorInfo(0, ppErrorInfoRem); + + return hr; +} + +HRESULT CALLBACK IErrorRecords_GetCustomErrorObject_Proxy(IErrorRecords* This, ULONG ulRecordNum, REFIID riid, + IUnknown **ppObject) +{ + HRESULT hr; + IErrorInfo *error; + + TRACE("(%p)->%d %s %p\n", This, ulRecordNum, debugstr_guid(riid), ppObject); + + hr = IErrorRecords_RemoteGetCustomErrorObject_Proxy(This, ulRecordNum, riid, ppObject, &error); + if(error) + { + SetErrorInfo(0, error); + IErrorInfo_Release(error); + } + return hr; +} + +HRESULT __RPC_STUB IErrorRecords_GetCustomErrorObject_Stub(IErrorRecords* This, ULONG ulRecordNum, REFIID riid, + IUnknown **ppObject, IErrorInfo **ppErrorInfoRem) +{ + HRESULT hr; + + TRACE("(%p)->%d %s %p %p\n", This, ulRecordNum, debugstr_guid(riid), ppObject, ppErrorInfoRem); + + *ppErrorInfoRem = NULL; + hr = IErrorRecords_GetCustomErrorObject(This, ulRecordNum, riid, ppObject); + if(FAILED(hr)) + GetErrorInfo(0, ppErrorInfoRem); + + return hr; +} + +HRESULT CALLBACK IErrorRecords_GetBasicErrorInfo_Proxy(IErrorRecords* This, ULONG ulRecordNum, ERRORINFO *pErrorInfo) +{ + TRACE("(%p)->%d %p\n", This, ulRecordNum, pErrorInfo); + + return IErrorRecords_GetBasicErrorInfo_Proxy(This, ulRecordNum, pErrorInfo); +} + +HRESULT __RPC_STUB IErrorRecords_GetBasicErrorInfo_Stub(IErrorRecords* This, ULONG ulRecordNum, ERRORINFO *pErrorInfo, + IErrorInfo **ppErrorInfoRem) +{ + HRESULT hr; + + TRACE("(%p)->%d %p %p\n", This, ulRecordNum, pErrorInfo, ppErrorInfoRem); + + *ppErrorInfoRem = NULL; + hr = IErrorRecords_GetBasicErrorInfo(This, ulRecordNum, pErrorInfo); + if(FAILED(hr)) + GetErrorInfo(0, ppErrorInfoRem); + + return hr; +} + +HRESULT CALLBACK IErrorRecords_AddErrorRecord_Proxy(IErrorRecords* This, ERRORINFO *pErrorInfo, DWORD dwLookupID, + DISPPARAMS *pdispparams, IUnknown *punkCustomError, DWORD dwDynamicErrorID) +{ + HRESULT hr; + IErrorInfo *error; + + TRACE("(%p)->%p %d %p %p %d\n", This, pErrorInfo, dwLookupID, pdispparams, punkCustomError, dwDynamicErrorID); + + hr = IErrorRecords_RemoteAddErrorRecord_Proxy(This, pErrorInfo, dwLookupID, pdispparams, punkCustomError, + dwDynamicErrorID, &error); + if(error) + { + SetErrorInfo(0, error); + IErrorInfo_Release(error); + } + return hr; +} + +HRESULT __RPC_STUB IErrorRecords_AddErrorRecord_Stub(IErrorRecords* This, ERRORINFO *pErrorInfo, DWORD dwLookupID, + DISPPARAMS *pdispparams, IUnknown *punkCustomError, DWORD dwDynamicErrorID, IErrorInfo **ppErrorInfoRem) +{ + HRESULT hr; + + TRACE("(%p)->%p %d %p %p %d %p\n", This, pErrorInfo, dwLookupID, pdispparams, punkCustomError, + dwDynamicErrorID, ppErrorInfoRem); + + *ppErrorInfoRem = NULL; + hr = IErrorRecords_AddErrorRecord(This, pErrorInfo, dwLookupID, pdispparams, punkCustomError, dwDynamicErrorID); + if(FAILED(hr)) + GetErrorInfo(0, ppErrorInfoRem); + + return hr; +} diff --git a/include/Makefile.in b/include/Makefile.in index 9a06ac6..a56c6bd 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -288,6 +288,7 @@ SRCDIR_INCLUDES = \ dyngraph.idl \ errorrep.h \ errors.h \ + errrec.idl \ evcode.h \ evntprov.h \ evntrace.h \ diff --git a/include/errrec.idl b/include/errrec.idl new file mode 100644 index 0000000..865b3f2 --- /dev/null +++ b/include/errrec.idl @@ -0,0 +1,78 @@ +/* + * Copyright (C) 2013 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +[ + object, + uuid(0c733a67-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IErrorRecords : IUnknown +{ + +cpp_quote("#define IDENTIFIER_SDK_MASK 0xF0000000") +cpp_quote("#define IDENTIFIER_SDK_ERROR 0x10000000") + +typedef struct tagERRORINFO +{ + HRESULT hrError; + DWORD dwMinor; + CLSID clsid; + IID iid; + DISPID dispid; +} ERRORINFO; + + [local] + HRESULT AddErrorRecord([in] ERRORINFO * pErrorInfo, [in] DWORD dwLookupID, [in] DISPPARAMS * pdispparams, + [in] IUnknown * punkCustomError, [in] DWORD dwDynamicErrorID); + + [call_as(AddErrorRecord)] + HRESULT RemoteAddErrorRecord([in] ERRORINFO * pErrorInfo, [in] DWORD dwLookupID, [in] DISPPARAMS * pdispparams, + [in] IUnknown * punkCustomError, [in] DWORD dwDynamicErrorID, [out] IErrorInfo ** ppErrorInfoRem); + + [local] + HRESULT GetBasicErrorInfo([in] ULONG ulRecordNum, [out] ERRORINFO * pErrorInfo); + + [call_as(GetBasicErrorInfo)] + HRESULT RemoteGetBasicErrorInfo([in] ULONG ulRecordNum, [out] ERRORINFO * pErrorInfo, [out] IErrorInfo **ppErrorInfoRem); + + [local] + HRESULT GetCustomErrorObject([in] ULONG ulRecordNum, [in] REFIID riid, [out] IUnknown ** ppObject); + + [call_as(GetCustomErrorObject)] + HRESULT RemoteGetCustomErrorObject([in] ULONG ulRecordNum, [in] REFIID riid, [out] IUnknown ** ppObject, + [out] IErrorInfo **ppErrorInfoRem); + + [local] + HRESULT GetErrorInfo([in] ULONG ulRecordNum, [in] LCID lcid, [out] IErrorInfo **ppErrorInfo); + + [call_as(GetErrorInfo)] + HRESULT RemoteGetErrorInfo([in] ULONG ulRecordNum, [in] LCID lcid, [out] IErrorInfo **ppErrorInfo, + [out] IErrorInfo **ppErrorInfoRem); + + [local] + HRESULT GetErrorParameters([in] ULONG ulRecordNum, [out] DISPPARAMS * pdispparams); + + [call_as(GetErrorParameters)] + HRESULT RemoteGetErrorParameters([in] ULONG ulRecordNum, [out] DISPPARAMS * pdispparams, [out] IErrorInfo ** ppErrorInfoRem); + + [local] + HRESULT GetRecordCount([out] ULONG *records); + + [call_as(GetRecordCount)] + HRESULT RemoteGetRecordCount([out] ULONG * pcRecords, [out] IErrorInfo **ppErrorInfoRem); +} diff --git a/include/oledb.idl b/include/oledb.idl index 0580932..5cd287f 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -66,6 +66,7 @@ typedef DWORD_PTR DBHASHVALUE; #include "rowchg.idl" #include "binres.idl" #include "crtrow.idl" +#include "errrec.idl" cpp_quote("#include <accctrl.h>") diff --git a/tools/make_makefiles b/tools/make_makefiles index bfa904e..6d4e8a7 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -151,6 +151,7 @@ my %private_idl_headers = ( "dbs.idl" => 1, "devenum.idl" => 1, "dyngraph.idl" => 1, + "errrec.idl" => 1, "opnrst.idl" => 1, "row.idl" => 1, "rowchg.idl" => 1,

1 0

Alistair Leslie-Hughes : oledb32: Add interface ISourcesRowset.
by Alexandre Julliard July 29, 2013

July 29, 2013

Module: wine Branch: master Commit: 83c14c723c9f5f4b233881677009fd4def61493b URL: http://source.winehq.org/git/wine.git/?a=commit;h=83c14c723c9f5f4b233881677… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 3 12:29:34 2013 +1000 oledb32: Add interface ISourcesRowset. --- dlls/msdaps/usrmarshal.c | 36 +++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/oledb.idl | 1 + include/srcrst.idl | 53 ++++++++++++++++++++++++++++++++++++++++++++++ tools/make_makefiles | 1 + 5 files changed, 92 insertions(+), 0 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 92bd802..7bbaa7b 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1060,3 +1060,39 @@ HRESULT __RPC_STUB IRowsetNotify_OnRowsetChange_Stub(IRowsetNotify* This, IRowse TRACE("(%p)->(%p %d %d %d)\n", This, rowset, reason, phase, cantdeny); return IRowsetNotify_OnRowsetChange(This, rowset, reason, phase, cantdeny); } + + +HRESULT CALLBACK ISourcesRowset_GetSourcesRowset_Proxy(ISourcesRowset* This, IUnknown *pUnkOuter, REFIID riid, ULONG cPropertySets, + DBPROPSET rgProperties[], IUnknown **ppSourcesRowset) +{ + HRESULT hr; + IErrorInfo *error; + + TRACE("(%p)->(%p %s %d %p %p)\n", This, pUnkOuter, debugstr_guid(riid), cPropertySets, rgProperties, ppSourcesRowset); + + hr = ISourcesRowset_RemoteGetSourcesRowset_Proxy(This, pUnkOuter, riid, cPropertySets, rgProperties, ppSourcesRowset, 0, NULL, &error); + if(error) + { + SetErrorInfo(0, error); + IErrorInfo_Release(error); + } + + return hr; +} + +HRESULT __RPC_STUB ISourcesRowset_GetSourcesRowset_Stub(ISourcesRowset* This, IUnknown *pUnkOuter, REFIID riid, ULONG cPropertySets, + DBPROPSET *rgProperties, IUnknown **ppSourcesRowset, ULONG cTotalProps, DBPROPSTATUS *rgPropStatus, + IErrorInfo **ppErrorInfoRem) +{ + HRESULT hr; + + TRACE("(%p)->(%p %s %d %p %p %d %p %p)\n", This, pUnkOuter, debugstr_guid(riid), cPropertySets, rgProperties, ppSourcesRowset, + cTotalProps, rgPropStatus, ppErrorInfoRem); + + *ppErrorInfoRem = NULL; + hr = ISourcesRowset_GetSourcesRowset(This, pUnkOuter, riid, cPropertySets, rgProperties, ppSourcesRowset); + if(FAILED(hr)) + GetErrorInfo(0, ppErrorInfoRem); + + return hr; +} diff --git a/include/Makefile.in b/include/Makefile.in index c3a39bc..9a06ac6 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -514,6 +514,7 @@ SRCDIR_INCLUDES = \ sql.h \ sqlext.h \ sqltypes.h \ + srcrst.idl \ srrestoreptapi.h \ sspi.h \ sti.h \ diff --git a/include/oledb.idl b/include/oledb.idl index eaa49a6..0580932 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -53,6 +53,7 @@ typedef DWORD_PTR DBHASHVALUE; #include "cmdtxt.idl" #include "dbccmd.idl" #include "dbcses.idl" +#include "srcrst.idl" #include "dbprop.idl" #include "dbinit.idl" #include "dbdsad.idl" diff --git a/include/srcrst.idl b/include/srcrst.idl new file mode 100644 index 0000000..83aae52 --- /dev/null +++ b/include/srcrst.idl @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2013 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +[ + object, + uuid(0c733a1e-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface ISourcesRowset : IUnknown +{ + typedef DWORD DBSOURCETYPE; + + enum DBSOURCETYPEENUM + { + DBSOURCETYPE_DATASOURCE = 1, + DBSOURCETYPE_ENUMERATOR = 2, + }; + + enum DBSOURCETYPEENUM20 + { + DBSOURCETYPE_DATASOURCE_TDP = 1, + DBSOURCETYPE_DATASOURCE_MDP = 3, + }; + + enum DBSOURCETYPEENUM25 + { + DBSOURCETYPE_BINDER = 4, + }; + + [local] + HRESULT GetSourcesRowset([in] IUnknown * pUnkOuter, [in] REFIID riid, [in] ULONG cPropertySets, + [in, out] DBPROPSET rgProperties[], [out] IUnknown **ppSourcesRowset); + + [call_as(GetSourcesRowset)] + HRESULT RemoteGetSourcesRowset([in] IUnknown * pUnkOuter, [in] REFIID riid, [in] ULONG cPropertySets, + [in] DBPROPSET * rgProperties, [out] IUnknown **ppSourcesRowset, [in] ULONG cTotalProps, + [out] DBPROPSTATUS *rgPropStatus, [out] IErrorInfo **ppErrorInfoRem); +} diff --git a/tools/make_makefiles b/tools/make_makefiles index 91b136d..bfa904e 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -158,6 +158,7 @@ my %private_idl_headers = ( "rstinf.idl" => 1, "rstloc.idl" => 1, "rstnot.idl" => 1, + "srcrst.idl" => 1, "sesprp.idl" => 1, "vmrender.idl" => 1, "xmldom.idl" => 1,

1 0

Vincent Povirk : advpack: Handle quoted arguments to rundll exports.
by Alexandre Julliard July 29, 2013

July 29, 2013

Module: wine Branch: master Commit: 531f795623659c77380ff4e79c7445731e2976da URL: http://source.winehq.org/git/wine.git/?a=commit;h=531f795623659c77380ff4e79… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jul 22 16:48:19 2013 -0500 advpack: Handle quoted arguments to rundll exports. --- dlls/advpack/advpack.c | 8 ++++---- dlls/advpack/advpack_private.h | 2 +- dlls/advpack/files.c | 4 ++-- dlls/advpack/install.c | 27 +++++++++++++++++++-------- dlls/advpack/tests/install.c | 2 +- 5 files changed, 27 insertions(+), 16 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 919c0bc..296abb5 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -175,7 +175,7 @@ void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir) FIXME("Need to support changing paths - default will be used\n"); /* set all ldids to dest */ - while ((ptr = get_parameter(&key, ','))) + while ((ptr = get_parameter(&key, ',', FALSE))) { ldid = atolW(ptr); SetupSetDirectoryIdW(hInf, ldid, dest); @@ -508,12 +508,12 @@ HRESULT WINAPI RegisterOCX(HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show) cmdline_ptr = cmdline_copy; lstrcpyW(cmdline_copy, cmdlineW.Buffer); - ocx_filename = get_parameter(&cmdline_ptr, ','); + ocx_filename = get_parameter(&cmdline_ptr, ',', TRUE); if (!ocx_filename || !*ocx_filename) goto done; - str_flags = get_parameter(&cmdline_ptr, ','); - param = get_parameter(&cmdline_ptr, ','); + str_flags = get_parameter(&cmdline_ptr, ',', TRUE); + param = get_parameter(&cmdline_ptr, ',', TRUE); hm = LoadLibraryExW(ocx_filename, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); if (!hm) diff --git a/dlls/advpack/advpack_private.h b/dlls/advpack/advpack_private.h index 5d74897..205cc60 100644 --- a/dlls/advpack/advpack_private.h +++ b/dlls/advpack/advpack_private.h @@ -22,7 +22,7 @@ #define __ADVPACK_PRIVATE_H HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg, const WCHAR *flags, const WCHAR *param) DECLSPEC_HIDDEN; -LPWSTR get_parameter(LPWSTR *params, WCHAR separator) DECLSPEC_HIDDEN; +LPWSTR get_parameter(LPWSTR *params, WCHAR separator, BOOL quoted) DECLSPEC_HIDDEN; void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir) DECLSPEC_HIDDEN; HRESULT launch_exe(LPCWSTR cmd, LPCWSTR dir, HANDLE *phEXE) DECLSPEC_HIDDEN; diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index a1d52f8..1e555f7 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -501,8 +501,8 @@ HRESULT WINAPI DelNodeRunDLL32W(HWND hWnd, HINSTANCE hInst, LPWSTR cmdline, INT lstrcpyW(cmdline_copy, cmdline); /* get the parameters at indexes 0 and 1 respectively */ - szFilename = get_parameter(&cmdline_ptr, ','); - szFlags = get_parameter(&cmdline_ptr, ','); + szFilename = get_parameter(&cmdline_ptr, ',', TRUE); + szFlags = get_parameter(&cmdline_ptr, ',', TRUE); if (szFlags) dwFlags = atolW(szFlags); diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 6079625..f75eb01 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -205,13 +205,24 @@ static HRESULT run_setup_commands_callback(HINF hinf, PCWSTR field, const void * /* sequentially returns pointers to parameters in a parameter list * returns NULL if the parameter is empty, e.g. one,,three */ -LPWSTR get_parameter(LPWSTR *params, WCHAR separator) +LPWSTR get_parameter(LPWSTR *params, WCHAR separator, BOOL quoted) { LPWSTR token = *params; if (!*params) return NULL; + if (quoted && *token == '"') + { + WCHAR *end = strchrW(token + 1, '"'); + if (end) + { + *end = 0; + *params = end + 1; + token = token + 1; + } + } + *params = strchrW(*params, separator); if (*params) *(*params)++ = '\0'; @@ -760,10 +771,10 @@ INT WINAPI LaunchINFSectionW(HWND hWnd, HINSTANCE hInst, LPWSTR cmdline, INT sho cmdline_ptr = cmdline_copy; lstrcpyW(cmdline_copy, cmdline); - inf_filename = get_parameter(&cmdline_ptr, ','); - install_sec = get_parameter(&cmdline_ptr, ','); + inf_filename = get_parameter(&cmdline_ptr, ',', TRUE); + install_sec = get_parameter(&cmdline_ptr, ',', TRUE); - str_flags = get_parameter(&cmdline_ptr, ','); + str_flags = get_parameter(&cmdline_ptr, ',', TRUE); if (str_flags) flags = atolW(str_flags); @@ -853,12 +864,12 @@ HRESULT WINAPI LaunchINFSectionExW(HWND hWnd, HINSTANCE hInst, LPWSTR cmdline, I cmdline_ptr = cmdline_copy; lstrcpyW(cmdline_copy, cmdline); - cabinfo.pszInf = get_parameter(&cmdline_ptr, ','); - cabinfo.pszSection = get_parameter(&cmdline_ptr, ','); - cabinfo.pszCab = get_parameter(&cmdline_ptr, ','); + cabinfo.pszInf = get_parameter(&cmdline_ptr, ',', TRUE); + cabinfo.pszSection = get_parameter(&cmdline_ptr, ',', TRUE); + cabinfo.pszCab = get_parameter(&cmdline_ptr, ',', TRUE); *cabinfo.szSrcPath = '\0'; - flags = get_parameter(&cmdline_ptr, ','); + flags = get_parameter(&cmdline_ptr, ',', TRUE); if (flags) cabinfo.dwFlags = atolW(flags); diff --git a/dlls/advpack/tests/install.c b/dlls/advpack/tests/install.c index 932f2da..ea479fd 100644 --- a/dlls/advpack/tests/install.c +++ b/dlls/advpack/tests/install.c @@ -242,7 +242,7 @@ static void test_LaunchINFSectionEx(void) lstrcat(cmdline, CURR_DIR); lstrcat(cmdline, "\\test.inf\",\"DefaultInstall\",\"c:,imacab.cab\",\"4\""); hr = pLaunchINFSectionEx(NULL, NULL, cmdline, 0); - todo_wine ok(hr == 0, "Expected 0, got %d\n", hr); + ok(hr == 0, "Expected 0, got %d\n", hr); /* The 'No UI' flag seems to have no effect whatsoever on Windows. * So only do this test in interactive mode.

1 0

Alistair Leslie-Hughes : oledb32: Add some missing defines.
by Alexandre Julliard July 29, 2013

July 29, 2013

Module: wine Branch: master Commit: d09ec59157a57e6a03e2a06e9e8082e3b6f3ec99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d09ec59157a57e6a03e2a06e9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 25 12:23:39 2013 +1000 oledb32: Add some missing defines. --- include/oledberr.h | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/include/oledberr.h b/include/oledberr.h index b91b429..9b87ba7 100644 --- a/include/oledberr.h +++ b/include/oledberr.h @@ -33,7 +33,14 @@ #define DB_E_BADCOMPAREOP 0x80040e27 #define DB_E_BADSTATUSVALUE 0x80040e28 -#define DB_E_CONCURRENCYVIOLATION 0x80040e38 +#define DB_E_CONCURRENCYVIOLATION 0x80040e38 + +#define DB_E_TABLEINUSE 0x80040e40 +#define DB_E_NOLOCALE 0x80040e41 +#define DB_E_BADRECORDNUM 0x80040e42 +#define DB_E_BOOKMARKSKIPPED 0x80040e43 +#define DB_E_BADPROPERTYVALUE 0x80040e44 +#define DB_E_INVALID 0x80040e45 #define DB_E_DATAOVERFLOW 0x80040e57

1 0

Andrew Eikum : dsound: Allow multiple buffers to capture from the same device.
by Alexandre Julliard July 27, 2013

July 27, 2013

Module: wine Branch: master Commit: dcaeb6b4fdf890d68d2c3c4d4d3372cf6d3d7e7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcaeb6b4fdf890d68d2c3c4d4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jul 26 14:24:23 2013 -0500 dsound: Allow multiple buffers to capture from the same device. --- dlls/dsound/capture.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 01cf775..63bda55 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -986,14 +986,6 @@ static HRESULT DirectSoundCaptureDevice_Initialize( EnterCriticalSection(&DSOUND_capturers_lock); - LIST_FOR_EACH_ENTRY(device, &DSOUND_capturers, DirectSoundCaptureDevice, entry){ - if(IsEqualGUID(&device->guid, &devGUID)){ - IMMDevice_Release(mmdevice); - LeaveCriticalSection(&DSOUND_capturers_lock); - return DSERR_ALLOCATED; - } - } - hr = DirectSoundCaptureDevice_Create(&device); if (hr != DS_OK) { WARN("DirectSoundCaptureDevice_Create failed\n");

1 0

Andrew Eikum : winmm/tests: Fix waveInGetPosition type.
by Alexandre Julliard July 27, 2013

July 27, 2013

Module: wine Branch: master Commit: 35e4aac8f659dcf3d77731691c9e17ecf3d6f488 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35e4aac8f659dcf3d77731691… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jul 26 14:17:03 2013 -0500 winmm/tests: Fix waveInGetPosition type. We're comparing the reported value against dwBytesRecorded, so we should request the value to be in bytes. --- dlls/winmm/tests/capture.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index f904bb1..d3d60db 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -226,10 +226,11 @@ static void wave_in_test_deviceIn(int device, LPWAVEFORMATEX pwfx, DWORD format, "frag.dwBytesRecorded=%d, should=%d\n", frag.dwBytesRecorded,pwfx->nAvgBytesPerSec); - mmt.wType = TIME_SAMPLES; + mmt.wType = TIME_BYTES; rc=waveInGetPosition(win, &mmt, sizeof(mmt)); ok(rc==MMSYSERR_NOERROR,"waveInGetPosition(%s): rc=%s\n", dev_name(device),wave_in_error(rc)); + ok(mmt.wType == TIME_BYTES, "doesn't support TIME_BYTES: %u\n", mmt.wType); ok(mmt.u.cb == frag.dwBytesRecorded, "Got wrong position: %u\n", mmt.u.cb); /* stop playing on error */

1 0

Bruno Jesus : ws2_32: Fix listen() implementation.
by Alexandre Julliard July 27, 2013

July 27, 2013

Module: wine Branch: master Commit: 3fea3a5b1a6285787f182276fd806238fe9fc2cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fea3a5b1a6285787f182276f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Jul 22 22:31:41 2013 -0300 ws2_32: Fix listen() implementation. --- dlls/ws2_32/socket.c | 35 ++++++++++++++++++++++++----------- dlls/ws2_32/tests/sock.c | 15 +++++---------- 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 7ad118f..462f153 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3695,23 +3695,36 @@ int WINAPI WS_ioctlsocket(SOCKET s, LONG cmd, WS_u_long *argp) */ int WINAPI WS_listen(SOCKET s, int backlog) { - int fd = get_sock_fd( s, FILE_READ_DATA, NULL ); + int fd = get_sock_fd( s, FILE_READ_DATA, NULL ), ret = SOCKET_ERROR; TRACE("socket %04lx, backlog %d\n", s, backlog); if (fd != -1) { - if (listen(fd, backlog) == 0) - { - release_sock_fd( s, fd ); - _enable_event(SOCKET2HANDLE(s), FD_ACCEPT, - FD_WINE_LISTENING, - FD_CONNECT|FD_WINE_CONNECTED); - return 0; - } - SetLastError(wsaErrno()); + union generic_unix_sockaddr uaddr; + socklen_t uaddrlen = sizeof(uaddr); + + if (getsockname(fd, &uaddr.addr, &uaddrlen) != 0) + { + SetLastError(wsaErrno()); + } + else if (!is_sockaddr_bound(&uaddr.addr, uaddrlen)) + { + SetLastError(WSAEINVAL); + } + else if (listen(fd, backlog) == 0) + { + _enable_event(SOCKET2HANDLE(s), FD_ACCEPT, + FD_WINE_LISTENING, + FD_CONNECT|FD_WINE_CONNECTED); + ret = 0; + } + else + SetLastError(wsaErrno()); release_sock_fd( s, fd ); } - return SOCKET_ERROR; + else + SetLastError(WSAENOTSOCK); + return ret; } /*********************************************************************** diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index bcf7abc..5a76a7a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2372,13 +2372,11 @@ static void test_listen(void) SetLastError(0xdeadbeef); ok ((listen(0, 0) == SOCKET_ERROR), "listen did not fail\n"); ret = WSAGetLastError(); -todo_wine ok (ret == WSAENOTSOCK, "expected 10038, received %d\n", ret); SetLastError(0xdeadbeef); ok ((listen(0xdeadbeef, 0) == SOCKET_ERROR), "listen did not fail\n"); ret = WSAGetLastError(); -todo_wine ok (ret == WSAENOTSOCK, "expected 10038, received %d\n", ret); /* tcp tests */ @@ -2388,7 +2386,6 @@ todo_wine fdB = socket(AF_INET, SOCK_STREAM, 0); ok ((fdB != INVALID_SOCKET), "socket failed unexpectedly: %d\n", WSAGetLastError() ); -todo_wine { SetLastError(0xdeadbeef); ok ((listen(fdA, -2) == SOCKET_ERROR), "listen did not fail\n"); ret = WSAGetLastError(); @@ -2409,27 +2406,27 @@ todo_wine { SetLastError(0xdeadbeef); ok (bind(fdB, (struct sockaddr*) &address, sizeof(address)), "bind should have failed\n"); ok (ret == WSAEINVAL, "expected 10022, received %d\n", ret); -} + ok (!listen(fdA, 0), "listen failed\n"); ok (!listen(fdA, SOMAXCONN), "double listen failed\n"); -todo_wine { + SetLastError(0xdeadbeef); ok ((listen(fdB, SOMAXCONN) == SOCKET_ERROR), "listen did not fail\n"); ret = WSAGetLastError(); ok (ret == WSAEINVAL, "expected 10022, received %d\n", ret); -} + ret = closesocket(fdB); ok (ret == 0, "closesocket failed unexpectedly: %d\n", ret); fdB = socket(AF_INET, SOCK_STREAM, 0); ok ((fdB != INVALID_SOCKET), "socket failed unexpectedly: %d\n", WSAGetLastError() ); -todo_wine { + SetLastError(0xdeadbeef); ok (bind(fdB, (struct sockaddr*) &address, sizeof(address)), "bind should have failed\n"); ret = WSAGetLastError(); ok (ret == WSAEADDRINUSE, "expected 10048, received %d\n", ret); -} + ret = closesocket(fdA); ok (ret == 0, "closesocket failed unexpectedly: %d\n", ret); ret = closesocket(fdB); @@ -2477,9 +2474,7 @@ static void test_select(void) ok ( !FD_ISSET(fdRead, &exceptfds), "FD should not be set\n"); ok ( !FD_ISSET(fdWrite, &exceptfds), "FD should not be set\n"); - todo_wine { ok ((listen(fdWrite, SOMAXCONN) == SOCKET_ERROR), "listen did not fail\n"); - } ret = closesocket(fdWrite); ok ( (ret == 0), "closesocket failed unexpectedly: %d\n", ret);

1 0

Charles Davis : winemac.drv: Also return the number of pixel formats if the caller didn' t supply a PIXELFORMATDESCRIPTOR.
by Alexandre Julliard July 27, 2013

July 27, 2013

Module: wine Branch: master Commit: 05a68dbc556cf4055c094c1d9670e98e505d090c URL: http://source.winehq.org/git/wine.git/?a=commit;h=05a68dbc556cf4055c094c1d9… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Tue Jul 23 21:26:29 2013 -0600 winemac.drv: Also return the number of pixel formats if the caller didn't supply a PIXELFORMATDESCRIPTOR. --- dlls/winemac.drv/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 0922371..fb294d1 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -3281,7 +3281,7 @@ int macdrv_wglDescribePixelFormat(HDC hdc, int fmt, UINT size, PIXELFORMATDESCRI TRACE("hdc %p fmt %d size %u descr %p\n", hdc, fmt, size, descr); - if (fmt <= 0 || fmt > ret) return ret; + if (fmt <= 0 || fmt > ret || !descr) return ret; if (size < sizeof(*descr)) return 0; pf = &pixel_formats[fmt - 1];

1 0