Merge to trunk HEAD(r36856)
authorSamuel Serapion <samuel.serapion@gmail.com>
Mon, 20 Oct 2008 21:36:03 +0000 (21:36 +0000)
committerSamuel Serapion <samuel.serapion@gmail.com>
Mon, 20 Oct 2008 21:36:03 +0000 (21:36 +0000)
svn path=/branches/ros-amd64-bringup/; revision=36862

25 files changed:
1  2 
reactos/base/applications/mscutils/servman/mainwnd.c
reactos/boot/freeldr/freeldr/freeldr.rbuild
reactos/dll/3rdparty/mesa32/mesa32.rbuild
reactos/dll/cpl/ncpa/ncpa.rbuild
reactos/dll/win32/advapi32/sec/misc.c
reactos/dll/win32/gdi32/misc/stubs.c
reactos/dll/win32/netcfgx/lang/de-DE.rc
reactos/dll/win32/user32/include/user32.h
reactos/drivers/network/dd/pcnet/pcnet.c
reactos/include/ddk/winddk.h
reactos/include/reactos/win32k/ntuser.h
reactos/ntoskrnl/mm/section.c
reactos/subsystems/win32/win32k/ntuser/callback.c
reactos/subsystems/win32/win32k/ntuser/class.c
reactos/subsystems/win32/win32k/ntuser/hook.c
reactos/subsystems/win32/win32k/ntuser/kbdlayout.c
reactos/subsystems/win32/win32k/ntuser/menu.c
reactos/subsystems/win32/win32k/ntuser/misc.c
reactos/subsystems/win32/win32k/ntuser/painting.c
reactos/subsystems/win32/win32k/ntuser/simplecall.c
reactos/tools/rbuild/backend/mingw/modulehandler.cpp
reactos/tools/rbuild/module.cpp
reactos/tools/widl/client.c
reactos/tools/widl/server.c
reactos/tools/widl/typegen.c

@@@ -5,16 -5,8 +5,9 @@@
        <include base="ncpa">.</include>
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x600</define>
-       <library>wine</library>
        <library>kernel32</library>
        <library>advapi32</library>
-       <library>user32</library>
-       <library>comctl32</library>
-       <library>iphlpapi</library>
-       <library>ws2_32</library>
-       <library>dhcpcsvc</library>
+       <library>shell32</library>
        <file>ncpa.c</file>
-       <file>tcpip_properties.c</file>
-       <file>ncpa.rc</file>
 +      <file>ncpa.spec</file>
  </module>
Simple merge
Simple merge
@@@ -227,4 -227,3 +227,4 @@@ BEGI
        IDS_DUP_IPADDR      "Die IP-Adresse ist bereits in der Liste vorhanden."
        IDS_DUP_GW          "Der Standardgateway ist bereits in der Liste vorhanden."
  END
- >>>>>>> .merge-right.r36700\r
++>>>>>>> .merge-right.r36700
Simple merge
Simple merge
@@@ -274,8 -274,8 +274,8 @@@ IntCallLowLevelHook(PHOOK Hook, INT Cod
  
     /* FIXME should get timeout from
      * HKEY_CURRENT_USER\Control Panel\Desktop\LowLevelHooksTimeout */
-    Status = co_MsqSendMessage(((PW32THREAD)Hook->Thread->Tcb.Win32Thread)->MessageQueue,
+    Status = co_MsqSendMessage(((PTHREADINFO)Hook->Thread->Tcb.Win32Thread)->MessageQueue,
 -                                    (HWND) Code,
 +                               (HWND)(UINT_PTR)Code,
                                     Hook->HookId,
                                           wParam,
                                           lParam,
@@@ -493,10 -493,10 +493,10 @@@ NtUserCallTwoParam
  
        case TWOPARAM_ROUTINE_SETGUITHRDHANDLE:
           {
-             PUSER_MESSAGE_QUEUE MsgQueue = ((PW32THREAD)PsGetCurrentThread()->Tcb.Win32Thread)->MessageQueue;
+             PUSER_MESSAGE_QUEUE MsgQueue = ((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->MessageQueue;
  
              ASSERT(MsgQueue);
 -            RETURN( (DWORD)MsqSetStateWindow(MsgQueue, (ULONG)Param1, (HWND)Param2));
 +            RETURN( (DWORD_PTR)MsqSetStateWindow(MsgQueue, (ULONG)Param1, (HWND)Param2));
           }
  
        case TWOPARAM_ROUTINE_ENABLEWINDOW:
Simple merge
Simple merge
Simple merge
Simple merge