wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

Alistair Leslie-Hughes : oledb32: Add support for IDBInitialize interface in IDataInitialize.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 8f8212b856a8e6b339fea6126381ace3613dfa7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f8212b856a8e6b339fea6126… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Sep 25 12:43:58 2012 +1000 oledb32: Add support for IDBInitialize interface in IDataInitialize. --- dlls/oledb32/datainit.c | 109 ++++++++++++++++++++++++++++++++++++++++ dlls/oledb32/tests/Makefile.in | 3 +- dlls/oledb32/tests/convert.c | 1 - dlls/oledb32/tests/database.c | 73 +++++++++++++++++++++++++++ dlls/oledb32/tests/marshal.c | 1 - 5 files changed, 184 insertions(+), 3 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index af596fe..a84d8aa 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -47,6 +47,110 @@ static inline datainit *impl_from_IDataInitialize(IDataInitialize *iface) return CONTAINING_RECORD(iface, datainit, IDataInitialize_iface); } +typedef struct +{ + IDBInitialize IDBInitialize_iface; + + LONG ref; +} dbinit; + +static inline dbinit *impl_from_IDBInitialize(IDBInitialize *iface) +{ + return CONTAINING_RECORD(iface, dbinit, IDBInitialize_iface); +} + +static HRESULT WINAPI dbinit_QueryInterface(IDBInitialize *iface, REFIID riid, void **obj) +{ + dbinit *This = impl_from_IDBInitialize(iface); + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), obj); + + *obj = NULL; + + if(IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDBInitialize)) + { + *obj = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IDBInitialize_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI dbinit_AddRef(IDBInitialize *iface) +{ + dbinit *This = impl_from_IDBInitialize(iface); + TRACE("(%p)\n", This); + + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI dbinit_Release(IDBInitialize *iface) +{ + dbinit *This = impl_from_IDBInitialize(iface); + LONG ref; + + TRACE("(%p)\n", This); + + ref = InterlockedDecrement(&This->ref); + if(ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI dbinit_Initialize(IDBInitialize *iface) +{ + dbinit *This = impl_from_IDBInitialize(iface); + + FIXME("(%p) stub\n", This); + + return S_OK; +} + +static HRESULT WINAPI dbinit_Uninitialize(IDBInitialize *iface) +{ + dbinit *This = impl_from_IDBInitialize(iface); + + FIXME("(%p) stub\n", This); + + return S_OK; +} + +static const IDBInitializeVtbl dbinit_vtbl = +{ + dbinit_QueryInterface, + dbinit_AddRef, + dbinit_Release, + dbinit_Initialize, + dbinit_Uninitialize +}; + +static HRESULT create_db_init(void **obj) +{ + dbinit *This; + + TRACE("()\n"); + + *obj = NULL; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if(!This) return E_OUTOFMEMORY; + + This->IDBInitialize_iface.lpVtbl = &dbinit_vtbl; + This->ref = 1; + + *obj = &This->IDBInitialize_iface; + + return S_OK; +} + static HRESULT WINAPI datainit_QueryInterface(IDataInitialize *iface, REFIID riid, void **obj) { datainit *This = impl_from_IDataInitialize(iface); @@ -102,6 +206,11 @@ static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *p FIXME("(%p)->(%p %d %s %s %p)\n", This, pUnkOuter, dwClsCtx, debugstr_w(pwszInitializationString), debugstr_guid(riid), ppDataSource); + if(IsEqualIID(riid, &IID_IDBInitialize)) + { + return create_db_init( (LPVOID*)ppDataSource); + } + return E_NOTIMPL; } diff --git a/dlls/oledb32/tests/Makefile.in b/dlls/oledb32/tests/Makefile.in index f91f86b..07a4892 100644 --- a/dlls/oledb32/tests/Makefile.in +++ b/dlls/oledb32/tests/Makefile.in @@ -1,8 +1,9 @@ TESTDLL = oledb32.dll -IMPORTS = oleaut32 ole32 user32 gdi32 advapi32 +IMPORTS = uuid oleaut32 ole32 user32 gdi32 advapi32 C_SRCS = \ convert.c \ + database.c \ marshal.c IDL_I_SRCS = convert.idl diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 1a1ea9a..9d50b8a 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -35,7 +35,6 @@ #include "wine/test.h" -DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static void test_dcinfo(void) { diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c new file mode 100644 index 0000000..c0d5237 --- /dev/null +++ b/dlls/oledb32/tests/database.c @@ -0,0 +1,73 @@ +/* OLEDB Database tests + * + * Copyright 2012 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 + */ +#include <stdarg.h> + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "windef.h" +#include "winbase.h" +#include "ole2.h" +#include "msdadc.h" +#include "msdasc.h" + +#include "wine/test.h" + + +void test_database(void) +{ + HRESULT hr; + IDBInitialize *dbinit = NULL; + IDataInitialize *datainit = NULL; + + hr = CoCreateInstance(&CLSID_MSDAINITIALIZE, NULL, CLSCTX_INPROC_SERVER, &IID_IDataInitialize,(void**)&datainit); + if(FAILED(hr)) + { + win_skip("Unable to load oledb library\n"); + return; + } + + hr = IDataInitialize_GetDataSource(datainit, NULL, CLSCTX_INPROC_SERVER, NULL, &IID_IDBInitialize, (IUnknown **)&dbinit); + ok(hr == S_OK, "got %08x\n", hr); + if(SUCCEEDED(hr)) + { + IDBProperties *props = NULL; + + hr = IDBInitialize_QueryInterface(dbinit, &IID_IDBProperties, (void**)&props); + todo_wine ok(hr == S_OK, "got %08x\n", hr); + if(SUCCEEDED(hr)) + { + IDBProperties_Release(props); + } + + IDBInitialize_Release(dbinit); + } + + IDataInitialize_Release(datainit); +} + +START_TEST(database) +{ + OleInitialize(NULL); + + test_database(); + + OleUninitialize(); +} diff --git a/dlls/oledb32/tests/marshal.c b/dlls/oledb32/tests/marshal.c index 39d8448..f9a2150 100644 --- a/dlls/oledb32/tests/marshal.c +++ b/dlls/oledb32/tests/marshal.c @@ -27,7 +27,6 @@ #include "windef.h" #include "winbase.h" -#include "initguid.h" #include "objbase.h" #include "oledb.h"

1 0

Alistair Leslie-Hughes : include: Add threading attribute to MSDAINITIALIZE .
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: be246e31e28c171adf5cdadefe98675e7f240bd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be246e31e28c171adf5cdadef… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 3 16:00:28 2012 +1000 include: Add threading attribute to MSDAINITIALIZE. --- include/msdasc.idl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/msdasc.idl b/include/msdasc.idl index ca879e8..16d2372 100644 --- a/include/msdasc.idl +++ b/include/msdasc.idl @@ -63,6 +63,7 @@ library MSDASC [ uuid(2206CDB0-19C1-11D1-89E0-00C04FD7A829), + threading(both), progid("MSDASC.MSDAINITIALIZE.1"), vi_progid("MSDASC.MSDAINITIALIZE"), ]

1 0

Nikolay Sivov : vbscript: Support vb* constants for message box return value.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 0c0e6f537166fc7883a02a807b1018f8aa947560 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c0e6f537166fc7883a02a807… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 3 15:57:25 2012 +0400 vbscript: Support vb* constants for message box return value. --- dlls/vbscript/global.c | 28 ++++++++++++++-------------- dlls/vbscript/tests/api.vbs | 15 +++++++++++++++ 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 32eebdc..76a035b 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1690,44 +1690,44 @@ static HRESULT Global_vbSystemModal(vbdisp_t *This, VARIANT *arg, unsigned args_ static HRESULT Global_vbOK(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, IDOK); } static HRESULT Global_vbCancel(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, IDCANCEL); } static HRESULT Global_vbAbort(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, IDABORT); } static HRESULT Global_vbRetry(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, IDRETRY); } static HRESULT Global_vbIgnore(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, IDIGNORE); } static HRESULT Global_vbYes(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, IDYES); } static HRESULT Global_vbNo(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, IDNO); } static HRESULT Global_vbEmpty(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 fc87c59..47fae0c 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -312,4 +312,19 @@ Call ok(getVT(vbYesNo) = "VT_I2", "getVT(vbYesNo) = " & getVT(vbYesNo)) Call ok(vbRetryCancel = 5, "vbRetryCancel = " & vbRetryCancel) Call ok(getVT(vbRetryCancel) = "VT_I2", "getVT(vbRetryCancel) = " & getVT(vbRetryCancel)) +Call ok(vbOK = 1, "vbOK = " & vbOK) +Call ok(getVT(vbOK) = "VT_I2", "getVT(vbOK) = " & getVT(vbOK)) +Call ok(vbCancel = 2, "vbCancel = " & vbCancel) +Call ok(getVT(vbCancel) = "VT_I2", "getVT(vbCancel) = " & getVT(vbCancel)) +Call ok(vbAbort = 3, "vbAbort = " & vbAbort) +Call ok(getVT(vbAbort) = "VT_I2", "getVT(vbAbort) = " & getVT(vbAbort)) +Call ok(vbRetry = 4, "vbRetry = " & vbRetry) +Call ok(getVT(vbRetry) = "VT_I2", "getVT(vbRetry) = " & getVT(vbRetry)) +Call ok(vbIgnore = 5, "vbIgnore = " & vbIgnore) +Call ok(getVT(vbIgnore) = "VT_I2", "getVT(vbIgnore) = " & getVT(vbIgnore)) +Call ok(vbYes = 6, "vbYes = " & vbYes) +Call ok(getVT(vbYes) = "VT_I2", "getVT(vbYes) = " & getVT(vbYes)) +Call ok(vbNo = 7, "vbNo = " & vbNo) +Call ok(getVT(vbNo) = "VT_I2", "getVT(vbNo) = " & getVT(vbNo)) + Call reportSuccess()

1 0

Nikolay Sivov : vbscript: Support vb* constants for message box buttons.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 6666284fe6e709de333450a5a1752e1da13ac100 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6666284fe6e709de333450a5a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 3 15:53:42 2012 +0400 vbscript: Support vb* constants for message box buttons. --- dlls/vbscript/global.c | 24 ++++++++++++------------ dlls/vbscript/tests/api.vbs | 13 +++++++++++++ dlls/vbscript/vbsglobal.idl | 2 +- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index e2319ae..32eebdc 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1594,38 +1594,38 @@ static HRESULT Global_vbFirstFullWeek(vbdisp_t *This, VARIANT *arg, unsigned arg static HRESULT Global_vbOKOnly(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, MB_OK); } static HRESULT Global_vbOKCancel(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, MB_OKCANCEL); } static HRESULT Global_vbAbortRetryIgnore(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, MB_ABORTRETRYIGNORE); } static HRESULT Global_vbYesNoCancel(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, MB_YESNOCANCEL); } static HRESULT Global_vbYesNo(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, MB_YESNO); } static HRESULT Global_vbRetryCancel(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, MB_RETRYCANCEL); } static HRESULT Global_vbCritical(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 6bcded8..fc87c59 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -299,4 +299,17 @@ end if Call ok(getVT(Now()) = "VT_DATE", "getVT(Now()) = " & getVT(Now())) +Call ok(vbOKOnly = 0, "vbOKOnly = " & vbOKOnly) +Call ok(getVT(vbOKOnly) = "VT_I2", "getVT(vbOKOnly) = " & getVT(vbOKOnly)) +Call ok(vbOKCancel = 1, "vbOKCancel = " & vbOKCancel) +Call ok(getVT(vbOKCancel) = "VT_I2", "getVT(vbOKCancel) = " & getVT(vbOKCancel)) +Call ok(vbAbortRetryIgnore = 2, "vbAbortRetryIgnore = " & vbAbortRetryIgnore) +Call ok(getVT(vbAbortRetryIgnore) = "VT_I2", "getVT(vbAbortRetryIgnore) = " & getVT(vbAbortRetryIgnore)) +Call ok(vbYesNoCancel = 3, "vbYesNoCancel = " & vbYesNoCancel) +Call ok(getVT(vbYesNoCancel) = "VT_I2", "getVT(vbYesNoCancel) = " & getVT(vbYesNoCancel)) +Call ok(vbYesNo = 4, "vbYesNo = " & vbYesNo) +Call ok(getVT(vbYesNo) = "VT_I2", "getVT(vbYesNo) = " & getVT(vbYesNo)) +Call ok(vbRetryCancel = 5, "vbRetryCancel = " & vbRetryCancel) +Call ok(getVT(vbRetryCancel) = "VT_I2", "getVT(vbRetryCancel) = " & getVT(vbRetryCancel)) + Call reportSuccess() diff --git a/dlls/vbscript/vbsglobal.idl b/dlls/vbscript/vbsglobal.idl index 5487cdc..fb847c1 100644 --- a/dlls/vbscript/vbsglobal.idl +++ b/dlls/vbscript/vbsglobal.idl @@ -85,7 +85,7 @@ library VBScript_Global [id(DISPID_GLOBAL_VBYESNO), readonly] VARIANT vbYesNo; - [id(DISPID_GLOBAL_VBYESNOCANCEL), readonly] + [id(DISPID_GLOBAL_VBRETRYCANCEL), readonly] VARIANT vbRetryCancel; [id(DISPID_GLOBAL_VBCRITICAL), readonly]

1 0

Piotr Caban : wininet: Fixed failing test.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 8e6d2bab3766e48cf559a011d6aa9b6419851ee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e6d2bab3766e48cf559a011d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 3 12:29:15 2012 +0200 wininet: Fixed failing test. --- dlls/wininet/tests/urlcache.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index c8f4570..f4e50ce 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -41,6 +41,7 @@ static BOOL (WINAPI *pUnlockUrlCacheEntryFileA)(LPCSTR,DWORD); static char filenameA[MAX_PATH + 1]; static char filenameA1[MAX_PATH + 1]; +static BOOL old_ie = FALSE; static void check_cache_entry_infoA(const char *returnedfrom, LPINTERNET_CACHE_ENTRY_INFO lpCacheEntryInfo) { @@ -137,7 +138,7 @@ static void test_GetUrlCacheEntryInfoExA(void) /* Unicode version of function seems to ignore 0x200 flag */ ret = GetUrlCacheEntryInfoExW(test_urlW, NULL, NULL, NULL, NULL, NULL, 0x200 /*GET_INSTALLED_ENTRY*/); - ok(ret, "GetUrlCacheEntryInfoExW failed with error %d\n", GetLastError()); + ok(ret || broken(old_ie && !ret), "GetUrlCacheEntryInfoExW failed with error %d\n", GetLastError()); ret = GetUrlCacheEntryInfoEx(test_url, lpCacheEntryInfo, &cbCacheEntryInfo, NULL, NULL, NULL, 0); ok(ret, "GetUrlCacheEntryInfoEx failed with error %d\n", GetLastError()); @@ -845,10 +846,10 @@ static void test_GetDiskInfoA(void) ret = GetDiskInfoA(path, NULL, NULL, NULL); error = GetLastError(); ok(!ret || - broken(ret), /* < IE7 */ + broken(old_ie && ret), /* < IE7 */ "GetDiskInfoA succeeded\n"); ok(error == ERROR_PATH_NOT_FOUND || - broken(error == 0xdeadbeef), /* < IE7 */ + broken(old_ie && error == 0xdeadbeef), /* < IE7 */ "got %u expected ERROR_PATH_NOT_FOUND\n", error); SetLastError(0xdeadbeef); @@ -867,6 +868,8 @@ START_TEST(urlcache) win_skip("Too old IE (older than 6.0)\n"); return; } + if(!GetProcAddress(hdll, "InternetGetSecurityInfoByURL")) /* < IE7 */ + old_ie = TRUE; pDeleteUrlCacheEntryA = (void*)GetProcAddress(hdll, "DeleteUrlCacheEntryA"); pUnlockUrlCacheEntryFileA = (void*)GetProcAddress(hdll, "UnlockUrlCacheEntryFileA");

1 0

Erich Hoover : hhctrl.ocx: Store all the parameters the first time the WinType is filled in.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: bc2258d678d43062441bbc62f98ad3d7370ab4be URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc2258d678d43062441bbc62f… Author: Erich Hoover <ehoover(a)mines.edu> Date: Tue Oct 2 15:13:14 2012 -0600 hhctrl.ocx: Store all the parameters the first time the WinType is filled in. --- dlls/hhctrl.ocx/chm.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 88bd6e5..e3f2a44 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -263,6 +263,13 @@ void MergeChmProperties(HH_WINTYPEW *src, HHInfo *info, BOOL override) if (unhandled_params) FIXME("Unsupported fsValidMembers fields: 0x%x\n", unhandled_params); + dst->fsValidMembers |= merge; + if (dst->cbStruct == 0) + { + /* If the structure has not been filled in yet then use all of the values */ + dst->cbStruct = sizeof(HH_WINTYPEW); + merge = ~0; + } if (merge & HHWIN_PARAM_PROPERTIES) dst->fsWinProperties = src->fsWinProperties; if (merge & HHWIN_PARAM_STYLES) dst->dwStyles = src->dwStyles; if (merge & HHWIN_PARAM_EXSTYLES) dst->dwExStyles = src->dwExStyles; @@ -276,7 +283,6 @@ void MergeChmProperties(HH_WINTYPEW *src, HHInfo *info, BOOL override) if (merge & HHWIN_PARAM_TABORDER) memcpy(&dst->tabOrder, &src->tabOrder, sizeof(src->tabOrder)); if (merge & HHWIN_PARAM_HISTORY_COUNT) dst->cHistory = src->cHistory; if (merge & HHWIN_PARAM_CUR_TAB) dst->curNavType = src->curNavType; - dst->fsValidMembers |= merge; /* * Note: We assume that hwndHelp, hwndCaller, hwndToolBar, hwndNavigation, and hwndHTML cannot be

1 0

Nozomi Kodama : d3dx9_36/tests: Remove useless casts.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 46fca31c4f18edecf4fea5a40c97d5f01d28b043 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46fca31c4f18edecf4fea5a40… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Tue Oct 2 14:14:12 2012 +0800 d3dx9_36/tests: Remove useless casts. --- dlls/d3dx9_36/tests/math.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 8ab0391..3eb31f9 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2645,7 +2645,7 @@ static void test_D3DXSHMultiply3(void) { unsigned int i; FLOAT a[20], b[20], c[20]; - /* D3DXSHMultiply only modifies the first 9 elements of the array */ + /* D3DXSHMultiply3 only modifies the first 9 elements of the array */ const FLOAT expected[20] = { 7.813913f, 2.256058f, 5.9484005f, 4.970894f, 2.899858f, 3.598946f, 1.726572f, 5.573538f, 0.622063f, 9.0f, 10.0f, 11.0f, 12.0f, 13.0f, @@ -2653,9 +2653,9 @@ static void test_D3DXSHMultiply3(void) for (i = 0; i < 20; i++) { - a[i] = 1.0f + (FLOAT)i/100.0f; - b[i] = 3.0f - (FLOAT)i/100.0f; - c[i] = (FLOAT)i; + a[i] = 1.0f + i / 100.0f; + b[i] = 3.0f - i / 100.0f; + c[i] = i; } D3DXSHMultiply3(c, a, b);

1 0

Nozomi Kodama : d3dx9_36/tests: Relax an equality between floats.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 3d5c61cdcd0431f381b412a3bf8963f9bde88a8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d5c61cdcd0431f381b412a3b… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Tue Oct 2 14:13:11 2012 +0800 d3dx9_36/tests: Relax an equality between floats. --- dlls/d3dx9_36/tests/math.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 761b832..8ab0391 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2418,7 +2418,7 @@ static void test_D3DXSHAdd(void) ok(relative_error(in1[i] + in2[i], out[i]) < admitted_error, "%u-%u: D3DXSHAdd() failed, got %f, expected %f\n", k, i, out[i], in1[i] + in2[i]); } - ok(out[count] == 0.0f, "%u-%u: D3DXSHAdd() failed, got %f, expected 0.0\n", k, k * k, out[count]); + ok(relative_error(out[count], 0.0f) < admitted_error, "%u-%u: D3DXSHAdd() failed, got %f, expected 0.0\n", k, k * k, out[count]); } }

1 0

Nozomi Kodama : d3dx9_36/tests: Avoid a potential out of bound access.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 9c823d04b6cd159b1d7251c7c654245f1177ddf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c823d04b6cd159b1d7251c7c… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Tue Oct 2 14:12:27 2012 +0800 d3dx9_36/tests: Avoid a potential out of bound access. --- dlls/d3dx9_36/tests/math.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index d56e38d..761b832 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2818,10 +2818,10 @@ static void test_D3DXSHRotateZ(void) { /* order = 0 or order = 1 behaves like order = D3DXSH_MINORDER */ square = ( order <= D3DXSH_MINORDER ) ? D3DXSH_MINORDER * D3DXSH_MINORDER : order * order; - expected = table[36 * j + i]; if ( i >= square || ( (order >= D3DXSH_MAXORDER) && ( i >= D3DXSH_MAXORDER * D3DXSH_MAXORDER ) ) ) expected = ( i + 1.0f ) * ( i + 1.0f ); - + else + expected = table[36 * j + i]; ok(relative_error(out[i], expected) < admitted_error, "angle %f, order %u index %u, Expected %f, received %f\n", angle[j], order, i, expected, out[i]); } }

1 0

Nozomi Kodama : d3dx9_36/tests: Speed up some tests.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 584c24050e7af550e9f77145770fcf744203ad12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=584c24050e7af550e9f771457… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Tue Oct 2 14:11:10 2012 +0800 d3dx9_36/tests: Speed up some tests. --- dlls/d3dx9_36/tests/math.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 1d7b7d5..d56e38d 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2406,7 +2406,7 @@ static void test_D3DXSHAdd(void) * All values will work, test from 0-7 [D3DXSH_MINORDER = 2, D3DXSH_MAXORDER = 6] * Exceptions will show up when out, in1 or in2 are NULL */ - for (k = 0; k < 8; ++k) + for (k = 0; k <= D3DXSH_MAXORDER + 1; k++) { UINT count = k * k; @@ -2425,18 +2425,18 @@ static void test_D3DXSHAdd(void) static void test_D3DXSHDot(void) { unsigned int i; - FLOAT a[64], b[64], got; + FLOAT a[49], b[49], got; CONST FLOAT expected[] = - { 0.5f, 0.5f, 25.0f, 262.5f, 1428.0f, 5362.0f, 15873.0f, 39812.0f, 88400.0f, }; + { 0.5f, 0.5f, 25.0f, 262.5f, 1428.0f, 5362.0f, 15873.0f, 39812.0f, }; - for (i = 0; i < 64; i++) + for (i = 0; i < 49; i++) { a[i] = (FLOAT)i + 1.0f; b[i] = (FLOAT)i + 0.5f; } /* D3DXSHDot computes by using order * order elements */ - for (i = 0; i < 9; i++) + for (i = 0; i <= D3DXSH_MAXORDER + 1; i++) { got = D3DXSHDot(i, a, b); ok(relative_error(got, expected[i]) < admitted_error, "order %d: expected %f, received %f\n", i, expected[i], got); @@ -2449,7 +2449,7 @@ static void test_D3DXSHEvalDirection(void) { unsigned int i, order; D3DXVECTOR3 d; - FLOAT a[100], expected[100], *received_ptr; + FLOAT a[49], expected[49], *received_ptr; CONST FLOAT table[36] = { 0.282095f, -0.977205f, 1.465808f, -0.488603f, 2.185097f, -6.555291f, 8.200181f, -3.277646f, -1.638823f, 1.180087f, 17.343668f, -40.220032f, @@ -2460,15 +2460,15 @@ static void test_D3DXSHEvalDirection(void) d.x = 1.0; d.y = 2.0f; d.z = 3.0f; - for(order = 0; order < 10; order++) + for (order = 0; order <= D3DXSH_MAXORDER + 1; order++) { - for(i = 0; i < 100; i++) + for (i = 0; i < 49; i++) a[i] = 1.5f + i; received_ptr = D3DXSHEvalDirection(a, order, &d); ok(received_ptr == a, "Expected %p, received %p\n", a, received_ptr); - for(i = 0; i < 100; i++) + for (i = 0; i < 49; i++) { /* if the order is < D3DXSH_MINORDER or order > D3DXSH_MAXORDER or the index of the element is greater than order * order - 1, D3DXSHEvalDirection does not modify the output */ if ( (order < D3DXSH_MINORDER) || (order > D3DXSH_MAXORDER) || (i >= order * order) ) @@ -2781,7 +2781,7 @@ static void test_D3DXSHRotate(void) static void test_D3DXSHRotateZ(void) { unsigned int i, j, order, square; - FLOAT angle[] = { D3DX_PI / 3.0f, -D3DX_PI / 3.0f, 4.0f * D3DX_PI / 3.0f, }, expected, in[100], out[100], *received_ptr, table[] = + FLOAT angle[] = { D3DX_PI / 3.0f, -D3DX_PI / 3.0f, 4.0f * D3DX_PI / 3.0f, }, expected, in[49], out[49], *received_ptr, table[] = { /* Angle = D3DX_PI / 3.0f */ 1.01f, 4.477762f, 3.010000f, 0.264289f, 5.297888f, 9.941864f, 7.010000f, -1.199813f, -8.843789f, -10.010002f, 7.494040f, 18.138016f, 13.010000, -3.395966f, -17.039942f, @@ -2801,20 +2801,20 @@ static void test_D3DXSHRotateZ(void) -27.968143f, 24.009993f, 2.226105f, 18.180552f, -43.824543f, 28.010008f, 14.082489f, -42.726471f, 31.010000f, 9.984427f, -41.628399f, 34.009987f, 5.886366f, -40.530327, }; - for (i = 0; i < 100; i++) + for (i = 0; i < 49; i++) in[i] = i + 1.01f; for (j = 0; j < 3; j++) { - for (order = 0; order < 10; order++) + for (order = 0; order <= D3DXSH_MAXORDER + 1; order++) { - for (i = 0; i < 100; i++) + for (i = 0; i < 49; i++) out[i] = ( i + 1.0f ) * ( i + 1.0f ); received_ptr = D3DXSHRotateZ(out, order, angle[j], in); ok(received_ptr == out, "angle %f, order %u, Expected %p, received %p\n", angle[j], order, out, received_ptr); - for (i = 0; i < 100; i++) + for (i = 0; i < 49; i++) { /* order = 0 or order = 1 behaves like order = D3DXSH_MINORDER */ square = ( order <= D3DXSH_MINORDER ) ? D3DXSH_MINORDER * D3DXSH_MINORDER : order * order; @@ -2831,20 +2831,20 @@ static void test_D3DXSHRotateZ(void) static void test_D3DXSHScale(void) { unsigned int i, order; - FLOAT a[100], b[100], expected, *received_array; + FLOAT a[49], b[49], expected, *received_array; - for (i = 0; i < 100; i++) + for (i = 0; i < 49; i++) { a[i] = i; b[i] = i; } - for (order = 0; order < 10; order++) + for (order = 0; order <= D3DXSH_MAXORDER + 1; order++) { received_array = D3DXSHScale(b, order, a, 5.0f); ok(received_array == b, "Expected %p, received %p\n", b, received_array); - for (i = 0; i < 100; i++) + for (i = 0; i < 49; i++) { if (i < order * order) expected = 5.0f * a[i];

1 0

← Newer
1
...
81
82
83
84
85
86
87
...
96
Older →

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