March 2016 - Wine-commits - list.winehq.org

Hugh McMaster : reg: Fail if the data for REG_MULTI_SZ contains two adjacent separators.
by Alexandre Julliard 01 Mar '16

01 Mar '16

1 0

Hugh McMaster : reg: Fail if the data for REG_MULTI_SZ begins with a separator.
by Alexandre Julliard 01 Mar '16

01 Mar '16

Module: wine Branch: master Commit: a573f237d0749440aa38c7ff0b8e69c58ee41028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a573f237d0749440aa38c7ff0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 29 15:54:22 2016 +1100 reg: Fail if the data for REG_MULTI_SZ begins with a separator. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 2 +- programs/reg/tests/reg.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index bb1764e..bad9274 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -300,7 +300,7 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r else buffer[destindex] = data[i]; - if (destindex && !buffer[destindex - 1] && !buffer[destindex]) + if (destindex && !buffer[destindex - 1] && (!buffer[destindex] || destindex == 1)) { HeapFree(GetProcessHeap(), 0, buffer); output_message(STRING_INVALID_STRING); diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index b5ae277..d03fb2c 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -357,7 +357,7 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi9 /s \"#\" /d \"two##strings\" /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi10 /s \"#\" /d \"#a\" /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi11 /s \"#\" /d \"a#\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); @@ -371,7 +371,7 @@ static void test_add(void) ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi14 /t REG_MULTI_SZ /d \"\\0a\" /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi15 /t REG_MULTI_SZ /d \"a\\0\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r);

1 0

Thomas Faber : msi: Do not open registry keys with no access rights.
by Alexandre Julliard 01 Mar '16

01 Mar '16

Module: wine Branch: master Commit: 57fa1bee65e14d0d4527edef01b2ce644720de51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57fa1bee65e14d0d4527edef0… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Nov 27 12:25:27 2015 +0100 msi: Do not open registry keys with no access rights. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 8c1bff3..370007c 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3003,7 +3003,7 @@ static void delete_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path ) { *p = 0; if (!p[1]) continue; /* trailing backslash */ - hkey = open_key( comp, root, subkey, FALSE, access ); + hkey = open_key( comp, root, subkey, FALSE, access | READ_CONTROL ); if (!hkey) break; res = RegDeleteKeyExW( hkey, p + 1, access, 0 ); RegCloseKey( hkey );

1 0

Thomas Faber : ole32: Do not open registry keys with no access rights.
by Alexandre Julliard 01 Mar '16

01 Mar '16

Module: wine Branch: master Commit: b743127c3ca7278553db834c9e48579a0e03769f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b743127c3ca7278553db834c9… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Nov 27 12:26:16 2015 +0100 ole32: Do not open registry keys with no access rights. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/comcat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/comcat.c b/dlls/ole32/comcat.c index 46a722e..eb5a927 100644 --- a/dlls/ole32/comcat.c +++ b/dlls/ole32/comcat.c @@ -245,7 +245,7 @@ static HRESULT COMCAT_IsClassOfCategories( if (res != ERROR_SUCCESS) return S_FALSE; for (string = impl_strings; *string; string += CHARS_IN_GUID) { HKEY catkey; - res = open_classes_key(subkey, string, 0, &catkey); + res = open_classes_key(subkey, string, READ_CONTROL, &catkey); if (res != ERROR_SUCCESS) { RegCloseKey(subkey); return S_FALSE;

1 0

Louis Lenders : ntdll: Add stub for RtlAddAuditAccessObjectAce and forward to AddAuditAccessObjectAce in advapi32.
by Alexandre Julliard 01 Mar '16

01 Mar '16

Module: wine Branch: master Commit: d37b3f59e9e1df6523ac77bf628b7220b97713ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=d37b3f59e9e1df6523ac77bf6… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Feb 25 09:10:32 2016 +0100 ntdll: Add stub for RtlAddAuditAccessObjectAce and forward to AddAuditAccessObjectAce in advapi32. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 18 ++++++++++++++++++ .../api-ms-win-downlevel-advapi32-l1-1-0.spec | 2 +- .../api-ms-win-security-base-l1-1-0.spec | 2 +- .../api-ms-win-security-base-l1-2-0.spec | 2 +- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/sec.c | 21 ++++++++++++++++++++- include/winternl.h | 1 + 8 files changed, 44 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 08f799d..1058935 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -23,7 +23,7 @@ @ stdcall AddAce(ptr long long ptr long) @ stdcall AddAuditAccessAce(ptr long long ptr long long) @ stdcall AddAuditAccessAceEx(ptr long long long ptr long long) -# @ stub AddAuditAccessObjectAce +@ stdcall AddAuditAccessObjectAce(ptr long long long ptr ptr ptr long long) # @ stub AddConditionalAce @ stdcall AddMandatoryAce(ptr long long long ptr) # @ stub AddUsersToEncryptedFileEx diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 08f88c0..5746218 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2672,6 +2672,24 @@ BOOL WINAPI AddAuditAccessAceEx( } /****************************************************************************** + * AddAuditAccessObjectAce [ADVAPI32.@] + */ +BOOL WINAPI AddAuditAccessObjectAce( + IN OUT PACL pAcl, + IN DWORD dwAceRevision, + IN DWORD dwAceFlags, + IN DWORD dwAccessMask, + IN GUID* pObjectTypeGuid, + IN GUID* pInheritedObjectTypeGuid, + IN PSID pSid, + IN BOOL bAuditSuccess, + IN BOOL bAuditFailure) +{ + return set_ntstatus( RtlAddAuditAccessObjectAce(pAcl, dwAceRevision, dwAceFlags, dwAccessMask, + pObjectTypeGuid, pInheritedObjectTypeGuid, pSid, bAuditSuccess, bAuditFailure) ); +} + +/****************************************************************************** * LookupAccountNameA [ADVAPI32.@] */ BOOL WINAPI diff --git a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec index e1b4663..e5280b5 100644 --- a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec @@ -14,7 +14,7 @@ @ stdcall AddAce(ptr long long ptr long) advapi32.AddAce @ stdcall AddAuditAccessAce(ptr long long ptr long long) advapi32.AddAuditAccessAce @ stdcall AddAuditAccessAceEx(ptr long long long ptr long long) advapi32.AddAuditAccessAceEx -@ stub AddAuditAccessObjectAce +@ stdcall AddAuditAccessObjectAce(ptr long long long ptr ptr ptr long long) advapi32.AddAuditAccessObjectAce @ stdcall AddMandatoryAce(ptr long long long ptr) advapi32.AddMandatoryAce @ stdcall AdjustTokenGroups(long long ptr long ptr ptr) advapi32.AdjustTokenGroups @ stdcall AdjustTokenPrivileges(long long ptr long ptr ptr) advapi32.AdjustTokenPrivileges diff --git a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec index a44f5b8..d1fdff4 100644 --- a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec +++ b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec @@ -14,7 +14,7 @@ @ stdcall AddAce(ptr long long ptr long) advapi32.AddAce @ stdcall AddAuditAccessAce(ptr long long ptr long long) advapi32.AddAuditAccessAce @ stdcall AddAuditAccessAceEx(ptr long long long ptr long long) advapi32.AddAuditAccessAceEx -@ stub AddAuditAccessObjectAce +@ stdcall AddAuditAccessObjectAce(ptr long long long ptr ptr ptr long long) advapi32.AddAuditAccessObjectAce @ stdcall AddMandatoryAce(ptr long long long ptr) advapi32.AddMandatoryAce @ stdcall AdjustTokenGroups(long long ptr long ptr ptr) advapi32.AdjustTokenGroups @ stdcall AdjustTokenPrivileges(long long ptr long ptr ptr) advapi32.AdjustTokenPrivileges diff --git a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec index 02e3b9a..01c7c01 100644 --- a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec +++ b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec @@ -14,7 +14,7 @@ @ stdcall AddAce(ptr long long ptr long) advapi32.AddAce @ stdcall AddAuditAccessAce(ptr long long ptr long long) advapi32.AddAuditAccessAce @ stdcall AddAuditAccessAceEx(ptr long long long ptr long long) advapi32.AddAuditAccessAceEx -@ stub AddAuditAccessObjectAce +@ stdcall AddAuditAccessObjectAce(ptr long long long ptr ptr ptr long long) advapi32.AddAuditAccessObjectAce @ stdcall AddMandatoryAce(ptr long long long ptr) advapi32.AddMandatoryAce @ stub AddResourceAttributeAce @ stub AddScopedPolicyIDAce diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0ccd79f..9b64023 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -417,7 +417,7 @@ @ stub RtlAddAttributeActionToRXact @ stdcall RtlAddAuditAccessAce(ptr long long ptr long long) @ stdcall RtlAddAuditAccessAceEx(ptr long long long ptr long long) -# @ stub RtlAddAuditAccessObjectAce +@ stdcall RtlAddAuditAccessObjectAce(ptr long long long ptr ptr ptr long long) # @ stub RtlAddCompoundAce # @ stub RtlAddRange @ cdecl -arch=arm,x86_64 RtlAddFunctionTable(ptr long long) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 125c86e..34de33b 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1325,7 +1325,26 @@ NTSTATUS WINAPI RtlAddAuditAccessAce( { return RtlAddAuditAccessAceEx(pAcl, dwAceRevision, 0, dwAccessMask, pSid, bAuditSuccess, bAuditFailure); } - + +/****************************************************************************** + * RtlAddAuditAccessObjectAce [NTDLL.@] + */ +NTSTATUS WINAPI RtlAddAuditAccessObjectAce( + IN OUT PACL pAcl, + IN DWORD dwAceRevision, + IN DWORD dwAceFlags, + IN DWORD dwAccessMask, + IN GUID* pObjectTypeGuid, + IN GUID* pInheritedObjectTypeGuid, + IN PSID pSid, + IN BOOL bAuditSuccess, + IN BOOL bAuditFailure) +{ + FIXME("%p %x %x %x %p %p %p %d %d - stub\n", pAcl, dwAceRevision, dwAceFlags, dwAccessMask, + pObjectTypeGuid, pInheritedObjectTypeGuid, pSid, bAuditSuccess, bAuditFailure); + return STATUS_NOT_IMPLEMENTED; +} + /****************************************************************************** * RtlValidAcl [NTDLL.@] */ diff --git a/include/winternl.h b/include/winternl.h index 9b40fd4..a861aa7 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2357,6 +2357,7 @@ NTSYSAPI NTSTATUS WINAPI RtlAddAccessDeniedAceEx(PACL,DWORD,DWORD,DWORD,PSID); NTSYSAPI NTSTATUS WINAPI RtlAddAtomToAtomTable(RTL_ATOM_TABLE,const WCHAR*,RTL_ATOM*); NTSYSAPI NTSTATUS WINAPI RtlAddAuditAccessAce(PACL,DWORD,DWORD,PSID,BOOL,BOOL); NTSYSAPI NTSTATUS WINAPI RtlAddAuditAccessAceEx(PACL,DWORD,DWORD,DWORD,PSID,BOOL,BOOL); +NTSYSAPI NTSTATUS WINAPI RtlAddAuditAccessObjectAce(PACL,DWORD,DWORD,DWORD,GUID*,GUID*,PSID,BOOL,BOOL); NTSYSAPI void WINAPI RtlAddRefActivationContext(HANDLE); NTSYSAPI PVOID WINAPI RtlAddVectoredExceptionHandler(ULONG,PVECTORED_EXCEPTION_HANDLER); NTSYSAPI NTSTATUS WINAPI RtlAdjustPrivilege(ULONG,BOOLEAN,BOOLEAN,PBOOLEAN);

1 0

Nikolay Sivov : include: Fix IsBad* prototypes.
by Alexandre Julliard 01 Mar '16

01 Mar '16

Module: wine Branch: master Commit: cd220569ddd1a43ade05a04d76f372ee6937e97e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd220569ddd1a43ade05a04d7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 1 11:53:31 2016 +0300 include: Fix IsBad* prototypes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/virtual.c | 16 ++++++++-------- include/winbase.h | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 4bfc6cc..cce707b 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -647,7 +647,7 @@ UINT WINAPI ResetWriteWatch( LPVOID base, SIZE_T size ) * Success: TRUE. * Failure: FALSE. Process has read access to entire block. */ -BOOL WINAPI IsBadReadPtr( LPCVOID ptr, UINT size ) +BOOL WINAPI IsBadReadPtr( LPCVOID ptr, UINT_PTR size ) { if (!size) return FALSE; /* handle 0 size case w/o reference */ if (!ptr) return TRUE; @@ -655,7 +655,7 @@ BOOL WINAPI IsBadReadPtr( LPCVOID ptr, UINT size ) { volatile const char *p = ptr; char dummy __attribute__((unused)); - UINT count = size; + UINT_PTR count = size; while (count > system_info.PageSize) { @@ -689,14 +689,14 @@ BOOL WINAPI IsBadReadPtr( LPCVOID ptr, UINT size ) * Success: TRUE. * Failure: FALSE. Process has write access to entire block. */ -BOOL WINAPI IsBadWritePtr( LPVOID ptr, UINT size ) +BOOL WINAPI IsBadWritePtr( LPVOID ptr, UINT_PTR size ) { if (!size) return FALSE; /* handle 0 size case w/o reference */ if (!ptr) return TRUE; __TRY { volatile char *p = ptr; - UINT count = size; + UINT_PTR count = size; while (count > system_info.PageSize) { @@ -730,7 +730,7 @@ BOOL WINAPI IsBadWritePtr( LPVOID ptr, UINT size ) * Success: TRUE. * Failure: FALSE. Process has read access to entire block. */ -BOOL WINAPI IsBadHugeReadPtr( LPCVOID ptr, UINT size ) +BOOL WINAPI IsBadHugeReadPtr( LPCVOID ptr, UINT_PTR size ) { return IsBadReadPtr( ptr, size ); } @@ -749,7 +749,7 @@ BOOL WINAPI IsBadHugeReadPtr( LPCVOID ptr, UINT size ) * Success: TRUE. * Failure: FALSE. Process has write access to entire block. */ -BOOL WINAPI IsBadHugeWritePtr( LPVOID ptr, UINT size ) +BOOL WINAPI IsBadHugeWritePtr( LPVOID ptr, UINT_PTR size ) { return IsBadWritePtr( ptr, size ); } @@ -786,7 +786,7 @@ BOOL WINAPI IsBadCodePtr( FARPROC ptr ) * Success: TRUE. * Failure: FALSE. Read access to all bytes in string. */ -BOOL WINAPI IsBadStringPtrA( LPCSTR str, UINT max ) +BOOL WINAPI IsBadStringPtrA( LPCSTR str, UINT_PTR max ) { if (!str) return TRUE; @@ -810,7 +810,7 @@ BOOL WINAPI IsBadStringPtrA( LPCSTR str, UINT max ) * * See IsBadStringPtrA. */ -BOOL WINAPI IsBadStringPtrW( LPCWSTR str, UINT max ) +BOOL WINAPI IsBadStringPtrW( LPCWSTR str, UINT_PTR max ) { if (!str) return TRUE; diff --git a/include/winbase.h b/include/winbase.h index 89f27c9..15edac3 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2236,13 +2236,13 @@ WINBASEAPI PSLIST_ENTRY WINAPI InterlockedFlushSList(PSLIST_HEADER); WINBASEAPI PSLIST_ENTRY WINAPI InterlockedPopEntrySList(PSLIST_HEADER); WINBASEAPI PSLIST_ENTRY WINAPI InterlockedPushEntrySList(PSLIST_HEADER, PSLIST_ENTRY); WINBASEAPI BOOL WINAPI IsBadCodePtr(FARPROC); -WINBASEAPI BOOL WINAPI IsBadHugeReadPtr(LPCVOID,UINT); -WINBASEAPI BOOL WINAPI IsBadHugeWritePtr(LPVOID,UINT); -WINBASEAPI BOOL WINAPI IsBadReadPtr(LPCVOID,UINT); -WINBASEAPI BOOL WINAPI IsBadStringPtrA(LPCSTR,UINT); -WINBASEAPI BOOL WINAPI IsBadStringPtrW(LPCWSTR,UINT); +WINBASEAPI BOOL WINAPI IsBadHugeReadPtr(LPCVOID,UINT_PTR); +WINBASEAPI BOOL WINAPI IsBadHugeWritePtr(LPVOID,UINT_PTR); +WINBASEAPI BOOL WINAPI IsBadReadPtr(LPCVOID,UINT_PTR); +WINBASEAPI BOOL WINAPI IsBadStringPtrA(LPCSTR,UINT_PTR); +WINBASEAPI BOOL WINAPI IsBadStringPtrW(LPCWSTR,UINT_PTR); #define IsBadStringPtr WINELIB_NAME_AW(IsBadStringPtr) -WINBASEAPI BOOL WINAPI IsBadWritePtr(LPVOID,UINT); +WINBASEAPI BOOL WINAPI IsBadWritePtr(LPVOID,UINT_PTR); WINBASEAPI BOOL WINAPI IsDebuggerPresent(void); WINBASEAPI BOOL WINAPI IsSystemResumeAutomatic(void); WINADVAPI BOOL WINAPI IsTextUnicode(LPCVOID,INT,LPINT);

1 0

Nikolay Sivov : gdi32: Use a macro instead of accessing FT_Face flags directly.
by Alexandre Julliard 01 Mar '16

01 Mar '16

Module: wine Branch: master Commit: 4b05cac3911300f604d3a7674b723a91111fabec URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b05cac3911300f604d3a7674… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 1 07:49:52 2016 +0300 gdi32: Use a macro instead of accessing FT_Face flags directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 01cb913..184e1d3 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7458,7 +7458,7 @@ static BOOL get_bitmap_text_metrics(GdiFont *font) TM.tmUnderlined = font->underline; TM.tmStruckOut = font->strikeout; /* NB inverted meaning of TMPF_FIXED_PITCH */ - TM.tmPitchAndFamily = ft_face->face_flags & FT_FACE_FLAG_FIXED_WIDTH ? 0 : TMPF_FIXED_PITCH; + TM.tmPitchAndFamily = FT_IS_FIXED_WIDTH(ft_face) ? 0 : TMPF_FIXED_PITCH; TM.tmCharSet = font->charset; } #undef TM

1 0

Józef Kucia : d3d10core/tests: Port test_create_typeless_resource() from d3d11.
by Alexandre Julliard 01 Mar '16

01 Mar '16

Module: wine Branch: master Commit: 7244ad3c72570e39ee0a57400f3d40fc0629e73c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7244ad3c72570e39ee0a57400… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 29 18:35:47 2016 +0100 d3d10core/tests: Port test_create_typeless_resource() from d3d11. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 103 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 25f22c2..8a3fbc7 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -5744,6 +5744,108 @@ static void test_swapchain_flip(void) DestroyWindow(window); } +static void test_create_typeless_resource(void) +{ + D3D10_TEXTURE2D_DESC texture2d_desc; + D3D10_TEXTURE3D_DESC texture3d_desc; + ID3D10Resource *resource; + ID3D10Device *device; + ULONG refcount; + unsigned int i; + HRESULT hr; + + static const struct + { + DXGI_FORMAT format; + D3D10_BIND_FLAG bind_flags; + D3D10_RESOURCE_DIMENSION type; + BOOL succeeds; + BOOL todo; + } + tests[] = + { + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_VERTEX_BUFFER, D3D10_RESOURCE_DIMENSION_TEXTURE2D, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_INDEX_BUFFER, D3D10_RESOURCE_DIMENSION_TEXTURE2D, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_CONSTANT_BUFFER, D3D10_RESOURCE_DIMENSION_TEXTURE2D, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_DIMENSION_TEXTURE3D, TRUE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_RENDER_TARGET, D3D10_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_DEPTH_STENCIL, D3D10_RESOURCE_DIMENSION_TEXTURE2D, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32_TYPELESS, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R16G16B16A16_TYPELESS, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R16G16B16A16_TYPELESS, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_DIMENSION_TEXTURE3D, TRUE, FALSE}, + {DXGI_FORMAT_R16G16B16A16_TYPELESS, D3D10_BIND_RENDER_TARGET, D3D10_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R32G32_TYPELESS, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R32G8X24_TYPELESS, D3D10_BIND_DEPTH_STENCIL, D3D10_RESOURCE_DIMENSION_TEXTURE2D, TRUE, TRUE}, + {DXGI_FORMAT_R10G10B10A2_TYPELESS, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R10G10B10A2_TYPELESS, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_DIMENSION_TEXTURE3D, TRUE, FALSE}, + {DXGI_FORMAT_R10G10B10A2_TYPELESS, D3D10_BIND_RENDER_TARGET, D3D10_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R32_TYPELESS, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R24G8_TYPELESS, D3D10_BIND_VERTEX_BUFFER, D3D10_RESOURCE_DIMENSION_TEXTURE2D, FALSE, TRUE}, + {DXGI_FORMAT_R24G8_TYPELESS, D3D10_BIND_INDEX_BUFFER, D3D10_RESOURCE_DIMENSION_TEXTURE2D, FALSE, TRUE}, + {DXGI_FORMAT_R24G8_TYPELESS, D3D10_BIND_CONSTANT_BUFFER, D3D10_RESOURCE_DIMENSION_TEXTURE2D, FALSE, TRUE}, + {DXGI_FORMAT_R24G8_TYPELESS, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R24G8_TYPELESS, D3D10_BIND_DEPTH_STENCIL, D3D10_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R8G8_TYPELESS, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R16_TYPELESS, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R8_TYPELESS, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + }; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + texture2d_desc.Width = 512; + texture2d_desc.Height = 512; + texture2d_desc.MipLevels = 1; + texture2d_desc.ArraySize = 1; + texture2d_desc.SampleDesc.Count = 1; + texture2d_desc.SampleDesc.Quality = 0; + texture2d_desc.Usage = D3D10_USAGE_DEFAULT; + texture2d_desc.CPUAccessFlags = 0; + texture2d_desc.MiscFlags = 0; + + texture3d_desc.Width = 64; + texture3d_desc.Height = 64; + texture3d_desc.Depth = 64; + texture3d_desc.MipLevels = 1; + texture3d_desc.Usage = D3D10_USAGE_DEFAULT; + texture3d_desc.CPUAccessFlags = 0; + texture3d_desc.MiscFlags = 0; + + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + if (tests[i].type == D3D10_RESOURCE_DIMENSION_TEXTURE2D) + { + texture2d_desc.Format = tests[i].format; + texture2d_desc.BindFlags = tests[i].bind_flags; + hr = ID3D10Device_CreateTexture2D(device, &texture2d_desc, NULL, (ID3D10Texture2D **)&resource); + } + else if (tests[i].type == D3D10_RESOURCE_DIMENSION_TEXTURE3D) + { + texture3d_desc.Format = tests[i].format; + texture3d_desc.BindFlags = tests[i].bind_flags; + hr = ID3D10Device_CreateTexture3D(device, &texture3d_desc, NULL, (ID3D10Texture3D **)&resource); + } + else + { + trace("Test %u: Unknown resource type %#x.\n", i, tests[i].type); + continue; + } + + todo_wine_if(tests[i].todo) + ok(hr == (tests[i].succeeds ? S_OK : E_INVALIDARG), "Test %u: Got unexpected hr %#x.\n", i, hr); + + if (SUCCEEDED(hr)) + ID3D10Resource_Release(resource); + } + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(device) { test_feature_level(); @@ -5776,4 +5878,5 @@ START_TEST(device) test_check_multisample_quality_levels(); test_cb_relative_addressing(); test_swapchain_flip(); + test_create_typeless_resource(); }

1 0

Frédéric Delanoy : ieframe/tests: Use todo_wine_if() in tests.
by Alexandre Julliard 01 Mar '16

01 Mar '16

Module: wine Branch: master Commit: 014e06b9c5176f0e1221a76e7f73ff9c59963de2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=014e06b9c5176f0e1221a76e7… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Feb 27 15:27:32 2016 +0100 ieframe/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/webbrowser.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 032faef..b2bbebd 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -1654,9 +1654,7 @@ static HRESULT WINAPI DocHostUIHandler_GetExternal(IDocHostUIHandler2 *iface, ID static HRESULT WINAPI DocHostUIHandler_TranslateUrl(IDocHostUIHandler2 *iface, DWORD dwTranslate, OLECHAR *pchURLIn, OLECHAR **ppchURLOut) { - if(is_downloading && !(dwl_flags & DWL_EXPECT_BEFORE_NAVIGATE)) - todo_wine CHECK_EXPECT(TranslateUrl); - else + todo_wine_if(is_downloading && !(dwl_flags & DWL_EXPECT_BEFORE_NAVIGATE)) CHECK_EXPECT(TranslateUrl); return E_NOTIMPL; }

1 0

Frédéric Delanoy : d3dx9/tests: Use todo_wine_if () in tests.
by Alexandre Julliard 01 Mar '16

01 Mar '16

Module: wine Branch: master Commit: 2d9659d311e23bb24f6f8b12a05b0acd77917ca2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d9659d311e23bb24f6f8b12a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Feb 27 15:27:33 2016 +0100 d3dx9/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/texture.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 095650f..87d13d2 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -1497,10 +1497,8 @@ static void test_D3DXCreateTextureFromFileInMemory(IDirect3DDevice9 *device) /* Check that D3DXCreateTextureFromFileInMemory accepts cube texture dds file (only first face texture is loaded) */ hr = D3DXCreateTextureFromFileInMemory(device, dds_cube_map, sizeof(dds_cube_map), &texture); - if (has_2d_dxt5) + todo_wine_if (!has_2d_dxt5) ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemory returned %#x, expected %#x.\n", hr, D3D_OK); - else - todo_wine ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemory returned %#x, expected %#x.\n", hr, D3D_OK); if (SUCCEEDED(hr)) { type = IDirect3DTexture9_GetType(texture); @@ -1525,10 +1523,8 @@ static void test_D3DXCreateTextureFromFileInMemory(IDirect3DDevice9 *device) /* Volume textures work too. */ hr = D3DXCreateTextureFromFileInMemory(device, dds_volume_map, sizeof(dds_volume_map), &texture); - if (has_2d_dxt3) + todo_wine_if (!has_2d_dxt3) ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemory returned %#x, expected %#x.\n", hr, D3D_OK); - else - todo_wine ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemory returned %#x, expected %#x.\n", hr, D3D_OK); if (SUCCEEDED(hr)) { type = IDirect3DTexture9_GetType(texture); @@ -1754,10 +1750,8 @@ static void test_D3DXCreateCubeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic hr = D3DXCreateCubeTextureFromFileInMemoryEx(device, dds_cube_map, sizeof(dds_cube_map), D3DX_DEFAULT, D3DX_DEFAULT, D3DUSAGE_DYNAMIC | D3DUSAGE_AUTOGENMIPMAP, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, &cube_texture); - if (has_cube_dxt5) + todo_wine_if (!has_cube_dxt5) ok(hr == D3D_OK, "D3DXCreateCubeTextureFromFileInMemoryEx returned %#x, expected %#x.\n", hr, D3D_OK); - else - todo_wine ok(hr == D3D_OK, "D3DXCreateCubeTextureFromFileInMemoryEx returned %#x, expected %#x.\n", hr, D3D_OK); if (SUCCEEDED(hr)) IDirect3DCubeTexture9_Release(cube_texture); } @@ -1782,10 +1776,8 @@ static void test_D3DXCreateVolumeTextureFromFileInMemory(IDirect3DDevice9 *devic ok(hr == D3DERR_INVALIDCALL, "D3DXCreateVolumeTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); hr = D3DXCreateVolumeTextureFromFileInMemory(device, dds_volume_map, sizeof(dds_volume_map), &volume_texture); - if (has_3d_dxt3) + todo_wine_if (!has_3d_dxt3) ok(hr == D3D_OK, "D3DXCreateVolumeTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); - else - todo_wine ok(hr == D3D_OK, "D3DXCreateVolumeTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); if (SUCCEEDED(hr)) { levelcount = IDirect3DVolumeTexture9_GetLevelCount(volume_texture);

1 0