Ros-diffs August 2012

ros-diffs@reactos.org

14 participants
198 discussions

[cgutman] 57168: [AFD] - Fix returning uninitialized data from FIONREAD when the socket is not bound or connected

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Aug 26 20:13:22 2012 New Revision: 57168 URL: http://svn.reactos.org/svn/reactos?rev=57168&view=rev Log: [AFD] - Fix returning uninitialized data from FIONREAD when the socket is not bound or connected Modified: trunk/reactos/drivers/network/afd/afd/info.c Modified: trunk/reactos/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/in… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] Sun Aug 26 20:13:22 2012 @@ -52,11 +52,7 @@ break; case AFD_INFO_RECEIVE_CONTENT_SIZE: - /* Only touch InfoReq if a socket has been set up. - Behaviour was verified under WinXP SP2. */ - if(FCB->AddressFile.Object || FCB->Connection.Object) - InfoReq->Information.Ulong = FCB->Recv.Content - FCB->Recv.BytesUsed; - + InfoReq->Information.Ulong = FCB->Recv.Content - FCB->Recv.BytesUsed; break; case AFD_INFO_SENDS_IN_PROGRESS:

12 years, 4 months

[ekohl] 57167: [ADVAPI32/LSASRV] - Implement LsaSetSeceret/LsarSetSecret (secret values are not encrypted yet) and LsaSetSystemAccessAccount. - Improve some TRACE messages.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Aug 26 14:05:27 2012 New Revision: 57167 URL: http://svn.reactos.org/svn/reactos?rev=57167&view=rev Log: [ADVAPI32/LSASRV] - Implement LsaSetSeceret/LsarSetSecret (secret values are not encrypted yet) and LsaSetSystemAccessAccount. - Improve some TRACE messages. Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec trunk/reactos/dll/win32/advapi32/sec/lsa.c trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/include/psdk/ntlsa.h trunk/reactos/include/psdk/ntsecapi.h trunk/reactos/include/reactos/idl/lsa.idl Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] Sun Aug 26 14:05:27 2012 @@ -402,7 +402,7 @@ @ stub LsaSetQuotasForAccount @ stdcall LsaSetSecret(ptr ptr ptr) @ stub LsaSetSecurityObject -@ stub LsaSetSystemAccessAccount +@ stdcall LsaSetSystemAccessAccount(ptr long) @ stdcall LsaSetTrustedDomainInfoByName(ptr ptr long ptr) @ stdcall LsaSetTrustedDomainInformation(ptr ptr long ptr) @ stdcall LsaStorePrivateData(ptr ptr ptr) Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Sun Aug 26 14:05:27 2012 @@ -1027,7 +1027,8 @@ { LSAPR_USER_RIGHT_SET UserRightSet; - TRACE("(%p,%p,%d,%p,0x%08x) stub\n", PolicyHandle, AccountSid, AllRights, UserRights, CountOfRights); + TRACE("LsaRemoveAccountRights(%p %p %d %p 0x%08x) stub\n", + PolicyHandle, AccountSid, AllRights, UserRights, CountOfRights); UserRightSet.Entries = CountOfRights; UserRightSet.UserRights = (PRPC_UNICODE_STRING)UserRights; @@ -1089,7 +1090,8 @@ { NTSTATUS Status; - TRACE("(%p,0x%08x,%p)\n", PolicyHandle, InformationClass, Buffer); + TRACE("LsaSetInformationPolicy(%p 0x%08x %p)\n", + PolicyHandle, InformationClass, Buffer); RpcTryExcept { @@ -1108,17 +1110,106 @@ /* - * @unimplemented - */ -NTSTATUS WINAPI LsaSetSecret( - IN LSA_HANDLE SecretHandle, - IN PLSA_UNICODE_STRING EncryptedCurrentValue, - IN PLSA_UNICODE_STRING EncryptedOldValue) -{ - FIXME("(%p,%p,%p) stub\n", SecretHandle, EncryptedCurrentValue, - EncryptedOldValue); - return STATUS_SUCCESS; -} + * @implemented + */ +NTSTATUS +WINAPI +LsaSetSecret(IN LSA_HANDLE SecretHandle, + IN PLSA_UNICODE_STRING CurrentValue OPTIONAL, + IN PLSA_UNICODE_STRING OldValue OPTIONAL) +{ + PLSAPR_CR_CIPHER_VALUE EncryptedCurrentValue = NULL; + PLSAPR_CR_CIPHER_VALUE EncryptedOldValue = NULL; + SIZE_T BufferSize; + NTSTATUS Status; + + TRACE("LsaSetSecret(%p,%p,%p)\n", + SecretHandle, EncryptedCurrentValue, EncryptedOldValue); + + if (CurrentValue != NULL) + { + BufferSize = sizeof(LSAPR_CR_CIPHER_VALUE) + CurrentValue->MaximumLength; + EncryptedCurrentValue = midl_user_allocate(BufferSize); + if (EncryptedCurrentValue == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + EncryptedCurrentValue->Length = CurrentValue->Length; + EncryptedCurrentValue->MaximumLength = CurrentValue->MaximumLength; + EncryptedCurrentValue->Buffer = (BYTE *)(EncryptedCurrentValue + 1); + if (EncryptedCurrentValue->Buffer != NULL) + memcpy(EncryptedCurrentValue->Buffer, CurrentValue->Buffer, CurrentValue->Length); + } + + if (OldValue != NULL) + { + BufferSize = sizeof(LSAPR_CR_CIPHER_VALUE) + OldValue->MaximumLength; + EncryptedOldValue = midl_user_allocate(BufferSize); + if (EncryptedOldValue == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + EncryptedOldValue->Length = OldValue->Length; + EncryptedOldValue->MaximumLength = OldValue->MaximumLength; + EncryptedOldValue->Buffer = (BYTE*)(EncryptedOldValue + 1); + if (EncryptedOldValue->Buffer != NULL) + memcpy(EncryptedOldValue->Buffer, OldValue->Buffer, OldValue->Length); + } + + RpcTryExcept + { + Status = LsarSetSecret((LSAPR_HANDLE)SecretHandle, + EncryptedCurrentValue, + EncryptedOldValue); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + +done: + if (EncryptedCurrentValue != NULL) + midl_user_free(EncryptedCurrentValue); + + if (EncryptedOldValue != NULL) + midl_user_free(EncryptedOldValue); + + return Status; +} + + +/* + * @implemented + */ +NTSTATUS +WINAPI +LsaSetSystemAccessAccount(IN LSA_HANDLE AccountHandle, + IN ULONG SystemAccess) +{ + NTSTATUS Status; + + TRACE("LsaSetSystemAccessAccount(%p 0x%lx)\n", + AccountHandle, SystemAccess); + + RpcTryExcept + { + Status = LsarSetSystemAccessAccount((LSAPR_HANDLE)AccountHandle, + SystemAccess); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + /* * @unimplemented Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sun Aug 26 14:05:27 2012 @@ -1193,12 +1193,96 @@ /* Function 29 */ NTSTATUS WINAPI LsarSetSecret( - LSAPR_HANDLE *SecretHandle, + LSAPR_HANDLE SecretHandle, PLSAPR_CR_CIPHER_VALUE EncryptedCurrentValue, PLSAPR_CR_CIPHER_VALUE EncryptedOldValue) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PLSA_DB_OBJECT SecretObject; + PBYTE CurrentValue = NULL; + PBYTE OldValue = NULL; + ULONG CurrentValueLength = 0; + ULONG OldValueLength = 0; + LARGE_INTEGER Time; + NTSTATUS Status; + + /* Validate the SecretHandle */ + Status = LsapValidateDbObject(SecretHandle, + LsaDbSecretObject, + SECRET_SET_VALUE, + &SecretObject); + if (!NT_SUCCESS(Status)) + { + ERR("LsapValidateDbObject returned 0x%08lx\n", Status); + return Status; + } + + if (EncryptedCurrentValue != NULL) + { + /* FIXME: Decrypt the current value */ + CurrentValue = EncryptedCurrentValue->Buffer; + CurrentValueLength = EncryptedCurrentValue->MaximumLength; + } + + /* Set the current value */ + Status = LsapSetObjectAttribute(SecretObject, + L"CurrentValue", + CurrentValue, + CurrentValueLength); + if (!NT_SUCCESS(Status)) + { + ERR("LsapSetObjectAttribute failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Get the current time */ + Status = NtQuerySystemTime(&Time); + if (!NT_SUCCESS(Status)) + { + ERR("NtQuerySystemTime failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Set the current time */ + Status = LsapSetObjectAttribute(SecretObject, + L"CurrentTime", + &Time, + sizeof(LARGE_INTEGER)); + if (!NT_SUCCESS(Status)) + { + ERR("LsapSetObjectAttribute failed (Status 0x%08lx)\n", Status); + goto done; + } + + if (EncryptedOldValue != NULL) + { + /* FIXME: Decrypt the old value */ + OldValue = EncryptedOldValue->Buffer; + OldValueLength = EncryptedOldValue->MaximumLength; + } + + /* Set the old value */ + Status = LsapSetObjectAttribute(SecretObject, + L"OldValue", + OldValue, + OldValueLength); + if (!NT_SUCCESS(Status)) + { + ERR("LsapSetObjectAttribute failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Set the old time */ + Status = LsapSetObjectAttribute(SecretObject, + L"OldTime", + &Time, + sizeof(LARGE_INTEGER)); + if (!NT_SUCCESS(Status)) + { + ERR("LsapSetObjectAttribute failed (Status 0x%08lx)\n", Status); + } + +done: + return Status; } Modified: trunk/reactos/include/psdk/ntlsa.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntlsa.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/ntlsa.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntlsa.h [iso-8859-1] Sun Aug 26 14:05:27 2012 @@ -30,6 +30,8 @@ #define ACCOUNT_ADJUST_QUOTAS 4 #define ACCOUNT_ADJUST_SYSTEM_ACCESS 8 +#define SECRET_SET_VALUE 1 +#define SECRET_QUERY_VALUE 2 #ifdef __cplusplus Modified: trunk/reactos/include/psdk/ntsecapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntsecapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] Sun Aug 26 14:05:27 2012 @@ -735,6 +735,7 @@ NTSTATUS NTAPI LsaSetInformationPolicy(LSA_HANDLE,POLICY_INFORMATION_CLASS, PVOID); NTSTATUS NTAPI LsaSetLocalInformationPolicy(LSA_HANDLE, POLICY_LOCAL_INFORMATION_CLASS,PVOID); +NTSTATUS NTAPI LsaSetSecret(LSA_HANDLE, PLSA_UNICODE_STRING, PLSA_UNICODE_STRING); NTSTATUS NTAPI LsaSetSystemAccessAccount(LSA_HANDLE, ULONG); NTSTATUS NTAPI LsaSetTrustedDomainInformation(LSA_HANDLE,PSID, TRUSTED_INFORMATION_CLASS,PVOID); Modified: trunk/reactos/include/reactos/idl/lsa.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/lsa.id… ============================================================================== --- trunk/reactos/include/reactos/idl/lsa.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/lsa.idl [iso-8859-1] Sun Aug 26 14:05:27 2012 @@ -775,7 +775,7 @@ /* Function 29 */ NTSTATUS __stdcall LsarSetSecret( - [in] LSAPR_HANDLE *SecretHandle, + [in] LSAPR_HANDLE SecretHandle, [in, unique] PLSAPR_CR_CIPHER_VALUE EncryptedCurrentValue, [in, unique] PLSAPR_CR_CIPHER_VALUE EncryptedOldValue);

12 years, 4 months

[tfaber] 57166: [KMTESTS:EX] - Make hard-coded calling convention exceptions in ExInterlocked compatible with GCC 4.7, and add the corresponding TODO about how ugly this is

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Aug 26 12:06:45 2012 New Revision: 57166 URL: http://svn.reactos.org/svn/reactos?rev=57166&view=rev Log: [KMTESTS:EX] - Make hard-coded calling convention exceptions in ExInterlocked compatible with GCC 4.7, and add the corresponding TODO about how ugly this is Modified: trunk/rostests/kmtests/ntos_ex/ExInterlocked.c Modified: trunk/rostests/kmtests/ntos_ex/ExInterlocked.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ex/ExInterlo… ============================================================================== --- trunk/rostests/kmtests/ntos_ex/ExInterlocked.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ex/ExInterlocked.c [iso-8859-1] Sun Aug 26 12:06:45 2012 @@ -50,6 +50,8 @@ typedef int PROCESSOR_STATE; #endif +/* TODO: these need to be rewritten in proper assembly to account for registers + * saved by the caller */ #if defined(_MSC_VER) && defined(_M_IX86) #define SaveState(State) do \ { \ @@ -74,19 +76,20 @@ #elif defined(__GNUC__) && defined(_M_IX86) #define SaveState(State) \ asm volatile( \ - "movl\t%%esi, (%%ecx)\n\t" \ - "movl\t%%edi, 4(%%ecx)\n\t" \ - "movl\t%%ebx, 8(%%ecx)\n\t" \ - "movl\t%%ebp, 12(%%ecx)\n\t" \ - "movl\t%%esp, 16(%%ecx)" \ + "movl\t%%esi, (%%ecx)\n\t" \ + "movl\t%%edi, 4(%%ecx)\n\t" \ + "movl\t%%ebx, 8(%%ecx)\n\t" \ + "movl\t%%ebp, 12(%%ecx)\n\t" \ + "movl\t%%esp, 16(%%ecx)" \ : : "c" (&State) : "memory" \ ); #define CheckState(OldState, NewState) do \ { \ - ok_eq_hex((OldState)->esi, (NewState)->esi); \ + /* TODO: GCC 4.7 uses esi and saves it before, so this is okay */ \ + /*ok_eq_hex((OldState)->esi, (NewState)->esi);*/ \ ok_eq_hex((OldState)->edi, (NewState)->edi); \ - /* TODO: GCC uses ebx and saves it before, so this is okay */ \ + /* TODO: GCC 4.4 uses ebx and saves it before, so this is okay */ \ /*ok_eq_hex((OldState)->ebx, (NewState)->ebx);*/ \ ok_eq_hex((OldState)->ebp, (NewState)->ebp); \ ok_eq_hex((OldState)->esp, (NewState)->esp); \ @@ -94,15 +97,15 @@ #elif defined(__GNUC__) && defined(_M_AMD64) #define SaveState(State) \ asm volatile( \ - "mov\t%%rsi, (%%rcx)\n\t" \ - "mov\t%%rdi, 8(%%rcx)\n\t" \ - "mov\t%%rbx, 16(%%rcx)\n\t" \ - "mov\t%%rbp, 24(%%rcx)\n\t" \ - "mov\t%%rsp, 32(%%rcx)\n\t" \ - "mov\t%%r12, 40(%%rcx)\n\t" \ - "mov\t%%r13, 48(%%rcx)\n\t" \ - "mov\t%%r14, 56(%%rcx)\n\t" \ - "mov\t%%r15, 64(%%rcx)" \ + "mov\t%%rsi, (%%rcx)\n\t" \ + "mov\t%%rdi, 8(%%rcx)\n\t" \ + "mov\t%%rbx, 16(%%rcx)\n\t" \ + "mov\t%%rbp, 24(%%rcx)\n\t" \ + "mov\t%%rsp, 32(%%rcx)\n\t" \ + "mov\t%%r12, 40(%%rcx)\n\t" \ + "mov\t%%r13, 48(%%rcx)\n\t" \ + "mov\t%%r14, 56(%%rcx)\n\t" \ + "mov\t%%r15, 64(%%rcx)" \ : : "c" (&State) : "memory" \ );

12 years, 4 months

[tfaber] 57165: [GDI32_APITEST] - Fix build

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Aug 26 11:35:58 2012 New Revision: 57165 URL: http://svn.reactos.org/svn/reactos?rev=57165&view=rev Log: [GDI32_APITEST] - Fix build Modified: trunk/rostests/apitests/gdi32/CreateIconIndirect.c Modified: trunk/rostests/apitests/gdi32/CreateIconIndirect.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateIcon… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateIconIndirect.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateIconIndirect.c [iso-8859-1] Sun Aug 26 11:35:58 2012 @@ -135,7 +135,7 @@ } -START_TEST(GetIconInfo) +START_TEST(CreateIconIndirect) { HCURSOR hcursor; HICON hicon;

12 years, 4 months

[tfaber] 57164: [GDI32_APITEST] - Actually run the CreateIconIndirect test when it's called

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Aug 26 11:17:37 2012 New Revision: 57164 URL: http://svn.reactos.org/svn/reactos?rev=57164&view=rev Log: [GDI32_APITEST] - Actually run the CreateIconIndirect test when it's called Modified: trunk/rostests/apitests/gdi32/testlist.c Modified: trunk/rostests/apitests/gdi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/testlist.c… ============================================================================== --- trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] Sun Aug 26 11:17:37 2012 @@ -75,7 +75,7 @@ { "CreateDIBPatternBrush", func_CreateDIBPatternBrush }, { "CreateFont", func_CreateFont }, { "CreateFontIndirect", func_CreateFontIndirect }, - { "CreateIconIndirect", func_CreateFontIndirect }, + { "CreateIconIndirect", func_CreateIconIndirect }, { "CreatePen", func_CreatePen }, { "CreateRectRgn", func_CreateRectRgn }, { "DPtoLP", func_DPtoLP },

12 years, 4 months

[akhaldi] 57163: [CMAKE] * Escape the source folder here.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Aug 26 11:14:52 2012 New Revision: 57163 URL: http://svn.reactos.org/svn/reactos?rev=57163&view=rev Log: [CMAKE] * Escape the source folder here. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=57163&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sun Aug 26 11:14:52 2012 @@ -19,7 +19,7 @@ if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) string(REPLACE "/" "\\" REACTOS_SOURCE_DIR_NATIVE ${REACTOS_SOURCE_DIR}) endif() -add_compile_flags("-fdebug-prefix-map=${REACTOS_SOURCE_DIR_NATIVE}=ReactOS") +add_compile_flags("-fdebug-prefix-map=\"${REACTOS_SOURCE_DIR_NATIVE}\"=ReactOS") # Debugging if(SEPARATE_DBG)

12 years, 4 months

[fireball] 57162: [SYSCALLS] - Remove old unnecessary copy of syscalls.inc

by fireball＠svn.reactos.org

Author: fireball Date: Sun Aug 26 10:22:39 2012 New Revision: 57162 URL: http://svn.reactos.org/svn/reactos?rev=57162&view=rev Log: [SYSCALLS] - Remove old unnecessary copy of syscalls.inc Removed: trunk/reactos/include/reactos/syscalls.inc Removed: trunk/reactos/include/reactos/syscalls.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/syscalls.i… ============================================================================== --- trunk/reactos/include/reactos/syscalls.inc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/syscalls.inc (removed) @@ -1,94 +1,0 @@ - -#ifdef _M_IX86 -#define KUSER_SHARED_SYSCALL HEX(7ffe0300) -#define KGDT_R0_CODE 8 -MACRO(STUBCODE_U, SyscallId, StackBytes) - mov eax, SyscallId - mov ecx, KUSER_SHARED_SYSCALL - call dword ptr [ecx] - ret StackBytes -ENDM -MACRO(STUBCODE_K, SyscallId, StackBytes) - mov eax, SyscallId - lea edx, [esp + 4] - pushf - push KGDT_R0_CODE - call _KiSystemService - ret StackBytes -ENDM -#elif defined(_M_AMD64) -MACRO(STUBCODE_U, SyscallId, StackBytes) - mov eax, SyscallId - mov r10, rcx - syscall - ret StackBytes -ENDM -MACRO(STUBCODE_K, SyscallId, StackBytes) - mov eax, SyscallId - call KiSystemService - ret StackBytes -ENDM -#elif defined(_M_ARM) -MACRO(STUBCODE_U, SyscallId, StackBytes) - swi #SyscallId - bx lr -ENDM -MACRO(STUBCODE_K, SyscallId, StackBytes) - mov ip, lr - swi #SyscallId - bx ip -ENDM -#elif defined(_M_PPC) -MACRO(STUBCODE_U, SyscallId, StackBytes) - stwu 1,-16(1) - mflr 0 - stw 0,0(1) - li 0, SyscallId - sc - lwz 0,0(1) - mtlr 0 - addi 1,1,16 - blr -ENDM -#define STUBCODE_K STUBCODE_U -#elif defined(_M_MIPS) -MACRO(STUBCODE_U, SyscallId, StackBytes) - li $8, KUSER_SHARED_SYSCALL - lw $8,0($8) - j $8 - nop -ENDM -MACRO(STUBCODE_K, SyscallId, StackBytes) - j KiSystemService - nop -ENDM -#else -#error unsupported architecture -#endif - -#ifdef _M_IX86 -MACRO(MAKE_LABEL, Name, Stackbytes) - PUBLIC _&Name&@&Stackbytes - _&Name&@&Stackbytes: -ENDM -#else -MACRO(MAKE_LABEL, Name, Stackbytes) - PUBLIC &Name - &Name: -ENDM -#endif - -MACRO(STUB_U, Name, ArgCount) - Stackbytes = 4 * &ArgCount - MAKE_LABEL Zw&Name, %Stackbytes - MAKE_LABEL Nt&Name, %Stackbytes - STUBCODE_U SyscallId, %Stackbytes - SyscallId = SyscallId + 1 -ENDM - -MACRO(STUB_K, Name, ArgCount) - Stackbytes = 4 * &ArgCount - MAKE_LABEL Zw&Name, %Stackbytes - STUBCODE_K SyscallId, %Stackbytes - SyscallId = SyscallId + 1 -ENDM

12 years, 4 months

[tfaber] 57161: [NTOSKRNL] - Revert r57155 until test issues are fixed

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Aug 26 09:22:09 2012 New Revision: 57161 URL: http://svn.reactos.org/svn/reactos?rev=57161&view=rev Log: [NTOSKRNL] - Revert r57155 until test issues are fixed Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Sun Aug 26 09:22:09 2012 @@ -1335,6 +1335,7 @@ } /* Check to see which list this page should go into */ + ASSERT(FALSE); if (Pfn1->u3.e1.Modified == 1) { /* Push it into the modified page list */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Sun Aug 26 09:22:09 2012 @@ -894,10 +894,10 @@ ASSERT(ActualPages <= PageCount); /* Release the working set lock */ -// MiUnlockWorkingSet(PsGetCurrentThread(), +// MiUnlockWorkingSet(PsGetCurrentThread(), // &MmSessionSpace->GlobalVirtualAddress->Vm); - + /* If we did at least one page... */ if (ActualPages) { @@ -974,7 +974,7 @@ { /* Create the PDEs needed for this mapping */ Status = MiSessionCommitPageTables(Base, - (PVOID)((ULONG_PTR)Base + + (PVOID)((ULONG_PTR)Base + Buckets * MI_SYSTEM_VIEW_BUCKET_SIZE)); NT_ASSERT(NT_SUCCESS(Status)); } @@ -1243,37 +1243,6 @@ return STATUS_SUCCESS; } -VOID -NTAPI -MiSubsectionConsistent(IN PSUBSECTION Subsection) -{ - /* ReactOS only supports systems with 4K pages and 4K sectors */ - ASSERT(Subsection->u.SubsectionFlags.SectorEndOffset == 0); - - /* Therefore, then number of PTEs should be equal to the number of sectors */ - if (Subsection->NumberOfFullSectors != Subsection->PtesInSubsection) - { - /* Break and warn if this is inconsistent */ - DPRINT1("Mm: Subsection inconsistent (%x vs %x)\n", - Subsection->NumberOfFullSectors, Subsection->PtesInSubsection); - DbgBreakPoint(); - } -} - -NTSTATUS -NTAPI -MiCreateDataFileMap(IN PFILE_OBJECT File, - OUT PSEGMENT *Segment, - IN PSIZE_T MaximumSize, - IN ULONG SectionPageProtection, - IN ULONG AllocationAttributes, - IN ULONG IgnoreFileSizing) -{ - /* Not yet implemented */ - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - NTSTATUS NTAPI MiCreatePagingFileMap(OUT PSEGMENT *Segment, @@ -2079,15 +2048,15 @@ SECTION Section; PSECTION NewSection; PSUBSECTION Subsection; - PSEGMENT NewSegment, Segment; + PSEGMENT NewSegment; NTSTATUS Status; PCONTROL_AREA ControlArea; - ULONG ProtectionMask, ControlAreaSize, Size, NonPagedCharge, PagedCharge; - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - BOOLEAN FileLock = FALSE, KernelCall = FALSE; - KIRQL OldIrql; - PFILE_OBJECT File; - PVOID PreviousSectionPointer; + ULONG ProtectionMask; + + /* ARM3 does not yet support this */ + ASSERT(FileHandle == NULL); + ASSERT(FileObject == NULL); + ASSERT((AllocationAttributes & SEC_LARGE_PAGES) == 0); /* Make the same sanity checks that the Nt interface should've validated */ ASSERT((AllocationAttributes & ~(SEC_COMMIT | SEC_RESERVE | SEC_BASED | @@ -2110,229 +2079,53 @@ ProtectionMask = MiMakeProtectionMask(SectionPageProtection); if (ProtectionMask == MM_INVALID_PROTECTION) return STATUS_INVALID_PAGE_PROTECTION; - /* Check if this is going to be a data or image backed file section */ - if ((FileHandle) || (FileObject)) - { - /* These cannot be mapped with large pages */ - if (AllocationAttributes & SEC_LARGE_PAGES) return STATUS_INVALID_PARAMETER_6; - - /* For now, only support the mechanism through a file handle */ - ASSERT(FileObject == NULL); - - /* Reference the file handle to get the object */ - Status = ObReferenceObjectByHandle(FileHandle, - MmMakeFileAccess[ProtectionMask], - IoFileObjectType, - PreviousMode, - (PVOID*)&File, - NULL); - if (!NT_SUCCESS(Status)) return Status; - - /* Make sure Cc has been doing its job */ - if (!File->SectionObjectPointer) - { - /* This is not a valid file system-based file, fail */ - ObDereferenceObject(File); - return STATUS_INVALID_FILE_FOR_SECTION; - } - - /* Image-file backed sections are not yet supported */ - ASSERT((AllocationAttributes & SEC_IMAGE) == 0); - - /* Compute the size of the control area, and allocate it */ - ControlAreaSize = sizeof(CONTROL_AREA) + sizeof(MSUBSECTION); - ControlArea = ExAllocatePoolWithTag(NonPagedPool, ControlAreaSize, 'aCmM'); - if (!ControlArea) - { - ObDereferenceObject(File); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Zero it out */ - RtlZeroMemory(ControlArea, ControlAreaSize); - - /* Did we get a handle, or an object? */ - if (FileHandle) - { - /* We got a file handle so we have to lock down the file */ -#if 0 - Status = FsRtlAcquireToCreateMappedSection(File, SectionPageProtection); - if (!NT_SUCCESS(Status)) - { - ExFreePool(ControlArea); - ObDereferenceObject(File); - return Status; - } -#else - /* ReactOS doesn't support this API yet, so do nothing */ - Status = STATUS_SUCCESS; -#endif - /* Update the top-level IRP so that drivers know what's happening */ - IoSetTopLevelIrp((PIRP)FSRTL_FSP_TOP_LEVEL_IRP); - FileLock = TRUE; - } - - /* Lock the PFN database while we play with the section pointers */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - - /* Image-file backed sections are not yet supported */ - ASSERT((AllocationAttributes & SEC_IMAGE) == 0); - - /* There should not already be a control area for this file */ - ASSERT(File->SectionObjectPointer->DataSectionObject == NULL); - NewSegment = NULL; - - /* Write down that this CA is being created, and set it */ - ControlArea->u.Flags.BeingCreated = TRUE; - PreviousSectionPointer = File->SectionObjectPointer; - File->SectionObjectPointer->DataSectionObject = ControlArea; - - /* We can release the PFN lock now */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - - /* We don't support previously-mapped file */ - ASSERT(NewSegment == NULL); - - /* Image-file backed sections are not yet supported */ - ASSERT((AllocationAttributes & SEC_IMAGE) == 0); - - /* So we always create a data file map */ - Status = MiCreateDataFileMap(File, - &Segment, - (PSIZE_T)InputMaximumSize, - SectionPageProtection, - AllocationAttributes, - KernelCall); - ASSERT(PreviousSectionPointer == File->SectionObjectPointer); - ASSERT(NT_SUCCESS(Status)); - - /* Check if a maximum size was specified */ - if (!InputMaximumSize->QuadPart) - { - /* Nope, use the segment size */ - Section.SizeOfSection.QuadPart = (LONGLONG)Segment->SizeOfSegment; - } - else - { - /* Yep, use the entered size */ - Section.SizeOfSection.QuadPart = InputMaximumSize->QuadPart; - } - - } - else - { - /* A handle must be supplied with SEC_IMAGE, as this is the no-handle path */ - if (AllocationAttributes & SEC_IMAGE) return STATUS_INVALID_FILE_FOR_SECTION; - - /* Not yet supported */ - ASSERT((AllocationAttributes & SEC_LARGE_PAGES) == 0); - - /* So this must be a pagefile-backed section, create the mappings needed */ - Status = MiCreatePagingFileMap(&NewSegment, - (PSIZE_T)InputMaximumSize, - ProtectionMask, - AllocationAttributes); - ASSERT(NT_SUCCESS(Status)); - - /* Set the size here, and read the control area */ - Section.SizeOfSection.QuadPart = NewSegment->SizeOfSegment; - ControlArea = NewSegment->ControlArea; - } - - /* Did we already have a segment? */ - if (!NewSegment) - { - /* This must be the file path and we created a segment */ - NewSegment = Segment; - ASSERT(File != NULL); - - /* Acquire the PFN lock while we set control area flags */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - - /* We don't support this race condition yet, so assume no waiters */ - ASSERT(ControlArea->WaitingForDeletion == NULL); - ControlArea->WaitingForDeletion = NULL; - - /* Image-file backed sections are not yet supported, nor ROM images */ - ASSERT((AllocationAttributes & SEC_IMAGE) == 0); - ASSERT(Segment->ControlArea->u.Flags.Rom == 0); - - /* Take off the being created flag, and then release the lock */ - ControlArea->u.Flags.BeingCreated = FALSE; - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - } - - /* Check if we locked the file earlier */ - if (FileLock) - { - /* Reset the top-level IRP and release the lock */ - IoSetTopLevelIrp(NULL); - //FsRtlReleaseFile(File); - FileLock = FALSE; - } + /* A handle must be supplied with SEC_IMAGE, and this is the no-handle path */ + if (AllocationAttributes & SEC_IMAGE) return STATUS_INVALID_FILE_FOR_SECTION; + + /* So this must be a pagefile-backed section, create the mappings needed */ + Status = MiCreatePagingFileMap(&NewSegment, + (PSIZE_T)InputMaximumSize, + ProtectionMask, + AllocationAttributes); + ASSERT(NT_SUCCESS(Status)); + ASSERT(NewSegment != NULL); /* Set the initial section object data */ Section.InitialPageProtection = SectionPageProtection; - - /* The mapping created a control area and segment, save the flags */ + Section.SizeOfSection.QuadPart = NewSegment->SizeOfSegment; Section.Segment = NewSegment; + + /* THe mapping created a control area and segment, save the flags */ + ControlArea = NewSegment->ControlArea; Section.u.LongFlags = ControlArea->u.LongFlags; - /* Check if this is a user-mode read-write non-image file mapping */ - if (!(FileObject) && - (SectionPageProtection & (PAGE_READWRITE | PAGE_EXECUTE_READWRITE)) && - (ControlArea->u.Flags.Image == 0) && - (ControlArea->FilePointer != NULL)) - { - /* Add a reference and set the flag */ - Section.u.Flags.UserWritable = 1; - InterlockedIncrement((PLONG)&ControlArea->WritableUserReferences); - } - - /* Check for image mappings or page file mappings */ - if ((ControlArea->u.Flags.Image == 1) || !(ControlArea->FilePointer)) - { - /* Charge the segment size, and allocate a subsection */ - PagedCharge = sizeof(SECTION) + NewSegment->TotalNumberOfPtes * sizeof(MMPTE); - Size = sizeof(SUBSECTION); - } - else - { - /* Charge nothing, and allocate a mapped subsection */ - PagedCharge = 0; - Size = sizeof(MSUBSECTION); - } - - /* Check if this is a normal CA */ + /* ARM3 cannot support these right now, make sure they're not being set */ + ASSERT(ControlArea->u.Flags.Image == 0); + ASSERT(ControlArea->FilePointer == NULL); ASSERT(ControlArea->u.Flags.GlobalOnlyPerSession == 0); ASSERT(ControlArea->u.Flags.Rom == 0); - - /* Charge only a CA, and the subsection is right after */ - NonPagedCharge = sizeof(CONTROL_AREA); + ASSERT(ControlArea->u.Flags.WasPurged == 0); + + /* A pagefile-backed mapping only has one subsection, and this is all ARM3 supports */ Subsection = (PSUBSECTION)(ControlArea + 1); - - /* We only support single-subsection mappings */ - NonPagedCharge += Size; ASSERT(Subsection->NextSubsection == NULL); /* Create the actual section object, with enough space for the prototype PTEs */ - Status = ObCreateObject(PreviousMode, + Status = ObCreateObject(ExGetPreviousMode(), MmSectionObjectType, ObjectAttributes, - PreviousMode, + ExGetPreviousMode(), NULL, sizeof(SECTION), - PagedCharge, - NonPagedCharge, + sizeof(SECTION) + + NewSegment->TotalNumberOfPtes * sizeof(MMPTE), + sizeof(CONTROL_AREA) + sizeof(SUBSECTION), (PVOID*)&NewSection); ASSERT(NT_SUCCESS(Status)); /* Now copy the local section object from the stack into this new object */ RtlCopyMemory(NewSection, &Section, sizeof(SECTION)); NewSection->Address.StartingVpn = 0; - - /* For now, only user calls are supported */ - ASSERT(KernelCall == FALSE); NewSection->u.Flags.UserReference = TRUE; /* Migrate the attribute into a flag */ @@ -2377,13 +2170,6 @@ /* Finally release the lock */ KeReleaseGuardedMutex(&MmSectionBasedMutex); } - - /* Write down if this was a kernel call */ - ControlArea->u.Flags.WasPurged |= KernelCall; - ASSERT(ControlArea->u.Flags.WasPurged == FALSE); - - /* Make sure the segment and the section are the same size, or the section is smaller */ - ASSERT(NewSection->SizeOfSection.QuadPart <= NewSection->Segment->SizeOfSegment); /* Return the object and the creation status */ *SectionObject = (PVOID)NewSection; Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sun Aug 26 09:22:09 2012 @@ -4860,19 +4860,17 @@ PROS_SECTION_OBJECT *SectionObject = (PROS_SECTION_OBJECT *)Section; /* Check if an ARM3 section is being created instead */ - if (!(AllocationAttributes & SEC_IMAGE) && (AllocationAttributes)) + if (AllocationAttributes & 1) { - if (!(FileObject) && !(FileHandle)) - { - return MmCreateArm3Section(Section, - DesiredAccess, - ObjectAttributes, - MaximumSize, - SectionPageProtection, - AllocationAttributes &~ 1, - FileHandle, - FileObject); - } + DPRINT1("Creating ARM3 section\n"); + return MmCreateArm3Section(Section, + DesiredAccess, + ObjectAttributes, + MaximumSize, + SectionPageProtection, + AllocationAttributes &~ 1, + FileHandle, + FileObject); } /*

12 years, 4 months

[jgardou] 57160: [OPENGL32_WINETEST] - Sync with wine

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun Aug 26 09:17:35 2012 New Revision: 57160 URL: http://svn.reactos.org/svn/reactos?rev=57160&view=rev Log: [OPENGL32_WINETEST] - Sync with wine Modified: trunk/rostests/winetests/opengl32/opengl.c Modified: trunk/rostests/winetests/opengl32/opengl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/opengl32/opengl… ============================================================================== --- trunk/rostests/winetests/opengl32/opengl.c [iso-8859-1] (original) +++ trunk/rostests/winetests/opengl32/opengl.c [iso-8859-1] Sun Aug 26 09:17:35 2012 @@ -24,18 +24,29 @@ void WINAPI glClearColor(float red, float green, float blue, float alpha); void WINAPI glClear(unsigned int mask); +#define GL_COLOR 0x1800 +typedef unsigned int GLenum; +typedef int GLint; +void WINAPI glCopyPixels(int x, int y, int width, int height, GLenum type); void WINAPI glFinish(void); +#define GL_NO_ERROR 0x0 +#define GL_INVALID_OPERATION 0x502 +GLenum WINAPI glGetError(void); #define GL_COLOR_BUFFER_BIT 0x00004000 const unsigned char * WINAPI glGetString(unsigned int); #define GL_VENDOR 0x1F00 #define GL_RENDERER 0x1F01 #define GL_VERSION 0x1F02 +#define GL_EXTENSIONS 0x1F03 + +#define GL_VIEWPORT 0x0ba2 +void WINAPI glGetIntegerv(GLenum pname, GLint *params); #define MAX_FORMATS 256 typedef void* HPBUFFERARB; /* WGL_ARB_create_context */ -HGLRC (WINAPI *pwglCreateContextAttribsARB)(HDC hDC, HGLRC hShareContext, const int *attribList); +static HGLRC (WINAPI *pwglCreateContextAttribsARB)(HDC hDC, HGLRC hShareContext, const int *attribList); /* GetLastError */ #define ERROR_INVALID_VERSION_ARB 0x2095 #define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091 @@ -106,6 +117,33 @@ #undef GET_PROC } +static BOOL gl_extension_supported(const char *extensions, const char *extension_string) +{ + size_t ext_str_len = strlen(extension_string); + + while (*extensions) + { + const char *start; + size_t len; + + while (isspace(*extensions)) + ++extensions; + start = extensions; + while (!isspace(*extensions) && *extensions) + ++extensions; + + len = extensions - start; + if (!len) + continue; + + if (len == ext_str_len && !memcmp(start, extension_string, ext_str_len)) + { + return TRUE; + } + } + return FALSE; +} + static void test_pbuffers(HDC hdc) { const int iAttribList[] = { WGL_DRAW_TO_PBUFFER_ARB, 1, /* Request pbuffer support */ @@ -171,7 +209,7 @@ trace("iPixelFormat returned by GetPixelFormat: %d\n", res); trace("PixelFormat from wglChoosePixelFormatARB: %d\n", iPixelFormat); - pwglReleasePbufferDCARB(pbuffer, hdc); + pwglReleasePbufferDCARB(pbuffer, pbuffer_hdc); } else skip("Pbuffer test for onscreen pixelformat skipped as no onscreen format with pbuffer capabilities have been found\n"); @@ -351,7 +389,6 @@ { BOOL ret; HGLRC hglrc; - DWORD error; hglrc = wglCreateContext(winhdc); ok( hglrc != 0, "wglCreateContext failed\n" ); @@ -374,9 +411,9 @@ SetLastError( 0xdeadbeef ); ret = wglMakeCurrent( NULL, NULL ); - ok( !ret, "wglMakeCurrent succeeded\n" ); - error = GetLastError(); - ok( error == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got error=%x\n", error); + ok( !ret || broken(ret) /* nt4 */, "wglMakeCurrent succeeded\n" ); + if (!ret) ok( GetLastError() == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLE, got error=%x\n", GetLastError() ); ret = wglMakeCurrent( winhdc, NULL ); ok( ret, "wglMakeCurrent failed\n" ); @@ -387,11 +424,13 @@ ret = wglMakeCurrent( NULL, NULL ); ok( ret, "wglMakeCurrent failed\n" ); + ok( wglGetCurrentContext() == NULL, "wrong context\n" ); + SetLastError( 0xdeadbeef ); ret = wglMakeCurrent( NULL, NULL ); - ok( !ret, "wglMakeCurrent succeeded\n" ); - error = GetLastError(); - ok( error == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got error=%x\n", error); + ok( !ret || broken(ret) /* nt4 */, "wglMakeCurrent succeeded\n" ); + if (!ret) ok( GetLastError() == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLE, got error=%x\n", GetLastError() ); ret = wglMakeCurrent( winhdc, hglrc ); ok( ret, "wglMakeCurrent failed\n" ); @@ -504,36 +543,48 @@ } } -static void test_bitmap_rendering(void) +static void test_bitmap_rendering( BOOL use_dib ) { PIXELFORMATDESCRIPTOR pfd; - int i, iPixelFormat=0; + int i, ret, bpp, iPixelFormat=0; unsigned int nFormats; - HGLRC hglrc; + HGLRC hglrc, hglrc2; BITMAPINFO biDst; - HBITMAP bmpDst, oldDst; + HBITMAP bmpDst, oldDst, bmp2; HDC hdcDst, hdcScreen; - UINT32 *dstBuffer; - - memset(&biDst, 0, sizeof(BITMAPINFO)); - biDst.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - biDst.bmiHeader.biWidth = 2; - biDst.bmiHeader.biHeight = -2; - biDst.bmiHeader.biPlanes = 1; - biDst.bmiHeader.biBitCount = 32; - biDst.bmiHeader.biCompression = BI_RGB; + UINT *dstBuffer = NULL; hdcScreen = CreateCompatibleDC(0); - if(GetDeviceCaps(hdcScreen, BITSPIXEL) != 32) - { - DeleteDC(hdcScreen); - trace("Skipping bitmap rendering test\n"); - return; - } - - hdcDst = CreateCompatibleDC(hdcScreen); - bmpDst = CreateDIBSection(hdcDst, &biDst, DIB_RGB_COLORS, (void**)&dstBuffer, NULL, 0); + hdcDst = CreateCompatibleDC(0); + + if (use_dib) + { + bpp = 32; + memset(&biDst, 0, sizeof(BITMAPINFO)); + biDst.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + biDst.bmiHeader.biWidth = 4; + biDst.bmiHeader.biHeight = -4; + biDst.bmiHeader.biPlanes = 1; + biDst.bmiHeader.biBitCount = 32; + biDst.bmiHeader.biCompression = BI_RGB; + + bmpDst = CreateDIBSection(0, &biDst, DIB_RGB_COLORS, (void**)&dstBuffer, NULL, 0); + + biDst.bmiHeader.biWidth = 12; + biDst.bmiHeader.biHeight = -12; + biDst.bmiHeader.biBitCount = 16; + bmp2 = CreateDIBSection(0, &biDst, DIB_RGB_COLORS, NULL, NULL, 0); + } + else + { + bpp = GetDeviceCaps( hdcScreen, BITSPIXEL ); + bmpDst = CreateBitmap( 4, 4, 1, bpp, NULL ); + bmp2 = CreateBitmap( 12, 12, 1, bpp, NULL ); + } + oldDst = SelectObject(hdcDst, bmpDst); + + trace( "testing on %s\n", use_dib ? "DIB" : "DDB" ); /* Pick a pixel format by hand because ChoosePixelFormat is unreliable */ nFormats = DescribePixelFormat(hdcDst, 0, 0, NULL); @@ -544,7 +595,7 @@ if((pfd.dwFlags & PFD_DRAW_TO_BITMAP) && (pfd.dwFlags & PFD_SUPPORT_OPENGL) && - (pfd.cColorBits == 32) && + (pfd.cColorBits == bpp) && (pfd.cAlphaBits == 8) ) { iPixelFormat = i; @@ -558,58 +609,126 @@ } else { - SetPixelFormat(hdcDst, iPixelFormat, &pfd); + ret = SetPixelFormat(hdcDst, iPixelFormat, &pfd); + ok( ret, "SetPixelFormat failed\n" ); + ret = GetPixelFormat( hdcDst ); + ok( ret == iPixelFormat, "GetPixelFormat returned %d/%d\n", ret, iPixelFormat ); + ret = SetPixelFormat(hdcDst, iPixelFormat + 1, &pfd); + ok( !ret, "SetPixelFormat succeeded\n" ); hglrc = wglCreateContext(hdcDst); - todo_wine ok(hglrc != NULL, "Unable to create a context\n"); + ok(hglrc != NULL, "Unable to create a context\n"); if(hglrc) { + GLint viewport[4]; wglMakeCurrent(hdcDst, hglrc); + hglrc2 = wglCreateContext(hdcDst); + ok(hglrc2 != NULL, "Unable to create a context\n"); /* Note this is RGBA but we read ARGB back */ glClearColor((float)0x22/0xff, (float)0x33/0xff, (float)0x44/0xff, (float)0x11/0xff); glClear(GL_COLOR_BUFFER_BIT); + glGetIntegerv( GL_VIEWPORT, viewport ); glFinish(); + ok( viewport[0] == 0 && viewport[1] == 0 && viewport[2] == 4 && viewport[3] == 4, + "wrong viewport %d,%d,%d,%d\n", viewport[0], viewport[1], viewport[2], viewport[3] ); /* Note apparently the alpha channel is not supported by the software renderer (bitmap only works using software) */ - ok(dstBuffer[0] == 0x223344, "Expected color=0x223344, received color=%x\n", dstBuffer[0]); + if (dstBuffer) + for (i = 0; i < 16; i++) + ok(dstBuffer[i] == 0x223344 || dstBuffer[i] == 0x11223344, "Received color=%x at %u\n", + dstBuffer[i], i); + + SelectObject(hdcDst, bmp2); + ret = GetPixelFormat( hdcDst ); + ok( ret == iPixelFormat, "GetPixelFormat returned %d/%d\n", ret, iPixelFormat ); + ret = SetPixelFormat(hdcDst, iPixelFormat + 1, &pfd); + ok( !ret, "SetPixelFormat succeeded\n" ); + + /* context still uses the old pixel format and viewport */ + glClearColor((float)0x44/0xff, (float)0x33/0xff, (float)0x22/0xff, (float)0x11/0xff); + glClear(GL_COLOR_BUFFER_BIT); + glFinish(); + glGetIntegerv( GL_VIEWPORT, viewport ); + ok( viewport[0] == 0 && viewport[1] == 0 && viewport[2] == 4 && viewport[3] == 4, + "wrong viewport %d,%d,%d,%d\n", viewport[0], viewport[1], viewport[2], viewport[3] ); wglMakeCurrent(NULL, NULL); - wglDeleteContext(hglrc); + wglMakeCurrent(hdcDst, hglrc); + glClearColor((float)0x44/0xff, (float)0x55/0xff, (float)0x66/0xff, (float)0x11/0xff); + glClear(GL_COLOR_BUFFER_BIT); + glFinish(); + glGetIntegerv( GL_VIEWPORT, viewport ); + ok( viewport[0] == 0 && viewport[1] == 0 && viewport[2] == 4 && viewport[3] == 4, + "wrong viewport %d,%d,%d,%d\n", viewport[0], viewport[1], viewport[2], viewport[3] ); + + wglMakeCurrent(hdcDst, hglrc2); + glGetIntegerv( GL_VIEWPORT, viewport ); + ok( viewport[0] == 0 && viewport[1] == 0 && viewport[2] == 12 && viewport[3] == 12, + "wrong viewport %d,%d,%d,%d\n", viewport[0], viewport[1], viewport[2], viewport[3] ); + + wglMakeCurrent(hdcDst, hglrc); + glGetIntegerv( GL_VIEWPORT, viewport ); + ok( viewport[0] == 0 && viewport[1] == 0 && viewport[2] == 4 && viewport[3] == 4, + "wrong viewport %d,%d,%d,%d\n", viewport[0], viewport[1], viewport[2], viewport[3] ); + + SelectObject(hdcDst, bmpDst); + ret = GetPixelFormat( hdcDst ); + ok( ret == iPixelFormat, "GetPixelFormat returned %d/%d\n", ret, iPixelFormat ); + ret = SetPixelFormat(hdcDst, iPixelFormat + 1, &pfd); + ok( !ret, "SetPixelFormat succeeded\n" ); + wglMakeCurrent(hdcDst, hglrc2); + glGetIntegerv( GL_VIEWPORT, viewport ); + ok( viewport[0] == 0 && viewport[1] == 0 && viewport[2] == 12 && viewport[3] == 12, + "wrong viewport %d,%d,%d,%d\n", viewport[0], viewport[1], viewport[2], viewport[3] ); } } SelectObject(hdcDst, oldDst); + DeleteObject(bmp2); DeleteObject(bmpDst); DeleteDC(hdcDst); - DeleteDC(hdcScreen); } struct wgl_thread_param { HANDLE test_finished; + HWND hwnd; HGLRC hglrc; - BOOL hglrc_deleted; + BOOL make_current; + BOOL make_current_error; + BOOL deleted; + DWORD deleted_error; }; static DWORD WINAPI wgl_thread(void *param) { struct wgl_thread_param *p = param; - - p->hglrc_deleted = wglDeleteContext(p->hglrc); + HDC hdc = GetDC( p->hwnd ); + + SetLastError(0xdeadbeef); + p->make_current = wglMakeCurrent(hdc, p->hglrc); + p->make_current_error = GetLastError(); + p->deleted = wglDeleteContext(p->hglrc); + p->deleted_error = GetLastError(); + ReleaseDC( p->hwnd, hdc ); SetEvent(p->test_finished); - return 0; } -static void test_deletecontext(HDC hdc) +static void test_deletecontext(HWND hwnd, HDC hdc) { struct wgl_thread_param thread_params; HGLRC hglrc = wglCreateContext(hdc); HANDLE thread_handle; DWORD res, tid; + SetLastError(0xdeadbeef); + res = wglDeleteContext(NULL); + ok(res == FALSE, "wglDeleteContext succeeded\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected last error to be ERROR_INVALID_HANDLE, got %u\n", GetLastError()); + if(!hglrc) { skip("wglCreateContext failed!\n"); @@ -627,23 +746,79 @@ * This differs from GLX which does allow it but it delays actual deletion until the context becomes not current. */ thread_params.hglrc = hglrc; + thread_params.hwnd = hwnd; thread_params.test_finished = CreateEvent(NULL, FALSE, FALSE, NULL); thread_handle = CreateThread(NULL, 0, wgl_thread, &thread_params, 0, &tid); ok(!!thread_handle, "Failed to create thread, last error %#x.\n", GetLastError()); if(thread_handle) { WaitForSingleObject(thread_handle, INFINITE); - ok(thread_params.hglrc_deleted == FALSE, "Attempt to delete WGL context from another thread passed but should fail!\n"); + ok(!thread_params.make_current, "Attempt to make WGL context from another thread passed\n"); + ok(thread_params.make_current_error == ERROR_BUSY, "Expected last error to be ERROR_BUSY, got %u\n", thread_params.make_current_error); + ok(!thread_params.deleted, "Attempt to delete WGL context from another thread passed\n"); + ok(thread_params.deleted_error == ERROR_BUSY, "Expected last error to be ERROR_BUSY, got %u\n", thread_params.deleted_error); } CloseHandle(thread_params.test_finished); res = wglDeleteContext(hglrc); ok(res == TRUE, "wglDeleteContext failed\n"); + + /* Attempting to delete the same context twice should fail. */ + SetLastError(0xdeadbeef); + res = wglDeleteContext(hglrc); + ok(res == FALSE, "wglDeleteContext succeeded\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected last error to be ERROR_INVALID_HANDLE, got %u\n", GetLastError()); /* WGL makes a context not current when deleting it. This differs from GLX behavior where * deletion takes place when the thread becomes not current. */ hglrc = wglGetCurrentContext(); ok(hglrc == NULL, "A WGL context is active while none was expected\n"); +} + + +static void test_getprocaddress(HDC hdc) +{ + const char *extensions = (const char*)glGetString(GL_EXTENSIONS); + PROC func = NULL; + HGLRC ctx = wglGetCurrentContext(); + + if (!extensions) + { + skip("skipping wglGetProcAddress tests because no GL extensions supported\n"); + return; + } + + /* Core GL 1.0/1.1 functions should not be loadable through wglGetProcAddress. + * Try to load the function with and without a context. + */ + func = wglGetProcAddress("glEnable"); + ok(func == NULL, "Lookup of function glEnable with a context passed, expected a failure\n"); + wglMakeCurrent(hdc, NULL); + func = wglGetProcAddress("glEnable"); + ok(func == NULL, "Lookup of function glEnable without a context passed, expected a failure\n"); + wglMakeCurrent(hdc, ctx); + + /* The goal of the test will be to test behavior of wglGetProcAddress when + * no WGL context is active. Before the test we pick an extension (GL_ARB_multitexture) + * which any GL >=1.2.1 implementation supports. Unfortunately the GDI renderer doesn't + * support it. There aren't any extensions we can use for this test which are supported by + * both GDI and real drivers. + * Note GDI only has GL_EXT_bgra, GL_EXT_paletted_texture and GL_WIN_swap_hint. + */ + if (!gl_extension_supported(extensions, "GL_ARB_multitexture")) + { + skip("skipping test because lack of GL_ARB_multitexture support\n"); + return; + } + + func = wglGetProcAddress("glActiveTextureARB"); + ok(func != NULL, "Unable to lookup glActiveTextureARB, last error %#x\n", GetLastError()); + + /* Temporarily disable the context, so we can see that we can't retrieve functions now. */ + wglMakeCurrent(hdc, NULL); + func = wglGetProcAddress("glActiveTextureARB"); + ok(func == NULL, "Function lookup without a context passed, expected a failure; last error %#x\n", GetLastError()); + wglMakeCurrent(hdc, ctx); } static void test_make_current_read(HDC hdc) @@ -730,7 +905,7 @@ HGLRC gl3Ctx; DWORD error; gl3Ctx = pwglCreateContextAttribsARB(hdc, (HGLRC)0xdeadbeef, 0); - todo_wine ok(gl3Ctx == 0, "pwglCreateContextAttribsARB using an invalid shareList passed\n"); + ok(gl3Ctx == 0, "pwglCreateContextAttribsARB using an invalid shareList passed\n"); error = GetLastError(); /* The Nvidia implementation seems to return hresults instead of win32 error codes */ todo_wine ok(error == ERROR_INVALID_OPERATION || @@ -866,6 +1041,365 @@ DestroyWindow(window); } +static void test_window_dc(void) +{ + PIXELFORMATDESCRIPTOR pf_desc = + { + sizeof(PIXELFORMATDESCRIPTOR), + 1, /* version */ + PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER, + PFD_TYPE_RGBA, + 24, /* 24-bit color depth */ + 0, 0, 0, 0, 0, 0, /* color bits */ + 0, /* alpha buffer */ + 0, /* shift bit */ + 0, /* accumulation buffer */ + 0, 0, 0, 0, /* accum bits */ + 32, /* z-buffer */ + 0, /* stencil buffer */ + 0, /* auxiliary buffer */ + PFD_MAIN_PLANE, /* main layer */ + 0, /* reserved */ + 0, 0, 0 /* layer masks */ + }; + int pixel_format; + HWND window; + RECT vp, r; + HGLRC ctx; + BOOL ret; + HDC dc; + + window = CreateWindowA("static", "opengl32_test", + WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); + ok(!!window, "Failed to create window, last error %#x.\n", GetLastError()); + + ShowWindow(window, SW_SHOW); + + dc = GetWindowDC(window); + ok(!!dc, "Failed to get DC.\n"); + + pixel_format = ChoosePixelFormat(dc, &pf_desc); + if (!pixel_format) + { + win_skip("Failed to find pixel format.\n"); + ReleaseDC(window, dc); + DestroyWindow(window); + return; + } + + ret = SetPixelFormat(dc, pixel_format, &pf_desc); + ok(ret, "Failed to set pixel format, last error %#x.\n", GetLastError()); + + ctx = wglCreateContext(dc); + ok(!!ctx, "Failed to create GL context, last error %#x.\n", GetLastError()); + + ret = wglMakeCurrent(dc, ctx); + ok(ret, "Failed to make context current, last error %#x.\n", GetLastError()); + + GetClientRect(window, &r); + glGetIntegerv(GL_VIEWPORT, (GLint *)&vp); + ok(EqualRect(&r, &vp), "Viewport not equal to client rect.\n"); + + ret = wglMakeCurrent(NULL, NULL); + ok(ret, "Failed to clear current context, last error %#x.\n", GetLastError()); + + ret = wglDeleteContext(ctx); + ok(ret, "Failed to delete GL context, last error %#x.\n", GetLastError()); + + ReleaseDC(window, dc); + DestroyWindow(window); +} + +static void test_destroy(HDC oldhdc) +{ + PIXELFORMATDESCRIPTOR pf_desc = + { + sizeof(PIXELFORMATDESCRIPTOR), + 1, /* version */ + PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER, + PFD_TYPE_RGBA, + 24, /* 24-bit color depth */ + 0, 0, 0, 0, 0, 0, /* color bits */ + 0, /* alpha buffer */ + 0, /* shift bit */ + 0, /* accumulation buffer */ + 0, 0, 0, 0, /* accum bits */ + 32, /* z-buffer */ + 0, /* stencil buffer */ + 0, /* auxiliary buffer */ + PFD_MAIN_PLANE, /* main layer */ + 0, /* reserved */ + 0, 0, 0 /* layer masks */ + }; + int pixel_format; + HWND window; + HGLRC ctx; + BOOL ret; + HDC dc; + GLenum glerr; + DWORD err; + HGLRC oldctx = wglGetCurrentContext(); + + ok(!!oldctx, "Expected to find a valid current context.\n"); + + window = CreateWindowA("static", "opengl32_test", + WS_POPUP, 0, 0, 640, 480, 0, 0, 0, 0); + ok(!!window, "Failed to create window, last error %#x.\n", GetLastError()); + + dc = GetDC(window); + ok(!!dc, "Failed to get DC.\n"); + + pixel_format = ChoosePixelFormat(dc, &pf_desc); + if (!pixel_format) + { + win_skip("Failed to find pixel format.\n"); + ReleaseDC(window, dc); + DestroyWindow(window); + return; + } + + ret = SetPixelFormat(dc, pixel_format, &pf_desc); + ok(ret, "Failed to set pixel format, last error %#x.\n", GetLastError()); + + ctx = wglCreateContext(dc); + ok(!!ctx, "Failed to create GL context, last error %#x.\n", GetLastError()); + + ret = wglMakeCurrent(dc, ctx); + ok(ret, "Failed to make context current, last error %#x.\n", GetLastError()); + + glClear(GL_COLOR_BUFFER_BIT); + glFinish(); + glerr = glGetError(); + ok(glerr == GL_NO_ERROR, "Failed glClear, error %#x.\n", glerr); + ret = SwapBuffers(dc); + ok(ret, "Failed SwapBuffers, error %#x.\n", GetLastError()); + + ret = DestroyWindow(window); + ok(ret, "Failed to destroy window, last error %#x.\n", GetLastError()); + + ok(wglGetCurrentContext() == ctx, "Wrong current context.\n"); + + SetLastError(0xdeadbeef); + ret = wglMakeCurrent(dc, ctx); + err = GetLastError(); + ok(!ret && err == ERROR_INVALID_HANDLE, + "Unexpected behavior when making context current, ret %d, last error %#x.\n", ret, err); + SetLastError(0xdeadbeef); + ret = SwapBuffers(dc); + err = GetLastError(); + ok(!ret && err == ERROR_INVALID_HANDLE, "Unexpected behavior with SwapBuffer, last error %#x.\n", err); + + ok(wglGetCurrentContext() == ctx, "Wrong current context.\n"); + + glClear(GL_COLOR_BUFFER_BIT); + glFinish(); + glerr = glGetError(); + ok(glerr == GL_NO_ERROR, "Failed glClear, error %#x.\n", glerr); + SetLastError(0xdeadbeef); + ret = SwapBuffers(dc); + err = GetLastError(); + ok(!ret && err == ERROR_INVALID_HANDLE, "Unexpected behavior with SwapBuffer, last error %#x.\n", err); + + ret = wglMakeCurrent(NULL, NULL); + ok(ret, "Failed to clear current context, last error %#x.\n", GetLastError()); + + glClear(GL_COLOR_BUFFER_BIT); + glFinish(); + glerr = glGetError(); + ok(glerr == GL_INVALID_OPERATION, "Failed glClear, error %#x.\n", glerr); + SetLastError(0xdeadbeef); + ret = SwapBuffers(dc); + err = GetLastError(); + ok(!ret && err == ERROR_INVALID_HANDLE, "Unexpected behavior with SwapBuffer, last error %#x.\n", err); + + SetLastError(0xdeadbeef); + ret = wglMakeCurrent(dc, ctx); + err = GetLastError(); + ok(!ret && err == ERROR_INVALID_HANDLE, + "Unexpected behavior when making context current, ret %d, last error %#x.\n", ret, err); + + ok(wglGetCurrentContext() == NULL, "Wrong current context.\n"); + + ret = wglMakeCurrent(oldhdc, oldctx); + ok(ret, "Failed to make context current, last error %#x.\n", GetLastError()); + ok(wglGetCurrentContext() == oldctx, "Wrong current context.\n"); + + SetLastError(0xdeadbeef); + ret = wglMakeCurrent(dc, ctx); + err = GetLastError(); + ok(!ret && err == ERROR_INVALID_HANDLE, + "Unexpected behavior when making context current, ret %d, last error %#x.\n", ret, err); + + ok(wglGetCurrentContext() == oldctx, "Wrong current context.\n"); + + ret = wglDeleteContext(ctx); + ok(ret, "Failed to delete GL context, last error %#x.\n", GetLastError()); + + ReleaseDC(window, dc); + + ret = wglMakeCurrent(oldhdc, oldctx); + ok(ret, "Failed to make context current, last error %#x.\n", GetLastError()); +} + +static void test_destroy_read(HDC oldhdc) +{ + PIXELFORMATDESCRIPTOR pf_desc = + { + sizeof(PIXELFORMATDESCRIPTOR), + 1, /* version */ + PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER, + PFD_TYPE_RGBA, + 24, /* 24-bit color depth */ + 0, 0, 0, 0, 0, 0, /* color bits */ + 0, /* alpha buffer */ + 0, /* shift bit */ + 0, /* accumulation buffer */ + 0, 0, 0, 0, /* accum bits */ + 32, /* z-buffer */ + 0, /* stencil buffer */ + 0, /* auxiliary buffer */ + PFD_MAIN_PLANE, /* main layer */ + 0, /* reserved */ + 0, 0, 0 /* layer masks */ + }; + int pixel_format; + HWND draw_window, read_window; + HGLRC ctx; + BOOL ret; + HDC read_dc, draw_dc; + GLenum glerr; + DWORD err; + HGLRC oldctx = wglGetCurrentContext(); + + ok(!!oldctx, "Expected to find a valid current context\n"); + + draw_window = CreateWindowA("static", "opengl32_test", + WS_POPUP, 0, 0, 640, 480, 0, 0, 0, 0); + ok(!!draw_window, "Failed to create window, last error %#x.\n", GetLastError()); + + draw_dc = GetDC(draw_window); + ok(!!draw_dc, "Failed to get DC.\n"); + + pixel_format = ChoosePixelFormat(draw_dc, &pf_desc); + if (!pixel_format) + { + win_skip("Failed to find pixel format.\n"); + ReleaseDC(draw_window, draw_dc); + DestroyWindow(draw_window); + return; + } + + ret = SetPixelFormat(draw_dc, pixel_format, &pf_desc); + ok(ret, "Failed to set pixel format, last error %#x.\n", GetLastError()); + + read_window = CreateWindowA("static", "opengl32_test", + WS_POPUP, 0, 0, 640, 480, 0, 0, 0, 0); + ok(!!read_window, "Failed to create window, last error %#x.\n", GetLastError()); + + read_dc = GetDC(read_window); + ok(!!draw_dc, "Failed to get DC.\n"); + + pixel_format = ChoosePixelFormat(read_dc, &pf_desc); + if (!pixel_format) + { + win_skip("Failed to find pixel format.\n"); + ReleaseDC(read_window, read_dc); + DestroyWindow(read_window); + ReleaseDC(draw_window, draw_dc); + DestroyWindow(draw_window); + return; + } + + ret = SetPixelFormat(read_dc, pixel_format, &pf_desc); + ok(ret, "Failed to set pixel format, last error %#x.\n", GetLastError()); + + ctx = wglCreateContext(draw_dc); + ok(!!ctx, "Failed to create GL context, last error %#x.\n", GetLastError()); + + ret = pwglMakeContextCurrentARB(draw_dc, read_dc, ctx); + ok(ret, "Failed to make context current, last error %#x.\n", GetLastError()); + + glCopyPixels(0, 0, 640, 480, GL_COLOR); + glFinish(); + glerr = glGetError(); + ok(glerr == GL_NO_ERROR, "Failed glCopyPixel, error %#x.\n", glerr); + ret = SwapBuffers(draw_dc); + ok(ret, "Failed SwapBuffers, error %#x.\n", GetLastError()); + + ret = DestroyWindow(read_window); + ok(ret, "Failed to destroy window, last error %#x.\n", GetLastError()); + + ok(wglGetCurrentContext() == ctx, "Wrong current context.\n"); + + if (0) /* Crashes on AMD on Windows */ + { + glCopyPixels(0, 0, 640, 480, GL_COLOR); + glFinish(); + glerr = glGetError(); + ok(glerr == GL_NO_ERROR, "Failed glCopyPixel, error %#x.\n", glerr); + } + + glClear(GL_COLOR_BUFFER_BIT); + glFinish(); + glerr = glGetError(); + ok(glerr == GL_NO_ERROR, "Failed glClear, error %#x.\n", glerr); + ret = SwapBuffers(draw_dc); + ok(ret, "Failed SwapBuffers, error %#x.\n", GetLastError()); + + ret = wglMakeCurrent(NULL, NULL); + ok(ret, "Failed to clear current context, last error %#x.\n", GetLastError()); + + if (0) /* This crashes with Nvidia drivers on Windows. */ + { + SetLastError(0xdeadbeef); + ret = pwglMakeContextCurrentARB(draw_dc, read_dc, ctx); + err = GetLastError(); + ok(!ret && err == ERROR_INVALID_HANDLE, + "Unexpected behavior when making context current, ret %d, last error %#x.\n", ret, err); + } + + ret = DestroyWindow(draw_window); + ok(ret, "Failed to destroy window, last error %#x.\n", GetLastError()); + + glClear(GL_COLOR_BUFFER_BIT); + glFinish(); + glerr = glGetError(); + ok(glerr == GL_INVALID_OPERATION, "Failed glClear, error %#x.\n", glerr); + SetLastError(0xdeadbeef); + ret = SwapBuffers(draw_dc); + err = GetLastError(); + ok(!ret && err == ERROR_INVALID_HANDLE, "Unexpected behavior with SwapBuffer, last error %#x.\n", err); + + SetLastError(0xdeadbeef); + ret = pwglMakeContextCurrentARB(draw_dc, read_dc, ctx); + err = GetLastError(); + ok(!ret && (err == ERROR_INVALID_HANDLE || err == 0xc0070006), + "Unexpected behavior when making context current, ret %d, last error %#x.\n", ret, err); + + ok(wglGetCurrentContext() == NULL, "Wrong current context.\n"); + + wglMakeCurrent(NULL, NULL); + + wglMakeCurrent(oldhdc, oldctx); + ok(wglGetCurrentContext() == oldctx, "Wrong current context.\n"); + + SetLastError(0xdeadbeef); + ret = pwglMakeContextCurrentARB(draw_dc, read_dc, ctx); + err = GetLastError(); + ok(!ret && (err == ERROR_INVALID_HANDLE || err == 0xc0070006), + "Unexpected behavior when making context current, last error %#x.\n", err); + + ok(wglGetCurrentContext() == oldctx, "Wrong current context.\n"); + + ret = wglDeleteContext(ctx); + ok(ret, "Failed to delete GL context, last error %#x.\n", GetLastError()); + + ReleaseDC(read_window, read_dc); + ReleaseDC(draw_window, draw_dc); + + wglMakeCurrent(oldhdc, oldctx); +} + START_TEST(opengl) { HWND hwnd; @@ -920,8 +1454,10 @@ res = SetPixelFormat(hdc, iPixelFormat, &pfd); ok(res, "SetPixelformat failed: %x\n", GetLastError()); - test_bitmap_rendering(); + test_bitmap_rendering( TRUE ); + test_bitmap_rendering( FALSE ); test_minimized(); + test_window_dc(); test_dc(hwnd, hdc); hglrc = wglCreateContext(hdc); @@ -943,6 +1479,10 @@ * any WGL call :( On Wine this would work but not on real Windows because there can be different implementations (software, ICD, MCD). */ init_functions(); + test_getprocaddress(hdc); + test_deletecontext(hwnd, hdc); + test_makecurrent(hdc); + /* The lack of wglGetExtensionsStringARB in general means broken software rendering or the lack of decent OpenGL support, skip tests in such cases */ if (!pwglGetExtensionsStringARB) { @@ -950,9 +1490,8 @@ return; } - test_deletecontext(hdc); - test_makecurrent(hdc); test_setpixelformat(hdc); + test_destroy(hdc); test_sharelists(hdc); test_colorbits(hdc); test_gdi_dbuf(hdc); @@ -965,7 +1504,10 @@ test_opengl3(hdc); if(strstr(wgl_extensions, "WGL_ARB_make_current_read")) + { test_make_current_read(hdc); + test_destroy_read(hdc); + } else skip("WGL_ARB_make_current_read not supported, skipping test\n");

12 years, 4 months

[tkreuzer] 57159: [PSEH2] PSEH2 uses a special mechanism to deal with nested try blocks inside the same function. Instead of pushing a second exception registration record on the exception list, it...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Aug 25 22:19:02 2012 New Revision: 57159 URL: http://svn.reactos.org/svn/reactos?rev=57159&view=rev Log: [PSEH2] PSEH2 uses a special mechanism to deal with nested try blocks inside the same function. Instead of pushing a second exception registration record on the exception list, it uses an internal pointer to handle the different try-levels. But when a function using SEH is inlined, the resulting code will push 2 registration frames on the stack. Now it happens with GCC 4.7.1 that these frames get shuffled on the stack, putting one for the inner try on a higher stack address. This is something that RtlUnwind regards as a bug and throws a STATUS_INVALID_UNWIND_TARGET exception. This was the reason for the crashing PSEH2_TEST, when compiled with GCC 4.7.1. To fix this, I added a mechanism that will prevent functions using SEH from being inlined. Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] Sat Aug 25 22:19:02 2012 @@ -108,6 +108,14 @@ #ifdef __cplusplus } +#endif + +/* Prevent gcc from inlining functions that use SEH. */ +#if ((__GNUC__ >= 4) && (__GNUC_MINOR__ >= 7)) +extern inline __attribute__((always_inline)) __attribute__((returns_twice)) void _SEH_DontInline() {} +#define __PREVENT_GCC_FROM_INLINING_SEH_FUNCTIONS() _SEH_DontInline(); +#else +#define __PREVENT_GCC_FROM_INLINING_SEH_FUNCTIONS() #endif /* A no-op side effect that scares GCC */ @@ -246,6 +254,7 @@ auto __SEH_DECLARE_FINALLY(_SEHFinally); #define _SEH2_TRY \ + __PREVENT_GCC_FROM_INLINING_SEH_FUNCTIONS() \ __SEH_BEGIN_SCOPE \ { \ __SEH_SCOPE_LOCALS; \

12 years, 4 months

← Newer
1
2
3
4
5
6
7
8
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2012