- Update KTHREAD and KUSER_SHARED_DATA to latest versions. This should make 2K3 drive...

[reactos.git] / reactos / subsys / win32k / ntuser / misc.c

diff --git a/reactos/subsys/win32k/ntuser/misc.c b/reactos/subsys/win32k/ntuser/misc.c
index 3e0e1c5..28ff45f 100644 (file)
--- a/reactos/subsys/win32k/ntuser/misc.c
+++ b/reactos/subsys/win32k/ntuser/misc.c
@@ -459,7 +459,7 @@ NtUserCallTwoParam(
 
       case TWOPARAM_ROUTINE_SETGUITHRDHANDLE:
          {
-            PUSER_MESSAGE_QUEUE MsgQueue = PsGetCurrentThread()->Tcb.Win32Thread->MessageQueue;
+            PUSER_MESSAGE_QUEUE MsgQueue = ((PW32THREAD)PsGetCurrentThread()->Tcb.Win32Thread)->MessageQueue;
 
             ASSERT(MsgQueue);
             RETURN( (DWORD)MsqSetStateWindow(MsgQueue, (ULONG)Param1, (HWND)Param2));
@@ -510,21 +510,6 @@ NtUserCallTwoParam(
          UNIMPLEMENTED
          RETURN( 0);
 
-      case TWOPARAM_ROUTINE_VALIDATERGN:
-         {
-            PWINDOW_OBJECT Window = UserGetWindowObject((HWND) Param1);
-            BOOL ret;
-
-            if (!Window)
-               RETURN(FALSE);
-
-            UserRefObjectCo(Window);
-            ret = co_UserValidateRgn(Window, (HRGN) Param2);
-            UserDerefObjectCo(Window);
-
-            RETURN((DWORD) ret);
-         }
-
       case TWOPARAM_ROUTINE_SETWNDCONTEXTHLPID:
          
          if(!(Window = UserGetWindowObject((HWND)Param1)))
@@ -704,6 +689,7 @@ NtUserCallHwndLock(
 {
    BOOL Ret = 0;
    PWINDOW_OBJECT Window;
+   USER_REFERENCE_ENTRY Ref;
    DECLARE_RETURN(BOOLEAN);
 
    DPRINT("Enter NtUserCallHwndLock\n");
@@ -713,7 +699,7 @@ NtUserCallHwndLock(
    {
       RETURN( FALSE);
    }
-   UserRefObjectCo(Window);
+   UserRefObjectCo(Window, &Ref);
 
    /* FIXME: Routine can be 0x53 - 0x5E */
    switch (Routine)
@@ -827,8 +813,9 @@ IntGetFontMetricSetting(LPWSTR lpValueName, PLOGFONTW font)
 {
    RTL_QUERY_REGISTRY_TABLE QueryTable[2];
    NTSTATUS Status;
+   /* Firefox 1.0.7 depends on the lfHeight value being negative */
    static LOGFONTW DefaultFont = {
-                                    11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET,
+                                    -11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET,
                                     0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS,
                                     L"Bitstream Vera Sans"
                                  };
@@ -1346,12 +1333,12 @@ NtUserGetGUIThreadInfo(
          SetLastWin32Error(ERROR_ACCESS_DENIED);
          RETURN( FALSE);
       }
-      Desktop = Thread->Tcb.Win32Thread->Desktop;
+      Desktop = ((PW32THREAD)Thread->Tcb.Win32Thread)->Desktop;
    }
    else
    {
       /* get the foreground thread */
-      PW32THREAD W32Thread = PsGetCurrentThread()->Tcb.Win32Thread;
+      PW32THREAD W32Thread = (PW32THREAD)PsGetCurrentThread()->Tcb.Win32Thread;
       Desktop = W32Thread->Desktop;
       if(Desktop)
       {