wine-commits January 2016

wine-commits@winehq.org

2 participants
627 discussions

Alexandre Julliard : Release 1.9.1.
by Alexandre Julliard 09 Jan '16

09 Jan '16

Module: wine Branch: master Commit: 91dd155e9bc13c1bc1be860cd67fe3e48c20feae URL: http://source.winehq.org/git/wine.git/?a=commit;h=91dd155e9bc13c1bc1be860cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 9 18:30:39 2016 +0900 Release 1.9.1. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 484 ++++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 +-- 3 files changed, 262 insertions(+), 242 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=91dd155e9bc13c1bc1be8…

1 0

Nikolay Sivov : shlwapi/tests: Fix uninitialized data access in tests ( Valgrind).
by Alexandre Julliard 09 Jan '16

09 Jan '16

Module: wine Branch: master Commit: ed0520e2e2a4c15eebc4f97a6f6d8258ad9387b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed0520e2e2a4c15eebc4f97a6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 7 23:14:55 2016 +0300 shlwapi/tests: Fix uninitialized data access in tests (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/ordinal.c | 2 +- dlls/shlwapi/tests/ordinal.c | 41 +++++++++++++++++++++-------------------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index e3d021f..334607e 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4842,7 +4842,7 @@ typedef struct SHELL_USER_PERMISSION { /* ...and this should be in shlwapi.h */ * NOTES * Call should free returned descriptor with LocalFree */ -PSECURITY_DESCRIPTOR WINAPI GetShellSecurityDescriptor(PSHELL_USER_PERMISSION *apUserPerm, int cUserPerm) +PSECURITY_DESCRIPTOR WINAPI GetShellSecurityDescriptor(const PSHELL_USER_PERMISSION *apUserPerm, int cUserPerm) { PSID *sidlist; PSID cur_user = NULL; diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index afccd3a..2a1eaed 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -72,6 +72,23 @@ static HWND (WINAPI *pSHSetParentHwnd)(HWND, HWND); static HRESULT (WINAPI *pIUnknown_GetClassID)(IUnknown*, CLSID*); static HRESULT (WINAPI *pDllGetVersion)(DLLVERSIONINFO2*); +typedef struct SHELL_USER_SID { + SID_IDENTIFIER_AUTHORITY sidAuthority; + DWORD dwUserGroupID; + DWORD dwUserID; +} SHELL_USER_SID, *PSHELL_USER_SID; +typedef struct SHELL_USER_PERMISSION { + + SHELL_USER_SID susID; + DWORD dwAccessType; + BOOL fInherit; + DWORD dwAccessMask; + DWORD dwInheritMask; + DWORD dwInheritAccessMask; +} SHELL_USER_PERMISSION, *PSHELL_USER_PERMISSION; + +static SECURITY_DESCRIPTOR* (WINAPI *pGetShellSecurityDescriptor)(const SHELL_USER_PERMISSION**,int); + static HMODULE hmlang; static HRESULT (WINAPI *pLcidToRfc1766A)(LCID, LPSTR, INT); @@ -676,40 +693,23 @@ static void test_fdsa(void) HeapFree(GetProcessHeap(), 0, mem); } - -typedef struct SHELL_USER_SID { - SID_IDENTIFIER_AUTHORITY sidAuthority; - DWORD dwUserGroupID; - DWORD dwUserID; -} SHELL_USER_SID, *PSHELL_USER_SID; -typedef struct SHELL_USER_PERMISSION { - SHELL_USER_SID susID; - DWORD dwAccessType; - BOOL fInherit; - DWORD dwAccessMask; - DWORD dwInheritMask; - DWORD dwInheritAccessMask; -} SHELL_USER_PERMISSION, *PSHELL_USER_PERMISSION; static void test_GetShellSecurityDescriptor(void) { - SHELL_USER_PERMISSION supCurrentUserFull = { + static const SHELL_USER_PERMISSION supCurrentUserFull = { { {SECURITY_NULL_SID_AUTHORITY}, 0, 0 }, ACCESS_ALLOWED_ACE_TYPE, FALSE, GENERIC_ALL, 0, 0 }; #define MY_INHERITANCE 0xBE /* invalid value to proof behavior */ - SHELL_USER_PERMISSION supEveryoneDenied = { + static const SHELL_USER_PERMISSION supEveryoneDenied = { { {SECURITY_WORLD_SID_AUTHORITY}, SECURITY_WORLD_RID, 0 }, ACCESS_DENIED_ACE_TYPE, TRUE, GENERIC_WRITE, MY_INHERITANCE | 0xDEADBA00, GENERIC_READ }; - PSHELL_USER_PERMISSION rgsup[2] = { + const SHELL_USER_PERMISSION* rgsup[2] = { &supCurrentUserFull, &supEveryoneDenied, }; SECURITY_DESCRIPTOR* psd; - SECURITY_DESCRIPTOR* (WINAPI*pGetShellSecurityDescriptor)(PSHELL_USER_PERMISSION*,int); void *pChrCmpIW = GetProcAddress(hShlwapi, "ChrCmpIW"); - pGetShellSecurityDescriptor=(void*)GetProcAddress(hShlwapi,(char*)475); - if(!pGetShellSecurityDescriptor) { win_skip("GetShellSecurityDescriptor not available\n"); @@ -3064,6 +3064,7 @@ static void init_pointers(void) MAKEFUNC(SHFormatDateTimeA, 353); MAKEFUNC(SHFormatDateTimeW, 354); MAKEFUNC(SHIShellFolder_EnumObjects, 404); + MAKEFUNC(GetShellSecurityDescriptor, 475); MAKEFUNC(SHGetObjectCompatFlags, 476); MAKEFUNC(IUnknown_QueryServiceExec, 484); MAKEFUNC(SHGetShellKey, 491);

1 0

Austin English : ntdll: Add RtlCreateUserProcess stub.
by Alexandre Julliard 09 Jan '16

09 Jan '16

Module: wine Branch: master Commit: 23d3b123db9599d216e1b5f2b2b33e91af2043a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23d3b123db9599d216e1b5f2b… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 15 01:51:05 2015 -0600 ntdll: Add RtlCreateUserProcess stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/rtl.c | 13 +++++++++++++ include/winternl.h | 10 ++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index a96edb1..4e49709 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -506,7 +506,7 @@ @ stdcall RtlCreateTimerQueue(ptr) @ stdcall RtlCreateUnicodeString(ptr wstr) @ stdcall RtlCreateUnicodeStringFromAsciiz(ptr str) -@ stub RtlCreateUserProcess +@ stdcall RtlCreateUserProcess(ptr long ptr ptr ptr long long long long ptr) @ stub RtlCreateUserSecurityObject @ stdcall RtlCreateUserThread(long ptr long ptr long long ptr ptr ptr ptr) @ stub RtlCustomCPToUnicodeN diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 74ad35a..f699cff 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1613,3 +1613,16 @@ void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE table, void *buffer, { FIXME("%p %p %u %p: stub\n", table, buffer, size, element); } + +/********************************************************************** + * RtlCreateUserProcess [NTDLL.@] + */ +NTSTATUS WINAPI RtlCreateUserProcess(UNICODE_STRING *path, ULONG attributes, RTL_USER_PROCESS_PARAMETERS *parameters, + SECURITY_DESCRIPTOR *process_descriptor, SECURITY_DESCRIPTOR *thread_descriptor, + HANDLE parent, BOOLEAN inherit, HANDLE debug, HANDLE exception, + RTL_USER_PROCESS_INFORMATION *info) +{ + FIXME("(%p %u %p %p %p %p %d %p %p %p): stub\n", path, attributes, parameters, process_descriptor, thread_descriptor, + parent, inherit, debug, exception, info); + return STATUS_NOT_IMPLEMENTED; +} diff --git a/include/winternl.h b/include/winternl.h index 42ecb5b..3494c00 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1893,6 +1893,15 @@ typedef struct _LPC_MESSAGE { UCHAR Data[ANYSIZE_ARRAY]; } LPC_MESSAGE, *PLPC_MESSAGE; +typedef struct _RTL_USER_PROCESS_INFORMATION +{ + ULONG Length; + HANDLE Process; + HANDLE Thread; + CLIENT_ID ClientId; + SECTION_IMAGE_INFORMATION ImageInformation; +} RTL_USER_PROCESS_INFORMATION, *PRTL_USER_PROCESS_INFORMATION; + typedef enum _SHUTDOWN_ACTION { ShutdownNoReboot, ShutdownReboot, @@ -2393,6 +2402,7 @@ NTSYSAPI NTSTATUS WINAPI RtlCreateTimerQueue(PHANDLE); NTSYSAPI NTSTATUS WINAPI RtlCreateTimer(PHANDLE, HANDLE, RTL_WAITORTIMERCALLBACKFUNC, PVOID, DWORD, DWORD, ULONG); NTSYSAPI BOOLEAN WINAPI RtlCreateUnicodeString(PUNICODE_STRING,LPCWSTR); NTSYSAPI BOOLEAN WINAPI RtlCreateUnicodeStringFromAsciiz(PUNICODE_STRING,LPCSTR); +NTSYSAPI NTSTATUS WINAPI RtlCreateUserProcess(UNICODE_STRING*,ULONG,RTL_USER_PROCESS_PARAMETERS*,SECURITY_DESCRIPTOR*,SECURITY_DESCRIPTOR*,HANDLE,BOOLEAN,HANDLE,HANDLE,RTL_USER_PROCESS_INFORMATION*); NTSYSAPI NTSTATUS WINAPI RtlCreateUserThread(HANDLE,const SECURITY_DESCRIPTOR*,BOOLEAN,PVOID,SIZE_T,SIZE_T,PRTL_THREAD_START_ROUTINE,void*,HANDLE*,CLIENT_ID*); NTSYSAPI void WINAPI RtlDeactivateActivationContext(DWORD,ULONG_PTR); NTSYSAPI PVOID WINAPI RtlDecodePointer(PVOID);

1 0

Nikolay Sivov : comctl32/tests: Separate individual Trackbar tests from each other.
by Alexandre Julliard 09 Jan '16

09 Jan '16

Module: wine Branch: master Commit: 1fce80024bab34a0828cb8f04c69819d3452ade9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fce80024bab34a0828cb8f04… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 8 15:47:07 2016 +0300 comctl32/tests: Separate individual Trackbar tests from each other. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/trackbar.c | 202 ++++++++++++++++++++++++++++------------- 1 file changed, 138 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1fce80024bab34a0828cb…

1 0

Alex Henrie : ntdll/tests: Correct signaled / not signaled error messages.
by Alexandre Julliard 09 Jan '16

09 Jan '16

Module: wine Branch: master Commit: a228d7d9808d5a48b3a31e7fdd06e73b112df20f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a228d7d9808d5a48b3a31e7fd… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Jan 8 02:38:36 2016 -0700 ntdll/tests: Correct signaled / not signaled error messages. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index b8f1847..7bf2ffe 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -677,7 +677,7 @@ static void read_file_test(void) apc_count = 0; U(iosb).Status = 0xdeadbabe; iosb.Information = 0xdeadbeef; - ok( !is_signaled( read ), "read handle is not signaled\n" ); + ok( !is_signaled( read ), "read handle is signaled\n" ); status = pNtReadFile( read, 0, apc, &apc_count, &iosb, buffer, 1, NULL, NULL ); ok( status == STATUS_PENDING, "wrong status %x\n", status ); ok( !is_signaled( read ), "read handle is signaled\n" ); @@ -690,7 +690,7 @@ static void read_file_test(void) Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 1, "wrong info %lu\n", iosb.Information ); - ok( is_signaled( read ), "read handle is signaled\n" ); + ok( is_signaled( read ), "read handle is not signaled\n" ); ok( !apc_count, "apc was called\n" ); apc_count = 0; SleepEx( 1, FALSE ); /* non-alertable sleep */ @@ -731,7 +731,7 @@ static void read_file_test(void) ok(ret && written == 1, "WriteFile error %d\n", GetLastError()); /* partial read is good enough */ Sleep(1); /* FIXME: needed for wine to run the i/o apc */ - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 1, "wrong info %lu\n", iosb.Information ); ok( !apc_count, "apc was called\n" ); @@ -762,7 +762,7 @@ static void read_file_test(void) ok( status == STATUS_INVALID_HANDLE, "wrong status %x\n", status ); ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); /* not reset on invalid handle */ + ok( is_signaled( event ), "event is not signaled\n" ); /* not reset on invalid handle */ ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( !apc_count, "apc was called\n" ); @@ -782,7 +782,7 @@ static void read_file_test(void) Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( U(iosb).Status == STATUS_PIPE_BROKEN, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); @@ -807,7 +807,7 @@ static void read_file_test(void) Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); @@ -833,7 +833,7 @@ static void read_file_test(void) Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); @@ -859,7 +859,7 @@ static void read_file_test(void) Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); @@ -885,7 +885,7 @@ static void read_file_test(void) Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 2, "apc was not called\n" ); @@ -906,7 +906,7 @@ static void read_file_test(void) if (status == STATUS_PENDING) WaitForSingleObject( event, 1000 ); ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == strlen(text), "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); @@ -923,7 +923,7 @@ static void read_file_test(void) if (status == STATUS_PENDING) WaitForSingleObject( event, 1000 ); ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == strlen(text), "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); @@ -940,7 +940,7 @@ static void read_file_test(void) WaitForSingleObject( event, 1000 ); ok( U(iosb).Status == STATUS_END_OF_FILE, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); @@ -961,7 +961,7 @@ static void read_file_test(void) if (status == STATUS_PENDING) WaitForSingleObject( event, 1000 ); ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == strlen(text), "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); @@ -975,7 +975,7 @@ static void read_file_test(void) ok( status == STATUS_SUCCESS, "wrong status %x\n", status ); ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == strlen(text), "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ todo_wine ok( !apc_count, "apc was called\n" );

1 0

Józef Kucia : wined3d: Add usage flags introduced with d3d9ex.
by Alexandre Julliard 09 Jan '16

09 Jan '16

Module: wine Branch: master Commit: 025373ca0e0bb690bb6459b3563eb6c1e9b7e4f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=025373ca0e0bb690bb6459b35… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 8 12:59:59 2016 +0100 wined3d: Add usage flags introduced with d3d9ex. 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> --- include/wine/wined3d.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9f39a6d..300b322 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -815,12 +815,16 @@ enum wined3d_display_rotation #define WINED3DUSAGE_NPATCHES 0x00000100 #define WINED3DUSAGE_DYNAMIC 0x00000200 #define WINED3DUSAGE_AUTOGENMIPMAP 0x00000400 +#define WINED3DUSAGE_RESTRICTED_CONTENT 0x00000800 +#define WINED3DUSAGE_RESTRICT_SHARED_RESOURCE_DRIVER 0x00001000 +#define WINED3DUSAGE_RESTRICT_SHARED_RESOURCE 0x00002000 #define WINED3DUSAGE_DMAP 0x00004000 -#define WINED3DUSAGE_MASK 0x00004fff -#define WINED3DUSAGE_TEXTURE 0x10000000 -#define WINED3DUSAGE_OWNDC 0x20000000 -#define WINED3DUSAGE_STATICDECL 0x40000000 -#define WINED3DUSAGE_OVERLAY 0x80000000 +#define WINED3DUSAGE_TEXTAPI 0x10000000 +#define WINED3DUSAGE_MASK 0x10007fff +#define WINED3DUSAGE_TEXTURE 0x01000000 +#define WINED3DUSAGE_OWNDC 0x02000000 +#define WINED3DUSAGE_STATICDECL 0x04000000 +#define WINED3DUSAGE_OVERLAY 0x08000000 #define WINED3DUSAGE_QUERY_LEGACYBUMPMAP 0x00008000 #define WINED3DUSAGE_QUERY_FILTER 0x00020000

1 0

Józef Kucia : d3d9/tests: Add missing space to trace( ) message.
by Alexandre Julliard 09 Jan '16

09 Jan '16

Module: wine Branch: master Commit: 810423960d14f197f936379605ba244a67a228bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=810423960d14f197f93637960… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 7 16:22:47 2016 +0100 d3d9/tests: Add missing space to trace() message. 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/d3d9/tests/d3d9ex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index e1ca770..99ba823 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -622,7 +622,7 @@ static void test_get_adapter_displaymode_ex(void) todo_wine ok(S2(U1(startmode)).dmDisplayOrientation == DMDO_180 && rotation == D3DDISPLAYROTATION_180, "rotation is %d instead of %d\n", rotation, S2(U1(startmode)).dmDisplayOrientation); - trace("GetAdapterDisplayModeEx returned Width = %d,Height = %d, RefreshRate = %d, Format = %x, ScanLineOrdering = %x, rotation = %d\n", + trace("GetAdapterDisplayModeEx returned Width = %d, Height = %d, RefreshRate = %d, Format = %x, ScanLineOrdering = %x, rotation = %d\n", mode_ex.Width, mode_ex.Height, mode_ex.RefreshRate, mode_ex.Format, mode_ex.ScanLineOrdering, rotation); /* test GetAdapterDisplayModeEx with null pointer for D3DDISPLAYROTATION */

1 0

Józef Kucia : d3d9/tests: Add test for CreateDepthStencilSurfaceEx().
by Alexandre Julliard 09 Jan '16

09 Jan '16

Module: wine Branch: master Commit: 38d2d462df799b54a3fae80838b4984563a1e5f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38d2d462df799b54a3fae8083… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 7 16:22:46 2016 +0100 d3d9/tests: Add test for CreateDepthStencilSurfaceEx(). 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/d3d9/tests/d3d9ex.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 151db41..e1ca770 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -42,6 +42,11 @@ struct device_desc DWORD flags; }; +static BOOL adapter_is_warp(const D3DADAPTER_IDENTIFIER9 *identifier) +{ + return !strcmp(identifier->Driver, "d3d10warp.dll"); +} + static BOOL color_match(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) { unsigned int i; @@ -644,6 +649,81 @@ out: IDirect3D9Ex_Release(d3d9ex); } +static void test_create_depth_stencil_surface_ex(void) +{ + static const struct + { + DWORD usage; + HRESULT hr; + BOOL broken_warp; + } + tests[] = + { + {0, D3D_OK, FALSE}, + {D3DUSAGE_DEPTHSTENCIL, D3DERR_INVALIDCALL, FALSE}, + {D3DUSAGE_RESTRICTED_CONTENT, D3D_OK, TRUE}, + }; + + D3DADAPTER_IDENTIFIER9 identifier; + D3DSURFACE_DESC surface_desc; + IDirect3DDevice9Ex *device; + IDirect3DSurface9 *surface; + IDirect3D9 *d3d; + unsigned int i; + HWND window; + HRESULT hr; + ULONG ref; + BOOL warp; + + window = create_window(); + + if (!(device = create_device(window, NULL))) + { + skip("Failed to create a D3D device.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9Ex_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get Direct3D9, hr %#x.\n", hr); + hr = IDirect3D9_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier); + ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr); + warp = adapter_is_warp(&identifier); + IDirect3D9_Release(d3d); + + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + surface = (IDirect3DSurface9 *)0xdeadbeef; + hr = IDirect3DDevice9Ex_CreateDepthStencilSurfaceEx(device, 64, 64, D3DFMT_D24S8, + D3DMULTISAMPLE_NONE, 0, TRUE, &surface, NULL, tests[i].usage); + ok(hr == tests[i].hr || broken(warp && tests[i].broken_warp), + "Test %u: Got unexpected hr %#x.\n", i, hr); + if (SUCCEEDED(hr)) + { + hr = IDirect3DSurface9_GetDesc(surface, &surface_desc); + ok(SUCCEEDED(hr), "Test %u: GetDesc failed, hr %#x.\n", i, hr); + ok(surface_desc.Type == D3DRTYPE_SURFACE, "Test %u: Got unexpected type %#x.\n", + i, surface_desc.Type); + ok(surface_desc.Pool == D3DPOOL_DEFAULT, "Test %u: Got unexpected pool %#x.\n", + i, surface_desc.Pool); + ok(surface_desc.Usage == (tests[i].usage | D3DUSAGE_DEPTHSTENCIL), + "Test %u: Got unexpected usage %#x.\n", i, surface_desc.Usage); + + ref = IDirect3DSurface9_Release(surface); + ok(!ref, "Test %u: Surface has %u references left.\n", i, ref); + } + else + { + ok(surface == (IDirect3DSurface9 *)0xdeadbeef || broken(warp && tests[i].broken_warp), + "Test %u: Got unexpected surface pointer %p.\n", i, surface); + } + } + + ref = IDirect3DDevice9Ex_Release(device); + ok(!ref, "Device has %u references left.\n", ref); + DestroyWindow(window); +} + static void test_user_memory(void) { static const struct @@ -3078,6 +3158,7 @@ START_TEST(d3d9ex) test_swapchain_get_displaymode_ex(); test_get_adapter_luid(); test_get_adapter_displaymode_ex(); + test_create_depth_stencil_surface_ex(); test_user_memory(); test_reset(); test_reset_resources();

1 0

Józef Kucia : d3d9: Implement d3d9_device_CreateDepthStencilSurfaceEx().
by Alexandre Julliard 09 Jan '16

09 Jan '16

Module: wine Branch: master Commit: 89c6a755c4c752558b8d3bf3ba3883d8d3ab4cbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=89c6a755c4c752558b8d3bf3b… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Thu Jan 7 16:22:45 2016 +0100 d3d9: Implement d3d9_device_CreateDepthStencilSurfaceEx(). 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/d3d9/device.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 294e680..ef019b1 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3352,16 +3352,28 @@ static HRESULT WINAPI d3d9_device_CreateDepthStencilSurfaceEx(IDirect3DDevice9Ex UINT width, UINT height, D3DFORMAT format, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, BOOL discard, IDirect3DSurface9 **surface, HANDLE *shared_handle, DWORD usage) { - FIXME("iface %p, width %u, height %u, format %#x, multisample_type %#x, multisample_quality %u,\n" - "discard %#x, surface %p, shared_handle %p, usage %#x stub!\n", + struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + DWORD flags = WINED3D_SURFACE_MAPPABLE; + + TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x, multisample_quality %u, " + "discard %#x, surface %p, shared_handle %p, usage %#x.\n", iface, width, height, format, multisample_type, multisample_quality, discard, surface, shared_handle, usage); - *surface = NULL; + if (usage & D3DUSAGE_DEPTHSTENCIL) + { + WARN("Invalid usage %#x.\n", usage); + return D3DERR_INVALIDCALL; + } + if (shared_handle) FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); - return E_NOTIMPL; + if (discard) + flags |= WINED3D_SURFACE_DISCARD; + + return d3d9_device_create_surface(device, width, height, format, flags, surface, + D3DUSAGE_DEPTHSTENCIL | usage, D3DPOOL_DEFAULT, multisample_type, multisample_quality, NULL); } static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_ResetEx(IDirect3DDevice9Ex *iface,

1 0

Józef Kucia : include: Add declarations for D3DUSAGEs added with d3d9ex.
by Alexandre Julliard 09 Jan '16

09 Jan '16

Module: wine Branch: master Commit: 391734702f4947937f5e1681f7e790951ed3cf53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=391734702f4947937f5e1681f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 7 16:22:44 2016 +0100 include: Add declarations for D3DUSAGEs added with d3d9ex. 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> --- include/d3d9types.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/d3d9types.h b/include/d3d9types.h index cec42ec..8ebedcc 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -113,6 +113,14 @@ #define D3DUSAGE_AUTOGENMIPMAP __MSABI_LONG(0x00000400) #define D3DUSAGE_DMAP __MSABI_LONG(0x00004000) +/* Parts added with d3d9ex */ +#if !defined(D3D_DISABLE_9EX) +#define D3DUSAGE_RESTRICTED_CONTENT __MSABI_LONG(0x00000800) +#define D3DUSAGE_RESTRICT_SHARED_RESOURCE_DRIVER __MSABI_LONG(0x00001000) +#define D3DUSAGE_RESTRICT_SHARED_RESOURCE __MSABI_LONG(0x00002000) +#define D3DUSAGE_TEXTAPI __MSABI_LONG(0x10000000) +#endif /* D3D_DISABLE_9EX */ + #define D3DUSAGE_QUERY_FILTER __MSABI_LONG(0x00020000) #define D3DUSAGE_QUERY_LEGACYBUMPMAP __MSABI_LONG(0x00008000) #define D3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING __MSABI_LONG(0x00080000)

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
63
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 January 2016