[ros-diffs] [tkreuzer] 34907: - #if out vista api for now - fix advapi and kernel32 spec files. They need more review though. - fix NtUserGetThreadState This fixes x86 build.

Author: tkreuzer
Date: Mon Jul 28 10:14:30 2008
New Revision: 34907

URL: http://svn.reactos.org/svn/reactos?rev=34907&view=rev
Log:
- #if out vista api for now
- fix advapi and kernel32 spec files. They need more review though.
- fix NtUserGetThreadState
This fixes x86 build.

Modified:
    branches/ros-amd64-bringup/reactos/dll/win32/advapi32/advapi32.spec
    branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.spec
    branches/ros-amd64-bringup/reactos/dll/win32/kernel32/synch/critical.c
    branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/misc.c

Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/advapi32.spec
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] Mon
Jul 28 10:14:30 2008
@@ -7,13 +7,13 @@
  @ stdcall AccessCheckAndAuditAlarmA(str ptr str str ptr long ptr long ptr ptr ptr)
  @ stdcall AccessCheckAndAuditAlarmW(wstr ptr wstr wstr ptr long ptr long ptr ptr ptr)
  @ stub AccessCheckByType #(ptr ptr long long ptr long ptr ptr ptr ptr ptr)
- @ stub AccessCheckByTypeAndAuditAlarmA
- @ stub AccessCheckByTypeAndAuditAlarmW
+ @ stdcall AccessCheckByTypeAndAuditAlarmA(str ptr str str ptr ptr long long long ptr
long ptr long ptr ptr ptr)
+ @ stdcall AccessCheckByTypeAndAuditAlarmW(wstr ptr wstr wstr ptr ptr long long long ptr
long ptr long ptr ptr ptr)
  @ stub AccessCheckByTypeResultList
- @ stub AccessCheckByTypeResultListAndAuditAlarmA
- @ stub AccessCheckByTypeResultListAndAuditAlarmByHandleA
- @ stub AccessCheckByTypeResultListAndAuditAlarmByHandleW
- @ stub AccessCheckByTypeResultListAndAuditAlarmW
+ @ stdcall AccessCheckByTypeResultListAndAuditAlarmA(str ptr str str ptr long long long
long ptr long ptr long ptr ptr ptr)
+ @ stdcall AccessCheckByTypeResultListAndAuditAlarmByHandleA(str ptr ptr str str ptr long
long long long ptr long ptr long ptr ptr ptr)
+ @ stdcall AccessCheckByTypeResultListAndAuditAlarmByHandleW(wstr ptr ptr wstr wstr ptr
long long long long ptr long ptr long ptr ptr ptr)
+ @ stdcall AccessCheckByTypeResultListAndAuditAlarmW(wstr ptr wstr wstr ptr long long
long long ptr long ptr long ptr ptr ptr)
  @ stdcall AddAccessAllowedAce (ptr long long ptr)
  @ stdcall AddAccessAllowedAceEx (ptr long long long ptr)
  @ stub AddAccessAllowedObjectAce
@@ -243,8 +243,8 @@
  @ stdcall GetFileSecurityW(wstr long ptr long ptr)
  @ stub GetInformationCodeAuthzLevelW
  @ stub GetInformationCodeAuthzPolicyW
- @ stub GetInheritanceSourceA
- @ stdcall GetInheritanceSourceW (ptr long long long ptr long ptr ptr ptr ptr)
+ @ stdcall GetInheritanceSourceA(str long long long ptr long ptr ptr ptr ptr)
+ @ stdcall GetInheritanceSourceW(wstr long long long ptr long ptr ptr ptr ptr)
  @ stdcall GetKernelObjectSecurity(long long ptr long ptr)
  @ stdcall GetLengthSid(ptr)
  @ stub GetLocalManagedApplicationData
@@ -448,6 +448,7 @@
  @ stub QueryAllTracesA
  @ stub QueryAllTracesW
  @ stub QueryRecoveryAgentsOnEncryptedFile
+ @ stdcall QuerySecurityAccessMask(long ptr)
  @ stdcall QueryServiceConfig2A(long long ptr long ptr)
  @ stdcall QueryServiceConfig2W(long long ptr long ptr)
  @ stdcall QueryServiceConfigA(long ptr long ptr)
@@ -467,6 +468,8 @@
  @ stdcall RegCloseKey(long)
  @ stdcall RegConnectRegistryA(str long ptr)
  @ stdcall RegConnectRegistryW(wstr long ptr)
+ @ stdcall RegCopyTreeA(ptr str ptr)
+ @ stdcall RegCopyTreeW(ptr wstr ptr)
  @ stdcall RegCreateKeyA(long str ptr)
  @ stdcall RegCreateKeyExA(long str long ptr long long ptr ptr ptr)
  @ stdcall RegCreateKeyExW(long wstr long ptr long long ptr ptr ptr)
@@ -572,6 +575,7 @@
  @ stdcall SetNamedSecurityInfoW(wstr long ptr ptr ptr ptr ptr)
  @ stdcall SetPrivateObjectSecurity(long ptr ptr ptr long)
  @ stub SetPrivateObjectSecurityEx
+ @ stdcall SetSecurityAccessMask(long ptr)
  @ stdcall SetSecurityDescriptorControl(ptr long long)
  @ stdcall SetSecurityDescriptorDacl(ptr long ptr long)
  @ stdcall SetSecurityDescriptorGroup (ptr ptr long)

Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.spec
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.spec [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.spec [iso-8859-1] Mon
Jul 28 10:14:30 2008
@@ -120,8 +120,8 @@
 @ stdcall CreateRemoteThread(long ptr long ptr long long ptr)
 @ stdcall CreateSemaphoreA(ptr long long str)
 @ stdcall CreateSemaphoreW(ptr long long wstr)
-@ stdcall CreateSemaphoreExA(ptr long long long str long long)
-@ stdcall CreateSemaphoreExW(ptr long long long wstr long long)
+@ stdcall CreateSemaphoreExA(ptr long long str long long)
+@ stdcall CreateSemaphoreExW(ptr long long wstr long long)
 @ stdcall CreateSocketHandle()
 @ stdcall CreateSymbolicLinkA(str str long)
 @ stdcall CreateSymbolicLinkW(wstr wstr long)
@@ -311,7 +311,7 @@
 @ stdcall GetConsoleCP()
 @ stub GetConsoleCharType
 @ stdcall GetConsoleCommandHistoryA(long long long) #check
-@ stdcall GetConsoleCommandHistoryLengthA(long long long)#check
+@ stdcall GetConsoleCommandHistoryLengthA(long)#check
 @ stdcall GetConsoleCommandHistoryLengthW(long)#check
 @ stdcall GetConsoleCommandHistoryW(long long long)#check
 @ stdcall GetConsoleCursorInfo(long ptr)
@@ -399,6 +399,7 @@
 @ stdcall GetLocalTime(ptr)
 @ stdcall GetLocaleInfoA(long long ptr long)
 @ stdcall GetLocaleInfoW(long long ptr long)
+@ stdcall GetLocaleInfoEx(wstr long wstr long)
 @ stdcall GetLogicalDriveStringsA(long ptr)
 @ stdcall GetLogicalDriveStringsW(long ptr)
 @ stdcall GetLogicalDrives()
@@ -575,7 +576,7 @@
 @ stdcall InitAtomTable(long)
 @ stdcall InitializeCriticalSection(ptr)
 @ stdcall InitializeCriticalSectionAndSpinCount(ptr long)
-@ stdcall InitializeCriticalSectionEx(ptr long long)
+#@ stdcall InitializeCriticalSectionEx(ptr long long)
 @ stdcall InitializeSListHead(ptr) ntdll.RtlInitializeSListHead
 @ stdcall InitializeSRWLock(ptr) ntdll.RtlInitializeSRWLock
 @ stdcall InterlockedCompareExchange (ptr long long)

Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/synch/critical.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/synch/critical.c [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/synch/critical.c [iso-8859-1]
Mon Jul 28 10:14:30 2008
@@ -58,11 +58,12 @@
 /*
  * @implemented
  */
+#if 0
 BOOL WINAPI InitializeCriticalSectionEx( CRITICAL_SECTION *crit, DWORD spincount, DWORD
flags )
 {
     NTSTATUS ret = RtlInitializeCriticalSectionEx( crit, spincount, flags );
     if (ret) RtlRaiseStatus( ret );
     return !ret;
 }
-
+#endif
 /* EOF */

Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/misc.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy…
==============================================================================
--- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1]
Mon Jul 28 10:14:30 2008
@@ -21,7 +21,7 @@
 NtUserGetThreadState(
    DWORD Routine)
 {
-   DECLARE_RETURN(DWORD_PTR);
+   DWORD_PTR ret = 0;
 
    DPRINT("Enter NtUserGetThreadState\n");
    if (Routine != THREADSTATE_GETTHREADINFO)
@@ -37,26 +37,29 @@
    {
       case THREADSTATE_GETTHREADINFO:
          GetW32ThreadInfo();
-         RETURN(0);
-
+         break;
       case THREADSTATE_FOCUSWINDOW:
-         RETURN( (DWORD_PTR)IntGetThreadFocusWindow());
+         ret = (DWORD_PTR)IntGetThreadFocusWindow();
+         break;
       case THREADSTATE_CAPTUREWINDOW:
          /* FIXME should use UserEnterShared */
-         RETURN( (DWORD_PTR)IntGetCapture());
+         ret = (DWORD_PTR)IntGetCapture();
+         break;
       case THREADSTATE_PROGMANWINDOW:
-         RETURN( (DWORD_PTR)GetW32ThreadInfo()->Desktop->hProgmanWindow);
+         ret = (DWORD_PTR)GetW32ThreadInfo()->Desktop->hProgmanWindow;
+         break;
       case THREADSTATE_TASKMANWINDOW:
-         RETURN( (DWORD_PTR)GetW32ThreadInfo()->Desktop->hTaskManWindow);
+         ret = (DWORD_PTR)GetW32ThreadInfo()->Desktop->hTaskManWindow;
+         break;
       case THREADSTATE_ACTIVEWINDOW:
-         RETURN ( (DWORD_PTR)UserGetActiveWindow());
-   }
-   RETURN( 0);
-
-CLEANUP:
-   DPRINT("Leave NtUserGetThreadState, ret=%i\n",_ret_);
+         ret = (DWORD_PTR)UserGetActiveWindow();
+         break;
+   }
+
+   DPRINT("Leave NtUserGetThreadState, ret=%i\n", ret);
    UserLeave();
-   END_CLEANUP;
+
+   return ret;
 }
 
 
@@ -124,7 +127,7 @@
 
    if(idThread)
    {
-      Status = PsLookupThreadByThreadId((HANDLE)idThread, &Thread);
+      Status = PsLookupThreadByThreadId((HANDLE)(DWORD_PTR)idThread, &Thread);
       if(!NT_SUCCESS(Status))
       {
          SetLastWin32Error(ERROR_ACCESS_DENIED);
@@ -416,7 +419,7 @@
                                 (ULONG_PTR)W32Process->HeapMappings.UserMapping;
             pi->psi = gpsi;
 
-            if (InterlockedCompareExchangePointer(&W32Process->ProcessInfo,
+            if
(InterlockedCompareExchangePointer((PVOID*)&W32Process->ProcessInfo,
                                                   pi,
                                                   NULL) != NULL)
             {