[MSCOREE] Sync to wine-10.0

Author: MishaProductions

dll/win32/mscoree/CMakeLists.txt

@@ -1,6 +1,6 @@
 
 remove_definitions(-D_WIN32_WINNT=0x502)
-add_definitions(-D_WIN32_WINNT=0x600)
+add_definitions(-D_WIN32_WINNT=0x600 -DUSE_NEW_WINE_REGISTER_RESOURCES)
 
 spec2def(mscoree.dll mscoree.spec)
 
@@ -24,8 +24,8 @@ add_library(mscoree MODULE
     ${CMAKE_CURRENT_BINARY_DIR}/mscoree.def)
 
 set_module_type(mscoree win32dll)
-target_link_libraries(mscoree uuid wine)
-add_importlibs(mscoree dbghelp advapi32 shell32 ole32 shlwapi msvcrt kernel32 ntdll)
-add_pch(mscoree mscoree_private.h "${PCH_SKIP_SOURCE}")
+target_link_libraries(mscoree uuid wine oldnames)
+add_importlibs(mscoree dbghelp advapi32 shell32 kernel32_vista ole32 shlwapi msvcrt kernel32 ntdll)
+#add_pch(mscoree mscoree_private.h "${PCH_SKIP_SOURCE}")
 add_cd_file(TARGET mscoree DESTINATION reactos/system32 FOR all)
 set_wine_module_FIXME(mscoree) # CORE-5743: No CONST_VTABLE

dll/win32/mscoree/assembly.c

@@ -18,10 +18,23 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <stdarg.h>
+#include <stdio.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "winver.h"
+#include "dbghelp.h"
+#include "ole2.h"
+#include "mscoree.h"
+#include "corhdr.h"
+#include "metahost.h"
+#include "cordebug.h"
+#include "wine/list.h"
 #include "mscoree_private.h"
 
-#include <winver.h>
-#include <dbghelp.h>
+#include "wine/debug.h"
 
 typedef struct
 {
@@ -49,7 +62,7 @@ typedef struct tagCLRTABLE
 
 struct tagASSEMBLY
 {
-    int is_mapped_file;
+    BOOL is_mapped_file;
 
     /* mapped files */
     LPWSTR path;
@@ -64,20 +77,6 @@ struct tagASSEMBLY
     METADATAHDR *metadatahdr;
 };
 
-static inline LPWSTR strdupW(LPCWSTR src)
-{
-    LPWSTR dest;
-
-    if (!src)
-        return NULL;
-
-    dest = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(src) + 1) * sizeof(WCHAR));
-    if (dest)
-        lstrcpyW(dest, src);
-
-    return dest;
-}
-
 static void* assembly_rva_to_va(ASSEMBLY *assembly, ULONG rva)
 {
     if (assembly->is_mapped_file)
@@ -115,7 +114,7 @@ static HRESULT parse_metadata_header(ASSEMBLY *assembly, DWORD *hdrsz)
 
     metadatahdr = (METADATAHDR *)ptr;
 
-    assembly->metadatahdr = HeapAlloc(GetProcessHeap(), 0, sizeof(METADATAHDR));
+    assembly->metadatahdr = malloc(sizeof(METADATAHDR));
     if (!assembly->metadatahdr)
         return E_OUTOFMEMORY;
 
@@ -195,13 +194,13 @@ HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file)
 
     *out = NULL;
 
-    assembly = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ASSEMBLY));
+    assembly = calloc(1, sizeof(ASSEMBLY));
     if (!assembly)
         return E_OUTOFMEMORY;
 
-    assembly->is_mapped_file = 1;
+    assembly->is_mapped_file = TRUE;
 
-    assembly->path = strdupW(file);
+    assembly->path = wcsdup(file);
     if (!assembly->path)
     {
         hr = E_OUTOFMEMORY;
@@ -249,11 +248,11 @@ HRESULT assembly_from_hmodule(ASSEMBLY **out, HMODULE hmodule)
 
     *out = NULL;
 
-    assembly = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ASSEMBLY));
+    assembly = calloc(1, sizeof(ASSEMBLY));
     if (!assembly)
         return E_OUTOFMEMORY;
 
-    assembly->is_mapped_file = 0;
+    assembly->is_mapped_file = FALSE;
 
     assembly->data = (BYTE*)hmodule;
 
@@ -277,9 +276,9 @@ HRESULT assembly_release(ASSEMBLY *assembly)
         CloseHandle(assembly->hmap);
         CloseHandle(assembly->hfile);
     }
-    HeapFree(GetProcessHeap(), 0, assembly->metadatahdr);
-    HeapFree(GetProcessHeap(), 0, assembly->path);
-    HeapFree(GetProcessHeap(), 0, assembly);
+    free(assembly->metadatahdr);
+    free(assembly->path);
+    free(assembly);
 
     return S_OK;
 }
@@ -300,3 +299,17 @@ HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWO
 
     return S_OK;
 }
+
+HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func)
+{
+    if (assembly->corhdr->Flags & COMIMAGE_FLAGS_NATIVE_ENTRYPOINT)
+    {
+        *func = assembly_rva_to_va(assembly, assembly->corhdr->EntryPointRVA);
+        return S_OK;
+    }
+    else
+    {
+        *func = NULL;
+        return S_FALSE;
+    }
+}