April 2015 - Wine-commits - list.winehq.org

Jacek Caban : inseng.idl: Added more declarations.
by Alexandre Julliard 22 Apr '15

22 Apr '15

Module: wine Branch: master Commit: c61d9981e8a6139d68dfd2093cf6b9aaaa4bd1cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c61d9981e8a6139d68dfd2093… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 22 15:48:13 2015 +0200 inseng.idl: Added more declarations. --- include/inseng.idl | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/include/inseng.idl b/include/inseng.idl index 7b9d0e7..8a3f4c4 100644 --- a/include/inseng.idl +++ b/include/inseng.idl @@ -20,6 +20,107 @@ #define threading(model) #endif +cpp_quote("#if 0") +import "unknwn.idl"; +cpp_quote("#endif") + +interface IStream; + +/* FIXME: Add full declarations. */ +interface ICifComponent; +interface IEnumCifComponents; +interface ICifGroup; +interface IEnumCifGroups; +interface ICifMode; +interface IEnumCifModes; + +typedef struct { + DWORD cbSize; + DWORD dwInstallSize; + DWORD dwWinDriveSize; + DWORD dwDownloadSize; + DWORD dwDependancySize; + DWORD dwInstallDriveReq; + DWORD dwWinDriveReq; + DWORD dwDownloadDriveReq; + char chWinDrive; + char chInstallDrive; + char chDownloadDrive; + DWORD dwTotalDownloadSize; +} COMPONENT_SIZES; + +[ + uuid(6e449688-c509-11cf-aafa-00aa00b6015c), + local +] +interface ICifFile : IUnknown +{ + HRESULT EnumComponents(IEnumCifComponents **enum_components, DWORD filter, void *pv); + HRESULT FindComponent(const char *id, ICifComponent **p); + HRESULT EnumGroups(IEnumCifGroups **enum_groups, DWORD filter, void *pv); + HRESULT FindGroup(const char *id, ICifGroup **p); + HRESULT EnumModes(IEnumCifModes **cuf_modes, DWORD filter, void *pv); + HRESULT FindMode(const char *id, ICifMode **p); + HRESULT GetDescription(char *desc, DWORD size); + HRESULT GetDetDlls(char **dlls, DWORD size); +} + +[ + uuid(6e449685-c509-11cf-aafa-00aa00b6015c), + local +] +interface IInstallEngineCallback : IUnknown +{ + HRESULT OnEngineStatusChange(DWORD status, DWORD substatus); + HRESULT OnStartInstall(DWORD dl_size, DWORD install_size); + HRESULT OnStartComponent(const char *id, DWORD dl_size, DWORD install_size, const char *string); + HRESULT OnComponentProgress(const char *id, DWORD phrase, const char *string, + const char *msg_string, ULONG progress, ULONG max); + HRESULT OnStopComponent(const char *id, HRESULT error, DWORD phrase, const char *string, DWORD status); + HRESULT OnStopInstall(HRESULT error, const char *error_string, DWORD status); + HRESULT OnEngineProblem(DWORD problem, LPDWORD action); +} + +[ + uuid(6e449684-c509-11cf-aafa-00aa00b6015c), + local +] +interface IInstallEngine : IUnknown +{ + HRESULT GetEngineStatus(DWORD *status); + HRESULT SetCifFile(const char *cab_name, const char *cif_name); + HRESULT DownloadComponents(DWORD flags); + HRESULT InstallComponents(DWORD flags); + HRESULT EnumInstallIDs(UINT index, char **id); + HRESULT EnumDownloadIDs(UINT index, char **id); + HRESULT IsComponentInstalled(const char *id, DWORD *status); + HRESULT RegisterInstallEngineCallback(IInstallEngineCallback *callback); + HRESULT UnregisterInstallEngineCallback(); + HRESULT SetAction(const char *id, DWORD action, DWORD priority); + HRESULT GetSizes(const char *id, COMPONENT_SIZES *sizes); + HRESULT LaunchExtraCommand(const char *inf_name, const char *section); + HRESULT GetDisplayName(const char *id, const char *name); + HRESULT SetBaseUrl(const char *base_name); + HRESULT SetDownloadDir(const char *download_dir); + HRESULT SetInstallDrive(char drive); + HRESULT SetInstallOptions(DWORD flags); + HRESULT SetHWND(HWND hwnd); + HRESULT SetIStream(IStream *stream); + HRESULT Abort(DWORD flags); + HRESULT Suspend(); + HRESULT Resume(); +} + +[ + uuid(6e449689-c509-11cf-aafa-00aa00b6015c), + local +] +interface IInstallEngine2 : IInstallEngine +{ + HRESULT SetLocalCif(const char *cif); + HRESULT GetICifFile(ICifFile **cif_file); +} + [ helpstring("Microsoft Active Setup Engine"), threading(apartment),

1 0

Jacek Caban : inseng: Added IInstallEngine2 stub.
by Alexandre Julliard 22 Apr '15

22 Apr '15

Module: wine Branch: master Commit: bdf8c7a148fc78896c798d0ef2f99db87cd3c3f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdf8c7a148fc78896c798d0ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 22 15:48:46 2015 +0200 inseng: Added IInstallEngine2 stub. --- dlls/inseng/inseng_main.c | 291 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 284 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bdf8c7a148fc78896c798…

1 0

Piotr Caban : msvcp110: Fix _Getcvt implementation.
by Alexandre Julliard 22 Apr '15

22 Apr '15

Module: wine Branch: master Commit: d7f6eac058a365c7b2f5593502b0b4fe7330834c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7f6eac058a365c7b2f559350… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 22 15:57:40 2015 +0200 msvcp110: Fix _Getcvt implementation. --- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp90/locale.c | 26 ++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 7 +++++++ include/msvcrt/stdlib.h | 4 ++-- 6 files changed, 38 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 2f3ace4..3be4944 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3780,7 +3780,7 @@ # extern _FZero @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) -@ cdecl -ret64 _Getcvt() +@ cdecl _Getcvt(ptr) @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr) diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index bc539b2..d8187d5 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3723,7 +3723,7 @@ # extern _FZero @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) -@ cdecl -ret64 _Getcvt() +@ cdecl _Getcvt(ptr) @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr) diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 6ce2eb0..bd949be 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3723,7 +3723,7 @@ # extern _FZero @ cdecl -ret64 _Getcoll() msvcp120._Getcoll @ cdecl _Getctype(ptr) msvcp120._Getctype -@ cdecl -ret64 _Getcvt() msvcp120._Getcvt +@ cdecl _Getcvt(ptr) msvcp120._Getcvt @ cdecl _Getdateorder() msvcp120._Getdateorder @ cdecl _Getwctype(long ptr) msvcp120._Getwctype @ cdecl _Getwctypes(ptr ptr ptr ptr) msvcp120._Getwctypes diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index e7d816b..f77d844 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -24,6 +24,7 @@ #include "errno.h" #include "limits.h" #include "math.h" +#include "mbctype.h" #include "stdio.h" #include "wchar.h" #include "wctype.h" @@ -684,6 +685,7 @@ _Ctypevec* __thiscall _Locinfo__Getctype(const _Locinfo *this, _Ctypevec *ret) } /* _Getcvt */ +#if _MSVCP_VER < 110 ULONGLONG __cdecl _Getcvt(void) { union { @@ -697,14 +699,38 @@ ULONGLONG __cdecl _Getcvt(void) ret.cvtvec.handle = ___lc_handle_func()[LC_CTYPE]; return ret.ull; } +#else +_Cvtvec* __cdecl _Getcvt(_Cvtvec *ret) +{ + int i; + + TRACE("\n"); + + memset(ret, 0, sizeof(*ret)); + ret->page = ___lc_codepage_func(); + ret->mb_max = ___mb_cur_max_func(); + + if(ret->mb_max > 1) { + for(i=0; i<256; i++) + if(_ismbblead(i)) ret->isleadbyte[i/8] |= 1 << (i&7); + } + return ret; +} +#endif /* ?_Getcvt(a)_Locinfo@std@@QBE?AU_Cvtvec@@XZ */ /* ?_Getcvt(a)_Locinfo@std@@QEBA?AU_Cvtvec@@XZ */ DEFINE_THISCALL_WRAPPER(_Locinfo__Getcvt, 8) _Cvtvec* __thiscall _Locinfo__Getcvt(const _Locinfo *this, _Cvtvec *ret) { +#if _MSVCP_VER < 110 ULONGLONG ull = _Getcvt(); memcpy(ret, &ull, sizeof(ull)); +#else + _Cvtvec cvtvec; + _Getcvt(&cvtvec); + memcpy(ret, &cvtvec, sizeof(cvtvec)); +#endif return ret; } diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 62dddc9..17d582c 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -192,8 +192,15 @@ int __thiscall codecvt_char_in(const codecvt_char*, int*, const char*, int __thiscall codecvt_base_max_length(const codecvt_base*); typedef struct { +#if _MSVCP_VER < 110 LCID handle; +#endif unsigned page; +#if _MSVCP_VER >= 110 + int mb_max; + int unk; + BYTE isleadbyte[32]; +#endif } _Cvtvec; /* class codecvt<wchar> */ diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index e88ffa3..174df43 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -119,8 +119,8 @@ extern unsigned int _fmode; #endif /* __i386__ */ -extern int* __cdecl ___mb_cur_max_func(void); -#define __mb_cur_max (*___mb_cur_max_func()) +extern int __cdecl ___mb_cur_max_func(void); +#define __mb_cur_max ___mb_cur_max_func() extern __msvcrt_ulong* __cdecl __doserrno(void); #define _doserrno (*__doserrno()) extern int* __cdecl _errno(void);

1 0

Piotr Caban : msvcp120: Add _Getcvt tests.
by Alexandre Julliard 22 Apr '15

22 Apr '15

Module: wine Branch: master Commit: a406abbec848c9706001e189a6ba77c27317629f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a406abbec848c9706001e189a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 22 15:57:54 2015 +0200 msvcp120: Add _Getcvt tests. --- dlls/msvcp120/tests/msvcp120.c | 60 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 1b1dbf0..e468a7e 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <locale.h> + #include "wine/test.h" #include "winbase.h" @@ -27,13 +29,27 @@ typedef struct { MSVCRT_long nsec; } xtime; +typedef struct { + unsigned page; + int mb_max; + int unk; + BYTE isleadbyte[32]; +} _Cvtvec; + +static char* (__cdecl *p_setlocale)(int, const char*); +static int (__cdecl *p__setmbcp)(int); +static int (__cdecl *p_isleadbyte)(int); + static MSVCRT_long (__cdecl *p__Xtime_diff_to_millis2)(const xtime*, const xtime*); static int (__cdecl *p_xtime_get)(xtime*, int); +static _Cvtvec* (__cdecl *p__Getcvt)(_Cvtvec*); static HMODULE msvcp; static BOOL init(void) { + HANDLE msvcr; + msvcp = LoadLibraryA("msvcp120.dll"); if(!msvcp) { @@ -43,7 +59,12 @@ static BOOL init(void) p__Xtime_diff_to_millis2 = (void*)GetProcAddress(msvcp, "_Xtime_diff_to_millis2"); p_xtime_get = (void*)GetProcAddress(msvcp, "xtime_get"); + p__Getcvt = (void*)GetProcAddress(msvcp, "_Getcvt"); + msvcr = GetModuleHandleA("msvcr120.dll"); + p_setlocale = (void*)GetProcAddress(msvcr, "setlocale"); + p__setmbcp = (void*)GetProcAddress(msvcr, "_setmbcp"); + p_isleadbyte = (void*)GetProcAddress(msvcr, "isleadbyte"); return TRUE; } @@ -131,9 +152,48 @@ static void test_xtime_get(void) "xtime_get() should have modified the xtime struct with the given option\n"); } +static void test__Getcvt(void) +{ + _Cvtvec cvtvec; + int i; + + p__Getcvt(&cvtvec); + ok(cvtvec.page == 0, "cvtvec.page = %d\n", cvtvec.page); + ok(cvtvec.mb_max == 1, "cvtvec.mb_max = %d\n", cvtvec.mb_max); + todo_wine ok(cvtvec.unk == 1, "cvtvec.unk = %d\n", cvtvec.unk); + for(i=0; i<32; i++) + ok(cvtvec.isleadbyte[i] == 0, "cvtvec.isleadbyte[%d] = %x\n", i, cvtvec.isleadbyte[i]); + + if(!p_setlocale(LC_ALL, ".936")) { + win_skip("_Getcvt tests\n"); + return; + } + p__Getcvt(&cvtvec); + ok(cvtvec.page == 936, "cvtvec.page = %d\n", cvtvec.page); + ok(cvtvec.mb_max == 2, "cvtvec.mb_max = %d\n", cvtvec.mb_max); + ok(cvtvec.unk == 0, "cvtvec.unk = %d\n", cvtvec.unk); + for(i=0; i<32; i++) + ok(cvtvec.isleadbyte[i] == 0, "cvtvec.isleadbyte[%d] = %x\n", i, cvtvec.isleadbyte[i]); + + p__setmbcp(936); + p__Getcvt(&cvtvec); + ok(cvtvec.page == 936, "cvtvec.page = %d\n", cvtvec.page); + ok(cvtvec.mb_max == 2, "cvtvec.mb_max = %d\n", cvtvec.mb_max); + ok(cvtvec.unk == 0, "cvtvec.unk = %d\n", cvtvec.unk); + for(i=0; i<32; i++) { + BYTE b = 0; + int j; + + for(j=0; j<8; j++) + b |= (p_isleadbyte(i*8+j) ? 1 : 0) << j; + ok(cvtvec.isleadbyte[i] ==b, "cvtvec.isleadbyte[%d] = %x (%x)\n", i, cvtvec.isleadbyte[i], b); + } +} + START_TEST(msvcp120) { if(!init()) return; test__Xtime_diff_to_millis2(); test_xtime_get(); + test__Getcvt(); }

1 0

Thomas Faber : ntdll/tests: Ensure 4-byte alignment for ATOM_BASIC_INFORMATION.
by Alexandre Julliard 22 Apr '15

22 Apr '15

Module: wine Branch: master Commit: bb781b44681ea5743fa62b6c2a71d32ce882b9c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb781b44681ea5743fa62b6c2… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Tue Apr 21 17:14:08 2015 +0200 ntdll/tests: Ensure 4-byte alignment for ATOM_BASIC_INFORMATION. --- dlls/ntdll/tests/atom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/atom.c b/dlls/ntdll/tests/atom.c index 0fed630..972a54e 100644 --- a/dlls/ntdll/tests/atom.c +++ b/dlls/ntdll/tests/atom.c @@ -432,9 +432,9 @@ static void test_Global(void) { NTSTATUS res; RTL_ATOM atom; - char ptr[sizeof(ATOM_BASIC_INFORMATION) + 255 * sizeof(WCHAR)]; + ULONG ptr[(sizeof(ATOM_BASIC_INFORMATION) + 255 * sizeof(WCHAR)) / sizeof(ULONG)]; ATOM_BASIC_INFORMATION* abi = (ATOM_BASIC_INFORMATION*)ptr; - ULONG ptr_size = sizeof(ATOM_BASIC_INFORMATION) + 255 * sizeof(WCHAR); + ULONG ptr_size = sizeof(ptr); if (pNtAddAtomNT4) res = pNtAddAtomNT4(testAtom1, &atom);

1 0

Stefan Leichter : netapi: Add stub for NetGroupAddUser.
by Alexandre Julliard 22 Apr '15

22 Apr '15

Module: wine Branch: master Commit: 11af7fda4f73ecf1c79bb5bfd088ffd1e95e4f70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11af7fda4f73ecf1c79bb5bfd… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Apr 21 22:06:43 2015 +0200 netapi: Add stub for NetGroupAddUser. --- dlls/netapi32/netapi32.c | 11 +++++++++++ dlls/netapi32/netapi32.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 33c0c17..7a1d408 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -2686,6 +2686,17 @@ NET_API_STATUS WINAPI NetGetAnyDCName(LPCWSTR servername, LPCWSTR domainname, LP } /************************************************************ + * NetGroupAddUser (NETAPI32.@) + */ +NET_API_STATUS WINAPI +NetGroupAddUser(LPCWSTR servername, LPCWSTR groupname, LPCWSTR username) +{ + FIXME("(%s, %s, %s) stub!\n", debugstr_w(servername), + debugstr_w(groupname), debugstr_w(username)); + return NERR_Success; +} + +/************************************************************ * NetGroupEnum (NETAPI32.@) * */ diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index 9d5ac28..ede3986 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -95,7 +95,7 @@ @ stub NetGetDisplayInformationIndex @ stdcall NetGetJoinInformation(wstr ptr ptr) @ stub NetGroupAdd -@ stub NetGroupAddUser +@ stdcall NetGroupAddUser(wstr wstr wstr) @ stub NetGroupDel @ stub NetGroupDelUser @ stdcall NetGroupEnum(wstr long ptr long ptr ptr ptr)

1 0

Stefan Leichter : ntdll: Add stub for WinSqmIsOptedIn.
by Alexandre Julliard 22 Apr '15

22 Apr '15

Module: wine Branch: master Commit: a9ae8dbf149ce063c2110d9e29bf8da5911ae468 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9ae8dbf149ce063c2110d9e2… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Apr 21 22:06:33 2015 +0200 ntdll: Add stub for WinSqmIsOptedIn. --- dlls/ntdll/misc.c | 10 ++++++++++ dlls/ntdll/ntdll.spec | 1 + 2 files changed, 11 insertions(+) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index ad1b43b..2cfa900 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -31,6 +31,7 @@ #include "wine/debug.h" #include "ntdll_misc.h" +WINE_DEFAULT_DEBUG_CHANNEL(ntdll); LPCSTR debugstr_ObjectAttributes(const OBJECT_ATTRIBUTES *oa) { @@ -325,3 +326,12 @@ void * __cdecl _lfind( const void *key, const void *base, unsigned int *nmemb, return (char*)base+(size*i); return NULL; } + +/********************************************************************* + * WinSqmIsOptedIn (NTDLL.@) + */ +BOOL WINAPI WinSqmIsOptedIn(void) +{ + FIXME("() stub\n"); + return FALSE; +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index c3307b2..28165ef 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -969,6 +969,7 @@ @ stdcall RtlxUnicodeStringToAnsiSize(ptr) RtlUnicodeStringToAnsiSize @ stdcall RtlxUnicodeStringToOemSize(ptr) RtlUnicodeStringToOemSize @ stdcall -ret64 VerSetConditionMask(int64 long long) +@ stdcall WinSqmIsOptedIn() @ stdcall ZwAcceptConnectPort(ptr long ptr long long ptr) NtAcceptConnectPort @ stdcall ZwAccessCheck(ptr long long ptr ptr ptr ptr ptr) NtAccessCheck @ stdcall ZwAccessCheckAndAuditAlarm(ptr long ptr ptr ptr long ptr long ptr ptr ptr) NtAccessCheckAndAuditAlarm

1 0

Matteo Bruni : opengl32: Update to the current OpenGL spec.
by Alexandre Julliard 22 Apr '15

22 Apr '15

Module: wine Branch: master Commit: 6c6f92ee42b518d0e6cd97195b4ca9b4fae20114 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c6f92ee42b518d0e6cd97195… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Apr 21 15:11:17 2015 +0200 opengl32: Update to the current OpenGL spec. --- dlls/opengl32/opengl_ext.c | 181 ++++++++++++++++++++++++++++++++++++-------- dlls/opengl32/opengl_norm.c | 58 +++++++++++--- include/wine/wgl.h | 56 ++++++++++++-- include/wine/wgl_driver.h | 39 +++++++--- 4 files changed, 275 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c6f92ee42b518d0e6cd9…

1 0

Matteo Bruni : d3d9/tests: Add a lighting test with non-affine worldview matrix.
by Alexandre Julliard 22 Apr '15

22 Apr '15

Module: wine Branch: master Commit: 92cb56a2f8d430bb703831ef0f29cbb38eb9aced URL: http://source.winehq.org/git/wine.git/?a=commit;h=92cb56a2f8d430bb703831ef0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Apr 21 15:11:18 2015 +0200 d3d9/tests: Add a lighting test with non-affine worldview matrix. --- dlls/d3d9/tests/visual.c | 108 ++++++++++++++++++++++++----------------------- 1 file changed, 55 insertions(+), 53 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 518a48a..eb715d7 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -262,6 +262,7 @@ static void lighting_test(void) ULONG refcount; HWND window; HRESULT hr; + unsigned int i; static const D3DMATRIX mat = {{{ @@ -275,7 +276,7 @@ static void lighting_test(void) 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 0.0f, 1.0f, + 0.0f, 0.0f, 0.5f, 1.0f, }}}, mat_transf = {{{ @@ -283,6 +284,13 @@ static void lighting_test(void) 0.0f, 1.0f, 0.0f, 0.0f, -1.0f, 0.0f, 0.0f, 0.0f, 10.f, 10.0f, 10.0f, 1.0f, + }}}, + mat_nonaffine = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, -1.0f, + 10.f, 10.0f, 10.0f, 0.0f, }}}; static const struct { @@ -343,8 +351,35 @@ static void lighting_test(void) {{-10.0f, -9.0f, 11.0f}, {-1.0f, 0.0f, 0.0f}, 0xff0000ff}, {{-10.0f, -9.0f, 9.0f}, {-1.0f, 0.0f, 0.0f}, 0xff0000ff}, {{-10.0f, -11.0f, 9.0f}, {-1.0f, 0.0f, 0.0f}, 0xff0000ff}, + }, + translatedquad[] = + { + {{-11.0f, -11.0f, -10.0f}, {0.0f, 0.0f, -1.0f}, 0xff0000ff}, + {{-11.0f, -9.0f, -10.0f}, {0.0f, 0.0f, -1.0f}, 0xff0000ff}, + {{ -9.0f, -9.0f, -10.0f}, {0.0f, 0.0f, -1.0f}, 0xff0000ff}, + {{ -9.0f, -11.0f, -10.0f}, {0.0f, 0.0f, -1.0f}, 0xff0000ff}, }; static const WORD indices[] = {0, 1, 2, 2, 3, 0}; + static const struct + { + const D3DMATRIX *world_matrix; + const void *quad; + unsigned int size; + DWORD expected; + const char *message; + BOOL todo; + } + tests[] = + { + {&mat, nquad, sizeof(nquad[0]), 0x000000ff, + "Lit quad with light", FALSE}, + {&mat_singular, nquad, sizeof(nquad[0]), 0x000000ff, + "Lit quad with singular world matrix", FALSE}, + {&mat_transf, rotatedquad, sizeof(rotatedquad[0]), 0x000000ff, + "Lit quad with transformation matrix", FALSE}, + {&mat_nonaffine, translatedquad, sizeof(translatedquad[0]), 0x00000000, + "Lit quad with non-affine matrix", TRUE}, + }; window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 0, 0, 640, 480, NULL, NULL, NULL, NULL); @@ -424,66 +459,33 @@ static void lighting_test(void) IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, TRUE); - ok(SUCCEEDED(hr), "Failed to enable lighting, hr %#x.\n", hr); hr = IDirect3DDevice9_LightEnable(device, 0, TRUE); ok(SUCCEEDED(hr), "Failed to enable light 0, hr %#x.\n", hr); - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); - ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); - - hr = IDirect3DDevice9_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - - hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, - 2, indices, D3DFMT_INDEX16, nquad, sizeof(nquad[0])); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); - - hr = IDirect3DDevice9_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - - color = getPixelColor(device, 320, 240); - ok(color == 0x000000ff, "Lit quad with light has color 0x%08x.\n", color); - - hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, &mat_singular); - ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); - - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); - ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); - - hr = IDirect3DDevice9_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - - hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, - 2, indices, D3DFMT_INDEX16, nquad, sizeof(nquad[0])); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); - - hr = IDirect3DDevice9_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - - color = getPixelColor(device, 160, 240); - ok(color == 0x00ffffff, "Cleared area has color 0x%08x.\n", color); - color = getPixelColor(device, 480, 240); - ok(color == 0x000000ff, "Lit quad with singular world matrix has color 0x%08x.\n", color); - - hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, &mat_transf); - ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + { + hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, tests[i].world_matrix); + ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); - ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); - hr = IDirect3DDevice9_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, - 2, indices, D3DFMT_INDEX16, rotatedquad, sizeof(rotatedquad[0])); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, + 2, indices, D3DFMT_INDEX16, tests[i].quad, tests[i].size); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); - hr = IDirect3DDevice9_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - color = getPixelColor(device, 320, 240); - ok(color == 0x000000ff, "Lit quad with transformation matrix has color 0x%08x.\n", color); + color = getPixelColor(device, 320, 240); + if (tests[i].todo) + todo_wine ok(color == tests[i].expected, "%s has color 0x%08x.\n", tests[i].message, color); + else + ok(color == tests[i].expected, "%s has color 0x%08x.\n", tests[i].message, color); + } hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, &mat); ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr);

1 0

Matteo Bruni : d3d8/tests: Add a lighting test with non-affine worldview matrix.
by Alexandre Julliard 22 Apr '15

22 Apr '15

Module: wine Branch: master Commit: 589f1072df9535104c074e5382ef7d8ce28f0f33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=589f1072df9535104c074e538… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Apr 21 15:11:19 2015 +0200 d3d8/tests: Add a lighting test with non-affine worldview matrix. --- dlls/d3d8/tests/visual.c | 110 ++++++++++++++++++++++++----------------------- 1 file changed, 56 insertions(+), 54 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 737bb91..652e2dd 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -185,6 +185,7 @@ static void lighting_test(void) ULONG refcount; HWND window; HRESULT hr; + unsigned int i; static const struct { @@ -238,6 +239,13 @@ static void lighting_test(void) {{-10.0f, -9.0f, 11.0f}, {-1.0f, 0.0f, 0.0f}, 0xff0000ff}, {{-10.0f, -9.0f, 9.0f}, {-1.0f, 0.0f, 0.0f}, 0xff0000ff}, {{-10.0f, -11.0f, 9.0f}, {-1.0f, 0.0f, 0.0f}, 0xff0000ff}, + }, + translatedquad[] = + { + {{-11.0f, -11.0f, -10.0f}, {0.0f, 0.0f, -1.0f}, 0xff0000ff}, + {{-11.0f, -9.0f, -10.0f}, {0.0f, 0.0f, -1.0f}, 0xff0000ff}, + {{ -9.0f, -9.0f, -10.0f}, {0.0f, 0.0f, -1.0f}, 0xff0000ff}, + {{ -9.0f, -11.0f, -10.0f}, {0.0f, 0.0f, -1.0f}, 0xff0000ff}, }; static const WORD indices[] = {0, 1, 2, 2, 3, 0}; static const D3DMATRIX mat = @@ -252,7 +260,7 @@ static void lighting_test(void) 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 0.0f, 1.0f, + 0.0f, 0.0f, 0.5f, 1.0f, }}}, mat_transf = {{{ @@ -260,7 +268,34 @@ static void lighting_test(void) 0.0f, 1.0f, 0.0f, 0.0f, -1.0f, 0.0f, 0.0f, 0.0f, 10.f, 10.0f, 10.0f, 1.0f, - }}}; + }}}, + mat_nonaffine = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, -1.0f, + 10.f, 10.0f, 10.0f, 0.0f, + }}}; + static const struct + { + const D3DMATRIX *world_matrix; + const void *quad; + unsigned int size; + DWORD expected; + const char *message; + BOOL todo; + } + tests[] = + { + {&mat, nquad, sizeof(nquad[0]), 0x000000ff, + "Lit quad with light", FALSE}, + {&mat_singular, nquad, sizeof(nquad[0]), 0x000000ff, + "Lit quad with singular world matrix", FALSE}, + {&mat_transf, rotatedquad, sizeof(rotatedquad[0]), 0x000000ff, + "Lit quad with transformation matrix", FALSE}, + {&mat_nonaffine, translatedquad, sizeof(translatedquad[0]), 0x00000000, + "Lit quad with non-affine matrix", TRUE}, + }; window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 0, 0, 640, 480, NULL, NULL, NULL, NULL); @@ -340,66 +375,33 @@ static void lighting_test(void) IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); - hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, TRUE); - ok(SUCCEEDED(hr), "Failed to enable lighting, hr %#x.\n", hr); hr = IDirect3DDevice8_LightEnable(device, 0, TRUE); ok(SUCCEEDED(hr), "Failed to enable light 0, hr %#x.\n", hr); - hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); - ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); - - hr = IDirect3DDevice8_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - - hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, - 2, indices, D3DFMT_INDEX16, nquad, sizeof(nquad[0])); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); - - hr = IDirect3DDevice8_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - - color = getPixelColor(device, 320, 240); - ok(color == 0x000000ff, "Lit quad with light has color 0x%08x.\n", color); - - hr = IDirect3DDevice8_SetTransform(device, D3DTS_WORLD, &mat_singular); - ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); - - hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); - ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); - - hr = IDirect3DDevice8_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - - hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, - 2, indices, D3DFMT_INDEX16, nquad, sizeof(nquad[0])); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); - - hr = IDirect3DDevice8_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - - color = getPixelColor(device, 160, 240); - ok(color == 0x00ffffff, "Cleared area has color 0x%08x.\n", color); - color = getPixelColor(device, 480, 240); - ok(color == 0x000000ff, "Lit quad with singular world matrix has color 0x%08x.\n", color); - - hr = IDirect3DDevice8_SetTransform(device, D3DTS_WORLD, &mat_transf); - ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + { + hr = IDirect3DDevice8_SetTransform(device, D3DTS_WORLD, tests[i].world_matrix); + ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); - hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); - ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); - hr = IDirect3DDevice8_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, - 2, indices, D3DFMT_INDEX16, rotatedquad, sizeof(rotatedquad[0])); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, + 2, indices, D3DFMT_INDEX16, tests[i].quad, tests[i].size); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); - hr = IDirect3DDevice8_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - color = getPixelColor(device, 320, 240); - ok(color == 0x000000ff, "Lit quad with transformation matrix has color 0x%08x.\n", color); + color = getPixelColor(device, 320, 240); + if (tests[i].todo) + todo_wine ok(color == tests[i].expected, "%s has color 0x%08x.\n", tests[i].message, color); + else + ok(color == tests[i].expected, "%s has color 0x%08x.\n", tests[i].message, color); + } refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0