Merge eterwine into eterhack

Conflicts:
	dlls/ntoskrnl.exe/ntoskrnl.c
	dlls/ntoskrnl.exe/ntoskrnl.exe.spec

diff --cc configure
Simple merge

diff --cc configure.ac
Simple merge

diff --cc dlls/comctl32/treeview.c
Simple merge

diff --cc dlls/kernel32/process.c
Simple merge

diff --cc dlls/msi/action.c
Simple merge

diff --cc dlls/msi/msipriv.h
Simple merge

diff --cc dlls/msi/package.c
Simple merge

diff --cc dlls/ntoskrnl.exe/ntoskrnl.c
index 6b814f0714ba99520026cc2ea973297698b0cf8f,ab113b002d3610c030db1dccf554c845ebf3b369..558e80b3f8d70a6cd19a28a3ffadf45d9191fcef
--- 1/dlls/ntoskrnl.exe/ntoskrnl.c
--- 2/dlls/ntoskrnl.exe/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
@@@ -2898,31 -1326,15 +2898,40 @@@ BOOLEAN WINAPI MmIsAddressValid(PVOID V
      return !IsBadWritePtr(VirtualAddress, 1);
  }
  
 + /***********************************************************************
 + *           MmMapLockedPages   (NTOSKRNL.EXE.@)
 + */
 +PVOID WINAPI MmMapLockedPages(PMDL MemoryDescriptorList,
 +        KPROCESSOR_MODE AccessMode)
 +{
 +    TRACE("%p %d\n", MemoryDescriptorList, AccessMode);
 +    return MemoryDescriptorList->MappedSystemVa;
 +}
 +
 +/***********************************************************************
 + *           MmMapLockedPagesSpecifyCache   (NTOSKRNL.EXE.@)
 + */
 +PVOID WINAPI MmMapLockedPagesSpecifyCache(PMDL MemoryDescriptorList,
 +                                          KPROCESSOR_MODE AccessMode,
 +                                          MEMORY_CACHING_TYPE CacheType,
 +                                          PVOID BaseAddress,
 +                                          ULONG BugCheckOnFailure,
 +                                          MM_PAGE_PRIORITY Priority)
 +{
 +    TRACE("%p %d %u %p %u %u\n", MemoryDescriptorList, AccessMode,
 +          CacheType, BaseAddress, BugCheckOnFailure, Priority);
 +    return MemoryDescriptorList->MappedSystemVa;
 +}
 +
+ /***********************************************************************
+  *           MmMapIoSpace   (NTOSKRNL.EXE.@)
+  */
+ PVOID WINAPI MmMapIoSpace( PHYSICAL_ADDRESS PhysicalAddress, DWORD NumberOfBytes, DWORD CacheType )
+ {
+     FIXME( "stub: 0x%08x%08x, %d, %d\n", PhysicalAddress.u.HighPart, PhysicalAddress.u.LowPart, NumberOfBytes, CacheType );
+     return NULL;
+ }
+ 
  /***********************************************************************
   *           MmPageEntireDriver   (NTOSKRNL.EXE.@)
   */
@@@ -2960,13 -1352,13 +2969,20 @@@ void WINAPI MmResetDriverPaging(PVOID A
      TRACE("%p\n", AddrInSection);
  }
  
 +/***********************************************************************
 + *           MmUnmapLockedPages   (NTOSKRNL.EXE.@)
 + */
 +void WINAPI MmUnmapLockedPages(PVOID BaseAddress, PMDL MemoryDescriptorList)
 +{
 +    TRACE("%p %p\n", BaseAddress, MemoryDescriptorList);
 +}
+ /***********************************************************************
+  *           MmUnmapIoSpace   (NTOSKRNL.EXE.@)
+  */
+ VOID WINAPI MmUnmapIoSpace( PVOID BaseAddress, SIZE_T NumberOfBytes )
+ {
+     FIXME( "stub: %p, %lu\n", BaseAddress, NumberOfBytes );
+ }
  
  /***********************************************************************
   *           ObfReferenceObject   (NTOSKRNL.EXE.@)

diff --cc dlls/ntoskrnl.exe/ntoskrnl.exe.spec
index 0190870b8132403c99a3105fcf40dd1a9072cd59,38ccb58178994bd1a0ba3c73826cbe999f9aa8b9..793a32f70a672bd6853c47ba9c6d87f6ca64618b
--- 1/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
--- 2/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
@@@ -688,9 -688,9 +688,9 @@@
  @ stub MmLockPagableDataSection
  @ stub MmLockPagableImageSection
  @ stub MmLockPagableSectionByHandle
- @ stub MmMapIoSpace
+ @ stdcall MmMapIoSpace(long long long long)
 -@ stub MmMapLockedPages
 -@ stub MmMapLockedPagesSpecifyCache
 +@ stdcall MmMapLockedPages(ptr long)
 +@ stdcall MmMapLockedPagesSpecifyCache(ptr long long ptr long long)
  @ stub MmMapLockedPagesWithReservedMapping
  @ stub MmMapMemoryDumpMdl
  @ stub MmMapUserAddressesToPage
@@@ -717,9 -717,9 +717,9 @@@
  @ stub MmSystemRangeStart
  @ stub MmTrimAllSystemPagableMemory
  @ stub MmUnlockPagableImageSection
 -@ stub MmUnlockPages
 +@ stdcall MmUnlockPages(ptr)
- @ stub MmUnmapIoSpace
+ @ stdcall MmUnmapIoSpace(ptr long)
 -@ stub MmUnmapLockedPages
 +@ stdcall MmUnmapLockedPages(ptr ptr)
  @ stub MmUnmapReservedMapping
  @ stub MmUnmapVideoDisplay
  @ stub MmUnmapViewInSessionSpace

diff --cc dlls/ws2_32/socket.c
Simple merge

diff --cc tools/wine.inf.in
Simple merge