September 2016 - Wine-Commits

Sebastian Lackner : jscript: Allocate string of correct size in Date toTimeString method.
by Alexandre Julliard Sept. 9, 2016

Sept. 9, 2016

Module: wine Branch: master Commit: fd07a1572762a05de8f1269e2b1287af6a9c71e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd07a1572762a05de8f1269e2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 8 23:54:54 2016 +0200 jscript: Allocate string of correct size in Date toTimeString method. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/date.c | 15 +++++++-------- dlls/jscript/tests/api.js | 6 ++++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index b6997ab..fdc3051 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -850,6 +850,7 @@ static HRESULT Date_toTimeString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, ':','%','0','2','d',' ','U','T','C',0 }; DateInstance *date; jsstr_t *date_str; + WCHAR buf[32]; DOUBLE time; WCHAR sign; int offset; @@ -868,12 +869,6 @@ static HRESULT Date_toTimeString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, time = local_time(date->time, date); if(r) { - WCHAR *ptr; - - date_str = jsstr_alloc_buf(17, &ptr); - if(!date_str) - return E_OUTOFMEMORY; - offset = date->bias + daylight_saving_ta(time, date); @@ -884,13 +879,17 @@ static HRESULT Date_toTimeString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, else sign = '-'; if(offset) - sprintfW(ptr, formatW, (int)hour_from_time(time), + sprintfW(buf, formatW, (int)hour_from_time(time), (int)min_from_time(time), (int)sec_from_time(time), sign, offset/60, offset%60); else - sprintfW(ptr, formatUTCW, (int)hour_from_time(time), + sprintfW(buf, formatUTCW, (int)hour_from_time(time), (int)min_from_time(time), (int)sec_from_time(time)); + date_str = jsstr_alloc(buf); + if(!date_str) + return E_OUTOFMEMORY; + *r = jsval_string(date_str); } return S_OK; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 43f7a19..083da93 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2147,9 +2147,11 @@ ok(Date.parse("Tue, 22 Mar 2016 09:57:55 +0400") === Date.parse("Tue, 22 Mar 201 "Date.parse(\"Tue, 22 Mar 2016 09:57:55 +0400\") = " + Date.parse("Tue, 22 Mar 2016 09:57:55 +0400")); tmp = (new Date()).toLocaleDateString(); -ok(tmp.charCodeAt(tmp.length-1) != 0, "invalid null byte"); +ok(tmp.indexOf(String.fromCharCode(0)) == -1, "invalid null byte"); tmp = (new Date()).toLocaleTimeString(); -ok(tmp.charCodeAt(tmp.length-1) != 0, "invalid null byte"); +ok(tmp.indexOf(String.fromCharCode(0)) == -1, "invalid null byte"); +tmp = (new Date()).toTimeString(); +ok(tmp.indexOf(String.fromCharCode(0)) == -1, "invalid null byte"); ok(typeof(Math.PI) === "number", "typeof(Math.PI) = " + typeof(Math.PI)); ok(Math.floor(Math.PI*100) === 314, "Math.PI = " + Math.PI);

1 0

Sebastian Lackner : jscript: Properly handle \0 characters in String indexOf method.
by Alexandre Julliard Sept. 9, 2016

Sept. 9, 2016

Module: wine Branch: master Commit: 1c3e0dd3d5ae6a4ba1cb2e5cc47f452a7115b803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c3e0dd3d5ae6a4ba1cb2e5cc… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 8 23:53:06 2016 +0200 jscript: Properly handle \0 characters in String indexOf method. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/string.c | 20 ++++++++++++-------- dlls/jscript/tests/api.js | 12 ++++++++++++ 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 40aa552..b5c0197 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -486,9 +486,9 @@ static HRESULT String_fontsize(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u static HRESULT String_indexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + unsigned pos = 0, search_len, length; jsstr_t *search_jsstr, *jsstr; const WCHAR *search_str, *str; - int length, pos = 0; INT ret = -1; HRESULT hres; @@ -498,7 +498,6 @@ static HRESULT String_indexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un if(FAILED(hres)) return hres; - length = jsstr_length(jsstr); if(!argc) { if(r) *r = jsval_number(-1); @@ -512,6 +511,9 @@ static HRESULT String_indexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un return hres; } + search_len = jsstr_length(search_jsstr); + length = jsstr_length(jsstr); + if(argc >= 2) { double d; @@ -520,14 +522,16 @@ static HRESULT String_indexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un pos = is_int32(d) ? min(length, d) : length; } - if(SUCCEEDED(hres)) { + if(SUCCEEDED(hres) && length >= search_len) { + const WCHAR *end = str+length-search_len; const WCHAR *ptr; - ptr = strstrW(str+pos, search_str); - if(ptr) - ret = ptr - str; - else - ret = -1; + for(ptr = str+pos; ptr <= end; ptr++) { + if(!memcmp(ptr, search_str, search_len*sizeof(WCHAR))) { + ret = ptr-str; + break; + } + } } jsstr_release(search_jsstr); diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index e7b55fc..43f7a19 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -629,6 +629,12 @@ tmp = "abcd".indexOf(); ok(tmp == -1, "indexOf = " + tmp); tmp = "abcd".indexOf("b", bigInt); ok(tmp == -1, "indexOf = " + tmp); +tmp = "abcd".indexOf("abcd",0); +ok(tmp === 0, "indexOf = " + tmp); +tmp = "abcd".indexOf("abcd",1); +ok(tmp === -1, "indexOf = " + tmp); +tmp = ("ab" + String.fromCharCode(0) + "cd").indexOf(String.fromCharCode(0)); +ok(tmp === 2, "indexOf = " + tmp); tmp = "abcd".lastIndexOf("bc",1); ok(tmp === 1, "lastIndexOf = " + tmp); @@ -650,6 +656,12 @@ tmp = strObj.lastIndexOf("b"); ok(tmp === 1, "lastIndexOf = " + tmp); tmp = "bbb".lastIndexOf("b", bigInt); ok(tmp === 2, "lastIndexOf = " + tmp); +tmp = "abcd".lastIndexOf("abcd",4); +ok(tmp === 0, "lastIndexOf = " + tmp); +tmp = "abcd".lastIndexOf("abcd",0); +ok(tmp === 0, "lastIndexOf = " + tmp); +tmp = ("ab" + String.fromCharCode(0) + "cd").lastIndexOf(String.fromCharCode(0)); +ok(tmp === 2, "lastIndexOf = " + tmp); tmp = "".toLowerCase(); ok(tmp === "", "''.toLowerCase() = " + tmp);

1 0

Sebastian Lackner : jscript/tests: Remove an invalid win2k broken() check.
by Alexandre Julliard Sept. 9, 2016

Sept. 9, 2016

Module: wine Branch: master Commit: cd5ea7612e9a4fc8ec70dce96776dd6b3c372896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd5ea7612e9a4fc8ec70dce96… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 8 19:16:51 2016 +0200 jscript/tests: Remove an invalid win2k broken() check. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/jscript.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index f949b9d..4c5aa6c 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -659,7 +659,7 @@ static void test_aggregation(void) hres = CoCreateInstance(&CLSID_JScript, (IUnknown*)0xdeadbeef, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IUnknown, (void**)&unk); - ok(hres == CLASS_E_NOAGGREGATION || broken(E_INVALIDARG) /* win2k */, + ok(hres == CLASS_E_NOAGGREGATION, "CoCreateInstance failed: %08x, expected CLASS_E_NOAGGREGATION\n", hres); ok(!unk || broken(unk != NULL), "unk = %p\n", unk); }

1 0

Michael Stefaniuc : urlmon: Avoid a cast from a COM object to an iface.
by Alexandre Julliard Sept. 9, 2016

Sept. 9, 2016

Module: wine Branch: master Commit: 1bf7c738d9554b7c05d7498a2b0b4401b3d9a71b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bf7c738d9554b7c05d7498a2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 8 22:20:33 2016 +0200 urlmon: Avoid a cast from a COM object to an iface. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/sec_mgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 0c20562..eab155d 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -1831,7 +1831,7 @@ HRESULT ZoneMgrImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) TRACE("(%p %p)\n", pUnkOuter, ppobj); ret->IInternetZoneManagerEx2_iface.lpVtbl = &ZoneMgrImplVtbl; ret->ref = 1; - *ppobj = (IInternetZoneManagerEx*)ret; + *ppobj = &ret->IInternetZoneManagerEx2_iface; URLMON_LockModule();

1 0

André Hentschel : loader/wine.inf: Open pdf files using winebrowser.
by Alexandre Julliard Sept. 9, 2016

Sept. 9, 2016

Module: wine Branch: master Commit: 3e997a75d3cae811e0f90c760c1d5f0616ba3558 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e997a75d3cae811e0f90c760… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Sep 5 22:56:31 2016 +0200 loader/wine.inf: Open pdf files using winebrowser. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 4e29026..0c58d6a 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -179,6 +179,7 @@ HKCR,.ini,,2,"inifile" HKCR,.lnk,,2,"lnkfile" HKCR,.msi,,2,"Msi.Package" HKCR,.msp,,2,"Msi.Patch" +HKCR,.pdf,,2,"pdffile" HKCR,.rtf,,2,"rtffile" HKCR,.wri,,2,"wrifile" HKCR,*\shellex\ContextMenuHandlers,,16 @@ -223,6 +224,12 @@ HKCR,Msi.Package\shell\Uninstall\command,,2,"%11%\msiexec.exe /x ""%1""" HKCR,Msi.Patch,,2,"Windows Installer Patch" HKCR,Msi.Patch\DefaultIcon,,2,"msiexec.exe" HKCR,Msi.Patch\shell\Open\command,,2,"%11%\msiexec.exe /p ""%1""" +HKCR,pdffile,,2,"PDF Document" +HKCR,pdffile\shell\open\command,,2,"""%11%\winebrowser.exe"" -nohome" +HKCR,pdffile\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," +HKCR,pdffile\shell\open\ddeexec,"NoActivateHandler",2,"" +HKCR,pdffile\shell\open\ddeexec\Application,,2,"IExplore" +HKCR,pdffile\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" HKCR,rtffile,,2,"Rich Text Document" HKCR,rtffile\shell\open\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" %1" HKCR,rtffile\shell\print\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" /p %1"

1 0

Alistair Leslie-Hughes : comdlg: Select all text when enter is pressed.
by Alexandre Julliard Sept. 9, 2016

Sept. 9, 2016

Module: wine Branch: master Commit: 326a9ea1375591a81ac5f8c0dc68a568f71825ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=326a9ea1375591a81ac5f8c0d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 30 08:00:21 2016 +0000 comdlg: Select all text when enter is pressed. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/filedlg.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index c4bced9..95eacd3 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -2552,6 +2552,13 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) COMDLG32_SHFree(pidlCurrent); if (filename_is_edit( fodInfos )) SendMessageW(fodInfos->DlgInfos.hwndFileName, EM_SETSEL, 0, -1); + else + { + HWND hwnd; + + hwnd = (HWND)SendMessageA(fodInfos->DlgInfos.hwndFileName, CBEM_GETEDITCONTROL, 0, 0); + SendMessageW(hwnd, EM_SETSEL, 0, -1); + } } } ret = FALSE;

1 0

Alistair Leslie-Hughes : comdlg32: Clear the filename text on OPEN_BROWSE.
by Alexandre Julliard Sept. 9, 2016

Sept. 9, 2016

Module: wine Branch: master Commit: b11d7f7482b6ce3c421848a092a4a2646c6bbaa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b11d7f7482b6ce3c421848a09… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 30 08:00:09 2016 +0000 comdlg32: Clear the filename text on OPEN_BROWSE. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/filedlg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 0fbb621..c4bced9 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -2541,6 +2541,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) && fodInfos->ofnInfos->Flags & OFN_EXPLORER) { SendCustomDlgNotificationMessage(hwnd, CDN_FOLDERCHANGE); + SendMessageA(fodInfos->DlgInfos.hwndFileName, WM_SETTEXT, 0, (LPARAM)""); } } else if( nOpenAction == ONOPEN_SEARCH )

1 0

Michael Stefaniuc : oleaut32: Avoid casts from COM objects to interfaces.
by Alexandre Julliard Sept. 9, 2016

Sept. 9, 2016

Module: wine Branch: master Commit: a3c5c50bdd066b2e5196f79db93c4918f5d5ec1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3c5c50bdd066b2e5196f79db… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 8 22:19:47 2016 +0200 oleaut32: Avoid casts from COM objects to interfaces. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/olefont.c | 6 ++++-- dlls/oleaut32/olepicture.c | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index 4b3411e..c20093c 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -1014,8 +1014,10 @@ static HRESULT WINAPI OLEFontImpl_Clone( newObject->pPropertyNotifyCP = NULL; newObject->pFontEventsCP = NULL; - CreateConnectionPoint((IUnknown*)newObject, &IID_IPropertyNotifySink, &newObject->pPropertyNotifyCP); - CreateConnectionPoint((IUnknown*)newObject, &IID_IFontEventsDisp, &newObject->pFontEventsCP); + CreateConnectionPoint((IUnknown*)&newObject->IFont_iface, &IID_IPropertyNotifySink, + &newObject->pPropertyNotifyCP); + CreateConnectionPoint((IUnknown*)&newObject->IFont_iface, &IID_IFontEventsDisp, + &newObject->pFontEventsCP); if (!newObject->pPropertyNotifyCP || !newObject->pFontEventsCP) { diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 96c109a..bfca22f 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -299,7 +299,8 @@ static OLEPictureImpl* OLEPictureImpl_Construct(LPPICTDESC pictDesc, BOOL fOwn) newObject->IConnectionPointContainer_iface.lpVtbl = &OLEPictureImpl_IConnectionPointContainer_VTable; newObject->pCP = NULL; - CreateConnectionPoint((IUnknown*)newObject,&IID_IPropertyNotifySink,&newObject->pCP); + CreateConnectionPoint((IUnknown*)&newObject->IPicture_iface, &IID_IPropertyNotifySink, + &newObject->pCP); if (!newObject->pCP) { HeapFree(GetProcessHeap(), 0, newObject);

1 0

Michael Stefaniuc : msdaps: Use the proper COM method wrappers.
by Alexandre Julliard Sept. 9, 2016

Sept. 9, 2016

Module: wine Branch: master Commit: 502b9e9aa7390209a2ff5858b69830863b27a33b URL: http://source.winehq.org/git/wine.git/?a=commit;h=502b9e9aa7390209a2ff5858b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 8 22:21:33 2016 +0200 msdaps: Use the proper COM method wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdaps/row_server.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msdaps/row_server.c b/dlls/msdaps/row_server.c index 784ade8..2b496be 100644 --- a/dlls/msdaps/row_server.c +++ b/dlls/msdaps/row_server.c @@ -757,19 +757,19 @@ static const IRowVtbl row_vtbl = static HRESULT WINAPI row_change_QueryInterface(IRowChange *iface, REFIID iid, void **obj) { row_proxy *This = impl_from_IRowChange(iface); - return IUnknown_QueryInterface((IUnknown *)This, iid, obj); + return IRow_QueryInterface(&This->IRow_iface, iid, obj); } static ULONG WINAPI row_change_AddRef(IRowChange *iface) { row_proxy *This = impl_from_IRowChange(iface); - return IUnknown_AddRef((IUnknown*)This); + return IRow_AddRef(&This->IRow_iface); } static ULONG WINAPI row_change_Release(IRowChange *iface) { row_proxy *This = impl_from_IRowChange(iface); - return IUnknown_Release((IUnknown*)This); + return IRow_Release(&This->IRow_iface); } static HRESULT WINAPI row_change_SetColumns(IRowChange *iface, DBORDINAL cColumns, @@ -1110,19 +1110,19 @@ static const IRowsetLocateVtbl rowsetlocate_vtbl = static HRESULT WINAPI rowsetinfo_QueryInterface(IRowsetInfo *iface, REFIID iid, void **obj) { rowset_proxy *This = impl_from_IRowsetInfo(iface); - return IUnknown_QueryInterface((IUnknown *)This, iid, obj); + return IRowsetLocate_QueryInterface(&This->IRowsetLocate_iface, iid, obj); } static ULONG WINAPI rowsetinfo_AddRef(IRowsetInfo *iface) { rowset_proxy *This = impl_from_IRowsetInfo(iface); - return IUnknown_AddRef((IUnknown *)This); + return IRowsetLocate_AddRef(&This->IRowsetLocate_iface); } static ULONG WINAPI rowsetinfo_Release(IRowsetInfo *iface) { rowset_proxy *This = impl_from_IRowsetInfo(iface); - return IUnknown_Release((IUnknown *)This); + return IRowsetLocate_Release(&This->IRowsetLocate_iface); } static HRESULT WINAPI rowsetinfo_GetProperties(IRowsetInfo *iface, const ULONG cPropertyIDSets, @@ -1167,19 +1167,19 @@ static const IRowsetInfoVtbl rowsetinfo_vtbl = static HRESULT WINAPI accessor_QueryInterface(IAccessor *iface, REFIID iid, void **obj) { rowset_proxy *This = impl_from_IAccessor(iface); - return IUnknown_QueryInterface((IUnknown *)This, iid, obj); + return IRowsetLocate_QueryInterface(&This->IRowsetLocate_iface, iid, obj); } static ULONG WINAPI accessor_AddRef(IAccessor *iface) { rowset_proxy *This = impl_from_IAccessor(iface); - return IUnknown_AddRef((IUnknown *)This); + return IRowsetLocate_AddRef(&This->IRowsetLocate_iface); } static ULONG WINAPI accessor_Release(IAccessor *iface) { rowset_proxy *This = impl_from_IAccessor(iface); - return IUnknown_Release((IUnknown *)This); + return IRowsetLocate_Release(&This->IRowsetLocate_iface); } static HRESULT WINAPI accessor_AddRefAccessor(IAccessor *iface, HACCESSOR hAccessor, DBREFCOUNT *pcRefCount)

1 0

Huw Davies : winmm/tests: Call CoInitialize() to enable tests to run on Win 10.
by Alexandre Julliard Sept. 8, 2016

Sept. 8, 2016

Module: wine Branch: master Commit: 5b622cfd84a1d690c5b1ccea4470c404f09f5c36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b622cfd84a1d690c5b1ccea4… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 8 11:48:20 2016 +0100 winmm/tests: Call CoInitialize() to enable tests to run on Win 10. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/Makefile.in | 2 +- dlls/winmm/tests/midi.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/winmm/tests/Makefile.in b/dlls/winmm/tests/Makefile.in index 5d81e38..1b191cb 100644 --- a/dlls/winmm/tests/Makefile.in +++ b/dlls/winmm/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = winmm.dll -IMPORTS = winmm user32 advapi32 +IMPORTS = winmm ole32 user32 advapi32 C_SRCS = \ capture.c \ diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index f3ea62c..1024c2c 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -22,6 +22,7 @@ #include <stddef.h> #include "windows.h" #include "mmsystem.h" +#include "objbase.h" #include "wine/test.h" extern const char* mmsys_error(MMRESULT error); /* from wave.c */ @@ -835,10 +836,15 @@ static void test_midi_outfns(HWND hwnd) START_TEST(midi) { HWND hwnd = 0; + + CoInitialize(NULL); /* Needed for Win 10 */ + if (1) /* select 1 for CALLBACK_WINDOW or 0 for CALLBACK_FUNCTION */ hwnd = CreateWindowExA(0, "static", "winmm midi test", WS_POPUP, 0,0,100,100, 0, 0, 0, NULL); test_midi_infns(hwnd); test_midi_outfns(hwnd); if (hwnd) DestroyWindow(hwnd); + + CoUninitialize(); }

1 0