diff --git a/wrappers/base/comdlg32_wrapper/itemdlg.c b/wrappers/base/comdlg32_wrapper/itemdlg.c
index 941b0ddf91..2f2c808b74 100644
--- a/wrappers/base/comdlg32_wrapper/itemdlg.c
+++ b/wrappers/base/comdlg32_wrapper/itemdlg.c
@@ -119,6 +119,7 @@ typedef struct FileDialogImpl {
 
     IShellItemArray *psia_selection;
     IShellItemArray *psia_results;
+    IShellItem *psia_result;
     IShellItem *psi_defaultfolder;
     IShellItem *psi_setfolder;
     IShellItem *psi_folder;
@@ -2459,8 +2460,8 @@ static HRESULT create_dialog(FileDialogImpl *This, HWND parent)
         ERR("Failed to show dialog (LastError: %ld)\n", GetLastError());
         return E_FAIL;
     }else{
-		// IShellItem shellItem;
-		// SHCreateItemFromParsingName(ofn.lpstrFile,NULL,&IID_IShellItem, (void**)&shellItem);
+		//IShellItem *shellItem;
+		SHCreateItemFromParsingName(ofn.lpstrFile,NULL,&IID_IShellItem, &This->psia_result);
 		// SHCreateShellItemArrayFromShellItem(&shellItem,&IID_IShellItemArray, (void**)&This->psia_results);
 	}
 
@@ -2877,27 +2878,31 @@ static HRESULT WINAPI IFileDialog2_fnSetFileNameLabel(IFileDialog2 *iface, LPCWS
 static HRESULT WINAPI IFileDialog2_fnGetResult(IFileDialog2 *iface, IShellItem **ppsi)
 {
     FileDialogImpl *This = impl_from_IFileDialog2(iface);
-    HRESULT hr;
+    //HRESULT hr;
     TRACE("%p (%p)\n", This, ppsi);
 
     if(!ppsi)
         return E_INVALIDARG;
 
-    if(This->psia_results)
-    {
-        DWORD item_count;
-        hr = IShellItemArray_GetCount(This->psia_results, &item_count);
-        if(SUCCEEDED(hr))
-        {
-            if(item_count != 1)
-                return E_FAIL;
-
-            /* Adds a reference. */
-            hr = IShellItemArray_GetItemAt(This->psia_results, 0, ppsi);
-        }
-
-        return hr;
-    }
+	if(This->psia_result){
+		*ppsi = This->psia_result;
+		return S_OK;
+	}
+    // if(This->psia_results)
+    // {
+        // DWORD item_count;
+        // hr = IShellItemArray_GetCount(This->psia_results, &item_count);
+        // if(SUCCEEDED(hr))
+        // {
+            // if(item_count != 1)
+                // return E_FAIL;
+
+            // /* Adds a reference. */
+            // hr = IShellItemArray_GetItemAt(This->psia_results, 0, ppsi);
+        // }
+
+        // return hr;
+    // }
 
     return E_UNEXPECTED;
 }
diff --git a/wrappers/base/gdi32_wrapper/font.c b/wrappers/base/gdi32_wrapper/font.c
index c28b45fe3d..f9394ca8d3 100644
--- a/wrappers/base/gdi32_wrapper/font.c
+++ b/wrappers/base/gdi32_wrapper/font.c
@@ -131,44 +131,76 @@ static inline struct font_handle_entry *handle_entry( DWORD handle )
     return NULL;
 }
 
-/*************************************************************************
- *             GetFontFileInfo   (GDI32.@)
- */
-BOOL WINAPI GetFontFileInfo( DWORD instance_id, DWORD unknown, struct font_fileinfo *info, DWORD size, DWORD *needed )
-{
-    // LOGFONTW logfont;
-    // HFONT hfont;
-    // HRESULT hr;
-
-    // // *fontface = NULL;
-
-    // hfont = GetCurrentObject(currentHdcFont, OBJ_FONT);
-    // if (!hfont)
-        // return E_INVALIDARG;
-    // GetObjectW(hfont, sizeof(logfont), &logfont);
-	
-    struct font_handle_entry *entry = handle_entry( instance_id );
-    const GdiFont *font;
-
-    if (!entry)
-    {
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return FALSE;
-    }
-
-    font = entry->obj;
-    *needed = sizeof(*info) + strlenW(font->fileinfo->path) * sizeof(WCHAR);
+LPCWSTR fontPath = L"C:\\Windows\\Fonts\\Tahoma.ttf";
+
+BOOL WINAPI GetFontFileInfo( DWORD instance_id, DWORD file_index, struct font_fileinfo *info, DWORD size, DWORD *needed ) {
+    struct font_fileinfo fileinfo = {0};
+	DWORD neededLength;
+    
+    ZeroMemory(&fileinfo, sizeof(fileinfo));
+    
+    neededLength = sizeof(info) + (strlenW(fontPath) + 1) * sizeof(WCHAR);
+
+    //font = entry->obj;
+    *needed = neededLength;
     if (*needed > size)
     {
         SetLastError(ERROR_INSUFFICIENT_BUFFER);
         return FALSE;
     }
-
-    /* path is included too */
-    memcpy(info, font->fileinfo, *needed);
+    info->writetime.dwLowDateTime = 0;
+    info->writetime.dwHighDateTime = 0;
+    info->size.LowPart = 1000000; // replace with actual font size
+    info->size.HighPart = 1000000; // replace with actual font size
+    memcpy(&(info->path), fontPath, (strlenW(fontPath) + 1) * sizeof(WCHAR));
     return TRUE;
 }
 
+// /*************************************************************************
+ // *             GetFontFileInfo   (GDI32.@)
+ // */
+// BOOL WINAPI GetFontFileInfo( DWORD instance_id, DWORD unknown, struct font_fileinfo *info, DWORD size, DWORD *needed )
+// {
+    // // LOGFONTW logfont;
+    // // HFONT hfont;
+    // // HRESULT hr;
+
+    // // // *fontface = NULL;
+
+    // // hfont = GetCurrentObject(currentHdcFont, OBJ_FONT);
+    // // if (!hfont)
+        // // return E_INVALIDARG;
+    // // GetObjectW(hfont, sizeof(logfont), &logfont);
+	
+    // //struct font_handle_entry *entry = handle_entry( instance_id );
+    // //const GdiFont *font;
+
+    // // if (!entry)
+    // // {
+        // // SetLastError(ERROR_INVALID_PARAMETER);
+        // // return FALSE;
+    // // }
+	
+	// struct font_fileinfo fileinfo = {0};
+	
+	// ZeroMemory(&fileinfo, sizeof(fileinfo));
+	
+	// fileinfo.path = L"C:\\Windows\\Fonts\\Tahoma.ttf";
+	// fileinfo.size = sizeof(*info) + strlenW(fileinfo.path) * sizeof(WCHAR);
+
+    // //font = entry->obj;
+    // *needed = fileinfo.size;
+    // if (*needed > size)
+    // {
+        // SetLastError(ERROR_INSUFFICIENT_BUFFER);
+        // return FALSE;
+    // }
+
+    // /* path is included too */
+    // memcpy(info, fileinfo, *needed);
+    // return TRUE;
+// }
+
 /*************************************************************
  *           GetFontRealizationInfo    (GDI32.@)
  */
@@ -183,29 +215,22 @@ GetFontRealizationInfo(HDC hdc, struct font_realization_info *info)
 	}
 	//Just return GetRealizationInfo, because call internally same syscall, NtGdiGetRealizationInfo
 	if(GdiRealizationInfo(hdc, &reinfo)){
-		info->file_count = 1;
-		switch(reinfo.iTechnology)
-		{
-			case 1:
-				info->flags = 1;
-				break;
-			case 2: 
-				info->flags |= 2;
-				break;
-			default:
-				break;
-		}
-		info->instance_id = reinfo.iUniq;
-		info->face_index = reinfo.iFontFileId;
-		info->simulations = 0;
+        info->flags = reinfo.iTechnology;
+        info->cache_num = 0;
+        info->instance_id = reinfo.iUniq;
+        if (info->size >= 20)
+            info->file_count = 1;
+        if (info->size >= 22)
+            info->face_index = reinfo.iFontFileId;
+        if (info->size >= 24)
+            info->simulations = 0;
+		// info->instance_id = reinfo.iUniq;
+		// info->face_index = reinfo.iFontFileId;
+		// info->simulations = 0;
 		return TRUE;
 	}
 	
-	return FALSE;
-
-    // if (physdev->font->fake_bold) info->simulations |= 0x1;
-    // if (physdev->font->fake_italic) info->simulations |= 0x2;
-	
+	return FALSE;	
 }
 
 static DWORD get_font_data( GdiFont *font, DWORD table, DWORD offset, LPVOID buf, DWORD cbData)
diff --git a/wrappers/base/kernelbase_wrapper/locale.c b/wrappers/base/kernelbase_wrapper/locale.c
index 93d4bea4da..8b0302359a 100644
--- a/wrappers/base/kernelbase_wrapper/locale.c
+++ b/wrappers/base/kernelbase_wrapper/locale.c
@@ -75,6 +75,145 @@ static const NLS_LOCALE_HEADER *locale_table;
 #define LOCALE_SSHORTESTDAYNAME6    0x0065
 #define LOCALE_SSHORTESTDAYNAME7    0x0066
 
+NeutralToSpecific NeutralToSpecificMap[] =
+{
+	{ L"af", L"af-ZA" },
+	{ L"am", L"am-ET" },
+	{ L"ar", L"ar-SA" },
+	{ L"arn", L"arn-CL" },
+	{ L"as", L"as-IN" },
+	{ L"az", L"az-Latn-AZ" },
+	{ L"az-Cyrl", L"az-Cyrl-AZ" },
+	{ L"az-Latn", L"az-Latn-AZ" },
+	{ L"ba", L"ba-RU" },
+	{ L"be", L"be-BY" },
+	{ L"bg", L"bg-BG" },
+	{ L"bn", L"bn-IN" },
+	{ L"bo", L"bo-CN" },
+	{ L"br", L"br-FR" },
+	{ L"bs-Cyrl", L"bs-Cyrl-BA" },
+	{ L"bs-Latn", L"bs-Latn-BA" },
+	{ L"ca", L"ca-ES" },
+	{ L"co", L"co-FR" },
+	{ L"cs", L"cs-CZ" },
+	{ L"cy", L"cy-GB" },
+	{ L"da", L"da-DK" },
+	{ L"de", L"de-DE" },
+	{ L"dsb", L"dsb-DE" },
+	{ L"dv", L"dv-MV" },
+	{ L"el", L"el-GR" },
+	{ L"en", L"en-US" },
+	{ L"es", L"es-ES" },
+	{ L"et", L"et-EE" },
+	{ L"eu", L"eu-ES" },
+	{ L"fa", L"fa-IR" },
+	{ L"fi", L"fi-FI" },
+	{ L"fil", L"fil-PH" },
+	{ L"fo", L"fo-FO" },
+	{ L"fr", L"fr-FR" },
+	{ L"fy", L"fy-NL" },
+	{ L"ga", L"ga-IE" },
+	{ L"gd", L"gd-GB" },
+	{ L"gl", L"gl-ES" },
+	{ L"gsw", L"gsw-FR" },
+	{ L"gu", L"gu-IN" },
+	{ L"ha-Latn", L"ha-Latn-NG" },
+	{ L"he", L"he-IL" },
+	{ L"hi", L"hi-IN" },
+	{ L"hr", L"hr-HR" },
+	{ L"hsb", L"hsb-DE" },
+	{ L"hu", L"hu-HU" },
+	{ L"hy", L"hy-AM" },
+	{ L"id", L"id-ID" },
+	{ L"ig", L"ig-NG" },
+	{ L"ii", L"ii-CN" },
+	{ L"is", L"is-IS" },
+	{ L"it", L"it-IT" },
+	{ L"iu-Cans", L"iu-Cans-CA" },
+	{ L"iu-Latn", L"iu-Latn-CA" },
+	{ L"ja", L"ja-JP" },
+	{ L"ka", L"ka-GE" },
+	{ L"kk", L"kk-KZ" },
+	{ L"kl", L"kl-GL" },
+	{ L"km", L"km-KH" },
+	{ L"kn", L"kn-IN" },
+	{ L"ko", L"ko-KR" },
+	{ L"kok", L"kok-IN" },
+	{ L"ky", L"ky-KG" },
+	{ L"lb", L"lb-LU" },
+	{ L"lo", L"lo-LA" },
+	{ L"lt", L"lt-LT" },
+	{ L"lv", L"lv-LV" },
+	{ L"mi", L"mi-NZ" },
+	{ L"mk", L"mk-MK" },
+	{ L"ml", L"ml-IN" },
+	{ L"mn", L"mn-MN" },
+	{ L"mn-Cyrl", L"mn-MN" },
+	{ L"mn-Mong", L"mn-Mong-CN" },
+	{ L"moh", L"moh-CA" },
+	{ L"mr", L"mr-IN" },
+	{ L"ms", L"ms-MY" },
+	{ L"mt", L"mt-MT" },
+	{ L"nb", L"nb-NO" },
+	{ L"ne", L"ne-NP" },
+	{ L"nl", L"nl-NL" },
+	{ L"nn", L"nn-NO" },
+	{ L"no", L"nb-NO" },
+	{ L"nso", L"nso-ZA" },
+	{ L"oc", L"oc-FR" },
+	{ L"or", L"or-IN" },
+	{ L"pa", L"pa-IN" },
+	{ L"pl", L"pl-PL" },
+	{ L"prs", L"prs-AF" },
+	{ L"ps", L"ps-AF" },
+	{ L"pt", L"pt-BR" },
+	{ L"qut", L"qut-GT" },
+	{ L"quz", L"quz-BO" },
+	{ L"rm", L"rm-CH" },
+	{ L"ro", L"ro-RO" },
+	{ L"ru", L"ru-RU" },
+	{ L"rw", L"rw-RW" },
+	{ L"sa", L"sa-IN" },
+	{ L"sah", L"sah-RU" },
+	{ L"se", L"se-NO" },
+	{ L"si", L"si-LK" },
+	{ L"sk", L"sk-SK" },
+	{ L"sl", L"sl-SI" },
+	{ L"sma", L"sma-SE" },
+	{ L"smj", L"smj-SE" },
+	{ L"smn", L"smn-FI" },
+	{ L"sms", L"sms-FI" },
+	{ L"sq", L"sq-AL" },
+	{ L"sr", L"sr-Latn-RS" },
+	{ L"sr-Cyrl", L"sr-Cyrl-RS" },
+	{ L"sr-Latn", L"sr-Latn-RS" },
+	{ L"sv", L"sv-SE" },
+	{ L"sw", L"sw-KE" },
+	{ L"syr", L"syr-SY" },
+	{ L"ta", L"ta-IN" },
+	{ L"te", L"te-IN" },
+	{ L"tg-Cyrl", L"tg-Cyrl-TJ" },
+	{ L"th", L"th-TH" },
+	{ L"tk", L"tk-TM" },
+	{ L"tn", L"tn-ZA" },
+	{ L"tr", L"tr-TR" },
+	{ L"tt", L"tt-RU" },
+	{ L"tzm-Latn", L"tzm-Latn-DZ" },
+	{ L"ug", L"ug-CN" },
+	{ L"uk", L"uk-UA" },
+	{ L"ur", L"ur-PK" },
+	{ L"uz", L"uz-Latn-UZ" },
+	{ L"uz-Cyrl", L"uz-Cyrl-UZ" },
+	{ L"uz-Latn", L"uz-Latn-UZ" },
+	{ L"vi", L"vi-VN" },
+	{ L"wo", L"wo-SN" },
+	{ L"xh", L"xh-ZA" },
+	{ L"yo", L"yo-NG" },
+	{ L"zh-Hans", L"zh-CN" },
+	{ L"zh-Hant", L"zh-HK" },
+	{ L"zu", L"zu-ZA" },
+};
+
 WINE_DEFAULT_DEBUG_CHANNEL(locale); 
 
 struct sortguid
@@ -841,31 +980,99 @@ LocaleNameToLCID(
     return GetSystemDefaultLCID();
 }
 
+// Implements wcsncpmp for ASCII chars only.
+// NOTE: We can't use wcsncmp in this context because we may end up trying to modify
+// locale data structs or even calling the same function in NLS code.
+static int _fastcall __wcsnicmp_ascii(const wchar_t* string1, const wchar_t* string2, size_t count)
+{
+	wchar_t f, l;
+	int result = 0;
+
+	if (count)
+	{
+		/* validation section */
+		do {
+			f = towlower(*string1);
+			l = towlower(*string2);
+			string1++;
+			string2++;
+		} while ((--count) && f && (f == l));
+
+		result = (int)(f - l);
+	}
+
+	return result;
+}
+
+//尝试将一个中性语言匹配到实际区域
+static LPCWSTR __fastcall DownlevelNeutralToSpecificLocaleName(LPCWSTR szLocaleName)
+{
+	int bottom = 0;
+	int top = _countof(NeutralToSpecificMap) - 1;
+	int middle;
+	int testIndex;
+
+	while (bottom <= top)
+	{
+		middle = (bottom + top) / 2;
+		testIndex = __wcsnicmp_ascii(szLocaleName, NeutralToSpecificMap[middle].szNeutralLocale, LOCALE_NAME_MAX_LENGTH);
+
+		if (testIndex == 0)
+			return NeutralToSpecificMap[middle].szSpecificLocale;
+
+		if (testIndex < 0)
+			top = middle - 1;
+		else
+			bottom = middle + 1;
+	}
+
+	//找不到就直接返回本身
+	return szLocaleName;
+}
+
 /***********************************************************************
  *           LCIDToLocaleName  (KERNEL32.@)
  */
 INT 
 WINAPI 
 LCIDToLocaleName( 
-	LCID lcid, 
+	LCID Locale, 
 	LPWSTR lpName, 
-	INT count, 
-	DWORD flags 
+	INT cchName, 
+	DWORD dwFlags 
 )
 {
 	int i;
-	int length = 0;
+	int count = 0;
+	LPCWSTR szLocaleName;
+	
+	szLocaleName = (LPWSTR)HeapAlloc(GetProcessHeap(), 8, MAX_PATH * 2);
+	
+	if (Locale == 0 || (lpName == NULL && cchName > 0) || cchName < 0)
+	{
+		SetLastError(ERROR_INVALID_PARAMETER);
+		return 0;
+	}	
 	for(i=0;i<LOCALE_TABLE_SIZE;i++){
-		if(lcid == LocaleTable[i].lcid){
-			length = (wcslen(LocaleTable[i].localeName)+1);
+		if(Locale == LocaleTable[i].lcid){
+			count = (wcslen(LocaleTable[i].localeName)+1);
 			if(lpName){
-				memcpy(lpName, LocaleTable[i].localeName, sizeof(WCHAR)*(length));
-				lpName[length-1] = 0;
+				memcpy(lpName, LocaleTable[i].localeName, sizeof(WCHAR)*(count));
+				lpName[count-1] = 0;
 			}			
-			return length;
+			return count;
 		}
 	}
-	return length;
+	if(lpName){
+		if ((LOCALE_ALLOW_NEUTRAL_NAMES & dwFlags) == 0)
+		{
+			szLocaleName = DownlevelNeutralToSpecificLocaleName(szLocaleName);
+			count = wcslen(szLocaleName) + 1;
+			memcpy(lpName, szLocaleName, count * sizeof(szLocaleName[0]));
+			HeapFree(GetProcessHeap(), 0, szLocaleName);
+		}		
+	}
+	return count;
 }
 
 //TODO MUI_LANGUAGE_ID
diff --git a/wrappers/base/kernelbase_wrapper/main.h b/wrappers/base/kernelbase_wrapper/main.h
index 7370c84fd7..f24f388437 100644
--- a/wrappers/base/kernelbase_wrapper/main.h
+++ b/wrappers/base/kernelbase_wrapper/main.h
@@ -251,7 +251,6 @@ typedef struct _UMS_CREATE_THREAD_ATTRIBUTES {
 #define CONTEXT_AMD64_SEGMENTS  (CONTEXT_AMD64 | 0x0004)
 #define CONTEXT_AMD64_FLOATING_POINT  (CONTEXT_AMD64 | 0x0008)
 #define CONTEXT_AMD64_DEBUG_REGISTERS (CONTEXT_AMD64 | 0x0010)
-#define CONTEXT_AMD64_XSTATE          (CONTEXT_AMD64 | 0x0040)
 #define CONTEXT_AMD64_FULL (CONTEXT_AMD64_CONTROL | CONTEXT_AMD64_INTEGER | CONTEXT_AMD64_FLOATING_POINT)
 #define CONTEXT_AMD64_ALL (CONTEXT_AMD64_CONTROL | CONTEXT_AMD64_INTEGER | CONTEXT_AMD64_SEGMENTS | CONTEXT_AMD64_FLOATING_POINT | CONTEXT_AMD64_DEBUG_REGISTERS)
 
@@ -424,6 +423,12 @@ typedef struct _LOCALE_LCID{
 	LCID lcid;
 }LOCALE_LCID;
 
+typedef struct _NeutralToSpecific
+{
+	LPCWSTR szNeutralLocale;
+	LPCWSTR szSpecificLocale;
+}NeutralToSpecific;
+
 typedef enum _POWER_REQUEST_TYPE { 
   PowerRequestDisplayRequired,
   PowerRequestSystemRequired,
diff --git a/wrappers/base/shell32_wrapper/main.c b/wrappers/base/shell32_wrapper/main.c
index 3cd930a2b4..7c859ef4c8 100644
--- a/wrappers/base/shell32_wrapper/main.c
+++ b/wrappers/base/shell32_wrapper/main.c
@@ -23,6 +23,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 HINSTANCE shell32_hInstance = 0;
 
+//SHFILEOPSTRUCTW fileOperation = {0};	
+
 BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
 {
 	DWORD bufferSize = 65535;
@@ -36,6 +38,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
 			shell32_hInstance = hInstDLL;
 			DisableThreadLibraryCalls(shell32_hInstance);		
 			AppData = (LPWSTR)HeapAlloc(GetProcessHeap(), 8, MAX_PATH * 2);
+			//ZeroMemory(&fileOperation, sizeof(fileOperation));	
 			if (!AppData)
 				return E_OUTOFMEMORY;
 			
diff --git a/wrappers/base/shell32_wrapper/shellole.c b/wrappers/base/shell32_wrapper/shellole.c
index 4a716ea04a..6ecaa5653f 100644
--- a/wrappers/base/shell32_wrapper/shellole.c
+++ b/wrappers/base/shell32_wrapper/shellole.c
@@ -67,7 +67,7 @@ static const struct {
 	// {&CLSID_ShellDesktop,	ISF_Desktop_Constructor},
 	// {&CLSID_ShellFSFolder,	IFSFolder_Constructor},
 	{&CLSID_ShellItem,	IShellItem_Constructor},
-	{&CLSID_ShellLink,	IShellLink_Constructor},
+	//{&CLSID_ShellLink,	IShellLink_Constructor},
 	{&CLSID_ExplorerBrowser,ExplorerBrowser_Constructor},
 	{&CLSID_KnownFolderManager, KnownFolderManager_Constructor},
 	// {&CLSID_Shell,          IShellDispatch_Constructor},
diff --git a/wrappers/base/shell32_wrapper/shlfileop.c b/wrappers/base/shell32_wrapper/shlfileop.c
index f452912345..0ef8cbae3f 100644
--- a/wrappers/base/shell32_wrapper/shlfileop.c
+++ b/wrappers/base/shell32_wrapper/shlfileop.c
@@ -58,1210 +58,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 #define FO_NEW_ITEM 5
 
-static DWORD SHNotifyCreateDirectoryA(LPCSTR path, LPSECURITY_ATTRIBUTES sec);
-static DWORD SHNotifyCreateDirectoryW(LPCWSTR path, LPSECURITY_ATTRIBUTES sec);
-static DWORD SHNotifyRemoveDirectoryA(LPCSTR path);
-static DWORD SHNotifyRemoveDirectoryW(LPCWSTR path);
-static DWORD SHNotifyDeleteFileA(LPCSTR path);
-static DWORD SHNotifyDeleteFileW(LPCWSTR path);
-static DWORD SHNotifyMoveFileW(LPCWSTR src, LPCWSTR dest);
-static DWORD SHNotifyCopyFileW(LPCWSTR src, LPCWSTR dest, BOOL bFailIfExists);
-static DWORD SHFindAttrW(LPCWSTR pName, BOOL fileOnly);
-
-typedef struct
-{
-    SHFILEOPSTRUCTW *req;
-    DWORD dwYesToAllMask;
-    BOOL bManyItems;
-    BOOL bCancelled;
-} FILE_OPERATION;
-
-/* Confirm dialogs with an optional "Yes To All" as used in file operations confirmations
- */
-struct confirm_msg_info
-{
-    LPWSTR lpszText;
-    LPWSTR lpszCaption;
-    HICON hIcon;
-    BOOL bYesToAll;
-};
-
-/* as some buttons may be hidden and the dialog height may change we may need
- * to move the controls */
-static void confirm_msg_move_button(HWND hDlg, INT iId, INT *xPos, INT yOffset, BOOL bShow)
-{
-    HWND hButton = GetDlgItem(hDlg, iId);
-    RECT r;
-
-    if (bShow) {
-        int width;
-
-        GetWindowRect(hButton, &r);
-        MapWindowPoints( 0, hDlg, (POINT *)&r, 2 );
-        width = r.right - r.left;
-        SetWindowPos(hButton, 0, *xPos - width, r.top - yOffset, 0, 0,
-                     SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW );
-        *xPos -= width + 5;
-    }
-    else
-        ShowWindow(hButton, SW_HIDE);
-}
-
-/* Note: we paint the text manually and don't use the static control to make
- * sure the text has the same height as the one computed in WM_INITDIALOG
- */
-static INT_PTR ConfirmMsgBox_Paint(HWND hDlg)
-{
-    PAINTSTRUCT ps;
-    HFONT hOldFont;
-    RECT r;
-    HDC hdc;
-
-    BeginPaint(hDlg, &ps);
-    hdc = ps.hdc;
-    SetBkMode(hdc, TRANSPARENT);
-
-    GetClientRect(GetDlgItem(hDlg, IDD_MESSAGE), &r);
-    /* this will remap the rect to dialog coords */
-    MapWindowPoints(GetDlgItem(hDlg, IDD_MESSAGE), hDlg, (LPPOINT)&r, 2);
-    hOldFont = SelectObject(hdc, (HFONT)SendDlgItemMessageW(hDlg, IDD_MESSAGE, WM_GETFONT, 0, 0));
-    DrawTextW(hdc, GetPropW(hDlg, L"WINE_CONFIRM"), -1, &r, DT_NOPREFIX | DT_PATH_ELLIPSIS | DT_WORDBREAK);
-    SelectObject(hdc, hOldFont);
-    EndPaint(hDlg, &ps);
-    return TRUE;
-}
-
-static INT_PTR ConfirmMsgBox_Init(HWND hDlg, LPARAM lParam)
-{
-    struct confirm_msg_info *info = (struct confirm_msg_info *)lParam;
-    INT xPos, yOffset;
-    int width, height;
-    HFONT hOldFont;
-    HDC hdc;
-    RECT r;
-
-    SetWindowTextW(hDlg, info->lpszCaption);
-    ShowWindow(GetDlgItem(hDlg, IDD_MESSAGE), SW_HIDE);
-    SetPropW(hDlg, L"WINE_CONFIRM", info->lpszText);
-    SendDlgItemMessageW(hDlg, IDD_ICON, STM_SETICON, (WPARAM)info->hIcon, 0);
-
-    /* compute the text height and resize the dialog */
-    GetClientRect(GetDlgItem(hDlg, IDD_MESSAGE), &r);
-    hdc = GetDC(hDlg);
-    yOffset = r.bottom;
-    hOldFont = SelectObject(hdc, (HFONT)SendDlgItemMessageW(hDlg, IDD_MESSAGE, WM_GETFONT, 0, 0));
-    DrawTextW(hdc, info->lpszText, -1, &r, DT_NOPREFIX | DT_PATH_ELLIPSIS | DT_WORDBREAK | DT_CALCRECT);
-    SelectObject(hdc, hOldFont);
-    yOffset -= r.bottom;
-    yOffset = min(yOffset, 35);  /* don't make the dialog too small */
-    ReleaseDC(hDlg, hdc);
-
-    GetClientRect(hDlg, &r);
-    xPos = r.right - 7;
-    GetWindowRect(hDlg, &r);
-    width = r.right - r.left;
-    height = r.bottom - r.top - yOffset;
-    MoveWindow(hDlg, (GetSystemMetrics(SM_CXSCREEN) - width)/2,
-        (GetSystemMetrics(SM_CYSCREEN) - height)/2, width, height, FALSE);
-
-    confirm_msg_move_button(hDlg, IDCANCEL,     &xPos, yOffset, info->bYesToAll);
-    confirm_msg_move_button(hDlg, IDNO,         &xPos, yOffset, TRUE);
-    confirm_msg_move_button(hDlg, IDD_YESTOALL, &xPos, yOffset, info->bYesToAll);
-    confirm_msg_move_button(hDlg, IDYES,        &xPos, yOffset, TRUE);
-    return TRUE;
-}
-
-static INT_PTR CALLBACK ConfirmMsgBoxProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-    switch (uMsg)
-    {
-        case WM_INITDIALOG:
-            return ConfirmMsgBox_Init(hDlg, lParam);
-        case WM_PAINT:
-            return ConfirmMsgBox_Paint(hDlg);
-        case WM_COMMAND:
-            EndDialog(hDlg, wParam);
-            break;
-        case WM_CLOSE:
-            EndDialog(hDlg, IDCANCEL);
-            break;
-    }
-    return FALSE;
-}
-
-static int SHELL_ConfirmMsgBox(HWND hWnd, LPWSTR lpszText, LPWSTR lpszCaption, HICON hIcon, BOOL bYesToAll)
-{
-    struct confirm_msg_info info;
-
-    info.lpszText = lpszText;
-    info.lpszCaption = lpszCaption;
-    info.hIcon = hIcon;
-    info.bYesToAll = bYesToAll;
-    return DialogBoxParamW(shell32_hInstance, L"SHELL_YESTOALL_MSGBOX", hWnd, ConfirmMsgBoxProc, (LPARAM)&info);
-}
-
-/* confirmation dialogs content */
-typedef struct
-{
-        HINSTANCE hIconInstance;
-        UINT icon_resource_id;
-	UINT caption_resource_id, text_resource_id;
-} SHELL_ConfirmIDstruc;
-
-static BOOL SHELL_ConfirmIDs(int nKindOfDialog, SHELL_ConfirmIDstruc *ids)
-{
-        ids->hIconInstance = shell32_hInstance;
-	switch (nKindOfDialog) {
-	  case ASK_DELETE_FILE:
-            ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE;
-	    ids->caption_resource_id  = IDS_DELETEITEM_CAPTION;
-	    ids->text_resource_id  = IDS_DELETEITEM_TEXT;
-	    return TRUE;
-	  case ASK_DELETE_FOLDER:
-            ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE;
-	    ids->caption_resource_id  = IDS_DELETEFOLDER_CAPTION;
-	    ids->text_resource_id  = IDS_DELETEITEM_TEXT;
-	    return TRUE;
-	  case ASK_DELETE_MULTIPLE_ITEM:
-            ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE;
-	    ids->caption_resource_id  = IDS_DELETEITEM_CAPTION;
-	    ids->text_resource_id  = IDS_DELETEMULTIPLE_TEXT;
-	    return TRUE;
-          case ASK_TRASH_FILE:
-            ids->icon_resource_id = IDI_SHELL_TRASH_FILE;
-            ids->caption_resource_id = IDS_DELETEITEM_CAPTION;
-            ids->text_resource_id = IDS_TRASHITEM_TEXT;
-            return TRUE;
-          case ASK_TRASH_FOLDER:
-            ids->icon_resource_id = IDI_SHELL_TRASH_FILE;
-            ids->caption_resource_id = IDS_DELETEFOLDER_CAPTION;
-            ids->text_resource_id = IDS_TRASHFOLDER_TEXT;
-            return TRUE;
-          case ASK_TRASH_MULTIPLE_ITEM:
-            ids->icon_resource_id = IDI_SHELL_TRASH_FILE;
-            ids->caption_resource_id = IDS_DELETEITEM_CAPTION;
-            ids->text_resource_id = IDS_TRASHMULTIPLE_TEXT;
-            return TRUE;
-          case ASK_CANT_TRASH_ITEM:
-            ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE;
-            ids->caption_resource_id  = IDS_DELETEITEM_CAPTION;
-            ids->text_resource_id  = IDS_CANTTRASH_TEXT;
-            return TRUE;
-	  case ASK_DELETE_SELECTED:
-            ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE;
-            ids->caption_resource_id  = IDS_DELETEITEM_CAPTION;
-            ids->text_resource_id  = IDS_DELETESELECTED_TEXT;
-            return TRUE;
-	  case ASK_OVERWRITE_FILE:
-            ids->hIconInstance = NULL;
-            ids->icon_resource_id = (UINT)IDI_WARNING;
-	    ids->caption_resource_id  = IDS_OVERWRITEFILE_CAPTION;
-	    ids->text_resource_id  = IDS_OVERWRITEFILE_TEXT;
-            return TRUE;
-	  case ASK_OVERWRITE_FOLDER:
-            ids->hIconInstance = NULL;
-            ids->icon_resource_id = (UINT)IDI_WARNING;
-            ids->caption_resource_id  = IDS_OVERWRITEFILE_CAPTION;
-            ids->text_resource_id  = IDS_OVERWRITEFOLDER_TEXT;
-            return TRUE;
-	  default:
-	    FIXME(" Unhandled nKindOfDialog %d stub\n", nKindOfDialog);
-	}
-	return FALSE;
-}
-
-static BOOL SHELL_ConfirmDialogW(HWND hWnd, int nKindOfDialog, LPCWSTR szDir, FILE_OPERATION *op)
-{
-	WCHAR szCaption[255], szText[255], szBuffer[MAX_PATH + 256];
-	SHELL_ConfirmIDstruc ids;
-	DWORD_PTR args[1];
-	HICON hIcon;
-	int ret;
-
-        assert(nKindOfDialog >= 0 && nKindOfDialog < 32);
-        if (op && (op->dwYesToAllMask & (1 << nKindOfDialog)))
-            return TRUE;
-
-        if (!SHELL_ConfirmIDs(nKindOfDialog, &ids)) return FALSE;
-
-        LoadStringW(shell32_hInstance, ids.caption_resource_id, szCaption, ARRAY_SIZE(szCaption));
-        LoadStringW(shell32_hInstance, ids.text_resource_id, szText, ARRAY_SIZE(szText));
-
-        args[0] = (DWORD_PTR)szDir;
-        FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY,
-            szText, 0, 0, szBuffer, ARRAY_SIZE(szBuffer), (va_list*)args);
-
-        hIcon = LoadIconW(ids.hIconInstance, (LPWSTR)MAKEINTRESOURCE(ids.icon_resource_id));
-
-        ret = SHELL_ConfirmMsgBox(hWnd, szBuffer, szCaption, hIcon, op && op->bManyItems);
-        if (op) {
-            if (ret == IDD_YESTOALL) {
-                op->dwYesToAllMask |= (1 << nKindOfDialog);
-                ret = IDYES;
-            }
-            if (ret == IDCANCEL)
-                op->bCancelled = TRUE;
-            if (ret != IDYES)
-                op->req->fAnyOperationsAborted = TRUE;
-        }
-        return ret == IDYES;
-}
-
-BOOL SHELL_ConfirmYesNoW(HWND hWnd, int nKindOfDialog, LPCWSTR szDir)
-{
-    return SHELL_ConfirmDialogW(hWnd, nKindOfDialog, szDir, NULL);
-}
-
-static DWORD SHELL32_AnsiToUnicodeBuf(LPCSTR aPath, LPWSTR *wPath, DWORD minChars)
-{
-	DWORD len = MultiByteToWideChar(CP_ACP, 0, aPath, -1, NULL, 0);
-
-	if (len < minChars)
-	  len = minChars;
-
-	*wPath = malloc(len * sizeof(WCHAR));
-	if (*wPath)
-	{
-	  MultiByteToWideChar(CP_ACP, 0, aPath, -1, *wPath, len);
-	  return NO_ERROR;
-	}
-	return E_OUTOFMEMORY;
-}
-
-HRESULT WINAPI SHIsFileAvailableOffline(LPCWSTR path, LPDWORD status)
-{
-    FIXME("(%s, %p) stub\n", debugstr_w(path), status);
-    return E_FAIL;
-}
-
-/**************************************************************************
- * SHELL_DeleteDirectory()  [internal]
- *
- * Asks for confirmation when bShowUI is true and deletes the directory and
- * all its subdirectories and files if necessary.
- */
-static DWORD SHELL_DeleteDirectoryW(HWND hwnd, LPCWSTR pszDir, BOOL bShowUI)
-{
-    DWORD    ret = 0;
-    HANDLE  hFind;
-    WIN32_FIND_DATAW wfd;
-    WCHAR   szTemp[MAX_PATH];
-
-    PathCombineW(szTemp, pszDir, L"*");
-    hFind = FindFirstFileW(szTemp, &wfd);
-
-    if (hFind != INVALID_HANDLE_VALUE) {
-        if (!bShowUI || SHELL_ConfirmDialogW(hwnd, ASK_DELETE_FOLDER, pszDir, NULL)) {
-            do {
-                if (IsDotDir(wfd.cFileName))
-                    continue;
-                PathCombineW(szTemp, pszDir, wfd.cFileName);
-                if (FILE_ATTRIBUTE_DIRECTORY & wfd.dwFileAttributes)
-                    ret = SHELL_DeleteDirectoryW(hwnd, szTemp, FALSE);
-                else
-                    ret = SHNotifyDeleteFileW(szTemp);
-            } while (!ret && FindNextFileW(hFind, &wfd));
-        }
-        FindClose(hFind);
-    }
-    if (ret == ERROR_SUCCESS)
-        ret = SHNotifyRemoveDirectoryW(pszDir);
-
-    return ret == ERROR_PATH_NOT_FOUND ?
-        0x7C: /* DE_INVALIDFILES (legacy Windows error) */
-        ret;
-}
-
-/**********************************************************************/
-
-static DWORD SHNotifyCreateDirectoryW(LPCWSTR path, LPSECURITY_ATTRIBUTES sec)
-{
-	TRACE("(%s, %p)\n", debugstr_w(path), sec);
-
-	if (CreateDirectoryW(path, sec))
-	{
-	  SHChangeNotify(SHCNE_MKDIR, SHCNF_PATHW, path, NULL);
-	  return ERROR_SUCCESS;
-	}
-	return GetLastError();
-}
-
-/***********************************************************************/
-
-static DWORD SHNotifyRemoveDirectoryW(LPCWSTR path)
-{
-	BOOL ret;
-	TRACE("(%s)\n", debugstr_w(path));
-
-	ret = RemoveDirectoryW(path);
-	if (!ret)
-	{
-	  /* Directory may be write protected */
-	  DWORD dwAttr = GetFileAttributesW(path);
-	  if (IsAttrib(dwAttr, FILE_ATTRIBUTE_READONLY))
-	    if (SetFileAttributesW(path, dwAttr & ~FILE_ATTRIBUTE_READONLY))
-	      ret = RemoveDirectoryW(path);
-	}
-	if (ret)
-	{
-	  SHChangeNotify(SHCNE_RMDIR, SHCNF_PATHW, path, NULL);
-	  return ERROR_SUCCESS;
-	}
-	return GetLastError();
-}
-
-/***********************************************************************/
-
-static DWORD SHNotifyDeleteFileW(LPCWSTR path)
-{
-	BOOL ret;
-
-	TRACE("(%s)\n", debugstr_w(path));
-
-	ret = DeleteFileW(path);
-	if (!ret)
-	{
-	  /* File may be write protected or a system file */
-	  DWORD dwAttr = GetFileAttributesW(path);
-	  if (IsAttrib(dwAttr, FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_SYSTEM))
-	    if (SetFileAttributesW(path, dwAttr & ~(FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_SYSTEM)))
-	      ret = DeleteFileW(path);
-	}
-	if (ret)
-	{
-	  SHChangeNotify(SHCNE_DELETE, SHCNF_PATHW, path, NULL);
-	  return ERROR_SUCCESS;
-	}
-	return GetLastError();
-}
-
-/************************************************************************
- * SHNotifyMoveFile          [internal]
- *
- * Moves a file. Also triggers a change notify if one exists.
- *
- * PARAMS
- *  src        [I]   path to source file to move
- *  dest       [I]   path to target file to move to
- *
- * RETURNS
- *  ERROR_SUCCESS if successful
- */
-static DWORD SHNotifyMoveFileW(LPCWSTR src, LPCWSTR dest)
-{
-	BOOL ret;
-
-	TRACE("(%s %s)\n", debugstr_w(src), debugstr_w(dest));
-
-        ret = MoveFileExW(src, dest, MOVEFILE_REPLACE_EXISTING);
-
-        /* MOVEFILE_REPLACE_EXISTING fails with dirs, so try MoveFile */
-        if (!ret)
-            ret = MoveFileW(src, dest);
-
-	if (!ret)
-	{
-	  DWORD dwAttr;
-
-	  dwAttr = SHFindAttrW(dest, FALSE);
-	  if (INVALID_FILE_ATTRIBUTES == dwAttr)
-	  {
-	    /* Source file may be write protected or a system file */
-	    dwAttr = GetFileAttributesW(src);
-	    if (IsAttrib(dwAttr, FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_SYSTEM))
-	      if (SetFileAttributesW(src, dwAttr & ~(FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_SYSTEM)))
-	        ret = MoveFileW(src, dest);
-	  }
-	}
-	if (ret)
-	{
-	  SHChangeNotify(SHCNE_RENAMEITEM, SHCNF_PATHW, src, dest);
-	  return ERROR_SUCCESS;
-	}
-	return GetLastError();
-}
-
-/************************************************************************
- * SHNotifyCopyFile          [internal]
- *
- * Copies a file. Also triggers a change notify if one exists.
- *
- * PARAMS
- *  src           [I]   path to source file to move
- *  dest          [I]   path to target file to move to
- *  bFailIfExists [I]   if TRUE, the target file will not be overwritten if
- *                      a file with this name already exists
- *
- * RETURNS
- *  ERROR_SUCCESS if successful
- */
-static DWORD SHNotifyCopyFileW(LPCWSTR src, LPCWSTR dest, BOOL bFailIfExists)
-{
-	BOOL ret;
-	DWORD attribs;
-
-	TRACE("(%s %s %s)\n", debugstr_w(src), debugstr_w(dest), bFailIfExists ? "failIfExists" : "");
-
-        /* Destination file may already exist with read only attribute */
-        attribs = GetFileAttributesW(dest);
-        if (IsAttrib(attribs, FILE_ATTRIBUTE_READONLY))
-          SetFileAttributesW(dest, attribs & ~FILE_ATTRIBUTE_READONLY);
-
-	ret = CopyFileW(src, dest, bFailIfExists);
-	if (ret)
-	{
-	  SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, dest, NULL);
-	  return ERROR_SUCCESS;
-	}
-
-	return GetLastError();
-}
-
-
-/*************************************************************************
- * SHFindAttrW      [internal]
- *
- * Get the Attributes for a file or directory. The difference to GetAttributes()
- * is that this function will also work for paths containing wildcard characters
- * in its filename.
-
- * PARAMS
- *  path       [I]   path of directory or file to check
- *  fileOnly   [I]   TRUE if only files should be found
- *
- * RETURNS
- *  INVALID_FILE_ATTRIBUTES if the path does not exist, the actual attributes of
- *  the first file or directory found otherwise
- */
-static DWORD SHFindAttrW(LPCWSTR pName, BOOL fileOnly)
-{
-	WIN32_FIND_DATAW wfd;
-	BOOL b_FileMask = fileOnly && (NULL != StrPBrkW(pName, L"*?"));
-	DWORD dwAttr = INVALID_FILE_ATTRIBUTES;
-	HANDLE hFind = FindFirstFileW(pName, &wfd);
-
-	TRACE("%s %d\n", debugstr_w(pName), fileOnly);
-	if (INVALID_HANDLE_VALUE != hFind)
-	{
-	  do
-	  {
-	    if (b_FileMask && IsAttribDir(wfd.dwFileAttributes))
-	       continue;
-	    dwAttr = wfd.dwFileAttributes;
-	    break;
-	  }
-	  while (FindNextFileW(hFind, &wfd));
-	  FindClose(hFind);
-	}
-	return dwAttr;
-}
-
-/*************************************************************************
- *
- * SHNameTranslate HelperFunction for SHFileOperationA
- *
- * Translates a list of 0 terminated ANSI strings into Unicode. If *wString
- * is NULL, only the necessary size of the string is determined and returned,
- * otherwise the ANSI strings are copied into it and the buffer is increased
- * to point to the location after the final 0 termination char.
- */
-static DWORD SHNameTranslate(LPWSTR* wString, LPCWSTR* pWToFrom, BOOL more)
-{
-	DWORD size = 0, aSize = 0;
-	LPCSTR aString = (LPCSTR)*pWToFrom;
-
-	if (aString)
-	{
-	  do
-	  {
-	    size = lstrlenA(aString) + 1;
-	    aSize += size;
-	    aString += size;
-	  } while ((size != 1) && more);
-	  /* The two sizes might be different in the case of multibyte chars */
-	  size = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)*pWToFrom, aSize, *wString, 0);
-	  if (*wString) /* only in the second loop */
-	  {
-	    MultiByteToWideChar(CP_ACP, 0, (LPCSTR)*pWToFrom, aSize, *wString, size);
-	    *pWToFrom = *wString;
-	    *wString += size;
-	  }
-	}
-	return size;
-}
-
-#define ERROR_SHELL_INTERNAL_FILE_NOT_FOUND 1026
-
-typedef struct
-{
-    DWORD attributes;
-    LPWSTR szDirectory;
-    LPWSTR szFilename;
-    LPWSTR szFullPath;
-    BOOL bFromWildcard;
-    BOOL bFromRelative;
-    BOOL bExists;
-} FILE_ENTRY;
-
-typedef struct
-{
-    FILE_ENTRY *feFiles;
-    DWORD num_alloc;
-    DWORD dwNumFiles;
-    BOOL bAnyFromWildcard;
-    BOOL bAnyDirectories;
-    BOOL bAnyDontExist;
-} FILE_LIST;
-
-
-static inline void grow_list(FILE_LIST *list)
-{
-    FILE_ENTRY *new = (FILE_ENTRY *)HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, list->feFiles,
-                                  list->num_alloc * 2 * sizeof(*new) );
-    list->feFiles = new;
-    list->num_alloc *= 2;
-}
-
-/* adds a file to the FILE_ENTRY struct
- */
-static void add_file_to_entry(FILE_ENTRY *feFile, LPCWSTR szFile)
-{
-    DWORD dwLen = lstrlenW(szFile) + 1;
-    LPCWSTR ptr;
-
-    feFile->szFullPath = malloc(dwLen * sizeof(WCHAR));
-    lstrcpyW(feFile->szFullPath, szFile);
-
-    ptr = StrRChrW(szFile, NULL, '\\');
-    if (ptr)
-    {
-        dwLen = ptr - szFile + 1;
-        feFile->szDirectory = malloc(dwLen * sizeof(WCHAR));
-        lstrcpynW(feFile->szDirectory, szFile, dwLen);
-
-        dwLen = lstrlenW(feFile->szFullPath) - dwLen + 1;
-        feFile->szFilename = malloc(dwLen * sizeof(WCHAR));
-        lstrcpyW(feFile->szFilename, ptr + 1); /* skip over backslash */
-    }
-    feFile->bFromWildcard = FALSE;
-}
-
-static LPWSTR wildcard_to_file(LPCWSTR szWildCard, LPCWSTR szFileName)
-{
-    LPCWSTR ptr;
-    LPWSTR szFullPath;
-    DWORD dwDirLen, dwFullLen;
-
-    ptr = StrRChrW(szWildCard, NULL, '\\');
-    dwDirLen = ptr - szWildCard + 1;
-
-    dwFullLen = dwDirLen + lstrlenW(szFileName) + 1;
-    szFullPath = malloc(dwFullLen * sizeof(WCHAR));
-
-    lstrcpynW(szFullPath, szWildCard, dwDirLen + 1);
-    lstrcatW(szFullPath, szFileName);
-
-    return szFullPath;
-}
-
-static void parse_wildcard_files(FILE_LIST *flList, LPCWSTR szFile, LPDWORD pdwListIndex)
-{
-    WIN32_FIND_DATAW wfd;
-    HANDLE hFile = FindFirstFileW(szFile, &wfd);
-    FILE_ENTRY *file;
-    LPWSTR szFullPath;
-    BOOL res;
-
-    if (hFile == INVALID_HANDLE_VALUE) return;
-
-    for (res = TRUE; res; res = FindNextFileW(hFile, &wfd))
-    {
-        if (IsDotDir(wfd.cFileName)) continue;
-        if (*pdwListIndex >= flList->num_alloc) grow_list( flList );
-        szFullPath = wildcard_to_file(szFile, wfd.cFileName);
-        file = &flList->feFiles[(*pdwListIndex)++];
-        add_file_to_entry(file, szFullPath);
-        file->bFromWildcard = TRUE;
-        file->attributes = wfd.dwFileAttributes;
-        if (IsAttribDir(file->attributes)) flList->bAnyDirectories = TRUE;
-        free(szFullPath);
-    }
-
-    FindClose(hFile);
-}
-
-/* takes the null-separated file list and fills out the FILE_LIST */
-static HRESULT parse_file_list(FILE_LIST *flList, LPCWSTR szFiles)
-{
-    LPCWSTR ptr = szFiles;
-    WCHAR szCurFile[MAX_PATH];
-    WCHAR *p;
-    DWORD i = 0;
-
-    if (!szFiles)
-        return ERROR_INVALID_PARAMETER;
-
-    flList->bAnyFromWildcard = FALSE;
-    flList->bAnyDirectories = FALSE;
-    flList->bAnyDontExist = FALSE;
-    flList->num_alloc = 32;
-    flList->dwNumFiles = 0;
-
-    /* empty list */
-    if (!szFiles[0])
-        return ERROR_ACCESS_DENIED;
-
-    flList->feFiles = calloc(flList->num_alloc, sizeof(FILE_ENTRY));
-
-    while (*ptr)
-    {
-        if (i >= flList->num_alloc) grow_list( flList );
-
-        /* change relative to absolute path */
-        if (PathIsRelativeW(ptr))
-        {
-            GetCurrentDirectoryW(MAX_PATH, szCurFile);
-            PathCombineW(szCurFile, szCurFile, ptr);
-            flList->feFiles[i].bFromRelative = TRUE;
-        }
-        else
-        {
-            lstrcpyW(szCurFile, ptr);
-            flList->feFiles[i].bFromRelative = FALSE;
-        }
-
-        for (p = szCurFile; *p; p++) if (*p == '/') *p = '\\';
-
-        /* parse wildcard files if they are in the filename */
-        if (StrPBrkW(szCurFile, L"*?"))
-        {
-            parse_wildcard_files(flList, szCurFile, &i);
-            flList->bAnyFromWildcard = TRUE;
-            i--;
-        }
-        else
-        {
-            FILE_ENTRY *file = &flList->feFiles[i];
-            add_file_to_entry(file, szCurFile);
-            file->attributes = GetFileAttributesW( file->szFullPath );
-            file->bExists = (file->attributes != INVALID_FILE_ATTRIBUTES);
-            if (!file->bExists) flList->bAnyDontExist = TRUE;
-            if (IsAttribDir(file->attributes)) flList->bAnyDirectories = TRUE;
-        }
-
-        /* advance to the next string */
-        ptr += lstrlenW(ptr) + 1;
-        i++;
-    }
-    flList->dwNumFiles = i;
-
-    return S_OK;
-}
-
-/* free the FILE_LIST */
-static void destroy_file_list(FILE_LIST *flList)
-{
-    DWORD i;
-
-    if (!flList || !flList->feFiles)
-        return;
-
-    for (i = 0; i < flList->dwNumFiles; i++)
-    {
-        free(flList->feFiles[i].szDirectory);
-        free(flList->feFiles[i].szFilename);
-        free(flList->feFiles[i].szFullPath);
-    }
-
-    free(flList->feFiles);
-}
-
-static void copy_dir_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, LPCWSTR szDestPath)
-{
-    WCHAR szFrom[MAX_PATH], szTo[MAX_PATH];
-    SHFILEOPSTRUCTW fileOp;
-
-    if (IsDotDir(feFrom->szFilename))
-        return;
-
-    if (PathFileExistsW(szDestPath))
-        PathCombineW(szTo, szDestPath, feFrom->szFilename);
-    else
-        lstrcpyW(szTo, szDestPath);
-
-    if (!(op->req->fFlags & FOF_NOCONFIRMATION) && PathFileExistsW(szTo)) {
-        if (!SHELL_ConfirmDialogW(op->req->hwnd, ASK_OVERWRITE_FOLDER, feFrom->szFilename, op))
-        {
-            /* Vista returns an ERROR_CANCELLED even if user pressed "No" */
-            if (!op->bManyItems)
-                op->bCancelled = TRUE;
-            return;
-        }
-    }
-
-    szTo[lstrlenW(szTo) + 1] = '\0';
-    SHNotifyCreateDirectoryW(szTo, NULL);
-
-    PathCombineW(szFrom, feFrom->szFullPath, L"*.*");
-    szFrom[lstrlenW(szFrom) + 1] = '\0';
-
-    fileOp = *op->req;
-    fileOp.pFrom = szFrom;
-    fileOp.pTo = szTo;
-    fileOp.fFlags &= ~FOF_MULTIDESTFILES; /* we know we're copying to one dir */
-
-    /* Don't ask the user about overwriting files when he accepted to overwrite the
-       folder. FIXME: this is not exactly what Windows does - e.g. there would be
-       an additional confirmation for a nested folder */
-    fileOp.fFlags |= FOF_NOCONFIRMATION;  
-
-    SHFileOperationW(&fileOp);
-}
-
-static BOOL copy_file_to_file(FILE_OPERATION *op, const WCHAR *szFrom, const WCHAR *szTo)
-{
-    if (!(op->req->fFlags & FOF_NOCONFIRMATION) && PathFileExistsW(szTo))
-    {
-        if (!SHELL_ConfirmDialogW(op->req->hwnd, ASK_OVERWRITE_FILE, PathFindFileNameW(szTo), op))
-            return FALSE;
-    }
-
-    return SHNotifyCopyFileW(szFrom, szTo, FALSE) == 0;
-}
-
-/* copy a file or directory to another directory */
-static void copy_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, const FILE_ENTRY *feTo)
-{
-    if (!PathFileExistsW(feTo->szFullPath))
-        SHNotifyCreateDirectoryW(feTo->szFullPath, NULL);
-
-    if (IsAttribFile(feFrom->attributes))
-    {
-        WCHAR szDestPath[MAX_PATH];
-
-        PathCombineW(szDestPath, feTo->szFullPath, feFrom->szFilename);
-        copy_file_to_file(op, feFrom->szFullPath, szDestPath);
-    }
-    else if (!(op->req->fFlags & FOF_FILESONLY && feFrom->bFromWildcard))
-        copy_dir_to_dir(op, feFrom, feTo->szFullPath);
-}
-
-static void create_dest_dirs(LPCWSTR szDestDir)
-{
-    WCHAR dir[MAX_PATH];
-    LPCWSTR ptr = StrChrW(szDestDir, '\\');
-
-    /* make sure all directories up to last one are created */
-    while (ptr && (ptr = StrChrW(ptr + 1, '\\')))
-    {
-        lstrcpynW(dir, szDestDir, ptr - szDestDir + 1);
-
-        if (!PathFileExistsW(dir))
-            SHNotifyCreateDirectoryW(dir, NULL);
-    }
-
-    /* create last directory */
-    if (!PathFileExistsW(szDestDir))
-        SHNotifyCreateDirectoryW(szDestDir, NULL);
-}
-
-/* the FO_COPY operation */
-static int copy_files(FILE_OPERATION *op, const FILE_LIST *flFrom, FILE_LIST *flTo)
-{
-    DWORD i;
-    const FILE_ENTRY *entryToCopy;
-    const FILE_ENTRY *fileDest = &flTo->feFiles[0];
-
-    if (flFrom->bAnyDontExist)
-        return ERROR_SHELL_INTERNAL_FILE_NOT_FOUND;
-
-    if (flTo->dwNumFiles == 0)
-    {
-        /* If the destination is empty, SHFileOperation should use the current directory */
-        WCHAR curdir[MAX_PATH+1];
-
-        GetCurrentDirectoryW(MAX_PATH, curdir);
-        curdir[lstrlenW(curdir)+1] = 0;
-
-        destroy_file_list(flTo);
-        ZeroMemory(flTo, sizeof(FILE_LIST));
-        parse_file_list(flTo, curdir);
-        fileDest = &flTo->feFiles[0];
-    }
-
-    if (op->req->fFlags & FOF_MULTIDESTFILES && flTo->dwNumFiles > 1)
-    {
-        if (flFrom->bAnyFromWildcard)
-            return ERROR_CANCELLED;
-
-        if (flFrom->dwNumFiles != flTo->dwNumFiles)
-        {
-            if (flFrom->dwNumFiles != 1 && !IsAttribDir(fileDest->attributes))
-                return ERROR_CANCELLED;
-
-            /* Free all but the first entry. */
-            for (i = 1; i < flTo->dwNumFiles; i++)
-            {
-                free(flTo->feFiles[i].szDirectory);
-                free(flTo->feFiles[i].szFilename);
-                free(flTo->feFiles[i].szFullPath);
-            }
-
-            flTo->dwNumFiles = 1;
-        }
-        else if (IsAttribDir(fileDest->attributes))
-        {
-            for (i = 1; i < flTo->dwNumFiles; i++)
-                if (!IsAttribDir(flTo->feFiles[i].attributes) ||
-                    !IsAttribDir(flFrom->feFiles[i].attributes))
-                {
-                    return ERROR_CANCELLED;
-                }
-        }
-    }
-    else if (flFrom->dwNumFiles != 1)
-    {
-        if (flTo->dwNumFiles != 1 && !IsAttribDir(fileDest->attributes))
-            return ERROR_CANCELLED;
-
-        if (PathFileExistsW(fileDest->szFullPath) &&
-            IsAttribFile(fileDest->attributes))
-        {
-            return ERROR_CANCELLED;
-        }
-
-        if (flTo->dwNumFiles == 1 && fileDest->bFromRelative &&
-            !PathFileExistsW(fileDest->szFullPath))
-        {
-            return ERROR_CANCELLED;
-        }
-    }
-
-    for (i = 0; i < flFrom->dwNumFiles; i++)
-    {
-        entryToCopy = &flFrom->feFiles[i];
-
-        if ((op->req->fFlags & FOF_MULTIDESTFILES) &&
-            flTo->dwNumFiles > 1)
-        {
-            fileDest = &flTo->feFiles[i];
-        }
-
-        if (IsAttribDir(entryToCopy->attributes) &&
-            !lstrcmpiW(entryToCopy->szFullPath, fileDest->szDirectory))
-        {
-            return ERROR_SUCCESS;
-        }
-
-        create_dest_dirs(fileDest->szDirectory);
-
-        if (!lstrcmpiW(entryToCopy->szFullPath, fileDest->szFullPath))
-        {
-            if (IsAttribFile(entryToCopy->attributes))
-                return ERROR_NO_MORE_SEARCH_HANDLES;
-            else
-                return ERROR_SUCCESS;
-        }
-
-        if ((flFrom->dwNumFiles > 1 && flTo->dwNumFiles == 1) ||
-            IsAttribDir(fileDest->attributes))
-        {
-            copy_to_dir(op, entryToCopy, fileDest);
-        }
-        else if (IsAttribDir(entryToCopy->attributes))
-        {
-            copy_dir_to_dir(op, entryToCopy, fileDest->szFullPath);
-        }
-        else
-        {
-            if (!copy_file_to_file(op, entryToCopy->szFullPath, fileDest->szFullPath))
-            {
-                op->req->fAnyOperationsAborted = TRUE;
-                return ERROR_CANCELLED;
-            }
-        }
-
-        /* Vista return code. XP would return e.g. ERROR_FILE_NOT_FOUND, ERROR_ALREADY_EXISTS */
-        if (op->bCancelled)
-            return ERROR_CANCELLED;
-    }
-
-    /* Vista return code. On XP if the used pressed "No" for the last item,
-     * ERROR_ARENA_TRASHED would be returned */
-    return ERROR_SUCCESS;
-}
-
-static BOOL confirm_delete_list(HWND hWnd, DWORD fFlags, BOOL fTrash, const FILE_LIST *flFrom)
-{
-    if (flFrom->dwNumFiles > 1)
-    {
-        WCHAR tmp[12];
-
-        swprintf(tmp, L"%d", flFrom->dwNumFiles);
-        return SHELL_ConfirmDialogW(hWnd, (fTrash?ASK_TRASH_MULTIPLE_ITEM:ASK_DELETE_MULTIPLE_ITEM), tmp, NULL);
-    }
-    else
-    {
-        const FILE_ENTRY *fileEntry = &flFrom->feFiles[0];
-
-        if (IsAttribFile(fileEntry->attributes))
-            return SHELL_ConfirmDialogW(hWnd, (fTrash?ASK_TRASH_FILE:ASK_DELETE_FILE), fileEntry->szFullPath, NULL);
-        else if (!(fFlags & FOF_FILESONLY && fileEntry->bFromWildcard))
-            return SHELL_ConfirmDialogW(hWnd, (fTrash?ASK_TRASH_FOLDER:ASK_DELETE_FOLDER), fileEntry->szFullPath, NULL);
-    }
-    return TRUE;
-}
-
-/* the FO_DELETE operation */
-static int delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom)
-{
-    const FILE_ENTRY *fileEntry;
-    DWORD i;
-    int ret;
-    BOOL bTrash;
-
-    if (!flFrom->dwNumFiles)
-        return ERROR_SUCCESS;
-
-    /* Windows also checks only the first item */
-    bTrash = (lpFileOp->fFlags & FOF_ALLOWUNDO);
-    //bTrash = (lpFileOp->fFlags & FOF_ALLOWUNDO) && is_trash_available();
-
-    if (!(lpFileOp->fFlags & FOF_NOCONFIRMATION) || (!bTrash && lpFileOp->fFlags & FOF_WANTNUKEWARNING))
-        if (!confirm_delete_list(lpFileOp->hwnd, lpFileOp->fFlags, bTrash, flFrom))
-        {
-            lpFileOp->fAnyOperationsAborted = TRUE;
-            return 0;
-        }
-
-    for (i = 0; i < flFrom->dwNumFiles; i++)
-    {
-        fileEntry = &flFrom->feFiles[i];
-
-        if (!IsAttribFile(fileEntry->attributes) &&
-            (lpFileOp->fFlags & FOF_FILESONLY && fileEntry->bFromWildcard))
-            continue;
-
-        if (bTrash)
-        {
-            BOOL bDelete;
-            // if (trash_file(fileEntry->szFullPath))
-                // continue;
-
-            /* Note: Windows silently deletes the file in such a situation, we show a dialog */
-            if (!(lpFileOp->fFlags & FOF_NOCONFIRMATION) || (lpFileOp->fFlags & FOF_WANTNUKEWARNING))
-                bDelete = SHELL_ConfirmDialogW(lpFileOp->hwnd, ASK_CANT_TRASH_ITEM, fileEntry->szFullPath, NULL);
-            else
-                bDelete = TRUE;
-
-            if (!bDelete)
-            {
-                lpFileOp->fAnyOperationsAborted = TRUE;
-                break;
-            }
-        }
-        
-        /* delete the file or directory */
-        if (IsAttribFile(fileEntry->attributes))
-            ret = DeleteFileW(fileEntry->szFullPath) ?
-                    ERROR_SUCCESS : GetLastError();
-        else
-            ret = SHELL_DeleteDirectoryW(lpFileOp->hwnd, fileEntry->szFullPath, FALSE);
-
-        if (ret)
-            return ret;
-    }
-
-    return ERROR_SUCCESS;
-}
-
-/* moves a file or directory to another directory */
-static void move_to_dir(LPSHFILEOPSTRUCTW lpFileOp, const FILE_ENTRY *feFrom, const FILE_ENTRY *feTo)
-{
-    WCHAR szDestPath[MAX_PATH];
-
-    PathCombineW(szDestPath, feTo->szFullPath, feFrom->szFilename);
-    SHNotifyMoveFileW(feFrom->szFullPath, szDestPath);
-}
-
-/* the FO_MOVE operation */
-static int move_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const FILE_LIST *flTo)
-{
-    DWORD i;
-    INT mismatched = 0;
-    const FILE_ENTRY *entryToMove;
-    const FILE_ENTRY *fileDest;
-
-    if (!flFrom->dwNumFiles)
-        return ERROR_SUCCESS;
-
-    if (!flTo->dwNumFiles)
-        return ERROR_FILE_NOT_FOUND;
-
-    if (!(lpFileOp->fFlags & FOF_MULTIDESTFILES) &&
-        flTo->dwNumFiles > 1 && flFrom->dwNumFiles > 1)
-    {
-        return ERROR_CANCELLED;
-    }
-
-    if (!(lpFileOp->fFlags & FOF_MULTIDESTFILES) &&
-        !flFrom->bAnyDirectories &&
-        flFrom->dwNumFiles > flTo->dwNumFiles)
-    {
-        return ERROR_CANCELLED;
-    }
-
-    if (!PathFileExistsW(flTo->feFiles[0].szDirectory))
-        return ERROR_CANCELLED;
-
-    if (lpFileOp->fFlags & FOF_MULTIDESTFILES)
-        mismatched = flFrom->dwNumFiles - flTo->dwNumFiles;
-
-    fileDest = &flTo->feFiles[0];
-    for (i = 0; i < flFrom->dwNumFiles; i++)
-    {
-        entryToMove = &flFrom->feFiles[i];
-
-        if (!PathFileExistsW(fileDest->szDirectory))
-            return ERROR_CANCELLED;
-
-        if (lpFileOp->fFlags & FOF_MULTIDESTFILES)
-        {
-            if (i >= flTo->dwNumFiles)
-                break;
-            fileDest = &flTo->feFiles[i];
-            if (mismatched && !fileDest->bExists)
-            {
-                create_dest_dirs(flTo->feFiles[i].szFullPath);
-                flTo->feFiles[i].bExists = TRUE;
-                flTo->feFiles[i].attributes = FILE_ATTRIBUTE_DIRECTORY;
-            }
-        }
-
-        if (fileDest->bExists && IsAttribDir(fileDest->attributes))
-            move_to_dir(lpFileOp, entryToMove, fileDest);
-        else
-            SHNotifyMoveFileW(entryToMove->szFullPath, fileDest->szFullPath);
-    }
-
-    if (mismatched > 0)
-    {
-        if (flFrom->bAnyDirectories)
-            return DE_DESTSAMETREE;
-        else
-            return DE_SAMEFILE;
-    }
-
-    return ERROR_SUCCESS;
-}
-
-/* the FO_RENAME files */
-static int rename_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const FILE_LIST *flTo)
-{
-    const FILE_ENTRY *feFrom;
-    const FILE_ENTRY *feTo;
-
-    if (flFrom->dwNumFiles != 1)
-        return ERROR_GEN_FAILURE;
-
-    if (flTo->dwNumFiles != 1)
-        return ERROR_CANCELLED;
-
-    feFrom = &flFrom->feFiles[0];
-    feTo= &flTo->feFiles[0];
-
-    /* fail if destination doesn't exist */
-    if (!feFrom->bExists)
-        return ERROR_SHELL_INTERNAL_FILE_NOT_FOUND;
-
-    /* fail if destination already exists */
-    if (feTo->bExists)
-        return ERROR_ALREADY_EXISTS;
-
-    return SHNotifyMoveFileW(feFrom->szFullPath, feTo->szFullPath);
-}
-
-/* alert the user if an unsupported flag is used */
-static void check_flags(FILEOP_FLAGS fFlags)
-{
-    WORD wUnsupportedFlags = FOF_NO_CONNECTED_ELEMENTS |
-        FOF_NOCOPYSECURITYATTRIBS | FOF_NORECURSEREPARSE |
-        FOF_RENAMEONCOLLISION | FOF_WANTMAPPINGHANDLE;
-
-    if (fFlags & wUnsupportedFlags)
-        FIXME("Unsupported flags: %04x\n", fFlags);
-}
-
-/*************************************************************************
- * SHFileOperationW          [SHELL32.@]
- *
- * See SHFileOperationA
- */
-int WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW lpFileOp)
-{
-    FILE_OPERATION op;
-    FILE_LIST flFrom, flTo;
-    int ret = 0;
-
-    if (!lpFileOp)
-        return ERROR_INVALID_PARAMETER;
-
-    check_flags(lpFileOp->fFlags);
-
-    ZeroMemory(&flFrom, sizeof(FILE_LIST));
-    ZeroMemory(&flTo, sizeof(FILE_LIST));
-
-    if ((ret = parse_file_list(&flFrom, lpFileOp->pFrom)))
-        return ret;
-
-    if (lpFileOp->wFunc != FO_DELETE)
-        parse_file_list(&flTo, lpFileOp->pTo);
-
-    ZeroMemory(&op, sizeof(op));
-    op.req = lpFileOp;
-    op.bManyItems = (flFrom.dwNumFiles > 1);
-    lpFileOp->fAnyOperationsAborted = FALSE;
-
-    switch (lpFileOp->wFunc)
-    {
-        case FO_COPY:
-            ret = copy_files(&op, &flFrom, &flTo);
-            break;
-        case FO_DELETE:
-            ret = delete_files(lpFileOp, &flFrom);
-            break;
-        case FO_MOVE:
-            ret = move_files(lpFileOp, &flFrom, &flTo);
-            break;
-        case FO_RENAME:
-            ret = rename_files(lpFileOp, &flFrom, &flTo);
-            break;
-        default:
-            ret = ERROR_INVALID_PARAMETER;
-            break;
-    }
-
-    destroy_file_list(&flFrom);
-
-    if (lpFileOp->wFunc != FO_DELETE)
-        destroy_file_list(&flTo);
-
-    if (ret == ERROR_CANCELLED)
-        lpFileOp->fAnyOperationsAborted = TRUE;
-
-    SetLastError(ERROR_SUCCESS);
-    return ret;
-}
-
 struct file_operation
 {
     IFileOperation IFileOperation_iface;
     LONG ref;
 	SHFILEOPSTRUCTW fileOperation;
 	DWORD operationFlags;
-	UINT operation;
 	DWORD fileAttributes;
 	BOOL aborted;
+	DWORD flags;
+	DWORD cookie;
 	IFileOperationProgressSink *sink;
 };
 
@@ -1274,7 +80,7 @@ static HRESULT WINAPI file_operation_QueryInterface(IFileOperation *iface, REFII
 {
     struct file_operation *operation = impl_from_IFileOperation(iface);
 
-    TRACE("(%p, %s, %p).\n", iface, debugstr_guid(riid), out);
+    DbgPrint("(%p, %s, %p).\n", iface, debugstr_guid(riid), out);
 
     if (IsEqualIID(&IID_IFileOperation, riid) ||
         IsEqualIID(&IID_IUnknown, riid))
@@ -1295,7 +101,7 @@ static ULONG WINAPI file_operation_AddRef(IFileOperation *iface)
     struct file_operation *operation = impl_from_IFileOperation(iface);
     ULONG ref = InterlockedIncrement(&operation->ref);
 
-    TRACE("(%p): ref=%lu.\n", iface, ref);
+    DbgPrint("(%p): ref=%lu.\n", iface, ref);
 
     return ref;
 }
@@ -1305,7 +111,7 @@ static ULONG WINAPI file_operation_Release(IFileOperation *iface)
     struct file_operation *operation = impl_from_IFileOperation(iface);
     ULONG ref = InterlockedDecrement(&operation->ref);
 
-    TRACE("(%p): ref=%lu.\n", iface, ref);
+    DbgPrint("(%p): ref=%lu.\n", iface, ref);
 
     if (!ref)
     {
@@ -1317,24 +123,31 @@ static ULONG WINAPI file_operation_Release(IFileOperation *iface)
 
 static HRESULT WINAPI file_operation_Advise(IFileOperation *iface, IFileOperationProgressSink *sink, DWORD *cookie)
 {
-	// struct file_operation *operation = impl_from_IFileOperation(iface);
+	struct file_operation *operation = impl_from_IFileOperation(iface);
     FIXME("(%p, %p, %p): stub.\n", iface, sink, cookie);
+	
+	*cookie = operation->cookie;
 
     return S_OK;
 }
 
 static HRESULT WINAPI file_operation_Unadvise(IFileOperation *iface, DWORD cookie)
 {
-	// struct file_operation *operation = impl_from_IFileOperation(iface);
+	struct file_operation *operation = impl_from_IFileOperation(iface);
     FIXME("(%p, %lx): stub.\n", iface, cookie);
+	
+	operation->cookie = cookie;
 
     return S_OK;
 }
 
 static HRESULT WINAPI file_operation_SetOperationFlags(IFileOperation *iface, DWORD flags)
 {
-	// struct file_operation *operation = impl_from_IFileOperation(iface);
-    FIXME("(%p, %lx): stub.\n", iface, flags);
+	struct file_operation *operation = impl_from_IFileOperation(iface);
+    //FIXME("(%p, %lx): stub.\n", iface, flags);
+	DbgPrint("IFileOperation::SetOperationFlags called\n");
+	
+	operation->flags = flags;
 
     return S_OK;
 }
@@ -1367,6 +180,8 @@ static HRESULT WINAPI file_operation_SetOwnerWindow(IFileOperation *iface, HWND
 {
 	struct file_operation *operation = impl_from_IFileOperation(iface);
 	
+	DbgPrint("IFileOperation::SetOwnerWindow called\n");
+	
 	operation->fileOperation.hwnd = owner;
     FIXME("(%p, %p): stub.\n", iface, owner);
 
@@ -1375,6 +190,7 @@ static HRESULT WINAPI file_operation_SetOwnerWindow(IFileOperation *iface, HWND
 
 static HRESULT WINAPI file_operation_ApplyPropertiesToItem(IFileOperation *iface, IShellItem *item)
 {
+	DbgPrint("IFileOperation::ApplyPropertiesToItem called\n");
 	// struct file_operation *operation = impl_from_IFileOperation(iface);
     FIXME("(%p, %p): stub.\n", iface, item);
 
@@ -1383,59 +199,82 @@ static HRESULT WINAPI file_operation_ApplyPropertiesToItem(IFileOperation *iface
 
 static HRESULT WINAPI file_operation_ApplyPropertiesToItems(IFileOperation *iface, IUnknown *items)
 {
+	DbgPrint("IFileOperation::ApplyPropertiesToItems called\n");
 	// struct file_operation *operation = impl_from_IFileOperation(iface);
     FIXME("(%p, %p): stub.\n", iface, items);
 
     return S_OK;
 }
 
-static HRESULT WINAPI file_operation_RenameItem(IFileOperation *iface, IShellItem *item, LPCWSTR name,
-        IFileOperationProgressSink *sink)
-{
-    struct file_operation *operation = impl_from_IFileOperation(iface);
+int 
+configureAndDoFileOperation(
+	SHFILEOPSTRUCTW fileOperation,
+	IShellItem *item, 
+	IShellItem *folder, 
+	LPCWSTR name, 
+	UINT operation,
+	DWORD flags
+){
     LPWSTR srcBuffer;
     LPWSTR dstBuffer;
-	int resp;
+	WCHAR wszFrom[MAX_PATH] = { 0 };
+	WCHAR wszTo[MAX_PATH] = { 0 };
     
-    srcBuffer = (LPWSTR)HeapAlloc(GetProcessHeap(), 8, MAX_PATH * 2);
-    if (!srcBuffer)
-        return E_OUTOFMEMORY;
-    dstBuffer = (LPWSTR)HeapAlloc(GetProcessHeap(), 8, MAX_PATH * 2);
-    if (!dstBuffer) {
-        HeapFree(GetProcessHeap(), 0, srcBuffer);
-        return E_OUTOFMEMORY;
-    }
-
+	//Get Source path and destination Path(without filename)
     IShellItem2_GetDisplayName(item, SIGDN_FILESYSPATH, &srcBuffer);
+	//Copy source and destination buffers to posterior copy memory
+	StrCpyW(wszFrom, srcBuffer);	
+	//Concat \0\0 to end of strings by CopyMemory
+	CopyMemory(wszFrom + lstrlenW(wszFrom), "\0\0", 2);		
+	if(folder && name){
+		IShellItem2_GetDisplayName(folder, SIGDN_FILESYSPATH, &dstBuffer);
+		//Concat '\\' to path destination and filename too
+		wcscat(dstBuffer, L"\\");	
+		wcscat(dstBuffer, name);
+		//Copy current source and destination buffers to posterior copy memory
+		StrCpyW(wszTo, dstBuffer);
+		CopyMemory(wszTo + lstrlenW(wszTo), "\0\0", 2);	
+	}	
+	//Fill fileOperation structure
+    fileOperation.wFunc = operation;
+    fileOperation.fFlags = flags;
+    fileOperation.pFrom = wszFrom;
+    fileOperation.pTo =  wszTo;
+	
+	return SHFileOperationW(&fileOperation);
+}
 
-    operation->fileOperation.wFunc = FO_RENAME;
-    operation->fileOperation.fFlags = FOF_SILENT | FOF_NOCONFIRMATION | FOF_NOERRORUI |
-                     FOF_NOCONFIRMMKDIR | FOF_NOCOPYSECURITYATTRIBS;
-
-	// StringCchCatW(dstBuffer, wcslen(srcBuffer) + 1, L"\\");
-	// StringCchCatW(dstBuffer, wcslen(srcBuffer) + wcslen(name) + 1, name);
-    operation->fileOperation.pFrom = srcBuffer;
-    operation->fileOperation.pTo = name;
+static HRESULT WINAPI file_operation_RenameItem(IFileOperation *iface, IShellItem *item, LPCWSTR name,
+        IFileOperationProgressSink *sink)
+{
+    struct file_operation *operation = impl_from_IFileOperation(iface);
+	DWORD flags = FOF_MULTIDESTFILES          |
+                  FOF_NOCONFIRMATION          |
+                  FOF_NOCONFIRMMKDIR          |
+                  FOF_NOCOPYSECURITYATTRIBS   |
+                  FOF_NOERRORUI               |
+                  FOF_RENAMEONCOLLISION;
+	int resp;
 
-    operation->operation = FO_RENAME;
     operation->sink = sink;
-    IFileOperationProgressSink_FinishOperations(sink, S_OK);
-	
-	resp = SHFileOperationW(&operation->fileOperation);
+	resp = configureAndDoFileOperation(operation->fileOperation, item, NULL, name, FO_RENAME, flags);
+	IFileOperationProgressSink_FinishOperations(sink, S_OK);
+	DbgPrint("IFileOperation::MoveItem:SHFileOperationW: (%d)\n", resp);
 	operation->aborted = FALSE;		
-    FIXME("(%p, %p, %s, %p): stub.\n", iface, item, debugstr_w(name), sink);
 
-    return S_OK;
+    FIXME("(%p, %p, %s, %p): stub.\n", iface, item, debugstr_w(name), sink);
+	
+	return S_OK;
 }
 
 static HRESULT WINAPI file_operation_RenameItems(IFileOperation *iface, IUnknown *items, LPCWSTR name)
 {
-	struct file_operation *operation = impl_from_IFileOperation(iface);
-	operation->fileOperation.wFunc = FO_RENAME;
-	operation->fileOperation.fFlags = FOF_MULTIDESTFILES;
-	operation->operation = FO_RENAME;
+	DbgPrint("IFileOperation::RenameItems called\n");
+	// struct file_operation *operation = impl_from_IFileOperation(iface);
+	// operation->fileOperation.wFunc = FO_RENAME;
+	// operation->fileOperation.fFlags = FOF_MULTIDESTFILES;
 	
-    FIXME("(%p, %p, %s): stub.\n", iface, items, debugstr_w(name));
+    // FIXME("(%p, %p, %s): stub.\n", iface, items, debugstr_w(name));
 
     return S_OK;
 }
@@ -1444,36 +283,18 @@ static HRESULT WINAPI file_operation_MoveItem(IFileOperation *iface, IShellItem
         LPCWSTR name, IFileOperationProgressSink *sink)
 {
     struct file_operation *operation = impl_from_IFileOperation(iface);
-    LPWSTR srcBuffer;
-    LPWSTR dstBuffer;
+	DWORD flags = FOF_MULTIDESTFILES          |
+                  FOF_NOCONFIRMATION          |
+                  FOF_NOCONFIRMMKDIR          |
+                  FOF_NOCOPYSECURITYATTRIBS   |
+                  FOF_NOERRORUI               |
+                  FOF_RENAMEONCOLLISION;
 	int resp;
-    
-    srcBuffer = (LPWSTR)HeapAlloc(GetProcessHeap(), 8, MAX_PATH * 2);
-    if (!srcBuffer)
-        return E_OUTOFMEMORY;
-    dstBuffer = (LPWSTR)HeapAlloc(GetProcessHeap(), 8, MAX_PATH * 2);
-    if (!dstBuffer) {
-        HeapFree(GetProcessHeap(), 0, srcBuffer);
-        return E_OUTOFMEMORY;
-    }
-
-    IShellItem2_GetDisplayName(item, SIGDN_FILESYSPATH, &srcBuffer);
-    IShellItem2_GetDisplayName(folder, SIGDN_FILESYSPATH, &dstBuffer);
 
-    operation->fileOperation.wFunc = FO_MOVE;
-    operation->fileOperation.fFlags = FOF_SILENT | FOF_NOCONFIRMATION | FOF_NOERRORUI |
-                     FOF_NOCONFIRMMKDIR | FOF_NOCOPYSECURITYATTRIBS;
-
-	StringCchCatW(dstBuffer, wcslen(srcBuffer) + 1, L"\\");
-	StringCchCatW(dstBuffer, wcslen(srcBuffer) + wcslen(name) + 1, name);
-    operation->fileOperation.pFrom = srcBuffer;
-    operation->fileOperation.pTo =    dstBuffer;
-
-    operation->operation = FO_MOVE;
     operation->sink = sink;
-    IFileOperationProgressSink_FinishOperations(sink, S_OK);
-	
-	resp = SHFileOperationW(&operation->fileOperation);
+	resp = configureAndDoFileOperation(operation->fileOperation, item, folder, name, FO_MOVE, flags);
+	IFileOperationProgressSink_FinishOperations(sink, S_OK);
+	DbgPrint("IFileOperation::MoveItem:SHFileOperationW: (%d)\n", resp);
 	operation->aborted = FALSE;		
 
     FIXME("(%p, %p, %p, %s, %p): stub.\n", iface, item, folder, debugstr_w(name), sink);
@@ -1483,64 +304,51 @@ static HRESULT WINAPI file_operation_MoveItem(IFileOperation *iface, IShellItem
 
 static HRESULT WINAPI file_operation_MoveItems(IFileOperation *iface, IUnknown *items, IShellItem *folder)
 {
-	struct file_operation *operation = impl_from_IFileOperation(iface);
-	operation->fileOperation.wFunc = FO_MOVE;
-	operation->fileOperation.fFlags = FOF_MULTIDESTFILES;
-	operation->operation = FO_MOVE;
+	DbgPrint("IFileOperation::MoveItems called\n");
+	// struct file_operation *operation = impl_from_IFileOperation(iface);
+	// operation->fileOperation.wFunc = FO_MOVE;
+	// operation->fileOperation.fFlags = FOF_MULTIDESTFILES;
+	// operation->operation = FO_MOVE;
 	
-    FIXME("(%p, %p, %p): stub.\n", iface, items, folder);
+    // FIXME("(%p, %p, %p): stub.\n", iface, items, folder);
 
     return S_OK;
 }
 
 static HRESULT WINAPI file_operation_CopyItem(IFileOperation *iface, IShellItem *item, IShellItem *folder,
         LPCWSTR name, IFileOperationProgressSink *sink)
-{
+{	
     struct file_operation *operation = impl_from_IFileOperation(iface);
-    LPWSTR srcBuffer;
-    LPWSTR dstBuffer;
-    
-    srcBuffer = (LPWSTR)HeapAlloc(GetProcessHeap(), 8, MAX_PATH * 2);
-    if (!srcBuffer)
-        return E_OUTOFMEMORY;
-    dstBuffer = (LPWSTR)HeapAlloc(GetProcessHeap(), 8, MAX_PATH * 2);
-    if (!dstBuffer) {
-        HeapFree(GetProcessHeap(), 0, srcBuffer);
-        return E_OUTOFMEMORY;
-    }
-
-    IShellItem2_GetDisplayName(item, SIGDN_FILESYSPATH, &srcBuffer);
-    IShellItem2_GetDisplayName(folder, SIGDN_FILESYSPATH, &dstBuffer);
-
-    operation->fileOperation.wFunc = FO_COPY;
-    operation->fileOperation.fFlags = FOF_SILENT | FOF_NOCONFIRMATION | FOF_NOERRORUI |
-                     FOF_NOCONFIRMMKDIR | FOF_NOCOPYSECURITYATTRIBS;
-
-	StringCchCatW(dstBuffer, wcslen(srcBuffer) + 1, L"\\");
-	StringCchCatW(dstBuffer, wcslen(srcBuffer) + wcslen(name) + 1, name);
-    operation->fileOperation.pFrom = srcBuffer;
-    operation->fileOperation.pTo =    dstBuffer;
+	DWORD flags = FOF_MULTIDESTFILES          |
+                  FOF_NOCONFIRMATION          |
+                  FOF_NOCONFIRMMKDIR          |
+                  FOF_NOCOPYSECURITYATTRIBS   |
+                  FOF_NOERRORUI               |
+                  FOF_RENAMEONCOLLISION;
+	int resp;
+	
+	DbgPrint("IFileOperation::CopyItem called\n");
 
-    operation->operation = FO_MOVE;
     operation->sink = sink;
-    IFileOperationProgressSink_FinishOperations(sink, S_OK);
-	
-	SHFileOperationW(&operation->fileOperation);
+	resp = configureAndDoFileOperation(operation->fileOperation, item, folder, name, FO_COPY, flags);
+	IFileOperationProgressSink_FinishOperations(sink, S_OK);
+	DbgPrint("IFileOperation::CopyItem:SHFileOperationW: (%d)\n", resp);
 	operation->aborted = FALSE;		
-	
-    FIXME("(%p, %p, %p, %s, %p): stub.\n", iface, item, folder, debugstr_w(name), sink);
 
+    FIXME("(%p, %p, %p, %s, %p): stub.\n", iface, item, folder, debugstr_w(name), sink);
+    
     return S_OK;
 }
 
 static HRESULT WINAPI file_operation_CopyItems(IFileOperation *iface, IUnknown *items, IShellItem *folder)
 {
-	struct file_operation *operation = impl_from_IFileOperation(iface);
-	operation->fileOperation.wFunc = FO_COPY;
-	operation->operation = FO_COPY;
-	operation->fileOperation.fFlags = FOF_NOCONFIRMMKDIR;
+	DbgPrint("IFileOperation::CopyItems called\n");
+	// struct file_operation *operation = impl_from_IFileOperation(iface);
+	// operation->fileOperation.wFunc = FO_COPY;
+	// operation->operation = FO_COPY;
+	// operation->fileOperation.fFlags = FOF_NOCONFIRMMKDIR;
 	
-    FIXME("(%p, %p, %p): stub.\n", iface, items, folder);
+    // FIXME("(%p, %p, %p): stub.\n", iface, items, folder);
 
     return S_OK;
 }
@@ -1548,23 +356,37 @@ static HRESULT WINAPI file_operation_CopyItems(IFileOperation *iface, IUnknown *
 static HRESULT WINAPI file_operation_DeleteItem(IFileOperation *iface, IShellItem *item,
         IFileOperationProgressSink *sink)
 {
-	struct file_operation *operation = impl_from_IFileOperation(iface);
-	operation->fileOperation.wFunc = FO_DELETE;
-	operation->operation = FO_DELETE;
+    struct file_operation *operation = impl_from_IFileOperation(iface);
+	DWORD flags = FOF_MULTIDESTFILES          |
+                  FOF_NOCONFIRMATION          |
+                  FOF_NOCONFIRMMKDIR          |
+                  FOF_NOCOPYSECURITYATTRIBS   |
+                  FOF_NOERRORUI               |
+                  FOF_RENAMEONCOLLISION;
+	int resp;
 	
-    FIXME("(%p, %p, %p): stub.\n", iface, item, sink);
+	DbgPrint("IFileOperation::DeleteItem called\n");
 
+    operation->sink = sink;
+	resp = configureAndDoFileOperation(operation->fileOperation, item, NULL, NULL, FO_DELETE, flags);
+	IFileOperationProgressSink_FinishOperations(sink, S_OK);
+	DbgPrint("IFileOperation::DeleteItem:SHFileOperationW: (%d)\n", resp);
+	operation->aborted = FALSE;		
+
+    FIXME("(%p, %p, %p): stub.\n", iface, item, sink);
+    
     return S_OK;
 }
 
 static HRESULT WINAPI file_operation_DeleteItems(IFileOperation *iface, IUnknown *items)
 {
-	struct file_operation *operation = impl_from_IFileOperation(iface);
-	operation->fileOperation.wFunc = FO_DELETE;
-	operation->fileOperation.fFlags = FOF_MULTIDESTFILES;
-	operation->operation = FO_DELETE;
+	DbgPrint("IFileOperation::DeleteItems called\n");
+	// struct file_operation *operation = impl_from_IFileOperation(iface);
+	// operation->fileOperation.wFunc = FO_DELETE;
+	// operation->fileOperation.fFlags = FOF_MULTIDESTFILES;
+	// operation->operation = FO_DELETE;
 	
-    FIXME("(%p, %p): stub.\n", iface, items);
+    // FIXME("(%p, %p): stub.\n", iface, items);
 
     return S_OK;
 }
@@ -1572,29 +394,23 @@ static HRESULT WINAPI file_operation_DeleteItems(IFileOperation *iface, IUnknown
 static HRESULT WINAPI file_operation_NewItem(IFileOperation *iface, IShellItem *folder, DWORD attributes,
         LPCWSTR name, LPCWSTR template, IFileOperationProgressSink *sink)
 {
-	struct file_operation *operation = impl_from_IFileOperation(iface);
-	operation->operation = FO_NEW_ITEM;	
+	DbgPrint("IFileOperation::NewItem called\n");
 	// struct file_operation *operation = impl_from_IFileOperation(iface);
+	// operation->operation = FO_NEW_ITEM;	
+	// // struct file_operation *operation = impl_from_IFileOperation(iface);
 	
-    FIXME("(%p, %p, %lx, %s, %s, %p): stub.\n", iface, folder, attributes,
-          debugstr_w(name), debugstr_w(template), sink);
+    // FIXME("(%p, %p, %lx, %s, %s, %p): stub.\n", iface, folder, attributes,
+          // debugstr_w(name), debugstr_w(template), sink);
 
     return S_OK;
 }
 
 static HRESULT WINAPI file_operation_PerformOperations(IFileOperation *iface)
 {
-	// struct file_operation *operation = impl_from_IFileOperation(iface);
-	// int resp;
-    // FIXME("(%p): stub.\n", iface);
+	DbgPrint("IFileOperation::PerformOperations called\n");
 	
-	// resp = SHFileOperationW(&operation->fileOperation);
-	// operation->aborted = FALSE;	
+	//Just return ok, because the real operation was done in operation
 	
-	// if(resp == 0){
-		// return S_OK;
-	// }
-
     return S_OK;
 }
 
@@ -1602,6 +418,8 @@ static HRESULT WINAPI file_operation_GetAnyOperationsAborted(IFileOperation *ifa
 {
 	struct file_operation *operation = impl_from_IFileOperation(iface);
 	
+	DbgPrint("IFileOperation::GetAnyOperationsAborted called\n");
+	
 	*aborted = operation->aborted;
     FIXME("(%p, %p): stub.\n", iface, aborted);
 
@@ -1639,10 +457,7 @@ HRESULT WINAPI IFileOperation_Constructor(IUnknown *outer, REFIID riid, void **o
 {
     struct file_operation *object;
     HRESULT hr;
-	
-    SHFILEOPSTRUCTW fileOperation = {0};
-
-    ZeroMemory(&fileOperation, sizeof(fileOperation));
+	SHFILEOPSTRUCTW fileOperation = {0};	
 
 	DbgPrint("IFileOperation_Constructor called\n");
 
@@ -1650,13 +465,16 @@ HRESULT WINAPI IFileOperation_Constructor(IUnknown *outer, REFIID riid, void **o
     if (!object)
         return E_OUTOFMEMORY;
 
+	ZeroMemory(&fileOperation, sizeof(fileOperation));
     object->IFileOperation_iface.lpVtbl = &file_operation_vtbl;
     object->ref = 1;
-    object->aborted = FALSE;
-    object->fileOperation = fileOperation;
+	object->fileOperation = fileOperation;
+    object->aborted = FALSE;	
 
     hr = IFileOperation_QueryInterface(&object->IFileOperation_iface, riid, out);
     IFileOperation_Release(&object->IFileOperation_iface);
+	
+	DbgPrint("IFileOperation_Constructor end\n");
 
     return hr;
 }
diff --git a/wrappers/new-dlls/combase/CMakeLists.txt b/wrappers/new-dlls/combase/CMakeLists.txt
index f215f8d0a5..cb9e3cc1c1 100644
--- a/wrappers/new-dlls/combase/CMakeLists.txt
+++ b/wrappers/new-dlls/combase/CMakeLists.txt
@@ -1,34 +1,36 @@
 
-include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
-include_directories(${REACTOS_SOURCE_DIR}/sdk/include/psdk)
+add_definitions(
+    -D__WINESRC__
+    -D_olebase_
+    -DCOM_NO_WINDOWS_H
+    -DENTRY_PREFIX=olebase_
+    -DPROXY_CLSID=CLSID_PSFactoryBuffer
+    -DWINE_REGISTER_DLL)
+	
+include_directories(${REACTOS_SOURCE_DIR}/sdk/include/wine)	
 
-spec2def(combase.dll combase.spec ADD_IMPORTLIB)
-generate_idl_iids(dcom.idl)
-add_idl_headers(combase_idlheader dcom.idl irpcss.idl)
-add_rpc_files(client irpcss.idl)
+spec2def(combase.dll combase.spec)
+
+#generate_idl_iids(dcom.idl)
+#add_idl_headers(dcom.idl)
+
+# add_rpcproxy_files(
+    # dcom.idl)
 
 list(APPEND SOURCE
 	apartment.c
-	combase.c
-	errorinfo.c
-	hglobalstream.c
-	malloc.c
-	marshal.c
-	roapi.c
-	rpc.c
-	string.c
-	stubmanager.c
-	usrmarshal.c
-    combase.rc
-	${CMAKE_CURRENT_BINARY_DIR}/combase_stubs.c
-	${CMAKE_CURRENT_BINARY_DIR}/combase.def
+    main.c
+	mta.c
+    #marshal.c
+    #rpc.c
+	version.rc
 	${CMAKE_CURRENT_BINARY_DIR}/dcom_i.c
-    ${CMAKE_CURRENT_BINARY_DIR}/irpcss_c.c)
-
-add_library(combase SHARED ${SOURCE})
+    ${CMAKE_CURRENT_BINARY_DIR}/combase_stubs.c
+	${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c
+    ${CMAKE_CURRENT_BINARY_DIR}/combase.def)
 
-set_module_type(combase win32dll UNICODE)
-add_dependencies(combase combase_idlheader)
-target_link_libraries(combase uuid wine ${PSEH_LIB})
-add_importlibs(combase user32 gdi32 advapi32 msvcrt kernelbase rpcrt4 oleaut32 ole32 ntdll)
+add_library(combase SHARED  ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/dcom_p.c)
+set_module_type(combase win32dll ENTRYPOINT 0)
+target_link_libraries(combase wine)
+add_importlibs(combase olebase rpcrt4 msvcrt kernel32 ntdll)
 add_cd_file(TARGET combase DESTINATION reactos/system32 FOR all)
diff --git a/wrappers/new-dlls/combase/apartment.c b/wrappers/new-dlls/combase/apartment.c
index 108d6a71c5..d5040e9ed6 100644
--- a/wrappers/new-dlls/combase/apartment.c
+++ b/wrappers/new-dlls/combase/apartment.c
@@ -1,1285 +1,114 @@
-/*
- *      Copyright 1995 Martin von Loewis
- *      Copyright 1998 Justin Bradford
- *      Copyright 1999 Francis Beaudet
- *      Copyright 1999 Sylvain St-Germain
- *      Copyright 2002 Marcus Meissner
- *      Copyright 2004 Mike Hearn
- *      Copyright 2005-2006 Robert Shearman (for CodeWeavers)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- *
- */
-
-#include <stdarg.h>
-#include <assert.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-
-#include "windef.h"
-#include "winbase.h"
-#include "servprov.h"
-
-#include "combase_private.h"
-
-#include "wine/debug.h"
-#include "wine/list.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(ole);
-
-enum comclass_threadingmodel
-{
-    ThreadingModel_Apartment = 1,
-    ThreadingModel_Free      = 2,
-    ThreadingModel_No        = 3,
-    ThreadingModel_Both      = 4,
-    ThreadingModel_Neutral   = 5
-};
-
-static struct apartment *mta;
-static struct apartment *main_sta; /* the first STA */
-static struct list apts = LIST_INIT(apts);
-
-static CRITICAL_SECTION apt_cs;
-static CRITICAL_SECTION_DEBUG apt_cs_debug =
-{
-    0, 0, &apt_cs,
-    { &apt_cs_debug.ProcessLocksList, &apt_cs_debug.ProcessLocksList },
-      0, 0, { (DWORD_PTR)(__FILE__ ": apt_cs") }
-};
-static CRITICAL_SECTION apt_cs = { &apt_cs_debug, -1, 0, 0, 0, 0 };
-
-static struct list dlls = LIST_INIT(dlls);
-
-static CRITICAL_SECTION dlls_cs;
-static CRITICAL_SECTION_DEBUG dlls_cs_debug =
-{
-    0, 0, &dlls_cs,
-    { &dlls_cs_debug.ProcessLocksList, &dlls_cs_debug.ProcessLocksList },
-      0, 0, { (DWORD_PTR)(__FILE__ ": dlls_cs") }
-};
-static CRITICAL_SECTION dlls_cs = { &dlls_cs_debug, -1, 0, 0, 0, 0 };
-
-typedef HRESULT (WINAPI *DllGetClassObjectFunc)(REFCLSID clsid, REFIID iid, void **obj);
-typedef HRESULT (WINAPI *DllCanUnloadNowFunc)(void);
-
-struct opendll
-{
-    LONG refs;
-    LPWSTR library_name;
-    HANDLE library;
-    DllGetClassObjectFunc DllGetClassObject;
-    DllCanUnloadNowFunc DllCanUnloadNow;
-    struct list entry;
-};
-
-struct apartment_loaded_dll
-{
-    struct list entry;
-    struct opendll *dll;
-    DWORD unload_time;
-    BOOL multi_threaded;
-};
-
-static struct opendll *apartment_get_dll(const WCHAR *library_name)
-{
-    struct opendll *ptr, *ret = NULL;
-
-    EnterCriticalSection(&dlls_cs);
-    LIST_FOR_EACH_ENTRY(ptr, &dlls, struct opendll, entry)
-    {
-        if (!wcsicmp(library_name, ptr->library_name) &&
-            (InterlockedIncrement(&ptr->refs) != 1) /* entry is being destroyed if == 1 */)
-        {
-            ret = ptr;
-            break;
-        }
-    }
-    LeaveCriticalSection(&dlls_cs);
-
-    return ret;
-}
-
-/* caller must ensure that library_name is not already in the open dll list */
-static HRESULT apartment_add_dll(const WCHAR *library_name, struct opendll **ret)
-{
-    struct opendll *entry;
-    int len;
-    HRESULT hr = S_OK;
-    HANDLE hLibrary;
-    DllCanUnloadNowFunc DllCanUnloadNow;
-    DllGetClassObjectFunc DllGetClassObject;
-
-    TRACE("%s\n", debugstr_w(library_name));
-
-    *ret = apartment_get_dll(library_name);
-    if (*ret) return S_OK;
-
-    /* Load outside of dlls lock to avoid dependency on the loader lock */
-    hLibrary = LoadLibraryExW(library_name, 0, LOAD_WITH_ALTERED_SEARCH_PATH);
-    if (!hLibrary)
-    {
-        ERR("couldn't load in-process dll %s\n", debugstr_w(library_name));
-        /* failure: DLL could not be loaded */
-        return E_ACCESSDENIED; /* FIXME: or should this be CO_E_DLLNOTFOUND? */
-    }
-
-    /* DllCanUnloadNow is optional */
-    DllCanUnloadNow = (void *)GetProcAddress(hLibrary, "DllCanUnloadNow");
-    DllGetClassObject = (void *)GetProcAddress(hLibrary, "DllGetClassObject");
-    if (!DllGetClassObject)
-    {
-        /* failure: the dll did not export DllGetClassObject */
-        ERR("couldn't find function DllGetClassObject in %s\n", debugstr_w(library_name));
-        FreeLibrary(hLibrary);
-        return CO_E_DLLNOTFOUND;
-    }
-
-    EnterCriticalSection(&dlls_cs);
-
-    *ret = apartment_get_dll(library_name);
-    if (*ret)
-    {
-        /* another caller to this function already added the dll while we
-         * weren't in the critical section */
-        FreeLibrary(hLibrary);
-    }
-    else
-    {
-        len = lstrlenW(library_name);
-        entry = heap_alloc(sizeof(*entry));
-        if (entry)
-            entry->library_name = heap_alloc((len + 1) * sizeof(WCHAR));
-        if (entry && entry->library_name)
-        {
-            memcpy(entry->library_name, library_name, (len + 1)*sizeof(WCHAR));
-            entry->library = hLibrary;
-            entry->refs = 1;
-            entry->DllCanUnloadNow = DllCanUnloadNow;
-            entry->DllGetClassObject = DllGetClassObject;
-            list_add_tail(&dlls, &entry->entry);
-            *ret = entry;
-        }
-        else
-        {
-            heap_free(entry);
-            hr = E_OUTOFMEMORY;
-            FreeLibrary(hLibrary);
-        }
-    }
-
-    LeaveCriticalSection(&dlls_cs);
-
-    return hr;
-}
-
-/* pass FALSE for free_entry to release a reference without destroying the
- * entry if it reaches zero or TRUE otherwise */
-static void apartment_release_dll(struct opendll *entry, BOOL free_entry)
-{
-    if (!InterlockedDecrement(&entry->refs) && free_entry)
-    {
-        EnterCriticalSection(&dlls_cs);
-        list_remove(&entry->entry);
-        LeaveCriticalSection(&dlls_cs);
-
-        TRACE("freeing %p\n", entry->library);
-        FreeLibrary(entry->library);
-
-        heap_free(entry->library_name);
-        heap_free(entry);
-    }
-}
-
-/* frees memory associated with active dll list */
-static void apartment_release_dlls(void)
-{
-    struct opendll *entry, *cursor2;
-    EnterCriticalSection(&dlls_cs);
-    LIST_FOR_EACH_ENTRY_SAFE(entry, cursor2, &dlls, struct opendll, entry)
-    {
-        list_remove(&entry->entry);
-        heap_free(entry->library_name);
-        heap_free(entry);
-    }
-    LeaveCriticalSection(&dlls_cs);
-    DeleteCriticalSection(&dlls_cs);
-}
-
-/*
- * This is a marshallable object exposing registered local servers.
- * IServiceProvider is used only because it happens meet requirements
- * and already has proxy/stub code. If more functionality is needed,
- * a custom interface may be used instead.
- */
-struct local_server
-{
-    IServiceProvider IServiceProvider_iface;
-    LONG refcount;
-    struct apartment *apt;
-    IStream *marshal_stream;
-};
-
-static inline struct local_server *impl_from_IServiceProvider(IServiceProvider *iface)
-{
-    return CONTAINING_RECORD(iface, struct local_server, IServiceProvider_iface);
-}
-
-static HRESULT WINAPI local_server_QueryInterface(IServiceProvider *iface, REFIID riid, void **obj)
-{
-    struct local_server *local_server = impl_from_IServiceProvider(iface);
-
-    TRACE("%p, %s, %p\n", iface, debugstr_guid(riid), obj);
-
-    if (IsEqualGUID(riid, &IID_IUnknown) ||
-            IsEqualGUID(riid, &IID_IServiceProvider))
-    {
-        *obj = &local_server->IServiceProvider_iface;
-    }
-    else
-    {
-        *obj = NULL;
-        return E_NOINTERFACE;
-    }
-
-    IUnknown_AddRef((IUnknown *)*obj);
-    return S_OK;
-}
-
-static ULONG WINAPI local_server_AddRef(IServiceProvider *iface)
-{
-    struct local_server *local_server = impl_from_IServiceProvider(iface);
-    LONG refcount = InterlockedIncrement(&local_server->refcount);
-
-    TRACE("%p, refcount %d\n", iface, refcount);
-
-    return refcount;
-}
-
-static ULONG WINAPI local_server_Release(IServiceProvider *iface)
-{
-    struct local_server *local_server = impl_from_IServiceProvider(iface);
-    LONG refcount = InterlockedDecrement(&local_server->refcount);
-
-    TRACE("%p, refcount %d\n", iface, refcount);
-
-    if (!refcount)
-    {
-        assert(!local_server->apt);
-        heap_free(local_server);
-    }
-
-    return refcount;
-}
-
-static HRESULT WINAPI local_server_QueryService(IServiceProvider *iface, REFGUID guid, REFIID riid, void **obj)
-{
-    struct local_server *local_server = impl_from_IServiceProvider(iface);
-    struct apartment *apt = com_get_current_apt();
-    HRESULT hr = E_FAIL;
-    IUnknown *unk;
-
-    TRACE("%p, %s, %s, %p\n", iface, debugstr_guid(guid), debugstr_guid(riid), obj);
-
-    if (!local_server->apt)
-        return E_UNEXPECTED;
-
-    if ((unk = com_get_registered_class_object(apt, guid, CLSCTX_LOCAL_SERVER)))
-    {
-        hr = IUnknown_QueryInterface(unk, riid, obj);
-        IUnknown_Release(unk);
-    }
-
-    return hr;
-}
-
-static const IServiceProviderVtbl local_server_vtbl =
-{
-    local_server_QueryInterface,
-    local_server_AddRef,
-    local_server_Release,
-    local_server_QueryService
-};
-
-HRESULT apartment_get_local_server_stream(struct apartment *apt, IStream **ret)
-{
-    HRESULT hr = S_OK;
-
-    EnterCriticalSection(&apt->cs);
-
-    if (!apt->local_server)
-    {
-        struct local_server *obj;
-
-        obj = heap_alloc(sizeof(*obj));
-        if (obj)
-        {
-            obj->IServiceProvider_iface.lpVtbl = &local_server_vtbl;
-            obj->refcount = 1;
-            obj->apt = apt;
-
-            hr = CreateStreamOnHGlobal(0, TRUE, &obj->marshal_stream);
-            if (SUCCEEDED(hr))
-            {
-                hr = CoMarshalInterface(obj->marshal_stream, &IID_IServiceProvider, (IUnknown *)&obj->IServiceProvider_iface,
-                        MSHCTX_LOCAL, NULL, MSHLFLAGS_TABLESTRONG);
-                if (FAILED(hr))
-                    IStream_Release(obj->marshal_stream);
-            }
-
-            if (SUCCEEDED(hr))
-                apt->local_server = obj;
-            else
-                heap_free(obj);
-        }
-        else
-            hr = E_OUTOFMEMORY;
-    }
-
-    if (SUCCEEDED(hr))
-        hr = IStream_Clone(apt->local_server->marshal_stream, ret);
-
-    LeaveCriticalSection(&apt->cs);
-
-    if (FAILED(hr))
-        ERR("Failed: %#x\n", hr);
-
-    return hr;
-}
-
-/* Creates new apartment for given model */
-static struct apartment *apartment_construct(DWORD model)
-{
-    struct apartment *apt;
-
-    TRACE("creating new apartment, model %d\n", model);
-
-    apt = heap_alloc_zero(sizeof(*apt));
-    apt->tid = GetCurrentThreadId();
-
-    list_init(&apt->proxies);
-    list_init(&apt->stubmgrs);
-    list_init(&apt->loaded_dlls);
-    list_init(&apt->usage_cookies);
-    apt->ipidc = 0;
-    apt->refs = 1;
-    apt->remunk_exported = FALSE;
-    apt->oidc = 1;
-    InitializeCriticalSection(&apt->cs);
-    apt->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": apartment");
-
-    apt->multi_threaded = !(model & COINIT_APARTMENTTHREADED);
-
-    if (apt->multi_threaded)
-    {
-        /* FIXME: should be randomly generated by in an RPC call to rpcss */
-        apt->oxid = ((OXID)GetCurrentProcessId() << 32) | 0xcafe;
-    }
-    else
-    {
-        /* FIXME: should be randomly generated by in an RPC call to rpcss */
-        apt->oxid = ((OXID)GetCurrentProcessId() << 32) | GetCurrentThreadId();
-    }
-
-    TRACE("Created apartment on OXID %s\n", wine_dbgstr_longlong(apt->oxid));
-
-    list_add_head(&apts, &apt->entry);
-
-    return apt;
-}
-
-/* Frees unused libraries loaded into apartment */
-void apartment_freeunusedlibraries(struct apartment *apt, DWORD delay)
-{
-    struct apartment_loaded_dll *entry, *next;
-
-    EnterCriticalSection(&apt->cs);
-    LIST_FOR_EACH_ENTRY_SAFE(entry, next, &apt->loaded_dlls, struct apartment_loaded_dll, entry)
-    {
-        if (entry->dll->DllCanUnloadNow && (entry->dll->DllCanUnloadNow() == S_OK))
-        {
-            DWORD real_delay = delay;
-
-            if (real_delay == INFINITE)
-            {
-                /* DLLs that return multi-threaded objects aren't unloaded
-                 * straight away to cope for programs that have races between
-                 * last object destruction and threads in the DLLs that haven't
-                 * finished, despite DllCanUnloadNow returning S_OK */
-                if (entry->multi_threaded)
-                    real_delay = 10 * 60 * 1000; /* 10 minutes */
-                else
-                    real_delay = 0;
-            }
-
-            if (!real_delay || (entry->unload_time && ((int)(GetTickCount() - entry->unload_time) > 0)))
-            {
-                list_remove(&entry->entry);
-                apartment_release_dll(entry->dll, TRUE);
-                heap_free(entry);
-            }
-            else
-            {
-                entry->unload_time = GetTickCount() + real_delay;
-                if (!entry->unload_time) entry->unload_time = 1;
-            }
-        }
-        else if (entry->unload_time)
-            entry->unload_time = 0;
-    }
-    LeaveCriticalSection(&apt->cs);
-}
-
-void apartment_release(struct apartment *apt)
-{
-    DWORD refcount;
-
-    EnterCriticalSection(&apt_cs);
-
-    refcount = InterlockedDecrement(&apt->refs);
-    TRACE("%s: after = %d\n", wine_dbgstr_longlong(apt->oxid), refcount);
-
-    if (apt->being_destroyed)
-    {
-        LeaveCriticalSection(&apt_cs);
-        return;
-    }
-
-    /* destruction stuff that needs to happen under global */
-    if (!refcount)
-    {
-        apt->being_destroyed = TRUE;
-        if (apt == mta) mta = NULL;
-        else if (apt == main_sta) main_sta = NULL;
-        list_remove(&apt->entry);
-    }
-
-    LeaveCriticalSection(&apt_cs);
-
-    if (!refcount)
-    {
-        struct list *cursor, *cursor2;
-
-        TRACE("destroying apartment %p, oxid %s\n", apt, wine_dbgstr_longlong(apt->oxid));
-
-        if (apt->local_server)
-        {
-            struct local_server *local_server = apt->local_server;
-            LARGE_INTEGER zero;
-
-            memset(&zero, 0, sizeof(zero));
-            IStream_Seek(local_server->marshal_stream, zero, STREAM_SEEK_SET, NULL);
-            CoReleaseMarshalData(local_server->marshal_stream);
-            IStream_Release(local_server->marshal_stream);
-            local_server->marshal_stream = NULL;
-
-            apt->local_server = NULL;
-            local_server->apt = NULL;
-            IServiceProvider_Release(&local_server->IServiceProvider_iface);
-        }
-
-        /* Release the references to the registered class objects */
-        apartment_revoke_all_classes(apt);
-
-        /* no locking is needed for this apartment, because no other thread
-         * can access it at this point */
-
-        apartment_disconnectproxies(apt);
-
-        if (apt->win) DestroyWindow(apt->win);
-        if (apt->host_apt_tid) PostThreadMessageW(apt->host_apt_tid, WM_QUIT, 0, 0);
-
-        LIST_FOR_EACH_SAFE(cursor, cursor2, &apt->stubmgrs)
-        {
-            struct stub_manager *stubmgr = LIST_ENTRY(cursor, struct stub_manager, entry);
-            /* release the implicit reference given by the fact that the
-             * stub has external references (it must do since it is in the
-             * stub manager list in the apartment and all non-apartment users
-             * must have a ref on the apartment and so it cannot be destroyed).
-             */
-            stub_manager_int_release(stubmgr);
-        }
-
-        /* if this assert fires, then another thread took a reference to a
-         * stub manager without taking a reference to the containing
-         * apartment, which it must do. */
-        assert(list_empty(&apt->stubmgrs));
-
-        if (apt->filter) IMessageFilter_Release(apt->filter);
-
-        /* free as many unused libraries as possible... */
-        apartment_freeunusedlibraries(apt, 0);
-
-        /* ... and free the memory for the apartment loaded dll entry and
-         * release the dll list reference without freeing the library for the
-         * rest */
-        while ((cursor = list_head(&apt->loaded_dlls)))
-        {
-            struct apartment_loaded_dll *apartment_loaded_dll = LIST_ENTRY(cursor, struct apartment_loaded_dll, entry);
-            apartment_release_dll(apartment_loaded_dll->dll, FALSE);
-            list_remove(cursor);
-            heap_free(apartment_loaded_dll);
-        }
-
-        apt->cs.DebugInfo->Spare[0] = 0;
-        DeleteCriticalSection(&apt->cs);
-
-        heap_free(apt);
-    }
-}
-
-static DWORD apartment_addref(struct apartment *apt)
-{
-    DWORD refs = InterlockedIncrement(&apt->refs);
-    TRACE("%s: before = %d\n", wine_dbgstr_longlong(apt->oxid), refs - 1);
-    return refs;
-}
-
-/* Gets existing apartment or creates a new one and enters it */
-static struct apartment *apartment_get_or_create(DWORD model)
-{
-    struct apartment *apt = com_get_current_apt();
-    struct tlsdata *data;
-
-    if (!apt)
-    {
-        com_get_tlsdata(&data);
-
-        if (model & COINIT_APARTMENTTHREADED)
-        {
-            EnterCriticalSection(&apt_cs);
-
-            apt = apartment_construct(model);
-            if (!main_sta)
-            {
-                main_sta = apt;
-                apt->main = TRUE;
-                TRACE("Created main-threaded apartment with OXID %s\n", wine_dbgstr_longlong(apt->oxid));
-            }
-
-            data->flags |= OLETLS_APARTMENTTHREADED;
-            if (model & COINIT_DISABLE_OLE1DDE)
-                data->flags |= OLETLS_DISABLE_OLE1DDE;
-
-            LeaveCriticalSection(&apt_cs);
-
-            if (apt->main)
-                apartment_createwindowifneeded(apt);
-        }
-        else
-        {
-            EnterCriticalSection(&apt_cs);
-
-            /* The multi-threaded apartment (MTA) contains zero or more threads interacting
-             * with free threaded (ie thread safe) COM objects. There is only ever one MTA
-             * in a process */
-            if (mta)
-            {
-                TRACE("entering the multithreaded apartment %s\n", wine_dbgstr_longlong(mta->oxid));
-                apartment_addref(mta);
-            }
-            else
-                mta = apartment_construct(model);
-
-            data->flags |= OLETLS_MULTITHREADED | OLETLS_DISABLE_OLE1DDE;
-
-            apt = mta;
-
-            LeaveCriticalSection(&apt_cs);
-        }
-        data->apt = apt;
-    }
-
-    return apt;
-}
-
-struct apartment * apartment_get_mta(void)
-{
-    struct apartment *apt;
-
-    EnterCriticalSection(&apt_cs);
-
-    if ((apt = mta))
-        apartment_addref(apt);
-
-    LeaveCriticalSection(&apt_cs);
-
-    return apt;
-}
-
-/* Return the current apartment if it exists, or, failing that, the MTA. Caller
- * must free the returned apartment in either case. */
-struct apartment * apartment_get_current_or_mta(void)
-{
-    struct apartment *apt = com_get_current_apt();
-    if (apt)
-    {
-        apartment_addref(apt);
-        return apt;
-    }
-    return apartment_get_mta();
-}
-
-/* The given OXID must be local to this process */
-struct apartment * apartment_findfromoxid(OXID oxid)
-{
-    struct apartment *result = NULL, *apt;
-
-    EnterCriticalSection(&apt_cs);
-    LIST_FOR_EACH_ENTRY(apt, &apts, struct apartment, entry)
-    {
-        if (apt->oxid == oxid)
-        {
-            result = apt;
-            apartment_addref(result);
-            break;
-        }
-    }
-    LeaveCriticalSection(&apt_cs);
-
-    return result;
-}
-
-/* gets the apartment which has a given creator thread ID. The caller must
- * release the reference from the apartment as soon as the apartment pointer
- * is no longer required. */
-struct apartment * apartment_findfromtid(DWORD tid)
-{
-    struct apartment *result = NULL, *apt;
-
-    EnterCriticalSection(&apt_cs);
-    LIST_FOR_EACH_ENTRY(apt, &apts, struct apartment, entry)
-    {
-        if (apt->tid == tid)
-        {
-            result = apt;
-            apartment_addref(result);
-            break;
-        }
-    }
-    LeaveCriticalSection(&apt_cs);
-
-    return result;
-}
-
-/* gets the main apartment if it exists. The caller must
- * release the reference from the apartment as soon as the apartment pointer
- * is no longer required. */
-static struct apartment *apartment_findmain(void)
-{
-    struct apartment *result;
-
-    EnterCriticalSection(&apt_cs);
-
-    result = main_sta;
-    if (result) apartment_addref(result);
-
-    LeaveCriticalSection(&apt_cs);
-
-    return result;
-}
-
-struct host_object_params
-{
-    struct class_reg_data regdata;
-    CLSID clsid; /* clsid of object to marshal */
-    IID iid; /* interface to marshal */
-    HANDLE event; /* event signalling when ready for multi-threaded case */
-    HRESULT hr; /* result for multi-threaded case */
-    IStream *stream; /* stream that the object will be marshaled into */
-    BOOL apartment_threaded; /* is the component purely apartment-threaded? */
-};
-
-/* Returns expanded dll path from the registry or activation context. */
-static BOOL get_object_dll_path(const struct class_reg_data *regdata, WCHAR *dst, DWORD dstlen)
-{
-    DWORD ret;
-
-    if (regdata->origin == CLASS_REG_REGISTRY)
-    {
-        DWORD keytype;
-        WCHAR src[MAX_PATH];
-        DWORD dwLength = dstlen * sizeof(WCHAR);
-
-        if ((ret = RegQueryValueExW(regdata->u.hkey, NULL, NULL, &keytype, (BYTE*)src, &dwLength)) == ERROR_SUCCESS)
-        {
-            if (keytype == REG_EXPAND_SZ)
-            {
-                if (dstlen <= ExpandEnvironmentStringsW(src, dst, dstlen)) ret = ERROR_MORE_DATA;
-            }
-            else
-            {
-                const WCHAR *quote_start;
-                quote_start = wcschr(src, '\"');
-                if (quote_start)
-                {
-                    const WCHAR *quote_end = wcschr(quote_start + 1, '\"');
-                    if (quote_end)
-                    {
-                        memmove(src, quote_start + 1, (quote_end - quote_start - 1) * sizeof(WCHAR));
-                        src[quote_end - quote_start - 1] = '\0';
-                    }
-                }
-                lstrcpynW(dst, src, dstlen);
-            }
-        }
-        return !ret;
-    }
-    else
-    {
-        ULONG_PTR cookie;
-
-        *dst = 0;
-        ActivateActCtx(regdata->u.actctx.hactctx, &cookie);
-        ret = SearchPathW(NULL, regdata->u.actctx.module_name, L".dll", dstlen, dst, NULL);
-        DeactivateActCtx(0, cookie);
-        return *dst != 0;
-    }
-}
-
-/* gets the specified class object by loading the appropriate DLL, if
- * necessary and calls the DllGetClassObject function for the DLL */
-static HRESULT apartment_getclassobject(struct apartment *apt, LPCWSTR dllpath,
-                                        BOOL apartment_threaded,
-                                        REFCLSID rclsid, REFIID riid, void **ppv)
-{
-    HRESULT hr = S_OK;
-    BOOL found = FALSE;
-    struct apartment_loaded_dll *apartment_loaded_dll;
-
-    if (!wcsicmp(dllpath, L"ole32.dll"))
-    {
-        HRESULT (WINAPI *p_ole32_DllGetClassObject)(REFCLSID clsid, REFIID riid, void **obj);
-
-        p_ole32_DllGetClassObject = (void *)GetProcAddress(GetModuleHandleW(L"ole32.dll"), "DllGetClassObject");
-
-        /* we don't need to control the lifetime of this dll, so use the local
-         * implementation of DllGetClassObject directly */
-        TRACE("calling ole32!DllGetClassObject\n");
-        hr = p_ole32_DllGetClassObject(rclsid, riid, ppv);
-
-        if (hr != S_OK)
-            ERR("DllGetClassObject returned error 0x%08x for dll %s\n", hr, debugstr_w(dllpath));
-
-        return hr;
-    }
-
-    EnterCriticalSection(&apt->cs);
-
-    LIST_FOR_EACH_ENTRY(apartment_loaded_dll, &apt->loaded_dlls, struct apartment_loaded_dll, entry)
-        if (!wcsicmp(dllpath, apartment_loaded_dll->dll->library_name))
-        {
-            TRACE("found %s already loaded\n", debugstr_w(dllpath));
-            found = TRUE;
-            break;
-        }
-
-    if (!found)
-    {
-        apartment_loaded_dll = heap_alloc(sizeof(*apartment_loaded_dll));
-        if (!apartment_loaded_dll)
-            hr = E_OUTOFMEMORY;
-        if (SUCCEEDED(hr))
-        {
-            apartment_loaded_dll->unload_time = 0;
-            apartment_loaded_dll->multi_threaded = FALSE;
-            hr = apartment_add_dll(dllpath, &apartment_loaded_dll->dll);
-            if (FAILED(hr))
-                heap_free(apartment_loaded_dll);
-        }
-        if (SUCCEEDED(hr))
-        {
-            TRACE("added new loaded dll %s\n", debugstr_w(dllpath));
-            list_add_tail(&apt->loaded_dlls, &apartment_loaded_dll->entry);
-        }
-    }
-
-    LeaveCriticalSection(&apt->cs);
-
-    if (SUCCEEDED(hr))
-    {
-        /* one component being multi-threaded overrides any number of
-         * apartment-threaded components */
-        if (!apartment_threaded)
-            apartment_loaded_dll->multi_threaded = TRUE;
-
-        TRACE("calling DllGetClassObject %p\n", apartment_loaded_dll->dll->DllGetClassObject);
-        /* OK: get the ClassObject */
-        hr = apartment_loaded_dll->dll->DllGetClassObject(rclsid, riid, ppv);
-
-        if (hr != S_OK)
-            ERR("DllGetClassObject returned error 0x%08x for dll %s\n", hr, debugstr_w(dllpath));
-    }
-
-    return hr;
-}
-
-static HRESULT apartment_hostobject(struct apartment *apt,
-                                    const struct host_object_params *params);
-
-struct host_thread_params
-{
-    COINIT threading_model;
-    HANDLE ready_event;
-    HWND apartment_hwnd;
-};
-
-/* thread for hosting an object to allow an object to appear to be created in
- * an apartment with an incompatible threading model */
-static DWORD CALLBACK apartment_hostobject_thread(void *p)
-{
-    struct host_thread_params *params = p;
-    MSG msg;
-    HRESULT hr;
-    struct apartment *apt;
-
-    TRACE("\n");
-
-    hr = CoInitializeEx(NULL, params->threading_model);
-    if (FAILED(hr)) return hr;
-
-    apt = com_get_current_apt();
-    if (params->threading_model == COINIT_APARTMENTTHREADED)
-    {
-        apartment_createwindowifneeded(apt);
-        params->apartment_hwnd = apartment_getwindow(apt);
-    }
-    else
-        params->apartment_hwnd = NULL;
-
-    /* force the message queue to be created before signaling parent thread */
-    PeekMessageW(&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE);
-
-    SetEvent(params->ready_event);
-    params = NULL; /* can't touch params after here as it may be invalid */
-
-    while (GetMessageW(&msg, NULL, 0, 0))
-    {
-        if (!msg.hwnd && (msg.message == DM_HOSTOBJECT))
-        {
-            struct host_object_params *obj_params = (struct host_object_params *)msg.lParam;
-            obj_params->hr = apartment_hostobject(apt, obj_params);
-            SetEvent(obj_params->event);
-        }
-        else
-        {
-            TranslateMessage(&msg);
-            DispatchMessageW(&msg);
-        }
-    }
-
-    TRACE("exiting\n");
-
-    CoUninitialize();
-
-    return S_OK;
-}
-
-/* finds or creates a host apartment, creates the object inside it and returns
- * a proxy to it so that the object can be used in the apartment of the
- * caller of this function */
-static HRESULT apartment_hostobject_in_hostapt(struct apartment *apt, BOOL multi_threaded,
-        BOOL main_apartment, const struct class_reg_data *regdata, REFCLSID rclsid, REFIID riid, void **ppv)
-{
-    struct host_object_params params;
-    HWND apartment_hwnd = NULL;
-    DWORD apartment_tid = 0;
-    HRESULT hr;
-
-    if (!multi_threaded && main_apartment)
-    {
-        struct apartment *host_apt = apartment_findmain();
-        if (host_apt)
-        {
-            apartment_hwnd = apartment_getwindow(host_apt);
-            apartment_release(host_apt);
-        }
-    }
-
-    if (!apartment_hwnd)
-    {
-        EnterCriticalSection(&apt->cs);
-
-        if (!apt->host_apt_tid)
-        {
-            struct host_thread_params thread_params;
-            HANDLE handles[2];
-            DWORD wait_value;
-
-            thread_params.threading_model = multi_threaded ? COINIT_MULTITHREADED : COINIT_APARTMENTTHREADED;
-            handles[0] = thread_params.ready_event = CreateEventW(NULL, FALSE, FALSE, NULL);
-            thread_params.apartment_hwnd = NULL;
-            handles[1] = CreateThread(NULL, 0, apartment_hostobject_thread, &thread_params, 0, &apt->host_apt_tid);
-            if (!handles[1])
-            {
-                CloseHandle(handles[0]);
-                LeaveCriticalSection(&apt->cs);
-                return E_OUTOFMEMORY;
-            }
-            wait_value = WaitForMultipleObjects(2, handles, FALSE, INFINITE);
-            CloseHandle(handles[0]);
-            CloseHandle(handles[1]);
-            if (wait_value == WAIT_OBJECT_0)
-                apt->host_apt_hwnd = thread_params.apartment_hwnd;
-            else
-            {
-                LeaveCriticalSection(&apt->cs);
-                return E_OUTOFMEMORY;
-            }
-        }
-
-        if (multi_threaded || !main_apartment)
-        {
-            apartment_hwnd = apt->host_apt_hwnd;
-            apartment_tid = apt->host_apt_tid;
-        }
-
-        LeaveCriticalSection(&apt->cs);
-    }
-
-    /* another thread may have become the main apartment in the time it took
-     * us to create the thread for the host apartment */
-    if (!apartment_hwnd && !multi_threaded && main_apartment)
-    {
-        struct apartment *host_apt = apartment_findmain();
-        if (host_apt)
-        {
-            apartment_hwnd = apartment_getwindow(host_apt);
-            apartment_release(host_apt);
-        }
-    }
-
-    params.regdata = *regdata;
-    params.clsid = *rclsid;
-    params.iid = *riid;
-    hr = CreateStreamOnHGlobal(NULL, TRUE, &params.stream);
-    if (FAILED(hr))
-        return hr;
-    params.apartment_threaded = !multi_threaded;
-    if (multi_threaded)
-    {
-        params.hr = S_OK;
-        params.event = CreateEventW(NULL, FALSE, FALSE, NULL);
-        if (!PostThreadMessageW(apartment_tid, DM_HOSTOBJECT, 0, (LPARAM)&params))
-            hr = E_OUTOFMEMORY;
-        else
-        {
-            WaitForSingleObject(params.event, INFINITE);
-            hr = params.hr;
-        }
-        CloseHandle(params.event);
-    }
-    else
-    {
-        if (!apartment_hwnd)
-        {
-            ERR("host apartment didn't create window\n");
-            hr = E_OUTOFMEMORY;
-        }
-        else
-            hr = SendMessageW(apartment_hwnd, DM_HOSTOBJECT, 0, (LPARAM)&params);
-    }
-    if (SUCCEEDED(hr))
-        hr = CoUnmarshalInterface(params.stream, riid, ppv);
-    IStream_Release(params.stream);
-    return hr;
-}
-
-static enum comclass_threadingmodel get_threading_model(const struct class_reg_data *data)
-{
-    if (data->origin == CLASS_REG_REGISTRY)
-    {
-        WCHAR threading_model[10 /* lstrlenW(L"apartment")+1 */];
-        DWORD dwLength = sizeof(threading_model);
-        DWORD keytype;
-        DWORD ret;
-
-        ret = RegQueryValueExW(data->u.hkey, L"ThreadingModel", NULL, &keytype, (BYTE*)threading_model, &dwLength);
-        if ((ret != ERROR_SUCCESS) || (keytype != REG_SZ))
-            threading_model[0] = '\0';
-
-        if (!wcsicmp(threading_model, L"Apartment")) return ThreadingModel_Apartment;
-        if (!wcsicmp(threading_model, L"Free")) return ThreadingModel_Free;
-        if (!wcsicmp(threading_model, L"Both")) return ThreadingModel_Both;
-
-        /* there's not specific handling for this case */
-        if (threading_model[0]) return ThreadingModel_Neutral;
-        return ThreadingModel_No;
-    }
-    else
-        return data->u.actctx.threading_model;
-}
-
-HRESULT apartment_get_inproc_class_object(struct apartment *apt, const struct class_reg_data *regdata,
-        REFCLSID rclsid, REFIID riid, DWORD class_context, void **ppv)
-{
-    WCHAR dllpath[MAX_PATH+1];
-    BOOL apartment_threaded;
-
-    if (!(class_context & CLSCTX_PS_DLL))
-    {
-        enum comclass_threadingmodel model = get_threading_model(regdata);
-
-        if (model == ThreadingModel_Apartment)
-        {
-            apartment_threaded = TRUE;
-            if (apt->multi_threaded)
-                return apartment_hostobject_in_hostapt(apt, FALSE, FALSE, regdata, rclsid, riid, ppv);
-        }
-        else if (model == ThreadingModel_Free)
-        {
-            apartment_threaded = FALSE;
-            if (!apt->multi_threaded)
-                return apartment_hostobject_in_hostapt(apt, TRUE, FALSE, regdata, rclsid, riid, ppv);
-        }
-        /* everything except "Apartment", "Free" and "Both" */
-        else if (model != ThreadingModel_Both)
-        {
-            apartment_threaded = TRUE;
-            /* everything else is main-threaded */
-            if (model != ThreadingModel_No)
-                FIXME("unrecognised threading model %d for object %s, should be main-threaded?\n", model, debugstr_guid(rclsid));
-
-            if (apt->multi_threaded || !apt->main)
-                return apartment_hostobject_in_hostapt(apt, FALSE, TRUE, regdata, rclsid, riid, ppv);
-        }
-        else
-            apartment_threaded = FALSE;
-    }
-    else
-        apartment_threaded = !apt->multi_threaded;
-
-    if (!get_object_dll_path(regdata, dllpath, ARRAY_SIZE(dllpath)))
-    {
-        /* failure: CLSID is not found in registry */
-        WARN("class %s not registered inproc\n", debugstr_guid(rclsid));
-        return REGDB_E_CLASSNOTREG;
-    }
-
-    return apartment_getclassobject(apt, dllpath, apartment_threaded, rclsid, riid, ppv);
-}
-
-static HRESULT apartment_hostobject(struct apartment *apt, const struct host_object_params *params)
-{
-    static const LARGE_INTEGER llZero;
-    WCHAR dllpath[MAX_PATH+1];
-    IUnknown *object;
-    HRESULT hr;
-
-    TRACE("clsid %s, iid %s\n", debugstr_guid(&params->clsid), debugstr_guid(&params->iid));
-
-    if (!get_object_dll_path(&params->regdata, dllpath, ARRAY_SIZE(dllpath)))
-    {
-        /* failure: CLSID is not found in registry */
-        WARN("class %s not registered inproc\n", debugstr_guid(&params->clsid));
-        return REGDB_E_CLASSNOTREG;
-    }
-
-    hr = apartment_getclassobject(apt, dllpath, params->apartment_threaded, &params->clsid, &params->iid, (void **)&object);
-    if (FAILED(hr))
-        return hr;
-
-    hr = CoMarshalInterface(params->stream, &params->iid, object, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL);
-    if (FAILED(hr))
-        IUnknown_Release(object);
-    IStream_Seek(params->stream, llZero, STREAM_SEEK_SET, NULL);
-
-    return hr;
-}
-
-struct dispatch_params;
-
-static LRESULT CALLBACK apartment_wndproc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
-{
-    switch (msg)
-    {
-    case DM_EXECUTERPC:
-        rpc_execute_call((struct dispatch_params *)lParam);
-        return 0;
-    case DM_HOSTOBJECT:
-        return apartment_hostobject(com_get_current_apt(), (const struct host_object_params *)lParam);
-    default:
-        return DefWindowProcW(hWnd, msg, wParam, lParam);
-    }
-}
-
-static BOOL apartment_is_model(const struct apartment *apt, DWORD model)
-{
-    return (apt->multi_threaded == !(model & COINIT_APARTMENTTHREADED));
-}
-
-HRESULT enter_apartment(struct tlsdata *data, DWORD model)
-{
-    HRESULT hr = S_OK;
-
-    if (!data->apt)
-    {
-        if (!apartment_get_or_create(model))
-            return E_OUTOFMEMORY;
-    }
-    else if (!apartment_is_model(data->apt, model))
-    {
-        WARN("Attempt to change threading model of this apartment from %s to %s\n",
-              data->apt->multi_threaded ? "multi-threaded" : "apartment threaded",
-              model & COINIT_APARTMENTTHREADED ? "apartment threaded" : "multi-threaded" );
-        return RPC_E_CHANGED_MODE;
-    }
-    else
-        hr = S_FALSE;
-
-    data->inits++;
-
-    return hr;
-}
-
-void leave_apartment(struct tlsdata *data)
-{
-    if (!--data->inits)
-    {
-        if (data->ole_inits)
-            WARN( "Uninitializing apartment while Ole is still initialized\n" );
-        apartment_release(data->apt);
-        data->apt = NULL;
-        data->flags &= ~(OLETLS_DISABLE_OLE1DDE | OLETLS_APARTMENTTHREADED | OLETLS_MULTITHREADED);
-    }
-}
-
-struct mta_cookie
-{
-    struct list entry;
-};
-
-HRESULT apartment_increment_mta_usage(CO_MTA_USAGE_COOKIE *cookie)
-{
-    struct mta_cookie *mta_cookie;
-
-    *cookie = NULL;
-
-    if (!(mta_cookie = heap_alloc(sizeof(*mta_cookie))))
-        return E_OUTOFMEMORY;
-
-    EnterCriticalSection(&apt_cs);
-
-    if (mta)
-        apartment_addref(mta);
-    else
-        mta = apartment_construct(COINIT_MULTITHREADED);
-    list_add_head(&mta->usage_cookies, &mta_cookie->entry);
-
-    LeaveCriticalSection(&apt_cs);
-
-    *cookie = (CO_MTA_USAGE_COOKIE)mta_cookie;
-
-    return S_OK;
-}
-
-void apartment_decrement_mta_usage(CO_MTA_USAGE_COOKIE cookie)
-{
-    struct mta_cookie *mta_cookie = (struct mta_cookie *)cookie;
-
-    EnterCriticalSection(&apt_cs);
-
-    if (mta)
-    {
-        struct mta_cookie *cur;
-
-        LIST_FOR_EACH_ENTRY(cur, &mta->usage_cookies, struct mta_cookie, entry)
-        {
-            if (mta_cookie == cur)
-            {
-                list_remove(&cur->entry);
-                heap_free(cur);
-                apartment_release(mta);
-                break;
-            }
-        }
-    }
-
-    LeaveCriticalSection(&apt_cs);
-}
-
-static const WCHAR aptwinclassW[] = L"OleMainThreadWndClass";
-static ATOM apt_win_class;
-
-static BOOL WINAPI register_class( INIT_ONCE *once, void *param, void **context )
-{
-    WNDCLASSW wclass;
-
-    /* Dispatching to the correct thread in an apartment is done through
-     * window messages rather than RPC transports. When an interface is
-     * marshalled into another apartment in the same process, a window of the
-     * following class is created. The *caller* of CoMarshalInterface (i.e., the
-     * application) is responsible for pumping the message loop in that thread.
-     * The WM_USER messages which point to the RPCs are then dispatched to
-     * apartment_wndproc by the user's code from the apartment in which the
-     * interface was unmarshalled.
-     */
-    memset(&wclass, 0, sizeof(wclass));
-    wclass.lpfnWndProc = apartment_wndproc;
-    wclass.hInstance = hProxyDll;
-    wclass.lpszClassName = aptwinclassW;
-    apt_win_class = RegisterClassW(&wclass);
-    return TRUE;
-}
-
-/* create a window for the apartment or return the current one if one has
- * already been created */
-HRESULT apartment_createwindowifneeded(struct apartment *apt)
-{
-    static INIT_ONCE class_init_once = INIT_ONCE_STATIC_INIT;
-
-    if (apt->multi_threaded)
-        return S_OK;
-
-    if (!apt->win)
-    {
-        HWND hwnd;
-
-        InitOnceExecuteOnce( &class_init_once, register_class, NULL, NULL );
-
-        hwnd = CreateWindowW(aptwinclassW, NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, 0, hProxyDll, NULL);
-        if (!hwnd)
-        {
-            ERR("CreateWindow failed with error %d\n", GetLastError());
-            return HRESULT_FROM_WIN32(GetLastError());
-        }
-        if (InterlockedCompareExchangePointer((void **)&apt->win, hwnd, NULL))
-            /* someone beat us to it */
-            DestroyWindow(hwnd);
-    }
-
-    return S_OK;
-}
-
-/* retrieves the window for the main- or apartment-threaded apartment */
-HWND apartment_getwindow(const struct apartment *apt)
-{
-    assert(!apt->multi_threaded);
-    return apt->win;
-}
-
-OXID apartment_getoxid(const struct apartment *apt)
-{
-    return apt->oxid;
-}
-
-void apartment_global_cleanup(void)
-{
-    if (apt_win_class)
-        UnregisterClassW((const WCHAR *)MAKEINTATOM(apt_win_class), hProxyDll);
-    apartment_release_dlls();
-    DeleteCriticalSection(&apt_cs);
+/*++
+
+Copyright (c) 2023 Shorthorn Project
+
+Module Name:
+
+    main.c
+
+Abstract:
+
+    This module implements COM Apartment functions APIs
+
+Author:
+
+    Skulltrail 12-October-2023
+
+Revision History:
+
+--*/
+
+#include "main.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(ole32);
+
+BOOLEAN g_cMTAInits;  // Global variables within ole32 itself
+DWORD gdwMainThreadId;
+
+HRESULT WINAPI CoGetApartmentType(APTTYPE *pAptType, APTTYPEQUALIFIER *pAptQualifier)
+/* 
+    win32 - March 7 2021
+	An important OLE function introduced in Windows 7, but should be usable in NT 4 and above.
+*/
+{
+  HRESULT Status; 
+  BOOLEAN MTAInit; 
+  SOleTlsData* ReservedForOle; 
+  DWORD CurrentThreadId; 
+  DWORD OleFlags; 
+  APTTYPE AptTypeTemp; 
+  APTTYPEQUALIFIER AptQualifierTemp; 
+  TEB *CurrentThreadInfo;
+
+  Status = S_OK;
+  if ( !pAptType || !pAptQualifier )
+    return E_INVALIDARG;
+  *pAptType = APTTYPE_CURRENT;
+  *pAptQualifier = APTTYPEQUALIFIER_NONE;
+  MTAInit = FALSE;
+  CurrentThreadInfo = NtCurrentTeb();
+  ReservedForOle = (SOleTlsData*) CurrentThreadInfo->ReservedForOle;
+  if ( g_cMTAInits )
+    MTAInit = TRUE;
+  // The following is a GetCurrentThreadId() replacement.
+  // NtCurrentTeb()->UniqueThread.ClientId or NtCurrentTeb() + 48h (AMD64) or NtCurrentTeb() + 24h (X86)
+  CurrentThreadId = (DWORD)CurrentThreadInfo->ClientId.UniqueThread;
+
+  if ( !ReservedForOle )
+  {
+    if ( MTAInit )
+      goto ImplicitMTA;
+    return CO_E_NOTINITIALIZED;
+  }
+  OleFlags = ReservedForOle->dwFlags;
+  if ( (OleFlags & 0x800) == 0 )
+  {
+    if ( (OleFlags & 0x80) != 0 )
+    {
+      AptTypeTemp = APTTYPE_STA;
+      if ( CurrentThreadId == gdwMainThreadId )
+        AptTypeTemp = APTTYPE_MAINSTA;
+      *pAptType = AptTypeTemp;
+      if ( (OleFlags & 0x400000) != 0 )
+        *pAptQualifier = APTTYPEQUALIFIER_APPLICATION_STA;
+   
+      if ( (OleFlags & 0x40000000) != 0 )
+        *pAptQualifier = APTTYPEQUALIFIER_RESERVED_1;
+      return Status;
+    }
+    if ( (OleFlags & 0x1100) != 0 )
+    {
+      *pAptType = APTTYPE_MTA;
+      return Status;
+    }
+    if ( MTAInit )
+    {
+ImplicitMTA:
+      *pAptType = APTTYPE_MTA;
+      *pAptQualifier = APTTYPEQUALIFIER_IMPLICIT_MTA;
+      return Status;
+    }
+    return CO_E_NOTINITIALIZED;
+  }
+  AptQualifierTemp = APTTYPEQUALIFIER_NA_ON_MTA;
+  *pAptType = APTTYPE_NA;
+  if ( (OleFlags & 0x80) != 0 )
+  {
+    AptQualifierTemp = APTTYPEQUALIFIER_NA_ON_STA;
+    if ( CurrentThreadId == gdwMainThreadId )
+      AptQualifierTemp = APTTYPEQUALIFIER_NA_ON_MAINSTA;
+    *pAptQualifier = AptQualifierTemp;
+	return Status;
+  }
+  if ( (OleFlags & 0x1100) != 0 )
+  {
+    *pAptQualifier = AptQualifierTemp;
+    return Status;
+  }
+  if ( MTAInit )
+  {
+    *pAptQualifier = APTTYPEQUALIFIER_NA_ON_IMPLICIT_MTA;
+    return Status;
+  }
+  return E_FAIL;
 }
diff --git a/wrappers/new-dlls/combase/combase.spec b/wrappers/new-dlls/combase/combase.spec
index 0437714edc..261a84cbca 100644
--- a/wrappers/new-dlls/combase/combase.spec
+++ b/wrappers/new-dlls/combase/combase.spec
@@ -1,148 +1,86 @@
-@ stub ObjectStublessClient3
-@ stub ObjectStublessClient4
-@ stub ObjectStublessClient5
-@ stub ObjectStublessClient6
-@ stub ObjectStublessClient7
-@ stub ObjectStublessClient8
-@ stub ObjectStublessClient9
-@ stub ObjectStublessClient10
-@ stub ObjectStublessClient11
-@ stub ObjectStublessClient12
-@ stub ObjectStublessClient13
-@ stub ObjectStublessClient14
-@ stub ObjectStublessClient15
-@ stub ObjectStublessClient16
-@ stub ObjectStublessClient17
-@ stub ObjectStublessClient18
-@ stub ObjectStublessClient19
-@ stub ObjectStublessClient20
-@ stub ObjectStublessClient21
-@ stub ObjectStublessClient22
-@ stub ObjectStublessClient23
-@ stub ObjectStublessClient24
-@ stub ObjectStublessClient25
-@ stub ObjectStublessClient26
-@ stub ObjectStublessClient27
-@ stub ObjectStublessClient28
-@ stub ObjectStublessClient29
-@ stub ObjectStublessClient30
-@ stub ObjectStublessClient31
-@ stub ObjectStublessClient32
-@ stub NdrProxyForwardingFunction3
-@ stub NdrProxyForwardingFunction4
-@ stub NdrProxyForwardingFunction5
-@ stub NdrProxyForwardingFunction6
-@ stub NdrProxyForwardingFunction7
-@ stub NdrProxyForwardingFunction8
-@ stub NdrProxyForwardingFunction9
-@ stub NdrProxyForwardingFunction10
-@ stub NdrProxyForwardingFunction11
-@ stub NdrProxyForwardingFunction12
-@ stub NdrProxyForwardingFunction13
-@ stub NdrProxyForwardingFunction14
-@ stub NdrProxyForwardingFunction15
-@ stub NdrProxyForwardingFunction16
-@ stub NdrProxyForwardingFunction17
-@ stub NdrProxyForwardingFunction18
-@ stub NdrProxyForwardingFunction19
-@ stub NdrProxyForwardingFunction20
-@ stub NdrProxyForwardingFunction21
-@ stub NdrProxyForwardingFunction22
-@ stub NdrProxyForwardingFunction23
-@ stub NdrProxyForwardingFunction24
-@ stub NdrProxyForwardingFunction25
-@ stub NdrProxyForwardingFunction26
-@ stub NdrProxyForwardingFunction27
-@ stub NdrProxyForwardingFunction28
-@ stub NdrProxyForwardingFunction29
-@ stub NdrProxyForwardingFunction30
-@ stub NdrProxyForwardingFunction31
-@ stub NdrProxyForwardingFunction32
-@ stub NdrOleInitializeExtension
-@ stub RoFailFastWithErrorContextInternal2
-@ stub RoFailFastWithErrorContextInternal
-@ stub UpdateProcessTracing
+@ stdcall PropVariantChangeType(ptr ptr long long) olebase.PropVariantChangeType
+@ stdcall BindMoniker(ptr long ptr ptr)
 @ stdcall CLIPFORMAT_UserFree(ptr ptr)
 @ stdcall CLIPFORMAT_UserMarshal(ptr ptr ptr)
 @ stdcall CLIPFORMAT_UserSize(ptr long ptr)
 @ stdcall CLIPFORMAT_UserUnmarshal(ptr ptr ptr)
-@ stub CLSIDFromOle1Class
+@ stdcall CLSIDFromOle1Class(wstr ptr ptr) olebase.CLSIDFromOle1Class
 @ stdcall CLSIDFromProgID(wstr ptr)
 @ stdcall CLSIDFromProgIDEx(wstr ptr)
 @ stdcall CLSIDFromString(wstr ptr)
-@ stub CleanupOleStateInAllTls
-@ stdcall CleanupTlsOleState(ptr)
-@ stub ClearCleanupFlag
 @ stdcall CoAddRefServerProcess()
-@ stub CoAllowUnmarshalerCLSID
-@ stub CoCancelCall
+@ stdcall CoAllowSetForegroundWindow(ptr ptr)
+@ stdcall CoBuildVersion()
+@ stdcall CoCancelCall(ptr long)
 @ stdcall CoCopyProxy(ptr ptr)
-@ stdcall CoCreateErrorInfo(ptr) CreateErrorInfo
 @ stdcall CoCreateFreeThreadedMarshaler(ptr ptr)
 @ stdcall CoCreateGuid(ptr)
 @ stdcall CoCreateInstance(ptr ptr long ptr ptr)
 @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr)
-@ stdcall CoCreateInstanceFromApp(ptr ptr long ptr long ptr)
-@ stub CoCreateObjectInContext
-@ stub CoDeactivateObject
-@ stub CoDecodeProxy
-@ stdcall CoDecrementMTAUsage(ptr)
+@ stdcall CoCreateObjectInContext(ptr ptr ptr ptr) olebase.CoCreateObjectInContext
+@ stdcall CoDeactivateObject(long long) olebase.CoDeactivateObject
 @ stdcall CoDisableCallCancellation(ptr)
-@ stub CoDisconnectContext
 @ stdcall CoDisconnectObject(ptr long)
+@ stdcall CoDosDateTimeToFileTime(long long ptr) kernel32.DosDateTimeToFileTime
 @ stdcall CoEnableCallCancellation(ptr)
 @ stdcall CoFileTimeNow(ptr)
+@ stdcall CoFileTimeToDosDateTime(ptr ptr ptr) kernel32.FileTimeToDosDateTime
+@ stdcall CoFreeAllLibraries()
+@ stdcall CoFreeLibrary(long)
 @ stdcall CoFreeUnusedLibraries()
 @ stdcall CoFreeUnusedLibrariesEx(long long)
-@ stdcall CoGetActivationState(int128 long ptr)
-@ stub CoGetApartmentID
-@ stdcall CoGetApartmentType(ptr ptr)
+@ stdcall CoGetApartmentID(long ptr) olebase.CoGetApartmentID
 @ stdcall CoGetCallContext(ptr ptr)
-@ stdcall CoGetCallState(long ptr)
 @ stdcall CoGetCallerTID(ptr)
-@ stub CoGetCancelObject
+@ stdcall CoGetCancelObject(long ptr ptr)
 @ stdcall CoGetClassObject(ptr long ptr ptr ptr)
-@ stub CoGetClassVersion
+@ stdcall CoGetClassVersion(ptr ptr ptr) olebase.CoGetClassVersion
+@ stdcall CoGetComCatalog(long ptr) olebase.CoGetComCatalog
 @ stdcall CoGetContextToken(ptr)
 @ stdcall CoGetCurrentLogicalThreadId(ptr)
 @ stdcall CoGetCurrentProcess()
 @ stdcall CoGetDefaultContext(long ptr ptr)
-@ stdcall CoGetErrorInfo(long ptr) GetErrorInfo
 @ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr)
 @ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr)
+@ stdcall CoGetInterceptor(long ptr long ptr)
+@ stdcall CoGetInterceptorFromTypeInfo(long ptr ptr long ptr)
 @ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr)
 @ stdcall CoGetMalloc(long ptr)
 @ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long)
-@ stub CoGetModuleType
+@ stdcall CoGetObject(wstr ptr ptr ptr)
 @ stdcall CoGetObjectContext(ptr ptr)
 @ stdcall CoGetPSClsid(ptr ptr)
-@ stub CoGetProcessIdentifier
+@ stdcall CoGetProcessIdentifier(ptr) olebase.CoGetProcessIdentifier
 @ stdcall CoGetStandardMarshal(ptr ptr long ptr long ptr)
-@ stub CoGetStdMarshalEx
-@ stub CoGetSystemSecurityPermissions
+@ stdcall CoGetState(ptr) olebase.CoGetState
+@ stdcall CoGetStdMarshalEx(ptr long ptr)
+@ stdcall CoGetSystemSecurityPermissions(long ptr) olebase.CoGetSystemSecurityPermissions
 @ stdcall CoGetTreatAsClass(ptr ptr)
 @ stdcall CoImpersonateClient()
-@ stdcall CoIncrementMTAUsage(ptr)
+@ stdcall CoInitialize(ptr)
 @ stdcall CoInitializeEx(ptr long)
 @ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr)
 @ stdcall CoInitializeWOW(long long)
-@ stub CoInvalidateRemoteMachineBindings
+@ stdcall CoInstall(ptr long ptr ptr wstr) olebase.CoInstall
+@ stdcall CoInvalidateRemoteMachineBindings(str) olebase.CoInvalidateRemoteMachineBindings
 @ stdcall CoIsHandlerConnected(ptr)
+@ stdcall CoIsOle1Class (ptr)
+@ stdcall CoLoadLibrary(wstr long)
 @ stdcall CoLockObjectExternal(ptr long long)
 @ stdcall CoMarshalHresult(ptr long)
 @ stdcall CoMarshalInterThreadInterfaceInStream(ptr ptr ptr)
 @ stdcall CoMarshalInterface(ptr ptr ptr long ptr long)
-@ stub CoPopServiceDomain
-@ stub CoPushServiceDomain
-@ stub CoQueryAuthenticationServices
+@ stdcall CoPopServiceDomain(ptr) olebase.CoPopServiceDomain
+@ stdcall CoPushServiceDomain(ptr) olebase.CoPushServiceDomain
+@ stdcall CoQueryAuthenticationServices(ptr ptr)
 @ stdcall CoQueryClientBlanket(ptr ptr ptr ptr ptr ptr ptr)
 @ stdcall CoQueryProxyBlanket(ptr ptr ptr ptr ptr ptr ptr ptr)
-@ stub CoReactivateObject
-@ stub CoRegisterActivationFilter
+@ stdcall CoQueryReleaseObject(ptr)
+@ stdcall CoReactivateObject(long ptr) olebase.CoReactivateObject
 @ stdcall CoRegisterChannelHook(ptr ptr)
 @ stdcall CoRegisterClassObject(ptr ptr long long ptr)
 @ stdcall CoRegisterInitializeSpy(ptr ptr)
-@ stdcall CoRegisterMallocSpy(ptr)
+@ stdcall CoRegisterMallocSpy (ptr)
 @ stdcall CoRegisterMessageFilter(ptr ptr)
 @ stdcall CoRegisterPSClsid(ptr ptr)
 @ stdcall CoRegisterSurrogate(ptr)
@@ -150,44 +88,62 @@
 @ stdcall CoReleaseMarshalData(ptr)
 @ stdcall CoReleaseServerProcess()
 @ stdcall CoResumeClassObjects()
-@ stub CoRetireServer
+@ stdcall CoRetireServer(ptr) olebase.CoRetireServer
 @ stdcall CoRevertToSelf()
 @ stdcall CoRevokeClassObject(long)
 @ stdcall CoRevokeInitializeSpy(int64)
 @ stdcall CoRevokeMallocSpy()
-@ stub CoSetCancelObject
-@ stdcall CoSetErrorInfo(long ptr) SetErrorInfo
+@ stdcall CoSetCancelObject(ptr) olebase.CoSetCancelObject
 @ stdcall CoSetProxyBlanket(ptr long long ptr long long ptr long)
+@ stdcall CoSetState(ptr)
 @ stdcall CoSuspendClassObjects()
 @ stdcall CoSwitchCallContext(ptr ptr)
 @ stdcall CoTaskMemAlloc(long)
 @ stdcall CoTaskMemFree(ptr)
 @ stdcall CoTaskMemRealloc(ptr long)
-@ stub CoTestCancel
+@ stdcall CoTestCancel() olebase.CoTestCancel
+@ stdcall CoTreatAsClass(ptr ptr)
 @ stdcall CoUninitialize()
-@ stub CoUnloadingWOW
+@ stdcall CoUnloadingWOW(long)
 @ stdcall CoUnmarshalHresult(ptr ptr)
 @ stdcall CoUnmarshalInterface(ptr ptr ptr)
-@ stub CoVrfCheckThreadState
-@ stub CoVrfGetThreadState
-@ stub CoVrfReleaseThreadState
 @ stdcall CoWaitForMultipleHandles(long long long ptr ptr)
-@ stub CoWaitForMultipleObjects
+@ stdcall ComPs_NdrDllCanUnloadNow(ptr) olebase.ComPs_NdrDllCanUnloadNow
+@ stdcall ComPs_NdrDllGetClassObject(long long ptr ptr ptr ptr) olebase.ComPs_NdrDllGetClassObject
+@ stdcall ComPs_NdrDllRegisterProxy(ptr ptr ptr ptr ptr) olebase.ComPs_NdrDllRegisterProxy
+@ stdcall ComPs_NdrDllUnregisterProxy(ptr ptr ptr ptr ptr) olebase.ComPs_NdrDllUnregisterProxy
+@ stdcall CreateAntiMoniker(ptr)
+@ stdcall CreateBindCtx(long ptr)
+@ stdcall CreateClassMoniker(ptr ptr)
+@ stdcall CreateDataAdviseHolder(ptr)
+@ stdcall CreateDataCache(ptr ptr ptr ptr)
 @ stdcall CreateErrorInfo(ptr)
+@ stdcall CreateFileMoniker(wstr ptr)
+@ stdcall CreateGenericComposite(ptr ptr ptr)
+@ stdcall CreateILockBytesOnHGlobal(ptr long ptr)
+@ stdcall CreateItemMoniker(wstr wstr ptr)
+@ stdcall CreateObjrefMoniker(ptr ptr)
+@ stdcall CreateOleAdviseHolder(ptr)
+@ stdcall CreatePointerMoniker(ptr ptr)
+@ stdcall CreateStdProgressIndicator(ptr str ptr ptr) olebase.CreateStdProgressIndicator
 @ stdcall CreateStreamOnHGlobal(ptr long ptr)
-@ stub DcomChannelSetHResult
+@ stdcall DcomChannelSetHResult(ptr ptr ptr) olebase.DcomChannelSetHResult
 @ stdcall DllDebugObjectRPCHook(long ptr)
-@ stdcall DllGetActivationFactory(ptr ptr)
-@ stdcall -private DllGetClassObject(ptr ptr ptr)
-@ stub EnableHookObject
+@ stdcall DllGetClassObject(ptr ptr ptr)
+@ stdcall DllGetClassObjectWOW(long ptr ptr)
+@ stdcall DllRegisterServer()
+@ stdcall DoDragDrop(ptr ptr long ptr)
+@ stdcall EnableHookObject(long ptr)
+@ stdcall FmtIdToPropStgName(ptr wstr)
 @ stdcall FreePropVariantArray(long ptr)
-@ stub FreePropVariantArrayWorker
-@ stub GetCatalogHelper
+@ stdcall GetClassFile(wstr ptr)
+@ stdcall GetConvertStg(ptr)
+@ stdcall GetDocumentBitStg(ptr)
 @ stdcall GetErrorInfo(long ptr)
-@ stub GetFuncDescs
+@ stdcall GetHGlobalFromILockBytes(ptr ptr)
 @ stdcall GetHGlobalFromStream(ptr ptr)
-@ stub GetHookInterface
-@ stdcall GetRestrictedErrorInfo(ptr)
+@ stdcall GetHookInterface(ptr)
+@ stdcall GetRunningObjectTable(long ptr)
 @ stdcall HACCEL_UserFree(ptr ptr)
 @ stdcall HACCEL_UserMarshal(ptr ptr ptr)
 @ stdcall HACCEL_UserSize(ptr long ptr)
@@ -198,12 +154,16 @@
 @ stdcall HBITMAP_UserUnmarshal(ptr ptr ptr)
 @ stdcall HBRUSH_UserFree(ptr ptr)
 @ stdcall HBRUSH_UserMarshal(ptr ptr ptr)
-@ stdcall HBRUSH_UserSize(ptr long ptr)
+@ stdcall HBRUSH_UserSize(ptr ptr)
 @ stdcall HBRUSH_UserUnmarshal(ptr ptr ptr)
 @ stdcall HDC_UserFree(ptr ptr)
 @ stdcall HDC_UserMarshal(ptr ptr ptr)
 @ stdcall HDC_UserSize(ptr long ptr)
 @ stdcall HDC_UserUnmarshal(ptr ptr ptr)
+@ stdcall HENHMETAFILE_UserFree(ptr ptr)
+@ stdcall HENHMETAFILE_UserMarshal(ptr ptr ptr)
+@ stdcall HENHMETAFILE_UserSize(ptr long ptr)
+@ stdcall HENHMETAFILE_UserUnmarshal(ptr ptr ptr)
 @ stdcall HGLOBAL_UserFree(ptr ptr)
 @ stdcall HGLOBAL_UserMarshal(ptr ptr ptr)
 @ stdcall HGLOBAL_UserSize(ptr long ptr)
@@ -216,138 +176,261 @@
 @ stdcall HMENU_UserMarshal(ptr ptr ptr)
 @ stdcall HMENU_UserSize(ptr long ptr)
 @ stdcall HMENU_UserUnmarshal(ptr ptr ptr)
+@ stdcall HMETAFILEPICT_UserFree(ptr ptr)
+@ stdcall HMETAFILEPICT_UserMarshal(ptr ptr ptr)
+@ stdcall HMETAFILEPICT_UserSize(ptr long ptr)
+@ stdcall HMETAFILEPICT_UserUnmarshal(ptr ptr ptr)
+@ stdcall HMETAFILE_UserFree(ptr ptr)
+@ stdcall HMETAFILE_UserMarshal(ptr ptr ptr)
+@ stdcall HMETAFILE_UserSize(ptr long ptr)
+@ stdcall HMETAFILE_UserUnmarshal(ptr ptr ptr)
 @ stdcall HPALETTE_UserFree(ptr ptr)
 @ stdcall HPALETTE_UserMarshal(ptr ptr ptr)
 @ stdcall HPALETTE_UserSize(ptr long ptr)
 @ stdcall HPALETTE_UserUnmarshal(ptr ptr ptr)
-@ stub HSTRING_UserFree
-@ stub -arch=win64 HSTRING_UserFree64
-@ stub HSTRING_UserMarshal
-@ stub -arch=win64 HSTRING_UserMarshal64
-@ stub HSTRING_UserSize
-@ stub -arch=win64 HSTRING_UserSize64
-@ stub HSTRING_UserUnmarshal
-@ stub -arch=win64 HSTRING_UserUnmarshal64
 @ stdcall HWND_UserFree(ptr ptr)
 @ stdcall HWND_UserMarshal(ptr ptr ptr)
 @ stdcall HWND_UserSize(ptr long ptr)
 @ stdcall HWND_UserUnmarshal(ptr ptr ptr)
-@ stub HkOleRegisterObject
+@ stdcall  HkOleRegisterObject(ptr ptr ptr long) olebase.HkOleRegisterObject
 @ stdcall IIDFromString(wstr ptr)
-@ stub InternalAppInvokeExceptionFilter
-@ stub InternalCCFreeUnused
-@ stub InternalCCGetClassInformationForDde
-@ stub InternalCCGetClassInformationFromKey
-@ stub InternalCCSetDdeServerWindow
-@ stub InternalCMLSendReceive
-@ stub InternalCallAsProxyExceptionFilter
-@ stub InternalCallFrameExceptionFilter
-@ stub InternalCallerIsAppContainer
-@ stub InternalCanMakeOutCall
-@ stub InternalCoIsSurrogateProcess
-@ stub InternalCoRegisterDisconnectCallback
-@ stub InternalCoRegisterSurrogatedObject
-@ stdcall InternalCoStdMarshalObject(ptr long ptr ptr)
-@ stub InternalCoUnregisterDisconnectCallback
-@ stub InternalCompleteObjRef
-@ stub InternalCreateCAggId
-@ stub InternalCreateIdentityHandler
-@ stub InternalDoATClassCreate
-@ stub InternalFillLocalOXIDInfo
-@ stub InternalFreeObjRef
-@ stub InternalGetWindowPropInterface
-@ stdcall InternalIrotEnumRunning(ptr)
-@ stdcall InternalIrotGetObject(ptr ptr ptr)
-@ stdcall InternalIrotGetTimeOfLastChange(ptr ptr)
-@ stdcall InternalIrotIsRunning(ptr)
-@ stdcall InternalIrotNoteChangeTime(long ptr)
-@ stdcall InternalIrotRegister(ptr ptr ptr ptr long ptr ptr)
-@ stdcall InternalIrotRevoke(long ptr ptr ptr)
-@ stub InternalIsApartmentInitialized
-@ stdcall InternalIsProcessInitialized()
-@ stub InternalMarshalObjRef
-@ stub InternalNotifyDDStartOrStop
-@ stub InternalOleModalLoopBlockFn
-@ stub InternalRegisterWindowPropInterface
-@ stub InternalReleaseMarshalObjRef
-@ stub InternalSTAInvoke
-@ stub InternalServerExceptionFilter
-@ stub InternalSetAptCallCtrlOnTlsIfRequired
-@ stub InternalSetOleThunkWowPtr
-@ stub InternalStubInvoke
-@ stdcall InternalTlsAllocData(ptr)
-@ stub InternalUnmarshalObjRef
-@ stub IsErrorPropagationEnabled
-@ stub NdrExtStubInitialize
-@ stub NdrOleDllGetClassObject
-@ stub NdrpFindInterface
+@ stdcall IsAccelerator(long long ptr long)
+@ stdcall IsEqualGUID(ptr ptr)
+@ stdcall IsValidIid(ptr)
+@ stdcall IsValidInterface(ptr)
+@ stdcall IsValidPtrIn(ptr long)
+@ stdcall IsValidPtrOut(ptr long)
+@ stdcall MkParseDisplayName(ptr ptr ptr ptr)
+@ stdcall MonikerCommonPrefixWith(ptr ptr ptr)
+@ stdcall MonikerRelativePathTo(ptr ptr ptr long)
+@ stdcall OleBuildVersion()
+@ stdcall OleConvertIStorageToOLESTREAM(ptr ptr)
+@ stdcall OleConvertIStorageToOLESTREAMEx(ptr ptr long long long ptr ptr)
+@ stdcall OleConvertOLESTREAMToIStorage(ptr ptr ptr)
+@ stdcall OleConvertOLESTREAMToIStorageEx(ptr ptr ptr ptr ptr ptr ptr)
+@ stdcall OleCreate(ptr ptr long ptr ptr ptr ptr)
+@ stdcall OleCreateDefaultHandler(ptr ptr ptr ptr)
+@ stdcall OleCreateEmbeddingHelper(ptr ptr long ptr ptr ptr)
+@ stdcall OleCreateEx(long long long long long ptr ptr ptr ptr ptr ptr ptr)
+@ stdcall OleCreateFromData(ptr ptr long ptr ptr ptr ptr)
+@ stdcall OleCreateFromDataEx(ptr ptr long long long ptr ptr ptr ptr ptr ptr ptr)
+@ stdcall OleCreateFromFile(ptr ptr ptr long ptr ptr ptr ptr)
+@ stdcall OleCreateFromFileEx(long str long long long long ptr ptr ptr ptr ptr ptr ptr)
+@ stdcall OleCreateLink(ptr ptr long ptr ptr ptr ptr)
+@ stdcall OleCreateLinkEx(ptr long long long long ptr ptr ptr ptr ptr ptr)
+@ stdcall OleCreateLinkFromData(ptr ptr long ptr ptr ptr ptr)
+@ stdcall OleCreateLinkFromDataEx(ptr long long long long ptr ptr ptr ptr ptr ptr ptr)
+@ stdcall OleCreateLinkToFile(ptr ptr long ptr ptr ptr ptr)
+@ stdcall OleCreateLinkToFileEx(str long long long long ptr ptr ptr ptr ptr ptr ptr)
+@ stdcall OleCreateMenuDescriptor(long ptr)
+@ stdcall OleCreateStaticFromData(ptr ptr long ptr ptr ptr ptr)
+@ stdcall OleDestroyMenuDescriptor(long)
+@ stdcall OleDoAutoConvert(ptr ptr)
+@ stdcall OleDraw(ptr long long ptr)
+@ stdcall OleDuplicateData(long long long)
+@ stdcall OleFlushClipboard()
+@ stdcall OleGetAutoConvert(ptr ptr)
+@ stdcall OleGetClipboard(ptr)
+@ stdcall OleGetIconOfClass(ptr ptr long)
+@ stdcall OleGetIconOfFile(str long)
+@ stdcall OleInitialize(ptr)
+@ stdcall OleInitializeWOW(long long)
+@ stdcall OleIsCurrentClipboard(ptr)
+@ stdcall OleIsRunning(ptr)
+@ stdcall OleLoad(ptr ptr ptr ptr)
+@ stdcall OleLoadFromStream(ptr ptr ptr)
+@ stdcall OleLockRunning(ptr long long)
+@ stdcall OleMetafilePictFromIconAndLabel(long ptr ptr long)
+@ stdcall OleNoteObjectVisible(ptr long)
+@ stdcall OleQueryCreateFromData(ptr)
+@ stdcall OleQueryLinkFromData(ptr)
+@ stdcall OleRegEnumFormatEtc(ptr long ptr)
+@ stdcall OleRegEnumVerbs(long ptr)
+@ stdcall OleRegGetMiscStatus(ptr long ptr)
+@ stdcall OleRegGetUserType(long long ptr)
+@ stdcall OleRun(ptr)
+@ stdcall OleSave(ptr ptr long)
+@ stdcall OleSaveToStream(ptr ptr)
+@ stdcall OleSetAutoConvert(ptr ptr)
+@ stdcall OleSetClipboard(ptr)
+@ stdcall OleSetContainedObject(ptr long)
+@ stdcall OleSetMenuDescriptor(long long long ptr ptr)
+@ stdcall OleTranslateAccelerator(ptr ptr ptr)
+@ stdcall OleUninitialize()
+@ stdcall OpenOrCreateStream(ptr str ptr)
 @ stdcall ProgIDFromCLSID(ptr ptr)
+@ stdcall PropStgNameToFmtId(wstr ptr)
+@ stdcall PropSysAllocString(wstr)
+@ stdcall PropSysFreeString(wstr)
 @ stdcall PropVariantClear(ptr)
 @ stdcall PropVariantCopy(ptr ptr)
-@ stub ReleaseFuncDescs
-@ stdcall RoActivateInstance(ptr ptr)
-@ stub RoCaptureErrorContext
-@ stub RoClearError
-@ stub RoFailFastWithErrorContext
-@ stub RoFreeParameterizedTypeExtra
-@ stub RoGetActivatableClassRegistration
-@ stdcall RoGetActivationFactory(ptr ptr ptr)
-@ stub RoGetAgileReference
-@ stdcall RoGetApartmentIdentifier(ptr)
-@ stub RoGetErrorReportingFlags
-@ stub RoGetMatchingRestrictedErrorInfo
-@ stdcall RoGetParameterizedTypeInstanceIID(long ptr ptr ptr ptr)
-@ stdcall RoGetServerActivatableClasses(ptr ptr ptr)
-@ stdcall RoInitialize(long)
-@ stub RoInspectCapturedStackBackTrace
-@ stub RoInspectThreadErrorInfo
-@ stub RoOriginateError
-@ stub RoOriginateErrorW
-@ stdcall RoOriginateLanguageException(long ptr ptr)
-@ stub RoParameterizedTypeExtraGetTypeSignature
-@ stdcall RoRegisterActivationFactories(ptr ptr long ptr)
-@ stdcall RoRegisterForApartmentShutdown(ptr ptr ptr)
-@ stub RoReportCapabilityCheckFailure
-@ stub RoReportFailedDelegate
-@ stub RoReportUnhandledError
-@ stub RoResolveRestrictedErrorInfoReference
-@ stub RoRevokeActivationFactories
-@ stub RoSetErrorReportingFlags
-@ stub RoTransformError
-@ stub RoTransformErrorW
-@ stdcall RoUninitialize()
-@ stub RoUnregisterForApartmentShutdown
-@ stub SetCleanupFlag
+@ stdcall ReadClassStg(ptr ptr)
+@ stdcall ReadClassStm(ptr ptr)
+@ stdcall ReadFmtUserTypeStg(ptr ptr ptr)
+@ stdcall ReadOleStg(ptr ptr ptr ptr ptr ptr)
+@ stdcall ReadStringStream(ptr str)
+@ stdcall RegisterDragDrop(long ptr)
+@ stdcall ReleaseStgMedium(ptr)
+@ stdcall RevokeDragDrop(long)
+@ stdcall SNB_UserFree(ptr ptr)
+@ stdcall SNB_UserMarshal(ptr ptr ptr)
+@ stdcall SNB_UserSize(ptr long ptr)
+@ stdcall SNB_UserUnmarshal(ptr ptr ptr)
+@ stdcall STGMEDIUM_UserFree(ptr ptr)
+@ stdcall STGMEDIUM_UserMarshal(ptr ptr ptr)
+@ stdcall STGMEDIUM_UserSize(ptr long ptr)
+@ stdcall STGMEDIUM_UserUnmarshal(ptr ptr ptr)
+@ stdcall SetConvertStg(ptr long)
+@ stdcall SetDocumentBitStg(ptr long)
 @ stdcall SetErrorInfo(long ptr)
-@ stub SetRestrictedErrorInfo
+@ stdcall StgConvertPropertyToVariant(ptr long ptr ptr)
+@ stdcall StgConvertVariantToProperty(ptr long ptr ptr long long ptr)
+@ stdcall StgCreateDocfile(wstr long long ptr)
+@ stdcall StgCreateDocfileOnILockBytes(ptr long long ptr)
+@ stdcall StgCreatePropSetStg(ptr long ptr)
+@ stdcall StgCreatePropStg(ptr ptr ptr long long ptr)
+@ stdcall StgCreateStorageEx(wstr long long long ptr ptr ptr ptr)
+@ stdcall StgGetIFillLockBytesOnFile(ptr ptr)
+@ stdcall StgGetIFillLockBytesOnILockBytes(ptr ptr)
+@ stdcall StgIsStorageFile(wstr)
+@ stdcall StgIsStorageILockBytes(ptr)
+@ stdcall StgOpenAsyncDocfileOnIFillLockBytes(ptr long long ptr)
+@ stdcall StgOpenPropStg(ptr ptr long long ptr)
+@ stdcall StgOpenStorage(wstr ptr long ptr long ptr)
+@ stdcall StgOpenStorageEx(wstr long long long ptr ptr ptr ptr)
+@ stdcall StgOpenStorageOnHandle(ptr long long long ptr ptr) olebase.StgOpenStorageOnHandle
+@ stdcall StgOpenStorageOnILockBytes(ptr ptr long long long ptr)
+@ stdcall StgPropertyLengthAsVariant(ptr long long long) olebase.StgPropertyLengthAsVariant
+@ stdcall StgSetTimes(wstr ptr ptr ptr )
 @ stdcall StringFromCLSID(ptr ptr)
 @ stdcall StringFromGUID2(ptr ptr long)
 @ stdcall StringFromIID(ptr ptr) StringFromCLSID
-@ stub UpdateDCOMSettings
+@ stdcall UpdateDCOMSettings()
+@ stdcall UtConvertDvtd16toDvtd32(ptr ptr ptr)
+@ stdcall UtConvertDvtd32toDvtd16(ptr ptr ptr)
+@ stdcall UtGetDvtd16Info(ptr ptr)
+@ stdcall UtGetDvtd32Info(ptr ptr)
 @ stdcall WdtpInterfacePointer_UserFree(ptr)
-@ stub -arch=win64 WdtpInterfacePointer_UserFree64
 @ stdcall WdtpInterfacePointer_UserMarshal(ptr long ptr ptr ptr)
-@ stub -arch=win64 WdtpInterfacePointer_UserMarshal64
-@ stdcall WdtpInterfacePointer_UserSize(ptr long long ptr ptr)
-@ stub -arch=win64 WdtpInterfacePointer_UserSize64
+@ stdcall WdtpInterfacePointer_UserSize(ptr long ptr long ptr)
 @ stdcall WdtpInterfacePointer_UserUnmarshal(ptr ptr ptr ptr)
-@ stub -arch=win64 WdtpInterfacePointer_UserUnmarshal64
-@ stdcall WindowsCompareStringOrdinal(ptr ptr ptr)
-@ stdcall WindowsConcatString(ptr ptr ptr)
-@ stdcall WindowsCreateString(wstr long ptr)
-@ stdcall WindowsCreateStringReference(wstr long ptr ptr)
-@ stdcall WindowsDeleteString(ptr)
-@ stdcall WindowsDeleteStringBuffer(ptr)
-@ stdcall WindowsDuplicateString(ptr ptr)
-@ stdcall WindowsGetStringLen(ptr)
-@ stdcall WindowsGetStringRawBuffer(ptr ptr)
-@ stub WindowsInspectString
-@ stdcall WindowsIsStringEmpty(ptr)
-@ stdcall WindowsPreallocateStringBuffer(long ptr ptr)
-@ stdcall WindowsPromoteStringBuffer(ptr ptr)
-@ stub WindowsReplaceString
-@ stdcall WindowsStringHasEmbeddedNull(ptr ptr)
-@ stdcall WindowsSubstring(ptr long ptr)
-@ stdcall WindowsSubstringWithSpecifiedLength(ptr long long ptr)
-@ stdcall WindowsTrimStringEnd(ptr ptr ptr)
-@ stdcall WindowsTrimStringStart(ptr ptr ptr)
+@ stdcall WriteClassStg(ptr ptr)
+@ stdcall WriteClassStm(ptr ptr)
+@ stdcall WriteFmtUserTypeStg(ptr long ptr)
+@ stdcall WriteOleStg(ptr ptr long ptr)
+@ stdcall WriteStringStream(ptr str)
+
+#missing on XP
+@ stdcall CoVrfCheckThreadState(ptr) olebase.CoVrfCheckThreadState
+@ stdcall CoVrfGetThreadState(ptr) olebase.CoVrfGetThreadState
+@ stdcall CoVrfReleaseThreadState(ptr) olebase.CoVrfReleaseThreadState
+@ stdcall UpdateProcessTracing(ptr ptr) olebase.UpdateProcessTracing
+@ stdcall CoGetModuleType(wstr ptr) olebase.CoGetModuleType
+
+#win Vista functions
+@ stdcall CoDisconnectContext(long)
+#Comment because link with propsys cause a error on Office 2010 installation
+; @ stdcall PropVariantToVariant(ptr ptr) propsys.PropVariantToVariant
+; @ stdcall StgDeserializePropVariant(ptr long ptr) propsys.StgDeserializePropVariant
+; @ stdcall StgSerializePropVariant(ptr ptr ptr) propsys.StgSerializePropVariant
+; @ stdcall VariantToPropVariant(ptr ptr) propsys.VariantToPropVariant
+
+#win7 functions
+@ stdcall CoDecrementMTAUsage(ptr)
+@ stdcall CoIncrementMTAUsage(ptr)
+@ stdcall CoGetApartmentType(ptr ptr)
+@ stdcall CoGetActivationState(int128 long ptr)
+@ stdcall CoGetCallState(long ptr)
+
+#for WinXP
+@ stdcall ComPs_CStdStubBuffer_AddRef(ptr) olebase.ComPs_CStdStubBuffer_AddRef
+@ stdcall ComPs_CStdStubBuffer_Connect(ptr ptr) olebase.ComPs_CStdStubBuffer_Connect
+@ stdcall ComPs_CStdStubBuffer_CountRefs(ptr) olebase.ComPs_CStdStubBuffer_CountRefs
+@ stdcall ComPs_CStdStubBuffer_DebugServerQueryInterface(ptr ptr) olebase.ComPs_CStdStubBuffer_DebugServerQueryInterface
+@ stdcall ComPs_CStdStubBuffer_DebugServerRelease(ptr ptr) olebase.ComPs_CStdStubBuffer_DebugServerRelease
+@ stdcall ComPs_CStdStubBuffer_Disconnect(ptr) olebase.ComPs_CStdStubBuffer_Disconnect
+@ stdcall ComPs_CStdStubBuffer_Invoke(ptr ptr ptr) olebase.ComPs_CStdStubBuffer_Invoke
+@ stdcall ComPs_CStdStubBuffer_IsIIDSupported(ptr long) olebase.ComPs_CStdStubBuffer_IsIIDSupported
+@ stdcall ComPs_CStdStubBuffer_QueryInterface(ptr long ptr) olebase.ComPs_CStdStubBuffer_QueryInterface
+@ stdcall ComPs_IUnknown_AddRef_Proxy(ptr) olebase.ComPs_IUnknown_AddRef_Proxy
+@ stdcall ComPs_IUnknown_QueryInterface_Proxy(ptr long ptr) olebase.ComPs_IUnknown_QueryInterface_Proxy 
+@ stdcall ComPs_IUnknown_Release_Proxy(ptr) olebase.ComPs_IUnknown_Release_Proxy 
+@ stdcall ComPs_NdrClientCall2(ptr ptr ptr) olebase.ComPs_NdrClientCall2 
+@ stdcall ComPs_NdrClientCall2_va(ptr ptr ptr) olebase.ComPs_NdrClientCall2_va
+@ stdcall ComPs_NdrCStdStubBuffer2_Release(ptr ptr) olebase.ComPs_NdrCStdStubBuffer2_Release
+@ stdcall ComPs_NdrCStdStubBuffer_Release(ptr ptr) olebase.ComPs_NdrCStdStubBuffer_Release
+@ stdcall ComPs_NdrStubCall2(ptr ptr ptr ptr) olebase.ComPs_NdrStubCall2
+@ stdcall ComPs_NdrStubForwardingFunction(ptr ptr ptr ptr) olebase.ComPs_NdrStubForwardingFunction 
+@ stdcall CoRegisterActivationFilter(ptr) olebase.CoRegisterActivationFilter
+
+#for XP x64
+@ stdcall -arch=x86_64 CLIPFORMAT_UserFree64(ptr ptr) olebase.CLIPFORMAT_UserFree64
+@ stdcall -arch=x86_64 CLIPFORMAT_UserMarshal64(ptr ptr ptr) olebase.CLIPFORMAT_UserMarshal64
+@ stdcall -arch=x86_64 CLIPFORMAT_UserSize64(ptr long ptr) olebase.CLIPFORMAT_UserSize64
+@ stdcall -arch=x86_64 CLIPFORMAT_UserUnmarshal64(ptr ptr ptr) olebase.CLIPFORMAT_UserUnmarshal64
+@ stdcall -arch=x86_64 HACCEL_UserFree64(ptr ptr) olebase.HACCEL_UserFree64
+@ stdcall -arch=x86_64 HACCEL_UserMarshal64(ptr ptr ptr) olebase.HACCEL_UserMarshal64
+@ stdcall -arch=x86_64 HACCEL_UserSize64(ptr long ptr) olebase.HACCEL_UserSize64
+@ stdcall -arch=x86_64 HACCEL_UserUnmarshal64(ptr ptr ptr) olebase.HACCEL_UserUnmarshal64
+@ stdcall -arch=x86_64 HBITMAP_UserFree64(ptr ptr) olebase.HBITMAP_UserFree64
+@ stdcall -arch=x86_64 HBITMAP_UserMarshal64(ptr ptr ptr) olebase.HBITMAP_UserMarshal64
+@ stdcall -arch=x86_64 HBITMAP_UserSize64(ptr long ptr) olebase.HBITMAP_UserSize64
+@ stdcall -arch=x86_64 HBITMAP_UserUnmarshal64(ptr ptr ptr) olebase.HBITMAP_UserUnmarshal64
+@ stdcall -arch=x86_64 HBRUSH_UserFree64(ptr ptr) olebase.HBRUSH_UserFree64
+@ stdcall -arch=x86_64 HBRUSH_UserMarshal64(ptr ptr ptr) olebase.HBRUSH_UserMarshal64
+@ stdcall -arch=x86_64 HBRUSH_UserSize64(ptr ptr) olebase.HBRUSH_UserSize64
+@ stdcall -arch=x86_64 HBRUSH_UserUnmarshal64(ptr ptr ptr) olebase.HBRUSH_UserUnmarshal64
+@ stdcall -arch=x86_64 HDC_UserFree64(ptr ptr) olebase.HDC_UserFree64
+@ stdcall -arch=x86_64 HDC_UserMarshal64(ptr ptr ptr) olebase.HDC_UserMarshal64
+@ stdcall -arch=x86_64 HDC_UserSize64(ptr long ptr) olebase.HDC_UserSize64
+@ stdcall -arch=x86_64 HDC_UserUnmarshal64(ptr ptr ptr) olebase.HDC_UserUnmarshal64
+@ stdcall -arch=x86_64 HENHMETAFILE_UserFree64(ptr ptr) olebase.HENHMETAFILE_UserFree64
+@ stdcall -arch=x86_64 HENHMETAFILE_UserMarshal64(ptr ptr ptr) olebase.HENHMETAFILE_UserMarshal64
+@ stdcall -arch=x86_64 HENHMETAFILE_UserSize64(ptr long ptr) olebase.HENHMETAFILE_UserSize64
+@ stdcall -arch=x86_64 HENHMETAFILE_UserUnmarshal64(ptr ptr ptr) olebase.HENHMETAFILE_UserUnmarshal64
+@ stdcall -arch=x86_64 HGLOBAL_UserFree64(ptr ptr) olebase.HGLOBAL_UserFree64
+@ stdcall -arch=x86_64 HGLOBAL_UserMarshal64(ptr ptr ptr) olebase.HGLOBAL_UserMarshal64
+@ stdcall -arch=x86_64 HGLOBAL_UserSize64(ptr long ptr) olebase.HGLOBAL_UserSize64
+@ stdcall -arch=x86_64 HGLOBAL_UserUnmarshal64(ptr ptr ptr) olebase.HGLOBAL_UserUnmarshal64
+@ stdcall -arch=x86_64 HICON_UserFree64(ptr ptr) olebase.HICON_UserFree64
+@ stdcall -arch=x86_64 HICON_UserMarshal64(ptr ptr ptr) olebase.HICON_UserMarshal64
+@ stdcall -arch=x86_64 HICON_UserSize64(ptr long ptr) olebase.HICON_UserSize64
+@ stdcall -arch=x86_64 HICON_UserUnmarshal64(ptr ptr ptr) olebase.HICON_UserUnmarshal64
+@ stdcall -arch=x86_64 HMENU_UserFree64(ptr ptr) olebase.HMENU_UserFree64
+@ stdcall -arch=x86_64 HMENU_UserMarshal64(ptr ptr ptr) olebase.HMENU_UserMarshal64
+@ stdcall -arch=x86_64 HMENU_UserSize64(ptr long ptr) olebase.HMENU_UserSize64
+@ stdcall -arch=x86_64 HMENU_UserUnmarshal64(ptr ptr ptr) olebase.HMENU_UserUnmarshal64
+@ stdcall -arch=x86_64 HMETAFILE_UserFree64(ptr ptr) olebase.HMETAFILE_UserFree64
+@ stdcall -arch=x86_64 HMETAFILE_UserMarshal64(ptr ptr ptr) olebase.HMETAFILE_UserMarshal64
+@ stdcall -arch=x86_64 HMETAFILE_UserSize64(ptr long ptr) olebase.HMETAFILE_UserSize64
+@ stdcall -arch=x86_64 HMETAFILE_UserUnmarshal64(ptr ptr ptr) olebase.HMETAFILE_UserUnmarshal64
+@ stdcall -arch=x86_64 HMETAFILEPICT_UserFree64(ptr ptr) olebase.HMETAFILEPICT_UserFree64
+@ stdcall -arch=x86_64 HMETAFILEPICT_UserMarshal64(ptr ptr ptr) olebase.HMETAFILEPICT_UserMarshal64
+@ stdcall -arch=x86_64 HMETAFILEPICT_UserSize64(ptr long ptr) olebase.HMETAFILEPICT_UserSize64
+@ stdcall -arch=x86_64 HMETAFILEPICT_UserUnmarshal64(ptr ptr ptr) olebase.HMETAFILEPICT_UserUnmarshal64
+@ stdcall -arch=x86_64 HPALETTE_UserFree64(ptr ptr) olebase.HPALETTE_UserFree64
+@ stdcall -arch=x86_64 HPALETTE_UserMarshal64(ptr ptr ptr) olebase.HPALETTE_UserMarshal64
+@ stdcall -arch=x86_64 HPALETTE_UserSize64(ptr long ptr) olebase.HPALETTE_UserSize64
+@ stdcall -arch=x86_64 HPALETTE_UserUnmarshal64(ptr ptr ptr) olebase.HPALETTE_UserUnmarshal64
+@ stdcall -arch=x86_64 HWND_UserFree64(ptr ptr) olebase.HWND_UserFree64
+@ stdcall -arch=x86_64 HWND_UserMarshal64(ptr ptr ptr) olebase.HWND_UserMarshal64
+@ stdcall -arch=x86_64 HWND_UserSize64(ptr long ptr) olebase.HWND_UserSize64
+@ stdcall -arch=x86_64 HWND_UserUnmarshal64(ptr ptr ptr) olebase.HWND_UserUnmarshal64
+@ stdcall -arch=x86_64 SNB_UserFree64(ptr ptr) olebase.SNB_UserFree64
+@ stdcall -arch=x86_64 SNB_UserMarshal64(ptr ptr ptr) olebase.SNB_UserMarshal64
+@ stdcall -arch=x86_64 SNB_UserSize64(ptr long ptr) olebase.SNB_UserSize64
+@ stdcall -arch=x86_64 SNB_UserUnmarshal64(ptr ptr ptr) olebase.SNB_UserUnmarshal64
+@ stdcall -arch=x86_64 STGMEDIUM_UserFree64(ptr ptr) olebase.STGMEDIUM_UserFree64
+@ stdcall -arch=x86_64 STGMEDIUM_UserMarshal64(ptr ptr ptr) olebase.STGMEDIUM_UserMarshal64
+@ stdcall -arch=x86_64 STGMEDIUM_UserSize64(ptr long ptr) olebase.STGMEDIUM_UserSize64
+@ stdcall -arch=x86_64 STGMEDIUM_UserUnmarshal64(ptr ptr ptr) olebase.STGMEDIUM_UserUnmarshal64
+@ stdcall -arch=x86_64 WdtpInterfacePointer_UserFree64(ptr) olebase.WdtpInterfacePointer_UserFree64
+@ stdcall -arch=x86_64 WdtpInterfacePointer_UserMarshal64(ptr long ptr ptr ptr) olebase.WdtpInterfacePointer_UserMarshal64
+@ stdcall -arch=x86_64 WdtpInterfacePointer_UserSize64(ptr long ptr long ptr) olebase.WdtpInterfacePointer_UserSize64
+@ stdcall -arch=x86_64 WdtpInterfacePointer_UserUnmarshal64(ptr ptr ptr ptr) olebase.WdtpInterfacePointer_UserUnmarshal64
+
+#For Vista Compatibility
+@ stdcall HRGN_UserFree(ptr ptr) olebase.HRGN_UserFree
+@ stdcall HRGN_UserMarshal(ptr ptr ptr) olebase.HRGN_UserMarshal
+@ stdcall HRGN_UserSize(ptr long ptr) olebase.HRGN_UserSize
+@ stdcall HRGN_UserUnmarshal(ptr ptr ptr) olebase.HRGN_UserUnmarshal
\ No newline at end of file
diff --git a/wrappers/new-dlls/combase/main.c b/wrappers/new-dlls/combase/main.c
new file mode 100644
index 0000000000..9045f568f6
--- /dev/null
+++ b/wrappers/new-dlls/combase/main.c
@@ -0,0 +1,70 @@
+/*++
+
+Copyright (c) 2023 Shorthorn Project
+
+Module Name:
+
+    main.c
+
+Abstract:
+
+    This module implements COM Main functions APIs
+
+Author:
+
+    Skulltrail 12-October-2023
+
+Revision History:
+
+--*/
+
+#define WIN32_NO_STATUS
+
+#include "main.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(ole32);
+
+static struct list registered_classes = LIST_INIT(registered_classes);
+
+static CRITICAL_SECTION registered_classes_cs;
+static CRITICAL_SECTION_DEBUG registered_classes_cs_debug =
+{
+    0, 0, &registered_classes_cs,
+    { &registered_classes_cs_debug.ProcessLocksList, &registered_classes_cs_debug.ProcessLocksList },
+      0, 0, { (DWORD_PTR)(__FILE__ ": registered_classes_cs") }
+};
+static CRITICAL_SECTION registered_classes_cs = { &registered_classes_cs_debug, -1, 0, 0, 0, 0 };
+
+/* will create if necessary */
+static inline struct oletls *COM_CurrentInfo(void)
+{
+    if (!NtCurrentTeb()->ReservedForOle)
+        NtCurrentTeb()->ReservedForOle = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct oletls));
+
+    return NtCurrentTeb()->ReservedForOle;
+}
+
+HRESULT 
+WINAPI
+CoDisconnectContext(
+  _In_ DWORD dwTimeout
+)
+{
+	return S_OK;
+}
+
+/***********************************************************************
+ *      CoGetActivationState (ole32.@)
+ */
+HRESULT WINAPI CoGetActivationState(GUID guid, DWORD unknown, DWORD *unknown2)
+{
+    return E_NOTIMPL;
+}
+
+/***********************************************************************
+ *      CoGetCallState (ole32.@)
+ */
+HRESULT WINAPI CoGetCallState(int unknown, PULONG unknown2)
+{
+    return E_NOTIMPL;
+}
\ No newline at end of file
diff --git a/wrappers/new-dlls/combase/main.h b/wrappers/new-dlls/combase/main.h
new file mode 100644
index 0000000000..314ba69329
--- /dev/null
+++ b/wrappers/new-dlls/combase/main.h
@@ -0,0 +1,314 @@
+#include <assert.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+
+#define COBJMACROS
+#define NONAMELESSUNION
+
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
+#include "winreg.h"
+#include "ole2.h"
+#include "ole2ver.h"
+
+#include "wine/unicode.h"
+#include "olestd.h"
+
+#include "wine/list.h"
+
+#include "windef.h"
+#include "winbase.h"
+#include "wtypes.h"
+#include "dcom_p.h"
+#include "winreg.h"
+#include "wine/winternl.h"
+#include "wine/debug.h"
+#include "wine/exception.h"
+#include "servprov.h"
+
+#define APTTYPEQUALIFIER_APPLICATION_STA 6
+#define APTTYPEQUALIFIER_RESERVED_1 7
+
+#define IRPCSS_PROTSEQ {'n','c','a','l','r','p','c',0}
+#define IRPCSS_ENDPOINT {'i','r','p','c','s','s',0}
+
+#define RPCSS_CALL_START \
+    HRESULT hr; \
+    for (;;) { \
+        __TRY {
+
+#define RPCSS_CALL_END \
+        } __EXCEPT(rpc_filter) { \
+            hr = HRESULT_FROM_WIN32(GetExceptionCode()); \
+        } \
+        __ENDTRY \
+        if (hr == HRESULT_FROM_WIN32(RPC_S_SERVER_UNAVAILABLE)) { \
+            if (start_rpcss()) \
+                continue; \
+        } \
+        break; \
+    } \
+    return hr;
+
+/* private flag indicating that the caller does not want to notify the stub
+ * when the proxy disconnects or is destroyed */
+#define SORFP_NOLIFETIMEMGMT SORF_OXRES2
+
+
+/* Since Visual Studio 2012, volatile accesses do not always imply acquire and
+ * release semantics.  We explicitly use ISO volatile semantics, manually
+ * placing barriers as appropriate.
+ */
+#define __WINE_LOAD32_NO_FENCE(src) (*(src))
+
+enum comclass_threadingmodel
+{
+    ThreadingModel_Apartment = 1,
+    ThreadingModel_Free      = 2,
+    ThreadingModel_No        = 3,
+    ThreadingModel_Both      = 4,
+    ThreadingModel_Neutral   = 5
+};
+
+struct apartment;
+typedef struct apartment APARTMENT;
+typedef struct LocalServer LocalServer;
+
+/*
+ * This is a marshallable object exposing registered local servers.
+ * IServiceProvider is used only because it happens meet requirements
+ * and already has proxy/stub code. If more functionality is needed,
+ * a custom interface may be used instead.
+ */
+struct LocalServer
+{
+    PVOID IServiceProvider_iface;//IServiceProvider IServiceProvider_iface; Modified to not implement really functions
+    LONG ref;
+    APARTMENT *apt;
+    IStream *marshal_stream;
+};
+
+struct apartment
+{
+    struct list entry;
+
+    LONG  refs;              /* refcount of the apartment (LOCK) */
+    BOOL multi_threaded;     /* multi-threaded or single-threaded apartment? (RO) */
+    DWORD tid;               /* thread id (RO) */
+    OXID oxid;               /* object exporter ID (RO) */
+    LONG ipidc;              /* interface pointer ID counter, starts at 1 (LOCK) */
+    CRITICAL_SECTION cs;     /* thread safety */
+    struct list proxies;     /* imported objects (CS cs) */
+    struct list stubmgrs;    /* stub managers for exported objects (CS cs) */
+    BOOL remunk_exported;    /* has the IRemUnknown interface for this apartment been created yet? (CS cs) */
+    LONG remoting_started;   /* has the RPC system been started for this apartment? (LOCK) */
+    struct list loaded_dlls; /* list of dlls loaded by this apartment (CS cs) */
+    DWORD host_apt_tid;      /* thread ID of apartment hosting objects of differing threading model (CS cs) */
+    HWND host_apt_hwnd;      /* handle to apartment window of host apartment (CS cs) */
+    struct local_server *local_server; /* A marshallable object exposing local servers (CS cs) */
+    BOOL being_destroyed;    /* is currently being destroyed */
+
+    /* FIXME: OIDs should be given out by RPCSS */
+    OID oidc;                /* object ID counter, starts at 1, zero is invalid OID (CS cs) */
+
+    /* STA-only fields */
+    HWND win;                /* message window (LOCK) */
+    IMessageFilter *filter;  /* message filter (CS cs) */
+    BOOL main;               /* is this a main-threaded-apartment? (RO) */
+
+    /* MTA-only */
+    struct list usage_cookies; /* Used for refcount control with CoIncrementMTAUsage()/CoDecrementMTAUsage(). */
+};
+
+/* this is what is stored in TEB->ReservedForOle */
+struct oletls
+{
+    struct apartment *apt;
+    IErrorInfo       *errorinfo;   /* see errorinfo.c */
+    IUnknown         *state;       /* see CoSetState */
+    DWORD             apt_mask;    /* apartment mask (+0Ch on x86) */
+    IInitializeSpy   *spy;         /* The "SPY" from CoInitializeSpy */
+    DWORD            inits;        /* number of times CoInitializeEx called */
+    DWORD            ole_inits;    /* number of times OleInitialize called */
+    GUID             causality_id; /* unique identifier for each COM call */
+    LONG             pending_call_count_client; /* number of client calls pending */
+    LONG             pending_call_count_server; /* number of server calls pending */
+    DWORD            unknown;
+    IObjContext     *context_token; /* (+38h on x86) */
+    IUnknown        *call_state;    /* current call context (+3Ch on x86) */
+    DWORD            unknown2[46];
+    IUnknown        *cancel_object; /* cancel object set by CoSetCancelObject (+F8h on x86) */
+};
+
+typedef HRESULT (WINAPI *DllGetClassObjectFunc)(REFCLSID clsid, REFIID iid, void **obj);
+typedef HRESULT (WINAPI *DllCanUnloadNowFunc)(void);
+
+struct opendll
+{
+    LONG refs;
+    LPWSTR library_name;
+    HANDLE library;
+    DllGetClassObjectFunc DllGetClassObject;
+    DllCanUnloadNowFunc DllCanUnloadNow;
+    struct list entry;
+};
+
+struct apartment_loaded_dll
+{
+    struct list entry;
+    struct opendll *dll;
+    DWORD unload_time;
+    BOOL multi_threaded;
+};
+
+struct registered_class
+{
+    struct list entry;
+    CLSID clsid;
+    OXID apartment_id;
+    IUnknown *object;
+    DWORD clscontext;
+    DWORD flags;
+    unsigned int cookie;
+    unsigned int rpcss_cookie;
+};
+
+
+/* imported object / proxy manager */
+struct proxy_manager
+{
+    IMultiQI IMultiQI_iface;
+    IMarshal IMarshal_iface;
+    IClientSecurity IClientSecurity_iface;
+    struct apartment *parent; /* owning apartment (RO) */
+    struct list entry;        /* entry in apartment (CS parent->cs) */
+    OXID oxid;                /* object exported ID (RO) */
+    OXID_INFO oxid_info;      /* string binding, ipid of rem unknown and other information (RO) */
+    OID oid;                  /* object ID (RO) */
+    struct list interfaces;   /* imported interfaces (CS cs) */
+    LONG refs;                /* proxy reference count (LOCK); 0 if about to be removed from list */
+    CRITICAL_SECTION cs;      /* thread safety for this object and children */
+    ULONG sorflags;           /* STDOBJREF flags (RO) */
+    IRemUnknown *remunk;      /* proxy to IRemUnknown used for lifecycle management (CS cs) */
+    HANDLE remoting_mutex;    /* mutex used for synchronizing access to IRemUnknown */
+    MSHCTX dest_context;      /* context used for activating optimisations (LOCK) */
+    void *dest_context_data;  /* reserved context value (LOCK) */
+};
+
+/* imported interface proxy */
+struct ifproxy
+{
+    struct list entry;       /* entry in proxy_manager list (CS parent->cs) */
+    struct proxy_manager *parent; /* owning proxy_manager (RO) */
+    void *iface;             /* interface pointer (RO) */
+    STDOBJREF stdobjref;     /* marshal data that represents this object (RO) */
+    IID iid;                 /* interface ID (RO) */
+    IRpcProxyBuffer *proxy;  /* interface proxy (RO) */
+    ULONG refs;              /* imported (public) references (LOCK) */
+    IRpcChannelBuffer *chan; /* channel to object (CS parent->cs) */
+};
+
+enum tlsdata_flags
+{
+    OLETLS_UUIDINITIALIZED = 0x2,
+    OLETLS_DISABLE_OLE1DDE = 0x40,
+    OLETLS_APARTMENTTHREADED = 0x80,
+    OLETLS_MULTITHREADED = 0x100,
+};
+
+/* this is what is stored in TEB->ReservedForOle */
+struct tlsdata
+{
+    struct apartment *apt;
+    IErrorInfo       *errorinfo;
+    DWORD             thread_seqid;  /* returned with CoGetCurrentProcess */
+    DWORD             flags;         /* tlsdata_flags (+0Ch on x86) */
+    void             *unknown0;
+    DWORD             inits;         /* number of times CoInitializeEx called */
+    DWORD             ole_inits;     /* number of times OleInitialize called */
+    GUID              causality_id;  /* unique identifier for each COM call */
+    LONG              pending_call_count_client; /* number of client calls pending */
+    LONG              pending_call_count_server; /* number of server calls pending */
+    DWORD             unknown;
+    IObjContext      *context_token; /* (+38h on x86) */
+    IUnknown         *call_state;    /* current call context (+3Ch on x86) */
+    DWORD             unknown2[46];
+    IUnknown         *cancel_object; /* cancel object set by CoSetCancelObject (+F8h on x86) */
+    IUnknown         *state;         /* see CoSetState */
+    struct list       spies;         /* Spies installed with CoRegisterInitializeSpy */
+    DWORD             spies_lock;
+    DWORD             cancelcount;
+};
+
+typedef struct _SOleTlsData {
+  void  *pvReserved0[2];
+  DWORD dwReserved0[3];
+  void  *pvReserved1[1];
+  DWORD dwReserved1[3];
+  void  *pvReserved2[4];
+  DWORD dwReserved2[1];
+  DWORD dwFlags;
+  void  *pCurrentCtx;
+} SOleTlsData, *PSOleTlsData;
+
+extern HRESULT WINAPI InternalTlsAllocData(struct tlsdata **data);
+
+static inline HRESULT com_get_tlsdata(struct tlsdata **data)
+{
+    *data = NtCurrentTeb()->ReservedForOle;
+    return *data ? S_OK : InternalTlsAllocData(data);
+}
+
+static inline struct apartment* com_get_current_apt(void)
+{
+    struct tlsdata *tlsdata = NULL;
+    com_get_tlsdata(&tlsdata);
+    return tlsdata->apt;
+}
+
+HRESULT apartment_increment_mta_usage(CO_MTA_USAGE_COOKIE *cookie);
+
+void apartment_decrement_mta_usage(CO_MTA_USAGE_COOKIE cookie);
+
+void apartment_revoke_all_classes(const struct apartment *apt);
+
+LONG WINAPI rpc_filter(EXCEPTION_POINTERS *eptr);
+
+BOOL start_rpcss(void);
+
+HRESULT apartment_disconnectproxies(struct apartment *apt);
+
+static DWORD apartment_addref(struct apartment *apt);
+
+struct apartment * apartment_get_mta(void);
+
+static HRESULT proxy_manager_get_remunknown(struct proxy_manager * This, IRemUnknown **remunk);
+
+HRESULT rpc_revoke_local_server(unsigned int cookie);
+
+struct apartment * apartment_get_current_or_mta(void);
+
+static HRESULT unmarshal_object(const STDOBJREF *stdobjref, struct apartment *apt,
+                                MSHCTX dest_context, void *dest_context_data,
+                                REFIID riid, const OXID_INFO *oxid_info,
+                                void **object);
+								
+void apartment_release(struct apartment *apt);
+
+static FORCEINLINE LONG ReadNoFence( LONG const volatile *src )
+{
+    LONG value = __WINE_LOAD32_NO_FENCE( (int const volatile *)src );
+    return value;
+}
+
+/* shared variables*/
+
+extern struct list registered_classes;
+
+extern CRITICAL_SECTION registered_classes_cs;
\ No newline at end of file
diff --git a/wrappers/new-dlls/combase/marshal.c b/wrappers/new-dlls/combase/marshal.c
index 51b4ce2411..652f7f9fc2 100644
--- a/wrappers/new-dlls/combase/marshal.c
+++ b/wrappers/new-dlls/combase/marshal.c
@@ -1,1822 +1,80 @@
-/*
- *     Copyright 2002 Juergen Schmied
- *     Copyright 2002 Marcus Meissner
- *     Copyright 2004 Mike Hearn, for CodeWeavers
- *     Copyright 2004 Rob Shearman, for CodeWeavers
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include <assert.h>
-
-#define COBJMACROS
-#include "objbase.h"
-
-#include "dcom.h"
-#include "combase_private.h"
-
-#include "wine/debug.h"
-#include "wine/heap.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(ole);
-
-HRESULT WINAPI RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid,
-                                const OXID_INFO *oxid_info, const IID *iid,
-                                DWORD dest_context, void *dest_context_data,
-                                IRpcChannelBuffer **chan, struct apartment *apt);
-
-static HRESULT unmarshal_object(const STDOBJREF *stdobjref, struct apartment *apt,
-                                MSHCTX dest_context, void *dest_context_data,
-                                REFIID riid, const OXID_INFO *oxid_info,
-                                void **object);
-
-/* number of refs given out for normal marshaling */
-#define NORMALEXTREFS 5
-
-/* private flag indicating that the object was marshaled as table-weak */
-#define SORFP_TABLEWEAK SORF_OXRES1
-/* private flag indicating that the caller does not want to notify the stub
- * when the proxy disconnects or is destroyed */
-#define SORFP_NOLIFETIMEMGMT SORF_OXRES2
-
-/* imported interface proxy */
-struct ifproxy
-{
-    struct list entry;       /* entry in proxy_manager list (CS parent->cs) */
-    struct proxy_manager *parent; /* owning proxy_manager (RO) */
-    void *iface;             /* interface pointer (RO) */
-    STDOBJREF stdobjref;     /* marshal data that represents this object (RO) */
-    IID iid;                 /* interface ID (RO) */
-    IRpcProxyBuffer *proxy;  /* interface proxy (RO) */
-    ULONG refs;              /* imported (public) references (LOCK) */
-    IRpcChannelBuffer *chan; /* channel to object (CS parent->cs) */
-};
-
-/* imported object / proxy manager */
-struct proxy_manager
-{
-    IMultiQI IMultiQI_iface;
-    IMarshal IMarshal_iface;
-    IClientSecurity IClientSecurity_iface;
-    struct apartment *parent; /* owning apartment (RO) */
-    struct list entry;        /* entry in apartment (CS parent->cs) */
-    OXID oxid;                /* object exported ID (RO) */
-    OXID_INFO oxid_info;      /* string binding, ipid of rem unknown and other information (RO) */
-    OID oid;                  /* object ID (RO) */
-    struct list interfaces;   /* imported interfaces (CS cs) */
-    LONG refs;                /* proxy reference count (LOCK) */
-    CRITICAL_SECTION cs;      /* thread safety for this object and children */
-    ULONG sorflags;           /* STDOBJREF flags (RO) */
-    IRemUnknown *remunk;      /* proxy to IRemUnknown used for lifecycle management (CS cs) */
-    HANDLE remoting_mutex;    /* mutex used for synchronizing access to IRemUnknown */
-    MSHCTX dest_context;      /* context used for activating optimisations (LOCK) */
-    void *dest_context_data;  /* reserved context value (LOCK) */
-};
-
-static inline struct proxy_manager *impl_from_IMultiQI(IMultiQI *iface)
-{
-    return CONTAINING_RECORD(iface, struct proxy_manager, IMultiQI_iface);
-}
-
-static inline struct proxy_manager *impl_from_IMarshal(IMarshal *iface)
-{
-    return CONTAINING_RECORD(iface, struct proxy_manager, IMarshal_iface);
-}
-
-static inline struct proxy_manager *impl_from_IClientSecurity(IClientSecurity *iface)
-{
-    return CONTAINING_RECORD(iface, struct proxy_manager, IClientSecurity_iface);
-}
-
-struct ftmarshaler
-{
-    IUnknown IUnknown_inner;
-    IMarshal IMarshal_iface;
-    IUnknown *outer_unk;
-    LONG refcount;
-};
-
-static struct ftmarshaler *impl_ft_from_IUnknown(IUnknown *iface)
-{
-    return CONTAINING_RECORD(iface, struct ftmarshaler, IUnknown_inner);
-}
-
-static struct ftmarshaler *impl_ft_from_IMarshal(IMarshal *iface)
-{
-    return CONTAINING_RECORD(iface, struct ftmarshaler, IMarshal_iface);
-}
-
-/***********************************************************************
- *            CoMarshalHresult        (combase.@)
- */
-HRESULT WINAPI CoMarshalHresult(IStream *stream, HRESULT hresult)
-{
-    return IStream_Write(stream, &hresult, sizeof(hresult), NULL);
-}
-
-/***********************************************************************
- *            CoUnmarshalHresult      (combase.@)
- */
-HRESULT WINAPI CoUnmarshalHresult(IStream *stream, HRESULT *phresult)
-{
-    return IStream_Read(stream, phresult, sizeof(*phresult), NULL);
-}
-
-/***********************************************************************
- *            CoGetInterfaceAndReleaseStream    (combase.@)
- */
-HRESULT WINAPI CoGetInterfaceAndReleaseStream(IStream *stream, REFIID riid, void **obj)
-{
-    HRESULT hr;
-
-    TRACE("%p, %s, %p\n", stream, debugstr_guid(riid), obj);
-
-    if (!stream) return E_INVALIDARG;
-    hr = CoUnmarshalInterface(stream, riid, obj);
-    IStream_Release(stream);
-    return hr;
-}
-
-/***********************************************************************
- *            CoMarshalInterThreadInterfaceInStream    (combase.@)
- */
-HRESULT WINAPI CoMarshalInterThreadInterfaceInStream(REFIID riid, IUnknown *unk, IStream **stream)
-{
-    ULARGE_INTEGER xpos;
-    LARGE_INTEGER seekto;
-    HRESULT hr;
-
-    TRACE("%s, %p, %p\n", debugstr_guid(riid), unk, stream);
-
-    hr = CreateStreamOnHGlobal(NULL, TRUE, stream);
-    if (FAILED(hr)) return hr;
-    hr = CoMarshalInterface(*stream, riid, unk, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL);
-
-    if (SUCCEEDED(hr))
-    {
-        memset(&seekto, 0, sizeof(seekto));
-        IStream_Seek(*stream, seekto, STREAM_SEEK_SET, &xpos);
-    }
-    else
-    {
-        IStream_Release(*stream);
-        *stream = NULL;
-    }
-
-    return hr;
-}
-
-static HRESULT WINAPI ftmarshaler_inner_QueryInterface(IUnknown *iface, REFIID riid, void **obj)
-{
-    struct ftmarshaler *marshaler = impl_ft_from_IUnknown(iface);
-
-    TRACE("%p, %s, %p\n", iface, debugstr_guid(riid), obj);
-
-    *obj = NULL;
-
-    if (IsEqualIID(&IID_IUnknown, riid))
-        *obj = &marshaler->IUnknown_inner;
-    else if (IsEqualIID(&IID_IMarshal, riid))
-        *obj = &marshaler->IMarshal_iface;
-    else
-    {
-        FIXME("No interface for %s\n", debugstr_guid(riid));
-        return E_NOINTERFACE;
-    }
-
-    IUnknown_AddRef((IUnknown *)*obj);
-
-    return S_OK;
-}
-
-static ULONG WINAPI ftmarshaler_inner_AddRef(IUnknown *iface)
-{
-    struct ftmarshaler *marshaler = impl_ft_from_IUnknown(iface);
-    ULONG refcount = InterlockedIncrement(&marshaler->refcount);
-
-    TRACE("%p, refcount %u\n", iface, refcount);
-
-    return refcount;
-}
-
-static ULONG WINAPI ftmarshaler_inner_Release(IUnknown *iface)
-{
-    struct ftmarshaler *marshaler = impl_ft_from_IUnknown(iface);
-    ULONG refcount = InterlockedDecrement(&marshaler->refcount);
-
-    TRACE("%p, refcount %u\n", iface, refcount);
-
-    if (!refcount)
-        heap_free(marshaler);
-
-    return refcount;
-}
-
-static const IUnknownVtbl ftmarshaler_inner_vtbl =
-{
-    ftmarshaler_inner_QueryInterface,
-    ftmarshaler_inner_AddRef,
-    ftmarshaler_inner_Release
-};
-
-static HRESULT WINAPI ftmarshaler_QueryInterface(IMarshal *iface, REFIID riid, void **obj)
-{
-    struct ftmarshaler *marshaler = impl_ft_from_IMarshal(iface);
-
-    TRACE("%p, %s, %p\n", iface, debugstr_guid(riid), obj);
-
-    return IUnknown_QueryInterface(marshaler->outer_unk, riid, obj);
-}
-
-static ULONG WINAPI ftmarshaler_AddRef(IMarshal *iface)
-{
-    struct ftmarshaler *marshaler = impl_ft_from_IMarshal(iface);
-
-    TRACE("%p\n", iface);
-
-    return IUnknown_AddRef(marshaler->outer_unk);
-}
-
-static ULONG WINAPI ftmarshaler_Release(IMarshal *iface)
-{
-    struct ftmarshaler *marshaler = impl_ft_from_IMarshal(iface);
-
-    TRACE("%p\n", iface);
-
-    return IUnknown_Release(marshaler->outer_unk);
-}
-
-static HRESULT WINAPI ftmarshaler_GetUnmarshalClass(IMarshal *iface, REFIID riid, void *pv,
-        DWORD dest_context, void *pvDestContext, DWORD mshlflags, CLSID *clsid)
-{
-    TRACE("%s, %p, %#x, %p, %#x, %p\n", debugstr_guid(riid), pv, dest_context, pvDestContext, mshlflags, clsid);
-
-    if (dest_context == MSHCTX_INPROC || dest_context == MSHCTX_CROSSCTX)
-        *clsid = CLSID_InProcFreeMarshaler;
-    else
-        *clsid = CLSID_StdMarshal;
-
-    return S_OK;
-}
-
-static HRESULT WINAPI ftmarshaler_GetMarshalSizeMax(IMarshal *iface, REFIID riid, void *pv,
-        DWORD dest_context, void *pvDestContext, DWORD mshlflags, DWORD *size)
-{
-    IMarshal *marshal = NULL;
-    HRESULT hr;
-
-    TRACE("%s, %p, %#x, %p, %#x, %p\n", debugstr_guid(riid), pv, dest_context, pvDestContext, mshlflags, size);
-
-    /* If the marshalling happens inside the same process the interface pointer is
-       copied between the apartments */
-    if (dest_context == MSHCTX_INPROC || dest_context == MSHCTX_CROSSCTX)
-    {
-        *size = sizeof(mshlflags) + sizeof(pv) + sizeof(DWORD) + sizeof(GUID);
-        return S_OK;
-    }
-
-    /* Use the standard marshaller to handle all other cases */
-    CoGetStandardMarshal(riid, pv, dest_context, pvDestContext, mshlflags, &marshal);
-    hr = IMarshal_GetMarshalSizeMax(marshal, riid, pv, dest_context, pvDestContext, mshlflags, size);
-    IMarshal_Release(marshal);
-    return hr;
-}
-
-static HRESULT WINAPI ftmarshaler_MarshalInterface(IMarshal *iface, IStream *stream, REFIID riid,
-        void *pv, DWORD dest_context, void *pvDestContext, DWORD mshlflags)
-{
-    IMarshal *marshal = NULL;
-    HRESULT hr;
-
-    TRACE("%p, %s, %p, %#x, %p, %#x\n", stream, debugstr_guid(riid), pv,
-            dest_context, pvDestContext, mshlflags);
-
-    /* If the marshalling happens inside the same process the interface pointer is
-       copied between the apartments */
-    if (dest_context == MSHCTX_INPROC || dest_context == MSHCTX_CROSSCTX)
-    {
-        void *object;
-        DWORD constant = 0;
-        GUID unknown_guid = { 0 };
-
-        hr = IUnknown_QueryInterface((IUnknown *)pv, riid, &object);
-        if (FAILED(hr))
-            return hr;
-
-        /* don't hold a reference to table-weak marshaled interfaces */
-        if (mshlflags & MSHLFLAGS_TABLEWEAK)
-            IUnknown_Release((IUnknown *)object);
-
-        hr = IStream_Write(stream, &mshlflags, sizeof(mshlflags), NULL);
-        if (hr != S_OK) return STG_E_MEDIUMFULL;
-
-        hr = IStream_Write(stream, &object, sizeof(object), NULL);
-        if (hr != S_OK) return STG_E_MEDIUMFULL;
-
-        if (sizeof(object) == sizeof(DWORD))
-        {
-            hr = IStream_Write(stream, &constant, sizeof(constant), NULL);
-            if (hr != S_OK) return STG_E_MEDIUMFULL;
-        }
-
-        hr = IStream_Write(stream, &unknown_guid, sizeof(unknown_guid), NULL);
-        if (hr != S_OK) return STG_E_MEDIUMFULL;
-
-        return S_OK;
-    }
-
-    /* Use the standard marshaler to handle all other cases */
-    CoGetStandardMarshal(riid, pv, dest_context, pvDestContext, mshlflags, &marshal);
-    hr = IMarshal_MarshalInterface(marshal, stream, riid, pv, dest_context, pvDestContext, mshlflags);
-    IMarshal_Release(marshal);
-    return hr;
-}
-
-static HRESULT WINAPI ftmarshaler_UnmarshalInterface(IMarshal *iface, IStream *stream, REFIID riid, void **ppv)
-{
-    DWORD mshlflags;
-    IUnknown *object;
-    DWORD constant;
-    GUID unknown_guid;
-    HRESULT hr;
-
-    TRACE("%p, %s, %p\n", stream, debugstr_guid(riid), ppv);
-
-    hr = IStream_Read(stream, &mshlflags, sizeof(mshlflags), NULL);
-    if (hr != S_OK) return STG_E_READFAULT;
-
-    hr = IStream_Read(stream, &object, sizeof(object), NULL);
-    if (hr != S_OK) return STG_E_READFAULT;
-
-    if (sizeof(object) == sizeof(DWORD))
-    {
-        hr = IStream_Read(stream, &constant, sizeof(constant), NULL);
-        if (hr != S_OK) return STG_E_READFAULT;
-        if (constant != 0)
-            FIXME("constant is 0x%x instead of 0\n", constant);
-    }
-
-    hr = IStream_Read(stream, &unknown_guid, sizeof(unknown_guid), NULL);
-    if (hr != S_OK) return STG_E_READFAULT;
-
-    hr = IUnknown_QueryInterface(object, riid, ppv);
-    if (!(mshlflags & (MSHLFLAGS_TABLEWEAK | MSHLFLAGS_TABLESTRONG)))
-        IUnknown_Release(object);
-
-    return hr;
-}
-
-static HRESULT WINAPI ftmarshaler_ReleaseMarshalData(IMarshal *iface, IStream *stream)
-{
-    DWORD mshlflags;
-    IUnknown *object;
-    DWORD constant;
-    GUID unknown_guid;
-    HRESULT hr;
-
-    TRACE("%p\n", stream);
-
-    hr = IStream_Read(stream, &mshlflags, sizeof(mshlflags), NULL);
-    if (hr != S_OK) return STG_E_READFAULT;
-
-    hr = IStream_Read(stream, &object, sizeof(object), NULL);
-    if (hr != S_OK) return STG_E_READFAULT;
-
-    if (sizeof(object) == sizeof(DWORD))
-    {
-        hr = IStream_Read(stream, &constant, sizeof(constant), NULL);
-        if (hr != S_OK) return STG_E_READFAULT;
-        if (constant != 0)
-            FIXME("constant is 0x%x instead of 0\n", constant);
-    }
-
-    hr = IStream_Read(stream, &unknown_guid, sizeof(unknown_guid), NULL);
-    if (hr != S_OK) return STG_E_READFAULT;
-
-    IUnknown_Release(object);
-    return S_OK;
-}
-
-static HRESULT WINAPI ftmarshaler_DisconnectObject(IMarshal *iface, DWORD reserved)
-{
-    TRACE("\n");
-
-    /* nothing to do */
-    return S_OK;
-}
-
-static const IMarshalVtbl ftmarshaler_vtbl =
-{
-    ftmarshaler_QueryInterface,
-    ftmarshaler_AddRef,
-    ftmarshaler_Release,
-    ftmarshaler_GetUnmarshalClass,
-    ftmarshaler_GetMarshalSizeMax,
-    ftmarshaler_MarshalInterface,
-    ftmarshaler_UnmarshalInterface,
-    ftmarshaler_ReleaseMarshalData,
-    ftmarshaler_DisconnectObject
-};
-
-/***********************************************************************
- *          CoCreateFreeThreadedMarshaler    (combase.@)
- */
-HRESULT WINAPI CoCreateFreeThreadedMarshaler(IUnknown *outer, IUnknown **marshaler)
-{
-    struct ftmarshaler *object;
-
-    TRACE("%p, %p\n", outer, marshaler);
-
-    object = heap_alloc(sizeof(*object));
-    if (!object)
-        return E_OUTOFMEMORY;
-
-    object->IUnknown_inner.lpVtbl = &ftmarshaler_inner_vtbl;
-    object->IMarshal_iface.lpVtbl = &ftmarshaler_vtbl;
-    object->refcount = 1;
-    object->outer_unk = outer ? outer : &object->IUnknown_inner;
-
-    *marshaler = &object->IUnknown_inner;
-
-    return S_OK;
-}
-
-/***********************************************************************
- *            CoGetMarshalSizeMax        (combase.@)
- */
-HRESULT WINAPI CoGetMarshalSizeMax(ULONG *size, REFIID riid, IUnknown *unk,
-         DWORD dest_context, void *pvDestContext, DWORD mshlFlags)
-{
-    BOOL std_marshal = FALSE;
-    IMarshal *marshal;
-    HRESULT hr;
-
-    if (!unk)
-        return E_POINTER;
-
-    hr = IUnknown_QueryInterface(unk, &IID_IMarshal, (void **)&marshal);
-    if (hr != S_OK)
-    {
-        std_marshal = TRUE;
-        hr = CoGetStandardMarshal(riid, unk, dest_context, pvDestContext, mshlFlags, &marshal);
-    }
-    if (hr != S_OK)
-        return hr;
-
-    hr = IMarshal_GetMarshalSizeMax(marshal, riid, unk, dest_context, pvDestContext, mshlFlags, size);
-    if (!std_marshal)
-        /* add on the size of the whole OBJREF structure like native does */
-        *size += sizeof(OBJREF);
-
-    IMarshal_Release(marshal);
-    return hr;
-}
-
-static void dump_mshflags(MSHLFLAGS flags)
-{
-    if (flags & MSHLFLAGS_TABLESTRONG)
-        TRACE(" MSHLFLAGS_TABLESTRONG");
-    if (flags & MSHLFLAGS_TABLEWEAK)
-        TRACE(" MSHLFLAGS_TABLEWEAK");
-    if (!(flags & (MSHLFLAGS_TABLESTRONG|MSHLFLAGS_TABLEWEAK)))
-        TRACE(" MSHLFLAGS_NORMAL");
-    if (flags & MSHLFLAGS_NOPING)
-        TRACE(" MSHLFLAGS_NOPING");
-}
-
-/***********************************************************************
- *        CoMarshalInterface    (combase.@)
- */
-HRESULT WINAPI CoMarshalInterface(IStream *stream, REFIID riid, IUnknown *unk,
-        DWORD dest_context, void *pvDestContext, DWORD mshlFlags)
-{
-    CLSID marshaler_clsid;
-    IMarshal *marshal;
-    HRESULT hr;
-
-    TRACE("%p, %s, %p, %x, %p, ", stream, debugstr_guid(riid), unk, dest_context, pvDestContext);
-    dump_mshflags(mshlFlags);
-    TRACE("\n");
-
-    if (!unk || !stream)
-        return E_INVALIDARG;
-
-    hr = IUnknown_QueryInterface(unk, &IID_IMarshal, (void **)&marshal);
-    if (hr != S_OK)
-        hr = CoGetStandardMarshal(riid, unk, dest_context, pvDestContext, mshlFlags, &marshal);
-    if (hr != S_OK)
-    {
-        ERR("Failed to get marshaller, %#x\n", hr);
-        return hr;
-    }
-
-    hr = IMarshal_GetUnmarshalClass(marshal, riid, unk, dest_context, pvDestContext, mshlFlags,
-            &marshaler_clsid);
-    if (hr != S_OK)
-    {
-        ERR("IMarshal::GetUnmarshalClass failed, %#x\n", hr);
-        goto cleanup;
-    }
-
-    /* FIXME: implement handler marshaling too */
-    if (IsEqualCLSID(&marshaler_clsid, &CLSID_StdMarshal))
-    {
-        TRACE("Using standard marshaling\n");
-    }
-    else
-    {
-        OBJREF objref;
-
-        TRACE("Using custom marshaling\n");
-        objref.signature = OBJREF_SIGNATURE;
-        objref.iid = *riid;
-        objref.flags = OBJREF_CUSTOM;
-        objref.u_objref.u_custom.clsid = marshaler_clsid;
-        objref.u_objref.u_custom.cbExtension = 0;
-        objref.u_objref.u_custom.size = 0;
-        hr = IMarshal_GetMarshalSizeMax(marshal, riid, unk, dest_context, pvDestContext, mshlFlags,
-                &objref.u_objref.u_custom.size);
-        if (hr != S_OK)
-        {
-            ERR("Failed to get max size of marshal data, error %#x\n", hr);
-            goto cleanup;
-        }
-        /* write constant sized common header and OR_CUSTOM data into stream */
-        hr = IStream_Write(stream, &objref, FIELD_OFFSET(OBJREF, u_objref.u_custom.pData), NULL);
-        if (hr != S_OK)
-        {
-            ERR("Failed to write OR_CUSTOM header to stream with %#x\n", hr);
-            goto cleanup;
-        }
-    }
-
-    TRACE("Calling IMarshal::MarshalInterface\n");
-
-    hr = IMarshal_MarshalInterface(marshal, stream, riid, unk, dest_context, pvDestContext, mshlFlags);
-    if (hr != S_OK)
-    {
-        ERR("Failed to marshal the interface %s, hr %#x\n", debugstr_guid(riid), hr);
-        goto cleanup;
-    }
-
-cleanup:
-    IMarshal_Release(marshal);
-
-    TRACE("completed with hr %#x\n", hr);
-
-    return hr;
-}
-
-/* Creates an IMarshal* object according to the data marshaled to the stream.
- * The function leaves the stream pointer at the start of the data written
- * to the stream by the IMarshal* object.
- */
-static HRESULT get_unmarshaler_from_stream(IStream *stream, IMarshal **marshal, IID *iid)
-{
-    OBJREF objref;
-    HRESULT hr;
-    ULONG res;
-
-    /* read common OBJREF header */
-    hr = IStream_Read(stream, &objref, FIELD_OFFSET(OBJREF, u_objref), &res);
-    if (hr != S_OK || (res != FIELD_OFFSET(OBJREF, u_objref)))
-    {
-        ERR("Failed to read common OBJREF header, 0x%08x\n", hr);
-        return STG_E_READFAULT;
-    }
-
-    /* sanity check on header */
-    if (objref.signature != OBJREF_SIGNATURE)
-    {
-        ERR("Bad OBJREF signature 0x%08x\n", objref.signature);
-        return RPC_E_INVALID_OBJREF;
-    }
-
-    if (iid) *iid = objref.iid;
-
-    /* FIXME: handler marshaling */
-    if (objref.flags & OBJREF_STANDARD)
-    {
-        TRACE("Using standard unmarshaling\n");
-        *marshal = NULL;
-        return S_FALSE;
-    }
-    else if (objref.flags & OBJREF_CUSTOM)
-    {
-        ULONG custom_header_size = FIELD_OFFSET(OBJREF, u_objref.u_custom.pData) -
-                                   FIELD_OFFSET(OBJREF, u_objref.u_custom);
-        TRACE("Using custom unmarshaling\n");
-        /* read constant sized OR_CUSTOM data from stream */
-        hr = IStream_Read(stream, &objref.u_objref.u_custom,
-                          custom_header_size, &res);
-        if (hr != S_OK || (res != custom_header_size))
-        {
-            ERR("Failed to read OR_CUSTOM header, 0x%08x\n", hr);
-            return STG_E_READFAULT;
-        }
-        /* now create the marshaler specified in the stream */
-        hr = CoCreateInstance(&objref.u_objref.u_custom.clsid, NULL,
-                              CLSCTX_INPROC_SERVER, &IID_IMarshal,
-                              (LPVOID*)marshal);
-    }
-    else
-    {
-        FIXME("Invalid or unimplemented marshaling type specified: %x\n",
-            objref.flags);
-        return RPC_E_INVALID_OBJREF;
-    }
-
-    if (hr != S_OK)
-        ERR("Failed to create marshal, 0x%08x\n", hr);
-
-    return hr;
-}
-
-static HRESULT std_release_marshal_data(IStream *stream)
-{
-    struct stub_manager *stubmgr;
-    struct OR_STANDARD  obj;
-    struct apartment *apt;
-    ULONG res;
-    HRESULT hr;
-
-    hr = IStream_Read(stream, &obj, FIELD_OFFSET(struct OR_STANDARD, saResAddr.aStringArray), &res);
-    if (hr != S_OK) return STG_E_READFAULT;
-
-    if (obj.saResAddr.wNumEntries)
-    {
-        ERR("unsupported size of DUALSTRINGARRAY\n");
-        return E_NOTIMPL;
-    }
-
-    TRACE("oxid = %s, oid = %s, ipid = %s\n", wine_dbgstr_longlong(obj.std.oxid),
-            wine_dbgstr_longlong(obj.std.oid), wine_dbgstr_guid(&obj.std.ipid));
-
-    if (!(apt = apartment_findfromoxid(obj.std.oxid)))
-    {
-        WARN("Could not map OXID %s to apartment object\n",
-            wine_dbgstr_longlong(obj.std.oxid));
-        return RPC_E_INVALID_OBJREF;
-    }
-
-    if (!(stubmgr = get_stub_manager(apt, obj.std.oid)))
-    {
-        apartment_release(apt);
-        ERR("could not map object ID to stub manager, oxid=%s, oid=%s\n",
-            wine_dbgstr_longlong(obj.std.oxid), wine_dbgstr_longlong(obj.std.oid));
-        return RPC_E_INVALID_OBJREF;
-    }
-
-    stub_manager_release_marshal_data(stubmgr, obj.std.cPublicRefs, &obj.std.ipid, obj.std.flags & SORFP_TABLEWEAK);
-
-    stub_manager_int_release(stubmgr);
-    apartment_release(apt);
-
-    return S_OK;
-}
-
-/***********************************************************************
- *            CoReleaseMarshalData        (combase.@)
- */
-HRESULT WINAPI CoReleaseMarshalData(IStream *stream)
-{
-    IMarshal *marshal;
-    HRESULT hr;
-
-    TRACE("%p\n", stream);
-
-    hr = get_unmarshaler_from_stream(stream, &marshal, NULL);
-    if (hr == S_FALSE)
-    {
-        hr = std_release_marshal_data(stream);
-        if (hr != S_OK)
-            ERR("StdMarshal ReleaseMarshalData failed with error %#x\n", hr);
-        return hr;
-    }
-    if (hr != S_OK)
-        return hr;
-
-    /* call the helper object to do the releasing of marshal data */
-    hr = IMarshal_ReleaseMarshalData(marshal, stream);
-    if (hr != S_OK)
-        ERR("IMarshal::ReleaseMarshalData failed with error %#x\n", hr);
-
-    IMarshal_Release(marshal);
-    return hr;
-}
-
-static HRESULT std_unmarshal_interface(MSHCTX dest_context, void *dest_context_data,
-        IStream *stream, REFIID riid, void **ppv)
-{
-    struct stub_manager *stubmgr = NULL;
-    struct OR_STANDARD obj;
-    ULONG res;
-    HRESULT hres;
-    struct apartment *apt, *stub_apt;
-
-    TRACE("(...,%s,....)\n", debugstr_guid(riid));
-
-    /* we need an apartment to unmarshal into */
-    if (!(apt = apartment_get_current_or_mta()))
-    {
-        ERR("Apartment not initialized\n");
-        return CO_E_NOTINITIALIZED;
-    }
-
-    /* read STDOBJREF from wire */
-    hres = IStream_Read(stream, &obj, FIELD_OFFSET(struct OR_STANDARD, saResAddr.aStringArray), &res);
-    if (hres != S_OK)
-    {
-        apartment_release(apt);
-        return STG_E_READFAULT;
-    }
-
-    if (obj.saResAddr.wNumEntries)
-    {
-        ERR("unsupported size of DUALSTRINGARRAY\n");
-        return E_NOTIMPL;
-    }
-
-    /* check if we're marshalling back to ourselves */
-    if ((apartment_getoxid(apt) == obj.std.oxid) && (stubmgr = get_stub_manager(apt, obj.std.oid)))
-    {
-        TRACE("Unmarshalling object marshalled in same apartment for iid %s, "
-              "returning original object %p\n", debugstr_guid(riid), stubmgr->object);
-
-        hres = IUnknown_QueryInterface(stubmgr->object, riid, ppv);
-
-        /* unref the ifstub. FIXME: only do this on success? */
-        if (!stub_manager_is_table_marshaled(stubmgr, &obj.std.ipid))
-            stub_manager_ext_release(stubmgr, obj.std.cPublicRefs, obj.std.flags & SORFP_TABLEWEAK, FALSE);
-
-        stub_manager_int_release(stubmgr);
-        apartment_release(apt);
-        return hres;
-    }
-
-    /* notify stub manager about unmarshal if process-local object.
-     * note: if the oxid is not found then we and native will quite happily
-     * ignore table marshaling and normal marshaling rules regarding number of
-     * unmarshals, etc, but if you abuse these rules then your proxy could end
-     * up returning RPC_E_DISCONNECTED. */
-    if ((stub_apt = apartment_findfromoxid(obj.std.oxid)))
-    {
-        if ((stubmgr = get_stub_manager(stub_apt, obj.std.oid)))
-        {
-            if (!stub_manager_notify_unmarshal(stubmgr, &obj.std.ipid))
-                hres = CO_E_OBJNOTCONNECTED;
-        }
-        else
-        {
-            WARN("Couldn't find object for OXID %s, OID %s, assuming disconnected\n",
-                wine_dbgstr_longlong(obj.std.oxid),
-                wine_dbgstr_longlong(obj.std.oid));
-            hres = CO_E_OBJNOTCONNECTED;
-        }
-    }
-    else
-        TRACE("Treating unmarshal from OXID %s as inter-process\n",
-            wine_dbgstr_longlong(obj.std.oxid));
-
-    if (hres == S_OK)
-        hres = unmarshal_object(&obj.std, apt, dest_context,
-                                dest_context_data, riid,
-                                stubmgr ? &stubmgr->oxid_info : NULL, ppv);
-
-    if (stubmgr) stub_manager_int_release(stubmgr);
-    if (stub_apt) apartment_release(stub_apt);
-
-    if (hres != S_OK) WARN("Failed with error 0x%08x\n", hres);
-    else TRACE("Successfully created proxy %p\n", *ppv);
-
-    apartment_release(apt);
-    return hres;
-}
-
-/***********************************************************************
- *            CoUnmarshalInterface        (combase.@)
- */
-HRESULT WINAPI CoUnmarshalInterface(IStream *stream, REFIID riid, void **ppv)
-{
-    IMarshal *marshal;
-    IUnknown *object;
-    HRESULT hr;
-    IID iid;
-
-    TRACE("%p, %s, %p\n", stream, debugstr_guid(riid), ppv);
-
-    if (!stream || !ppv)
-        return E_INVALIDARG;
-
-    hr = get_unmarshaler_from_stream(stream, &marshal, &iid);
-    if (hr == S_FALSE)
-    {
-        hr = std_unmarshal_interface(0, NULL, stream, &iid, (void **)&object);
-        if (hr != S_OK)
-            ERR("StdMarshal UnmarshalInterface failed, hr %#x\n", hr);
-    }
-    else if (hr == S_OK)
-    {
-        /* call the helper object to do the actual unmarshaling */
-        hr = IMarshal_UnmarshalInterface(marshal, stream, &iid, (void **)&object);
-        IMarshal_Release(marshal);
-        if (hr != S_OK)
-            ERR("IMarshal::UnmarshalInterface failed, hr %#x\n", hr);
-    }
-
-    if (hr == S_OK)
-    {
-        /* IID_NULL means use the interface ID of the marshaled object */
-        if (!IsEqualIID(riid, &IID_NULL) && !IsEqualIID(riid, &iid))
-        {
-            TRACE("requested interface != marshalled interface, additional QI needed\n");
-            hr = IUnknown_QueryInterface(object, riid, ppv);
-            if (hr != S_OK)
-                ERR("Couldn't query for interface %s, hr %#x\n", debugstr_guid(riid), hr);
-            IUnknown_Release(object);
-        }
-        else
-        {
-            *ppv = object;
-        }
-    }
-
-    TRACE("completed with hr 0x%x\n", hr);
-
-    return hr;
-}
-
-/* Marshalling just passes a unique identifier to the remote client,
- * that makes it possible to find the passed interface again.
- *
- * So basically we need a set of values that make it unique.
- *
- * Note that the IUnknown_QI(ob,xiid,&ppv) always returns the SAME ppv value!
- *
- * A triple is used: OXID (apt id), OID (stub manager id),
- * IPID (interface ptr/stub id).
- *
- * OXIDs identify an apartment and are network scoped
- * OIDs identify a stub manager and are apartment scoped
- * IPIDs identify an interface stub and are apartment scoped
- */
-
-static inline HRESULT get_facbuf_for_iid(REFIID riid, IPSFactoryBuffer **facbuf)
-{
-    HRESULT       hr;
-    CLSID         clsid;
-
-    hr = CoGetPSClsid(riid, &clsid);
-    if (hr != S_OK)
-        return hr;
-    return CoGetClassObject(&clsid, CLSCTX_INPROC_SERVER | CLSCTX_PS_DLL, NULL, &IID_IPSFactoryBuffer, (void **)facbuf);
-}
-
-/* marshals an object into a STDOBJREF structure */
-HRESULT marshal_object(struct apartment *apt, STDOBJREF *stdobjref, REFIID riid, IUnknown *object,
-    DWORD dest_context, void *dest_context_data, MSHLFLAGS mshlflags)
-{
-    struct stub_manager *manager;
-    struct ifstub       *ifstub;
-    BOOL                 tablemarshal;
-    HRESULT              hr;
-
-    stdobjref->oxid = apartment_getoxid(apt);
-
-    hr = apartment_createwindowifneeded(apt);
-    if (hr != S_OK)
-        return hr;
-
-    if (!(manager = get_stub_manager_from_object(apt, object, TRUE)))
-        return E_OUTOFMEMORY;
-
-    stdobjref->flags = SORF_NULL;
-    if (mshlflags & MSHLFLAGS_TABLEWEAK)
-        stdobjref->flags |= SORFP_TABLEWEAK;
-    if (mshlflags & MSHLFLAGS_NOPING)
-        stdobjref->flags |= SORF_NOPING;
-    stdobjref->oid = manager->oid;
-
-    tablemarshal = ((mshlflags & MSHLFLAGS_TABLESTRONG) || (mshlflags & MSHLFLAGS_TABLEWEAK));
-
-    /* make sure ifstub that we are creating is unique */
-    ifstub = stub_manager_find_ifstub(manager, riid, mshlflags);
-    if (!ifstub) {
-        IRpcStubBuffer *stub = NULL;
-
-        /* IUnknown doesn't require a stub buffer, because it never goes out on
-         * the wire */
-        if (!IsEqualIID(riid, &IID_IUnknown))
-        {
-            IPSFactoryBuffer *psfb;
-
-            hr = get_facbuf_for_iid(riid, &psfb);
-            if (hr == S_OK) {
-                hr = IPSFactoryBuffer_CreateStub(psfb, riid, manager->object, &stub);
-                IPSFactoryBuffer_Release(psfb);
-                if (hr != S_OK)
-                    ERR("Failed to create an IRpcStubBuffer from IPSFactory for %s with error 0x%08x\n",
-                        debugstr_guid(riid), hr);
-            }else {
-                WARN("couldn't get IPSFactory buffer for interface %s\n", debugstr_guid(riid));
-                hr = E_NOINTERFACE;
-            }
-
-        }
-
-        if (hr == S_OK) {
-            ifstub = stub_manager_new_ifstub(manager, stub, riid, dest_context, dest_context_data, mshlflags);
-            if (!ifstub)
-                hr = E_OUTOFMEMORY;
-        }
-        if (stub) IRpcStubBuffer_Release(stub);
-
-        if (hr != S_OK) {
-            stub_manager_int_release(manager);
-            /* destroy the stub manager if it has no ifstubs by releasing
-             * zero external references */
-            stub_manager_ext_release(manager, 0, FALSE, TRUE);
-            return hr;
-        }
-    }
-
-    if (!tablemarshal)
-    {
-        stdobjref->cPublicRefs = NORMALEXTREFS;
-        stub_manager_ext_addref(manager, stdobjref->cPublicRefs, FALSE);
-    }
-    else
-    {
-        stdobjref->cPublicRefs = 0;
-        if (mshlflags & MSHLFLAGS_TABLESTRONG)
-            stub_manager_ext_addref(manager, 1, FALSE);
-        else
-            stub_manager_ext_addref(manager, 0, TRUE);
-    }
-
-    /* FIXME: check return value */
-    rpc_register_interface(riid);
-
-    stdobjref->ipid = ifstub->ipid;
-
-    stub_manager_int_release(manager);
-    return S_OK;
-}
-
-/* Client-side identity of the server object */
-
-static HRESULT proxy_manager_get_remunknown(struct proxy_manager * This, IRemUnknown **remunk);
-static void proxy_manager_destroy(struct proxy_manager * This);
-static HRESULT proxy_manager_find_ifproxy(struct proxy_manager * This, REFIID riid, struct ifproxy ** ifproxy_found);
-static HRESULT proxy_manager_query_local_interface(struct proxy_manager * This, REFIID riid, void ** ppv);
-
-static HRESULT WINAPI ClientIdentity_QueryInterface(IMultiQI * iface, REFIID riid, void ** ppv)
-{
-    HRESULT hr;
-    MULTI_QI mqi;
-
-    TRACE("%s\n", debugstr_guid(riid));
-
-    mqi.pIID = riid;
-    hr = IMultiQI_QueryMultipleInterfaces(iface, 1, &mqi);
-    *ppv = mqi.pItf;
-
-    return hr;
-}
-
-static ULONG WINAPI ClientIdentity_AddRef(IMultiQI *iface)
-{
-    struct proxy_manager *This = impl_from_IMultiQI(iface);
-    TRACE("%p - before %d\n", iface, This->refs);
-    return InterlockedIncrement(&This->refs);
-}
-
-static ULONG WINAPI ClientIdentity_Release(IMultiQI *iface)
-{
-    struct proxy_manager *This = impl_from_IMultiQI(iface);
-    ULONG refs = InterlockedDecrement(&This->refs);
-    TRACE("%p - after %d\n", iface, refs);
-    if (!refs)
-        proxy_manager_destroy(This);
-    return refs;
-}
-
-static HRESULT WINAPI ClientIdentity_QueryMultipleInterfaces(IMultiQI *iface, ULONG cMQIs, MULTI_QI *pMQIs)
-{
-    struct proxy_manager *This = impl_from_IMultiQI(iface);
-    REMQIRESULT *qiresults = NULL;
-    ULONG nonlocal_mqis = 0;
-    ULONG i;
-    ULONG successful_mqis = 0;
-    IID *iids = HeapAlloc(GetProcessHeap(), 0, cMQIs * sizeof(*iids));
-    /* mapping of RemQueryInterface index to QueryMultipleInterfaces index */
-    ULONG *mapping = HeapAlloc(GetProcessHeap(), 0, cMQIs * sizeof(*mapping));
-
-    TRACE("cMQIs: %d\n", cMQIs);
-
-    /* try to get a local interface - this includes already active proxy
-     * interfaces and also interfaces exposed by the proxy manager */
-    for (i = 0; i < cMQIs; i++)
-    {
-        TRACE("iid[%d] = %s\n", i, debugstr_guid(pMQIs[i].pIID));
-        pMQIs[i].hr = proxy_manager_query_local_interface(This, pMQIs[i].pIID, (void **)&pMQIs[i].pItf);
-        if (pMQIs[i].hr == S_OK)
-            successful_mqis++;
-        else
-        {
-            iids[nonlocal_mqis] = *pMQIs[i].pIID;
-            mapping[nonlocal_mqis] = i;
-            nonlocal_mqis++;
-        }
-    }
-
-    TRACE("%d interfaces not found locally\n", nonlocal_mqis);
-
-    /* if we have more than one interface not found locally then we must try
-     * to query the remote object for it */
-    if (nonlocal_mqis != 0)
-    {
-        IRemUnknown *remunk;
-        HRESULT hr;
-        IPID *ipid;
-
-        /* get the ipid of the first entry */
-        /* FIXME: should we implement ClientIdentity on the ifproxies instead
-         * of the proxy_manager so we use the correct ipid here? */
-        ipid = &LIST_ENTRY(list_head(&This->interfaces), struct ifproxy, entry)->stdobjref.ipid;
-
-        /* get IRemUnknown proxy so we can communicate with the remote object */
-        hr = proxy_manager_get_remunknown(This, &remunk);
-
-        if (SUCCEEDED(hr))
-        {
-            hr = IRemUnknown_RemQueryInterface(remunk, ipid, NORMALEXTREFS,
-                                               nonlocal_mqis, iids, &qiresults);
-            IRemUnknown_Release(remunk);
-            if (FAILED(hr))
-                WARN("IRemUnknown_RemQueryInterface failed with error 0x%08x\n", hr);
-        }
-
-        /* IRemUnknown_RemQueryInterface can return S_FALSE if only some of
-         * the interfaces were returned */
-        if (SUCCEEDED(hr))
-        {
-            struct apartment *apt = apartment_get_current_or_mta();
-
-            /* try to unmarshal each object returned to us */
-            for (i = 0; i < nonlocal_mqis; i++)
-            {
-                ULONG index = mapping[i];
-                HRESULT hrobj = qiresults[i].hResult;
-                if (hrobj == S_OK)
-                    hrobj = unmarshal_object(&qiresults[i].std, apt,
-                                             This->dest_context,
-                                             This->dest_context_data,
-                                             pMQIs[index].pIID, &This->oxid_info,
-                                             (void **)&pMQIs[index].pItf);
-
-                if (hrobj == S_OK)
-                    successful_mqis++;
-                else
-                    ERR("Failed to get pointer to interface %s\n", debugstr_guid(pMQIs[index].pIID));
-                pMQIs[index].hr = hrobj;
-            }
-
-            apartment_release(apt);
-        }
-
-        /* free the memory allocated by the proxy */
-        CoTaskMemFree(qiresults);
-    }
-
-    TRACE("%d/%d successfully queried\n", successful_mqis, cMQIs);
-
-    HeapFree(GetProcessHeap(), 0, iids);
-    HeapFree(GetProcessHeap(), 0, mapping);
-
-    if (successful_mqis == cMQIs)
-        return S_OK; /* we got all requested interfaces */
-    else if (successful_mqis == 0)
-        return E_NOINTERFACE; /* we didn't get any interfaces */
-    else
-        return S_FALSE; /* we got some interfaces */
-}
-
-static const IMultiQIVtbl ClientIdentity_Vtbl =
-{
-    ClientIdentity_QueryInterface,
-    ClientIdentity_AddRef,
-    ClientIdentity_Release,
-    ClientIdentity_QueryMultipleInterfaces
-};
-
-static HRESULT StdMarshalImpl_Construct(REFIID, DWORD, void*, void**);
-
-static HRESULT WINAPI Proxy_QueryInterface(IMarshal *iface, REFIID riid, void **ppvObject)
-{
-    struct proxy_manager *This = impl_from_IMarshal( iface );
-    return IMultiQI_QueryInterface(&This->IMultiQI_iface, riid, ppvObject);
-}
-
-static ULONG WINAPI Proxy_AddRef(IMarshal *iface)
-{
-    struct proxy_manager *This = impl_from_IMarshal( iface );
-    return IMultiQI_AddRef(&This->IMultiQI_iface);
-}
-
-static ULONG WINAPI Proxy_Release(IMarshal *iface)
-{
-    struct proxy_manager *This = impl_from_IMarshal( iface );
-    return IMultiQI_Release(&This->IMultiQI_iface);
-}
-
-static HRESULT WINAPI Proxy_GetUnmarshalClass(
-    IMarshal *iface, REFIID riid, void* pv, DWORD dwDestContext,
-    void* pvDestContext, DWORD mshlflags, CLSID* pCid)
-{
-    *pCid = CLSID_StdMarshal;
-    return S_OK;
-}
-
-static HRESULT WINAPI Proxy_GetMarshalSizeMax(
-    IMarshal *iface, REFIID riid, void* pv, DWORD dwDestContext,
-    void* pvDestContext, DWORD mshlflags, DWORD* pSize)
-{
-    *pSize = FIELD_OFFSET(OBJREF, u_objref.u_standard.saResAddr.aStringArray);
-    return S_OK;
-}
-
-static void fill_std_objref(OBJREF *objref, const GUID *iid, STDOBJREF *std)
-{
-    objref->signature = OBJREF_SIGNATURE;
-    objref->flags = OBJREF_STANDARD;
-    objref->iid = *iid;
-    if(std)
-        objref->u_objref.u_standard.std = *std;
-    memset(&objref->u_objref.u_standard.saResAddr, 0,
-            sizeof(objref->u_objref.u_standard.saResAddr));
-}
-
-static HRESULT WINAPI Proxy_MarshalInterface(
-    LPMARSHAL iface, IStream *pStm, REFIID riid, void* pv, DWORD dwDestContext,
-    void* pvDestContext, DWORD mshlflags)
-{
-    struct proxy_manager *This = impl_from_IMarshal( iface );
-    HRESULT hr;
-    struct ifproxy *ifproxy;
-
-    TRACE("(...,%s,...)\n", debugstr_guid(riid));
-
-    hr = proxy_manager_find_ifproxy(This, riid, &ifproxy);
-    if (SUCCEEDED(hr))
-    {
-        STDOBJREF stdobjref = ifproxy->stdobjref;
-
-        stdobjref.cPublicRefs = 0;
-
-        if ((mshlflags != MSHLFLAGS_TABLEWEAK) &&
-            (mshlflags != MSHLFLAGS_TABLESTRONG))
-        {
-            ULONG cPublicRefs = ifproxy->refs;
-            ULONG cPublicRefsOld;
-            /* optimization - share out proxy's public references if possible
-             * instead of making new proxy do a roundtrip through the server */
-            do
-            {
-                ULONG cPublicRefsNew;
-                cPublicRefsOld = cPublicRefs;
-                stdobjref.cPublicRefs = cPublicRefs / 2;
-                cPublicRefsNew = cPublicRefs - stdobjref.cPublicRefs;
-                cPublicRefs = InterlockedCompareExchange(
-                    (LONG *)&ifproxy->refs, cPublicRefsNew, cPublicRefsOld);
-            } while (cPublicRefs != cPublicRefsOld);
-        }
-
-        /* normal and table-strong marshaling need at least one reference */
-        if (!stdobjref.cPublicRefs && (mshlflags != MSHLFLAGS_TABLEWEAK))
-        {
-            IRemUnknown *remunk;
-            hr = proxy_manager_get_remunknown(This, &remunk);
-            if (hr == S_OK)
-            {
-                HRESULT hrref = S_OK;
-                REMINTERFACEREF rif;
-                rif.ipid = ifproxy->stdobjref.ipid;
-                rif.cPublicRefs = (mshlflags == MSHLFLAGS_TABLESTRONG) ? 1 : NORMALEXTREFS;
-                rif.cPrivateRefs = 0;
-                hr = IRemUnknown_RemAddRef(remunk, 1, &rif, &hrref);
-                IRemUnknown_Release(remunk);
-                if (hr == S_OK && hrref == S_OK)
-                {
-                    /* table-strong marshaling doesn't give the refs to the
-                     * client that unmarshals the STDOBJREF */
-                    if (mshlflags != MSHLFLAGS_TABLESTRONG)
-                        stdobjref.cPublicRefs = rif.cPublicRefs;
-                }
-                else
-                    ERR("IRemUnknown_RemAddRef returned with 0x%08x, hrref = 0x%08x\n", hr, hrref);
-            }
-        }
-
-        if (SUCCEEDED(hr))
-        {
-            OBJREF objref;
-
-            TRACE("writing stdobjref: flags = %04x cPublicRefs = %d oxid = %s oid = %s ipid = %s\n",
-                stdobjref.flags, stdobjref.cPublicRefs,
-                wine_dbgstr_longlong(stdobjref.oxid),
-                wine_dbgstr_longlong(stdobjref.oid),
-                debugstr_guid(&stdobjref.ipid));
-            fill_std_objref(&objref, riid, &stdobjref);
-            hr = IStream_Write(pStm, &objref, FIELD_OFFSET(OBJREF,
-                        u_objref.u_standard.saResAddr.aStringArray), NULL);
-        }
-    }
-    else
-    {
-        /* we don't have the interface already unmarshaled so we have to
-         * request the object from the server */
-        IRemUnknown *remunk;
-        IPID *ipid;
-        REMQIRESULT *qiresults = NULL;
-        IID iid = *riid;
-
-        /* get the ipid of the first entry */
-        /* FIXME: should we implement ClientIdentity on the ifproxies instead
-         * of the proxy_manager so we use the correct ipid here? */
-        ipid = &LIST_ENTRY(list_head(&This->interfaces), struct ifproxy, entry)->stdobjref.ipid;
-
-        /* get IRemUnknown proxy so we can communicate with the remote object */
-        hr = proxy_manager_get_remunknown(This, &remunk);
-
-        if (hr == S_OK)
-        {
-            hr = IRemUnknown_RemQueryInterface(remunk, ipid, NORMALEXTREFS,
-                                               1, &iid, &qiresults);
-            if (SUCCEEDED(hr))
-            {
-                OBJREF objref;
-
-                fill_std_objref(&objref, riid, &qiresults->std);
-                hr = IStream_Write(pStm, &objref, FIELD_OFFSET(OBJREF,
-                            u_objref.u_standard.saResAddr.aStringArray), NULL);
-                if (FAILED(hr))
-                {
-                    REMINTERFACEREF rif;
-                    rif.ipid = qiresults->std.ipid;
-                    rif.cPublicRefs = qiresults->std.cPublicRefs;
-                    rif.cPrivateRefs = 0;
-                    IRemUnknown_RemRelease(remunk, 1, &rif);
-                }
-                CoTaskMemFree(qiresults);
-            }
-            else
-                ERR("IRemUnknown_RemQueryInterface failed with error 0x%08x\n", hr);
-            IRemUnknown_Release(remunk);
-        }
-    }
-
-    return hr;
-}
-
-static HRESULT WINAPI Proxy_UnmarshalInterface(
-        IMarshal *iface, IStream *pStm, REFIID riid, void **ppv)
-{
-    struct proxy_manager *This = impl_from_IMarshal( iface );
-    IMarshal *marshal;
-    HRESULT hr;
-
-    TRACE("(%p, %p, %s, %p)\n", This, pStm, wine_dbgstr_guid(riid), ppv);
-
-    hr = StdMarshalImpl_Construct(&IID_IMarshal, This->dest_context,
-            This->dest_context_data, (void**)&marshal);
-    if(FAILED(hr))
-        return hr;
-
-    hr = IMarshal_UnmarshalInterface(marshal, pStm, riid, ppv);
-    IMarshal_Release(marshal);
-    return hr;
-}
-
-static HRESULT WINAPI Proxy_ReleaseMarshalData(IMarshal *iface, IStream *pStm)
-{
-    struct proxy_manager *This = impl_from_IMarshal( iface );
-    IMarshal *marshal;
-    HRESULT hr;
-
-    TRACE("(%p, %p)\n", This, pStm);
-
-    hr = StdMarshalImpl_Construct(&IID_IMarshal, This->dest_context,
-            This->dest_context_data, (void**)&marshal);
-    if(FAILED(hr))
-        return hr;
-
-    hr = IMarshal_ReleaseMarshalData(marshal, pStm);
-    IMarshal_Release(marshal);
-    return hr;
-}
-
-static HRESULT WINAPI Proxy_DisconnectObject(IMarshal *iface, DWORD dwReserved)
-{
-    struct proxy_manager *This = impl_from_IMarshal( iface );
-    IMarshal *marshal;
-    HRESULT hr;
-
-    TRACE("(%p, %x)\n", This, dwReserved);
-
-    hr = StdMarshalImpl_Construct(&IID_IMarshal, This->dest_context,
-            This->dest_context_data, (void**)&marshal);
-    if(FAILED(hr))
-        return hr;
-
-    hr = IMarshal_DisconnectObject(marshal, dwReserved);
-    IMarshal_Release(marshal);
-    return hr;
-}
-
-static const IMarshalVtbl ProxyMarshal_Vtbl =
-{
-    Proxy_QueryInterface,
-    Proxy_AddRef,
-    Proxy_Release,
-    Proxy_GetUnmarshalClass,
-    Proxy_GetMarshalSizeMax,
-    Proxy_MarshalInterface,
-    Proxy_UnmarshalInterface,
-    Proxy_ReleaseMarshalData,
-    Proxy_DisconnectObject
-};
-
-static HRESULT WINAPI ProxyCliSec_QueryInterface(IClientSecurity *iface, REFIID riid, void **ppvObject)
-{
-    struct proxy_manager *This = impl_from_IClientSecurity( iface );
-    return IMultiQI_QueryInterface(&This->IMultiQI_iface, riid, ppvObject);
-}
-
-static ULONG WINAPI ProxyCliSec_AddRef(IClientSecurity *iface)
-{
-    struct proxy_manager *This = impl_from_IClientSecurity( iface );
-    return IMultiQI_AddRef(&This->IMultiQI_iface);
-}
-
-static ULONG WINAPI ProxyCliSec_Release(IClientSecurity *iface)
-{
-    struct proxy_manager *This = impl_from_IClientSecurity( iface );
-    return IMultiQI_Release(&This->IMultiQI_iface);
-}
-
-static HRESULT WINAPI ProxyCliSec_QueryBlanket(IClientSecurity *iface,
-                                               IUnknown *pProxy,
-                                               DWORD *pAuthnSvc,
-                                               DWORD *pAuthzSvc,
-                                               OLECHAR **ppServerPrincName,
-                                               DWORD *pAuthnLevel,
-                                               DWORD *pImpLevel,
-                                               void **pAuthInfo,
-                                               DWORD *pCapabilities)
-{
-    FIXME("(%p, %p, %p, %p, %p, %p, %p, %p): stub\n", pProxy, pAuthnSvc,
-          pAuthzSvc, ppServerPrincName, pAuthnLevel, pImpLevel, pAuthInfo,
-          pCapabilities);
-
-    if (pAuthnSvc)
-        *pAuthnSvc = 0;
-    if (pAuthzSvc)
-        *pAuthzSvc = 0;
-    if (ppServerPrincName)
-        *ppServerPrincName = NULL;
-    if (pAuthnLevel)
-        *pAuthnLevel = RPC_C_AUTHN_LEVEL_DEFAULT;
-    if (pImpLevel)
-        *pImpLevel = RPC_C_IMP_LEVEL_DEFAULT;
-    if (pAuthInfo)
-        *pAuthInfo = NULL;
-    if (pCapabilities)
-        *pCapabilities = EOAC_NONE;
-
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI ProxyCliSec_SetBlanket(IClientSecurity *iface,
-                                             IUnknown *pProxy, DWORD AuthnSvc,
-                                             DWORD AuthzSvc,
-                                             OLECHAR *pServerPrincName,
-                                             DWORD AuthnLevel, DWORD ImpLevel,
-                                             void *pAuthInfo,
-                                             DWORD Capabilities)
-{
-    FIXME("(%p, %d, %d, %s, %d, %d, %p, 0x%x): stub\n", pProxy, AuthnSvc, AuthzSvc,
-          pServerPrincName == COLE_DEFAULT_PRINCIPAL ? "<default principal>" : debugstr_w(pServerPrincName),
-          AuthnLevel, ImpLevel, pAuthInfo, Capabilities);
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI ProxyCliSec_CopyProxy(IClientSecurity *iface,
-                                            IUnknown *pProxy, IUnknown **ppCopy)
-{
-    FIXME("(%p, %p): stub\n", pProxy, ppCopy);
-    *ppCopy = NULL;
-    return E_NOTIMPL;
-}
-
-static const IClientSecurityVtbl ProxyCliSec_Vtbl =
-{
-    ProxyCliSec_QueryInterface,
-    ProxyCliSec_AddRef,
-    ProxyCliSec_Release,
-    ProxyCliSec_QueryBlanket,
-    ProxyCliSec_SetBlanket,
-    ProxyCliSec_CopyProxy
-};
-
-static HRESULT ifproxy_get_public_ref(struct ifproxy * This)
-{
-    HRESULT hr = S_OK;
-
-    if (WAIT_OBJECT_0 != WaitForSingleObject(This->parent->remoting_mutex, INFINITE))
-    {
-        ERR("Wait failed for ifproxy %p\n", This);
-        return E_UNEXPECTED;
-    }
-
-    if (This->refs == 0)
-    {
-        IRemUnknown *remunk = NULL;
-
-        TRACE("getting public ref for ifproxy %p\n", This);
-
-        hr = proxy_manager_get_remunknown(This->parent, &remunk);
-        if (hr == S_OK)
-        {
-            HRESULT hrref = S_OK;
-            REMINTERFACEREF rif;
-            rif.ipid = This->stdobjref.ipid;
-            rif.cPublicRefs = NORMALEXTREFS;
-            rif.cPrivateRefs = 0;
-            hr = IRemUnknown_RemAddRef(remunk, 1, &rif, &hrref);
-            IRemUnknown_Release(remunk);
-            if (hr == S_OK && hrref == S_OK)
-                InterlockedExchangeAdd((LONG *)&This->refs, NORMALEXTREFS);
-            else
-                ERR("IRemUnknown_RemAddRef returned with 0x%08x, hrref = 0x%08x\n", hr, hrref);
-        }
-    }
-    ReleaseMutex(This->parent->remoting_mutex);
-
-    return hr;
-}
-
-static HRESULT ifproxy_release_public_refs(struct ifproxy * This)
-{
-    HRESULT hr = S_OK;
-    LONG public_refs;
-
-    if (WAIT_OBJECT_0 != WaitForSingleObject(This->parent->remoting_mutex, INFINITE))
-    {
-        ERR("Wait failed for ifproxy %p\n", This);
-        return E_UNEXPECTED;
-    }
-
-    public_refs = This->refs;
-    if (public_refs > 0)
-    {
-        IRemUnknown *remunk = NULL;
-
-        TRACE("releasing %d refs\n", public_refs);
-
-        hr = proxy_manager_get_remunknown(This->parent, &remunk);
-        if (hr == S_OK)
-        {
-            REMINTERFACEREF rif;
-            rif.ipid = This->stdobjref.ipid;
-            rif.cPublicRefs = public_refs;
-            rif.cPrivateRefs = 0;
-            hr = IRemUnknown_RemRelease(remunk, 1, &rif);
-            IRemUnknown_Release(remunk);
-            if (hr == S_OK)
-                InterlockedExchangeAdd((LONG *)&This->refs, -public_refs);
-            else if (hr == RPC_E_DISCONNECTED)
-                WARN("couldn't release references because object was "
-                     "disconnected: oxid = %s, oid = %s\n",
-                     wine_dbgstr_longlong(This->parent->oxid),
-                     wine_dbgstr_longlong(This->parent->oid));
-            else
-                ERR("IRemUnknown_RemRelease failed with error 0x%08x\n", hr);
-        }
-    }
-    ReleaseMutex(This->parent->remoting_mutex);
-
-    return hr;
-}
-
-/* should be called inside This->parent->cs critical section */
-static void ifproxy_disconnect(struct ifproxy * This)
-{
-    ifproxy_release_public_refs(This);
-    if (This->proxy) IRpcProxyBuffer_Disconnect(This->proxy);
-
-    IRpcChannelBuffer_Release(This->chan);
-    This->chan = NULL;
-}
-
-/* should be called in This->parent->cs critical section if it is an entry in parent's list */
-static void ifproxy_destroy(struct ifproxy * This)
-{
-    TRACE("%p\n", This);
-
-    /* release public references to this object so that the stub can know
-     * when to destroy itself */
-    ifproxy_release_public_refs(This);
-
-    list_remove(&This->entry);
-
-    if (This->chan)
-    {
-        IRpcChannelBuffer_Release(This->chan);
-        This->chan = NULL;
-    }
-
-    if (This->proxy) IRpcProxyBuffer_Release(This->proxy);
-
-    HeapFree(GetProcessHeap(), 0, This);
-}
-
-static HRESULT proxy_manager_construct(
-    struct apartment * apt, ULONG sorflags, OXID oxid, OID oid,
-    const OXID_INFO *oxid_info, struct proxy_manager ** proxy_manager)
-{
-    struct proxy_manager * This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This));
-    if (!This) return E_OUTOFMEMORY;
-
-    This->remoting_mutex = CreateMutexW(NULL, FALSE, NULL);
-    if (!This->remoting_mutex)
-    {
-        HeapFree(GetProcessHeap(), 0, This);
-        return HRESULT_FROM_WIN32(GetLastError());
-    }
-
-    if (oxid_info)
-    {
-        This->oxid_info.dwPid = oxid_info->dwPid;
-        This->oxid_info.dwTid = oxid_info->dwTid;
-        This->oxid_info.ipidRemUnknown = oxid_info->ipidRemUnknown;
-        This->oxid_info.dwAuthnHint = oxid_info->dwAuthnHint;
-        This->oxid_info.psa = NULL /* FIXME: copy from oxid_info */;
-    }
-    else
-    {
-        HRESULT hr = rpc_resolve_oxid(oxid, &This->oxid_info);
-        if (FAILED(hr))
-        {
-            CloseHandle(This->remoting_mutex);
-            HeapFree(GetProcessHeap(), 0, This);
-            return hr;
-        }
-    }
-
-    This->IMultiQI_iface.lpVtbl = &ClientIdentity_Vtbl;
-    This->IMarshal_iface.lpVtbl = &ProxyMarshal_Vtbl;
-    This->IClientSecurity_iface.lpVtbl = &ProxyCliSec_Vtbl;
-
-    list_init(&This->entry);
-    list_init(&This->interfaces);
-
-    InitializeCriticalSection(&This->cs);
-    This->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": proxy_manager");
-
-    /* the apartment the object was unmarshaled into */
-    This->parent = apt;
-
-    /* the source apartment and id of the object */
-    This->oxid = oxid;
-    This->oid = oid;
-
-    This->refs = 1;
-
-    /* the DCOM draft specification states that the SORF_NOPING flag is
-     * proxy manager specific, not ifproxy specific, so this implies that we
-     * should store the STDOBJREF flags here in the proxy manager. */
-    This->sorflags = sorflags;
-
-    /* we create the IRemUnknown proxy on demand */
-    This->remunk = NULL;
-
-    /* initialise these values to the weakest values and they will be
-     * overwritten in proxy_manager_set_context */
-    This->dest_context = MSHCTX_INPROC;
-    This->dest_context_data = NULL;
-
-    EnterCriticalSection(&apt->cs);
-    /* FIXME: we are dependent on the ordering in here to make sure a proxy's
-     * IRemUnknown proxy doesn't get destroyed before the regular proxy does
-     * because we need the IRemUnknown proxy during the destruction of the
-     * regular proxy. Ideally, we should maintain a separate list for the
-     * IRemUnknown proxies that need late destruction */
-    list_add_tail(&apt->proxies, &This->entry);
-    LeaveCriticalSection(&apt->cs);
-
-    TRACE("%p created for OXID %s, OID %s\n", This,
-        wine_dbgstr_longlong(oxid), wine_dbgstr_longlong(oid));
-
-    *proxy_manager = This;
-    return S_OK;
-}
-
-static inline void proxy_manager_set_context(struct proxy_manager *This, MSHCTX dest_context, void *dest_context_data)
-{
-    MSHCTX old_dest_context;
-    MSHCTX new_dest_context;
+/*++
 
-    do
-    {
-        old_dest_context = This->dest_context;
-        new_dest_context = old_dest_context;
-        /* "stronger" values overwrite "weaker" values. stronger values are
-         * ones that disable more optimisations */
-        switch (old_dest_context)
-        {
-        case MSHCTX_INPROC:
-            new_dest_context = dest_context;
-            break;
-        case MSHCTX_CROSSCTX:
-            switch (dest_context)
-            {
-            case MSHCTX_INPROC:
-                break;
-            default:
-                new_dest_context = dest_context;
-            }
-            break;
-        case MSHCTX_LOCAL:
-            switch (dest_context)
-            {
-            case MSHCTX_INPROC:
-            case MSHCTX_CROSSCTX:
-                break;
-            default:
-                new_dest_context = dest_context;
-            }
-            break;
-        case MSHCTX_NOSHAREDMEM:
-            switch (dest_context)
-            {
-            case MSHCTX_DIFFERENTMACHINE:
-                new_dest_context = dest_context;
-                break;
-            default:
-                break;
-            }
-            break;
-        default:
-            break;
-        }
+Copyright (c) 2023 Shorthorn Project
 
-        if (old_dest_context == new_dest_context) break;
+Module Name:
 
-        new_dest_context = InterlockedCompareExchange((PLONG)&This->dest_context, new_dest_context, old_dest_context);
-    } while (new_dest_context != old_dest_context);
+    main.c
 
-    if (dest_context_data)
-        InterlockedExchangePointer(&This->dest_context_data, dest_context_data);
-}
+Abstract:
 
-static HRESULT proxy_manager_query_local_interface(struct proxy_manager * This, REFIID riid, void ** ppv)
-{
-    HRESULT hr;
-    struct ifproxy * ifproxy;
+    This module implements COM Marshaling functions APIs
 
-    TRACE("%s\n", debugstr_guid(riid));
+Author:
 
-    if (IsEqualIID(riid, &IID_IUnknown) ||
-        IsEqualIID(riid, &IID_IMultiQI))
-    {
-        *ppv = &This->IMultiQI_iface;
-        IMultiQI_AddRef(&This->IMultiQI_iface);
-        return S_OK;
-    }
-    if (IsEqualIID(riid, &IID_IMarshal))
-    {
-        *ppv = &This->IMarshal_iface;
-        IMarshal_AddRef(&This->IMarshal_iface);
-        return S_OK;
-    }
-    if (IsEqualIID(riid, &IID_IClientSecurity))
-    {
-        *ppv = &This->IClientSecurity_iface;
-        IClientSecurity_AddRef(&This->IClientSecurity_iface);
-        return S_OK;
-    }
+    Skulltrail 12-October-2023
 
-    hr = proxy_manager_find_ifproxy(This, riid, &ifproxy);
-    if (hr == S_OK)
-    {
-        *ppv = ifproxy->iface;
-        IUnknown_AddRef((IUnknown *)*ppv);
-        return S_OK;
-    }
+Revision History:
 
-    *ppv = NULL;
-    return E_NOINTERFACE;
-}
+--*/
 
-static HRESULT proxy_manager_create_ifproxy(
-    struct proxy_manager * This, const STDOBJREF *stdobjref, REFIID riid,
-    IRpcChannelBuffer * channel, struct ifproxy ** iif_out)
-{
-    HRESULT hr;
-    IPSFactoryBuffer * psfb;
-    struct ifproxy * ifproxy = HeapAlloc(GetProcessHeap(), 0, sizeof(*ifproxy));
-    if (!ifproxy) return E_OUTOFMEMORY;
+#define WIN32_NO_STATUS
 
-    list_init(&ifproxy->entry);
+#include "main.h"
 
-    ifproxy->parent = This;
-    ifproxy->stdobjref = *stdobjref;
-    ifproxy->iid = *riid;
-    ifproxy->refs = 0;
-    ifproxy->proxy = NULL;
+WINE_DEFAULT_DEBUG_CHANNEL(ole32);
 
-    assert(channel);
-    ifproxy->chan = channel; /* FIXME: we should take the binding strings and construct the channel in this function */
+static HRESULT ifproxy_release_public_refs(struct ifproxy * This)
+{
+    HRESULT hr = S_OK;
+    LONG public_refs;
 
-    /* the IUnknown interface is special because it does not have a
-     * proxy associated with the ifproxy as we handle IUnknown ourselves */
-    if (IsEqualIID(riid, &IID_IUnknown))
+    if (WAIT_OBJECT_0 != WaitForSingleObject(This->parent->remoting_mutex, INFINITE))
     {
-        ifproxy->iface = &This->IMultiQI_iface;
-        IMultiQI_AddRef(&This->IMultiQI_iface);
-        hr = S_OK;
+        ERR("Wait failed for ifproxy %p\n", This);
+        return E_UNEXPECTED;
     }
-    else
+
+    public_refs = This->refs;
+    if (public_refs > 0)
     {
-        hr = get_facbuf_for_iid(riid, &psfb);
+        IRemUnknown *remunk = NULL;
+
+        TRACE("releasing %ld refs\n", public_refs);
+
+        hr = proxy_manager_get_remunknown(This->parent, &remunk);
         if (hr == S_OK)
         {
-            /* important note: the outer unknown is set to the proxy manager.
-             * This ensures the COM identity rules are not violated, by having a
-             * one-to-one mapping of objects on the proxy side to objects on the
-             * stub side, no matter which interface you view the object through */
-            hr = IPSFactoryBuffer_CreateProxy(psfb, (IUnknown*)&This->IMultiQI_iface, riid,
-                                              &ifproxy->proxy, &ifproxy->iface);
-            IPSFactoryBuffer_Release(psfb);
-            if (hr != S_OK)
-                ERR("Could not create proxy for interface %s, error 0x%08x\n",
-                    debugstr_guid(riid), hr);
+            REMINTERFACEREF rif;
+            rif.ipid = This->stdobjref.ipid;
+            rif.cPublicRefs = public_refs;
+            rif.cPrivateRefs = 0;
+            hr = IRemUnknown_RemRelease(remunk, 1, &rif);
+            IRemUnknown_Release(remunk);
+            if (hr == S_OK)
+                InterlockedExchangeAdd((LONG *)&This->refs, -public_refs);
+            else if (hr == RPC_E_DISCONNECTED)
+                WARN("couldn't release references because object was "
+                     "disconnected: oxid = %s, oid = %s\n",
+                     wine_dbgstr_longlong(This->parent->oxid),
+                     wine_dbgstr_longlong(This->parent->oid));
+            else
+                ERR("IRemUnknown_RemRelease failed with error %#lx\n", hr);
         }
-        else
-            ERR("Could not get IPSFactoryBuffer for interface %s, error 0x%08x\n",
-                debugstr_guid(riid), hr);
-
-        if (hr == S_OK)
-            hr = IRpcProxyBuffer_Connect(ifproxy->proxy, ifproxy->chan);
-    }
-
-    if (hr == S_OK)
-    {
-        EnterCriticalSection(&This->cs);
-        list_add_tail(&This->interfaces, &ifproxy->entry);
-        LeaveCriticalSection(&This->cs);
-
-        *iif_out = ifproxy;
-        TRACE("ifproxy %p created for IPID %s, interface %s with %u public refs\n",
-              ifproxy, debugstr_guid(&stdobjref->ipid), debugstr_guid(riid), stdobjref->cPublicRefs);
     }
-    else
-        ifproxy_destroy(ifproxy);
+    ReleaseMutex(This->parent->remoting_mutex);
 
     return hr;
 }
 
-static HRESULT proxy_manager_find_ifproxy(struct proxy_manager * This, REFIID riid, struct ifproxy ** ifproxy_found)
+/* should be called inside This->parent->cs critical section */
+static void ifproxy_disconnect(struct ifproxy * This)
 {
-    HRESULT hr = E_NOINTERFACE; /* assume not found */
-    struct ifproxy *ifproxy;
-
-    EnterCriticalSection(&This->cs);
-    LIST_FOR_EACH_ENTRY(ifproxy, &This->interfaces, struct ifproxy, entry)
-    {
-        if (IsEqualIID(riid, &ifproxy->iid))
-        {
-            *ifproxy_found = ifproxy;
-            hr = S_OK;
-            break;
-        }
-    }
-    LeaveCriticalSection(&This->cs);
+    ifproxy_release_public_refs(This);
+    if (This->proxy) IRpcProxyBuffer_Disconnect(This->proxy);
 
-    return hr;
+    IRpcChannelBuffer_Release(This->chan);
+    This->chan = NULL;
 }
 
 static void proxy_manager_disconnect(struct proxy_manager * This)
@@ -1846,6 +104,18 @@ static void proxy_manager_disconnect(struct proxy_manager * This)
     LeaveCriticalSection(&This->cs);
 }
 
+HRESULT apartment_disconnectproxies(struct apartment *apt)
+{
+    struct proxy_manager *proxy;
+
+    LIST_FOR_EACH_ENTRY(proxy, &apt->proxies, struct proxy_manager, entry)
+    {
+        proxy_manager_disconnect(proxy);
+    }
+
+    return S_OK;
+}
+
 static HRESULT proxy_manager_get_remunknown(struct proxy_manager * This, IRemUnknown **remunk)
 {
     HRESULT hr = S_OK;
@@ -1904,55 +174,35 @@ static HRESULT proxy_manager_get_remunknown(struct proxy_manager * This, IRemUnk
     LeaveCriticalSection(&This->cs);
     apartment_release(apt);
 
-    TRACE("got IRemUnknown* pointer %p, hr = 0x%08x\n", *remunk, hr);
+    TRACE("got IRemUnknown* pointer %p, hr = %#lx\n", *remunk, hr);
 
     return hr;
 }
 
-/* destroys a proxy manager, freeing the memory it used.
- * Note: this function should not be called from a list iteration in the
- * apartment, due to the fact that it removes itself from the apartment and
- * it could add a proxy to IRemUnknown into the apartment. */
-static void proxy_manager_destroy(struct proxy_manager * This)
+/*
+ * Safely increment the reference count of a proxy manager obtained from an
+ * apartment proxy list.
+ *
+ * This function shall be called inside the apartment's critical section.
+ */
+static LONG proxy_manager_addref_if_alive(struct proxy_manager * This)
 {
-    struct list * cursor;
-
-    TRACE("oxid = %s, oid = %s\n", wine_dbgstr_longlong(This->oxid),
-        wine_dbgstr_longlong(This->oid));
+    LONG refs = ReadNoFence(&This->refs);
+    LONG old_refs, new_refs;
 
-    if (This->parent)
+    do
     {
-        EnterCriticalSection(&This->parent->cs);
-
-        /* remove ourself from the list of proxy objects in the apartment */
-        LIST_FOR_EACH(cursor, &This->parent->proxies)
+        if (refs == 0)
         {
-            if (cursor == &This->entry)
-            {
-                list_remove(&This->entry);
-                break;
-            }
+            /* This proxy manager is about to be destroyed */
+            return 0;
         }
 
-        LeaveCriticalSection(&This->parent->cs);
-    }
-
-    /* destroy all of the interface proxies */
-    while ((cursor = list_head(&This->interfaces)))
-    {
-        struct ifproxy * ifproxy = LIST_ENTRY(cursor, struct ifproxy, entry);
-        ifproxy_destroy(ifproxy);
-    }
-
-    if (This->remunk) IRemUnknown_Release(This->remunk);
-    CoTaskMemFree(This->oxid_info.psa);
+        old_refs = refs;
+        new_refs = refs + 1;
+    } while ((refs = InterlockedCompareExchange(&This->refs, new_refs, old_refs)) != old_refs);
 
-    This->cs.DebugInfo->Spare[0] = 0;
-    DeleteCriticalSection(&This->cs);
-
-    CloseHandle(This->remoting_mutex);
-
-    HeapFree(GetProcessHeap(), 0, This);
+    return new_refs;
 }
 
 /* finds the proxy manager corresponding to a given OXID and OID that has
@@ -1971,7 +221,7 @@ static BOOL find_proxy_manager(struct apartment * apt, OXID oxid, OID oid, struc
             /* be careful of a race with ClientIdentity_Release, which would
              * cause us to return a proxy which is in the process of being
              * destroyed */
-            if (IMultiQI_AddRef(&proxy->IMultiQI_iface) != 0)
+            if (proxy_manager_addref_if_alive(proxy) != 0)
             {
                 *proxy_found = proxy;
                 found = TRUE;
@@ -1983,109 +233,88 @@ static BOOL find_proxy_manager(struct apartment * apt, OXID oxid, OID oid, struc
     return found;
 }
 
-HRESULT apartment_disconnectproxies(struct apartment *apt)
+static HRESULT proxy_manager_construct(
+    struct apartment * apt, ULONG sorflags, OXID oxid, OID oid,
+    const OXID_INFO *oxid_info, struct proxy_manager ** proxy_manager)
 {
-    struct proxy_manager *proxy;
+    struct proxy_manager * This = malloc(sizeof(*This));
+    if (!This) return E_OUTOFMEMORY;
 
-    LIST_FOR_EACH_ENTRY(proxy, &apt->proxies, struct proxy_manager, entry)
+    This->remoting_mutex = CreateMutexW(NULL, FALSE, NULL);
+    if (!This->remoting_mutex)
     {
-        proxy_manager_disconnect(proxy);
+        free(This);
+        return HRESULT_FROM_WIN32(GetLastError());
     }
 
-    return S_OK;
-}
-
-/********************** StdMarshal implementation ****************************/
-
-struct stdmarshal
-{
-    IMarshal IMarshal_iface;
-    LONG refcount;
-    DWORD dest_context;
-    void *dest_context_data;
-};
-
-static inline struct stdmarshal *impl_from_StdMarshal(IMarshal *iface)
-{
-    return CONTAINING_RECORD(iface, struct stdmarshal, IMarshal_iface);
-}
-
-static HRESULT WINAPI StdMarshalImpl_QueryInterface(IMarshal *iface, REFIID riid, void **ppv)
-{
-    *ppv = NULL;
-    if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IMarshal, riid))
+    if (oxid_info)
     {
-        *ppv = iface;
-        IMarshal_AddRef(iface);
-        return S_OK;
+        This->oxid_info.dwPid = oxid_info->dwPid;
+        This->oxid_info.dwTid = oxid_info->dwTid;
+        This->oxid_info.ipidRemUnknown = oxid_info->ipidRemUnknown;
+        This->oxid_info.dwAuthnHint = oxid_info->dwAuthnHint;
+        This->oxid_info.psa = NULL /* FIXME: copy from oxid_info */;
+    }
+    else
+    {
+        HRESULT hr = rpc_resolve_oxid(oxid, &This->oxid_info);
+        if (FAILED(hr))
+        {
+            CloseHandle(This->remoting_mutex);
+            free(This);
+            return hr;
+        }
     }
-    FIXME("No interface for %s.\n", debugstr_guid(riid));
-    return E_NOINTERFACE;
-}
 
-static ULONG WINAPI StdMarshalImpl_AddRef(IMarshal *iface)
-{
-    struct stdmarshal *marshal = impl_from_StdMarshal(iface);
-    return InterlockedIncrement(&marshal->refcount);
-}
+    This->IMultiQI_iface.lpVtbl = &ClientIdentity_Vtbl;
+    This->IMarshal_iface.lpVtbl = &ProxyMarshal_Vtbl;
+    This->IClientSecurity_iface.lpVtbl = &ProxyCliSec_Vtbl;
 
-static ULONG WINAPI StdMarshalImpl_Release(IMarshal *iface)
-{
-    struct stdmarshal *marshal = impl_from_StdMarshal(iface);
-    ULONG refcount = InterlockedDecrement(&marshal->refcount);
+    list_init(&This->entry);
+    list_init(&This->interfaces);
 
-    if (!refcount)
-        heap_free(marshal);
+    InitializeCriticalSection(&This->cs);
+    This->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": proxy_manager");
 
-    return refcount;
-}
+    /* the apartment the object was unmarshaled into */
+    This->parent = apt;
 
-static HRESULT WINAPI StdMarshalImpl_GetUnmarshalClass(IMarshal *iface, REFIID riid, void *pv,
-        DWORD dwDestContext, void *pvDestContext, DWORD mshlflags, CLSID *pCid)
-{
-    *pCid = CLSID_StdMarshal;
-    return S_OK;
-}
+    /* the source apartment and id of the object */
+    This->oxid = oxid;
+    This->oid = oid;
 
-static HRESULT WINAPI StdMarshalImpl_GetMarshalSizeMax(IMarshal *iface, REFIID riid, void *pv,
-        DWORD dwDestContext, void *pvDestContext, DWORD mshlflags, DWORD *pSize)
-{
-    *pSize = FIELD_OFFSET(OBJREF, u_objref.u_standard.saResAddr.aStringArray);
-    return S_OK;
-}
+    This->refs = 1;
 
-static HRESULT WINAPI StdMarshalImpl_MarshalInterface(IMarshal *iface, IStream *stream, REFIID riid, void *pv,
-        DWORD dest_context, void *dest_context_data, DWORD mshlflags)
-{
-    ULONG res;
-    HRESULT hr;
-    OBJREF objref;
-    struct apartment *apt;
+    /* the DCOM draft specification states that the SORF_NOPING flag is
+     * proxy manager specific, not ifproxy specific, so this implies that we
+     * should store the STDOBJREF flags here in the proxy manager. */
+    This->sorflags = sorflags;
 
-    TRACE("(...,%s,...)\n", debugstr_guid(riid));
+    /* we create the IRemUnknown proxy on demand */
+    This->remunk = NULL;
 
-    if (!(apt = apartment_get_current_or_mta()))
-    {
-        ERR("Apartment not initialized\n");
-        return CO_E_NOTINITIALIZED;
-    }
+    /* initialise these values to the weakest values and they will be
+     * overwritten in proxy_manager_set_context */
+    This->dest_context = MSHCTX_INPROC;
+    This->dest_context_data = NULL;
 
-    /* make sure this apartment can be reached from other threads / processes */
-    rpc_start_remoting(apt);
+    EnterCriticalSection(&apt->cs);
+    /* FIXME: we are dependent on the ordering in here to make sure a proxy's
+     * IRemUnknown proxy doesn't get destroyed before the regular proxy does
+     * because we need the IRemUnknown proxy during the destruction of the
+     * regular proxy. Ideally, we should maintain a separate list for the
+     * IRemUnknown proxies that need late destruction */
+    list_add_tail(&apt->proxies, &This->entry);
+    LeaveCriticalSection(&apt->cs);
 
-    fill_std_objref(&objref, riid, NULL);
-    hr = marshal_object(apt, &objref.u_objref.u_standard.std, riid, pv, dest_context,
-            dest_context_data, mshlflags);
-    apartment_release(apt);
-    if (hr != S_OK)
-    {
-        ERR("Failed to create ifstub, hr %#x\n", hr);
-        return hr;
-    }
+    TRACE("%p created for OXID %s, OID %s\n", This,
+        wine_dbgstr_longlong(oxid), wine_dbgstr_longlong(oid));
 
-    return IStream_Write(stream, &objref, FIELD_OFFSET(OBJREF, u_objref.u_standard.saResAddr.aStringArray), &res);
+    *proxy_manager = This;
+    return S_OK;
 }
 
+
 /* helper for StdMarshalImpl_UnmarshalInterface - does the unmarshaling with
  * no questions asked about the rules surrounding same-apartment unmarshals
  * and table marshaling */
@@ -2097,7 +326,7 @@ static HRESULT unmarshal_object(const STDOBJREF *stdobjref, struct apartment *ap
 
     assert(apt);
 
-    TRACE("stdobjref: flags = %04x cPublicRefs = %d oxid = %s oid = %s ipid = %s\n",
+    TRACE("stdobjref: flags = %#lx cPublicRefs = %ld oxid = %s oid = %s ipid = %s\n",
         stdobjref->flags, stdobjref->cPublicRefs,
         wine_dbgstr_longlong(stdobjref->oxid),
         wine_dbgstr_longlong(stdobjref->oid),
@@ -2152,123 +381,3 @@ static HRESULT unmarshal_object(const STDOBJREF *stdobjref, struct apartment *ap
 
     return hr;
 }
-
-static HRESULT WINAPI StdMarshalImpl_UnmarshalInterface(IMarshal *iface, IStream *stream, REFIID riid, void **ppv)
-{
-    struct stdmarshal *marshal = impl_from_StdMarshal(iface);
-    OBJREF objref;
-    HRESULT hr;
-    ULONG res;
-
-    hr = IStream_Read(stream, &objref, FIELD_OFFSET(OBJREF, u_objref), &res);
-    if (hr != S_OK || (res != FIELD_OFFSET(OBJREF, u_objref)))
-    {
-        ERR("Failed to read common OBJREF header, 0x%08x\n", hr);
-        return STG_E_READFAULT;
-    }
-
-    if (objref.signature != OBJREF_SIGNATURE)
-    {
-        ERR("Bad OBJREF signature 0x%08x\n", objref.signature);
-        return RPC_E_INVALID_OBJREF;
-    }
-
-    if (!(objref.flags & OBJREF_STANDARD))
-    {
-        FIXME("unsupported objref.flags = %x\n", objref.flags);
-        return E_NOTIMPL;
-    }
-
-    return std_unmarshal_interface(marshal->dest_context, marshal->dest_context_data, stream, riid, ppv);
-}
-
-static HRESULT WINAPI StdMarshalImpl_ReleaseMarshalData(IMarshal *iface, IStream *stream)
-{
-    OBJREF objref;
-    HRESULT hr;
-    ULONG res;
-
-    TRACE("%p, %p\n", iface, stream);
-
-    hr = IStream_Read(stream, &objref, FIELD_OFFSET(OBJREF, u_objref), &res);
-    if (hr != S_OK || (res != FIELD_OFFSET(OBJREF, u_objref)))
-    {
-        ERR("Failed to read common OBJREF header, 0x%08x\n", hr);
-        return STG_E_READFAULT;
-    }
-
-    if (objref.signature != OBJREF_SIGNATURE)
-    {
-        ERR("Bad OBJREF signature 0x%08x\n", objref.signature);
-        return RPC_E_INVALID_OBJREF;
-    }
-
-    if (!(objref.flags & OBJREF_STANDARD))
-    {
-        FIXME("unsupported objref.flags = %x\n", objref.flags);
-        return E_NOTIMPL;
-    }
-
-    return std_release_marshal_data(stream);
-}
-
-static HRESULT WINAPI StdMarshalImpl_DisconnectObject(IMarshal *iface, DWORD reserved)
-{
-    FIXME("(), stub!\n");
-    return S_OK;
-}
-
-static const IMarshalVtbl StdMarshalVtbl =
-{
-    StdMarshalImpl_QueryInterface,
-    StdMarshalImpl_AddRef,
-    StdMarshalImpl_Release,
-    StdMarshalImpl_GetUnmarshalClass,
-    StdMarshalImpl_GetMarshalSizeMax,
-    StdMarshalImpl_MarshalInterface,
-    StdMarshalImpl_UnmarshalInterface,
-    StdMarshalImpl_ReleaseMarshalData,
-    StdMarshalImpl_DisconnectObject
-};
-
-static HRESULT StdMarshalImpl_Construct(REFIID riid, DWORD dest_context, void *dest_context_data, void **ppvObject)
-{
-    struct stdmarshal *object;
-    HRESULT hr;
-
-    object = heap_alloc(sizeof(*object));
-    if (!object)
-        return E_OUTOFMEMORY;
-
-    object->IMarshal_iface.lpVtbl = &StdMarshalVtbl;
-    object->refcount = 1;
-    object->dest_context = dest_context;
-    object->dest_context_data = dest_context_data;
-
-    hr = IMarshal_QueryInterface(&object->IMarshal_iface, riid, ppvObject);
-    IMarshal_Release(&object->IMarshal_iface);
-
-    return hr;
-}
-
-HRESULT WINAPI InternalCoStdMarshalObject(REFIID riid, DWORD dest_context, void *dest_context_data, void **ppvObject)
-{
-    return StdMarshalImpl_Construct(riid, dest_context, dest_context_data, ppvObject);
-}
-
-/***********************************************************************
- *            CoGetStandardMarshal        (combase.@)
- */
-HRESULT WINAPI CoGetStandardMarshal(REFIID riid, IUnknown *pUnk, DWORD dwDestContext,
-        void *dest_context, DWORD flags, IMarshal **marshal)
-{
-    if (pUnk == NULL)
-    {
-        FIXME("(%s,NULL,%x,%p,%x,%p), unimplemented yet.\n", debugstr_guid(riid), dwDestContext,
-                dest_context, flags, marshal);
-        return E_NOTIMPL;
-    }
-    TRACE("%s, %p, %x, %p, %x, %p\n", debugstr_guid(riid), pUnk, dwDestContext, dest_context, flags, marshal);
-
-    return StdMarshalImpl_Construct(&IID_IMarshal, dwDestContext, dest_context, (void **)marshal);
-}
diff --git a/wrappers/new-dlls/combase/mta.c b/wrappers/new-dlls/combase/mta.c
new file mode 100644
index 0000000000..f9650680dd
--- /dev/null
+++ b/wrappers/new-dlls/combase/mta.c
@@ -0,0 +1,82 @@
+/*++
+
+Copyright (c) 2023 Shorthorn Project
+
+Module Name:
+
+    mta.c
+
+Abstract:
+
+    This module implements COM MTA functions APIs
+
+Author:
+
+    Skulltrail 12-October-2023
+
+Revision History:
+
+--*/
+
+#define WIN32_NO_STATUS
+
+#include "main.h"
+
+typedef struct _MTA_USAGE_INCREMENTOR
+{
+  ULONG ulTime;
+  DWORD dwThreadId;
+}MTA_USAGE_INCREMENTOR, *PMTA_USAGE_INCREMENTOR; // This struct came from the public symbol for combase.
+// Very little information or none at all is stripped from the symbol, including TEB data.
+
+DWORD MTAThreadToRemove = 0;
+
+void CreateMTAUsageThread()
+// Suggestion to self: implement mutex object and use WaitForSingleObject instead.
+// But this does not seem necessary at this time.
+{
+	DWORD Tid;
+	CoInitializeEx(NULL, 0);
+	Tid = GetCurrentThreadId();
+	while(MTAThreadToRemove != Tid)
+		Sleep(1); // Sleep(0) is equivalent to taking your CPU hostage when it is unnecessary
+    MTAThreadToRemove = 0;
+	CoUninitialize();
+}
+
+HRESULT WINAPI CoIncrementMTAUsage(CO_MTA_USAGE_COOKIE *pCookie) 
+/*
+   My earlier drafts of this function did not create a thread, but used internal functions and incremented
+   a global value in ole32.dll. Those are not suitable for wrappers.
+   
+   As the main intent of this function is to keep MTA alive when no MTA threads are running, the function
+   creates a thread that initializes a MTA then suspends immediately. The thread is resumed by a calloc
+   to CoDecrementMTAUsage.
+*/
+{
+	PMTA_USAGE_INCREMENTOR MTAIncrementor;
+	DWORD ThreadId;
+	MTAIncrementor = CoTaskMemAlloc(sizeof(MTA_USAGE_INCREMENTOR));
+	CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)CreateMTAUsageThread, 0, 0, &ThreadId);
+	MTAIncrementor->dwThreadId = ThreadId;
+	MTAIncrementor->ulTime = GetTickCount();
+
+	*pCookie = (CO_MTA_USAGE_COOKIE)MTAIncrementor;
+
+	return S_OK;
+}
+
+HRESULT WINAPI CoDecrementMTAUsage(CO_MTA_USAGE_COOKIE *pCookie)
+{
+	PMTA_USAGE_INCREMENTOR MTAIncrementor;
+	if(pCookie)
+	{
+		MTAIncrementor = (PMTA_USAGE_INCREMENTOR)*pCookie;
+		MTAThreadToRemove = MTAIncrementor->dwThreadId;
+
+		CoTaskMemFree(*pCookie);
+		return S_OK;
+	}
+	else
+		return E_INVALIDARG;
+}
\ No newline at end of file
diff --git a/wrappers/new-dlls/combase/olestd.h b/wrappers/new-dlls/combase/olestd.h
new file mode 100644
index 0000000000..02a4d3b2aa
--- /dev/null
+++ b/wrappers/new-dlls/combase/olestd.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2000 Abey George
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#if !defined( __WINE_OLESTD_H_ )
+#define __WINE_OLESTD_H_
+
+#if !defined(__cplusplus) && !defined( __TURBOC__)
+#define NONAMELESSUNION     /* use strict ANSI standard (for DVOBJ.H) */
+#endif
+
+/* Clipboard format strings */
+#define CF_EMBEDSOURCE      "Embed Source"
+#define CF_EMBEDDEDOBJECT   "Embedded Object"
+#define CF_LINKSOURCE       "Link Source"
+#define CF_CUSTOMLINKSOURCE "Custom Link Source"
+#define CF_OBJECTDESCRIPTOR "Object Descriptor"
+#define CF_LINKSRCDESCRIPTOR "Link Source Descriptor"
+#define CF_OWNERLINK        "OwnerLink"
+#define CF_FILENAME         "FileName"
+
+#define OleStdQueryOleObjectData(lpformatetc)   \
+   (((lpformatetc)->tymed & TYMED_ISTORAGE) ?    \
+         NOERROR : ResultFromScode(DV_E_FORMATETC))
+
+#define OleStdQueryLinkSourceData(lpformatetc)   \
+   (((lpformatetc)->tymed & TYMED_ISTREAM) ?    \
+         NOERROR : ResultFromScode(DV_E_FORMATETC))
+
+#define OleStdQueryObjectDescriptorData(lpformatetc)    \
+   (((lpformatetc)->tymed & TYMED_HGLOBAL) ?    \
+         NOERROR : ResultFromScode(DV_E_FORMATETC))
+
+#define OleStdQueryFormatMedium(lpformatetc, tymd)  \
+   (((lpformatetc)->tymed & tymd) ?    \
+         NOERROR : ResultFromScode(DV_E_FORMATETC))
+
+/* Make an independent copy of a MetafilePict */
+#define OleStdCopyMetafilePict(hpictin, phpictout)  \
+   (*(phpictout) = OleDuplicateData(hpictin,CF_METAFILEPICT,GHND|GMEM_SHARE))
+
+#endif /* __WINE_OLESTD_H_ */
diff --git a/wrappers/new-dlls/combase/rpc.c b/wrappers/new-dlls/combase/rpc.c
index 55450ad7f1..ece1ede229 100644
--- a/wrappers/new-dlls/combase/rpc.c
+++ b/wrappers/new-dlls/combase/rpc.c
@@ -1,187 +1,95 @@
-/*
- * Copyright 2001  Ove Kåven, TransGaming Technologies
- * Copyright 2002  Marcus Meissner
- * Copyright 2005  Mike Hearn, Rob Shearman for CodeWeavers
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
+/*++
 
-#include <stdarg.h>
+Copyright (c) 2023 Shorthorn Project
 
-#define COBJMACROS
+Module Name:
 
-#include "windef.h"
-#include "winbase.h"
-#include "winsvc.h"
-#include "servprov.h"
+    main.c
 
-#include "wine/debug.h"
-#include "wine/exception.h"
-#include "wine/heap.h"
+Abstract:
 
-#include "combase_private.h"
+    This module implements COM RPC functions APIs
 
-#include "irpcss.h"
+Author:
 
-WINE_DEFAULT_DEBUG_CHANNEL(ole);
+    Skulltrail 12-October-2023
 
-static void __RPC_STUB dispatch_rpc(RPC_MESSAGE *msg);
+Revision History:
 
-/* we only use one function to dispatch calls for all methods - we use the
- * RPC_IF_OLE flag to tell the RPC runtime that this is the case */
-static RPC_DISPATCH_FUNCTION rpc_dispatch_table[1] = { dispatch_rpc }; /* (RO) */
-static RPC_DISPATCH_TABLE rpc_dispatch = { 1, rpc_dispatch_table }; /* (RO) */
-
-static struct list registered_interfaces = LIST_INIT(registered_interfaces); /* (CS csRegIf) */
-static CRITICAL_SECTION csRegIf;
-static CRITICAL_SECTION_DEBUG csRegIf_debug =
-{
-    0, 0, &csRegIf,
-    { &csRegIf_debug.ProcessLocksList, &csRegIf_debug.ProcessLocksList },
-      0, 0, { (DWORD_PTR)(__FILE__ ": dcom registered server interfaces") }
-};
-static CRITICAL_SECTION csRegIf = { &csRegIf_debug, -1, 0, 0, 0, 0 };
-
-static struct list channel_hooks = LIST_INIT(channel_hooks); /* (CS csChannelHook) */
-static CRITICAL_SECTION csChannelHook;
-static CRITICAL_SECTION_DEBUG csChannelHook_debug =
+--*/
+ 
+#include "main.h"
+ 
+WINE_DEFAULT_DEBUG_CHANNEL(ole32);
+ 
+ static RPC_BINDING_HANDLE get_rpc_handle(unsigned short *protseq, unsigned short *endpoint)
 {
-    0, 0, &csChannelHook,
-    { &csChannelHook_debug.ProcessLocksList, &csChannelHook_debug.ProcessLocksList },
-      0, 0, { (DWORD_PTR)(__FILE__ ": channel hooks") }
-};
-static CRITICAL_SECTION csChannelHook = { &csChannelHook_debug, -1, 0, 0, 0, 0 };
-
-static WCHAR rpctransportW[] = L"ncalrpc";
+    RPC_BINDING_HANDLE handle = NULL;
+    RPC_STATUS status;
+    RPC_WSTR binding;
 
-struct registered_if
-{
-    struct list entry;
-    DWORD refs; /* ref count */
-    RPC_SERVER_INTERFACE If; /* interface registered with the RPC runtime */
-};
+    status = RpcStringBindingComposeW(NULL, protseq, NULL, endpoint, NULL, &binding);
+    if (status == RPC_S_OK)
+    {
+        status = RpcBindingFromStringBindingW(binding, &handle);
+        RpcStringFreeW(&binding);
+    }
 
-/* get the pipe endpoint specified of the specified apartment */
-static inline void get_rpc_endpoint(LPWSTR endpoint, const OXID *oxid)
-{
-    /* FIXME: should get endpoint from rpcss */
-    wsprintfW(endpoint, L"\\pipe\\OLE_%08lx%08lx", (DWORD)(*oxid >> 32), (DWORD)*oxid);
+    return handle;
 }
-
-typedef struct
-{
-    IRpcChannelBuffer IRpcChannelBuffer_iface;
-    LONG refs;
-
-    DWORD dest_context; /* returned from GetDestCtx */
-    void *dest_context_data; /* returned from GetDestCtx */
-} RpcChannelBuffer;
-
-typedef struct
+ 
+ static RPC_BINDING_HANDLE get_irpcss_handle(void)
 {
-    RpcChannelBuffer       super; /* superclass */
-
-    RPC_BINDING_HANDLE     bind; /* handle to the remote server */
-    OXID                   oxid; /* apartment in which the channel is valid */
-    DWORD                  server_pid; /* id of server process */
-    HANDLE                 event; /* cached event handle */
-    IID                    iid; /* IID of the proxy this belongs to */
-} ClientRpcChannelBuffer;
-
-struct dispatch_params
-{
-    RPCOLEMESSAGE     *msg; /* message */
-    IRpcStubBuffer    *stub; /* stub buffer, if applicable */
-    IRpcChannelBuffer *chan; /* server channel buffer, if applicable */
-    IID                iid; /* ID of interface being called */
-    IUnknown          *iface; /* interface being called */
-    HANDLE             handle; /* handle that will become signaled when call finishes */
-    BOOL               bypass_rpcrt; /* bypass RPC runtime? */
-    RPC_STATUS         status; /* status (out) */
-    HRESULT            hr; /* hresult (out) */
-};
+    static RPC_BINDING_HANDLE irpcss_handle;
 
-struct message_state
-{
-    RPC_BINDING_HANDLE binding_handle;
-    ULONG prefix_data_len;
-    SChannelHookCallInfo channel_hook_info;
-    BOOL bypass_rpcrt;
+    if (!irpcss_handle)
+    {
+        unsigned short protseq[] = IRPCSS_PROTSEQ;
+        unsigned short endpoint[] = IRPCSS_ENDPOINT;
 
-    /* client only */
-    HWND target_hwnd;
-    DWORD target_tid;
-    struct dispatch_params params;
-};
+        RPC_BINDING_HANDLE new_handle = get_rpc_handle(protseq, endpoint);
+        if (InterlockedCompareExchangePointer(&irpcss_handle, new_handle, NULL))
+            /* another thread beat us to it */
+            RpcBindingFree(&new_handle);
+    }
+    return irpcss_handle;
+}
 
-typedef struct
+static void scm_revoke_class(struct registered_class *_class)
 {
-    ULONG conformance; /* NDR */
-    GUID id;
-    ULONG size;
-    /* [size_is((size+7)&~7)] */ unsigned char data[1];
-} WIRE_ORPC_EXTENT;
-
-typedef struct
+    list_remove(&_class->entry);
+    free(_class->object);
+    free(_class);
+}
+ 
+ /* From rpcss */
+HRESULT __cdecl irpcss_server_revoke(handle_t h, unsigned int cookie)
 {
-    ULONG size;
-    ULONG reserved;
-    unsigned char extent[1];
-} WIRE_ORPC_EXTENT_ARRAY;
+    struct registered_class *cur;
 
-typedef struct
-{
-    ULONG version;
-    ULONG flags;
-    ULONG reserved1;
-    GUID  cid;
-    unsigned char extensions[1];
-} WIRE_ORPCTHIS;
+    EnterCriticalSection(&registered_classes_cs);
 
-typedef struct
-{
-    ULONG flags;
-    unsigned char extensions[1];
-} WIRE_ORPCTHAT;
+    LIST_FOR_EACH_ENTRY(cur, &registered_classes, struct registered_class, entry)
+    {
+        if (cur->cookie == cookie)
+        {
+            scm_revoke_class(cur);
+            break;
+        }
+    }
 
-struct channel_hook_entry
-{
-    struct list entry;
-    GUID id;
-    IChannelHook *hook;
-};
+    LeaveCriticalSection(&registered_classes_cs);
 
-struct channel_hook_buffer_data
-{
-    GUID id;
-    ULONG extension_size;
-};
-void * __RPC_USER MIDL_user_allocate(SIZE_T size)
-{
-    return heap_alloc(size);
+    return S_OK;
 }
 
-void __RPC_USER MIDL_user_free(void *p)
+HRESULT rpc_revoke_local_server(unsigned int cookie)
 {
-    heap_free(p);
+    RPCSS_CALL_START
+    hr = irpcss_server_revoke(get_irpcss_handle(), cookie);
+    RPCSS_CALL_END
 }
 
-static LONG WINAPI rpc_filter(EXCEPTION_POINTERS *eptr)
-{
-    return I_RpcExceptionFilter(eptr->ExceptionRecord->ExceptionCode);
-}
 
 static BOOL start_rpcss(void)
 {
@@ -224,7 +132,7 @@ static BOOL start_rpcss(void)
         } while (status.dwCurrentState == SERVICE_START_PENDING);
 
         if (status.dwCurrentState != SERVICE_RUNNING)
-            WARN("RpcSs failed to start %u\n", status.dwCurrentState);
+            WARN("RpcSs failed to start %lu\n", status.dwCurrentState);
     }
     else
         ERR("Failed to start RpcSs service\n");
@@ -234,1878 +142,7 @@ static BOOL start_rpcss(void)
     return ret;
 }
 
-static RPC_BINDING_HANDLE get_rpc_handle(unsigned short *protseq, unsigned short *endpoint)
-{
-    RPC_BINDING_HANDLE handle = NULL;
-    RPC_STATUS status;
-    RPC_WSTR binding;
-
-    status = RpcStringBindingComposeW(NULL, protseq, NULL, endpoint, NULL, &binding);
-    if (status == RPC_S_OK)
-    {
-        status = RpcBindingFromStringBindingW(binding, &handle);
-        RpcStringFreeW(&binding);
-    }
-
-    return handle;
-}
-
-static RPC_BINDING_HANDLE get_irpcss_handle(void)
-{
-    static RPC_BINDING_HANDLE irpcss_handle;
-
-    if (!irpcss_handle)
-    {
-        unsigned short protseq[] = IRPCSS_PROTSEQ;
-        unsigned short endpoint[] = IRPCSS_ENDPOINT;
-
-        RPC_BINDING_HANDLE new_handle = get_rpc_handle(protseq, endpoint);
-        if (InterlockedCompareExchangePointer(&irpcss_handle, new_handle, NULL))
-            /* another thread beat us to it */
-            RpcBindingFree(&new_handle);
-    }
-    return irpcss_handle;
-}
-
-static RPC_BINDING_HANDLE get_irot_handle(void)
-{
-    static RPC_BINDING_HANDLE irot_handle;
-
-    if (!irot_handle)
-    {
-        unsigned short protseq[] = IROT_PROTSEQ;
-        unsigned short endpoint[] = IROT_ENDPOINT;
-
-        RPC_BINDING_HANDLE new_handle = get_rpc_handle(protseq, endpoint);
-        if (InterlockedCompareExchangePointer(&irot_handle, new_handle, NULL))
-            /* another thread beat us to it */
-            RpcBindingFree(&new_handle);
-    }
-    return irot_handle;
-}
-
-#define RPCSS_CALL_START \
-    HRESULT hr; \
-    for (;;) { \
-        __TRY {
-
-#define RPCSS_CALL_END \
-        } __EXCEPT(rpc_filter) { \
-            hr = HRESULT_FROM_WIN32(GetExceptionCode()); \
-        } \
-        __ENDTRY \
-        if (hr == HRESULT_FROM_WIN32(RPC_S_SERVER_UNAVAILABLE)) { \
-            if (start_rpcss()) \
-                continue; \
-        } \
-        break; \
-    } \
-    return hr;
-
-HRESULT rpcss_get_next_seqid(DWORD *id)
-{
-    RPCSS_CALL_START
-    hr = irpcss_get_thread_seq_id(get_irpcss_handle(), id);
-    RPCSS_CALL_END
-}
-
-HRESULT WINAPI InternalIrotRegister(const MonikerComparisonData *moniker_data,
-        const InterfaceData *object, const InterfaceData *moniker,
-        const FILETIME *time, DWORD flags, IrotCookie *cookie, IrotContextHandle *ctxt_handle)
-{
-    RPCSS_CALL_START
-    hr = IrotRegister(get_irot_handle(), moniker_data, object, moniker, time, flags, cookie, ctxt_handle);
-    RPCSS_CALL_END
-}
-
-HRESULT WINAPI InternalIrotIsRunning(const MonikerComparisonData *moniker_data)
-{
-    RPCSS_CALL_START
-    hr = IrotIsRunning(get_irot_handle(), moniker_data);
-    RPCSS_CALL_END
-}
-
-HRESULT WINAPI InternalIrotGetObject(const MonikerComparisonData *moniker_data, PInterfaceData *obj,
-        IrotCookie *cookie)
-{
-    RPCSS_CALL_START
-    hr = IrotGetObject(get_irot_handle(), moniker_data, obj, cookie);
-    RPCSS_CALL_END
-}
-
-HRESULT WINAPI InternalIrotNoteChangeTime(IrotCookie cookie, const FILETIME *time)
-{
-    RPCSS_CALL_START
-    hr = IrotNoteChangeTime(get_irot_handle(), cookie, time);
-    RPCSS_CALL_END
-}
-
-HRESULT WINAPI InternalIrotGetTimeOfLastChange(const MonikerComparisonData *moniker_data, FILETIME *time)
-{
-    RPCSS_CALL_START
-    hr = IrotGetTimeOfLastChange(get_irot_handle(), moniker_data, time);
-    RPCSS_CALL_END
-}
-
-HRESULT WINAPI InternalIrotEnumRunning(PInterfaceList *list)
-{
-    RPCSS_CALL_START
-    hr = IrotEnumRunning(get_irot_handle(), list);
-    RPCSS_CALL_END
-}
-
-HRESULT WINAPI InternalIrotRevoke(IrotCookie cookie, IrotContextHandle *ctxt_handle, PInterfaceData *object,
-        PInterfaceData *moniker)
-{
-    RPCSS_CALL_START
-    hr = IrotRevoke(get_irot_handle(), cookie, ctxt_handle, object, moniker);
-    RPCSS_CALL_END
-}
-
-static HRESULT rpcss_server_register(REFCLSID clsid, DWORD flags, MInterfacePointer *obj, unsigned int *cookie)
-{
-    RPCSS_CALL_START
-    hr = irpcss_server_register(get_irpcss_handle(), clsid, flags, obj, cookie);
-    RPCSS_CALL_END
-}
-
-HRESULT rpc_revoke_local_server(unsigned int cookie)
-{
-    RPCSS_CALL_START
-    hr = irpcss_server_revoke(get_irpcss_handle(), cookie);
-    RPCSS_CALL_END
-}
-
-static HRESULT rpcss_get_class_object(REFCLSID rclsid, PMInterfacePointer *objref)
-{
-    RPCSS_CALL_START
-    hr = irpcss_get_class_object(get_irpcss_handle(), rclsid, objref);
-    RPCSS_CALL_END
-}
-
-static DWORD start_local_service(const WCHAR *name, DWORD num, LPCWSTR *params)
-{
-    SC_HANDLE handle, hsvc;
-    DWORD r = ERROR_FUNCTION_FAILED;
-
-    TRACE("Starting service %s %d params\n", debugstr_w(name), num);
-
-    handle = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT);
-    if (!handle)
-        return r;
-    hsvc = OpenServiceW(handle, name, SERVICE_START);
-    if (hsvc)
-    {
-        if(StartServiceW(hsvc, num, params))
-            r = ERROR_SUCCESS;
-        else
-            r = GetLastError();
-        if (r == ERROR_SERVICE_ALREADY_RUNNING)
-            r = ERROR_SUCCESS;
-        CloseServiceHandle(hsvc);
-    }
-    else
-        r = GetLastError();
-    CloseServiceHandle(handle);
-
-    TRACE("StartService returned error %u (%s)\n", r, (r == ERROR_SUCCESS) ? "ok":"failed");
-
-    return r;
-}
-
-/*
- * create_local_service()  - start a COM server in a service
- *
- *   To start a Local Service, we read the AppID value under
- * the class's CLSID key, then open the HKCR\\AppId key specified
- * there and check for a LocalService value.
- *
- * Note:  Local Services are not supported under Windows 9x
- */
-static HRESULT create_local_service(REFCLSID rclsid)
-{
-    HRESULT hr;
-    WCHAR buf[CHARS_IN_GUID];
-    HKEY hkey;
-    LONG r;
-    DWORD type, sz;
-
-    TRACE("Attempting to start Local service for %s\n", debugstr_guid(rclsid));
-
-    hr = open_appidkey_from_clsid(rclsid, KEY_READ, &hkey);
-    if (FAILED(hr))
-        return hr;
-
-    /* read the LocalService and ServiceParameters values from the AppID key */
-    sz = sizeof buf;
-    r = RegQueryValueExW(hkey, L"LocalService", NULL, &type, (LPBYTE)buf, &sz);
-    if (r == ERROR_SUCCESS && type == REG_SZ)
-    {
-        DWORD num_args = 0;
-        LPWSTR args[1] = { NULL };
-
-        /*
-         * FIXME: I'm not really sure how to deal with the service parameters.
-         *        I suspect that the string returned from RegQueryValueExW
-         *        should be split into a number of arguments by spaces.
-         *        It would make more sense if ServiceParams contained a
-         *        REG_MULTI_SZ here, but it's a REG_SZ for the services
-         *        that I'm interested in for the moment.
-         */
-        r = RegQueryValueExW(hkey, L"ServiceParams", NULL, &type, NULL, &sz);
-        if (r == ERROR_SUCCESS && type == REG_SZ && sz)
-        {
-            args[0] = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sz);
-            num_args++;
-            RegQueryValueExW(hkey, L"ServiceParams", NULL, &type, (LPBYTE)args[0], &sz);
-        }
-        r = start_local_service(buf, num_args, (LPCWSTR *)args);
-        if (r != ERROR_SUCCESS)
-            hr = REGDB_E_CLASSNOTREG; /* FIXME: check retval */
-        HeapFree(GetProcessHeap(),0,args[0]);
-    }
-    else
-    {
-        WARN("No LocalService value\n");
-        hr = REGDB_E_CLASSNOTREG; /* FIXME: check retval */
-    }
-    RegCloseKey(hkey);
-
-    return hr;
-}
-
-static HRESULT create_server(REFCLSID rclsid, HANDLE *process)
-{
-    static const WCHAR  embeddingW[] = L" -Embedding";
-    HKEY                key;
-    HRESULT             hr;
-    WCHAR               command[MAX_PATH + ARRAY_SIZE(embeddingW)];
-    DWORD               size = (MAX_PATH+1) * sizeof(WCHAR);
-    STARTUPINFOW        sinfo;
-    PROCESS_INFORMATION pinfo;
-    LONG ret;
-
-    hr = open_key_for_clsid(rclsid, L"LocalServer32", KEY_READ, &key);
-    if (FAILED(hr))
-    {
-        ERR("class %s not registered\n", debugstr_guid(rclsid));
-        return hr;
-    }
-
-    ret = RegQueryValueExW(key, NULL, NULL, NULL, (LPBYTE)command, &size);
-    RegCloseKey(key);
-    if (ret)
-    {
-        WARN("No default value for LocalServer32 key\n");
-        return REGDB_E_CLASSNOTREG; /* FIXME: check retval */
-    }
-
-    memset(&sinfo, 0, sizeof(sinfo));
-    sinfo.cb = sizeof(sinfo);
-
-    /* EXE servers are started with the -Embedding switch. */
-
-    lstrcatW(command, embeddingW);
-
-    TRACE("activating local server %s for %s\n", debugstr_w(command), debugstr_guid(rclsid));
-
-    /* FIXME: Win2003 supports a ServerExecutable value that is passed into
-     * CreateProcess */
-    if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &sinfo, &pinfo))
-    {
-        WARN("failed to run local server %s\n", debugstr_w(command));
-        return HRESULT_FROM_WIN32(GetLastError());
-    }
-    *process = pinfo.hProcess;
-    CloseHandle(pinfo.hThread);
-
-    return S_OK;
-}
-
-HRESULT rpc_get_local_class_object(REFCLSID rclsid, REFIID riid, void **obj)
-{
-    PMInterfacePointer objref = NULL;
-    IServiceProvider *local_server;
-    IStream *stream = NULL;
-    ULARGE_INTEGER newpos;
-    LARGE_INTEGER seekto;
-    int tries = 0;
-    ULONG length;
-    HRESULT hr;
-    static const int MAXTRIES = 30; /* 30 seconds */
-
-    TRACE("clsid %s, riid %s\n", debugstr_guid(rclsid), debugstr_guid(riid));
-
-    while (tries++ < MAXTRIES)
-    {
-        DWORD index, start_ticks;
-        HANDLE process = 0;
-
-        if (SUCCEEDED(hr = rpcss_get_class_object(rclsid, &objref)))
-            break;
-
-        if (tries == 1)
-        {
-            if ((hr = create_local_service(rclsid)) && (hr = create_server(rclsid, &process)) )
-                return hr;
-        }
-
-        /* Wait for one second, even if messages arrive. */
-        start_ticks = GetTickCount();
-        do
-        {
-            if (SUCCEEDED(CoWaitForMultipleHandles(0, 1000, (process != 0), &process, &index)) && process && !index)
-            {
-                WARN("Server for %s failed to start.\n", debugstr_guid(rclsid));
-                CloseHandle(process);
-                return E_NOINTERFACE;
-            }
-        } while (GetTickCount() - start_ticks < 1000);
-
-        if (process) CloseHandle(process);
-    }
-
-    if (!objref || tries >= MAXTRIES)
-        return E_NOINTERFACE;
-
-    if (SUCCEEDED(hr = CreateStreamOnHGlobal(0, TRUE, &stream)))
-        hr = IStream_Write(stream, objref->abData, objref->ulCntData, &length);
-
-    MIDL_user_free(objref);
-
-    if (SUCCEEDED(hr))
-    {
-        seekto.QuadPart = 0;
-        IStream_Seek(stream, seekto, STREAM_SEEK_SET, &newpos);
-
-        TRACE("Unmarshalling local server.\n");
-        hr = CoUnmarshalInterface(stream, &IID_IServiceProvider, (void **)&local_server);
-        if (SUCCEEDED(hr))
-        {
-            hr = IServiceProvider_QueryService(local_server, rclsid, riid, obj);
-            IServiceProvider_Release(local_server);
-        }
-    }
-
-    if (stream)
-        IStream_Release(stream);
-
-    return hr;
-}
-
-HRESULT rpc_register_local_server(REFCLSID clsid, IStream *stream, DWORD flags, unsigned int *cookie)
-{
-    MInterfacePointer *obj;
-    const void *ptr;
-    HGLOBAL hmem;
-    SIZE_T size;
-    HRESULT hr;
-
-    TRACE("%s, %#x\n", debugstr_guid(clsid), flags);
-
-    hr = GetHGlobalFromStream(stream, &hmem);
-    if (FAILED(hr)) return hr;
-
-    size = GlobalSize(hmem);
-    if (!(obj = heap_alloc(FIELD_OFFSET(MInterfacePointer, abData[size]))))
-        return E_OUTOFMEMORY;
-    obj->ulCntData = size;
-    ptr = GlobalLock(hmem);
-    memcpy(obj->abData, ptr, size);
-    GlobalUnlock(hmem);
-
-    hr = rpcss_server_register(clsid, flags, obj, cookie);
-
-    heap_free(obj);
-
-    return hr;
-}
-
-static HRESULT unmarshal_ORPCTHAT(RPC_MESSAGE *msg, ORPCTHAT *orpcthat, ORPC_EXTENT_ARRAY *orpc_ext_array,
-        WIRE_ORPC_EXTENT **first_wire_orpc_extent);
-
-/* Channel Hook Functions */
-
-static ULONG ChannelHooks_ClientGetSize(SChannelHookCallInfo *info, struct channel_hook_buffer_data **data,
-        unsigned int *hook_count, ULONG *extension_count)
+static LONG WINAPI rpc_filter(EXCEPTION_POINTERS *eptr)
 {
-    struct channel_hook_entry *entry;
-    ULONG total_size = 0;
-    unsigned int hook_index = 0;
-
-    *hook_count = 0;
-    *extension_count = 0;
-
-    EnterCriticalSection(&csChannelHook);
-
-    LIST_FOR_EACH_ENTRY(entry, &channel_hooks, struct channel_hook_entry, entry)
-        (*hook_count)++;
-
-    if (*hook_count)
-        *data = HeapAlloc(GetProcessHeap(), 0, *hook_count * sizeof(struct channel_hook_buffer_data));
-    else
-        *data = NULL;
-
-    LIST_FOR_EACH_ENTRY(entry, &channel_hooks, struct channel_hook_entry, entry)
-    {
-        ULONG extension_size = 0;
-
-        IChannelHook_ClientGetSize(entry->hook, &entry->id, &info->iid, &extension_size);
-
-        TRACE("%s: extension_size = %u\n", debugstr_guid(&entry->id), extension_size);
-
-        extension_size = (extension_size+7)&~7;
-        (*data)[hook_index].id = entry->id;
-        (*data)[hook_index].extension_size = extension_size;
-
-        /* an extension is only put onto the wire if it has data to write */
-        if (extension_size)
-        {
-            total_size += FIELD_OFFSET(WIRE_ORPC_EXTENT, data[extension_size]);
-            (*extension_count)++;
-        }
-
-        hook_index++;
-    }
-
-    LeaveCriticalSection(&csChannelHook);
-
-    return total_size;
-}
-
-static unsigned char * ChannelHooks_ClientFillBuffer(SChannelHookCallInfo *info,
-    unsigned char *buffer, struct channel_hook_buffer_data *data,
-    unsigned int hook_count)
-{
-    struct channel_hook_entry *entry;
-
-    EnterCriticalSection(&csChannelHook);
-
-    LIST_FOR_EACH_ENTRY(entry, &channel_hooks, struct channel_hook_entry, entry)
-    {
-        unsigned int i;
-        ULONG extension_size = 0;
-        WIRE_ORPC_EXTENT *wire_orpc_extent = (WIRE_ORPC_EXTENT *)buffer;
-
-        for (i = 0; i < hook_count; i++)
-            if (IsEqualGUID(&entry->id, &data[i].id))
-                extension_size = data[i].extension_size;
-
-        /* an extension is only put onto the wire if it has data to write */
-        if (!extension_size)
-            continue;
-
-        IChannelHook_ClientFillBuffer(entry->hook, &entry->id, &info->iid,
-            &extension_size, buffer + FIELD_OFFSET(WIRE_ORPC_EXTENT, data[0]));
-
-        TRACE("%s: extension_size = %u\n", debugstr_guid(&entry->id), extension_size);
-
-        /* FIXME: set unused portion of wire_orpc_extent->data to 0? */
-
-        wire_orpc_extent->conformance = (extension_size+7)&~7;
-        wire_orpc_extent->size = extension_size;
-        wire_orpc_extent->id = entry->id;
-        buffer += FIELD_OFFSET(WIRE_ORPC_EXTENT, data[wire_orpc_extent->conformance]);
-    }
-
-    LeaveCriticalSection(&csChannelHook);
-
-    return buffer;
-}
-
-static void ChannelHooks_ServerNotify(SChannelHookCallInfo *info,
-    DWORD lDataRep, WIRE_ORPC_EXTENT *first_wire_orpc_extent,
-    ULONG extension_count)
-{
-    struct channel_hook_entry *entry;
-    ULONG i;
-
-    EnterCriticalSection(&csChannelHook);
-
-    LIST_FOR_EACH_ENTRY(entry, &channel_hooks, struct channel_hook_entry, entry)
-    {
-        WIRE_ORPC_EXTENT *wire_orpc_extent;
-        for (i = 0, wire_orpc_extent = first_wire_orpc_extent;
-             i < extension_count;
-             i++, wire_orpc_extent = (WIRE_ORPC_EXTENT *)&wire_orpc_extent->data[wire_orpc_extent->conformance])
-        {
-            if (IsEqualGUID(&entry->id, &wire_orpc_extent->id))
-                break;
-        }
-        if (i == extension_count) wire_orpc_extent = NULL;
-
-        IChannelHook_ServerNotify(entry->hook, &entry->id, &info->iid,
-            wire_orpc_extent ? wire_orpc_extent->size : 0,
-            wire_orpc_extent ? wire_orpc_extent->data : NULL,
-            lDataRep);
-    }
-
-    LeaveCriticalSection(&csChannelHook);
-}
-
-static ULONG ChannelHooks_ServerGetSize(SChannelHookCallInfo *info,
-                                        struct channel_hook_buffer_data **data, unsigned int *hook_count,
-                                        ULONG *extension_count)
-{
-    struct channel_hook_entry *entry;
-    ULONG total_size = 0;
-    unsigned int hook_index = 0;
-
-    *hook_count = 0;
-    *extension_count = 0;
-
-    EnterCriticalSection(&csChannelHook);
-
-    LIST_FOR_EACH_ENTRY(entry, &channel_hooks, struct channel_hook_entry, entry)
-        (*hook_count)++;
-
-    if (*hook_count)
-        *data = HeapAlloc(GetProcessHeap(), 0, *hook_count * sizeof(struct channel_hook_buffer_data));
-    else
-        *data = NULL;
-
-    LIST_FOR_EACH_ENTRY(entry, &channel_hooks, struct channel_hook_entry, entry)
-    {
-        ULONG extension_size = 0;
-
-        IChannelHook_ServerGetSize(entry->hook, &entry->id, &info->iid, S_OK,
-                                   &extension_size);
-
-        TRACE("%s: extension_size = %u\n", debugstr_guid(&entry->id), extension_size);
-
-        extension_size = (extension_size+7)&~7;
-        (*data)[hook_index].id = entry->id;
-        (*data)[hook_index].extension_size = extension_size;
-
-        /* an extension is only put onto the wire if it has data to write */
-        if (extension_size)
-        {
-            total_size += FIELD_OFFSET(WIRE_ORPC_EXTENT, data[extension_size]);
-            (*extension_count)++;
-        }
-
-        hook_index++;
-    }
-
-    LeaveCriticalSection(&csChannelHook);
-
-    return total_size;
-}
-
-static unsigned char * ChannelHooks_ServerFillBuffer(SChannelHookCallInfo *info,
-                                                     unsigned char *buffer, struct channel_hook_buffer_data *data,
-                                                     unsigned int hook_count)
-{
-    struct channel_hook_entry *entry;
-
-    EnterCriticalSection(&csChannelHook);
-
-    LIST_FOR_EACH_ENTRY(entry, &channel_hooks, struct channel_hook_entry, entry)
-    {
-        unsigned int i;
-        ULONG extension_size = 0;
-        WIRE_ORPC_EXTENT *wire_orpc_extent = (WIRE_ORPC_EXTENT *)buffer;
-
-        for (i = 0; i < hook_count; i++)
-            if (IsEqualGUID(&entry->id, &data[i].id))
-                extension_size = data[i].extension_size;
-
-        /* an extension is only put onto the wire if it has data to write */
-        if (!extension_size)
-            continue;
-
-        IChannelHook_ServerFillBuffer(entry->hook, &entry->id, &info->iid,
-                                      &extension_size, buffer + FIELD_OFFSET(WIRE_ORPC_EXTENT, data[0]),
-                                      S_OK);
-
-        TRACE("%s: extension_size = %u\n", debugstr_guid(&entry->id), extension_size);
-
-        /* FIXME: set unused portion of wire_orpc_extent->data to 0? */
-
-        wire_orpc_extent->conformance = (extension_size+7)&~7;
-        wire_orpc_extent->size = extension_size;
-        wire_orpc_extent->id = entry->id;
-        buffer += FIELD_OFFSET(WIRE_ORPC_EXTENT, data[wire_orpc_extent->conformance]);
-    }
-
-    LeaveCriticalSection(&csChannelHook);
-
-    return buffer;
-}
-
-static void ChannelHooks_ClientNotify(SChannelHookCallInfo *info,
-                                      DWORD lDataRep, WIRE_ORPC_EXTENT *first_wire_orpc_extent,
-                                      ULONG extension_count, HRESULT hrFault)
-{
-    struct channel_hook_entry *entry;
-    ULONG i;
-
-    EnterCriticalSection(&csChannelHook);
-
-    LIST_FOR_EACH_ENTRY(entry, &channel_hooks, struct channel_hook_entry, entry)
-    {
-        WIRE_ORPC_EXTENT *wire_orpc_extent;
-        for (i = 0, wire_orpc_extent = first_wire_orpc_extent;
-             i < extension_count;
-             i++, wire_orpc_extent = (WIRE_ORPC_EXTENT *)&wire_orpc_extent->data[wire_orpc_extent->conformance])
-        {
-            if (IsEqualGUID(&entry->id, &wire_orpc_extent->id))
-                break;
-        }
-        if (i == extension_count) wire_orpc_extent = NULL;
-
-        IChannelHook_ClientNotify(entry->hook, &entry->id, &info->iid,
-                                  wire_orpc_extent ? wire_orpc_extent->size : 0,
-                                  wire_orpc_extent ? wire_orpc_extent->data : NULL,
-                                  lDataRep, hrFault);
-    }
-
-    LeaveCriticalSection(&csChannelHook);
-}
-
-HRESULT rpc_register_channel_hook(REFGUID rguid, IChannelHook *hook)
-{
-    struct channel_hook_entry *entry;
-
-    entry = HeapAlloc(GetProcessHeap(), 0, sizeof(*entry));
-    if (!entry)
-        return E_OUTOFMEMORY;
-
-    entry->id = *rguid;
-    entry->hook = hook;
-    IChannelHook_AddRef(hook);
-
-    EnterCriticalSection(&csChannelHook);
-    list_add_tail(&channel_hooks, &entry->entry);
-    LeaveCriticalSection(&csChannelHook);
-
-    return S_OK;
-}
-
-void rpc_unregister_channel_hooks(void)
-{
-    struct channel_hook_entry *cursor;
-    struct channel_hook_entry *cursor2;
-
-    EnterCriticalSection(&csChannelHook);
-    LIST_FOR_EACH_ENTRY_SAFE(cursor, cursor2, &channel_hooks, struct channel_hook_entry, entry)
-        HeapFree(GetProcessHeap(), 0, cursor);
-    LeaveCriticalSection(&csChannelHook);
-    DeleteCriticalSection(&csChannelHook);
-    DeleteCriticalSection(&csRegIf);
-}
-
-/* RPC Channel Buffer Functions */
-
-static HRESULT WINAPI RpcChannelBuffer_QueryInterface(IRpcChannelBuffer *iface, REFIID riid, LPVOID *ppv)
-{
-    *ppv = NULL;
-    if (IsEqualIID(riid,&IID_IRpcChannelBuffer) || IsEqualIID(riid,&IID_IUnknown))
-    {
-        *ppv = iface;
-        IRpcChannelBuffer_AddRef(iface);
-        return S_OK;
-    }
-    return E_NOINTERFACE;
-}
-
-static ULONG WINAPI RpcChannelBuffer_AddRef(LPRPCCHANNELBUFFER iface)
-{
-    RpcChannelBuffer *This = (RpcChannelBuffer *)iface;
-    return InterlockedIncrement(&This->refs);
-}
-
-static ULONG WINAPI ServerRpcChannelBuffer_Release(LPRPCCHANNELBUFFER iface)
-{
-    RpcChannelBuffer *This = (RpcChannelBuffer *)iface;
-    ULONG ref;
-
-    ref = InterlockedDecrement(&This->refs);
-    if (ref)
-        return ref;
-
-    HeapFree(GetProcessHeap(), 0, This);
-    return 0;
-}
-
-static ULONG WINAPI ClientRpcChannelBuffer_Release(LPRPCCHANNELBUFFER iface)
-{
-    ClientRpcChannelBuffer *This = (ClientRpcChannelBuffer *)iface;
-    ULONG ref;
-
-    ref = InterlockedDecrement(&This->super.refs);
-    if (ref)
-        return ref;
-
-    if (This->event) CloseHandle(This->event);
-    RpcBindingFree(&This->bind);
-    HeapFree(GetProcessHeap(), 0, This);
-    return 0;
-}
-
-static HRESULT WINAPI ServerRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, RPCOLEMESSAGE* olemsg, REFIID riid)
-{
-    RpcChannelBuffer *This = (RpcChannelBuffer *)iface;
-    RPC_MESSAGE *msg = (RPC_MESSAGE *)olemsg;
-    RPC_STATUS status;
-    ORPCTHAT *orpcthat;
-    struct message_state *message_state;
-    ULONG extensions_size;
-    struct channel_hook_buffer_data *channel_hook_data;
-    unsigned int channel_hook_count;
-    ULONG extension_count;
-
-    TRACE("(%p)->(%p,%s)\n", This, olemsg, debugstr_guid(riid));
-
-    message_state = msg->Handle;
-    /* restore the binding handle and the real start of data */
-    msg->Handle = message_state->binding_handle;
-    msg->Buffer = (char *)msg->Buffer - message_state->prefix_data_len;
-
-    extensions_size = ChannelHooks_ServerGetSize(&message_state->channel_hook_info,
-                                                 &channel_hook_data, &channel_hook_count, &extension_count);
-
-    msg->BufferLength += FIELD_OFFSET(WIRE_ORPCTHAT, extensions) + sizeof(DWORD);
-    if (extensions_size)
-    {
-        msg->BufferLength += FIELD_OFFSET(WIRE_ORPC_EXTENT_ARRAY, extent[2*sizeof(DWORD) + extensions_size]);
-        if (extension_count & 1)
-            msg->BufferLength += FIELD_OFFSET(WIRE_ORPC_EXTENT, data[0]);
-    }
-
-    if (message_state->bypass_rpcrt)
-    {
-        msg->Buffer = HeapAlloc(GetProcessHeap(), 0, msg->BufferLength);
-        if (msg->Buffer)
-            status = RPC_S_OK;
-        else
-        {
-            HeapFree(GetProcessHeap(), 0, channel_hook_data);
-            return E_OUTOFMEMORY;
-        }
-    }
-    else
-        status = I_RpcGetBuffer(msg);
-
-    orpcthat = msg->Buffer;
-    msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPCTHAT, extensions);
-
-    orpcthat->flags = ORPCF_NULL /* FIXME? */;
-
-    /* NDR representation of orpcthat->extensions */
-    *(DWORD *)msg->Buffer = extensions_size ? 1 : 0;
-    msg->Buffer = (char *)msg->Buffer + sizeof(DWORD);
-
-    if (extensions_size)
-    {
-        WIRE_ORPC_EXTENT_ARRAY *orpc_extent_array = msg->Buffer;
-        orpc_extent_array->size = extension_count;
-        orpc_extent_array->reserved = 0;
-        msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPC_EXTENT_ARRAY, extent);
-        /* NDR representation of orpc_extent_array->extent */
-        *(DWORD *)msg->Buffer = 1;
-        msg->Buffer = (char *)msg->Buffer + sizeof(DWORD);
-        /* NDR representation of [size_is] attribute of orpc_extent_array->extent */
-        *(DWORD *)msg->Buffer = (extension_count + 1) & ~1;
-        msg->Buffer = (char *)msg->Buffer + sizeof(DWORD);
-
-        msg->Buffer = ChannelHooks_ServerFillBuffer(&message_state->channel_hook_info,
-                                                    msg->Buffer, channel_hook_data, channel_hook_count);
-
-        /* we must add a dummy extension if there is an odd extension
-         * count to meet the contract specified by the size_is attribute */
-        if (extension_count & 1)
-        {
-            WIRE_ORPC_EXTENT *wire_orpc_extent = msg->Buffer;
-            wire_orpc_extent->conformance = 0;
-            wire_orpc_extent->id = GUID_NULL;
-            wire_orpc_extent->size = 0;
-            msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPC_EXTENT, data[0]);
-        }
-    }
-
-    HeapFree(GetProcessHeap(), 0, channel_hook_data);
-
-    /* store the prefixed data length so that we can restore the real buffer
-     * later */
-    message_state->prefix_data_len = (char *)msg->Buffer - (char *)orpcthat;
-    msg->BufferLength -= message_state->prefix_data_len;
-    /* save away the message state again */
-    msg->Handle = message_state;
-
-    TRACE("-- %d\n", status);
-
-    return HRESULT_FROM_WIN32(status);
-}
-
-static HANDLE ClientRpcChannelBuffer_GetEventHandle(ClientRpcChannelBuffer *This)
-{
-    HANDLE event = InterlockedExchangePointer(&This->event, NULL);
-
-    /* Note: must be auto-reset event so we can reuse it without a call
-    * to ResetEvent */
-    if (!event) event = CreateEventW(NULL, FALSE, FALSE, NULL);
-
-    return event;
-}
-
-static void ClientRpcChannelBuffer_ReleaseEventHandle(ClientRpcChannelBuffer *This, HANDLE event)
-{
-    if (InterlockedCompareExchangePointer(&This->event, event, NULL))
-        /* already a handle cached in This */
-        CloseHandle(event);
-}
-
-static HRESULT WINAPI ClientRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, RPCOLEMESSAGE* olemsg, REFIID riid)
-{
-    ClientRpcChannelBuffer *This = (ClientRpcChannelBuffer *)iface;
-    RPC_MESSAGE *msg = (RPC_MESSAGE *)olemsg;
-    RPC_CLIENT_INTERFACE *cif;
-    RPC_STATUS status;
-    ORPCTHIS *orpcthis;
-    struct message_state *message_state;
-    ULONG extensions_size;
-    struct channel_hook_buffer_data *channel_hook_data;
-    unsigned int channel_hook_count;
-    ULONG extension_count;
-    IPID ipid;
-    HRESULT hr;
-    struct apartment *apt = NULL;
-
-    TRACE("(%p)->(%p,%s)\n", This, olemsg, debugstr_guid(riid));
-
-    cif = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(RPC_CLIENT_INTERFACE));
-    if (!cif)
-        return E_OUTOFMEMORY;
-
-    message_state = HeapAlloc(GetProcessHeap(), 0, sizeof(*message_state));
-    if (!message_state)
-    {
-        HeapFree(GetProcessHeap(), 0, cif);
-        return E_OUTOFMEMORY;
-    }
-
-    cif->Length = sizeof(RPC_CLIENT_INTERFACE);
-    /* RPC interface ID = COM interface ID */
-    cif->InterfaceId.SyntaxGUID = This->iid;
-    /* COM objects always have a version of 0.0 */
-    cif->InterfaceId.SyntaxVersion.MajorVersion = 0;
-    cif->InterfaceId.SyntaxVersion.MinorVersion = 0;
-    msg->Handle = This->bind;
-    msg->RpcInterfaceInformation = cif;
-
-    message_state->prefix_data_len = 0;
-    message_state->binding_handle = This->bind;
-
-    message_state->channel_hook_info.iid = *riid;
-    message_state->channel_hook_info.cbSize = sizeof(message_state->channel_hook_info);
-    CoGetCurrentLogicalThreadId(&message_state->channel_hook_info.uCausality);
-    message_state->channel_hook_info.dwServerPid = This->server_pid;
-    message_state->channel_hook_info.iMethod = msg->ProcNum & ~RPC_FLAGS_VALID_BIT;
-    message_state->channel_hook_info.pObject = NULL; /* only present on server-side */
-    message_state->target_hwnd = NULL;
-    message_state->target_tid = 0;
-    memset(&message_state->params, 0, sizeof(message_state->params));
-
-    extensions_size = ChannelHooks_ClientGetSize(&message_state->channel_hook_info,
-        &channel_hook_data, &channel_hook_count, &extension_count);
-
-    msg->BufferLength += FIELD_OFFSET(WIRE_ORPCTHIS, extensions) + sizeof(DWORD);
-    if (extensions_size)
-    {
-        msg->BufferLength += FIELD_OFFSET(WIRE_ORPC_EXTENT_ARRAY, extent[2*sizeof(DWORD) + extensions_size]);
-        if (extension_count & 1)
-            msg->BufferLength += FIELD_OFFSET(WIRE_ORPC_EXTENT, data[0]);
-    }
-
-    RpcBindingInqObject(message_state->binding_handle, &ipid);
-    hr = ipid_get_dispatch_params(&ipid, &apt, NULL, &message_state->params.stub,
-                                  &message_state->params.chan,
-                                  &message_state->params.iid,
-                                  &message_state->params.iface);
-    if (hr == S_OK)
-    {
-        /* stub, chan, iface and iid are unneeded in multi-threaded case as we go
-         * via the RPC runtime */
-        if (apt->multi_threaded)
-        {
-            IRpcStubBuffer_Release(message_state->params.stub);
-            message_state->params.stub = NULL;
-            IRpcChannelBuffer_Release(message_state->params.chan);
-            message_state->params.chan = NULL;
-            message_state->params.iface = NULL;
-        }
-        else
-        {
-            message_state->params.bypass_rpcrt = TRUE;
-            message_state->target_hwnd = apartment_getwindow(apt);
-            message_state->target_tid = apt->tid;
-            /* we assume later on that this being non-NULL is the indicator that
-             * means call directly instead of going through RPC runtime */
-            if (!message_state->target_hwnd)
-                ERR("window for apartment %s is NULL\n", wine_dbgstr_longlong(apt->oxid));
-        }
-    }
-    if (apt) apartment_release(apt);
-    message_state->params.handle = ClientRpcChannelBuffer_GetEventHandle(This);
-    /* Note: message_state->params.msg is initialised in
-     * ClientRpcChannelBuffer_SendReceive */
-
-    /* shortcut the RPC runtime */
-    if (message_state->target_hwnd)
-    {
-        msg->Buffer = HeapAlloc(GetProcessHeap(), 0, msg->BufferLength);
-        if (msg->Buffer)
-            status = RPC_S_OK;
-        else
-            status = ERROR_OUTOFMEMORY;
-    }
-    else
-        status = I_RpcGetBuffer(msg);
-
-    msg->Handle = message_state;
-
-    if (status == RPC_S_OK)
-    {
-        orpcthis = msg->Buffer;
-        msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPCTHIS, extensions);
-
-        orpcthis->version.MajorVersion = COM_MAJOR_VERSION;
-        orpcthis->version.MinorVersion = COM_MINOR_VERSION;
-        orpcthis->flags = message_state->channel_hook_info.dwServerPid ? ORPCF_LOCAL : ORPCF_NULL;
-        orpcthis->reserved1 = 0;
-        orpcthis->cid = message_state->channel_hook_info.uCausality;
-
-        /* NDR representation of orpcthis->extensions */
-        *(DWORD *)msg->Buffer = extensions_size ? 1 : 0;
-        msg->Buffer = (char *)msg->Buffer + sizeof(DWORD);
-
-        if (extensions_size)
-        {
-            ORPC_EXTENT_ARRAY *orpc_extent_array = msg->Buffer;
-            orpc_extent_array->size = extension_count;
-            orpc_extent_array->reserved = 0;
-            msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPC_EXTENT_ARRAY, extent);
-            /* NDR representation of orpc_extent_array->extent */
-            *(DWORD *)msg->Buffer = 1;
-            msg->Buffer = (char *)msg->Buffer + sizeof(DWORD);
-            /* NDR representation of [size_is] attribute of orpc_extent_array->extent */
-            *(DWORD *)msg->Buffer = (extension_count + 1) & ~1;
-            msg->Buffer = (char *)msg->Buffer + sizeof(DWORD);
-
-            msg->Buffer = ChannelHooks_ClientFillBuffer(&message_state->channel_hook_info,
-                msg->Buffer, channel_hook_data, channel_hook_count);
-
-            /* we must add a dummy extension if there is an odd extension
-             * count to meet the contract specified by the size_is attribute */
-            if (extension_count & 1)
-            {
-                WIRE_ORPC_EXTENT *wire_orpc_extent = msg->Buffer;
-                wire_orpc_extent->conformance = 0;
-                wire_orpc_extent->id = GUID_NULL;
-                wire_orpc_extent->size = 0;
-                msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPC_EXTENT, data[0]);
-            }
-        }
-
-        /* store the prefixed data length so that we can restore the real buffer
-         * pointer in ClientRpcChannelBuffer_SendReceive. */
-        message_state->prefix_data_len = (char *)msg->Buffer - (char *)orpcthis;
-        msg->BufferLength -= message_state->prefix_data_len;
-    }
-
-    HeapFree(GetProcessHeap(), 0, channel_hook_data);
-
-    TRACE("-- %d\n", status);
-
-    return HRESULT_FROM_WIN32(status);
-}
-
-static HRESULT WINAPI ServerRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER iface, RPCOLEMESSAGE *olemsg, ULONG *pstatus)
-{
-    FIXME("stub\n");
-    return E_NOTIMPL;
-}
-
-/* this thread runs an outgoing RPC */
-static DWORD WINAPI rpc_sendreceive_thread(LPVOID param)
-{
-    struct dispatch_params *data = param;
-
-    /* Note: I_RpcSendReceive doesn't raise exceptions like the higher-level
-     * RPC functions do */
-    data->status = I_RpcSendReceive((RPC_MESSAGE *)data->msg);
-
-    TRACE("completed with status 0x%x\n", data->status);
-
-    SetEvent(data->handle);
-
-    return 0;
-}
-
-static inline HRESULT ClientRpcChannelBuffer_IsCorrectApartment(ClientRpcChannelBuffer *This, const struct apartment *apt)
-{
-    if (!apt)
-        return S_FALSE;
-    if (This->oxid != apartment_getoxid(apt))
-        return S_FALSE;
-    return S_OK;
-}
-
-static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER iface, RPCOLEMESSAGE *olemsg, ULONG *pstatus)
-{
-    ClientRpcChannelBuffer *This = (ClientRpcChannelBuffer *)iface;
-    HRESULT hr;
-    RPC_MESSAGE *msg = (RPC_MESSAGE *)olemsg;
-    RPC_STATUS status;
-    DWORD index;
-    struct message_state *message_state;
-    ORPCTHAT orpcthat;
-    ORPC_EXTENT_ARRAY orpc_ext_array;
-    WIRE_ORPC_EXTENT *first_wire_orpc_extent = NULL;
-    HRESULT hrFault = S_OK;
-    struct apartment *apt = apartment_get_current_or_mta();
-    struct tlsdata *tlsdata;
-
-    TRACE("(%p) iMethod=%d\n", olemsg, olemsg->iMethod);
-
-    hr = ClientRpcChannelBuffer_IsCorrectApartment(This, apt);
-    if (hr != S_OK)
-    {
-        ERR("called from wrong apartment, should have been 0x%s\n",
-            wine_dbgstr_longlong(This->oxid));
-        if (apt) apartment_release(apt);
-        return RPC_E_WRONG_THREAD;
-    }
-
-    if (FAILED(hr = com_get_tlsdata(&tlsdata)))
-        return hr;
-
-    /* This situation should be impossible in multi-threaded apartments,
-     * because the calling thread isn't re-enterable.
-     * Note: doing a COM call during the processing of a sent message is
-     * only disallowed if a client call is already being waited for
-     * completion */
-    if (!apt->multi_threaded &&
-        tlsdata->pending_call_count_client &&
-        InSendMessage())
-    {
-        ERR("can't make an outgoing COM call in response to a sent message\n");
-        apartment_release(apt);
-        return RPC_E_CANTCALLOUT_ININPUTSYNCCALL;
-    }
-
-    message_state = msg->Handle;
-    /* restore the binding handle and the real start of data */
-    msg->Handle = message_state->binding_handle;
-    msg->Buffer = (char *)msg->Buffer - message_state->prefix_data_len;
-    msg->BufferLength += message_state->prefix_data_len;
-
-    /* Note: this is an optimization in the Microsoft OLE runtime that we need
-     * to copy, as shown by the test_no_couninitialize_client test. without
-     * short-circuiting the RPC runtime in the case below, the test will
-     * deadlock on the loader lock due to the RPC runtime needing to create
-     * a thread to process the RPC when this function is called indirectly
-     * from DllMain */
-
-    message_state->params.msg = olemsg;
-    if (message_state->params.bypass_rpcrt)
-    {
-        TRACE("Calling apartment thread 0x%08x...\n", message_state->target_tid);
-
-        msg->ProcNum &= ~RPC_FLAGS_VALID_BIT;
-
-        if (!PostMessageW(message_state->target_hwnd, DM_EXECUTERPC, 0,
-                          (LPARAM)&message_state->params))
-        {
-            ERR("PostMessage failed with error %u\n", GetLastError());
-
-            /* Note: message_state->params.iface doesn't have a reference and
-             * so doesn't need to be released */
-
-            hr = HRESULT_FROM_WIN32(GetLastError());
-        }
-    }
-    else
-    {
-        /* we use a separate thread here because we need to be able to
-         * pump the message loop in the application thread: if we do not,
-         * any windows created by this thread will hang and RPCs that try
-         * and re-enter this STA from an incoming server thread will
-         * deadlock. InstallShield is an example of that.
-         */
-        if (!QueueUserWorkItem(rpc_sendreceive_thread, &message_state->params, WT_EXECUTEDEFAULT))
-        {
-            ERR("QueueUserWorkItem failed with error %u\n", GetLastError());
-            hr = E_UNEXPECTED;
-        }
-        else
-            hr = S_OK;
-    }
-
-    if (hr == S_OK)
-    {
-        if (WaitForSingleObject(message_state->params.handle, 0))
-        {
-            tlsdata->pending_call_count_client++;
-            hr = CoWaitForMultipleHandles(0, INFINITE, 1, &message_state->params.handle, &index);
-            tlsdata->pending_call_count_client--;
-        }
-    }
-    ClientRpcChannelBuffer_ReleaseEventHandle(This, message_state->params.handle);
-
-    /* for WM shortcut, faults are returned in params->hr */
-    if (hr == S_OK)
-        hrFault = message_state->params.hr;
-
-    status = message_state->params.status;
-
-    orpcthat.flags = ORPCF_NULL;
-    orpcthat.extensions = NULL;
-
-    TRACE("RPC call status: 0x%x\n", status);
-    if (status != RPC_S_OK)
-        hr = HRESULT_FROM_WIN32(status);
-
-    TRACE("hrFault = 0x%08x\n", hrFault);
-
-    /* FIXME: this condition should be
-     * "hr == S_OK && (!hrFault || msg->BufferLength > FIELD_OFFSET(ORPCTHAT, extensions) + 4)"
-     * but we don't currently reset the message length for PostMessage
-     * dispatched calls */
-    if (hr == S_OK && hrFault == S_OK)
-    {
-        HRESULT hr2;
-        char *original_buffer = msg->Buffer;
-
-        /* handle ORPCTHAT and client extensions */
-
-        hr2 = unmarshal_ORPCTHAT(msg, &orpcthat, &orpc_ext_array, &first_wire_orpc_extent);
-        if (FAILED(hr2))
-            hr = hr2;
-
-        message_state->prefix_data_len = (char *)msg->Buffer - original_buffer;
-        msg->BufferLength -= message_state->prefix_data_len;
-    }
-    else
-        message_state->prefix_data_len = 0;
-
-    if (hr == S_OK)
-    {
-        ChannelHooks_ClientNotify(&message_state->channel_hook_info,
-                                  msg->DataRepresentation,
-                                  first_wire_orpc_extent,
-                                  orpcthat.extensions && first_wire_orpc_extent ? orpcthat.extensions->size : 0,
-                                  hrFault);
-    }
-
-    /* save away the message state again */
-    msg->Handle = message_state;
-
-    if (pstatus) *pstatus = status;
-
-    if (hr == S_OK)
-        hr = hrFault;
-
-    TRACE("-- 0x%08x\n", hr);
-
-    apartment_release(apt);
-    return hr;
-}
-
-static HRESULT WINAPI ServerRpcChannelBuffer_FreeBuffer(LPRPCCHANNELBUFFER iface, RPCOLEMESSAGE* olemsg)
-{
-    RPC_MESSAGE *msg = (RPC_MESSAGE *)olemsg;
-    RPC_STATUS status;
-    struct message_state *message_state;
-
-    TRACE("(%p)\n", msg);
-
-    message_state = msg->Handle;
-    /* restore the binding handle and the real start of data */
-    msg->Handle = message_state->binding_handle;
-    msg->Buffer = (char *)msg->Buffer - message_state->prefix_data_len;
-    msg->BufferLength += message_state->prefix_data_len;
-    message_state->prefix_data_len = 0;
-
-    if (message_state->bypass_rpcrt)
-    {
-        HeapFree(GetProcessHeap(), 0, msg->Buffer);
-        status = RPC_S_OK;
-    }
-    else
-        status = I_RpcFreeBuffer(msg);
-
-    msg->Handle = message_state;
-
-    TRACE("-- %d\n", status);
-
-    return HRESULT_FROM_WIN32(status);
-}
-
-static HRESULT WINAPI ClientRpcChannelBuffer_FreeBuffer(LPRPCCHANNELBUFFER iface, RPCOLEMESSAGE* olemsg)
-{
-    RPC_MESSAGE *msg = (RPC_MESSAGE *)olemsg;
-    RPC_STATUS status;
-    struct message_state *message_state;
-
-    TRACE("(%p)\n", msg);
-
-    message_state = msg->Handle;
-    /* restore the binding handle and the real start of data */
-    msg->Handle = message_state->binding_handle;
-    msg->Buffer = (char *)msg->Buffer - message_state->prefix_data_len;
-    msg->BufferLength += message_state->prefix_data_len;
-
-    if (message_state->params.bypass_rpcrt)
-    {
-        HeapFree(GetProcessHeap(), 0, msg->Buffer);
-        status = RPC_S_OK;
-    }
-    else
-        status = I_RpcFreeBuffer(msg);
-
-    HeapFree(GetProcessHeap(), 0, msg->RpcInterfaceInformation);
-    msg->RpcInterfaceInformation = NULL;
-
-    if (message_state->params.stub)
-        IRpcStubBuffer_Release(message_state->params.stub);
-    if (message_state->params.chan)
-        IRpcChannelBuffer_Release(message_state->params.chan);
-    HeapFree(GetProcessHeap(), 0, message_state);
-
-    TRACE("-- %d\n", status);
-
-    return HRESULT_FROM_WIN32(status);
-}
-
-static HRESULT WINAPI ClientRpcChannelBuffer_GetDestCtx(LPRPCCHANNELBUFFER iface, DWORD* pdwDestContext, void** ppvDestContext)
-{
-    ClientRpcChannelBuffer *This = (ClientRpcChannelBuffer *)iface;
-
-    TRACE("(%p,%p)\n", pdwDestContext, ppvDestContext);
-
-    *pdwDestContext = This->super.dest_context;
-    *ppvDestContext = This->super.dest_context_data;
-
-    return S_OK;
-}
-
-static HRESULT WINAPI ServerRpcChannelBuffer_GetDestCtx(LPRPCCHANNELBUFFER iface, DWORD* dest_context, void** dest_context_data)
-{
-    RpcChannelBuffer *This = (RpcChannelBuffer *)iface;
-
-    TRACE("(%p,%p)\n", dest_context, dest_context_data);
-
-    *dest_context = This->dest_context;
-    *dest_context_data = This->dest_context_data;
-    return S_OK;
-}
-
-static HRESULT WINAPI RpcChannelBuffer_IsConnected(LPRPCCHANNELBUFFER iface)
-{
-    TRACE("()\n");
-    /* native does nothing too */
-    return S_OK;
-}
-
-static const IRpcChannelBufferVtbl ClientRpcChannelBufferVtbl =
-{
-    RpcChannelBuffer_QueryInterface,
-    RpcChannelBuffer_AddRef,
-    ClientRpcChannelBuffer_Release,
-    ClientRpcChannelBuffer_GetBuffer,
-    ClientRpcChannelBuffer_SendReceive,
-    ClientRpcChannelBuffer_FreeBuffer,
-    ClientRpcChannelBuffer_GetDestCtx,
-    RpcChannelBuffer_IsConnected
-};
-
-static const IRpcChannelBufferVtbl ServerRpcChannelBufferVtbl =
-{
-    RpcChannelBuffer_QueryInterface,
-    RpcChannelBuffer_AddRef,
-    ServerRpcChannelBuffer_Release,
-    ServerRpcChannelBuffer_GetBuffer,
-    ServerRpcChannelBuffer_SendReceive,
-    ServerRpcChannelBuffer_FreeBuffer,
-    ServerRpcChannelBuffer_GetDestCtx,
-    RpcChannelBuffer_IsConnected
-};
-
-/* returns a channel buffer for proxies */
-HRESULT rpc_create_clientchannel(const OXID *oxid, const IPID *ipid,
-                                const OXID_INFO *oxid_info, const IID *iid,
-                                DWORD dest_context, void *dest_context_data,
-                                IRpcChannelBuffer **chan, struct apartment *apt)
-{
-    ClientRpcChannelBuffer *This;
-    WCHAR                   endpoint[200];
-    RPC_BINDING_HANDLE      bind;
-    RPC_STATUS              status;
-    LPWSTR                  string_binding;
-
-    /* FIXME: get the endpoint from oxid_info->psa instead */
-    get_rpc_endpoint(endpoint, oxid);
-
-    TRACE("proxy pipe: connecting to endpoint: %s\n", debugstr_w(endpoint));
-
-    status = RpcStringBindingComposeW(
-        NULL,
-        rpctransportW,
-        NULL,
-        endpoint,
-        NULL,
-        &string_binding);
-
-    if (status == RPC_S_OK)
-    {
-        status = RpcBindingFromStringBindingW(string_binding, &bind);
-
-        if (status == RPC_S_OK)
-        {
-            IPID ipid2 = *ipid; /* why can't RpcBindingSetObject take a const? */
-            status = RpcBindingSetObject(bind, &ipid2);
-            if (status != RPC_S_OK)
-                RpcBindingFree(&bind);
-        }
-
-        RpcStringFreeW(&string_binding);
-    }
-
-    if (status != RPC_S_OK)
-    {
-        ERR("Couldn't get binding for endpoint %s, status = %d\n", debugstr_w(endpoint), status);
-        return HRESULT_FROM_WIN32(status);
-    }
-
-    This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This));
-    if (!This)
-    {
-        RpcBindingFree(&bind);
-        return E_OUTOFMEMORY;
-    }
-
-    This->super.IRpcChannelBuffer_iface.lpVtbl = &ClientRpcChannelBufferVtbl;
-    This->super.refs = 1;
-    This->super.dest_context = dest_context;
-    This->super.dest_context_data = dest_context_data;
-    This->bind = bind;
-    This->oxid = apartment_getoxid(apt);
-    This->server_pid = oxid_info->dwPid;
-    This->event = NULL;
-    This->iid = *iid;
-
-    *chan = &This->super.IRpcChannelBuffer_iface;
-
-    return S_OK;
-}
-
-HRESULT rpc_create_serverchannel(DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan)
-{
-    RpcChannelBuffer *This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This));
-    if (!This)
-        return E_OUTOFMEMORY;
-
-    This->IRpcChannelBuffer_iface.lpVtbl = &ServerRpcChannelBufferVtbl;
-    This->refs = 1;
-    This->dest_context = dest_context;
-    This->dest_context_data = dest_context_data;
-
-    *chan = &This->IRpcChannelBuffer_iface;
-
-    return S_OK;
-}
-
-/* unmarshals ORPC_EXTENT_ARRAY according to NDR rules, but doesn't allocate
- * any memory */
-static HRESULT unmarshal_ORPC_EXTENT_ARRAY(RPC_MESSAGE *msg, const char *end,
-                                           ORPC_EXTENT_ARRAY *extensions,
-                                           WIRE_ORPC_EXTENT **first_wire_orpc_extent)
-{
-    DWORD pointer_id;
-    DWORD i;
-
-    memcpy(extensions, msg->Buffer, FIELD_OFFSET(WIRE_ORPC_EXTENT_ARRAY, extent));
-    msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPC_EXTENT_ARRAY, extent);
-
-    if ((const char *)msg->Buffer + 2 * sizeof(DWORD) > end)
-        return RPC_E_INVALID_HEADER;
-
-    pointer_id = *(DWORD *)msg->Buffer;
-    msg->Buffer = (char *)msg->Buffer + sizeof(DWORD);
-    extensions->extent = NULL;
-
-    if (pointer_id)
-    {
-        WIRE_ORPC_EXTENT *wire_orpc_extent;
-
-        /* conformance */
-        if (*(DWORD *)msg->Buffer != ((extensions->size+1)&~1))
-            return RPC_S_INVALID_BOUND;
-
-        msg->Buffer = (char *)msg->Buffer + sizeof(DWORD);
-
-        /* arbitrary limit for security (don't know what native does) */
-        if (extensions->size > 256)
-        {
-            ERR("too many extensions: %d\n", extensions->size);
-            return RPC_S_INVALID_BOUND;
-        }
-
-        *first_wire_orpc_extent = wire_orpc_extent = msg->Buffer;
-        for (i = 0; i < ((extensions->size+1)&~1); i++)
-        {
-            if ((const char *)&wire_orpc_extent->data[0] > end)
-                return RPC_S_INVALID_BOUND;
-            if (wire_orpc_extent->conformance != ((wire_orpc_extent->size+7)&~7))
-                return RPC_S_INVALID_BOUND;
-            if ((const char *)&wire_orpc_extent->data[wire_orpc_extent->conformance] > end)
-                return RPC_S_INVALID_BOUND;
-            TRACE("size %u, guid %s\n", wire_orpc_extent->size, debugstr_guid(&wire_orpc_extent->id));
-            wire_orpc_extent = (WIRE_ORPC_EXTENT *)&wire_orpc_extent->data[wire_orpc_extent->conformance];
-        }
-        msg->Buffer = wire_orpc_extent;
-    }
-
-    return S_OK;
-}
-
-/* unmarshals ORPCTHIS according to NDR rules, but doesn't allocate any memory */
-static HRESULT unmarshal_ORPCTHIS(RPC_MESSAGE *msg, ORPCTHIS *orpcthis,
-    ORPC_EXTENT_ARRAY *orpc_ext_array, WIRE_ORPC_EXTENT **first_wire_orpc_extent)
-{
-    const char *end = (char *)msg->Buffer + msg->BufferLength;
-
-    *first_wire_orpc_extent = NULL;
-
-    if (msg->BufferLength < FIELD_OFFSET(WIRE_ORPCTHIS, extensions) + sizeof(DWORD))
-    {
-        ERR("invalid buffer length\n");
-        return RPC_E_INVALID_HEADER;
-    }
-
-    memcpy(orpcthis, msg->Buffer, FIELD_OFFSET(WIRE_ORPCTHIS, extensions));
-    msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPCTHIS, extensions);
-
-    if ((const char *)msg->Buffer + sizeof(DWORD) > end)
-        return RPC_E_INVALID_HEADER;
-
-    if (*(DWORD *)msg->Buffer)
-        orpcthis->extensions = orpc_ext_array;
-    else
-        orpcthis->extensions = NULL;
-
-    msg->Buffer = (char *)msg->Buffer + sizeof(DWORD);
-
-    if (orpcthis->extensions)
-    {
-        HRESULT hr = unmarshal_ORPC_EXTENT_ARRAY(msg, end, orpc_ext_array,
-                                                 first_wire_orpc_extent);
-        if (FAILED(hr))
-            return hr;
-    }
-
-    if ((orpcthis->version.MajorVersion != COM_MAJOR_VERSION) ||
-        (orpcthis->version.MinorVersion > COM_MINOR_VERSION))
-    {
-        ERR("COM version {%d, %d} not supported\n",
-            orpcthis->version.MajorVersion, orpcthis->version.MinorVersion);
-        return RPC_E_VERSION_MISMATCH;
-    }
-
-    if (orpcthis->flags & ~(ORPCF_LOCAL|ORPCF_RESERVED1|ORPCF_RESERVED2|ORPCF_RESERVED3|ORPCF_RESERVED4))
-    {
-        ERR("invalid flags 0x%x\n", orpcthis->flags & ~(ORPCF_LOCAL|ORPCF_RESERVED1|ORPCF_RESERVED2|ORPCF_RESERVED3|ORPCF_RESERVED4));
-        return RPC_E_INVALID_HEADER;
-    }
-
-    return S_OK;
-}
-
-static HRESULT unmarshal_ORPCTHAT(RPC_MESSAGE *msg, ORPCTHAT *orpcthat,
-                                  ORPC_EXTENT_ARRAY *orpc_ext_array, WIRE_ORPC_EXTENT **first_wire_orpc_extent)
-{
-    const char *end = (char *)msg->Buffer + msg->BufferLength;
-
-    *first_wire_orpc_extent = NULL;
-
-    if (msg->BufferLength < FIELD_OFFSET(WIRE_ORPCTHAT, extensions) + sizeof(DWORD))
-    {
-        ERR("invalid buffer length\n");
-        return RPC_E_INVALID_HEADER;
-    }
-
-    memcpy(orpcthat, msg->Buffer, FIELD_OFFSET(WIRE_ORPCTHAT, extensions));
-    msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPCTHAT, extensions);
-
-    if ((const char *)msg->Buffer + sizeof(DWORD) > end)
-        return RPC_E_INVALID_HEADER;
-
-    if (*(DWORD *)msg->Buffer)
-        orpcthat->extensions = orpc_ext_array;
-    else
-        orpcthat->extensions = NULL;
-
-    msg->Buffer = (char *)msg->Buffer + sizeof(DWORD);
-
-    if (orpcthat->extensions)
-    {
-        HRESULT hr = unmarshal_ORPC_EXTENT_ARRAY(msg, end, orpc_ext_array,
-                                                 first_wire_orpc_extent);
-        if (FAILED(hr))
-            return hr;
-    }
-
-    if (orpcthat->flags & ~(ORPCF_LOCAL|ORPCF_RESERVED1|ORPCF_RESERVED2|ORPCF_RESERVED3|ORPCF_RESERVED4))
-    {
-        ERR("invalid flags 0x%x\n", orpcthat->flags & ~(ORPCF_LOCAL|ORPCF_RESERVED1|ORPCF_RESERVED2|ORPCF_RESERVED3|ORPCF_RESERVED4));
-        return RPC_E_INVALID_HEADER;
-    }
-
-    return S_OK;
-}
-
-void rpc_execute_call(struct dispatch_params *params)
-{
-    struct message_state *message_state = NULL;
-    RPC_MESSAGE *msg = (RPC_MESSAGE *)params->msg;
-    char *original_buffer = msg->Buffer;
-    ORPCTHIS orpcthis;
-    ORPC_EXTENT_ARRAY orpc_ext_array;
-    WIRE_ORPC_EXTENT *first_wire_orpc_extent;
-    GUID old_causality_id;
-    struct tlsdata *tlsdata;
-    struct apartment *apt;
-
-    if (FAILED(com_get_tlsdata(&tlsdata)))
-        return;
-
-    apt = com_get_current_apt();
-
-    /* handle ORPCTHIS and server extensions */
-
-    params->hr = unmarshal_ORPCTHIS(msg, &orpcthis, &orpc_ext_array, &first_wire_orpc_extent);
-    if (params->hr != S_OK)
-    {
-        msg->Buffer = original_buffer;
-        goto exit;
-    }
-
-    message_state = HeapAlloc(GetProcessHeap(), 0, sizeof(*message_state));
-    if (!message_state)
-    {
-        params->hr = E_OUTOFMEMORY;
-        msg->Buffer = original_buffer;
-        goto exit;
-    }
-
-    message_state->prefix_data_len = (char *)msg->Buffer - original_buffer;
-    message_state->binding_handle = msg->Handle;
-    message_state->bypass_rpcrt = params->bypass_rpcrt;
-
-    message_state->channel_hook_info.iid = params->iid;
-    message_state->channel_hook_info.cbSize = sizeof(message_state->channel_hook_info);
-    message_state->channel_hook_info.uCausality = orpcthis.cid;
-    message_state->channel_hook_info.dwServerPid = GetCurrentProcessId();
-    message_state->channel_hook_info.iMethod = msg->ProcNum;
-    message_state->channel_hook_info.pObject = params->iface;
-
-    if (orpcthis.extensions && first_wire_orpc_extent &&
-        orpcthis.extensions->size)
-        ChannelHooks_ServerNotify(&message_state->channel_hook_info, msg->DataRepresentation, first_wire_orpc_extent, orpcthis.extensions->size);
-
-    msg->Handle = message_state;
-    msg->BufferLength -= message_state->prefix_data_len;
-
-    /* call message filter */
-
-    if (apt->filter)
-    {
-        DWORD handlecall;
-        INTERFACEINFO interface_info;
-        CALLTYPE calltype;
-
-        interface_info.pUnk = params->iface;
-        interface_info.iid = params->iid;
-        interface_info.wMethod = msg->ProcNum;
-
-        if (IsEqualGUID(&orpcthis.cid, &tlsdata->causality_id))
-            calltype = CALLTYPE_NESTED;
-        else if (tlsdata->pending_call_count_server == 0)
-            calltype = CALLTYPE_TOPLEVEL;
-        else
-            calltype = CALLTYPE_TOPLEVEL_CALLPENDING;
-
-        handlecall = IMessageFilter_HandleInComingCall(apt->filter,
-                                                       calltype,
-                                                       UlongToHandle(GetCurrentProcessId()),
-                                                       0 /* FIXME */,
-                                                       &interface_info);
-        TRACE("IMessageFilter_HandleInComingCall returned %d\n", handlecall);
-        switch (handlecall)
-        {
-        case SERVERCALL_REJECTED:
-            params->hr = RPC_E_CALL_REJECTED;
-            goto exit_reset_state;
-        case SERVERCALL_RETRYLATER:
-#if 0 /* FIXME: handle retries on the client side before enabling this code */
-            params->hr = RPC_E_RETRY;
-            goto exit_reset_state;
-#else
-            FIXME("retry call later not implemented\n");
-            break;
-#endif
-        case SERVERCALL_ISHANDLED:
-        default:
-            break;
-        }
-    }
-
-    /* invoke the method */
-
-    /* save the old causality ID - note: any calls executed while processing
-     * messages received during the SendReceive will appear to originate from
-     * this call - this should be checked with what Windows does */
-    old_causality_id = tlsdata->causality_id;
-    tlsdata->causality_id = orpcthis.cid;
-    tlsdata->pending_call_count_server++;
-    params->hr = IRpcStubBuffer_Invoke(params->stub, params->msg, params->chan);
-    tlsdata->pending_call_count_server--;
-    tlsdata->causality_id = old_causality_id;
-
-    /* the invoke allocated a new buffer, so free the old one */
-    if (message_state->bypass_rpcrt && original_buffer != msg->Buffer)
-        HeapFree(GetProcessHeap(), 0, original_buffer);
-
-exit_reset_state:
-    message_state = msg->Handle;
-    msg->Handle = message_state->binding_handle;
-    msg->Buffer = (char *)msg->Buffer - message_state->prefix_data_len;
-    msg->BufferLength += message_state->prefix_data_len;
-
-exit:
-    HeapFree(GetProcessHeap(), 0, message_state);
-    if (params->handle) SetEvent(params->handle);
-}
-
-static void __RPC_STUB dispatch_rpc(RPC_MESSAGE *msg)
-{
-    struct dispatch_params *params;
-    struct stub_manager *stub_manager;
-    struct apartment *apt;
-    IPID ipid;
-    HRESULT hr;
-
-    RpcBindingInqObject(msg->Handle, &ipid);
-
-    TRACE("ipid = %s, iMethod = %d\n", debugstr_guid(&ipid), msg->ProcNum);
-
-    params = HeapAlloc(GetProcessHeap(), 0, sizeof(*params));
-    if (!params)
-    {
-        RpcRaiseException(E_OUTOFMEMORY);
-        return;
-    }
-
-    hr = ipid_get_dispatch_params(&ipid, &apt, &stub_manager, &params->stub, &params->chan,
-                                  &params->iid, &params->iface);
-    if (hr != S_OK)
-    {
-        ERR("no apartment found for ipid %s\n", debugstr_guid(&ipid));
-        HeapFree(GetProcessHeap(), 0, params);
-        RpcRaiseException(hr);
-        return;
-    }
-
-    params->msg = (RPCOLEMESSAGE *)msg;
-    params->status = RPC_S_OK;
-    params->hr = S_OK;
-    params->handle = NULL;
-    params->bypass_rpcrt = FALSE;
-
-    /* Note: this is the important difference between STAs and MTAs - we
-     * always execute RPCs to STAs in the thread that originally created the
-     * apartment (i.e. the one that pumps messages to the window) */
-    if (!apt->multi_threaded)
-    {
-        params->handle = CreateEventW(NULL, FALSE, FALSE, NULL);
-
-        TRACE("Calling apartment thread 0x%08x...\n", apt->tid);
-
-        if (PostMessageW(apartment_getwindow(apt), DM_EXECUTERPC, 0, (LPARAM)params))
-            WaitForSingleObject(params->handle, INFINITE);
-        else
-        {
-            ERR("PostMessage failed with error %u\n", GetLastError());
-            IRpcChannelBuffer_Release(params->chan);
-            IRpcStubBuffer_Release(params->stub);
-        }
-        CloseHandle(params->handle);
-    }
-    else
-    {
-        BOOL joined = FALSE;
-        struct tlsdata *tlsdata;
-
-        com_get_tlsdata(&tlsdata);
-
-        if (!tlsdata->apt)
-        {
-            enter_apartment(tlsdata, COINIT_MULTITHREADED);
-            joined = TRUE;
-        }
-        rpc_execute_call(params);
-        if (joined)
-        {
-            leave_apartment(tlsdata);
-        }
-    }
-
-    hr = params->hr;
-    if (params->chan)
-        IRpcChannelBuffer_Release(params->chan);
-    if (params->stub)
-        IRpcStubBuffer_Release(params->stub);
-    HeapFree(GetProcessHeap(), 0, params);
-
-    stub_manager_int_release(stub_manager);
-    apartment_release(apt);
-
-    /* if IRpcStubBuffer_Invoke fails, we should raise an exception to tell
-     * the RPC runtime that the call failed */
-    if (hr != S_OK) RpcRaiseException(hr);
-}
-
-/* stub registration */
-HRESULT rpc_register_interface(REFIID riid)
-{
-    struct registered_if *rif;
-    BOOL found = FALSE;
-    HRESULT hr = S_OK;
-
-    TRACE("(%s)\n", debugstr_guid(riid));
-
-    EnterCriticalSection(&csRegIf);
-    LIST_FOR_EACH_ENTRY(rif, &registered_interfaces, struct registered_if, entry)
-    {
-        if (IsEqualGUID(&rif->If.InterfaceId.SyntaxGUID, riid))
-        {
-            rif->refs++;
-            found = TRUE;
-            break;
-        }
-    }
-    if (!found)
-    {
-        TRACE("Creating new interface\n");
-
-        rif = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*rif));
-        if (rif)
-        {
-            RPC_STATUS status;
-
-            rif->refs = 1;
-            rif->If.Length = sizeof(RPC_SERVER_INTERFACE);
-            /* RPC interface ID = COM interface ID */
-            rif->If.InterfaceId.SyntaxGUID = *riid;
-            rif->If.DispatchTable = &rpc_dispatch;
-            /* all other fields are 0, including the version asCOM objects
-             * always have a version of 0.0 */
-            status = RpcServerRegisterIfEx(
-                (RPC_IF_HANDLE)&rif->If,
-                NULL, NULL,
-                RPC_IF_OLE | RPC_IF_AUTOLISTEN,
-                RPC_C_LISTEN_MAX_CALLS_DEFAULT,
-                NULL);
-            if (status == RPC_S_OK)
-                list_add_tail(&registered_interfaces, &rif->entry);
-            else
-            {
-                ERR("RpcServerRegisterIfEx failed with error %d\n", status);
-                HeapFree(GetProcessHeap(), 0, rif);
-                hr = HRESULT_FROM_WIN32(status);
-            }
-        }
-        else
-            hr = E_OUTOFMEMORY;
-    }
-    LeaveCriticalSection(&csRegIf);
-    return hr;
-}
-
-/* stub unregistration */
-void rpc_unregister_interface(REFIID riid, BOOL wait)
-{
-    struct registered_if *rif;
-    EnterCriticalSection(&csRegIf);
-    LIST_FOR_EACH_ENTRY(rif, &registered_interfaces, struct registered_if, entry)
-    {
-        if (IsEqualGUID(&rif->If.InterfaceId.SyntaxGUID, riid))
-        {
-            if (!--rif->refs)
-            {
-                RpcServerUnregisterIf((RPC_IF_HANDLE)&rif->If, NULL, wait);
-                list_remove(&rif->entry);
-                HeapFree(GetProcessHeap(), 0, rif);
-            }
-            break;
-        }
-    }
-    LeaveCriticalSection(&csRegIf);
-}
-
-/* get the info for an OXID, including the IPID for the rem unknown interface
- * and the string binding */
-HRESULT rpc_resolve_oxid(OXID oxid, OXID_INFO *oxid_info)
-{
-    TRACE("%s\n", wine_dbgstr_longlong(oxid));
-
-    oxid_info->dwTid = 0;
-    oxid_info->dwPid = 0;
-    oxid_info->dwAuthnHint = RPC_C_AUTHN_LEVEL_NONE;
-    /* FIXME: this is a hack around not having an OXID resolver yet -
-     * this function should contact the machine's OXID resolver and then it
-     * should give us the IPID of the IRemUnknown interface */
-    oxid_info->ipidRemUnknown.Data1 = 0xffffffff;
-    oxid_info->ipidRemUnknown.Data2 = 0xffff;
-    oxid_info->ipidRemUnknown.Data3 = 0xffff;
-    memcpy(oxid_info->ipidRemUnknown.Data4, &oxid, sizeof(OXID));
-    oxid_info->psa = NULL /* FIXME */;
-
-    return S_OK;
-}
-
-/* make the apartment reachable by other threads and processes and create the
- * IRemUnknown object */
-void rpc_start_remoting(struct apartment *apt)
-{
-    if (!InterlockedExchange(&apt->remoting_started, TRUE))
-    {
-        WCHAR endpoint[200];
-        RPC_STATUS status;
-
-        get_rpc_endpoint(endpoint, &apt->oxid);
-
-        status = RpcServerUseProtseqEpW(
-            rpctransportW,
-            RPC_C_PROTSEQ_MAX_REQS_DEFAULT,
-            endpoint,
-            NULL);
-        if (status != RPC_S_OK)
-            ERR("Couldn't register endpoint %s\n", debugstr_w(endpoint));
-
-        /* FIXME: move remote unknown exporting into this function */
-    }
-    start_apartment_remote_unknown(apt);
-}
-
-/******************************************************************************
- *            DllDebugObjectRPCHook    (combase.@)
- */
-BOOL WINAPI DllDebugObjectRPCHook(BOOL trace, /* ORPC_INIT_ARGS * */ void *args)
-{
-    FIXME("%d, %p: stub\n", trace, args);
-
-    return TRUE;
-}
+    return I_RpcExceptionFilter(eptr->ExceptionRecord->ExceptionCode);
+}
\ No newline at end of file
diff --git a/wrappers/new-dlls/combase/version.rc b/wrappers/new-dlls/combase/version.rc
new file mode 100644
index 0000000000..d953d2a325
--- /dev/null
+++ b/wrappers/new-dlls/combase/version.rc
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2011 Jacek Caban for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <windef.h>
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+#define WINE_FILEDESCRIPTION_STR "Microsoft OLE for Windows Wrapper for One-Core-API"
+#define WINE_FILENAME_STR "ole32.dll"
+
+#include "common_wrappers_ver.rc"
\ No newline at end of file
diff --git a/wrappers/new-dlls/combase_/CMakeLists.txt b/wrappers/new-dlls/combase_/CMakeLists.txt
new file mode 100644
index 0000000000..f215f8d0a5
--- /dev/null
+++ b/wrappers/new-dlls/combase_/CMakeLists.txt
@@ -0,0 +1,34 @@
+
+include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
+include_directories(${REACTOS_SOURCE_DIR}/sdk/include/psdk)
+
+spec2def(combase.dll combase.spec ADD_IMPORTLIB)
+generate_idl_iids(dcom.idl)
+add_idl_headers(combase_idlheader dcom.idl irpcss.idl)
+add_rpc_files(client irpcss.idl)
+
+list(APPEND SOURCE
+	apartment.c
+	combase.c
+	errorinfo.c
+	hglobalstream.c
+	malloc.c
+	marshal.c
+	roapi.c
+	rpc.c
+	string.c
+	stubmanager.c
+	usrmarshal.c
+    combase.rc
+	${CMAKE_CURRENT_BINARY_DIR}/combase_stubs.c
+	${CMAKE_CURRENT_BINARY_DIR}/combase.def
+	${CMAKE_CURRENT_BINARY_DIR}/dcom_i.c
+    ${CMAKE_CURRENT_BINARY_DIR}/irpcss_c.c)
+
+add_library(combase SHARED ${SOURCE})
+
+set_module_type(combase win32dll UNICODE)
+add_dependencies(combase combase_idlheader)
+target_link_libraries(combase uuid wine ${PSEH_LIB})
+add_importlibs(combase user32 gdi32 advapi32 msvcrt kernelbase rpcrt4 oleaut32 ole32 ntdll)
+add_cd_file(TARGET combase DESTINATION reactos/system32 FOR all)
diff --git a/wrappers/new-dlls/combase_/apartment.c b/wrappers/new-dlls/combase_/apartment.c
new file mode 100644
index 0000000000..108d6a71c5
--- /dev/null
+++ b/wrappers/new-dlls/combase_/apartment.c
@@ -0,0 +1,1285 @@
+/*
+ *      Copyright 1995 Martin von Loewis
+ *      Copyright 1998 Justin Bradford
+ *      Copyright 1999 Francis Beaudet
+ *      Copyright 1999 Sylvain St-Germain
+ *      Copyright 2002 Marcus Meissner
+ *      Copyright 2004 Mike Hearn
+ *      Copyright 2005-2006 Robert Shearman (for CodeWeavers)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ *
+ */
+
+#include <stdarg.h>
+#include <assert.h>
+
+#define COBJMACROS
+#define NONAMELESSUNION
+
+#include "windef.h"
+#include "winbase.h"
+#include "servprov.h"
+
+#include "combase_private.h"
+
+#include "wine/debug.h"
+#include "wine/list.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
+
+enum comclass_threadingmodel
+{
+    ThreadingModel_Apartment = 1,
+    ThreadingModel_Free      = 2,
+    ThreadingModel_No        = 3,
+    ThreadingModel_Both      = 4,
+    ThreadingModel_Neutral   = 5
+};
+
+static struct apartment *mta;
+static struct apartment *main_sta; /* the first STA */
+static struct list apts = LIST_INIT(apts);
+
+static CRITICAL_SECTION apt_cs;
+static CRITICAL_SECTION_DEBUG apt_cs_debug =
+{
+    0, 0, &apt_cs,
+    { &apt_cs_debug.ProcessLocksList, &apt_cs_debug.ProcessLocksList },
+      0, 0, { (DWORD_PTR)(__FILE__ ": apt_cs") }
+};
+static CRITICAL_SECTION apt_cs = { &apt_cs_debug, -1, 0, 0, 0, 0 };
+
+static struct list dlls = LIST_INIT(dlls);
+
+static CRITICAL_SECTION dlls_cs;
+static CRITICAL_SECTION_DEBUG dlls_cs_debug =
+{
+    0, 0, &dlls_cs,
+    { &dlls_cs_debug.ProcessLocksList, &dlls_cs_debug.ProcessLocksList },
+      0, 0, { (DWORD_PTR)(__FILE__ ": dlls_cs") }
+};
+static CRITICAL_SECTION dlls_cs = { &dlls_cs_debug, -1, 0, 0, 0, 0 };
+
+typedef HRESULT (WINAPI *DllGetClassObjectFunc)(REFCLSID clsid, REFIID iid, void **obj);
+typedef HRESULT (WINAPI *DllCanUnloadNowFunc)(void);
+
+struct opendll
+{
+    LONG refs;
+    LPWSTR library_name;
+    HANDLE library;
+    DllGetClassObjectFunc DllGetClassObject;
+    DllCanUnloadNowFunc DllCanUnloadNow;
+    struct list entry;
+};
+
+struct apartment_loaded_dll
+{
+    struct list entry;
+    struct opendll *dll;
+    DWORD unload_time;
+    BOOL multi_threaded;
+};
+
+static struct opendll *apartment_get_dll(const WCHAR *library_name)
+{
+    struct opendll *ptr, *ret = NULL;
+
+    EnterCriticalSection(&dlls_cs);
+    LIST_FOR_EACH_ENTRY(ptr, &dlls, struct opendll, entry)
+    {
+        if (!wcsicmp(library_name, ptr->library_name) &&
+            (InterlockedIncrement(&ptr->refs) != 1) /* entry is being destroyed if == 1 */)
+        {
+            ret = ptr;
+            break;
+        }
+    }
+    LeaveCriticalSection(&dlls_cs);
+
+    return ret;
+}
+
+/* caller must ensure that library_name is not already in the open dll list */
+static HRESULT apartment_add_dll(const WCHAR *library_name, struct opendll **ret)
+{
+    struct opendll *entry;
+    int len;
+    HRESULT hr = S_OK;
+    HANDLE hLibrary;
+    DllCanUnloadNowFunc DllCanUnloadNow;
+    DllGetClassObjectFunc DllGetClassObject;
+
+    TRACE("%s\n", debugstr_w(library_name));
+
+    *ret = apartment_get_dll(library_name);
+    if (*ret) return S_OK;
+
+    /* Load outside of dlls lock to avoid dependency on the loader lock */
+    hLibrary = LoadLibraryExW(library_name, 0, LOAD_WITH_ALTERED_SEARCH_PATH);
+    if (!hLibrary)
+    {
+        ERR("couldn't load in-process dll %s\n", debugstr_w(library_name));
+        /* failure: DLL could not be loaded */
+        return E_ACCESSDENIED; /* FIXME: or should this be CO_E_DLLNOTFOUND? */
+    }
+
+    /* DllCanUnloadNow is optional */
+    DllCanUnloadNow = (void *)GetProcAddress(hLibrary, "DllCanUnloadNow");
+    DllGetClassObject = (void *)GetProcAddress(hLibrary, "DllGetClassObject");
+    if (!DllGetClassObject)
+    {
+        /* failure: the dll did not export DllGetClassObject */
+        ERR("couldn't find function DllGetClassObject in %s\n", debugstr_w(library_name));
+        FreeLibrary(hLibrary);
+        return CO_E_DLLNOTFOUND;
+    }
+
+    EnterCriticalSection(&dlls_cs);
+
+    *ret = apartment_get_dll(library_name);
+    if (*ret)
+    {
+        /* another caller to this function already added the dll while we
+         * weren't in the critical section */
+        FreeLibrary(hLibrary);
+    }
+    else
+    {
+        len = lstrlenW(library_name);
+        entry = heap_alloc(sizeof(*entry));
+        if (entry)
+            entry->library_name = heap_alloc((len + 1) * sizeof(WCHAR));
+        if (entry && entry->library_name)
+        {
+            memcpy(entry->library_name, library_name, (len + 1)*sizeof(WCHAR));
+            entry->library = hLibrary;
+            entry->refs = 1;
+            entry->DllCanUnloadNow = DllCanUnloadNow;
+            entry->DllGetClassObject = DllGetClassObject;
+            list_add_tail(&dlls, &entry->entry);
+            *ret = entry;
+        }
+        else
+        {
+            heap_free(entry);
+            hr = E_OUTOFMEMORY;
+            FreeLibrary(hLibrary);
+        }
+    }
+
+    LeaveCriticalSection(&dlls_cs);
+
+    return hr;
+}
+
+/* pass FALSE for free_entry to release a reference without destroying the
+ * entry if it reaches zero or TRUE otherwise */
+static void apartment_release_dll(struct opendll *entry, BOOL free_entry)
+{
+    if (!InterlockedDecrement(&entry->refs) && free_entry)
+    {
+        EnterCriticalSection(&dlls_cs);
+        list_remove(&entry->entry);
+        LeaveCriticalSection(&dlls_cs);
+
+        TRACE("freeing %p\n", entry->library);
+        FreeLibrary(entry->library);
+
+        heap_free(entry->library_name);
+        heap_free(entry);
+    }
+}
+
+/* frees memory associated with active dll list */
+static void apartment_release_dlls(void)
+{
+    struct opendll *entry, *cursor2;
+    EnterCriticalSection(&dlls_cs);
+    LIST_FOR_EACH_ENTRY_SAFE(entry, cursor2, &dlls, struct opendll, entry)
+    {
+        list_remove(&entry->entry);
+        heap_free(entry->library_name);
+        heap_free(entry);
+    }
+    LeaveCriticalSection(&dlls_cs);
+    DeleteCriticalSection(&dlls_cs);
+}
+
+/*
+ * This is a marshallable object exposing registered local servers.
+ * IServiceProvider is used only because it happens meet requirements
+ * and already has proxy/stub code. If more functionality is needed,
+ * a custom interface may be used instead.
+ */
+struct local_server
+{
+    IServiceProvider IServiceProvider_iface;
+    LONG refcount;
+    struct apartment *apt;
+    IStream *marshal_stream;
+};
+
+static inline struct local_server *impl_from_IServiceProvider(IServiceProvider *iface)
+{
+    return CONTAINING_RECORD(iface, struct local_server, IServiceProvider_iface);
+}
+
+static HRESULT WINAPI local_server_QueryInterface(IServiceProvider *iface, REFIID riid, void **obj)
+{
+    struct local_server *local_server = impl_from_IServiceProvider(iface);
+
+    TRACE("%p, %s, %p\n", iface, debugstr_guid(riid), obj);
+
+    if (IsEqualGUID(riid, &IID_IUnknown) ||
+            IsEqualGUID(riid, &IID_IServiceProvider))
+    {
+        *obj = &local_server->IServiceProvider_iface;
+    }
+    else
+    {
+        *obj = NULL;
+        return E_NOINTERFACE;
+    }
+
+    IUnknown_AddRef((IUnknown *)*obj);
+    return S_OK;
+}
+
+static ULONG WINAPI local_server_AddRef(IServiceProvider *iface)
+{
+    struct local_server *local_server = impl_from_IServiceProvider(iface);
+    LONG refcount = InterlockedIncrement(&local_server->refcount);
+
+    TRACE("%p, refcount %d\n", iface, refcount);
+
+    return refcount;
+}
+
+static ULONG WINAPI local_server_Release(IServiceProvider *iface)
+{
+    struct local_server *local_server = impl_from_IServiceProvider(iface);
+    LONG refcount = InterlockedDecrement(&local_server->refcount);
+
+    TRACE("%p, refcount %d\n", iface, refcount);
+
+    if (!refcount)
+    {
+        assert(!local_server->apt);
+        heap_free(local_server);
+    }
+
+    return refcount;
+}
+
+static HRESULT WINAPI local_server_QueryService(IServiceProvider *iface, REFGUID guid, REFIID riid, void **obj)
+{
+    struct local_server *local_server = impl_from_IServiceProvider(iface);
+    struct apartment *apt = com_get_current_apt();
+    HRESULT hr = E_FAIL;
+    IUnknown *unk;
+
+    TRACE("%p, %s, %s, %p\n", iface, debugstr_guid(guid), debugstr_guid(riid), obj);
+
+    if (!local_server->apt)
+        return E_UNEXPECTED;
+
+    if ((unk = com_get_registered_class_object(apt, guid, CLSCTX_LOCAL_SERVER)))
+    {
+        hr = IUnknown_QueryInterface(unk, riid, obj);
+        IUnknown_Release(unk);
+    }
+
+    return hr;
+}
+
+static const IServiceProviderVtbl local_server_vtbl =
+{
+    local_server_QueryInterface,
+    local_server_AddRef,
+    local_server_Release,
+    local_server_QueryService
+};
+
+HRESULT apartment_get_local_server_stream(struct apartment *apt, IStream **ret)
+{
+    HRESULT hr = S_OK;
+
+    EnterCriticalSection(&apt->cs);
+
+    if (!apt->local_server)
+    {
+        struct local_server *obj;
+
+        obj = heap_alloc(sizeof(*obj));
+        if (obj)
+        {
+            obj->IServiceProvider_iface.lpVtbl = &local_server_vtbl;
+            obj->refcount = 1;
+            obj->apt = apt;
+
+            hr = CreateStreamOnHGlobal(0, TRUE, &obj->marshal_stream);
+            if (SUCCEEDED(hr))
+            {
+                hr = CoMarshalInterface(obj->marshal_stream, &IID_IServiceProvider, (IUnknown *)&obj->IServiceProvider_iface,
+                        MSHCTX_LOCAL, NULL, MSHLFLAGS_TABLESTRONG);
+                if (FAILED(hr))
+                    IStream_Release(obj->marshal_stream);
+            }
+
+            if (SUCCEEDED(hr))
+                apt->local_server = obj;
+            else
+                heap_free(obj);
+        }
+        else
+            hr = E_OUTOFMEMORY;
+    }
+
+    if (SUCCEEDED(hr))
+        hr = IStream_Clone(apt->local_server->marshal_stream, ret);
+
+    LeaveCriticalSection(&apt->cs);
+
+    if (FAILED(hr))
+        ERR("Failed: %#x\n", hr);
+
+    return hr;
+}
+
+/* Creates new apartment for given model */
+static struct apartment *apartment_construct(DWORD model)
+{
+    struct apartment *apt;
+
+    TRACE("creating new apartment, model %d\n", model);
+
+    apt = heap_alloc_zero(sizeof(*apt));
+    apt->tid = GetCurrentThreadId();
+
+    list_init(&apt->proxies);
+    list_init(&apt->stubmgrs);
+    list_init(&apt->loaded_dlls);
+    list_init(&apt->usage_cookies);
+    apt->ipidc = 0;
+    apt->refs = 1;
+    apt->remunk_exported = FALSE;
+    apt->oidc = 1;
+    InitializeCriticalSection(&apt->cs);
+    apt->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": apartment");
+
+    apt->multi_threaded = !(model & COINIT_APARTMENTTHREADED);
+
+    if (apt->multi_threaded)
+    {
+        /* FIXME: should be randomly generated by in an RPC call to rpcss */
+        apt->oxid = ((OXID)GetCurrentProcessId() << 32) | 0xcafe;
+    }
+    else
+    {
+        /* FIXME: should be randomly generated by in an RPC call to rpcss */
+        apt->oxid = ((OXID)GetCurrentProcessId() << 32) | GetCurrentThreadId();
+    }
+
+    TRACE("Created apartment on OXID %s\n", wine_dbgstr_longlong(apt->oxid));
+
+    list_add_head(&apts, &apt->entry);
+
+    return apt;
+}
+
+/* Frees unused libraries loaded into apartment */
+void apartment_freeunusedlibraries(struct apartment *apt, DWORD delay)
+{
+    struct apartment_loaded_dll *entry, *next;
+
+    EnterCriticalSection(&apt->cs);
+    LIST_FOR_EACH_ENTRY_SAFE(entry, next, &apt->loaded_dlls, struct apartment_loaded_dll, entry)
+    {
+        if (entry->dll->DllCanUnloadNow && (entry->dll->DllCanUnloadNow() == S_OK))
+        {
+            DWORD real_delay = delay;
+
+            if (real_delay == INFINITE)
+            {
+                /* DLLs that return multi-threaded objects aren't unloaded
+                 * straight away to cope for programs that have races between
+                 * last object destruction and threads in the DLLs that haven't
+                 * finished, despite DllCanUnloadNow returning S_OK */
+                if (entry->multi_threaded)
+                    real_delay = 10 * 60 * 1000; /* 10 minutes */
+                else
+                    real_delay = 0;
+            }
+
+            if (!real_delay || (entry->unload_time && ((int)(GetTickCount() - entry->unload_time) > 0)))
+            {
+                list_remove(&entry->entry);
+                apartment_release_dll(entry->dll, TRUE);
+                heap_free(entry);
+            }
+            else
+            {
+                entry->unload_time = GetTickCount() + real_delay;
+                if (!entry->unload_time) entry->unload_time = 1;
+            }
+        }
+        else if (entry->unload_time)
+            entry->unload_time = 0;
+    }
+    LeaveCriticalSection(&apt->cs);
+}
+
+void apartment_release(struct apartment *apt)
+{
+    DWORD refcount;
+
+    EnterCriticalSection(&apt_cs);
+
+    refcount = InterlockedDecrement(&apt->refs);
+    TRACE("%s: after = %d\n", wine_dbgstr_longlong(apt->oxid), refcount);
+
+    if (apt->being_destroyed)
+    {
+        LeaveCriticalSection(&apt_cs);
+        return;
+    }
+
+    /* destruction stuff that needs to happen under global */
+    if (!refcount)
+    {
+        apt->being_destroyed = TRUE;
+        if (apt == mta) mta = NULL;
+        else if (apt == main_sta) main_sta = NULL;
+        list_remove(&apt->entry);
+    }
+
+    LeaveCriticalSection(&apt_cs);
+
+    if (!refcount)
+    {
+        struct list *cursor, *cursor2;
+
+        TRACE("destroying apartment %p, oxid %s\n", apt, wine_dbgstr_longlong(apt->oxid));
+
+        if (apt->local_server)
+        {
+            struct local_server *local_server = apt->local_server;
+            LARGE_INTEGER zero;
+
+            memset(&zero, 0, sizeof(zero));
+            IStream_Seek(local_server->marshal_stream, zero, STREAM_SEEK_SET, NULL);
+            CoReleaseMarshalData(local_server->marshal_stream);
+            IStream_Release(local_server->marshal_stream);
+            local_server->marshal_stream = NULL;
+
+            apt->local_server = NULL;
+            local_server->apt = NULL;
+            IServiceProvider_Release(&local_server->IServiceProvider_iface);
+        }
+
+        /* Release the references to the registered class objects */
+        apartment_revoke_all_classes(apt);
+
+        /* no locking is needed for this apartment, because no other thread
+         * can access it at this point */
+
+        apartment_disconnectproxies(apt);
+
+        if (apt->win) DestroyWindow(apt->win);
+        if (apt->host_apt_tid) PostThreadMessageW(apt->host_apt_tid, WM_QUIT, 0, 0);
+
+        LIST_FOR_EACH_SAFE(cursor, cursor2, &apt->stubmgrs)
+        {
+            struct stub_manager *stubmgr = LIST_ENTRY(cursor, struct stub_manager, entry);
+            /* release the implicit reference given by the fact that the
+             * stub has external references (it must do since it is in the
+             * stub manager list in the apartment and all non-apartment users
+             * must have a ref on the apartment and so it cannot be destroyed).
+             */
+            stub_manager_int_release(stubmgr);
+        }
+
+        /* if this assert fires, then another thread took a reference to a
+         * stub manager without taking a reference to the containing
+         * apartment, which it must do. */
+        assert(list_empty(&apt->stubmgrs));
+
+        if (apt->filter) IMessageFilter_Release(apt->filter);
+
+        /* free as many unused libraries as possible... */
+        apartment_freeunusedlibraries(apt, 0);
+
+        /* ... and free the memory for the apartment loaded dll entry and
+         * release the dll list reference without freeing the library for the
+         * rest */
+        while ((cursor = list_head(&apt->loaded_dlls)))
+        {
+            struct apartment_loaded_dll *apartment_loaded_dll = LIST_ENTRY(cursor, struct apartment_loaded_dll, entry);
+            apartment_release_dll(apartment_loaded_dll->dll, FALSE);
+            list_remove(cursor);
+            heap_free(apartment_loaded_dll);
+        }
+
+        apt->cs.DebugInfo->Spare[0] = 0;
+        DeleteCriticalSection(&apt->cs);
+
+        heap_free(apt);
+    }
+}
+
+static DWORD apartment_addref(struct apartment *apt)
+{
+    DWORD refs = InterlockedIncrement(&apt->refs);
+    TRACE("%s: before = %d\n", wine_dbgstr_longlong(apt->oxid), refs - 1);
+    return refs;
+}
+
+/* Gets existing apartment or creates a new one and enters it */
+static struct apartment *apartment_get_or_create(DWORD model)
+{
+    struct apartment *apt = com_get_current_apt();
+    struct tlsdata *data;
+
+    if (!apt)
+    {
+        com_get_tlsdata(&data);
+
+        if (model & COINIT_APARTMENTTHREADED)
+        {
+            EnterCriticalSection(&apt_cs);
+
+            apt = apartment_construct(model);
+            if (!main_sta)
+            {
+                main_sta = apt;
+                apt->main = TRUE;
+                TRACE("Created main-threaded apartment with OXID %s\n", wine_dbgstr_longlong(apt->oxid));
+            }
+
+            data->flags |= OLETLS_APARTMENTTHREADED;
+            if (model & COINIT_DISABLE_OLE1DDE)
+                data->flags |= OLETLS_DISABLE_OLE1DDE;
+
+            LeaveCriticalSection(&apt_cs);
+
+            if (apt->main)
+                apartment_createwindowifneeded(apt);
+        }
+        else
+        {
+            EnterCriticalSection(&apt_cs);
+
+            /* The multi-threaded apartment (MTA) contains zero or more threads interacting
+             * with free threaded (ie thread safe) COM objects. There is only ever one MTA
+             * in a process */
+            if (mta)
+            {
+                TRACE("entering the multithreaded apartment %s\n", wine_dbgstr_longlong(mta->oxid));
+                apartment_addref(mta);
+            }
+            else
+                mta = apartment_construct(model);
+
+            data->flags |= OLETLS_MULTITHREADED | OLETLS_DISABLE_OLE1DDE;
+
+            apt = mta;
+
+            LeaveCriticalSection(&apt_cs);
+        }
+        data->apt = apt;
+    }
+
+    return apt;
+}
+
+struct apartment * apartment_get_mta(void)
+{
+    struct apartment *apt;
+
+    EnterCriticalSection(&apt_cs);
+
+    if ((apt = mta))
+        apartment_addref(apt);
+
+    LeaveCriticalSection(&apt_cs);
+
+    return apt;
+}
+
+/* Return the current apartment if it exists, or, failing that, the MTA. Caller
+ * must free the returned apartment in either case. */
+struct apartment * apartment_get_current_or_mta(void)
+{
+    struct apartment *apt = com_get_current_apt();
+    if (apt)
+    {
+        apartment_addref(apt);
+        return apt;
+    }
+    return apartment_get_mta();
+}
+
+/* The given OXID must be local to this process */
+struct apartment * apartment_findfromoxid(OXID oxid)
+{
+    struct apartment *result = NULL, *apt;
+
+    EnterCriticalSection(&apt_cs);
+    LIST_FOR_EACH_ENTRY(apt, &apts, struct apartment, entry)
+    {
+        if (apt->oxid == oxid)
+        {
+            result = apt;
+            apartment_addref(result);
+            break;
+        }
+    }
+    LeaveCriticalSection(&apt_cs);
+
+    return result;
+}
+
+/* gets the apartment which has a given creator thread ID. The caller must
+ * release the reference from the apartment as soon as the apartment pointer
+ * is no longer required. */
+struct apartment * apartment_findfromtid(DWORD tid)
+{
+    struct apartment *result = NULL, *apt;
+
+    EnterCriticalSection(&apt_cs);
+    LIST_FOR_EACH_ENTRY(apt, &apts, struct apartment, entry)
+    {
+        if (apt->tid == tid)
+        {
+            result = apt;
+            apartment_addref(result);
+            break;
+        }
+    }
+    LeaveCriticalSection(&apt_cs);
+
+    return result;
+}
+
+/* gets the main apartment if it exists. The caller must
+ * release the reference from the apartment as soon as the apartment pointer
+ * is no longer required. */
+static struct apartment *apartment_findmain(void)
+{
+    struct apartment *result;
+
+    EnterCriticalSection(&apt_cs);
+
+    result = main_sta;
+    if (result) apartment_addref(result);
+
+    LeaveCriticalSection(&apt_cs);
+
+    return result;
+}
+
+struct host_object_params
+{
+    struct class_reg_data regdata;
+    CLSID clsid; /* clsid of object to marshal */
+    IID iid; /* interface to marshal */
+    HANDLE event; /* event signalling when ready for multi-threaded case */
+    HRESULT hr; /* result for multi-threaded case */
+    IStream *stream; /* stream that the object will be marshaled into */
+    BOOL apartment_threaded; /* is the component purely apartment-threaded? */
+};
+
+/* Returns expanded dll path from the registry or activation context. */
+static BOOL get_object_dll_path(const struct class_reg_data *regdata, WCHAR *dst, DWORD dstlen)
+{
+    DWORD ret;
+
+    if (regdata->origin == CLASS_REG_REGISTRY)
+    {
+        DWORD keytype;
+        WCHAR src[MAX_PATH];
+        DWORD dwLength = dstlen * sizeof(WCHAR);
+
+        if ((ret = RegQueryValueExW(regdata->u.hkey, NULL, NULL, &keytype, (BYTE*)src, &dwLength)) == ERROR_SUCCESS)
+        {
+            if (keytype == REG_EXPAND_SZ)
+            {
+                if (dstlen <= ExpandEnvironmentStringsW(src, dst, dstlen)) ret = ERROR_MORE_DATA;
+            }
+            else
+            {
+                const WCHAR *quote_start;
+                quote_start = wcschr(src, '\"');
+                if (quote_start)
+                {
+                    const WCHAR *quote_end = wcschr(quote_start + 1, '\"');
+                    if (quote_end)
+                    {
+                        memmove(src, quote_start + 1, (quote_end - quote_start - 1) * sizeof(WCHAR));
+                        src[quote_end - quote_start - 1] = '\0';
+                    }
+                }
+                lstrcpynW(dst, src, dstlen);
+            }
+        }
+        return !ret;
+    }
+    else
+    {
+        ULONG_PTR cookie;
+
+        *dst = 0;
+        ActivateActCtx(regdata->u.actctx.hactctx, &cookie);
+        ret = SearchPathW(NULL, regdata->u.actctx.module_name, L".dll", dstlen, dst, NULL);
+        DeactivateActCtx(0, cookie);
+        return *dst != 0;
+    }
+}
+
+/* gets the specified class object by loading the appropriate DLL, if
+ * necessary and calls the DllGetClassObject function for the DLL */
+static HRESULT apartment_getclassobject(struct apartment *apt, LPCWSTR dllpath,
+                                        BOOL apartment_threaded,
+                                        REFCLSID rclsid, REFIID riid, void **ppv)
+{
+    HRESULT hr = S_OK;
+    BOOL found = FALSE;
+    struct apartment_loaded_dll *apartment_loaded_dll;
+
+    if (!wcsicmp(dllpath, L"ole32.dll"))
+    {
+        HRESULT (WINAPI *p_ole32_DllGetClassObject)(REFCLSID clsid, REFIID riid, void **obj);
+
+        p_ole32_DllGetClassObject = (void *)GetProcAddress(GetModuleHandleW(L"ole32.dll"), "DllGetClassObject");
+
+        /* we don't need to control the lifetime of this dll, so use the local
+         * implementation of DllGetClassObject directly */
+        TRACE("calling ole32!DllGetClassObject\n");
+        hr = p_ole32_DllGetClassObject(rclsid, riid, ppv);
+
+        if (hr != S_OK)
+            ERR("DllGetClassObject returned error 0x%08x for dll %s\n", hr, debugstr_w(dllpath));
+
+        return hr;
+    }
+
+    EnterCriticalSection(&apt->cs);
+
+    LIST_FOR_EACH_ENTRY(apartment_loaded_dll, &apt->loaded_dlls, struct apartment_loaded_dll, entry)
+        if (!wcsicmp(dllpath, apartment_loaded_dll->dll->library_name))
+        {
+            TRACE("found %s already loaded\n", debugstr_w(dllpath));
+            found = TRUE;
+            break;
+        }
+
+    if (!found)
+    {
+        apartment_loaded_dll = heap_alloc(sizeof(*apartment_loaded_dll));
+        if (!apartment_loaded_dll)
+            hr = E_OUTOFMEMORY;
+        if (SUCCEEDED(hr))
+        {
+            apartment_loaded_dll->unload_time = 0;
+            apartment_loaded_dll->multi_threaded = FALSE;
+            hr = apartment_add_dll(dllpath, &apartment_loaded_dll->dll);
+            if (FAILED(hr))
+                heap_free(apartment_loaded_dll);
+        }
+        if (SUCCEEDED(hr))
+        {
+            TRACE("added new loaded dll %s\n", debugstr_w(dllpath));
+            list_add_tail(&apt->loaded_dlls, &apartment_loaded_dll->entry);
+        }
+    }
+
+    LeaveCriticalSection(&apt->cs);
+
+    if (SUCCEEDED(hr))
+    {
+        /* one component being multi-threaded overrides any number of
+         * apartment-threaded components */
+        if (!apartment_threaded)
+            apartment_loaded_dll->multi_threaded = TRUE;
+
+        TRACE("calling DllGetClassObject %p\n", apartment_loaded_dll->dll->DllGetClassObject);
+        /* OK: get the ClassObject */
+        hr = apartment_loaded_dll->dll->DllGetClassObject(rclsid, riid, ppv);
+
+        if (hr != S_OK)
+            ERR("DllGetClassObject returned error 0x%08x for dll %s\n", hr, debugstr_w(dllpath));
+    }
+
+    return hr;
+}
+
+static HRESULT apartment_hostobject(struct apartment *apt,
+                                    const struct host_object_params *params);
+
+struct host_thread_params
+{
+    COINIT threading_model;
+    HANDLE ready_event;
+    HWND apartment_hwnd;
+};
+
+/* thread for hosting an object to allow an object to appear to be created in
+ * an apartment with an incompatible threading model */
+static DWORD CALLBACK apartment_hostobject_thread(void *p)
+{
+    struct host_thread_params *params = p;
+    MSG msg;
+    HRESULT hr;
+    struct apartment *apt;
+
+    TRACE("\n");
+
+    hr = CoInitializeEx(NULL, params->threading_model);
+    if (FAILED(hr)) return hr;
+
+    apt = com_get_current_apt();
+    if (params->threading_model == COINIT_APARTMENTTHREADED)
+    {
+        apartment_createwindowifneeded(apt);
+        params->apartment_hwnd = apartment_getwindow(apt);
+    }
+    else
+        params->apartment_hwnd = NULL;
+
+    /* force the message queue to be created before signaling parent thread */
+    PeekMessageW(&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE);
+
+    SetEvent(params->ready_event);
+    params = NULL; /* can't touch params after here as it may be invalid */
+
+    while (GetMessageW(&msg, NULL, 0, 0))
+    {
+        if (!msg.hwnd && (msg.message == DM_HOSTOBJECT))
+        {
+            struct host_object_params *obj_params = (struct host_object_params *)msg.lParam;
+            obj_params->hr = apartment_hostobject(apt, obj_params);
+            SetEvent(obj_params->event);
+        }
+        else
+        {
+            TranslateMessage(&msg);
+            DispatchMessageW(&msg);
+        }
+    }
+
+    TRACE("exiting\n");
+
+    CoUninitialize();
+
+    return S_OK;
+}
+
+/* finds or creates a host apartment, creates the object inside it and returns
+ * a proxy to it so that the object can be used in the apartment of the
+ * caller of this function */
+static HRESULT apartment_hostobject_in_hostapt(struct apartment *apt, BOOL multi_threaded,
+        BOOL main_apartment, const struct class_reg_data *regdata, REFCLSID rclsid, REFIID riid, void **ppv)
+{
+    struct host_object_params params;
+    HWND apartment_hwnd = NULL;
+    DWORD apartment_tid = 0;
+    HRESULT hr;
+
+    if (!multi_threaded && main_apartment)
+    {
+        struct apartment *host_apt = apartment_findmain();
+        if (host_apt)
+        {
+            apartment_hwnd = apartment_getwindow(host_apt);
+            apartment_release(host_apt);
+        }
+    }
+
+    if (!apartment_hwnd)
+    {
+        EnterCriticalSection(&apt->cs);
+
+        if (!apt->host_apt_tid)
+        {
+            struct host_thread_params thread_params;
+            HANDLE handles[2];
+            DWORD wait_value;
+
+            thread_params.threading_model = multi_threaded ? COINIT_MULTITHREADED : COINIT_APARTMENTTHREADED;
+            handles[0] = thread_params.ready_event = CreateEventW(NULL, FALSE, FALSE, NULL);
+            thread_params.apartment_hwnd = NULL;
+            handles[1] = CreateThread(NULL, 0, apartment_hostobject_thread, &thread_params, 0, &apt->host_apt_tid);
+            if (!handles[1])
+            {
+                CloseHandle(handles[0]);
+                LeaveCriticalSection(&apt->cs);
+                return E_OUTOFMEMORY;
+            }
+            wait_value = WaitForMultipleObjects(2, handles, FALSE, INFINITE);
+            CloseHandle(handles[0]);
+            CloseHandle(handles[1]);
+            if (wait_value == WAIT_OBJECT_0)
+                apt->host_apt_hwnd = thread_params.apartment_hwnd;
+            else
+            {
+                LeaveCriticalSection(&apt->cs);
+                return E_OUTOFMEMORY;
+            }
+        }
+
+        if (multi_threaded || !main_apartment)
+        {
+            apartment_hwnd = apt->host_apt_hwnd;
+            apartment_tid = apt->host_apt_tid;
+        }
+
+        LeaveCriticalSection(&apt->cs);
+    }
+
+    /* another thread may have become the main apartment in the time it took
+     * us to create the thread for the host apartment */
+    if (!apartment_hwnd && !multi_threaded && main_apartment)
+    {
+        struct apartment *host_apt = apartment_findmain();
+        if (host_apt)
+        {
+            apartment_hwnd = apartment_getwindow(host_apt);
+            apartment_release(host_apt);
+        }
+    }
+
+    params.regdata = *regdata;
+    params.clsid = *rclsid;
+    params.iid = *riid;
+    hr = CreateStreamOnHGlobal(NULL, TRUE, &params.stream);
+    if (FAILED(hr))
+        return hr;
+    params.apartment_threaded = !multi_threaded;
+    if (multi_threaded)
+    {
+        params.hr = S_OK;
+        params.event = CreateEventW(NULL, FALSE, FALSE, NULL);
+        if (!PostThreadMessageW(apartment_tid, DM_HOSTOBJECT, 0, (LPARAM)&params))
+            hr = E_OUTOFMEMORY;
+        else
+        {
+            WaitForSingleObject(params.event, INFINITE);
+            hr = params.hr;
+        }
+        CloseHandle(params.event);
+    }
+    else
+    {
+        if (!apartment_hwnd)
+        {
+            ERR("host apartment didn't create window\n");
+            hr = E_OUTOFMEMORY;
+        }
+        else
+            hr = SendMessageW(apartment_hwnd, DM_HOSTOBJECT, 0, (LPARAM)&params);
+    }
+    if (SUCCEEDED(hr))
+        hr = CoUnmarshalInterface(params.stream, riid, ppv);
+    IStream_Release(params.stream);
+    return hr;
+}
+
+static enum comclass_threadingmodel get_threading_model(const struct class_reg_data *data)
+{
+    if (data->origin == CLASS_REG_REGISTRY)
+    {
+        WCHAR threading_model[10 /* lstrlenW(L"apartment")+1 */];
+        DWORD dwLength = sizeof(threading_model);
+        DWORD keytype;
+        DWORD ret;
+
+        ret = RegQueryValueExW(data->u.hkey, L"ThreadingModel", NULL, &keytype, (BYTE*)threading_model, &dwLength);
+        if ((ret != ERROR_SUCCESS) || (keytype != REG_SZ))
+            threading_model[0] = '\0';
+
+        if (!wcsicmp(threading_model, L"Apartment")) return ThreadingModel_Apartment;
+        if (!wcsicmp(threading_model, L"Free")) return ThreadingModel_Free;
+        if (!wcsicmp(threading_model, L"Both")) return ThreadingModel_Both;
+
+        /* there's not specific handling for this case */
+        if (threading_model[0]) return ThreadingModel_Neutral;
+        return ThreadingModel_No;
+    }
+    else
+        return data->u.actctx.threading_model;
+}
+
+HRESULT apartment_get_inproc_class_object(struct apartment *apt, const struct class_reg_data *regdata,
+        REFCLSID rclsid, REFIID riid, DWORD class_context, void **ppv)
+{
+    WCHAR dllpath[MAX_PATH+1];
+    BOOL apartment_threaded;
+
+    if (!(class_context & CLSCTX_PS_DLL))
+    {
+        enum comclass_threadingmodel model = get_threading_model(regdata);
+
+        if (model == ThreadingModel_Apartment)
+        {
+            apartment_threaded = TRUE;
+            if (apt->multi_threaded)
+                return apartment_hostobject_in_hostapt(apt, FALSE, FALSE, regdata, rclsid, riid, ppv);
+        }
+        else if (model == ThreadingModel_Free)
+        {
+            apartment_threaded = FALSE;
+            if (!apt->multi_threaded)
+                return apartment_hostobject_in_hostapt(apt, TRUE, FALSE, regdata, rclsid, riid, ppv);
+        }
+        /* everything except "Apartment", "Free" and "Both" */
+        else if (model != ThreadingModel_Both)
+        {
+            apartment_threaded = TRUE;
+            /* everything else is main-threaded */
+            if (model != ThreadingModel_No)
+                FIXME("unrecognised threading model %d for object %s, should be main-threaded?\n", model, debugstr_guid(rclsid));
+
+            if (apt->multi_threaded || !apt->main)
+                return apartment_hostobject_in_hostapt(apt, FALSE, TRUE, regdata, rclsid, riid, ppv);
+        }
+        else
+            apartment_threaded = FALSE;
+    }
+    else
+        apartment_threaded = !apt->multi_threaded;
+
+    if (!get_object_dll_path(regdata, dllpath, ARRAY_SIZE(dllpath)))
+    {
+        /* failure: CLSID is not found in registry */
+        WARN("class %s not registered inproc\n", debugstr_guid(rclsid));
+        return REGDB_E_CLASSNOTREG;
+    }
+
+    return apartment_getclassobject(apt, dllpath, apartment_threaded, rclsid, riid, ppv);
+}
+
+static HRESULT apartment_hostobject(struct apartment *apt, const struct host_object_params *params)
+{
+    static const LARGE_INTEGER llZero;
+    WCHAR dllpath[MAX_PATH+1];
+    IUnknown *object;
+    HRESULT hr;
+
+    TRACE("clsid %s, iid %s\n", debugstr_guid(&params->clsid), debugstr_guid(&params->iid));
+
+    if (!get_object_dll_path(&params->regdata, dllpath, ARRAY_SIZE(dllpath)))
+    {
+        /* failure: CLSID is not found in registry */
+        WARN("class %s not registered inproc\n", debugstr_guid(&params->clsid));
+        return REGDB_E_CLASSNOTREG;
+    }
+
+    hr = apartment_getclassobject(apt, dllpath, params->apartment_threaded, &params->clsid, &params->iid, (void **)&object);
+    if (FAILED(hr))
+        return hr;
+
+    hr = CoMarshalInterface(params->stream, &params->iid, object, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL);
+    if (FAILED(hr))
+        IUnknown_Release(object);
+    IStream_Seek(params->stream, llZero, STREAM_SEEK_SET, NULL);
+
+    return hr;
+}
+
+struct dispatch_params;
+
+static LRESULT CALLBACK apartment_wndproc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
+{
+    switch (msg)
+    {
+    case DM_EXECUTERPC:
+        rpc_execute_call((struct dispatch_params *)lParam);
+        return 0;
+    case DM_HOSTOBJECT:
+        return apartment_hostobject(com_get_current_apt(), (const struct host_object_params *)lParam);
+    default:
+        return DefWindowProcW(hWnd, msg, wParam, lParam);
+    }
+}
+
+static BOOL apartment_is_model(const struct apartment *apt, DWORD model)
+{
+    return (apt->multi_threaded == !(model & COINIT_APARTMENTTHREADED));
+}
+
+HRESULT enter_apartment(struct tlsdata *data, DWORD model)
+{
+    HRESULT hr = S_OK;
+
+    if (!data->apt)
+    {
+        if (!apartment_get_or_create(model))
+            return E_OUTOFMEMORY;
+    }
+    else if (!apartment_is_model(data->apt, model))
+    {
+        WARN("Attempt to change threading model of this apartment from %s to %s\n",
+              data->apt->multi_threaded ? "multi-threaded" : "apartment threaded",
+              model & COINIT_APARTMENTTHREADED ? "apartment threaded" : "multi-threaded" );
+        return RPC_E_CHANGED_MODE;
+    }
+    else
+        hr = S_FALSE;
+
+    data->inits++;
+
+    return hr;
+}
+
+void leave_apartment(struct tlsdata *data)
+{
+    if (!--data->inits)
+    {
+        if (data->ole_inits)
+            WARN( "Uninitializing apartment while Ole is still initialized\n" );
+        apartment_release(data->apt);
+        data->apt = NULL;
+        data->flags &= ~(OLETLS_DISABLE_OLE1DDE | OLETLS_APARTMENTTHREADED | OLETLS_MULTITHREADED);
+    }
+}
+
+struct mta_cookie
+{
+    struct list entry;
+};
+
+HRESULT apartment_increment_mta_usage(CO_MTA_USAGE_COOKIE *cookie)
+{
+    struct mta_cookie *mta_cookie;
+
+    *cookie = NULL;
+
+    if (!(mta_cookie = heap_alloc(sizeof(*mta_cookie))))
+        return E_OUTOFMEMORY;
+
+    EnterCriticalSection(&apt_cs);
+
+    if (mta)
+        apartment_addref(mta);
+    else
+        mta = apartment_construct(COINIT_MULTITHREADED);
+    list_add_head(&mta->usage_cookies, &mta_cookie->entry);
+
+    LeaveCriticalSection(&apt_cs);
+
+    *cookie = (CO_MTA_USAGE_COOKIE)mta_cookie;
+
+    return S_OK;
+}
+
+void apartment_decrement_mta_usage(CO_MTA_USAGE_COOKIE cookie)
+{
+    struct mta_cookie *mta_cookie = (struct mta_cookie *)cookie;
+
+    EnterCriticalSection(&apt_cs);
+
+    if (mta)
+    {
+        struct mta_cookie *cur;
+
+        LIST_FOR_EACH_ENTRY(cur, &mta->usage_cookies, struct mta_cookie, entry)
+        {
+            if (mta_cookie == cur)
+            {
+                list_remove(&cur->entry);
+                heap_free(cur);
+                apartment_release(mta);
+                break;
+            }
+        }
+    }
+
+    LeaveCriticalSection(&apt_cs);
+}
+
+static const WCHAR aptwinclassW[] = L"OleMainThreadWndClass";
+static ATOM apt_win_class;
+
+static BOOL WINAPI register_class( INIT_ONCE *once, void *param, void **context )
+{
+    WNDCLASSW wclass;
+
+    /* Dispatching to the correct thread in an apartment is done through
+     * window messages rather than RPC transports. When an interface is
+     * marshalled into another apartment in the same process, a window of the
+     * following class is created. The *caller* of CoMarshalInterface (i.e., the
+     * application) is responsible for pumping the message loop in that thread.
+     * The WM_USER messages which point to the RPCs are then dispatched to
+     * apartment_wndproc by the user's code from the apartment in which the
+     * interface was unmarshalled.
+     */
+    memset(&wclass, 0, sizeof(wclass));
+    wclass.lpfnWndProc = apartment_wndproc;
+    wclass.hInstance = hProxyDll;
+    wclass.lpszClassName = aptwinclassW;
+    apt_win_class = RegisterClassW(&wclass);
+    return TRUE;
+}
+
+/* create a window for the apartment or return the current one if one has
+ * already been created */
+HRESULT apartment_createwindowifneeded(struct apartment *apt)
+{
+    static INIT_ONCE class_init_once = INIT_ONCE_STATIC_INIT;
+
+    if (apt->multi_threaded)
+        return S_OK;
+
+    if (!apt->win)
+    {
+        HWND hwnd;
+
+        InitOnceExecuteOnce( &class_init_once, register_class, NULL, NULL );
+
+        hwnd = CreateWindowW(aptwinclassW, NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, 0, hProxyDll, NULL);
+        if (!hwnd)
+        {
+            ERR("CreateWindow failed with error %d\n", GetLastError());
+            return HRESULT_FROM_WIN32(GetLastError());
+        }
+        if (InterlockedCompareExchangePointer((void **)&apt->win, hwnd, NULL))
+            /* someone beat us to it */
+            DestroyWindow(hwnd);
+    }
+
+    return S_OK;
+}
+
+/* retrieves the window for the main- or apartment-threaded apartment */
+HWND apartment_getwindow(const struct apartment *apt)
+{
+    assert(!apt->multi_threaded);
+    return apt->win;
+}
+
+OXID apartment_getoxid(const struct apartment *apt)
+{
+    return apt->oxid;
+}
+
+void apartment_global_cleanup(void)
+{
+    if (apt_win_class)
+        UnregisterClassW((const WCHAR *)MAKEINTATOM(apt_win_class), hProxyDll);
+    apartment_release_dlls();
+    DeleteCriticalSection(&apt_cs);
+}
diff --git a/wrappers/new-dlls/combase/combase.c b/wrappers/new-dlls/combase_/combase.c
similarity index 100%
rename from wrappers/new-dlls/combase/combase.c
rename to wrappers/new-dlls/combase_/combase.c
diff --git a/wrappers/new-dlls/combase/combase.rc b/wrappers/new-dlls/combase_/combase.rc
similarity index 100%
rename from wrappers/new-dlls/combase/combase.rc
rename to wrappers/new-dlls/combase_/combase.rc
diff --git a/wrappers/new-dlls/combase_/combase.spec b/wrappers/new-dlls/combase_/combase.spec
new file mode 100644
index 0000000000..0437714edc
--- /dev/null
+++ b/wrappers/new-dlls/combase_/combase.spec
@@ -0,0 +1,353 @@
+@ stub ObjectStublessClient3
+@ stub ObjectStublessClient4
+@ stub ObjectStublessClient5
+@ stub ObjectStublessClient6
+@ stub ObjectStublessClient7
+@ stub ObjectStublessClient8
+@ stub ObjectStublessClient9
+@ stub ObjectStublessClient10
+@ stub ObjectStublessClient11
+@ stub ObjectStublessClient12
+@ stub ObjectStublessClient13
+@ stub ObjectStublessClient14
+@ stub ObjectStublessClient15
+@ stub ObjectStublessClient16
+@ stub ObjectStublessClient17
+@ stub ObjectStublessClient18
+@ stub ObjectStublessClient19
+@ stub ObjectStublessClient20
+@ stub ObjectStublessClient21
+@ stub ObjectStublessClient22
+@ stub ObjectStublessClient23
+@ stub ObjectStublessClient24
+@ stub ObjectStublessClient25
+@ stub ObjectStublessClient26
+@ stub ObjectStublessClient27
+@ stub ObjectStublessClient28
+@ stub ObjectStublessClient29
+@ stub ObjectStublessClient30
+@ stub ObjectStublessClient31
+@ stub ObjectStublessClient32
+@ stub NdrProxyForwardingFunction3
+@ stub NdrProxyForwardingFunction4
+@ stub NdrProxyForwardingFunction5
+@ stub NdrProxyForwardingFunction6
+@ stub NdrProxyForwardingFunction7
+@ stub NdrProxyForwardingFunction8
+@ stub NdrProxyForwardingFunction9
+@ stub NdrProxyForwardingFunction10
+@ stub NdrProxyForwardingFunction11
+@ stub NdrProxyForwardingFunction12
+@ stub NdrProxyForwardingFunction13
+@ stub NdrProxyForwardingFunction14
+@ stub NdrProxyForwardingFunction15
+@ stub NdrProxyForwardingFunction16
+@ stub NdrProxyForwardingFunction17
+@ stub NdrProxyForwardingFunction18
+@ stub NdrProxyForwardingFunction19
+@ stub NdrProxyForwardingFunction20
+@ stub NdrProxyForwardingFunction21
+@ stub NdrProxyForwardingFunction22
+@ stub NdrProxyForwardingFunction23
+@ stub NdrProxyForwardingFunction24
+@ stub NdrProxyForwardingFunction25
+@ stub NdrProxyForwardingFunction26
+@ stub NdrProxyForwardingFunction27
+@ stub NdrProxyForwardingFunction28
+@ stub NdrProxyForwardingFunction29
+@ stub NdrProxyForwardingFunction30
+@ stub NdrProxyForwardingFunction31
+@ stub NdrProxyForwardingFunction32
+@ stub NdrOleInitializeExtension
+@ stub RoFailFastWithErrorContextInternal2
+@ stub RoFailFastWithErrorContextInternal
+@ stub UpdateProcessTracing
+@ stdcall CLIPFORMAT_UserFree(ptr ptr)
+@ stdcall CLIPFORMAT_UserMarshal(ptr ptr ptr)
+@ stdcall CLIPFORMAT_UserSize(ptr long ptr)
+@ stdcall CLIPFORMAT_UserUnmarshal(ptr ptr ptr)
+@ stub CLSIDFromOle1Class
+@ stdcall CLSIDFromProgID(wstr ptr)
+@ stdcall CLSIDFromProgIDEx(wstr ptr)
+@ stdcall CLSIDFromString(wstr ptr)
+@ stub CleanupOleStateInAllTls
+@ stdcall CleanupTlsOleState(ptr)
+@ stub ClearCleanupFlag
+@ stdcall CoAddRefServerProcess()
+@ stub CoAllowUnmarshalerCLSID
+@ stub CoCancelCall
+@ stdcall CoCopyProxy(ptr ptr)
+@ stdcall CoCreateErrorInfo(ptr) CreateErrorInfo
+@ stdcall CoCreateFreeThreadedMarshaler(ptr ptr)
+@ stdcall CoCreateGuid(ptr)
+@ stdcall CoCreateInstance(ptr ptr long ptr ptr)
+@ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr)
+@ stdcall CoCreateInstanceFromApp(ptr ptr long ptr long ptr)
+@ stub CoCreateObjectInContext
+@ stub CoDeactivateObject
+@ stub CoDecodeProxy
+@ stdcall CoDecrementMTAUsage(ptr)
+@ stdcall CoDisableCallCancellation(ptr)
+@ stub CoDisconnectContext
+@ stdcall CoDisconnectObject(ptr long)
+@ stdcall CoEnableCallCancellation(ptr)
+@ stdcall CoFileTimeNow(ptr)
+@ stdcall CoFreeUnusedLibraries()
+@ stdcall CoFreeUnusedLibrariesEx(long long)
+@ stdcall CoGetActivationState(int128 long ptr)
+@ stub CoGetApartmentID
+@ stdcall CoGetApartmentType(ptr ptr)
+@ stdcall CoGetCallContext(ptr ptr)
+@ stdcall CoGetCallState(long ptr)
+@ stdcall CoGetCallerTID(ptr)
+@ stub CoGetCancelObject
+@ stdcall CoGetClassObject(ptr long ptr ptr ptr)
+@ stub CoGetClassVersion
+@ stdcall CoGetContextToken(ptr)
+@ stdcall CoGetCurrentLogicalThreadId(ptr)
+@ stdcall CoGetCurrentProcess()
+@ stdcall CoGetDefaultContext(long ptr ptr)
+@ stdcall CoGetErrorInfo(long ptr) GetErrorInfo
+@ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr)
+@ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr)
+@ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr)
+@ stdcall CoGetMalloc(long ptr)
+@ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long)
+@ stub CoGetModuleType
+@ stdcall CoGetObjectContext(ptr ptr)
+@ stdcall CoGetPSClsid(ptr ptr)
+@ stub CoGetProcessIdentifier
+@ stdcall CoGetStandardMarshal(ptr ptr long ptr long ptr)
+@ stub CoGetStdMarshalEx
+@ stub CoGetSystemSecurityPermissions
+@ stdcall CoGetTreatAsClass(ptr ptr)
+@ stdcall CoImpersonateClient()
+@ stdcall CoIncrementMTAUsage(ptr)
+@ stdcall CoInitializeEx(ptr long)
+@ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr)
+@ stdcall CoInitializeWOW(long long)
+@ stub CoInvalidateRemoteMachineBindings
+@ stdcall CoIsHandlerConnected(ptr)
+@ stdcall CoLockObjectExternal(ptr long long)
+@ stdcall CoMarshalHresult(ptr long)
+@ stdcall CoMarshalInterThreadInterfaceInStream(ptr ptr ptr)
+@ stdcall CoMarshalInterface(ptr ptr ptr long ptr long)
+@ stub CoPopServiceDomain
+@ stub CoPushServiceDomain
+@ stub CoQueryAuthenticationServices
+@ stdcall CoQueryClientBlanket(ptr ptr ptr ptr ptr ptr ptr)
+@ stdcall CoQueryProxyBlanket(ptr ptr ptr ptr ptr ptr ptr ptr)
+@ stub CoReactivateObject
+@ stub CoRegisterActivationFilter
+@ stdcall CoRegisterChannelHook(ptr ptr)
+@ stdcall CoRegisterClassObject(ptr ptr long long ptr)
+@ stdcall CoRegisterInitializeSpy(ptr ptr)
+@ stdcall CoRegisterMallocSpy(ptr)
+@ stdcall CoRegisterMessageFilter(ptr ptr)
+@ stdcall CoRegisterPSClsid(ptr ptr)
+@ stdcall CoRegisterSurrogate(ptr)
+@ stdcall CoRegisterSurrogateEx(ptr ptr)
+@ stdcall CoReleaseMarshalData(ptr)
+@ stdcall CoReleaseServerProcess()
+@ stdcall CoResumeClassObjects()
+@ stub CoRetireServer
+@ stdcall CoRevertToSelf()
+@ stdcall CoRevokeClassObject(long)
+@ stdcall CoRevokeInitializeSpy(int64)
+@ stdcall CoRevokeMallocSpy()
+@ stub CoSetCancelObject
+@ stdcall CoSetErrorInfo(long ptr) SetErrorInfo
+@ stdcall CoSetProxyBlanket(ptr long long ptr long long ptr long)
+@ stdcall CoSuspendClassObjects()
+@ stdcall CoSwitchCallContext(ptr ptr)
+@ stdcall CoTaskMemAlloc(long)
+@ stdcall CoTaskMemFree(ptr)
+@ stdcall CoTaskMemRealloc(ptr long)
+@ stub CoTestCancel
+@ stdcall CoUninitialize()
+@ stub CoUnloadingWOW
+@ stdcall CoUnmarshalHresult(ptr ptr)
+@ stdcall CoUnmarshalInterface(ptr ptr ptr)
+@ stub CoVrfCheckThreadState
+@ stub CoVrfGetThreadState
+@ stub CoVrfReleaseThreadState
+@ stdcall CoWaitForMultipleHandles(long long long ptr ptr)
+@ stub CoWaitForMultipleObjects
+@ stdcall CreateErrorInfo(ptr)
+@ stdcall CreateStreamOnHGlobal(ptr long ptr)
+@ stub DcomChannelSetHResult
+@ stdcall DllDebugObjectRPCHook(long ptr)
+@ stdcall DllGetActivationFactory(ptr ptr)
+@ stdcall -private DllGetClassObject(ptr ptr ptr)
+@ stub EnableHookObject
+@ stdcall FreePropVariantArray(long ptr)
+@ stub FreePropVariantArrayWorker
+@ stub GetCatalogHelper
+@ stdcall GetErrorInfo(long ptr)
+@ stub GetFuncDescs
+@ stdcall GetHGlobalFromStream(ptr ptr)
+@ stub GetHookInterface
+@ stdcall GetRestrictedErrorInfo(ptr)
+@ stdcall HACCEL_UserFree(ptr ptr)
+@ stdcall HACCEL_UserMarshal(ptr ptr ptr)
+@ stdcall HACCEL_UserSize(ptr long ptr)
+@ stdcall HACCEL_UserUnmarshal(ptr ptr ptr)
+@ stdcall HBITMAP_UserFree(ptr ptr)
+@ stdcall HBITMAP_UserMarshal(ptr ptr ptr)
+@ stdcall HBITMAP_UserSize(ptr long ptr)
+@ stdcall HBITMAP_UserUnmarshal(ptr ptr ptr)
+@ stdcall HBRUSH_UserFree(ptr ptr)
+@ stdcall HBRUSH_UserMarshal(ptr ptr ptr)
+@ stdcall HBRUSH_UserSize(ptr long ptr)
+@ stdcall HBRUSH_UserUnmarshal(ptr ptr ptr)
+@ stdcall HDC_UserFree(ptr ptr)
+@ stdcall HDC_UserMarshal(ptr ptr ptr)
+@ stdcall HDC_UserSize(ptr long ptr)
+@ stdcall HDC_UserUnmarshal(ptr ptr ptr)
+@ stdcall HGLOBAL_UserFree(ptr ptr)
+@ stdcall HGLOBAL_UserMarshal(ptr ptr ptr)
+@ stdcall HGLOBAL_UserSize(ptr long ptr)
+@ stdcall HGLOBAL_UserUnmarshal(ptr ptr ptr)
+@ stdcall HICON_UserFree(ptr ptr)
+@ stdcall HICON_UserMarshal(ptr ptr ptr)
+@ stdcall HICON_UserSize(ptr long ptr)
+@ stdcall HICON_UserUnmarshal(ptr ptr ptr)
+@ stdcall HMENU_UserFree(ptr ptr)
+@ stdcall HMENU_UserMarshal(ptr ptr ptr)
+@ stdcall HMENU_UserSize(ptr long ptr)
+@ stdcall HMENU_UserUnmarshal(ptr ptr ptr)
+@ stdcall HPALETTE_UserFree(ptr ptr)
+@ stdcall HPALETTE_UserMarshal(ptr ptr ptr)
+@ stdcall HPALETTE_UserSize(ptr long ptr)
+@ stdcall HPALETTE_UserUnmarshal(ptr ptr ptr)
+@ stub HSTRING_UserFree
+@ stub -arch=win64 HSTRING_UserFree64
+@ stub HSTRING_UserMarshal
+@ stub -arch=win64 HSTRING_UserMarshal64
+@ stub HSTRING_UserSize
+@ stub -arch=win64 HSTRING_UserSize64
+@ stub HSTRING_UserUnmarshal
+@ stub -arch=win64 HSTRING_UserUnmarshal64
+@ stdcall HWND_UserFree(ptr ptr)
+@ stdcall HWND_UserMarshal(ptr ptr ptr)
+@ stdcall HWND_UserSize(ptr long ptr)
+@ stdcall HWND_UserUnmarshal(ptr ptr ptr)
+@ stub HkOleRegisterObject
+@ stdcall IIDFromString(wstr ptr)
+@ stub InternalAppInvokeExceptionFilter
+@ stub InternalCCFreeUnused
+@ stub InternalCCGetClassInformationForDde
+@ stub InternalCCGetClassInformationFromKey
+@ stub InternalCCSetDdeServerWindow
+@ stub InternalCMLSendReceive
+@ stub InternalCallAsProxyExceptionFilter
+@ stub InternalCallFrameExceptionFilter
+@ stub InternalCallerIsAppContainer
+@ stub InternalCanMakeOutCall
+@ stub InternalCoIsSurrogateProcess
+@ stub InternalCoRegisterDisconnectCallback
+@ stub InternalCoRegisterSurrogatedObject
+@ stdcall InternalCoStdMarshalObject(ptr long ptr ptr)
+@ stub InternalCoUnregisterDisconnectCallback
+@ stub InternalCompleteObjRef
+@ stub InternalCreateCAggId
+@ stub InternalCreateIdentityHandler
+@ stub InternalDoATClassCreate
+@ stub InternalFillLocalOXIDInfo
+@ stub InternalFreeObjRef
+@ stub InternalGetWindowPropInterface
+@ stdcall InternalIrotEnumRunning(ptr)
+@ stdcall InternalIrotGetObject(ptr ptr ptr)
+@ stdcall InternalIrotGetTimeOfLastChange(ptr ptr)
+@ stdcall InternalIrotIsRunning(ptr)
+@ stdcall InternalIrotNoteChangeTime(long ptr)
+@ stdcall InternalIrotRegister(ptr ptr ptr ptr long ptr ptr)
+@ stdcall InternalIrotRevoke(long ptr ptr ptr)
+@ stub InternalIsApartmentInitialized
+@ stdcall InternalIsProcessInitialized()
+@ stub InternalMarshalObjRef
+@ stub InternalNotifyDDStartOrStop
+@ stub InternalOleModalLoopBlockFn
+@ stub InternalRegisterWindowPropInterface
+@ stub InternalReleaseMarshalObjRef
+@ stub InternalSTAInvoke
+@ stub InternalServerExceptionFilter
+@ stub InternalSetAptCallCtrlOnTlsIfRequired
+@ stub InternalSetOleThunkWowPtr
+@ stub InternalStubInvoke
+@ stdcall InternalTlsAllocData(ptr)
+@ stub InternalUnmarshalObjRef
+@ stub IsErrorPropagationEnabled
+@ stub NdrExtStubInitialize
+@ stub NdrOleDllGetClassObject
+@ stub NdrpFindInterface
+@ stdcall ProgIDFromCLSID(ptr ptr)
+@ stdcall PropVariantClear(ptr)
+@ stdcall PropVariantCopy(ptr ptr)
+@ stub ReleaseFuncDescs
+@ stdcall RoActivateInstance(ptr ptr)
+@ stub RoCaptureErrorContext
+@ stub RoClearError
+@ stub RoFailFastWithErrorContext
+@ stub RoFreeParameterizedTypeExtra
+@ stub RoGetActivatableClassRegistration
+@ stdcall RoGetActivationFactory(ptr ptr ptr)
+@ stub RoGetAgileReference
+@ stdcall RoGetApartmentIdentifier(ptr)
+@ stub RoGetErrorReportingFlags
+@ stub RoGetMatchingRestrictedErrorInfo
+@ stdcall RoGetParameterizedTypeInstanceIID(long ptr ptr ptr ptr)
+@ stdcall RoGetServerActivatableClasses(ptr ptr ptr)
+@ stdcall RoInitialize(long)
+@ stub RoInspectCapturedStackBackTrace
+@ stub RoInspectThreadErrorInfo
+@ stub RoOriginateError
+@ stub RoOriginateErrorW
+@ stdcall RoOriginateLanguageException(long ptr ptr)
+@ stub RoParameterizedTypeExtraGetTypeSignature
+@ stdcall RoRegisterActivationFactories(ptr ptr long ptr)
+@ stdcall RoRegisterForApartmentShutdown(ptr ptr ptr)
+@ stub RoReportCapabilityCheckFailure
+@ stub RoReportFailedDelegate
+@ stub RoReportUnhandledError
+@ stub RoResolveRestrictedErrorInfoReference
+@ stub RoRevokeActivationFactories
+@ stub RoSetErrorReportingFlags
+@ stub RoTransformError
+@ stub RoTransformErrorW
+@ stdcall RoUninitialize()
+@ stub RoUnregisterForApartmentShutdown
+@ stub SetCleanupFlag
+@ stdcall SetErrorInfo(long ptr)
+@ stub SetRestrictedErrorInfo
+@ stdcall StringFromCLSID(ptr ptr)
+@ stdcall StringFromGUID2(ptr ptr long)
+@ stdcall StringFromIID(ptr ptr) StringFromCLSID
+@ stub UpdateDCOMSettings
+@ stdcall WdtpInterfacePointer_UserFree(ptr)
+@ stub -arch=win64 WdtpInterfacePointer_UserFree64
+@ stdcall WdtpInterfacePointer_UserMarshal(ptr long ptr ptr ptr)
+@ stub -arch=win64 WdtpInterfacePointer_UserMarshal64
+@ stdcall WdtpInterfacePointer_UserSize(ptr long long ptr ptr)
+@ stub -arch=win64 WdtpInterfacePointer_UserSize64
+@ stdcall WdtpInterfacePointer_UserUnmarshal(ptr ptr ptr ptr)
+@ stub -arch=win64 WdtpInterfacePointer_UserUnmarshal64
+@ stdcall WindowsCompareStringOrdinal(ptr ptr ptr)
+@ stdcall WindowsConcatString(ptr ptr ptr)
+@ stdcall WindowsCreateString(wstr long ptr)
+@ stdcall WindowsCreateStringReference(wstr long ptr ptr)
+@ stdcall WindowsDeleteString(ptr)
+@ stdcall WindowsDeleteStringBuffer(ptr)
+@ stdcall WindowsDuplicateString(ptr ptr)
+@ stdcall WindowsGetStringLen(ptr)
+@ stdcall WindowsGetStringRawBuffer(ptr ptr)
+@ stub WindowsInspectString
+@ stdcall WindowsIsStringEmpty(ptr)
+@ stdcall WindowsPreallocateStringBuffer(long ptr ptr)
+@ stdcall WindowsPromoteStringBuffer(ptr ptr)
+@ stub WindowsReplaceString
+@ stdcall WindowsStringHasEmbeddedNull(ptr ptr)
+@ stdcall WindowsSubstring(ptr long ptr)
+@ stdcall WindowsSubstringWithSpecifiedLength(ptr long long ptr)
+@ stdcall WindowsTrimStringEnd(ptr ptr ptr)
+@ stdcall WindowsTrimStringStart(ptr ptr ptr)
diff --git a/wrappers/new-dlls/combase/combase_private.h b/wrappers/new-dlls/combase_/combase_private.h
similarity index 100%
rename from wrappers/new-dlls/combase/combase_private.h
rename to wrappers/new-dlls/combase_/combase_private.h
diff --git a/wrappers/new-dlls/combase_/dcom.idl b/wrappers/new-dlls/combase_/dcom.idl
new file mode 100644
index 0000000000..c3d090a9cb
--- /dev/null
+++ b/wrappers/new-dlls/combase_/dcom.idl
@@ -0,0 +1,306 @@
+/*
+ * Copyright 2003 Ove Kåven, TransGaming Technologies
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+/* see the official DCOM specification
+ * (there's a copy at http://www.grimes.demon.co.uk/DCOM/DCOMSpec.htm) */
+
+#pragma makedep proxy
+#pragma makedep register
+
+import "unknwn.idl";
+
+[
+    threading(both),
+    uuid(00000320-0000-0000-c000-000000000046)
+]
+coclass PSFactoryBuffer { interface IFactoryBuffer; }
+
+[
+  uuid(99fcfe60-5260-101b-bbcb-00aa0021347a),
+  pointer_default(unique)
+]
+interface ObjectRpcBaseTypes
+{
+  typedef unsigned hyper ID;
+  typedef ID MID;
+  typedef ID OXID;
+  typedef ID OID;
+  typedef ID SETID;
+  typedef GUID IPID;
+  typedef GUID CID;
+  typedef REFGUID REFIPID;
+
+  const unsigned short COM_MINOR_VERSION_1 = 1;
+  const unsigned short COM_MINOR_VERSION_2 = 2;
+
+  const unsigned short COM_MAJOR_VERSION = 5;
+  const unsigned short COM_MINOR_VERSION = 3;
+
+  typedef struct tagCOMVERSION {
+    unsigned short MajorVersion;
+    unsigned short MinorVersion;
+  } COMVERSION;
+
+  const unsigned long ORPCF_NULL = 0;
+  const unsigned long ORPCF_LOCAL = 1;
+  const unsigned long ORPCF_RESERVED1 = 2;
+  const unsigned long ORPCF_RESERVED2 = 4;
+  const unsigned long ORPCF_RESERVED3 = 8;
+  const unsigned long ORPCF_RESERVED4 = 16;
+
+  typedef struct tagORPC_EXTENT {
+    GUID id;
+    unsigned long size;
+    [size_is((size+7)&~7)] byte data[];
+  } ORPC_EXTENT;
+
+  typedef struct tagORPC_EXTENT_ARRAY {
+    unsigned long size;
+    unsigned long reserved;
+    [size_is((size+1)&~1,), unique] ORPC_EXTENT **extent;
+  } ORPC_EXTENT_ARRAY;
+
+  typedef struct tagORPCTHIS {
+    COMVERSION version;
+    unsigned long flags;
+    unsigned long reserved1;
+    CID cid;
+    [unique] ORPC_EXTENT_ARRAY *extensions;
+  } ORPCTHIS;
+
+  typedef struct tagORPCTHAT {
+    unsigned long flags;
+    [unique] ORPC_EXTENT_ARRAY *extensions;
+  } ORPCTHAT;
+
+  const unsigned short NCADG_IP_UDP = 0x08;
+  const unsigned short NCACN_IP_TCP = 0x07;
+  const unsigned short NCADG_IPX = 0x0E;
+  const unsigned short NCACN_SPX = 0x0C;
+  const unsigned short NCACN_NB_NB = 0x12;
+  const unsigned short NCACN_NB_IPX = 0x0D;
+  const unsigned short NCACN_DNET_NSP = 0x04;
+  const unsigned short NCACN_HTTP = 0x1F;
+
+  typedef struct tagSTRINGBINDING {
+    unsigned short wTowerId;
+    [string] WCHAR aNetworkAddr[];
+  } STRINGBINDING;
+
+  const unsigned short COM_C_AUTHZ_NONE = 0xffff;
+
+  typedef struct tagSECURITYBINDING {
+    unsigned short wAuthnSvc;
+    unsigned short wAuthzSvc;
+    [string] WCHAR aPrincName[];
+  } SECURITYBINDING;
+
+  typedef struct tagDUALSTRINGARRAY {
+    unsigned short wNumEntries;
+    unsigned short wSecurityOffset;
+    [size_is(wNumEntries)] unsigned short aStringArray[];
+  } DUALSTRINGARRAY;
+
+  typedef struct tagOXID_INFO {
+    DWORD dwTid;
+    DWORD dwPid;
+    IPID ipidRemUnknown;
+    DWORD dwAuthnHint;
+    DUALSTRINGARRAY *psa;
+  } OXID_INFO;
+
+  const unsigned long OBJREF_SIGNATURE = 0x574f454d; /* "MEOW" */
+  const unsigned long OBJREF_STANDARD = 0x1;
+  const unsigned long OBJREF_HANDLER = 0x2;
+  const unsigned long OBJREF_CUSTOM = 0x4;
+  const unsigned long SORF_OXRES1 = 0x1;
+  const unsigned long SORF_OXRES2 = 0x20;
+  const unsigned long SORF_OXRES3 = 0x40;
+  const unsigned long SORF_OXRES4 = 0x80;
+  const unsigned long SORF_OXRES5 = 0x100;
+  const unsigned long SORF_OXRES6 = 0x200;
+  const unsigned long SORF_OXRES7 = 0x400;
+  const unsigned long SORF_OXRES8 = 0x800;
+  const unsigned long SORF_NULL = 0x0;
+  const unsigned long SORF_NOPING = 0x1000;
+
+  typedef struct tagSTDOBJREF {
+    unsigned long flags;
+    unsigned long cPublicRefs;
+    OXID oxid;
+    OID oid;
+    IPID ipid;
+  } STDOBJREF;
+
+  typedef struct tagOBJREF {
+    unsigned long signature;
+    unsigned long flags;
+    GUID iid;
+    [switch_is(flags)] union {
+    [case(OBJREF_STANDARD)] struct OR_STANDARD {
+        STDOBJREF std;
+        DUALSTRINGARRAY saResAddr;
+      } u_standard;
+    [case(OBJREF_HANDLER)] struct OR_HANDLER {
+        STDOBJREF std;
+        CLSID clsid;
+        DUALSTRINGARRAY saResAddr;
+      } u_handler;
+    [case(OBJREF_CUSTOM)] struct OR_CUSTOM {
+        CLSID clsid;
+        unsigned long cbExtension;
+        ULONG size;
+        [size_is(size), ref] byte *pData;
+      } u_custom;
+    } u_objref;
+  } OBJREF;
+
+  typedef struct tagMInterfacePointer {
+    ULONG ulCntData;
+    [size_is(ulCntData)] BYTE abData[];
+  } MInterfacePointer;
+
+  typedef [unique] MInterfacePointer *PMInterfacePointer;
+
+} /* interface ObjectRpcBaseTypes */
+
+[
+  object,
+  uuid(00000131-0000-0000-C000-000000000046)
+]
+interface IRemUnknown : IUnknown
+{
+  typedef [unique] IRemUnknown *LPREMUNKNOWN;
+
+  typedef struct tagREMQIRESULT {
+    HRESULT hResult;
+    STDOBJREF std;
+  } REMQIRESULT;
+
+  typedef struct tagREMINTERFACEREF {
+    IPID ipid;
+    unsigned long cPublicRefs;
+    unsigned long cPrivateRefs;
+  } REMINTERFACEREF; 
+
+  HRESULT RemQueryInterface(
+    [in] REFIPID ripid,
+    [in] ULONG cRefs,
+    [in] unsigned short cIids,
+    [in, size_is(cIids)] IID *iids,
+    [out, size_is(,cIids)] REMQIRESULT **ppQIResults);
+
+  HRESULT RemAddRef(
+    [in] unsigned short cInterfaceRefs,
+    [in, size_is(cInterfaceRefs)] REMINTERFACEREF* InterfaceRefs,
+    [out, size_is(cInterfaceRefs)] HRESULT *pResults);
+
+  HRESULT RemRelease(
+    [in] unsigned short cInterfaceRefs,
+    [in, size_is(cInterfaceRefs)] REMINTERFACEREF* InterfaceRefs);
+}
+
+[
+  object,
+  uuid(00000142-0000-0000-C000-000000000046)
+]
+interface IRemUnknown2 : IRemUnknown
+{
+  typedef [unique] IRemUnknown2 *LPREMUNKNOWN2;
+
+  HRESULT RemQueryInterface2(
+    [in] REFIPID ripid,
+    [in] unsigned short cIids,
+    [in, size_is(cIids)] IID *iids,
+    [out, size_is(cIids)] HRESULT *phr,
+    [out, size_is(cIids)] MInterfacePointer **ppMIF);
+}
+
+[
+  uuid(99fcfec4-5260-101b-bbcb-00aa0021347a),
+  pointer_default(unique)
+]
+interface IOXIDResolver
+{
+  [idempotent] error_status_t ResolveOxid(
+    [in] handle_t hRpc,
+    [in] OXID *pOxid,
+    [in] unsigned short cRequestedProtseqs,
+    [in, ref, size_is(cRequestedProtseqs)] unsigned short arRequestedProtseqs[],
+    [out, ref] DUALSTRINGARRAY **ppdsaOxidBindings,
+    [out, ref] IPID *pipidRemUnknown,
+    [out, ref] DWORD *pAuthnHint);
+
+  [idempotent] error_status_t SimplePing(
+    [in] handle_t hRpc,
+    [in] SETID *pSetId);
+
+  [idempotent] error_status_t ComplexPing(
+    [in] handle_t hRpc,
+    [in, out] SETID *pSetId,
+    [in] unsigned short SequenceNum,
+    [in] unsigned short cAddToSet,
+    [in] unsigned short cDelFromSet,
+    [in, unique, size_is(cAddToSet)] OID AddToSet[],
+    [in, unique, size_is(cDelFromSet)] OID DelFromSet[],
+    [out] unsigned short *pPingBackoffFactor);
+
+  [idempotent] error_status_t ServerAlive(
+    [in] handle_t hRpc);
+
+  [idempotent] error_status_t ResolveOxid2(
+    [in] handle_t hRpc,
+    [in] OXID *pOxid,
+    [in] unsigned short cRequestedProtseqs,
+    [in, ref, size_is(cRequestedProtseqs)] unsigned short arRequestedProtseqs[],
+    [out, ref] DUALSTRINGARRAY **ppdsaOxidBindings,
+    [out, ref] IPID *pipidRemUnknown,
+    [out, ref] DWORD *pAuthnHint,
+    [out, ref] COMVERSION *pComVersion); 
+}
+
+[
+  uuid(4d9f4ab8-7d1c-11cf-861e-0020af6e7c57),
+  pointer_default(unique)
+]
+interface IRemoteActivation
+{
+  const unsigned long MODE_GET_CLASS_OBJECT = 0xffffffff;
+
+  HRESULT RemoteActivation(
+    [in] handle_t hRpc,
+    [in] ORPCTHIS *ORPCthis,
+    [out] ORPCTHAT *ORPCthat,
+    [in] GUID *Clsid,
+    [in, string, unique] WCHAR *pwszObjectName,
+    [in, unique] MInterfacePointer *pObjectStorage,
+    [in] DWORD ClientImpLevel,
+    [in] DWORD Mode,
+    [in] DWORD Interfaces,
+    [in, unique, size_is(Interfaces)] IID *pIIDs,
+    [in] unsigned short cRequestedProtseqs,
+    [in, size_is(cRequestedProtseqs)] unsigned short RequestedProtseqs[],
+    [out] OXID *pOxid,
+    [out] DUALSTRINGARRAY **ppdsaOxidBindings,
+    [out] IPID *pipidRemUnknown,
+    [out] DWORD *pAuthnHint,
+    [out] COMVERSION *pServerVersion,
+    [out] HRESULT *phr,
+    [out,size_is(Interfaces)] MInterfacePointer **ppInterfaceData,
+    [out,size_is(Interfaces)] HRESULT *pResults);
+}
diff --git a/wrappers/new-dlls/combase/errorinfo.c b/wrappers/new-dlls/combase_/errorinfo.c
similarity index 100%
rename from wrappers/new-dlls/combase/errorinfo.c
rename to wrappers/new-dlls/combase_/errorinfo.c
diff --git a/wrappers/new-dlls/combase/hglobalstream.c b/wrappers/new-dlls/combase_/hglobalstream.c
similarity index 100%
rename from wrappers/new-dlls/combase/hglobalstream.c
rename to wrappers/new-dlls/combase_/hglobalstream.c
diff --git a/wrappers/new-dlls/combase/irot.idl b/wrappers/new-dlls/combase_/irot.idl
similarity index 100%
rename from wrappers/new-dlls/combase/irot.idl
rename to wrappers/new-dlls/combase_/irot.idl
diff --git a/wrappers/new-dlls/combase/irpcss.idl b/wrappers/new-dlls/combase_/irpcss.idl
similarity index 100%
rename from wrappers/new-dlls/combase/irpcss.idl
rename to wrappers/new-dlls/combase_/irpcss.idl
diff --git a/wrappers/new-dlls/combase/malloc.c b/wrappers/new-dlls/combase_/malloc.c
similarity index 100%
rename from wrappers/new-dlls/combase/malloc.c
rename to wrappers/new-dlls/combase_/malloc.c
diff --git a/wrappers/new-dlls/combase_/marshal.c b/wrappers/new-dlls/combase_/marshal.c
new file mode 100644
index 0000000000..51b4ce2411
--- /dev/null
+++ b/wrappers/new-dlls/combase_/marshal.c
@@ -0,0 +1,2274 @@
+/*
+ *     Copyright 2002 Juergen Schmied
+ *     Copyright 2002 Marcus Meissner
+ *     Copyright 2004 Mike Hearn, for CodeWeavers
+ *     Copyright 2004 Rob Shearman, for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <assert.h>
+
+#define COBJMACROS
+#include "objbase.h"
+
+#include "dcom.h"
+#include "combase_private.h"
+
+#include "wine/debug.h"
+#include "wine/heap.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
+
+HRESULT WINAPI RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid,
+                                const OXID_INFO *oxid_info, const IID *iid,
+                                DWORD dest_context, void *dest_context_data,
+                                IRpcChannelBuffer **chan, struct apartment *apt);
+
+static HRESULT unmarshal_object(const STDOBJREF *stdobjref, struct apartment *apt,
+                                MSHCTX dest_context, void *dest_context_data,
+                                REFIID riid, const OXID_INFO *oxid_info,
+                                void **object);
+
+/* number of refs given out for normal marshaling */
+#define NORMALEXTREFS 5
+
+/* private flag indicating that the object was marshaled as table-weak */
+#define SORFP_TABLEWEAK SORF_OXRES1
+/* private flag indicating that the caller does not want to notify the stub
+ * when the proxy disconnects or is destroyed */
+#define SORFP_NOLIFETIMEMGMT SORF_OXRES2
+
+/* imported interface proxy */
+struct ifproxy
+{
+    struct list entry;       /* entry in proxy_manager list (CS parent->cs) */
+    struct proxy_manager *parent; /* owning proxy_manager (RO) */
+    void *iface;             /* interface pointer (RO) */
+    STDOBJREF stdobjref;     /* marshal data that represents this object (RO) */
+    IID iid;                 /* interface ID (RO) */
+    IRpcProxyBuffer *proxy;  /* interface proxy (RO) */
+    ULONG refs;              /* imported (public) references (LOCK) */
+    IRpcChannelBuffer *chan; /* channel to object (CS parent->cs) */
+};
+
+/* imported object / proxy manager */
+struct proxy_manager
+{
+    IMultiQI IMultiQI_iface;
+    IMarshal IMarshal_iface;
+    IClientSecurity IClientSecurity_iface;
+    struct apartment *parent; /* owning apartment (RO) */
+    struct list entry;        /* entry in apartment (CS parent->cs) */
+    OXID oxid;                /* object exported ID (RO) */
+    OXID_INFO oxid_info;      /* string binding, ipid of rem unknown and other information (RO) */
+    OID oid;                  /* object ID (RO) */
+    struct list interfaces;   /* imported interfaces (CS cs) */
+    LONG refs;                /* proxy reference count (LOCK) */
+    CRITICAL_SECTION cs;      /* thread safety for this object and children */
+    ULONG sorflags;           /* STDOBJREF flags (RO) */
+    IRemUnknown *remunk;      /* proxy to IRemUnknown used for lifecycle management (CS cs) */
+    HANDLE remoting_mutex;    /* mutex used for synchronizing access to IRemUnknown */
+    MSHCTX dest_context;      /* context used for activating optimisations (LOCK) */
+    void *dest_context_data;  /* reserved context value (LOCK) */
+};
+
+static inline struct proxy_manager *impl_from_IMultiQI(IMultiQI *iface)
+{
+    return CONTAINING_RECORD(iface, struct proxy_manager, IMultiQI_iface);
+}
+
+static inline struct proxy_manager *impl_from_IMarshal(IMarshal *iface)
+{
+    return CONTAINING_RECORD(iface, struct proxy_manager, IMarshal_iface);
+}
+
+static inline struct proxy_manager *impl_from_IClientSecurity(IClientSecurity *iface)
+{
+    return CONTAINING_RECORD(iface, struct proxy_manager, IClientSecurity_iface);
+}
+
+struct ftmarshaler
+{
+    IUnknown IUnknown_inner;
+    IMarshal IMarshal_iface;
+    IUnknown *outer_unk;
+    LONG refcount;
+};
+
+static struct ftmarshaler *impl_ft_from_IUnknown(IUnknown *iface)
+{
+    return CONTAINING_RECORD(iface, struct ftmarshaler, IUnknown_inner);
+}
+
+static struct ftmarshaler *impl_ft_from_IMarshal(IMarshal *iface)
+{
+    return CONTAINING_RECORD(iface, struct ftmarshaler, IMarshal_iface);
+}
+
+/***********************************************************************
+ *            CoMarshalHresult        (combase.@)
+ */
+HRESULT WINAPI CoMarshalHresult(IStream *stream, HRESULT hresult)
+{
+    return IStream_Write(stream, &hresult, sizeof(hresult), NULL);
+}
+
+/***********************************************************************
+ *            CoUnmarshalHresult      (combase.@)
+ */
+HRESULT WINAPI CoUnmarshalHresult(IStream *stream, HRESULT *phresult)
+{
+    return IStream_Read(stream, phresult, sizeof(*phresult), NULL);
+}
+
+/***********************************************************************
+ *            CoGetInterfaceAndReleaseStream    (combase.@)
+ */
+HRESULT WINAPI CoGetInterfaceAndReleaseStream(IStream *stream, REFIID riid, void **obj)
+{
+    HRESULT hr;
+
+    TRACE("%p, %s, %p\n", stream, debugstr_guid(riid), obj);
+
+    if (!stream) return E_INVALIDARG;
+    hr = CoUnmarshalInterface(stream, riid, obj);
+    IStream_Release(stream);
+    return hr;
+}
+
+/***********************************************************************
+ *            CoMarshalInterThreadInterfaceInStream    (combase.@)
+ */
+HRESULT WINAPI CoMarshalInterThreadInterfaceInStream(REFIID riid, IUnknown *unk, IStream **stream)
+{
+    ULARGE_INTEGER xpos;
+    LARGE_INTEGER seekto;
+    HRESULT hr;
+
+    TRACE("%s, %p, %p\n", debugstr_guid(riid), unk, stream);
+
+    hr = CreateStreamOnHGlobal(NULL, TRUE, stream);
+    if (FAILED(hr)) return hr;
+    hr = CoMarshalInterface(*stream, riid, unk, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL);
+
+    if (SUCCEEDED(hr))
+    {
+        memset(&seekto, 0, sizeof(seekto));
+        IStream_Seek(*stream, seekto, STREAM_SEEK_SET, &xpos);
+    }
+    else
+    {
+        IStream_Release(*stream);
+        *stream = NULL;
+    }
+
+    return hr;
+}
+
+static HRESULT WINAPI ftmarshaler_inner_QueryInterface(IUnknown *iface, REFIID riid, void **obj)
+{
+    struct ftmarshaler *marshaler = impl_ft_from_IUnknown(iface);
+
+    TRACE("%p, %s, %p\n", iface, debugstr_guid(riid), obj);
+
+    *obj = NULL;
+
+    if (IsEqualIID(&IID_IUnknown, riid))
+        *obj = &marshaler->IUnknown_inner;
+    else if (IsEqualIID(&IID_IMarshal, riid))
+        *obj = &marshaler->IMarshal_iface;
+    else
+    {
+        FIXME("No interface for %s\n", debugstr_guid(riid));
+        return E_NOINTERFACE;
+    }
+
+    IUnknown_AddRef((IUnknown *)*obj);
+
+    return S_OK;
+}
+
+static ULONG WINAPI ftmarshaler_inner_AddRef(IUnknown *iface)
+{
+    struct ftmarshaler *marshaler = impl_ft_from_IUnknown(iface);
+    ULONG refcount = InterlockedIncrement(&marshaler->refcount);
+
+    TRACE("%p, refcount %u\n", iface, refcount);
+
+    return refcount;
+}
+
+static ULONG WINAPI ftmarshaler_inner_Release(IUnknown *iface)
+{
+    struct ftmarshaler *marshaler = impl_ft_from_IUnknown(iface);
+    ULONG refcount = InterlockedDecrement(&marshaler->refcount);
+
+    TRACE("%p, refcount %u\n", iface, refcount);
+
+    if (!refcount)
+        heap_free(marshaler);
+
+    return refcount;
+}
+
+static const IUnknownVtbl ftmarshaler_inner_vtbl =
+{
+    ftmarshaler_inner_QueryInterface,
+    ftmarshaler_inner_AddRef,
+    ftmarshaler_inner_Release
+};
+
+static HRESULT WINAPI ftmarshaler_QueryInterface(IMarshal *iface, REFIID riid, void **obj)
+{
+    struct ftmarshaler *marshaler = impl_ft_from_IMarshal(iface);
+
+    TRACE("%p, %s, %p\n", iface, debugstr_guid(riid), obj);
+
+    return IUnknown_QueryInterface(marshaler->outer_unk, riid, obj);
+}
+
+static ULONG WINAPI ftmarshaler_AddRef(IMarshal *iface)
+{
+    struct ftmarshaler *marshaler = impl_ft_from_IMarshal(iface);
+
+    TRACE("%p\n", iface);
+
+    return IUnknown_AddRef(marshaler->outer_unk);
+}
+
+static ULONG WINAPI ftmarshaler_Release(IMarshal *iface)
+{
+    struct ftmarshaler *marshaler = impl_ft_from_IMarshal(iface);
+
+    TRACE("%p\n", iface);
+
+    return IUnknown_Release(marshaler->outer_unk);
+}
+
+static HRESULT WINAPI ftmarshaler_GetUnmarshalClass(IMarshal *iface, REFIID riid, void *pv,
+        DWORD dest_context, void *pvDestContext, DWORD mshlflags, CLSID *clsid)
+{
+    TRACE("%s, %p, %#x, %p, %#x, %p\n", debugstr_guid(riid), pv, dest_context, pvDestContext, mshlflags, clsid);
+
+    if (dest_context == MSHCTX_INPROC || dest_context == MSHCTX_CROSSCTX)
+        *clsid = CLSID_InProcFreeMarshaler;
+    else
+        *clsid = CLSID_StdMarshal;
+
+    return S_OK;
+}
+
+static HRESULT WINAPI ftmarshaler_GetMarshalSizeMax(IMarshal *iface, REFIID riid, void *pv,
+        DWORD dest_context, void *pvDestContext, DWORD mshlflags, DWORD *size)
+{
+    IMarshal *marshal = NULL;
+    HRESULT hr;
+
+    TRACE("%s, %p, %#x, %p, %#x, %p\n", debugstr_guid(riid), pv, dest_context, pvDestContext, mshlflags, size);
+
+    /* If the marshalling happens inside the same process the interface pointer is
+       copied between the apartments */
+    if (dest_context == MSHCTX_INPROC || dest_context == MSHCTX_CROSSCTX)
+    {
+        *size = sizeof(mshlflags) + sizeof(pv) + sizeof(DWORD) + sizeof(GUID);
+        return S_OK;
+    }
+
+    /* Use the standard marshaller to handle all other cases */
+    CoGetStandardMarshal(riid, pv, dest_context, pvDestContext, mshlflags, &marshal);
+    hr = IMarshal_GetMarshalSizeMax(marshal, riid, pv, dest_context, pvDestContext, mshlflags, size);
+    IMarshal_Release(marshal);
+    return hr;
+}
+
+static HRESULT WINAPI ftmarshaler_MarshalInterface(IMarshal *iface, IStream *stream, REFIID riid,
+        void *pv, DWORD dest_context, void *pvDestContext, DWORD mshlflags)
+{
+    IMarshal *marshal = NULL;
+    HRESULT hr;
+
+    TRACE("%p, %s, %p, %#x, %p, %#x\n", stream, debugstr_guid(riid), pv,
+            dest_context, pvDestContext, mshlflags);
+
+    /* If the marshalling happens inside the same process the interface pointer is
+       copied between the apartments */
+    if (dest_context == MSHCTX_INPROC || dest_context == MSHCTX_CROSSCTX)
+    {
+        void *object;
+        DWORD constant = 0;
+        GUID unknown_guid = { 0 };
+
+        hr = IUnknown_QueryInterface((IUnknown *)pv, riid, &object);
+        if (FAILED(hr))
+            return hr;
+
+        /* don't hold a reference to table-weak marshaled interfaces */
+        if (mshlflags & MSHLFLAGS_TABLEWEAK)
+            IUnknown_Release((IUnknown *)object);
+
+        hr = IStream_Write(stream, &mshlflags, sizeof(mshlflags), NULL);
+        if (hr != S_OK) return STG_E_MEDIUMFULL;
+
+        hr = IStream_Write(stream, &object, sizeof(object), NULL);
+        if (hr != S_OK) return STG_E_MEDIUMFULL;
+
+        if (sizeof(object) == sizeof(DWORD))
+        {
+            hr = IStream_Write(stream, &constant, sizeof(constant), NULL);
+            if (hr != S_OK) return STG_E_MEDIUMFULL;
+        }
+
+        hr = IStream_Write(stream, &unknown_guid, sizeof(unknown_guid), NULL);
+        if (hr != S_OK) return STG_E_MEDIUMFULL;
+
+        return S_OK;
+    }
+
+    /* Use the standard marshaler to handle all other cases */
+    CoGetStandardMarshal(riid, pv, dest_context, pvDestContext, mshlflags, &marshal);
+    hr = IMarshal_MarshalInterface(marshal, stream, riid, pv, dest_context, pvDestContext, mshlflags);
+    IMarshal_Release(marshal);
+    return hr;
+}
+
+static HRESULT WINAPI ftmarshaler_UnmarshalInterface(IMarshal *iface, IStream *stream, REFIID riid, void **ppv)
+{
+    DWORD mshlflags;
+    IUnknown *object;
+    DWORD constant;
+    GUID unknown_guid;
+    HRESULT hr;
+
+    TRACE("%p, %s, %p\n", stream, debugstr_guid(riid), ppv);
+
+    hr = IStream_Read(stream, &mshlflags, sizeof(mshlflags), NULL);
+    if (hr != S_OK) return STG_E_READFAULT;
+
+    hr = IStream_Read(stream, &object, sizeof(object), NULL);
+    if (hr != S_OK) return STG_E_READFAULT;
+
+    if (sizeof(object) == sizeof(DWORD))
+    {
+        hr = IStream_Read(stream, &constant, sizeof(constant), NULL);
+        if (hr != S_OK) return STG_E_READFAULT;
+        if (constant != 0)
+            FIXME("constant is 0x%x instead of 0\n", constant);
+    }
+
+    hr = IStream_Read(stream, &unknown_guid, sizeof(unknown_guid), NULL);
+    if (hr != S_OK) return STG_E_READFAULT;
+
+    hr = IUnknown_QueryInterface(object, riid, ppv);
+    if (!(mshlflags & (MSHLFLAGS_TABLEWEAK | MSHLFLAGS_TABLESTRONG)))
+        IUnknown_Release(object);
+
+    return hr;
+}
+
+static HRESULT WINAPI ftmarshaler_ReleaseMarshalData(IMarshal *iface, IStream *stream)
+{
+    DWORD mshlflags;
+    IUnknown *object;
+    DWORD constant;
+    GUID unknown_guid;
+    HRESULT hr;
+
+    TRACE("%p\n", stream);
+
+    hr = IStream_Read(stream, &mshlflags, sizeof(mshlflags), NULL);
+    if (hr != S_OK) return STG_E_READFAULT;
+
+    hr = IStream_Read(stream, &object, sizeof(object), NULL);
+    if (hr != S_OK) return STG_E_READFAULT;
+
+    if (sizeof(object) == sizeof(DWORD))
+    {
+        hr = IStream_Read(stream, &constant, sizeof(constant), NULL);
+        if (hr != S_OK) return STG_E_READFAULT;
+        if (constant != 0)
+            FIXME("constant is 0x%x instead of 0\n", constant);
+    }
+
+    hr = IStream_Read(stream, &unknown_guid, sizeof(unknown_guid), NULL);
+    if (hr != S_OK) return STG_E_READFAULT;
+
+    IUnknown_Release(object);
+    return S_OK;
+}
+
+static HRESULT WINAPI ftmarshaler_DisconnectObject(IMarshal *iface, DWORD reserved)
+{
+    TRACE("\n");
+
+    /* nothing to do */
+    return S_OK;
+}
+
+static const IMarshalVtbl ftmarshaler_vtbl =
+{
+    ftmarshaler_QueryInterface,
+    ftmarshaler_AddRef,
+    ftmarshaler_Release,
+    ftmarshaler_GetUnmarshalClass,
+    ftmarshaler_GetMarshalSizeMax,
+    ftmarshaler_MarshalInterface,
+    ftmarshaler_UnmarshalInterface,
+    ftmarshaler_ReleaseMarshalData,
+    ftmarshaler_DisconnectObject
+};
+
+/***********************************************************************
+ *          CoCreateFreeThreadedMarshaler    (combase.@)
+ */
+HRESULT WINAPI CoCreateFreeThreadedMarshaler(IUnknown *outer, IUnknown **marshaler)
+{
+    struct ftmarshaler *object;
+
+    TRACE("%p, %p\n", outer, marshaler);
+
+    object = heap_alloc(sizeof(*object));
+    if (!object)
+        return E_OUTOFMEMORY;
+
+    object->IUnknown_inner.lpVtbl = &ftmarshaler_inner_vtbl;
+    object->IMarshal_iface.lpVtbl = &ftmarshaler_vtbl;
+    object->refcount = 1;
+    object->outer_unk = outer ? outer : &object->IUnknown_inner;
+
+    *marshaler = &object->IUnknown_inner;
+
+    return S_OK;
+}
+
+/***********************************************************************
+ *            CoGetMarshalSizeMax        (combase.@)
+ */
+HRESULT WINAPI CoGetMarshalSizeMax(ULONG *size, REFIID riid, IUnknown *unk,
+         DWORD dest_context, void *pvDestContext, DWORD mshlFlags)
+{
+    BOOL std_marshal = FALSE;
+    IMarshal *marshal;
+    HRESULT hr;
+
+    if (!unk)
+        return E_POINTER;
+
+    hr = IUnknown_QueryInterface(unk, &IID_IMarshal, (void **)&marshal);
+    if (hr != S_OK)
+    {
+        std_marshal = TRUE;
+        hr = CoGetStandardMarshal(riid, unk, dest_context, pvDestContext, mshlFlags, &marshal);
+    }
+    if (hr != S_OK)
+        return hr;
+
+    hr = IMarshal_GetMarshalSizeMax(marshal, riid, unk, dest_context, pvDestContext, mshlFlags, size);
+    if (!std_marshal)
+        /* add on the size of the whole OBJREF structure like native does */
+        *size += sizeof(OBJREF);
+
+    IMarshal_Release(marshal);
+    return hr;
+}
+
+static void dump_mshflags(MSHLFLAGS flags)
+{
+    if (flags & MSHLFLAGS_TABLESTRONG)
+        TRACE(" MSHLFLAGS_TABLESTRONG");
+    if (flags & MSHLFLAGS_TABLEWEAK)
+        TRACE(" MSHLFLAGS_TABLEWEAK");
+    if (!(flags & (MSHLFLAGS_TABLESTRONG|MSHLFLAGS_TABLEWEAK)))
+        TRACE(" MSHLFLAGS_NORMAL");
+    if (flags & MSHLFLAGS_NOPING)
+        TRACE(" MSHLFLAGS_NOPING");
+}
+
+/***********************************************************************
+ *        CoMarshalInterface    (combase.@)
+ */
+HRESULT WINAPI CoMarshalInterface(IStream *stream, REFIID riid, IUnknown *unk,
+        DWORD dest_context, void *pvDestContext, DWORD mshlFlags)
+{
+    CLSID marshaler_clsid;
+    IMarshal *marshal;
+    HRESULT hr;
+
+    TRACE("%p, %s, %p, %x, %p, ", stream, debugstr_guid(riid), unk, dest_context, pvDestContext);
+    dump_mshflags(mshlFlags);
+    TRACE("\n");
+
+    if (!unk || !stream)
+        return E_INVALIDARG;
+
+    hr = IUnknown_QueryInterface(unk, &IID_IMarshal, (void **)&marshal);
+    if (hr != S_OK)
+        hr = CoGetStandardMarshal(riid, unk, dest_context, pvDestContext, mshlFlags, &marshal);
+    if (hr != S_OK)
+    {
+        ERR("Failed to get marshaller, %#x\n", hr);
+        return hr;
+    }
+
+    hr = IMarshal_GetUnmarshalClass(marshal, riid, unk, dest_context, pvDestContext, mshlFlags,
+            &marshaler_clsid);
+    if (hr != S_OK)
+    {
+        ERR("IMarshal::GetUnmarshalClass failed, %#x\n", hr);
+        goto cleanup;
+    }
+
+    /* FIXME: implement handler marshaling too */
+    if (IsEqualCLSID(&marshaler_clsid, &CLSID_StdMarshal))
+    {
+        TRACE("Using standard marshaling\n");
+    }
+    else
+    {
+        OBJREF objref;
+
+        TRACE("Using custom marshaling\n");
+        objref.signature = OBJREF_SIGNATURE;
+        objref.iid = *riid;
+        objref.flags = OBJREF_CUSTOM;
+        objref.u_objref.u_custom.clsid = marshaler_clsid;
+        objref.u_objref.u_custom.cbExtension = 0;
+        objref.u_objref.u_custom.size = 0;
+        hr = IMarshal_GetMarshalSizeMax(marshal, riid, unk, dest_context, pvDestContext, mshlFlags,
+                &objref.u_objref.u_custom.size);
+        if (hr != S_OK)
+        {
+            ERR("Failed to get max size of marshal data, error %#x\n", hr);
+            goto cleanup;
+        }
+        /* write constant sized common header and OR_CUSTOM data into stream */
+        hr = IStream_Write(stream, &objref, FIELD_OFFSET(OBJREF, u_objref.u_custom.pData), NULL);
+        if (hr != S_OK)
+        {
+            ERR("Failed to write OR_CUSTOM header to stream with %#x\n", hr);
+            goto cleanup;
+        }
+    }
+
+    TRACE("Calling IMarshal::MarshalInterface\n");
+
+    hr = IMarshal_MarshalInterface(marshal, stream, riid, unk, dest_context, pvDestContext, mshlFlags);
+    if (hr != S_OK)
+    {
+        ERR("Failed to marshal the interface %s, hr %#x\n", debugstr_guid(riid), hr);
+        goto cleanup;
+    }
+
+cleanup:
+    IMarshal_Release(marshal);
+
+    TRACE("completed with hr %#x\n", hr);
+
+    return hr;
+}
+
+/* Creates an IMarshal* object according to the data marshaled to the stream.
+ * The function leaves the stream pointer at the start of the data written
+ * to the stream by the IMarshal* object.
+ */
+static HRESULT get_unmarshaler_from_stream(IStream *stream, IMarshal **marshal, IID *iid)
+{
+    OBJREF objref;
+    HRESULT hr;
+    ULONG res;
+
+    /* read common OBJREF header */
+    hr = IStream_Read(stream, &objref, FIELD_OFFSET(OBJREF, u_objref), &res);
+    if (hr != S_OK || (res != FIELD_OFFSET(OBJREF, u_objref)))
+    {
+        ERR("Failed to read common OBJREF header, 0x%08x\n", hr);
+        return STG_E_READFAULT;
+    }
+
+    /* sanity check on header */
+    if (objref.signature != OBJREF_SIGNATURE)
+    {
+        ERR("Bad OBJREF signature 0x%08x\n", objref.signature);
+        return RPC_E_INVALID_OBJREF;
+    }
+
+    if (iid) *iid = objref.iid;
+
+    /* FIXME: handler marshaling */
+    if (objref.flags & OBJREF_STANDARD)
+    {
+        TRACE("Using standard unmarshaling\n");
+        *marshal = NULL;
+        return S_FALSE;
+    }
+    else if (objref.flags & OBJREF_CUSTOM)
+    {
+        ULONG custom_header_size = FIELD_OFFSET(OBJREF, u_objref.u_custom.pData) -
+                                   FIELD_OFFSET(OBJREF, u_objref.u_custom);
+        TRACE("Using custom unmarshaling\n");
+        /* read constant sized OR_CUSTOM data from stream */
+        hr = IStream_Read(stream, &objref.u_objref.u_custom,
+                          custom_header_size, &res);
+        if (hr != S_OK || (res != custom_header_size))
+        {
+            ERR("Failed to read OR_CUSTOM header, 0x%08x\n", hr);
+            return STG_E_READFAULT;
+        }
+        /* now create the marshaler specified in the stream */
+        hr = CoCreateInstance(&objref.u_objref.u_custom.clsid, NULL,
+                              CLSCTX_INPROC_SERVER, &IID_IMarshal,
+                              (LPVOID*)marshal);
+    }
+    else
+    {
+        FIXME("Invalid or unimplemented marshaling type specified: %x\n",
+            objref.flags);
+        return RPC_E_INVALID_OBJREF;
+    }
+
+    if (hr != S_OK)
+        ERR("Failed to create marshal, 0x%08x\n", hr);
+
+    return hr;
+}
+
+static HRESULT std_release_marshal_data(IStream *stream)
+{
+    struct stub_manager *stubmgr;
+    struct OR_STANDARD  obj;
+    struct apartment *apt;
+    ULONG res;
+    HRESULT hr;
+
+    hr = IStream_Read(stream, &obj, FIELD_OFFSET(struct OR_STANDARD, saResAddr.aStringArray), &res);
+    if (hr != S_OK) return STG_E_READFAULT;
+
+    if (obj.saResAddr.wNumEntries)
+    {
+        ERR("unsupported size of DUALSTRINGARRAY\n");
+        return E_NOTIMPL;
+    }
+
+    TRACE("oxid = %s, oid = %s, ipid = %s\n", wine_dbgstr_longlong(obj.std.oxid),
+            wine_dbgstr_longlong(obj.std.oid), wine_dbgstr_guid(&obj.std.ipid));
+
+    if (!(apt = apartment_findfromoxid(obj.std.oxid)))
+    {
+        WARN("Could not map OXID %s to apartment object\n",
+            wine_dbgstr_longlong(obj.std.oxid));
+        return RPC_E_INVALID_OBJREF;
+    }
+
+    if (!(stubmgr = get_stub_manager(apt, obj.std.oid)))
+    {
+        apartment_release(apt);
+        ERR("could not map object ID to stub manager, oxid=%s, oid=%s\n",
+            wine_dbgstr_longlong(obj.std.oxid), wine_dbgstr_longlong(obj.std.oid));
+        return RPC_E_INVALID_OBJREF;
+    }
+
+    stub_manager_release_marshal_data(stubmgr, obj.std.cPublicRefs, &obj.std.ipid, obj.std.flags & SORFP_TABLEWEAK);
+
+    stub_manager_int_release(stubmgr);
+    apartment_release(apt);
+
+    return S_OK;
+}
+
+/***********************************************************************
+ *            CoReleaseMarshalData        (combase.@)
+ */
+HRESULT WINAPI CoReleaseMarshalData(IStream *stream)
+{
+    IMarshal *marshal;
+    HRESULT hr;
+
+    TRACE("%p\n", stream);
+
+    hr = get_unmarshaler_from_stream(stream, &marshal, NULL);
+    if (hr == S_FALSE)
+    {
+        hr = std_release_marshal_data(stream);
+        if (hr != S_OK)
+            ERR("StdMarshal ReleaseMarshalData failed with error %#x\n", hr);
+        return hr;
+    }
+    if (hr != S_OK)
+        return hr;
+
+    /* call the helper object to do the releasing of marshal data */
+    hr = IMarshal_ReleaseMarshalData(marshal, stream);
+    if (hr != S_OK)
+        ERR("IMarshal::ReleaseMarshalData failed with error %#x\n", hr);
+
+    IMarshal_Release(marshal);
+    return hr;
+}
+
+static HRESULT std_unmarshal_interface(MSHCTX dest_context, void *dest_context_data,
+        IStream *stream, REFIID riid, void **ppv)
+{
+    struct stub_manager *stubmgr = NULL;
+    struct OR_STANDARD obj;
+    ULONG res;
+    HRESULT hres;
+    struct apartment *apt, *stub_apt;
+
+    TRACE("(...,%s,....)\n", debugstr_guid(riid));
+
+    /* we need an apartment to unmarshal into */
+    if (!(apt = apartment_get_current_or_mta()))
+    {
+        ERR("Apartment not initialized\n");
+        return CO_E_NOTINITIALIZED;
+    }
+
+    /* read STDOBJREF from wire */
+    hres = IStream_Read(stream, &obj, FIELD_OFFSET(struct OR_STANDARD, saResAddr.aStringArray), &res);
+    if (hres != S_OK)
+    {
+        apartment_release(apt);
+        return STG_E_READFAULT;
+    }
+
+    if (obj.saResAddr.wNumEntries)
+    {
+        ERR("unsupported size of DUALSTRINGARRAY\n");
+        return E_NOTIMPL;
+    }
+
+    /* check if we're marshalling back to ourselves */
+    if ((apartment_getoxid(apt) == obj.std.oxid) && (stubmgr = get_stub_manager(apt, obj.std.oid)))
+    {
+        TRACE("Unmarshalling object marshalled in same apartment for iid %s, "
+              "returning original object %p\n", debugstr_guid(riid), stubmgr->object);
+
+        hres = IUnknown_QueryInterface(stubmgr->object, riid, ppv);
+
+        /* unref the ifstub. FIXME: only do this on success? */
+        if (!stub_manager_is_table_marshaled(stubmgr, &obj.std.ipid))
+            stub_manager_ext_release(stubmgr, obj.std.cPublicRefs, obj.std.flags & SORFP_TABLEWEAK, FALSE);
+
+        stub_manager_int_release(stubmgr);
+        apartment_release(apt);
+        return hres;
+    }
+
+    /* notify stub manager about unmarshal if process-local object.
+     * note: if the oxid is not found then we and native will quite happily
+     * ignore table marshaling and normal marshaling rules regarding number of
+     * unmarshals, etc, but if you abuse these rules then your proxy could end
+     * up returning RPC_E_DISCONNECTED. */
+    if ((stub_apt = apartment_findfromoxid(obj.std.oxid)))
+    {
+        if ((stubmgr = get_stub_manager(stub_apt, obj.std.oid)))
+        {
+            if (!stub_manager_notify_unmarshal(stubmgr, &obj.std.ipid))
+                hres = CO_E_OBJNOTCONNECTED;
+        }
+        else
+        {
+            WARN("Couldn't find object for OXID %s, OID %s, assuming disconnected\n",
+                wine_dbgstr_longlong(obj.std.oxid),
+                wine_dbgstr_longlong(obj.std.oid));
+            hres = CO_E_OBJNOTCONNECTED;
+        }
+    }
+    else
+        TRACE("Treating unmarshal from OXID %s as inter-process\n",
+            wine_dbgstr_longlong(obj.std.oxid));
+
+    if (hres == S_OK)
+        hres = unmarshal_object(&obj.std, apt, dest_context,
+                                dest_context_data, riid,
+                                stubmgr ? &stubmgr->oxid_info : NULL, ppv);
+
+    if (stubmgr) stub_manager_int_release(stubmgr);
+    if (stub_apt) apartment_release(stub_apt);
+
+    if (hres != S_OK) WARN("Failed with error 0x%08x\n", hres);
+    else TRACE("Successfully created proxy %p\n", *ppv);
+
+    apartment_release(apt);
+    return hres;
+}
+
+/***********************************************************************
+ *            CoUnmarshalInterface        (combase.@)
+ */
+HRESULT WINAPI CoUnmarshalInterface(IStream *stream, REFIID riid, void **ppv)
+{
+    IMarshal *marshal;
+    IUnknown *object;
+    HRESULT hr;
+    IID iid;
+
+    TRACE("%p, %s, %p\n", stream, debugstr_guid(riid), ppv);
+
+    if (!stream || !ppv)
+        return E_INVALIDARG;
+
+    hr = get_unmarshaler_from_stream(stream, &marshal, &iid);
+    if (hr == S_FALSE)
+    {
+        hr = std_unmarshal_interface(0, NULL, stream, &iid, (void **)&object);
+        if (hr != S_OK)
+            ERR("StdMarshal UnmarshalInterface failed, hr %#x\n", hr);
+    }
+    else if (hr == S_OK)
+    {
+        /* call the helper object to do the actual unmarshaling */
+        hr = IMarshal_UnmarshalInterface(marshal, stream, &iid, (void **)&object);
+        IMarshal_Release(marshal);
+        if (hr != S_OK)
+            ERR("IMarshal::UnmarshalInterface failed, hr %#x\n", hr);
+    }
+
+    if (hr == S_OK)
+    {
+        /* IID_NULL means use the interface ID of the marshaled object */
+        if (!IsEqualIID(riid, &IID_NULL) && !IsEqualIID(riid, &iid))
+        {
+            TRACE("requested interface != marshalled interface, additional QI needed\n");
+            hr = IUnknown_QueryInterface(object, riid, ppv);
+            if (hr != S_OK)
+                ERR("Couldn't query for interface %s, hr %#x\n", debugstr_guid(riid), hr);
+            IUnknown_Release(object);
+        }
+        else
+        {
+            *ppv = object;
+        }
+    }
+
+    TRACE("completed with hr 0x%x\n", hr);
+
+    return hr;
+}
+
+/* Marshalling just passes a unique identifier to the remote client,
+ * that makes it possible to find the passed interface again.
+ *
+ * So basically we need a set of values that make it unique.
+ *
+ * Note that the IUnknown_QI(ob,xiid,&ppv) always returns the SAME ppv value!
+ *
+ * A triple is used: OXID (apt id), OID (stub manager id),
+ * IPID (interface ptr/stub id).
+ *
+ * OXIDs identify an apartment and are network scoped
+ * OIDs identify a stub manager and are apartment scoped
+ * IPIDs identify an interface stub and are apartment scoped
+ */
+
+static inline HRESULT get_facbuf_for_iid(REFIID riid, IPSFactoryBuffer **facbuf)
+{
+    HRESULT       hr;
+    CLSID         clsid;
+
+    hr = CoGetPSClsid(riid, &clsid);
+    if (hr != S_OK)
+        return hr;
+    return CoGetClassObject(&clsid, CLSCTX_INPROC_SERVER | CLSCTX_PS_DLL, NULL, &IID_IPSFactoryBuffer, (void **)facbuf);
+}
+
+/* marshals an object into a STDOBJREF structure */
+HRESULT marshal_object(struct apartment *apt, STDOBJREF *stdobjref, REFIID riid, IUnknown *object,
+    DWORD dest_context, void *dest_context_data, MSHLFLAGS mshlflags)
+{
+    struct stub_manager *manager;
+    struct ifstub       *ifstub;
+    BOOL                 tablemarshal;
+    HRESULT              hr;
+
+    stdobjref->oxid = apartment_getoxid(apt);
+
+    hr = apartment_createwindowifneeded(apt);
+    if (hr != S_OK)
+        return hr;
+
+    if (!(manager = get_stub_manager_from_object(apt, object, TRUE)))
+        return E_OUTOFMEMORY;
+
+    stdobjref->flags = SORF_NULL;
+    if (mshlflags & MSHLFLAGS_TABLEWEAK)
+        stdobjref->flags |= SORFP_TABLEWEAK;
+    if (mshlflags & MSHLFLAGS_NOPING)
+        stdobjref->flags |= SORF_NOPING;
+    stdobjref->oid = manager->oid;
+
+    tablemarshal = ((mshlflags & MSHLFLAGS_TABLESTRONG) || (mshlflags & MSHLFLAGS_TABLEWEAK));
+
+    /* make sure ifstub that we are creating is unique */
+    ifstub = stub_manager_find_ifstub(manager, riid, mshlflags);
+    if (!ifstub) {
+        IRpcStubBuffer *stub = NULL;
+
+        /* IUnknown doesn't require a stub buffer, because it never goes out on
+         * the wire */
+        if (!IsEqualIID(riid, &IID_IUnknown))
+        {
+            IPSFactoryBuffer *psfb;
+
+            hr = get_facbuf_for_iid(riid, &psfb);
+            if (hr == S_OK) {
+                hr = IPSFactoryBuffer_CreateStub(psfb, riid, manager->object, &stub);
+                IPSFactoryBuffer_Release(psfb);
+                if (hr != S_OK)
+                    ERR("Failed to create an IRpcStubBuffer from IPSFactory for %s with error 0x%08x\n",
+                        debugstr_guid(riid), hr);
+            }else {
+                WARN("couldn't get IPSFactory buffer for interface %s\n", debugstr_guid(riid));
+                hr = E_NOINTERFACE;
+            }
+
+        }
+
+        if (hr == S_OK) {
+            ifstub = stub_manager_new_ifstub(manager, stub, riid, dest_context, dest_context_data, mshlflags);
+            if (!ifstub)
+                hr = E_OUTOFMEMORY;
+        }
+        if (stub) IRpcStubBuffer_Release(stub);
+
+        if (hr != S_OK) {
+            stub_manager_int_release(manager);
+            /* destroy the stub manager if it has no ifstubs by releasing
+             * zero external references */
+            stub_manager_ext_release(manager, 0, FALSE, TRUE);
+            return hr;
+        }
+    }
+
+    if (!tablemarshal)
+    {
+        stdobjref->cPublicRefs = NORMALEXTREFS;
+        stub_manager_ext_addref(manager, stdobjref->cPublicRefs, FALSE);
+    }
+    else
+    {
+        stdobjref->cPublicRefs = 0;
+        if (mshlflags & MSHLFLAGS_TABLESTRONG)
+            stub_manager_ext_addref(manager, 1, FALSE);
+        else
+            stub_manager_ext_addref(manager, 0, TRUE);
+    }
+
+    /* FIXME: check return value */
+    rpc_register_interface(riid);
+
+    stdobjref->ipid = ifstub->ipid;
+
+    stub_manager_int_release(manager);
+    return S_OK;
+}
+
+/* Client-side identity of the server object */
+
+static HRESULT proxy_manager_get_remunknown(struct proxy_manager * This, IRemUnknown **remunk);
+static void proxy_manager_destroy(struct proxy_manager * This);
+static HRESULT proxy_manager_find_ifproxy(struct proxy_manager * This, REFIID riid, struct ifproxy ** ifproxy_found);
+static HRESULT proxy_manager_query_local_interface(struct proxy_manager * This, REFIID riid, void ** ppv);
+
+static HRESULT WINAPI ClientIdentity_QueryInterface(IMultiQI * iface, REFIID riid, void ** ppv)
+{
+    HRESULT hr;
+    MULTI_QI mqi;
+
+    TRACE("%s\n", debugstr_guid(riid));
+
+    mqi.pIID = riid;
+    hr = IMultiQI_QueryMultipleInterfaces(iface, 1, &mqi);
+    *ppv = mqi.pItf;
+
+    return hr;
+}
+
+static ULONG WINAPI ClientIdentity_AddRef(IMultiQI *iface)
+{
+    struct proxy_manager *This = impl_from_IMultiQI(iface);
+    TRACE("%p - before %d\n", iface, This->refs);
+    return InterlockedIncrement(&This->refs);
+}
+
+static ULONG WINAPI ClientIdentity_Release(IMultiQI *iface)
+{
+    struct proxy_manager *This = impl_from_IMultiQI(iface);
+    ULONG refs = InterlockedDecrement(&This->refs);
+    TRACE("%p - after %d\n", iface, refs);
+    if (!refs)
+        proxy_manager_destroy(This);
+    return refs;
+}
+
+static HRESULT WINAPI ClientIdentity_QueryMultipleInterfaces(IMultiQI *iface, ULONG cMQIs, MULTI_QI *pMQIs)
+{
+    struct proxy_manager *This = impl_from_IMultiQI(iface);
+    REMQIRESULT *qiresults = NULL;
+    ULONG nonlocal_mqis = 0;
+    ULONG i;
+    ULONG successful_mqis = 0;
+    IID *iids = HeapAlloc(GetProcessHeap(), 0, cMQIs * sizeof(*iids));
+    /* mapping of RemQueryInterface index to QueryMultipleInterfaces index */
+    ULONG *mapping = HeapAlloc(GetProcessHeap(), 0, cMQIs * sizeof(*mapping));
+
+    TRACE("cMQIs: %d\n", cMQIs);
+
+    /* try to get a local interface - this includes already active proxy
+     * interfaces and also interfaces exposed by the proxy manager */
+    for (i = 0; i < cMQIs; i++)
+    {
+        TRACE("iid[%d] = %s\n", i, debugstr_guid(pMQIs[i].pIID));
+        pMQIs[i].hr = proxy_manager_query_local_interface(This, pMQIs[i].pIID, (void **)&pMQIs[i].pItf);
+        if (pMQIs[i].hr == S_OK)
+            successful_mqis++;
+        else
+        {
+            iids[nonlocal_mqis] = *pMQIs[i].pIID;
+            mapping[nonlocal_mqis] = i;
+            nonlocal_mqis++;
+        }
+    }
+
+    TRACE("%d interfaces not found locally\n", nonlocal_mqis);
+
+    /* if we have more than one interface not found locally then we must try
+     * to query the remote object for it */
+    if (nonlocal_mqis != 0)
+    {
+        IRemUnknown *remunk;
+        HRESULT hr;
+        IPID *ipid;
+
+        /* get the ipid of the first entry */
+        /* FIXME: should we implement ClientIdentity on the ifproxies instead
+         * of the proxy_manager so we use the correct ipid here? */
+        ipid = &LIST_ENTRY(list_head(&This->interfaces), struct ifproxy, entry)->stdobjref.ipid;
+
+        /* get IRemUnknown proxy so we can communicate with the remote object */
+        hr = proxy_manager_get_remunknown(This, &remunk);
+
+        if (SUCCEEDED(hr))
+        {
+            hr = IRemUnknown_RemQueryInterface(remunk, ipid, NORMALEXTREFS,
+                                               nonlocal_mqis, iids, &qiresults);
+            IRemUnknown_Release(remunk);
+            if (FAILED(hr))
+                WARN("IRemUnknown_RemQueryInterface failed with error 0x%08x\n", hr);
+        }
+
+        /* IRemUnknown_RemQueryInterface can return S_FALSE if only some of
+         * the interfaces were returned */
+        if (SUCCEEDED(hr))
+        {
+            struct apartment *apt = apartment_get_current_or_mta();
+
+            /* try to unmarshal each object returned to us */
+            for (i = 0; i < nonlocal_mqis; i++)
+            {
+                ULONG index = mapping[i];
+                HRESULT hrobj = qiresults[i].hResult;
+                if (hrobj == S_OK)
+                    hrobj = unmarshal_object(&qiresults[i].std, apt,
+                                             This->dest_context,
+                                             This->dest_context_data,
+                                             pMQIs[index].pIID, &This->oxid_info,
+                                             (void **)&pMQIs[index].pItf);
+
+                if (hrobj == S_OK)
+                    successful_mqis++;
+                else
+                    ERR("Failed to get pointer to interface %s\n", debugstr_guid(pMQIs[index].pIID));
+                pMQIs[index].hr = hrobj;
+            }
+
+            apartment_release(apt);
+        }
+
+        /* free the memory allocated by the proxy */
+        CoTaskMemFree(qiresults);
+    }
+
+    TRACE("%d/%d successfully queried\n", successful_mqis, cMQIs);
+
+    HeapFree(GetProcessHeap(), 0, iids);
+    HeapFree(GetProcessHeap(), 0, mapping);
+
+    if (successful_mqis == cMQIs)
+        return S_OK; /* we got all requested interfaces */
+    else if (successful_mqis == 0)
+        return E_NOINTERFACE; /* we didn't get any interfaces */
+    else
+        return S_FALSE; /* we got some interfaces */
+}
+
+static const IMultiQIVtbl ClientIdentity_Vtbl =
+{
+    ClientIdentity_QueryInterface,
+    ClientIdentity_AddRef,
+    ClientIdentity_Release,
+    ClientIdentity_QueryMultipleInterfaces
+};
+
+static HRESULT StdMarshalImpl_Construct(REFIID, DWORD, void*, void**);
+
+static HRESULT WINAPI Proxy_QueryInterface(IMarshal *iface, REFIID riid, void **ppvObject)
+{
+    struct proxy_manager *This = impl_from_IMarshal( iface );
+    return IMultiQI_QueryInterface(&This->IMultiQI_iface, riid, ppvObject);
+}
+
+static ULONG WINAPI Proxy_AddRef(IMarshal *iface)
+{
+    struct proxy_manager *This = impl_from_IMarshal( iface );
+    return IMultiQI_AddRef(&This->IMultiQI_iface);
+}
+
+static ULONG WINAPI Proxy_Release(IMarshal *iface)
+{
+    struct proxy_manager *This = impl_from_IMarshal( iface );
+    return IMultiQI_Release(&This->IMultiQI_iface);
+}
+
+static HRESULT WINAPI Proxy_GetUnmarshalClass(
+    IMarshal *iface, REFIID riid, void* pv, DWORD dwDestContext,
+    void* pvDestContext, DWORD mshlflags, CLSID* pCid)
+{
+    *pCid = CLSID_StdMarshal;
+    return S_OK;
+}
+
+static HRESULT WINAPI Proxy_GetMarshalSizeMax(
+    IMarshal *iface, REFIID riid, void* pv, DWORD dwDestContext,
+    void* pvDestContext, DWORD mshlflags, DWORD* pSize)
+{
+    *pSize = FIELD_OFFSET(OBJREF, u_objref.u_standard.saResAddr.aStringArray);
+    return S_OK;
+}
+
+static void fill_std_objref(OBJREF *objref, const GUID *iid, STDOBJREF *std)
+{
+    objref->signature = OBJREF_SIGNATURE;
+    objref->flags = OBJREF_STANDARD;
+    objref->iid = *iid;
+    if(std)
+        objref->u_objref.u_standard.std = *std;
+    memset(&objref->u_objref.u_standard.saResAddr, 0,
+            sizeof(objref->u_objref.u_standard.saResAddr));
+}
+
+static HRESULT WINAPI Proxy_MarshalInterface(
+    LPMARSHAL iface, IStream *pStm, REFIID riid, void* pv, DWORD dwDestContext,
+    void* pvDestContext, DWORD mshlflags)
+{
+    struct proxy_manager *This = impl_from_IMarshal( iface );
+    HRESULT hr;
+    struct ifproxy *ifproxy;
+
+    TRACE("(...,%s,...)\n", debugstr_guid(riid));
+
+    hr = proxy_manager_find_ifproxy(This, riid, &ifproxy);
+    if (SUCCEEDED(hr))
+    {
+        STDOBJREF stdobjref = ifproxy->stdobjref;
+
+        stdobjref.cPublicRefs = 0;
+
+        if ((mshlflags != MSHLFLAGS_TABLEWEAK) &&
+            (mshlflags != MSHLFLAGS_TABLESTRONG))
+        {
+            ULONG cPublicRefs = ifproxy->refs;
+            ULONG cPublicRefsOld;
+            /* optimization - share out proxy's public references if possible
+             * instead of making new proxy do a roundtrip through the server */
+            do
+            {
+                ULONG cPublicRefsNew;
+                cPublicRefsOld = cPublicRefs;
+                stdobjref.cPublicRefs = cPublicRefs / 2;
+                cPublicRefsNew = cPublicRefs - stdobjref.cPublicRefs;
+                cPublicRefs = InterlockedCompareExchange(
+                    (LONG *)&ifproxy->refs, cPublicRefsNew, cPublicRefsOld);
+            } while (cPublicRefs != cPublicRefsOld);
+        }
+
+        /* normal and table-strong marshaling need at least one reference */
+        if (!stdobjref.cPublicRefs && (mshlflags != MSHLFLAGS_TABLEWEAK))
+        {
+            IRemUnknown *remunk;
+            hr = proxy_manager_get_remunknown(This, &remunk);
+            if (hr == S_OK)
+            {
+                HRESULT hrref = S_OK;
+                REMINTERFACEREF rif;
+                rif.ipid = ifproxy->stdobjref.ipid;
+                rif.cPublicRefs = (mshlflags == MSHLFLAGS_TABLESTRONG) ? 1 : NORMALEXTREFS;
+                rif.cPrivateRefs = 0;
+                hr = IRemUnknown_RemAddRef(remunk, 1, &rif, &hrref);
+                IRemUnknown_Release(remunk);
+                if (hr == S_OK && hrref == S_OK)
+                {
+                    /* table-strong marshaling doesn't give the refs to the
+                     * client that unmarshals the STDOBJREF */
+                    if (mshlflags != MSHLFLAGS_TABLESTRONG)
+                        stdobjref.cPublicRefs = rif.cPublicRefs;
+                }
+                else
+                    ERR("IRemUnknown_RemAddRef returned with 0x%08x, hrref = 0x%08x\n", hr, hrref);
+            }
+        }
+
+        if (SUCCEEDED(hr))
+        {
+            OBJREF objref;
+
+            TRACE("writing stdobjref: flags = %04x cPublicRefs = %d oxid = %s oid = %s ipid = %s\n",
+                stdobjref.flags, stdobjref.cPublicRefs,
+                wine_dbgstr_longlong(stdobjref.oxid),
+                wine_dbgstr_longlong(stdobjref.oid),
+                debugstr_guid(&stdobjref.ipid));
+            fill_std_objref(&objref, riid, &stdobjref);
+            hr = IStream_Write(pStm, &objref, FIELD_OFFSET(OBJREF,
+                        u_objref.u_standard.saResAddr.aStringArray), NULL);
+        }
+    }
+    else
+    {
+        /* we don't have the interface already unmarshaled so we have to
+         * request the object from the server */
+        IRemUnknown *remunk;
+        IPID *ipid;
+        REMQIRESULT *qiresults = NULL;
+        IID iid = *riid;
+
+        /* get the ipid of the first entry */
+        /* FIXME: should we implement ClientIdentity on the ifproxies instead
+         * of the proxy_manager so we use the correct ipid here? */
+        ipid = &LIST_ENTRY(list_head(&This->interfaces), struct ifproxy, entry)->stdobjref.ipid;
+
+        /* get IRemUnknown proxy so we can communicate with the remote object */
+        hr = proxy_manager_get_remunknown(This, &remunk);
+
+        if (hr == S_OK)
+        {
+            hr = IRemUnknown_RemQueryInterface(remunk, ipid, NORMALEXTREFS,
+                                               1, &iid, &qiresults);
+            if (SUCCEEDED(hr))
+            {
+                OBJREF objref;
+
+                fill_std_objref(&objref, riid, &qiresults->std);
+                hr = IStream_Write(pStm, &objref, FIELD_OFFSET(OBJREF,
+                            u_objref.u_standard.saResAddr.aStringArray), NULL);
+                if (FAILED(hr))
+                {
+                    REMINTERFACEREF rif;
+                    rif.ipid = qiresults->std.ipid;
+                    rif.cPublicRefs = qiresults->std.cPublicRefs;
+                    rif.cPrivateRefs = 0;
+                    IRemUnknown_RemRelease(remunk, 1, &rif);
+                }
+                CoTaskMemFree(qiresults);
+            }
+            else
+                ERR("IRemUnknown_RemQueryInterface failed with error 0x%08x\n", hr);
+            IRemUnknown_Release(remunk);
+        }
+    }
+
+    return hr;
+}
+
+static HRESULT WINAPI Proxy_UnmarshalInterface(
+        IMarshal *iface, IStream *pStm, REFIID riid, void **ppv)
+{
+    struct proxy_manager *This = impl_from_IMarshal( iface );
+    IMarshal *marshal;
+    HRESULT hr;
+
+    TRACE("(%p, %p, %s, %p)\n", This, pStm, wine_dbgstr_guid(riid), ppv);
+
+    hr = StdMarshalImpl_Construct(&IID_IMarshal, This->dest_context,
+            This->dest_context_data, (void**)&marshal);
+    if(FAILED(hr))
+        return hr;
+
+    hr = IMarshal_UnmarshalInterface(marshal, pStm, riid, ppv);
+    IMarshal_Release(marshal);
+    return hr;
+}
+
+static HRESULT WINAPI Proxy_ReleaseMarshalData(IMarshal *iface, IStream *pStm)
+{
+    struct proxy_manager *This = impl_from_IMarshal( iface );
+    IMarshal *marshal;
+    HRESULT hr;
+
+    TRACE("(%p, %p)\n", This, pStm);
+
+    hr = StdMarshalImpl_Construct(&IID_IMarshal, This->dest_context,
+            This->dest_context_data, (void**)&marshal);
+    if(FAILED(hr))
+        return hr;
+
+    hr = IMarshal_ReleaseMarshalData(marshal, pStm);
+    IMarshal_Release(marshal);
+    return hr;
+}
+
+static HRESULT WINAPI Proxy_DisconnectObject(IMarshal *iface, DWORD dwReserved)
+{
+    struct proxy_manager *This = impl_from_IMarshal( iface );
+    IMarshal *marshal;
+    HRESULT hr;
+
+    TRACE("(%p, %x)\n", This, dwReserved);
+
+    hr = StdMarshalImpl_Construct(&IID_IMarshal, This->dest_context,
+            This->dest_context_data, (void**)&marshal);
+    if(FAILED(hr))
+        return hr;
+
+    hr = IMarshal_DisconnectObject(marshal, dwReserved);
+    IMarshal_Release(marshal);
+    return hr;
+}
+
+static const IMarshalVtbl ProxyMarshal_Vtbl =
+{
+    Proxy_QueryInterface,
+    Proxy_AddRef,
+    Proxy_Release,
+    Proxy_GetUnmarshalClass,
+    Proxy_GetMarshalSizeMax,
+    Proxy_MarshalInterface,
+    Proxy_UnmarshalInterface,
+    Proxy_ReleaseMarshalData,
+    Proxy_DisconnectObject
+};
+
+static HRESULT WINAPI ProxyCliSec_QueryInterface(IClientSecurity *iface, REFIID riid, void **ppvObject)
+{
+    struct proxy_manager *This = impl_from_IClientSecurity( iface );
+    return IMultiQI_QueryInterface(&This->IMultiQI_iface, riid, ppvObject);
+}
+
+static ULONG WINAPI ProxyCliSec_AddRef(IClientSecurity *iface)
+{
+    struct proxy_manager *This = impl_from_IClientSecurity( iface );
+    return IMultiQI_AddRef(&This->IMultiQI_iface);
+}
+
+static ULONG WINAPI ProxyCliSec_Release(IClientSecurity *iface)
+{
+    struct proxy_manager *This = impl_from_IClientSecurity( iface );
+    return IMultiQI_Release(&This->IMultiQI_iface);
+}
+
+static HRESULT WINAPI ProxyCliSec_QueryBlanket(IClientSecurity *iface,
+                                               IUnknown *pProxy,
+                                               DWORD *pAuthnSvc,
+                                               DWORD *pAuthzSvc,
+                                               OLECHAR **ppServerPrincName,
+                                               DWORD *pAuthnLevel,
+                                               DWORD *pImpLevel,
+                                               void **pAuthInfo,
+                                               DWORD *pCapabilities)
+{
+    FIXME("(%p, %p, %p, %p, %p, %p, %p, %p): stub\n", pProxy, pAuthnSvc,
+          pAuthzSvc, ppServerPrincName, pAuthnLevel, pImpLevel, pAuthInfo,
+          pCapabilities);
+
+    if (pAuthnSvc)
+        *pAuthnSvc = 0;
+    if (pAuthzSvc)
+        *pAuthzSvc = 0;
+    if (ppServerPrincName)
+        *ppServerPrincName = NULL;
+    if (pAuthnLevel)
+        *pAuthnLevel = RPC_C_AUTHN_LEVEL_DEFAULT;
+    if (pImpLevel)
+        *pImpLevel = RPC_C_IMP_LEVEL_DEFAULT;
+    if (pAuthInfo)
+        *pAuthInfo = NULL;
+    if (pCapabilities)
+        *pCapabilities = EOAC_NONE;
+
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ProxyCliSec_SetBlanket(IClientSecurity *iface,
+                                             IUnknown *pProxy, DWORD AuthnSvc,
+                                             DWORD AuthzSvc,
+                                             OLECHAR *pServerPrincName,
+                                             DWORD AuthnLevel, DWORD ImpLevel,
+                                             void *pAuthInfo,
+                                             DWORD Capabilities)
+{
+    FIXME("(%p, %d, %d, %s, %d, %d, %p, 0x%x): stub\n", pProxy, AuthnSvc, AuthzSvc,
+          pServerPrincName == COLE_DEFAULT_PRINCIPAL ? "<default principal>" : debugstr_w(pServerPrincName),
+          AuthnLevel, ImpLevel, pAuthInfo, Capabilities);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ProxyCliSec_CopyProxy(IClientSecurity *iface,
+                                            IUnknown *pProxy, IUnknown **ppCopy)
+{
+    FIXME("(%p, %p): stub\n", pProxy, ppCopy);
+    *ppCopy = NULL;
+    return E_NOTIMPL;
+}
+
+static const IClientSecurityVtbl ProxyCliSec_Vtbl =
+{
+    ProxyCliSec_QueryInterface,
+    ProxyCliSec_AddRef,
+    ProxyCliSec_Release,
+    ProxyCliSec_QueryBlanket,
+    ProxyCliSec_SetBlanket,
+    ProxyCliSec_CopyProxy
+};
+
+static HRESULT ifproxy_get_public_ref(struct ifproxy * This)
+{
+    HRESULT hr = S_OK;
+
+    if (WAIT_OBJECT_0 != WaitForSingleObject(This->parent->remoting_mutex, INFINITE))
+    {
+        ERR("Wait failed for ifproxy %p\n", This);
+        return E_UNEXPECTED;
+    }
+
+    if (This->refs == 0)
+    {
+        IRemUnknown *remunk = NULL;
+
+        TRACE("getting public ref for ifproxy %p\n", This);
+
+        hr = proxy_manager_get_remunknown(This->parent, &remunk);
+        if (hr == S_OK)
+        {
+            HRESULT hrref = S_OK;
+            REMINTERFACEREF rif;
+            rif.ipid = This->stdobjref.ipid;
+            rif.cPublicRefs = NORMALEXTREFS;
+            rif.cPrivateRefs = 0;
+            hr = IRemUnknown_RemAddRef(remunk, 1, &rif, &hrref);
+            IRemUnknown_Release(remunk);
+            if (hr == S_OK && hrref == S_OK)
+                InterlockedExchangeAdd((LONG *)&This->refs, NORMALEXTREFS);
+            else
+                ERR("IRemUnknown_RemAddRef returned with 0x%08x, hrref = 0x%08x\n", hr, hrref);
+        }
+    }
+    ReleaseMutex(This->parent->remoting_mutex);
+
+    return hr;
+}
+
+static HRESULT ifproxy_release_public_refs(struct ifproxy * This)
+{
+    HRESULT hr = S_OK;
+    LONG public_refs;
+
+    if (WAIT_OBJECT_0 != WaitForSingleObject(This->parent->remoting_mutex, INFINITE))
+    {
+        ERR("Wait failed for ifproxy %p\n", This);
+        return E_UNEXPECTED;
+    }
+
+    public_refs = This->refs;
+    if (public_refs > 0)
+    {
+        IRemUnknown *remunk = NULL;
+
+        TRACE("releasing %d refs\n", public_refs);
+
+        hr = proxy_manager_get_remunknown(This->parent, &remunk);
+        if (hr == S_OK)
+        {
+            REMINTERFACEREF rif;
+            rif.ipid = This->stdobjref.ipid;
+            rif.cPublicRefs = public_refs;
+            rif.cPrivateRefs = 0;
+            hr = IRemUnknown_RemRelease(remunk, 1, &rif);
+            IRemUnknown_Release(remunk);
+            if (hr == S_OK)
+                InterlockedExchangeAdd((LONG *)&This->refs, -public_refs);
+            else if (hr == RPC_E_DISCONNECTED)
+                WARN("couldn't release references because object was "
+                     "disconnected: oxid = %s, oid = %s\n",
+                     wine_dbgstr_longlong(This->parent->oxid),
+                     wine_dbgstr_longlong(This->parent->oid));
+            else
+                ERR("IRemUnknown_RemRelease failed with error 0x%08x\n", hr);
+        }
+    }
+    ReleaseMutex(This->parent->remoting_mutex);
+
+    return hr;
+}
+
+/* should be called inside This->parent->cs critical section */
+static void ifproxy_disconnect(struct ifproxy * This)
+{
+    ifproxy_release_public_refs(This);
+    if (This->proxy) IRpcProxyBuffer_Disconnect(This->proxy);
+
+    IRpcChannelBuffer_Release(This->chan);
+    This->chan = NULL;
+}
+
+/* should be called in This->parent->cs critical section if it is an entry in parent's list */
+static void ifproxy_destroy(struct ifproxy * This)
+{
+    TRACE("%p\n", This);
+
+    /* release public references to this object so that the stub can know
+     * when to destroy itself */
+    ifproxy_release_public_refs(This);
+
+    list_remove(&This->entry);
+
+    if (This->chan)
+    {
+        IRpcChannelBuffer_Release(This->chan);
+        This->chan = NULL;
+    }
+
+    if (This->proxy) IRpcProxyBuffer_Release(This->proxy);
+
+    HeapFree(GetProcessHeap(), 0, This);
+}
+
+static HRESULT proxy_manager_construct(
+    struct apartment * apt, ULONG sorflags, OXID oxid, OID oid,
+    const OXID_INFO *oxid_info, struct proxy_manager ** proxy_manager)
+{
+    struct proxy_manager * This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This));
+    if (!This) return E_OUTOFMEMORY;
+
+    This->remoting_mutex = CreateMutexW(NULL, FALSE, NULL);
+    if (!This->remoting_mutex)
+    {
+        HeapFree(GetProcessHeap(), 0, This);
+        return HRESULT_FROM_WIN32(GetLastError());
+    }
+
+    if (oxid_info)
+    {
+        This->oxid_info.dwPid = oxid_info->dwPid;
+        This->oxid_info.dwTid = oxid_info->dwTid;
+        This->oxid_info.ipidRemUnknown = oxid_info->ipidRemUnknown;
+        This->oxid_info.dwAuthnHint = oxid_info->dwAuthnHint;
+        This->oxid_info.psa = NULL /* FIXME: copy from oxid_info */;
+    }
+    else
+    {
+        HRESULT hr = rpc_resolve_oxid(oxid, &This->oxid_info);
+        if (FAILED(hr))
+        {
+            CloseHandle(This->remoting_mutex);
+            HeapFree(GetProcessHeap(), 0, This);
+            return hr;
+        }
+    }
+
+    This->IMultiQI_iface.lpVtbl = &ClientIdentity_Vtbl;
+    This->IMarshal_iface.lpVtbl = &ProxyMarshal_Vtbl;
+    This->IClientSecurity_iface.lpVtbl = &ProxyCliSec_Vtbl;
+
+    list_init(&This->entry);
+    list_init(&This->interfaces);
+
+    InitializeCriticalSection(&This->cs);
+    This->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": proxy_manager");
+
+    /* the apartment the object was unmarshaled into */
+    This->parent = apt;
+
+    /* the source apartment and id of the object */
+    This->oxid = oxid;
+    This->oid = oid;
+
+    This->refs = 1;
+
+    /* the DCOM draft specification states that the SORF_NOPING flag is
+     * proxy manager specific, not ifproxy specific, so this implies that we
+     * should store the STDOBJREF flags here in the proxy manager. */
+    This->sorflags = sorflags;
+
+    /* we create the IRemUnknown proxy on demand */
+    This->remunk = NULL;
+
+    /* initialise these values to the weakest values and they will be
+     * overwritten in proxy_manager_set_context */
+    This->dest_context = MSHCTX_INPROC;
+    This->dest_context_data = NULL;
+
+    EnterCriticalSection(&apt->cs);
+    /* FIXME: we are dependent on the ordering in here to make sure a proxy's
+     * IRemUnknown proxy doesn't get destroyed before the regular proxy does
+     * because we need the IRemUnknown proxy during the destruction of the
+     * regular proxy. Ideally, we should maintain a separate list for the
+     * IRemUnknown proxies that need late destruction */
+    list_add_tail(&apt->proxies, &This->entry);
+    LeaveCriticalSection(&apt->cs);
+
+    TRACE("%p created for OXID %s, OID %s\n", This,
+        wine_dbgstr_longlong(oxid), wine_dbgstr_longlong(oid));
+
+    *proxy_manager = This;
+    return S_OK;
+}
+
+static inline void proxy_manager_set_context(struct proxy_manager *This, MSHCTX dest_context, void *dest_context_data)
+{
+    MSHCTX old_dest_context;
+    MSHCTX new_dest_context;
+
+    do
+    {
+        old_dest_context = This->dest_context;
+        new_dest_context = old_dest_context;
+        /* "stronger" values overwrite "weaker" values. stronger values are
+         * ones that disable more optimisations */
+        switch (old_dest_context)
+        {
+        case MSHCTX_INPROC:
+            new_dest_context = dest_context;
+            break;
+        case MSHCTX_CROSSCTX:
+            switch (dest_context)
+            {
+            case MSHCTX_INPROC:
+                break;
+            default:
+                new_dest_context = dest_context;
+            }
+            break;
+        case MSHCTX_LOCAL:
+            switch (dest_context)
+            {
+            case MSHCTX_INPROC:
+            case MSHCTX_CROSSCTX:
+                break;
+            default:
+                new_dest_context = dest_context;
+            }
+            break;
+        case MSHCTX_NOSHAREDMEM:
+            switch (dest_context)
+            {
+            case MSHCTX_DIFFERENTMACHINE:
+                new_dest_context = dest_context;
+                break;
+            default:
+                break;
+            }
+            break;
+        default:
+            break;
+        }
+
+        if (old_dest_context == new_dest_context) break;
+
+        new_dest_context = InterlockedCompareExchange((PLONG)&This->dest_context, new_dest_context, old_dest_context);
+    } while (new_dest_context != old_dest_context);
+
+    if (dest_context_data)
+        InterlockedExchangePointer(&This->dest_context_data, dest_context_data);
+}
+
+static HRESULT proxy_manager_query_local_interface(struct proxy_manager * This, REFIID riid, void ** ppv)
+{
+    HRESULT hr;
+    struct ifproxy * ifproxy;
+
+    TRACE("%s\n", debugstr_guid(riid));
+
+    if (IsEqualIID(riid, &IID_IUnknown) ||
+        IsEqualIID(riid, &IID_IMultiQI))
+    {
+        *ppv = &This->IMultiQI_iface;
+        IMultiQI_AddRef(&This->IMultiQI_iface);
+        return S_OK;
+    }
+    if (IsEqualIID(riid, &IID_IMarshal))
+    {
+        *ppv = &This->IMarshal_iface;
+        IMarshal_AddRef(&This->IMarshal_iface);
+        return S_OK;
+    }
+    if (IsEqualIID(riid, &IID_IClientSecurity))
+    {
+        *ppv = &This->IClientSecurity_iface;
+        IClientSecurity_AddRef(&This->IClientSecurity_iface);
+        return S_OK;
+    }
+
+    hr = proxy_manager_find_ifproxy(This, riid, &ifproxy);
+    if (hr == S_OK)
+    {
+        *ppv = ifproxy->iface;
+        IUnknown_AddRef((IUnknown *)*ppv);
+        return S_OK;
+    }
+
+    *ppv = NULL;
+    return E_NOINTERFACE;
+}
+
+static HRESULT proxy_manager_create_ifproxy(
+    struct proxy_manager * This, const STDOBJREF *stdobjref, REFIID riid,
+    IRpcChannelBuffer * channel, struct ifproxy ** iif_out)
+{
+    HRESULT hr;
+    IPSFactoryBuffer * psfb;
+    struct ifproxy * ifproxy = HeapAlloc(GetProcessHeap(), 0, sizeof(*ifproxy));
+    if (!ifproxy) return E_OUTOFMEMORY;
+
+    list_init(&ifproxy->entry);
+
+    ifproxy->parent = This;
+    ifproxy->stdobjref = *stdobjref;
+    ifproxy->iid = *riid;
+    ifproxy->refs = 0;
+    ifproxy->proxy = NULL;
+
+    assert(channel);
+    ifproxy->chan = channel; /* FIXME: we should take the binding strings and construct the channel in this function */
+
+    /* the IUnknown interface is special because it does not have a
+     * proxy associated with the ifproxy as we handle IUnknown ourselves */
+    if (IsEqualIID(riid, &IID_IUnknown))
+    {
+        ifproxy->iface = &This->IMultiQI_iface;
+        IMultiQI_AddRef(&This->IMultiQI_iface);
+        hr = S_OK;
+    }
+    else
+    {
+        hr = get_facbuf_for_iid(riid, &psfb);
+        if (hr == S_OK)
+        {
+            /* important note: the outer unknown is set to the proxy manager.
+             * This ensures the COM identity rules are not violated, by having a
+             * one-to-one mapping of objects on the proxy side to objects on the
+             * stub side, no matter which interface you view the object through */
+            hr = IPSFactoryBuffer_CreateProxy(psfb, (IUnknown*)&This->IMultiQI_iface, riid,
+                                              &ifproxy->proxy, &ifproxy->iface);
+            IPSFactoryBuffer_Release(psfb);
+            if (hr != S_OK)
+                ERR("Could not create proxy for interface %s, error 0x%08x\n",
+                    debugstr_guid(riid), hr);
+        }
+        else
+            ERR("Could not get IPSFactoryBuffer for interface %s, error 0x%08x\n",
+                debugstr_guid(riid), hr);
+
+        if (hr == S_OK)
+            hr = IRpcProxyBuffer_Connect(ifproxy->proxy, ifproxy->chan);
+    }
+
+    if (hr == S_OK)
+    {
+        EnterCriticalSection(&This->cs);
+        list_add_tail(&This->interfaces, &ifproxy->entry);
+        LeaveCriticalSection(&This->cs);
+
+        *iif_out = ifproxy;
+        TRACE("ifproxy %p created for IPID %s, interface %s with %u public refs\n",
+              ifproxy, debugstr_guid(&stdobjref->ipid), debugstr_guid(riid), stdobjref->cPublicRefs);
+    }
+    else
+        ifproxy_destroy(ifproxy);
+
+    return hr;
+}
+
+static HRESULT proxy_manager_find_ifproxy(struct proxy_manager * This, REFIID riid, struct ifproxy ** ifproxy_found)
+{
+    HRESULT hr = E_NOINTERFACE; /* assume not found */
+    struct ifproxy *ifproxy;
+
+    EnterCriticalSection(&This->cs);
+    LIST_FOR_EACH_ENTRY(ifproxy, &This->interfaces, struct ifproxy, entry)
+    {
+        if (IsEqualIID(riid, &ifproxy->iid))
+        {
+            *ifproxy_found = ifproxy;
+            hr = S_OK;
+            break;
+        }
+    }
+    LeaveCriticalSection(&This->cs);
+
+    return hr;
+}
+
+static void proxy_manager_disconnect(struct proxy_manager * This)
+{
+    struct ifproxy *ifproxy;
+
+    TRACE("oxid = %s, oid = %s\n", wine_dbgstr_longlong(This->oxid),
+        wine_dbgstr_longlong(This->oid));
+
+    EnterCriticalSection(&This->cs);
+
+    /* SORFP_NOLIFTIMEMGMT proxies (for IRemUnknown) shouldn't be
+     * disconnected - it won't do anything anyway, except cause
+     * problems for other objects that depend on this proxy always
+     * working */
+    if (!(This->sorflags & SORFP_NOLIFETIMEMGMT))
+    {
+        LIST_FOR_EACH_ENTRY(ifproxy, &This->interfaces, struct ifproxy, entry)
+        {
+            ifproxy_disconnect(ifproxy);
+        }
+    }
+
+    /* apartment is being destroyed so don't keep a pointer around to it */
+    This->parent = NULL;
+
+    LeaveCriticalSection(&This->cs);
+}
+
+static HRESULT proxy_manager_get_remunknown(struct proxy_manager * This, IRemUnknown **remunk)
+{
+    HRESULT hr = S_OK;
+    struct apartment *apt;
+    BOOL called_in_original_apt;
+
+    /* we don't want to try and unmarshal or use IRemUnknown if we don't want
+     * lifetime management */
+    if (This->sorflags & SORFP_NOLIFETIMEMGMT)
+        return S_FALSE;
+
+    if (!(apt = apartment_get_current_or_mta()))
+        return CO_E_NOTINITIALIZED;
+
+    called_in_original_apt = This->parent && (This->parent->oxid == apt->oxid);
+
+    EnterCriticalSection(&This->cs);
+    /* only return the cached object if called from the original apartment.
+     * in future, we might want to make the IRemUnknown proxy callable from any
+     * apartment to avoid these checks */
+    if (This->remunk && called_in_original_apt)
+    {
+        /* already created - return existing object */
+        *remunk = This->remunk;
+        IRemUnknown_AddRef(*remunk);
+    }
+    else if (!This->parent)
+    {
+        /* disconnected - we can't create IRemUnknown */
+        *remunk = NULL;
+        hr = S_FALSE;
+    }
+    else
+    {
+        STDOBJREF stdobjref;
+        /* Don't want IRemUnknown lifetime management as this is IRemUnknown!
+         * We also don't care about whether or not the stub is still alive */
+        stdobjref.flags = SORFP_NOLIFETIMEMGMT | SORF_NOPING;
+        stdobjref.cPublicRefs = 1;
+        /* oxid of destination object */
+        stdobjref.oxid = This->oxid;
+        /* FIXME: what should be used for the oid? The DCOM draft doesn't say */
+        stdobjref.oid = (OID)-1;
+        stdobjref.ipid = This->oxid_info.ipidRemUnknown;
+
+        /* do the unmarshal */
+        hr = unmarshal_object(&stdobjref, apt, This->dest_context,
+                              This->dest_context_data, &IID_IRemUnknown,
+                              &This->oxid_info, (void**)remunk);
+        if (hr == S_OK && called_in_original_apt)
+        {
+            This->remunk = *remunk;
+            IRemUnknown_AddRef(This->remunk);
+        }
+    }
+    LeaveCriticalSection(&This->cs);
+    apartment_release(apt);
+
+    TRACE("got IRemUnknown* pointer %p, hr = 0x%08x\n", *remunk, hr);
+
+    return hr;
+}
+
+/* destroys a proxy manager, freeing the memory it used.
+ * Note: this function should not be called from a list iteration in the
+ * apartment, due to the fact that it removes itself from the apartment and
+ * it could add a proxy to IRemUnknown into the apartment. */
+static void proxy_manager_destroy(struct proxy_manager * This)
+{
+    struct list * cursor;
+
+    TRACE("oxid = %s, oid = %s\n", wine_dbgstr_longlong(This->oxid),
+        wine_dbgstr_longlong(This->oid));
+
+    if (This->parent)
+    {
+        EnterCriticalSection(&This->parent->cs);
+
+        /* remove ourself from the list of proxy objects in the apartment */
+        LIST_FOR_EACH(cursor, &This->parent->proxies)
+        {
+            if (cursor == &This->entry)
+            {
+                list_remove(&This->entry);
+                break;
+            }
+        }
+
+        LeaveCriticalSection(&This->parent->cs);
+    }
+
+    /* destroy all of the interface proxies */
+    while ((cursor = list_head(&This->interfaces)))
+    {
+        struct ifproxy * ifproxy = LIST_ENTRY(cursor, struct ifproxy, entry);
+        ifproxy_destroy(ifproxy);
+    }
+
+    if (This->remunk) IRemUnknown_Release(This->remunk);
+    CoTaskMemFree(This->oxid_info.psa);
+
+    This->cs.DebugInfo->Spare[0] = 0;
+    DeleteCriticalSection(&This->cs);
+
+    CloseHandle(This->remoting_mutex);
+
+    HeapFree(GetProcessHeap(), 0, This);
+}
+
+/* finds the proxy manager corresponding to a given OXID and OID that has
+ * been unmarshaled in the specified apartment. The caller must release the
+ * reference to the proxy_manager when the object is no longer used. */
+static BOOL find_proxy_manager(struct apartment * apt, OXID oxid, OID oid, struct proxy_manager ** proxy_found)
+{
+    struct proxy_manager *proxy;
+    BOOL found = FALSE;
+
+    EnterCriticalSection(&apt->cs);
+    LIST_FOR_EACH_ENTRY(proxy, &apt->proxies, struct proxy_manager, entry)
+    {
+        if ((oxid == proxy->oxid) && (oid == proxy->oid))
+        {
+            /* be careful of a race with ClientIdentity_Release, which would
+             * cause us to return a proxy which is in the process of being
+             * destroyed */
+            if (IMultiQI_AddRef(&proxy->IMultiQI_iface) != 0)
+            {
+                *proxy_found = proxy;
+                found = TRUE;
+                break;
+            }
+        }
+    }
+    LeaveCriticalSection(&apt->cs);
+    return found;
+}
+
+HRESULT apartment_disconnectproxies(struct apartment *apt)
+{
+    struct proxy_manager *proxy;
+
+    LIST_FOR_EACH_ENTRY(proxy, &apt->proxies, struct proxy_manager, entry)
+    {
+        proxy_manager_disconnect(proxy);
+    }
+
+    return S_OK;
+}
+
+/********************** StdMarshal implementation ****************************/
+
+struct stdmarshal
+{
+    IMarshal IMarshal_iface;
+    LONG refcount;
+    DWORD dest_context;
+    void *dest_context_data;
+};
+
+static inline struct stdmarshal *impl_from_StdMarshal(IMarshal *iface)
+{
+    return CONTAINING_RECORD(iface, struct stdmarshal, IMarshal_iface);
+}
+
+static HRESULT WINAPI StdMarshalImpl_QueryInterface(IMarshal *iface, REFIID riid, void **ppv)
+{
+    *ppv = NULL;
+    if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IMarshal, riid))
+    {
+        *ppv = iface;
+        IMarshal_AddRef(iface);
+        return S_OK;
+    }
+    FIXME("No interface for %s.\n", debugstr_guid(riid));
+    return E_NOINTERFACE;
+}
+
+static ULONG WINAPI StdMarshalImpl_AddRef(IMarshal *iface)
+{
+    struct stdmarshal *marshal = impl_from_StdMarshal(iface);
+    return InterlockedIncrement(&marshal->refcount);
+}
+
+static ULONG WINAPI StdMarshalImpl_Release(IMarshal *iface)
+{
+    struct stdmarshal *marshal = impl_from_StdMarshal(iface);
+    ULONG refcount = InterlockedDecrement(&marshal->refcount);
+
+    if (!refcount)
+        heap_free(marshal);
+
+    return refcount;
+}
+
+static HRESULT WINAPI StdMarshalImpl_GetUnmarshalClass(IMarshal *iface, REFIID riid, void *pv,
+        DWORD dwDestContext, void *pvDestContext, DWORD mshlflags, CLSID *pCid)
+{
+    *pCid = CLSID_StdMarshal;
+    return S_OK;
+}
+
+static HRESULT WINAPI StdMarshalImpl_GetMarshalSizeMax(IMarshal *iface, REFIID riid, void *pv,
+        DWORD dwDestContext, void *pvDestContext, DWORD mshlflags, DWORD *pSize)
+{
+    *pSize = FIELD_OFFSET(OBJREF, u_objref.u_standard.saResAddr.aStringArray);
+    return S_OK;
+}
+
+static HRESULT WINAPI StdMarshalImpl_MarshalInterface(IMarshal *iface, IStream *stream, REFIID riid, void *pv,
+        DWORD dest_context, void *dest_context_data, DWORD mshlflags)
+{
+    ULONG res;
+    HRESULT hr;
+    OBJREF objref;
+    struct apartment *apt;
+
+    TRACE("(...,%s,...)\n", debugstr_guid(riid));
+
+    if (!(apt = apartment_get_current_or_mta()))
+    {
+        ERR("Apartment not initialized\n");
+        return CO_E_NOTINITIALIZED;
+    }
+
+    /* make sure this apartment can be reached from other threads / processes */
+    rpc_start_remoting(apt);
+
+    fill_std_objref(&objref, riid, NULL);
+    hr = marshal_object(apt, &objref.u_objref.u_standard.std, riid, pv, dest_context,
+            dest_context_data, mshlflags);
+    apartment_release(apt);
+    if (hr != S_OK)
+    {
+        ERR("Failed to create ifstub, hr %#x\n", hr);
+        return hr;
+    }
+
+    return IStream_Write(stream, &objref, FIELD_OFFSET(OBJREF, u_objref.u_standard.saResAddr.aStringArray), &res);
+}
+
+/* helper for StdMarshalImpl_UnmarshalInterface - does the unmarshaling with
+ * no questions asked about the rules surrounding same-apartment unmarshals
+ * and table marshaling */
+static HRESULT unmarshal_object(const STDOBJREF *stdobjref, struct apartment *apt, MSHCTX dest_context,
+        void *dest_context_data, REFIID riid, const OXID_INFO *oxid_info, void **object)
+{
+    struct proxy_manager *proxy_manager = NULL;
+    HRESULT hr = S_OK;
+
+    assert(apt);
+
+    TRACE("stdobjref: flags = %04x cPublicRefs = %d oxid = %s oid = %s ipid = %s\n",
+        stdobjref->flags, stdobjref->cPublicRefs,
+        wine_dbgstr_longlong(stdobjref->oxid),
+        wine_dbgstr_longlong(stdobjref->oid),
+        debugstr_guid(&stdobjref->ipid));
+
+    /* create a new proxy manager if one doesn't already exist for the
+     * object */
+    if (!find_proxy_manager(apt, stdobjref->oxid, stdobjref->oid, &proxy_manager))
+    {
+        hr = proxy_manager_construct(apt, stdobjref->flags,
+                                     stdobjref->oxid, stdobjref->oid, oxid_info,
+                                     &proxy_manager);
+    }
+    else
+        TRACE("proxy manager already created, using\n");
+
+    if (hr == S_OK)
+    {
+        struct ifproxy * ifproxy;
+
+        proxy_manager_set_context(proxy_manager, dest_context, dest_context_data);
+
+        hr = proxy_manager_find_ifproxy(proxy_manager, riid, &ifproxy);
+        if (hr == E_NOINTERFACE)
+        {
+            IRpcChannelBuffer *chanbuf;
+            hr = rpc_create_clientchannel(&stdobjref->oxid, &stdobjref->ipid,
+                    &proxy_manager->oxid_info, riid, proxy_manager->dest_context,
+                    proxy_manager->dest_context_data, &chanbuf, apt);
+            if (hr == S_OK)
+                hr = proxy_manager_create_ifproxy(proxy_manager, stdobjref, riid, chanbuf, &ifproxy);
+        }
+        else
+            IUnknown_AddRef((IUnknown *)ifproxy->iface);
+
+        if (hr == S_OK)
+        {
+            InterlockedExchangeAdd((LONG *)&ifproxy->refs, stdobjref->cPublicRefs);
+            /* get at least one external reference to the object to keep it alive */
+            hr = ifproxy_get_public_ref(ifproxy);
+            if (FAILED(hr))
+                ifproxy_destroy(ifproxy);
+        }
+
+        if (hr == S_OK)
+            *object = ifproxy->iface;
+    }
+
+    /* release our reference to the proxy manager - the client/apartment
+     * will hold on to the remaining reference for us */
+    if (proxy_manager) IMultiQI_Release(&proxy_manager->IMultiQI_iface);
+
+    return hr;
+}
+
+static HRESULT WINAPI StdMarshalImpl_UnmarshalInterface(IMarshal *iface, IStream *stream, REFIID riid, void **ppv)
+{
+    struct stdmarshal *marshal = impl_from_StdMarshal(iface);
+    OBJREF objref;
+    HRESULT hr;
+    ULONG res;
+
+    hr = IStream_Read(stream, &objref, FIELD_OFFSET(OBJREF, u_objref), &res);
+    if (hr != S_OK || (res != FIELD_OFFSET(OBJREF, u_objref)))
+    {
+        ERR("Failed to read common OBJREF header, 0x%08x\n", hr);
+        return STG_E_READFAULT;
+    }
+
+    if (objref.signature != OBJREF_SIGNATURE)
+    {
+        ERR("Bad OBJREF signature 0x%08x\n", objref.signature);
+        return RPC_E_INVALID_OBJREF;
+    }
+
+    if (!(objref.flags & OBJREF_STANDARD))
+    {
+        FIXME("unsupported objref.flags = %x\n", objref.flags);
+        return E_NOTIMPL;
+    }
+
+    return std_unmarshal_interface(marshal->dest_context, marshal->dest_context_data, stream, riid, ppv);
+}
+
+static HRESULT WINAPI StdMarshalImpl_ReleaseMarshalData(IMarshal *iface, IStream *stream)
+{
+    OBJREF objref;
+    HRESULT hr;
+    ULONG res;
+
+    TRACE("%p, %p\n", iface, stream);
+
+    hr = IStream_Read(stream, &objref, FIELD_OFFSET(OBJREF, u_objref), &res);
+    if (hr != S_OK || (res != FIELD_OFFSET(OBJREF, u_objref)))
+    {
+        ERR("Failed to read common OBJREF header, 0x%08x\n", hr);
+        return STG_E_READFAULT;
+    }
+
+    if (objref.signature != OBJREF_SIGNATURE)
+    {
+        ERR("Bad OBJREF signature 0x%08x\n", objref.signature);
+        return RPC_E_INVALID_OBJREF;
+    }
+
+    if (!(objref.flags & OBJREF_STANDARD))
+    {
+        FIXME("unsupported objref.flags = %x\n", objref.flags);
+        return E_NOTIMPL;
+    }
+
+    return std_release_marshal_data(stream);
+}
+
+static HRESULT WINAPI StdMarshalImpl_DisconnectObject(IMarshal *iface, DWORD reserved)
+{
+    FIXME("(), stub!\n");
+    return S_OK;
+}
+
+static const IMarshalVtbl StdMarshalVtbl =
+{
+    StdMarshalImpl_QueryInterface,
+    StdMarshalImpl_AddRef,
+    StdMarshalImpl_Release,
+    StdMarshalImpl_GetUnmarshalClass,
+    StdMarshalImpl_GetMarshalSizeMax,
+    StdMarshalImpl_MarshalInterface,
+    StdMarshalImpl_UnmarshalInterface,
+    StdMarshalImpl_ReleaseMarshalData,
+    StdMarshalImpl_DisconnectObject
+};
+
+static HRESULT StdMarshalImpl_Construct(REFIID riid, DWORD dest_context, void *dest_context_data, void **ppvObject)
+{
+    struct stdmarshal *object;
+    HRESULT hr;
+
+    object = heap_alloc(sizeof(*object));
+    if (!object)
+        return E_OUTOFMEMORY;
+
+    object->IMarshal_iface.lpVtbl = &StdMarshalVtbl;
+    object->refcount = 1;
+    object->dest_context = dest_context;
+    object->dest_context_data = dest_context_data;
+
+    hr = IMarshal_QueryInterface(&object->IMarshal_iface, riid, ppvObject);
+    IMarshal_Release(&object->IMarshal_iface);
+
+    return hr;
+}
+
+HRESULT WINAPI InternalCoStdMarshalObject(REFIID riid, DWORD dest_context, void *dest_context_data, void **ppvObject)
+{
+    return StdMarshalImpl_Construct(riid, dest_context, dest_context_data, ppvObject);
+}
+
+/***********************************************************************
+ *            CoGetStandardMarshal        (combase.@)
+ */
+HRESULT WINAPI CoGetStandardMarshal(REFIID riid, IUnknown *pUnk, DWORD dwDestContext,
+        void *dest_context, DWORD flags, IMarshal **marshal)
+{
+    if (pUnk == NULL)
+    {
+        FIXME("(%s,NULL,%x,%p,%x,%p), unimplemented yet.\n", debugstr_guid(riid), dwDestContext,
+                dest_context, flags, marshal);
+        return E_NOTIMPL;
+    }
+    TRACE("%s, %p, %x, %p, %x, %p\n", debugstr_guid(riid), pUnk, dwDestContext, dest_context, flags, marshal);
+
+    return StdMarshalImpl_Construct(&IID_IMarshal, dwDestContext, dest_context, (void **)marshal);
+}
diff --git a/wrappers/new-dlls/combase/roapi.c b/wrappers/new-dlls/combase_/roapi.c
similarity index 100%
rename from wrappers/new-dlls/combase/roapi.c
rename to wrappers/new-dlls/combase_/roapi.c
diff --git a/wrappers/new-dlls/combase_/rpc.c b/wrappers/new-dlls/combase_/rpc.c
new file mode 100644
index 0000000000..55450ad7f1
--- /dev/null
+++ b/wrappers/new-dlls/combase_/rpc.c
@@ -0,0 +1,2111 @@
+/*
+ * Copyright 2001  Ove Kåven, TransGaming Technologies
+ * Copyright 2002  Marcus Meissner
+ * Copyright 2005  Mike Hearn, Rob Shearman for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <stdarg.h>
+
+#define COBJMACROS
+
+#include "windef.h"
+#include "winbase.h"
+#include "winsvc.h"
+#include "servprov.h"
+
+#include "wine/debug.h"
+#include "wine/exception.h"
+#include "wine/heap.h"
+
+#include "combase_private.h"
+
+#include "irpcss.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
+
+static void __RPC_STUB dispatch_rpc(RPC_MESSAGE *msg);
+
+/* we only use one function to dispatch calls for all methods - we use the
+ * RPC_IF_OLE flag to tell the RPC runtime that this is the case */
+static RPC_DISPATCH_FUNCTION rpc_dispatch_table[1] = { dispatch_rpc }; /* (RO) */
+static RPC_DISPATCH_TABLE rpc_dispatch = { 1, rpc_dispatch_table }; /* (RO) */
+
+static struct list registered_interfaces = LIST_INIT(registered_interfaces); /* (CS csRegIf) */
+static CRITICAL_SECTION csRegIf;
+static CRITICAL_SECTION_DEBUG csRegIf_debug =
+{
+    0, 0, &csRegIf,
+    { &csRegIf_debug.ProcessLocksList, &csRegIf_debug.ProcessLocksList },
+      0, 0, { (DWORD_PTR)(__FILE__ ": dcom registered server interfaces") }
+};
+static CRITICAL_SECTION csRegIf = { &csRegIf_debug, -1, 0, 0, 0, 0 };
+
+static struct list channel_hooks = LIST_INIT(channel_hooks); /* (CS csChannelHook) */
+static CRITICAL_SECTION csChannelHook;
+static CRITICAL_SECTION_DEBUG csChannelHook_debug =
+{
+    0, 0, &csChannelHook,
+    { &csChannelHook_debug.ProcessLocksList, &csChannelHook_debug.ProcessLocksList },
+      0, 0, { (DWORD_PTR)(__FILE__ ": channel hooks") }
+};
+static CRITICAL_SECTION csChannelHook = { &csChannelHook_debug, -1, 0, 0, 0, 0 };
+
+static WCHAR rpctransportW[] = L"ncalrpc";
+
+struct registered_if
+{
+    struct list entry;
+    DWORD refs; /* ref count */
+    RPC_SERVER_INTERFACE If; /* interface registered with the RPC runtime */
+};
+
+/* get the pipe endpoint specified of the specified apartment */
+static inline void get_rpc_endpoint(LPWSTR endpoint, const OXID *oxid)
+{
+    /* FIXME: should get endpoint from rpcss */
+    wsprintfW(endpoint, L"\\pipe\\OLE_%08lx%08lx", (DWORD)(*oxid >> 32), (DWORD)*oxid);
+}
+
+typedef struct
+{
+    IRpcChannelBuffer IRpcChannelBuffer_iface;
+    LONG refs;
+
+    DWORD dest_context; /* returned from GetDestCtx */
+    void *dest_context_data; /* returned from GetDestCtx */
+} RpcChannelBuffer;
+
+typedef struct
+{
+    RpcChannelBuffer       super; /* superclass */
+
+    RPC_BINDING_HANDLE     bind; /* handle to the remote server */
+    OXID                   oxid; /* apartment in which the channel is valid */
+    DWORD                  server_pid; /* id of server process */
+    HANDLE                 event; /* cached event handle */
+    IID                    iid; /* IID of the proxy this belongs to */
+} ClientRpcChannelBuffer;
+
+struct dispatch_params
+{
+    RPCOLEMESSAGE     *msg; /* message */
+    IRpcStubBuffer    *stub; /* stub buffer, if applicable */
+    IRpcChannelBuffer *chan; /* server channel buffer, if applicable */
+    IID                iid; /* ID of interface being called */
+    IUnknown          *iface; /* interface being called */
+    HANDLE             handle; /* handle that will become signaled when call finishes */
+    BOOL               bypass_rpcrt; /* bypass RPC runtime? */
+    RPC_STATUS         status; /* status (out) */
+    HRESULT            hr; /* hresult (out) */
+};
+
+struct message_state
+{
+    RPC_BINDING_HANDLE binding_handle;
+    ULONG prefix_data_len;
+    SChannelHookCallInfo channel_hook_info;
+    BOOL bypass_rpcrt;
+
+    /* client only */
+    HWND target_hwnd;
+    DWORD target_tid;
+    struct dispatch_params params;
+};
+
+typedef struct
+{
+    ULONG conformance; /* NDR */
+    GUID id;
+    ULONG size;
+    /* [size_is((size+7)&~7)] */ unsigned char data[1];
+} WIRE_ORPC_EXTENT;
+
+typedef struct
+{
+    ULONG size;
+    ULONG reserved;
+    unsigned char extent[1];
+} WIRE_ORPC_EXTENT_ARRAY;
+
+typedef struct
+{
+    ULONG version;
+    ULONG flags;
+    ULONG reserved1;
+    GUID  cid;
+    unsigned char extensions[1];
+} WIRE_ORPCTHIS;
+
+typedef struct
+{
+    ULONG flags;
+    unsigned char extensions[1];
+} WIRE_ORPCTHAT;
+
+struct channel_hook_entry
+{
+    struct list entry;
+    GUID id;
+    IChannelHook *hook;
+};
+
+struct channel_hook_buffer_data
+{
+    GUID id;
+    ULONG extension_size;
+};
+void * __RPC_USER MIDL_user_allocate(SIZE_T size)
+{
+    return heap_alloc(size);
+}
+
+void __RPC_USER MIDL_user_free(void *p)
+{
+    heap_free(p);
+}
+
+static LONG WINAPI rpc_filter(EXCEPTION_POINTERS *eptr)
+{
+    return I_RpcExceptionFilter(eptr->ExceptionRecord->ExceptionCode);
+}
+
+static BOOL start_rpcss(void)
+{
+    SERVICE_STATUS_PROCESS status;
+    SC_HANDLE scm, service;
+    BOOL ret = FALSE;
+
+    TRACE("\n");
+
+    if (!(scm = OpenSCManagerW(NULL, NULL, 0)))
+    {
+        ERR("Failed to open service manager\n");
+        return FALSE;
+    }
+
+    if (!(service = OpenServiceW(scm, L"RpcSs", SERVICE_START | SERVICE_QUERY_STATUS)))
+    {
+        ERR("Failed to open RpcSs service\n");
+        CloseServiceHandle( scm );
+        return FALSE;
+    }
+
+    if (StartServiceW(service, 0, NULL) || GetLastError() == ERROR_SERVICE_ALREADY_RUNNING)
+    {
+        ULONGLONG start_time = GetTickCount64();
+        do
+        {
+            DWORD dummy;
+
+            if (!QueryServiceStatusEx(service, SC_STATUS_PROCESS_INFO, (BYTE *)&status, sizeof(status), &dummy))
+                break;
+            if (status.dwCurrentState == SERVICE_RUNNING)
+            {
+                ret = TRUE;
+                break;
+            }
+            if (GetTickCount64() - start_time > 30000) break;
+            Sleep( 100 );
+
+        } while (status.dwCurrentState == SERVICE_START_PENDING);
+
+        if (status.dwCurrentState != SERVICE_RUNNING)
+            WARN("RpcSs failed to start %u\n", status.dwCurrentState);
+    }
+    else
+        ERR("Failed to start RpcSs service\n");
+
+    CloseServiceHandle(service);
+    CloseServiceHandle(scm);
+    return ret;
+}
+
+static RPC_BINDING_HANDLE get_rpc_handle(unsigned short *protseq, unsigned short *endpoint)
+{
+    RPC_BINDING_HANDLE handle = NULL;
+    RPC_STATUS status;
+    RPC_WSTR binding;
+
+    status = RpcStringBindingComposeW(NULL, protseq, NULL, endpoint, NULL, &binding);
+    if (status == RPC_S_OK)
+    {
+        status = RpcBindingFromStringBindingW(binding, &handle);
+        RpcStringFreeW(&binding);
+    }
+
+    return handle;
+}
+
+static RPC_BINDING_HANDLE get_irpcss_handle(void)
+{
+    static RPC_BINDING_HANDLE irpcss_handle;
+
+    if (!irpcss_handle)
+    {
+        unsigned short protseq[] = IRPCSS_PROTSEQ;
+        unsigned short endpoint[] = IRPCSS_ENDPOINT;
+
+        RPC_BINDING_HANDLE new_handle = get_rpc_handle(protseq, endpoint);
+        if (InterlockedCompareExchangePointer(&irpcss_handle, new_handle, NULL))
+            /* another thread beat us to it */
+            RpcBindingFree(&new_handle);
+    }
+    return irpcss_handle;
+}
+
+static RPC_BINDING_HANDLE get_irot_handle(void)
+{
+    static RPC_BINDING_HANDLE irot_handle;
+
+    if (!irot_handle)
+    {
+        unsigned short protseq[] = IROT_PROTSEQ;
+        unsigned short endpoint[] = IROT_ENDPOINT;
+
+        RPC_BINDING_HANDLE new_handle = get_rpc_handle(protseq, endpoint);
+        if (InterlockedCompareExchangePointer(&irot_handle, new_handle, NULL))
+            /* another thread beat us to it */
+            RpcBindingFree(&new_handle);
+    }
+    return irot_handle;
+}
+
+#define RPCSS_CALL_START \
+    HRESULT hr; \
+    for (;;) { \
+        __TRY {
+
+#define RPCSS_CALL_END \
+        } __EXCEPT(rpc_filter) { \
+            hr = HRESULT_FROM_WIN32(GetExceptionCode()); \
+        } \
+        __ENDTRY \
+        if (hr == HRESULT_FROM_WIN32(RPC_S_SERVER_UNAVAILABLE)) { \
+            if (start_rpcss()) \
+                continue; \
+        } \
+        break; \
+    } \
+    return hr;
+
+HRESULT rpcss_get_next_seqid(DWORD *id)
+{
+    RPCSS_CALL_START
+    hr = irpcss_get_thread_seq_id(get_irpcss_handle(), id);
+    RPCSS_CALL_END
+}
+
+HRESULT WINAPI InternalIrotRegister(const MonikerComparisonData *moniker_data,
+        const InterfaceData *object, const InterfaceData *moniker,
+        const FILETIME *time, DWORD flags, IrotCookie *cookie, IrotContextHandle *ctxt_handle)
+{
+    RPCSS_CALL_START
+    hr = IrotRegister(get_irot_handle(), moniker_data, object, moniker, time, flags, cookie, ctxt_handle);
+    RPCSS_CALL_END
+}
+
+HRESULT WINAPI InternalIrotIsRunning(const MonikerComparisonData *moniker_data)
+{
+    RPCSS_CALL_START
+    hr = IrotIsRunning(get_irot_handle(), moniker_data);
+    RPCSS_CALL_END
+}
+
+HRESULT WINAPI InternalIrotGetObject(const MonikerComparisonData *moniker_data, PInterfaceData *obj,
+        IrotCookie *cookie)
+{
+    RPCSS_CALL_START
+    hr = IrotGetObject(get_irot_handle(), moniker_data, obj, cookie);
+    RPCSS_CALL_END
+}
+
+HRESULT WINAPI InternalIrotNoteChangeTime(IrotCookie cookie, const FILETIME *time)
+{
+    RPCSS_CALL_START
+    hr = IrotNoteChangeTime(get_irot_handle(), cookie, time);
+    RPCSS_CALL_END
+}
+
+HRESULT WINAPI InternalIrotGetTimeOfLastChange(const MonikerComparisonData *moniker_data, FILETIME *time)
+{
+    RPCSS_CALL_START
+    hr = IrotGetTimeOfLastChange(get_irot_handle(), moniker_data, time);
+    RPCSS_CALL_END
+}
+
+HRESULT WINAPI InternalIrotEnumRunning(PInterfaceList *list)
+{
+    RPCSS_CALL_START
+    hr = IrotEnumRunning(get_irot_handle(), list);
+    RPCSS_CALL_END
+}
+
+HRESULT WINAPI InternalIrotRevoke(IrotCookie cookie, IrotContextHandle *ctxt_handle, PInterfaceData *object,
+        PInterfaceData *moniker)
+{
+    RPCSS_CALL_START
+    hr = IrotRevoke(get_irot_handle(), cookie, ctxt_handle, object, moniker);
+    RPCSS_CALL_END
+}
+
+static HRESULT rpcss_server_register(REFCLSID clsid, DWORD flags, MInterfacePointer *obj, unsigned int *cookie)
+{
+    RPCSS_CALL_START
+    hr = irpcss_server_register(get_irpcss_handle(), clsid, flags, obj, cookie);
+    RPCSS_CALL_END
+}
+
+HRESULT rpc_revoke_local_server(unsigned int cookie)
+{
+    RPCSS_CALL_START
+    hr = irpcss_server_revoke(get_irpcss_handle(), cookie);
+    RPCSS_CALL_END
+}
+
+static HRESULT rpcss_get_class_object(REFCLSID rclsid, PMInterfacePointer *objref)
+{
+    RPCSS_CALL_START
+    hr = irpcss_get_class_object(get_irpcss_handle(), rclsid, objref);
+    RPCSS_CALL_END
+}
+
+static DWORD start_local_service(const WCHAR *name, DWORD num, LPCWSTR *params)
+{
+    SC_HANDLE handle, hsvc;
+    DWORD r = ERROR_FUNCTION_FAILED;
+
+    TRACE("Starting service %s %d params\n", debugstr_w(name), num);
+
+    handle = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT);
+    if (!handle)
+        return r;
+    hsvc = OpenServiceW(handle, name, SERVICE_START);
+    if (hsvc)
+    {
+        if(StartServiceW(hsvc, num, params))
+            r = ERROR_SUCCESS;
+        else
+            r = GetLastError();
+        if (r == ERROR_SERVICE_ALREADY_RUNNING)
+            r = ERROR_SUCCESS;
+        CloseServiceHandle(hsvc);
+    }
+    else
+        r = GetLastError();
+    CloseServiceHandle(handle);
+
+    TRACE("StartService returned error %u (%s)\n", r, (r == ERROR_SUCCESS) ? "ok":"failed");
+
+    return r;
+}
+
+/*
+ * create_local_service()  - start a COM server in a service
+ *
+ *   To start a Local Service, we read the AppID value under
+ * the class's CLSID key, then open the HKCR\\AppId key specified
+ * there and check for a LocalService value.
+ *
+ * Note:  Local Services are not supported under Windows 9x
+ */
+static HRESULT create_local_service(REFCLSID rclsid)
+{
+    HRESULT hr;
+    WCHAR buf[CHARS_IN_GUID];
+    HKEY hkey;
+    LONG r;
+    DWORD type, sz;
+
+    TRACE("Attempting to start Local service for %s\n", debugstr_guid(rclsid));
+
+    hr = open_appidkey_from_clsid(rclsid, KEY_READ, &hkey);
+    if (FAILED(hr))
+        return hr;
+
+    /* read the LocalService and ServiceParameters values from the AppID key */
+    sz = sizeof buf;
+    r = RegQueryValueExW(hkey, L"LocalService", NULL, &type, (LPBYTE)buf, &sz);
+    if (r == ERROR_SUCCESS && type == REG_SZ)
+    {
+        DWORD num_args = 0;
+        LPWSTR args[1] = { NULL };
+
+        /*
+         * FIXME: I'm not really sure how to deal with the service parameters.
+         *        I suspect that the string returned from RegQueryValueExW
+         *        should be split into a number of arguments by spaces.
+         *        It would make more sense if ServiceParams contained a
+         *        REG_MULTI_SZ here, but it's a REG_SZ for the services
+         *        that I'm interested in for the moment.
+         */
+        r = RegQueryValueExW(hkey, L"ServiceParams", NULL, &type, NULL, &sz);
+        if (r == ERROR_SUCCESS && type == REG_SZ && sz)
+        {
+            args[0] = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sz);
+            num_args++;
+            RegQueryValueExW(hkey, L"ServiceParams", NULL, &type, (LPBYTE)args[0], &sz);
+        }
+        r = start_local_service(buf, num_args, (LPCWSTR *)args);
+        if (r != ERROR_SUCCESS)
+            hr = REGDB_E_CLASSNOTREG; /* FIXME: check retval */
+        HeapFree(GetProcessHeap(),0,args[0]);
+    }
+    else
+    {
+        WARN("No LocalService value\n");
+        hr = REGDB_E_CLASSNOTREG; /* FIXME: check retval */
+    }
+    RegCloseKey(hkey);
+
+    return hr;
+}
+
+static HRESULT create_server(REFCLSID rclsid, HANDLE *process)
+{
+    static const WCHAR  embeddingW[] = L" -Embedding";
+    HKEY                key;
+    HRESULT             hr;
+    WCHAR               command[MAX_PATH + ARRAY_SIZE(embeddingW)];
+    DWORD               size = (MAX_PATH+1) * sizeof(WCHAR);
+    STARTUPINFOW        sinfo;
+    PROCESS_INFORMATION pinfo;
+    LONG ret;
+
+    hr = open_key_for_clsid(rclsid, L"LocalServer32", KEY_READ, &key);
+    if (FAILED(hr))
+    {
+        ERR("class %s not registered\n", debugstr_guid(rclsid));
+        return hr;
+    }
+
+    ret = RegQueryValueExW(key, NULL, NULL, NULL, (LPBYTE)command, &size);
+    RegCloseKey(key);
+    if (ret)
+    {
+        WARN("No default value for LocalServer32 key\n");
+        return REGDB_E_CLASSNOTREG; /* FIXME: check retval */
+    }
+
+    memset(&sinfo, 0, sizeof(sinfo));
+    sinfo.cb = sizeof(sinfo);
+
+    /* EXE servers are started with the -Embedding switch. */
+
+    lstrcatW(command, embeddingW);
+
+    TRACE("activating local server %s for %s\n", debugstr_w(command), debugstr_guid(rclsid));
+
+    /* FIXME: Win2003 supports a ServerExecutable value that is passed into
+     * CreateProcess */
+    if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &sinfo, &pinfo))
+    {
+        WARN("failed to run local server %s\n", debugstr_w(command));
+        return HRESULT_FROM_WIN32(GetLastError());
+    }
+    *process = pinfo.hProcess;
+    CloseHandle(pinfo.hThread);
+
+    return S_OK;
+}
+
+HRESULT rpc_get_local_class_object(REFCLSID rclsid, REFIID riid, void **obj)
+{
+    PMInterfacePointer objref = NULL;
+    IServiceProvider *local_server;
+    IStream *stream = NULL;
+    ULARGE_INTEGER newpos;
+    LARGE_INTEGER seekto;
+    int tries = 0;
+    ULONG length;
+    HRESULT hr;
+    static const int MAXTRIES = 30; /* 30 seconds */
+
+    TRACE("clsid %s, riid %s\n", debugstr_guid(rclsid), debugstr_guid(riid));
+
+    while (tries++ < MAXTRIES)
+    {
+        DWORD index, start_ticks;
+        HANDLE process = 0;
+
+        if (SUCCEEDED(hr = rpcss_get_class_object(rclsid, &objref)))
+            break;
+
+        if (tries == 1)
+        {
+            if ((hr = create_local_service(rclsid)) && (hr = create_server(rclsid, &process)) )
+                return hr;
+        }
+
+        /* Wait for one second, even if messages arrive. */
+        start_ticks = GetTickCount();
+        do
+        {
+            if (SUCCEEDED(CoWaitForMultipleHandles(0, 1000, (process != 0), &process, &index)) && process && !index)
+            {
+                WARN("Server for %s failed to start.\n", debugstr_guid(rclsid));
+                CloseHandle(process);
+                return E_NOINTERFACE;
+            }
+        } while (GetTickCount() - start_ticks < 1000);
+
+        if (process) CloseHandle(process);
+    }
+
+    if (!objref || tries >= MAXTRIES)
+        return E_NOINTERFACE;
+
+    if (SUCCEEDED(hr = CreateStreamOnHGlobal(0, TRUE, &stream)))
+        hr = IStream_Write(stream, objref->abData, objref->ulCntData, &length);
+
+    MIDL_user_free(objref);
+
+    if (SUCCEEDED(hr))
+    {
+        seekto.QuadPart = 0;
+        IStream_Seek(stream, seekto, STREAM_SEEK_SET, &newpos);
+
+        TRACE("Unmarshalling local server.\n");
+        hr = CoUnmarshalInterface(stream, &IID_IServiceProvider, (void **)&local_server);
+        if (SUCCEEDED(hr))
+        {
+            hr = IServiceProvider_QueryService(local_server, rclsid, riid, obj);
+            IServiceProvider_Release(local_server);
+        }
+    }
+
+    if (stream)
+        IStream_Release(stream);
+
+    return hr;
+}
+
+HRESULT rpc_register_local_server(REFCLSID clsid, IStream *stream, DWORD flags, unsigned int *cookie)
+{
+    MInterfacePointer *obj;
+    const void *ptr;
+    HGLOBAL hmem;
+    SIZE_T size;
+    HRESULT hr;
+
+    TRACE("%s, %#x\n", debugstr_guid(clsid), flags);
+
+    hr = GetHGlobalFromStream(stream, &hmem);
+    if (FAILED(hr)) return hr;
+
+    size = GlobalSize(hmem);
+    if (!(obj = heap_alloc(FIELD_OFFSET(MInterfacePointer, abData[size]))))
+        return E_OUTOFMEMORY;
+    obj->ulCntData = size;
+    ptr = GlobalLock(hmem);
+    memcpy(obj->abData, ptr, size);
+    GlobalUnlock(hmem);
+
+    hr = rpcss_server_register(clsid, flags, obj, cookie);
+
+    heap_free(obj);
+
+    return hr;
+}
+
+static HRESULT unmarshal_ORPCTHAT(RPC_MESSAGE *msg, ORPCTHAT *orpcthat, ORPC_EXTENT_ARRAY *orpc_ext_array,
+        WIRE_ORPC_EXTENT **first_wire_orpc_extent);
+
+/* Channel Hook Functions */
+
+static ULONG ChannelHooks_ClientGetSize(SChannelHookCallInfo *info, struct channel_hook_buffer_data **data,
+        unsigned int *hook_count, ULONG *extension_count)
+{
+    struct channel_hook_entry *entry;
+    ULONG total_size = 0;
+    unsigned int hook_index = 0;
+
+    *hook_count = 0;
+    *extension_count = 0;
+
+    EnterCriticalSection(&csChannelHook);
+
+    LIST_FOR_EACH_ENTRY(entry, &channel_hooks, struct channel_hook_entry, entry)
+        (*hook_count)++;
+
+    if (*hook_count)
+        *data = HeapAlloc(GetProcessHeap(), 0, *hook_count * sizeof(struct channel_hook_buffer_data));
+    else
+        *data = NULL;
+
+    LIST_FOR_EACH_ENTRY(entry, &channel_hooks, struct channel_hook_entry, entry)
+    {
+        ULONG extension_size = 0;
+
+        IChannelHook_ClientGetSize(entry->hook, &entry->id, &info->iid, &extension_size);
+
+        TRACE("%s: extension_size = %u\n", debugstr_guid(&entry->id), extension_size);
+
+        extension_size = (extension_size+7)&~7;
+        (*data)[hook_index].id = entry->id;
+        (*data)[hook_index].extension_size = extension_size;
+
+        /* an extension is only put onto the wire if it has data to write */
+        if (extension_size)
+        {
+            total_size += FIELD_OFFSET(WIRE_ORPC_EXTENT, data[extension_size]);
+            (*extension_count)++;
+        }
+
+        hook_index++;
+    }
+
+    LeaveCriticalSection(&csChannelHook);
+
+    return total_size;
+}
+
+static unsigned char * ChannelHooks_ClientFillBuffer(SChannelHookCallInfo *info,
+    unsigned char *buffer, struct channel_hook_buffer_data *data,
+    unsigned int hook_count)
+{
+    struct channel_hook_entry *entry;
+
+    EnterCriticalSection(&csChannelHook);
+
+    LIST_FOR_EACH_ENTRY(entry, &channel_hooks, struct channel_hook_entry, entry)
+    {
+        unsigned int i;
+        ULONG extension_size = 0;
+        WIRE_ORPC_EXTENT *wire_orpc_extent = (WIRE_ORPC_EXTENT *)buffer;
+
+        for (i = 0; i < hook_count; i++)
+            if (IsEqualGUID(&entry->id, &data[i].id))
+                extension_size = data[i].extension_size;
+
+        /* an extension is only put onto the wire if it has data to write */
+        if (!extension_size)
+            continue;
+
+        IChannelHook_ClientFillBuffer(entry->hook, &entry->id, &info->iid,
+            &extension_size, buffer + FIELD_OFFSET(WIRE_ORPC_EXTENT, data[0]));
+
+        TRACE("%s: extension_size = %u\n", debugstr_guid(&entry->id), extension_size);
+
+        /* FIXME: set unused portion of wire_orpc_extent->data to 0? */
+
+        wire_orpc_extent->conformance = (extension_size+7)&~7;
+        wire_orpc_extent->size = extension_size;
+        wire_orpc_extent->id = entry->id;
+        buffer += FIELD_OFFSET(WIRE_ORPC_EXTENT, data[wire_orpc_extent->conformance]);
+    }
+
+    LeaveCriticalSection(&csChannelHook);
+
+    return buffer;
+}
+
+static void ChannelHooks_ServerNotify(SChannelHookCallInfo *info,
+    DWORD lDataRep, WIRE_ORPC_EXTENT *first_wire_orpc_extent,
+    ULONG extension_count)
+{
+    struct channel_hook_entry *entry;
+    ULONG i;
+
+    EnterCriticalSection(&csChannelHook);
+
+    LIST_FOR_EACH_ENTRY(entry, &channel_hooks, struct channel_hook_entry, entry)
+    {
+        WIRE_ORPC_EXTENT *wire_orpc_extent;
+        for (i = 0, wire_orpc_extent = first_wire_orpc_extent;
+             i < extension_count;
+             i++, wire_orpc_extent = (WIRE_ORPC_EXTENT *)&wire_orpc_extent->data[wire_orpc_extent->conformance])
+        {
+            if (IsEqualGUID(&entry->id, &wire_orpc_extent->id))
+                break;
+        }
+        if (i == extension_count) wire_orpc_extent = NULL;
+
+        IChannelHook_ServerNotify(entry->hook, &entry->id, &info->iid,
+            wire_orpc_extent ? wire_orpc_extent->size : 0,
+            wire_orpc_extent ? wire_orpc_extent->data : NULL,
+            lDataRep);
+    }
+
+    LeaveCriticalSection(&csChannelHook);
+}
+
+static ULONG ChannelHooks_ServerGetSize(SChannelHookCallInfo *info,
+                                        struct channel_hook_buffer_data **data, unsigned int *hook_count,
+                                        ULONG *extension_count)
+{
+    struct channel_hook_entry *entry;
+    ULONG total_size = 0;
+    unsigned int hook_index = 0;
+
+    *hook_count = 0;
+    *extension_count = 0;
+
+    EnterCriticalSection(&csChannelHook);
+
+    LIST_FOR_EACH_ENTRY(entry, &channel_hooks, struct channel_hook_entry, entry)
+        (*hook_count)++;
+
+    if (*hook_count)
+        *data = HeapAlloc(GetProcessHeap(), 0, *hook_count * sizeof(struct channel_hook_buffer_data));
+    else
+        *data = NULL;
+
+    LIST_FOR_EACH_ENTRY(entry, &channel_hooks, struct channel_hook_entry, entry)
+    {
+        ULONG extension_size = 0;
+
+        IChannelHook_ServerGetSize(entry->hook, &entry->id, &info->iid, S_OK,
+                                   &extension_size);
+
+        TRACE("%s: extension_size = %u\n", debugstr_guid(&entry->id), extension_size);
+
+        extension_size = (extension_size+7)&~7;
+        (*data)[hook_index].id = entry->id;
+        (*data)[hook_index].extension_size = extension_size;
+
+        /* an extension is only put onto the wire if it has data to write */
+        if (extension_size)
+        {
+            total_size += FIELD_OFFSET(WIRE_ORPC_EXTENT, data[extension_size]);
+            (*extension_count)++;
+        }
+
+        hook_index++;
+    }
+
+    LeaveCriticalSection(&csChannelHook);
+
+    return total_size;
+}
+
+static unsigned char * ChannelHooks_ServerFillBuffer(SChannelHookCallInfo *info,
+                                                     unsigned char *buffer, struct channel_hook_buffer_data *data,
+                                                     unsigned int hook_count)
+{
+    struct channel_hook_entry *entry;
+
+    EnterCriticalSection(&csChannelHook);
+
+    LIST_FOR_EACH_ENTRY(entry, &channel_hooks, struct channel_hook_entry, entry)
+    {
+        unsigned int i;
+        ULONG extension_size = 0;
+        WIRE_ORPC_EXTENT *wire_orpc_extent = (WIRE_ORPC_EXTENT *)buffer;
+
+        for (i = 0; i < hook_count; i++)
+            if (IsEqualGUID(&entry->id, &data[i].id))
+                extension_size = data[i].extension_size;
+
+        /* an extension is only put onto the wire if it has data to write */
+        if (!extension_size)
+            continue;
+
+        IChannelHook_ServerFillBuffer(entry->hook, &entry->id, &info->iid,
+                                      &extension_size, buffer + FIELD_OFFSET(WIRE_ORPC_EXTENT, data[0]),
+                                      S_OK);
+
+        TRACE("%s: extension_size = %u\n", debugstr_guid(&entry->id), extension_size);
+
+        /* FIXME: set unused portion of wire_orpc_extent->data to 0? */
+
+        wire_orpc_extent->conformance = (extension_size+7)&~7;
+        wire_orpc_extent->size = extension_size;
+        wire_orpc_extent->id = entry->id;
+        buffer += FIELD_OFFSET(WIRE_ORPC_EXTENT, data[wire_orpc_extent->conformance]);
+    }
+
+    LeaveCriticalSection(&csChannelHook);
+
+    return buffer;
+}
+
+static void ChannelHooks_ClientNotify(SChannelHookCallInfo *info,
+                                      DWORD lDataRep, WIRE_ORPC_EXTENT *first_wire_orpc_extent,
+                                      ULONG extension_count, HRESULT hrFault)
+{
+    struct channel_hook_entry *entry;
+    ULONG i;
+
+    EnterCriticalSection(&csChannelHook);
+
+    LIST_FOR_EACH_ENTRY(entry, &channel_hooks, struct channel_hook_entry, entry)
+    {
+        WIRE_ORPC_EXTENT *wire_orpc_extent;
+        for (i = 0, wire_orpc_extent = first_wire_orpc_extent;
+             i < extension_count;
+             i++, wire_orpc_extent = (WIRE_ORPC_EXTENT *)&wire_orpc_extent->data[wire_orpc_extent->conformance])
+        {
+            if (IsEqualGUID(&entry->id, &wire_orpc_extent->id))
+                break;
+        }
+        if (i == extension_count) wire_orpc_extent = NULL;
+
+        IChannelHook_ClientNotify(entry->hook, &entry->id, &info->iid,
+                                  wire_orpc_extent ? wire_orpc_extent->size : 0,
+                                  wire_orpc_extent ? wire_orpc_extent->data : NULL,
+                                  lDataRep, hrFault);
+    }
+
+    LeaveCriticalSection(&csChannelHook);
+}
+
+HRESULT rpc_register_channel_hook(REFGUID rguid, IChannelHook *hook)
+{
+    struct channel_hook_entry *entry;
+
+    entry = HeapAlloc(GetProcessHeap(), 0, sizeof(*entry));
+    if (!entry)
+        return E_OUTOFMEMORY;
+
+    entry->id = *rguid;
+    entry->hook = hook;
+    IChannelHook_AddRef(hook);
+
+    EnterCriticalSection(&csChannelHook);
+    list_add_tail(&channel_hooks, &entry->entry);
+    LeaveCriticalSection(&csChannelHook);
+
+    return S_OK;
+}
+
+void rpc_unregister_channel_hooks(void)
+{
+    struct channel_hook_entry *cursor;
+    struct channel_hook_entry *cursor2;
+
+    EnterCriticalSection(&csChannelHook);
+    LIST_FOR_EACH_ENTRY_SAFE(cursor, cursor2, &channel_hooks, struct channel_hook_entry, entry)
+        HeapFree(GetProcessHeap(), 0, cursor);
+    LeaveCriticalSection(&csChannelHook);
+    DeleteCriticalSection(&csChannelHook);
+    DeleteCriticalSection(&csRegIf);
+}
+
+/* RPC Channel Buffer Functions */
+
+static HRESULT WINAPI RpcChannelBuffer_QueryInterface(IRpcChannelBuffer *iface, REFIID riid, LPVOID *ppv)
+{
+    *ppv = NULL;
+    if (IsEqualIID(riid,&IID_IRpcChannelBuffer) || IsEqualIID(riid,&IID_IUnknown))
+    {
+        *ppv = iface;
+        IRpcChannelBuffer_AddRef(iface);
+        return S_OK;
+    }
+    return E_NOINTERFACE;
+}
+
+static ULONG WINAPI RpcChannelBuffer_AddRef(LPRPCCHANNELBUFFER iface)
+{
+    RpcChannelBuffer *This = (RpcChannelBuffer *)iface;
+    return InterlockedIncrement(&This->refs);
+}
+
+static ULONG WINAPI ServerRpcChannelBuffer_Release(LPRPCCHANNELBUFFER iface)
+{
+    RpcChannelBuffer *This = (RpcChannelBuffer *)iface;
+    ULONG ref;
+
+    ref = InterlockedDecrement(&This->refs);
+    if (ref)
+        return ref;
+
+    HeapFree(GetProcessHeap(), 0, This);
+    return 0;
+}
+
+static ULONG WINAPI ClientRpcChannelBuffer_Release(LPRPCCHANNELBUFFER iface)
+{
+    ClientRpcChannelBuffer *This = (ClientRpcChannelBuffer *)iface;
+    ULONG ref;
+
+    ref = InterlockedDecrement(&This->super.refs);
+    if (ref)
+        return ref;
+
+    if (This->event) CloseHandle(This->event);
+    RpcBindingFree(&This->bind);
+    HeapFree(GetProcessHeap(), 0, This);
+    return 0;
+}
+
+static HRESULT WINAPI ServerRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, RPCOLEMESSAGE* olemsg, REFIID riid)
+{
+    RpcChannelBuffer *This = (RpcChannelBuffer *)iface;
+    RPC_MESSAGE *msg = (RPC_MESSAGE *)olemsg;
+    RPC_STATUS status;
+    ORPCTHAT *orpcthat;
+    struct message_state *message_state;
+    ULONG extensions_size;
+    struct channel_hook_buffer_data *channel_hook_data;
+    unsigned int channel_hook_count;
+    ULONG extension_count;
+
+    TRACE("(%p)->(%p,%s)\n", This, olemsg, debugstr_guid(riid));
+
+    message_state = msg->Handle;
+    /* restore the binding handle and the real start of data */
+    msg->Handle = message_state->binding_handle;
+    msg->Buffer = (char *)msg->Buffer - message_state->prefix_data_len;
+
+    extensions_size = ChannelHooks_ServerGetSize(&message_state->channel_hook_info,
+                                                 &channel_hook_data, &channel_hook_count, &extension_count);
+
+    msg->BufferLength += FIELD_OFFSET(WIRE_ORPCTHAT, extensions) + sizeof(DWORD);
+    if (extensions_size)
+    {
+        msg->BufferLength += FIELD_OFFSET(WIRE_ORPC_EXTENT_ARRAY, extent[2*sizeof(DWORD) + extensions_size]);
+        if (extension_count & 1)
+            msg->BufferLength += FIELD_OFFSET(WIRE_ORPC_EXTENT, data[0]);
+    }
+
+    if (message_state->bypass_rpcrt)
+    {
+        msg->Buffer = HeapAlloc(GetProcessHeap(), 0, msg->BufferLength);
+        if (msg->Buffer)
+            status = RPC_S_OK;
+        else
+        {
+            HeapFree(GetProcessHeap(), 0, channel_hook_data);
+            return E_OUTOFMEMORY;
+        }
+    }
+    else
+        status = I_RpcGetBuffer(msg);
+
+    orpcthat = msg->Buffer;
+    msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPCTHAT, extensions);
+
+    orpcthat->flags = ORPCF_NULL /* FIXME? */;
+
+    /* NDR representation of orpcthat->extensions */
+    *(DWORD *)msg->Buffer = extensions_size ? 1 : 0;
+    msg->Buffer = (char *)msg->Buffer + sizeof(DWORD);
+
+    if (extensions_size)
+    {
+        WIRE_ORPC_EXTENT_ARRAY *orpc_extent_array = msg->Buffer;
+        orpc_extent_array->size = extension_count;
+        orpc_extent_array->reserved = 0;
+        msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPC_EXTENT_ARRAY, extent);
+        /* NDR representation of orpc_extent_array->extent */
+        *(DWORD *)msg->Buffer = 1;
+        msg->Buffer = (char *)msg->Buffer + sizeof(DWORD);
+        /* NDR representation of [size_is] attribute of orpc_extent_array->extent */
+        *(DWORD *)msg->Buffer = (extension_count + 1) & ~1;
+        msg->Buffer = (char *)msg->Buffer + sizeof(DWORD);
+
+        msg->Buffer = ChannelHooks_ServerFillBuffer(&message_state->channel_hook_info,
+                                                    msg->Buffer, channel_hook_data, channel_hook_count);
+
+        /* we must add a dummy extension if there is an odd extension
+         * count to meet the contract specified by the size_is attribute */
+        if (extension_count & 1)
+        {
+            WIRE_ORPC_EXTENT *wire_orpc_extent = msg->Buffer;
+            wire_orpc_extent->conformance = 0;
+            wire_orpc_extent->id = GUID_NULL;
+            wire_orpc_extent->size = 0;
+            msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPC_EXTENT, data[0]);
+        }
+    }
+
+    HeapFree(GetProcessHeap(), 0, channel_hook_data);
+
+    /* store the prefixed data length so that we can restore the real buffer
+     * later */
+    message_state->prefix_data_len = (char *)msg->Buffer - (char *)orpcthat;
+    msg->BufferLength -= message_state->prefix_data_len;
+    /* save away the message state again */
+    msg->Handle = message_state;
+
+    TRACE("-- %d\n", status);
+
+    return HRESULT_FROM_WIN32(status);
+}
+
+static HANDLE ClientRpcChannelBuffer_GetEventHandle(ClientRpcChannelBuffer *This)
+{
+    HANDLE event = InterlockedExchangePointer(&This->event, NULL);
+
+    /* Note: must be auto-reset event so we can reuse it without a call
+    * to ResetEvent */
+    if (!event) event = CreateEventW(NULL, FALSE, FALSE, NULL);
+
+    return event;
+}
+
+static void ClientRpcChannelBuffer_ReleaseEventHandle(ClientRpcChannelBuffer *This, HANDLE event)
+{
+    if (InterlockedCompareExchangePointer(&This->event, event, NULL))
+        /* already a handle cached in This */
+        CloseHandle(event);
+}
+
+static HRESULT WINAPI ClientRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, RPCOLEMESSAGE* olemsg, REFIID riid)
+{
+    ClientRpcChannelBuffer *This = (ClientRpcChannelBuffer *)iface;
+    RPC_MESSAGE *msg = (RPC_MESSAGE *)olemsg;
+    RPC_CLIENT_INTERFACE *cif;
+    RPC_STATUS status;
+    ORPCTHIS *orpcthis;
+    struct message_state *message_state;
+    ULONG extensions_size;
+    struct channel_hook_buffer_data *channel_hook_data;
+    unsigned int channel_hook_count;
+    ULONG extension_count;
+    IPID ipid;
+    HRESULT hr;
+    struct apartment *apt = NULL;
+
+    TRACE("(%p)->(%p,%s)\n", This, olemsg, debugstr_guid(riid));
+
+    cif = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(RPC_CLIENT_INTERFACE));
+    if (!cif)
+        return E_OUTOFMEMORY;
+
+    message_state = HeapAlloc(GetProcessHeap(), 0, sizeof(*message_state));
+    if (!message_state)
+    {
+        HeapFree(GetProcessHeap(), 0, cif);
+        return E_OUTOFMEMORY;
+    }
+
+    cif->Length = sizeof(RPC_CLIENT_INTERFACE);
+    /* RPC interface ID = COM interface ID */
+    cif->InterfaceId.SyntaxGUID = This->iid;
+    /* COM objects always have a version of 0.0 */
+    cif->InterfaceId.SyntaxVersion.MajorVersion = 0;
+    cif->InterfaceId.SyntaxVersion.MinorVersion = 0;
+    msg->Handle = This->bind;
+    msg->RpcInterfaceInformation = cif;
+
+    message_state->prefix_data_len = 0;
+    message_state->binding_handle = This->bind;
+
+    message_state->channel_hook_info.iid = *riid;
+    message_state->channel_hook_info.cbSize = sizeof(message_state->channel_hook_info);
+    CoGetCurrentLogicalThreadId(&message_state->channel_hook_info.uCausality);
+    message_state->channel_hook_info.dwServerPid = This->server_pid;
+    message_state->channel_hook_info.iMethod = msg->ProcNum & ~RPC_FLAGS_VALID_BIT;
+    message_state->channel_hook_info.pObject = NULL; /* only present on server-side */
+    message_state->target_hwnd = NULL;
+    message_state->target_tid = 0;
+    memset(&message_state->params, 0, sizeof(message_state->params));
+
+    extensions_size = ChannelHooks_ClientGetSize(&message_state->channel_hook_info,
+        &channel_hook_data, &channel_hook_count, &extension_count);
+
+    msg->BufferLength += FIELD_OFFSET(WIRE_ORPCTHIS, extensions) + sizeof(DWORD);
+    if (extensions_size)
+    {
+        msg->BufferLength += FIELD_OFFSET(WIRE_ORPC_EXTENT_ARRAY, extent[2*sizeof(DWORD) + extensions_size]);
+        if (extension_count & 1)
+            msg->BufferLength += FIELD_OFFSET(WIRE_ORPC_EXTENT, data[0]);
+    }
+
+    RpcBindingInqObject(message_state->binding_handle, &ipid);
+    hr = ipid_get_dispatch_params(&ipid, &apt, NULL, &message_state->params.stub,
+                                  &message_state->params.chan,
+                                  &message_state->params.iid,
+                                  &message_state->params.iface);
+    if (hr == S_OK)
+    {
+        /* stub, chan, iface and iid are unneeded in multi-threaded case as we go
+         * via the RPC runtime */
+        if (apt->multi_threaded)
+        {
+            IRpcStubBuffer_Release(message_state->params.stub);
+            message_state->params.stub = NULL;
+            IRpcChannelBuffer_Release(message_state->params.chan);
+            message_state->params.chan = NULL;
+            message_state->params.iface = NULL;
+        }
+        else
+        {
+            message_state->params.bypass_rpcrt = TRUE;
+            message_state->target_hwnd = apartment_getwindow(apt);
+            message_state->target_tid = apt->tid;
+            /* we assume later on that this being non-NULL is the indicator that
+             * means call directly instead of going through RPC runtime */
+            if (!message_state->target_hwnd)
+                ERR("window for apartment %s is NULL\n", wine_dbgstr_longlong(apt->oxid));
+        }
+    }
+    if (apt) apartment_release(apt);
+    message_state->params.handle = ClientRpcChannelBuffer_GetEventHandle(This);
+    /* Note: message_state->params.msg is initialised in
+     * ClientRpcChannelBuffer_SendReceive */
+
+    /* shortcut the RPC runtime */
+    if (message_state->target_hwnd)
+    {
+        msg->Buffer = HeapAlloc(GetProcessHeap(), 0, msg->BufferLength);
+        if (msg->Buffer)
+            status = RPC_S_OK;
+        else
+            status = ERROR_OUTOFMEMORY;
+    }
+    else
+        status = I_RpcGetBuffer(msg);
+
+    msg->Handle = message_state;
+
+    if (status == RPC_S_OK)
+    {
+        orpcthis = msg->Buffer;
+        msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPCTHIS, extensions);
+
+        orpcthis->version.MajorVersion = COM_MAJOR_VERSION;
+        orpcthis->version.MinorVersion = COM_MINOR_VERSION;
+        orpcthis->flags = message_state->channel_hook_info.dwServerPid ? ORPCF_LOCAL : ORPCF_NULL;
+        orpcthis->reserved1 = 0;
+        orpcthis->cid = message_state->channel_hook_info.uCausality;
+
+        /* NDR representation of orpcthis->extensions */
+        *(DWORD *)msg->Buffer = extensions_size ? 1 : 0;
+        msg->Buffer = (char *)msg->Buffer + sizeof(DWORD);
+
+        if (extensions_size)
+        {
+            ORPC_EXTENT_ARRAY *orpc_extent_array = msg->Buffer;
+            orpc_extent_array->size = extension_count;
+            orpc_extent_array->reserved = 0;
+            msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPC_EXTENT_ARRAY, extent);
+            /* NDR representation of orpc_extent_array->extent */
+            *(DWORD *)msg->Buffer = 1;
+            msg->Buffer = (char *)msg->Buffer + sizeof(DWORD);
+            /* NDR representation of [size_is] attribute of orpc_extent_array->extent */
+            *(DWORD *)msg->Buffer = (extension_count + 1) & ~1;
+            msg->Buffer = (char *)msg->Buffer + sizeof(DWORD);
+
+            msg->Buffer = ChannelHooks_ClientFillBuffer(&message_state->channel_hook_info,
+                msg->Buffer, channel_hook_data, channel_hook_count);
+
+            /* we must add a dummy extension if there is an odd extension
+             * count to meet the contract specified by the size_is attribute */
+            if (extension_count & 1)
+            {
+                WIRE_ORPC_EXTENT *wire_orpc_extent = msg->Buffer;
+                wire_orpc_extent->conformance = 0;
+                wire_orpc_extent->id = GUID_NULL;
+                wire_orpc_extent->size = 0;
+                msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPC_EXTENT, data[0]);
+            }
+        }
+
+        /* store the prefixed data length so that we can restore the real buffer
+         * pointer in ClientRpcChannelBuffer_SendReceive. */
+        message_state->prefix_data_len = (char *)msg->Buffer - (char *)orpcthis;
+        msg->BufferLength -= message_state->prefix_data_len;
+    }
+
+    HeapFree(GetProcessHeap(), 0, channel_hook_data);
+
+    TRACE("-- %d\n", status);
+
+    return HRESULT_FROM_WIN32(status);
+}
+
+static HRESULT WINAPI ServerRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER iface, RPCOLEMESSAGE *olemsg, ULONG *pstatus)
+{
+    FIXME("stub\n");
+    return E_NOTIMPL;
+}
+
+/* this thread runs an outgoing RPC */
+static DWORD WINAPI rpc_sendreceive_thread(LPVOID param)
+{
+    struct dispatch_params *data = param;
+
+    /* Note: I_RpcSendReceive doesn't raise exceptions like the higher-level
+     * RPC functions do */
+    data->status = I_RpcSendReceive((RPC_MESSAGE *)data->msg);
+
+    TRACE("completed with status 0x%x\n", data->status);
+
+    SetEvent(data->handle);
+
+    return 0;
+}
+
+static inline HRESULT ClientRpcChannelBuffer_IsCorrectApartment(ClientRpcChannelBuffer *This, const struct apartment *apt)
+{
+    if (!apt)
+        return S_FALSE;
+    if (This->oxid != apartment_getoxid(apt))
+        return S_FALSE;
+    return S_OK;
+}
+
+static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER iface, RPCOLEMESSAGE *olemsg, ULONG *pstatus)
+{
+    ClientRpcChannelBuffer *This = (ClientRpcChannelBuffer *)iface;
+    HRESULT hr;
+    RPC_MESSAGE *msg = (RPC_MESSAGE *)olemsg;
+    RPC_STATUS status;
+    DWORD index;
+    struct message_state *message_state;
+    ORPCTHAT orpcthat;
+    ORPC_EXTENT_ARRAY orpc_ext_array;
+    WIRE_ORPC_EXTENT *first_wire_orpc_extent = NULL;
+    HRESULT hrFault = S_OK;
+    struct apartment *apt = apartment_get_current_or_mta();
+    struct tlsdata *tlsdata;
+
+    TRACE("(%p) iMethod=%d\n", olemsg, olemsg->iMethod);
+
+    hr = ClientRpcChannelBuffer_IsCorrectApartment(This, apt);
+    if (hr != S_OK)
+    {
+        ERR("called from wrong apartment, should have been 0x%s\n",
+            wine_dbgstr_longlong(This->oxid));
+        if (apt) apartment_release(apt);
+        return RPC_E_WRONG_THREAD;
+    }
+
+    if (FAILED(hr = com_get_tlsdata(&tlsdata)))
+        return hr;
+
+    /* This situation should be impossible in multi-threaded apartments,
+     * because the calling thread isn't re-enterable.
+     * Note: doing a COM call during the processing of a sent message is
+     * only disallowed if a client call is already being waited for
+     * completion */
+    if (!apt->multi_threaded &&
+        tlsdata->pending_call_count_client &&
+        InSendMessage())
+    {
+        ERR("can't make an outgoing COM call in response to a sent message\n");
+        apartment_release(apt);
+        return RPC_E_CANTCALLOUT_ININPUTSYNCCALL;
+    }
+
+    message_state = msg->Handle;
+    /* restore the binding handle and the real start of data */
+    msg->Handle = message_state->binding_handle;
+    msg->Buffer = (char *)msg->Buffer - message_state->prefix_data_len;
+    msg->BufferLength += message_state->prefix_data_len;
+
+    /* Note: this is an optimization in the Microsoft OLE runtime that we need
+     * to copy, as shown by the test_no_couninitialize_client test. without
+     * short-circuiting the RPC runtime in the case below, the test will
+     * deadlock on the loader lock due to the RPC runtime needing to create
+     * a thread to process the RPC when this function is called indirectly
+     * from DllMain */
+
+    message_state->params.msg = olemsg;
+    if (message_state->params.bypass_rpcrt)
+    {
+        TRACE("Calling apartment thread 0x%08x...\n", message_state->target_tid);
+
+        msg->ProcNum &= ~RPC_FLAGS_VALID_BIT;
+
+        if (!PostMessageW(message_state->target_hwnd, DM_EXECUTERPC, 0,
+                          (LPARAM)&message_state->params))
+        {
+            ERR("PostMessage failed with error %u\n", GetLastError());
+
+            /* Note: message_state->params.iface doesn't have a reference and
+             * so doesn't need to be released */
+
+            hr = HRESULT_FROM_WIN32(GetLastError());
+        }
+    }
+    else
+    {
+        /* we use a separate thread here because we need to be able to
+         * pump the message loop in the application thread: if we do not,
+         * any windows created by this thread will hang and RPCs that try
+         * and re-enter this STA from an incoming server thread will
+         * deadlock. InstallShield is an example of that.
+         */
+        if (!QueueUserWorkItem(rpc_sendreceive_thread, &message_state->params, WT_EXECUTEDEFAULT))
+        {
+            ERR("QueueUserWorkItem failed with error %u\n", GetLastError());
+            hr = E_UNEXPECTED;
+        }
+        else
+            hr = S_OK;
+    }
+
+    if (hr == S_OK)
+    {
+        if (WaitForSingleObject(message_state->params.handle, 0))
+        {
+            tlsdata->pending_call_count_client++;
+            hr = CoWaitForMultipleHandles(0, INFINITE, 1, &message_state->params.handle, &index);
+            tlsdata->pending_call_count_client--;
+        }
+    }
+    ClientRpcChannelBuffer_ReleaseEventHandle(This, message_state->params.handle);
+
+    /* for WM shortcut, faults are returned in params->hr */
+    if (hr == S_OK)
+        hrFault = message_state->params.hr;
+
+    status = message_state->params.status;
+
+    orpcthat.flags = ORPCF_NULL;
+    orpcthat.extensions = NULL;
+
+    TRACE("RPC call status: 0x%x\n", status);
+    if (status != RPC_S_OK)
+        hr = HRESULT_FROM_WIN32(status);
+
+    TRACE("hrFault = 0x%08x\n", hrFault);
+
+    /* FIXME: this condition should be
+     * "hr == S_OK && (!hrFault || msg->BufferLength > FIELD_OFFSET(ORPCTHAT, extensions) + 4)"
+     * but we don't currently reset the message length for PostMessage
+     * dispatched calls */
+    if (hr == S_OK && hrFault == S_OK)
+    {
+        HRESULT hr2;
+        char *original_buffer = msg->Buffer;
+
+        /* handle ORPCTHAT and client extensions */
+
+        hr2 = unmarshal_ORPCTHAT(msg, &orpcthat, &orpc_ext_array, &first_wire_orpc_extent);
+        if (FAILED(hr2))
+            hr = hr2;
+
+        message_state->prefix_data_len = (char *)msg->Buffer - original_buffer;
+        msg->BufferLength -= message_state->prefix_data_len;
+    }
+    else
+        message_state->prefix_data_len = 0;
+
+    if (hr == S_OK)
+    {
+        ChannelHooks_ClientNotify(&message_state->channel_hook_info,
+                                  msg->DataRepresentation,
+                                  first_wire_orpc_extent,
+                                  orpcthat.extensions && first_wire_orpc_extent ? orpcthat.extensions->size : 0,
+                                  hrFault);
+    }
+
+    /* save away the message state again */
+    msg->Handle = message_state;
+
+    if (pstatus) *pstatus = status;
+
+    if (hr == S_OK)
+        hr = hrFault;
+
+    TRACE("-- 0x%08x\n", hr);
+
+    apartment_release(apt);
+    return hr;
+}
+
+static HRESULT WINAPI ServerRpcChannelBuffer_FreeBuffer(LPRPCCHANNELBUFFER iface, RPCOLEMESSAGE* olemsg)
+{
+    RPC_MESSAGE *msg = (RPC_MESSAGE *)olemsg;
+    RPC_STATUS status;
+    struct message_state *message_state;
+
+    TRACE("(%p)\n", msg);
+
+    message_state = msg->Handle;
+    /* restore the binding handle and the real start of data */
+    msg->Handle = message_state->binding_handle;
+    msg->Buffer = (char *)msg->Buffer - message_state->prefix_data_len;
+    msg->BufferLength += message_state->prefix_data_len;
+    message_state->prefix_data_len = 0;
+
+    if (message_state->bypass_rpcrt)
+    {
+        HeapFree(GetProcessHeap(), 0, msg->Buffer);
+        status = RPC_S_OK;
+    }
+    else
+        status = I_RpcFreeBuffer(msg);
+
+    msg->Handle = message_state;
+
+    TRACE("-- %d\n", status);
+
+    return HRESULT_FROM_WIN32(status);
+}
+
+static HRESULT WINAPI ClientRpcChannelBuffer_FreeBuffer(LPRPCCHANNELBUFFER iface, RPCOLEMESSAGE* olemsg)
+{
+    RPC_MESSAGE *msg = (RPC_MESSAGE *)olemsg;
+    RPC_STATUS status;
+    struct message_state *message_state;
+
+    TRACE("(%p)\n", msg);
+
+    message_state = msg->Handle;
+    /* restore the binding handle and the real start of data */
+    msg->Handle = message_state->binding_handle;
+    msg->Buffer = (char *)msg->Buffer - message_state->prefix_data_len;
+    msg->BufferLength += message_state->prefix_data_len;
+
+    if (message_state->params.bypass_rpcrt)
+    {
+        HeapFree(GetProcessHeap(), 0, msg->Buffer);
+        status = RPC_S_OK;
+    }
+    else
+        status = I_RpcFreeBuffer(msg);
+
+    HeapFree(GetProcessHeap(), 0, msg->RpcInterfaceInformation);
+    msg->RpcInterfaceInformation = NULL;
+
+    if (message_state->params.stub)
+        IRpcStubBuffer_Release(message_state->params.stub);
+    if (message_state->params.chan)
+        IRpcChannelBuffer_Release(message_state->params.chan);
+    HeapFree(GetProcessHeap(), 0, message_state);
+
+    TRACE("-- %d\n", status);
+
+    return HRESULT_FROM_WIN32(status);
+}
+
+static HRESULT WINAPI ClientRpcChannelBuffer_GetDestCtx(LPRPCCHANNELBUFFER iface, DWORD* pdwDestContext, void** ppvDestContext)
+{
+    ClientRpcChannelBuffer *This = (ClientRpcChannelBuffer *)iface;
+
+    TRACE("(%p,%p)\n", pdwDestContext, ppvDestContext);
+
+    *pdwDestContext = This->super.dest_context;
+    *ppvDestContext = This->super.dest_context_data;
+
+    return S_OK;
+}
+
+static HRESULT WINAPI ServerRpcChannelBuffer_GetDestCtx(LPRPCCHANNELBUFFER iface, DWORD* dest_context, void** dest_context_data)
+{
+    RpcChannelBuffer *This = (RpcChannelBuffer *)iface;
+
+    TRACE("(%p,%p)\n", dest_context, dest_context_data);
+
+    *dest_context = This->dest_context;
+    *dest_context_data = This->dest_context_data;
+    return S_OK;
+}
+
+static HRESULT WINAPI RpcChannelBuffer_IsConnected(LPRPCCHANNELBUFFER iface)
+{
+    TRACE("()\n");
+    /* native does nothing too */
+    return S_OK;
+}
+
+static const IRpcChannelBufferVtbl ClientRpcChannelBufferVtbl =
+{
+    RpcChannelBuffer_QueryInterface,
+    RpcChannelBuffer_AddRef,
+    ClientRpcChannelBuffer_Release,
+    ClientRpcChannelBuffer_GetBuffer,
+    ClientRpcChannelBuffer_SendReceive,
+    ClientRpcChannelBuffer_FreeBuffer,
+    ClientRpcChannelBuffer_GetDestCtx,
+    RpcChannelBuffer_IsConnected
+};
+
+static const IRpcChannelBufferVtbl ServerRpcChannelBufferVtbl =
+{
+    RpcChannelBuffer_QueryInterface,
+    RpcChannelBuffer_AddRef,
+    ServerRpcChannelBuffer_Release,
+    ServerRpcChannelBuffer_GetBuffer,
+    ServerRpcChannelBuffer_SendReceive,
+    ServerRpcChannelBuffer_FreeBuffer,
+    ServerRpcChannelBuffer_GetDestCtx,
+    RpcChannelBuffer_IsConnected
+};
+
+/* returns a channel buffer for proxies */
+HRESULT rpc_create_clientchannel(const OXID *oxid, const IPID *ipid,
+                                const OXID_INFO *oxid_info, const IID *iid,
+                                DWORD dest_context, void *dest_context_data,
+                                IRpcChannelBuffer **chan, struct apartment *apt)
+{
+    ClientRpcChannelBuffer *This;
+    WCHAR                   endpoint[200];
+    RPC_BINDING_HANDLE      bind;
+    RPC_STATUS              status;
+    LPWSTR                  string_binding;
+
+    /* FIXME: get the endpoint from oxid_info->psa instead */
+    get_rpc_endpoint(endpoint, oxid);
+
+    TRACE("proxy pipe: connecting to endpoint: %s\n", debugstr_w(endpoint));
+
+    status = RpcStringBindingComposeW(
+        NULL,
+        rpctransportW,
+        NULL,
+        endpoint,
+        NULL,
+        &string_binding);
+
+    if (status == RPC_S_OK)
+    {
+        status = RpcBindingFromStringBindingW(string_binding, &bind);
+
+        if (status == RPC_S_OK)
+        {
+            IPID ipid2 = *ipid; /* why can't RpcBindingSetObject take a const? */
+            status = RpcBindingSetObject(bind, &ipid2);
+            if (status != RPC_S_OK)
+                RpcBindingFree(&bind);
+        }
+
+        RpcStringFreeW(&string_binding);
+    }
+
+    if (status != RPC_S_OK)
+    {
+        ERR("Couldn't get binding for endpoint %s, status = %d\n", debugstr_w(endpoint), status);
+        return HRESULT_FROM_WIN32(status);
+    }
+
+    This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This));
+    if (!This)
+    {
+        RpcBindingFree(&bind);
+        return E_OUTOFMEMORY;
+    }
+
+    This->super.IRpcChannelBuffer_iface.lpVtbl = &ClientRpcChannelBufferVtbl;
+    This->super.refs = 1;
+    This->super.dest_context = dest_context;
+    This->super.dest_context_data = dest_context_data;
+    This->bind = bind;
+    This->oxid = apartment_getoxid(apt);
+    This->server_pid = oxid_info->dwPid;
+    This->event = NULL;
+    This->iid = *iid;
+
+    *chan = &This->super.IRpcChannelBuffer_iface;
+
+    return S_OK;
+}
+
+HRESULT rpc_create_serverchannel(DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan)
+{
+    RpcChannelBuffer *This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This));
+    if (!This)
+        return E_OUTOFMEMORY;
+
+    This->IRpcChannelBuffer_iface.lpVtbl = &ServerRpcChannelBufferVtbl;
+    This->refs = 1;
+    This->dest_context = dest_context;
+    This->dest_context_data = dest_context_data;
+
+    *chan = &This->IRpcChannelBuffer_iface;
+
+    return S_OK;
+}
+
+/* unmarshals ORPC_EXTENT_ARRAY according to NDR rules, but doesn't allocate
+ * any memory */
+static HRESULT unmarshal_ORPC_EXTENT_ARRAY(RPC_MESSAGE *msg, const char *end,
+                                           ORPC_EXTENT_ARRAY *extensions,
+                                           WIRE_ORPC_EXTENT **first_wire_orpc_extent)
+{
+    DWORD pointer_id;
+    DWORD i;
+
+    memcpy(extensions, msg->Buffer, FIELD_OFFSET(WIRE_ORPC_EXTENT_ARRAY, extent));
+    msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPC_EXTENT_ARRAY, extent);
+
+    if ((const char *)msg->Buffer + 2 * sizeof(DWORD) > end)
+        return RPC_E_INVALID_HEADER;
+
+    pointer_id = *(DWORD *)msg->Buffer;
+    msg->Buffer = (char *)msg->Buffer + sizeof(DWORD);
+    extensions->extent = NULL;
+
+    if (pointer_id)
+    {
+        WIRE_ORPC_EXTENT *wire_orpc_extent;
+
+        /* conformance */
+        if (*(DWORD *)msg->Buffer != ((extensions->size+1)&~1))
+            return RPC_S_INVALID_BOUND;
+
+        msg->Buffer = (char *)msg->Buffer + sizeof(DWORD);
+
+        /* arbitrary limit for security (don't know what native does) */
+        if (extensions->size > 256)
+        {
+            ERR("too many extensions: %d\n", extensions->size);
+            return RPC_S_INVALID_BOUND;
+        }
+
+        *first_wire_orpc_extent = wire_orpc_extent = msg->Buffer;
+        for (i = 0; i < ((extensions->size+1)&~1); i++)
+        {
+            if ((const char *)&wire_orpc_extent->data[0] > end)
+                return RPC_S_INVALID_BOUND;
+            if (wire_orpc_extent->conformance != ((wire_orpc_extent->size+7)&~7))
+                return RPC_S_INVALID_BOUND;
+            if ((const char *)&wire_orpc_extent->data[wire_orpc_extent->conformance] > end)
+                return RPC_S_INVALID_BOUND;
+            TRACE("size %u, guid %s\n", wire_orpc_extent->size, debugstr_guid(&wire_orpc_extent->id));
+            wire_orpc_extent = (WIRE_ORPC_EXTENT *)&wire_orpc_extent->data[wire_orpc_extent->conformance];
+        }
+        msg->Buffer = wire_orpc_extent;
+    }
+
+    return S_OK;
+}
+
+/* unmarshals ORPCTHIS according to NDR rules, but doesn't allocate any memory */
+static HRESULT unmarshal_ORPCTHIS(RPC_MESSAGE *msg, ORPCTHIS *orpcthis,
+    ORPC_EXTENT_ARRAY *orpc_ext_array, WIRE_ORPC_EXTENT **first_wire_orpc_extent)
+{
+    const char *end = (char *)msg->Buffer + msg->BufferLength;
+
+    *first_wire_orpc_extent = NULL;
+
+    if (msg->BufferLength < FIELD_OFFSET(WIRE_ORPCTHIS, extensions) + sizeof(DWORD))
+    {
+        ERR("invalid buffer length\n");
+        return RPC_E_INVALID_HEADER;
+    }
+
+    memcpy(orpcthis, msg->Buffer, FIELD_OFFSET(WIRE_ORPCTHIS, extensions));
+    msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPCTHIS, extensions);
+
+    if ((const char *)msg->Buffer + sizeof(DWORD) > end)
+        return RPC_E_INVALID_HEADER;
+
+    if (*(DWORD *)msg->Buffer)
+        orpcthis->extensions = orpc_ext_array;
+    else
+        orpcthis->extensions = NULL;
+
+    msg->Buffer = (char *)msg->Buffer + sizeof(DWORD);
+
+    if (orpcthis->extensions)
+    {
+        HRESULT hr = unmarshal_ORPC_EXTENT_ARRAY(msg, end, orpc_ext_array,
+                                                 first_wire_orpc_extent);
+        if (FAILED(hr))
+            return hr;
+    }
+
+    if ((orpcthis->version.MajorVersion != COM_MAJOR_VERSION) ||
+        (orpcthis->version.MinorVersion > COM_MINOR_VERSION))
+    {
+        ERR("COM version {%d, %d} not supported\n",
+            orpcthis->version.MajorVersion, orpcthis->version.MinorVersion);
+        return RPC_E_VERSION_MISMATCH;
+    }
+
+    if (orpcthis->flags & ~(ORPCF_LOCAL|ORPCF_RESERVED1|ORPCF_RESERVED2|ORPCF_RESERVED3|ORPCF_RESERVED4))
+    {
+        ERR("invalid flags 0x%x\n", orpcthis->flags & ~(ORPCF_LOCAL|ORPCF_RESERVED1|ORPCF_RESERVED2|ORPCF_RESERVED3|ORPCF_RESERVED4));
+        return RPC_E_INVALID_HEADER;
+    }
+
+    return S_OK;
+}
+
+static HRESULT unmarshal_ORPCTHAT(RPC_MESSAGE *msg, ORPCTHAT *orpcthat,
+                                  ORPC_EXTENT_ARRAY *orpc_ext_array, WIRE_ORPC_EXTENT **first_wire_orpc_extent)
+{
+    const char *end = (char *)msg->Buffer + msg->BufferLength;
+
+    *first_wire_orpc_extent = NULL;
+
+    if (msg->BufferLength < FIELD_OFFSET(WIRE_ORPCTHAT, extensions) + sizeof(DWORD))
+    {
+        ERR("invalid buffer length\n");
+        return RPC_E_INVALID_HEADER;
+    }
+
+    memcpy(orpcthat, msg->Buffer, FIELD_OFFSET(WIRE_ORPCTHAT, extensions));
+    msg->Buffer = (char *)msg->Buffer + FIELD_OFFSET(WIRE_ORPCTHAT, extensions);
+
+    if ((const char *)msg->Buffer + sizeof(DWORD) > end)
+        return RPC_E_INVALID_HEADER;
+
+    if (*(DWORD *)msg->Buffer)
+        orpcthat->extensions = orpc_ext_array;
+    else
+        orpcthat->extensions = NULL;
+
+    msg->Buffer = (char *)msg->Buffer + sizeof(DWORD);
+
+    if (orpcthat->extensions)
+    {
+        HRESULT hr = unmarshal_ORPC_EXTENT_ARRAY(msg, end, orpc_ext_array,
+                                                 first_wire_orpc_extent);
+        if (FAILED(hr))
+            return hr;
+    }
+
+    if (orpcthat->flags & ~(ORPCF_LOCAL|ORPCF_RESERVED1|ORPCF_RESERVED2|ORPCF_RESERVED3|ORPCF_RESERVED4))
+    {
+        ERR("invalid flags 0x%x\n", orpcthat->flags & ~(ORPCF_LOCAL|ORPCF_RESERVED1|ORPCF_RESERVED2|ORPCF_RESERVED3|ORPCF_RESERVED4));
+        return RPC_E_INVALID_HEADER;
+    }
+
+    return S_OK;
+}
+
+void rpc_execute_call(struct dispatch_params *params)
+{
+    struct message_state *message_state = NULL;
+    RPC_MESSAGE *msg = (RPC_MESSAGE *)params->msg;
+    char *original_buffer = msg->Buffer;
+    ORPCTHIS orpcthis;
+    ORPC_EXTENT_ARRAY orpc_ext_array;
+    WIRE_ORPC_EXTENT *first_wire_orpc_extent;
+    GUID old_causality_id;
+    struct tlsdata *tlsdata;
+    struct apartment *apt;
+
+    if (FAILED(com_get_tlsdata(&tlsdata)))
+        return;
+
+    apt = com_get_current_apt();
+
+    /* handle ORPCTHIS and server extensions */
+
+    params->hr = unmarshal_ORPCTHIS(msg, &orpcthis, &orpc_ext_array, &first_wire_orpc_extent);
+    if (params->hr != S_OK)
+    {
+        msg->Buffer = original_buffer;
+        goto exit;
+    }
+
+    message_state = HeapAlloc(GetProcessHeap(), 0, sizeof(*message_state));
+    if (!message_state)
+    {
+        params->hr = E_OUTOFMEMORY;
+        msg->Buffer = original_buffer;
+        goto exit;
+    }
+
+    message_state->prefix_data_len = (char *)msg->Buffer - original_buffer;
+    message_state->binding_handle = msg->Handle;
+    message_state->bypass_rpcrt = params->bypass_rpcrt;
+
+    message_state->channel_hook_info.iid = params->iid;
+    message_state->channel_hook_info.cbSize = sizeof(message_state->channel_hook_info);
+    message_state->channel_hook_info.uCausality = orpcthis.cid;
+    message_state->channel_hook_info.dwServerPid = GetCurrentProcessId();
+    message_state->channel_hook_info.iMethod = msg->ProcNum;
+    message_state->channel_hook_info.pObject = params->iface;
+
+    if (orpcthis.extensions && first_wire_orpc_extent &&
+        orpcthis.extensions->size)
+        ChannelHooks_ServerNotify(&message_state->channel_hook_info, msg->DataRepresentation, first_wire_orpc_extent, orpcthis.extensions->size);
+
+    msg->Handle = message_state;
+    msg->BufferLength -= message_state->prefix_data_len;
+
+    /* call message filter */
+
+    if (apt->filter)
+    {
+        DWORD handlecall;
+        INTERFACEINFO interface_info;
+        CALLTYPE calltype;
+
+        interface_info.pUnk = params->iface;
+        interface_info.iid = params->iid;
+        interface_info.wMethod = msg->ProcNum;
+
+        if (IsEqualGUID(&orpcthis.cid, &tlsdata->causality_id))
+            calltype = CALLTYPE_NESTED;
+        else if (tlsdata->pending_call_count_server == 0)
+            calltype = CALLTYPE_TOPLEVEL;
+        else
+            calltype = CALLTYPE_TOPLEVEL_CALLPENDING;
+
+        handlecall = IMessageFilter_HandleInComingCall(apt->filter,
+                                                       calltype,
+                                                       UlongToHandle(GetCurrentProcessId()),
+                                                       0 /* FIXME */,
+                                                       &interface_info);
+        TRACE("IMessageFilter_HandleInComingCall returned %d\n", handlecall);
+        switch (handlecall)
+        {
+        case SERVERCALL_REJECTED:
+            params->hr = RPC_E_CALL_REJECTED;
+            goto exit_reset_state;
+        case SERVERCALL_RETRYLATER:
+#if 0 /* FIXME: handle retries on the client side before enabling this code */
+            params->hr = RPC_E_RETRY;
+            goto exit_reset_state;
+#else
+            FIXME("retry call later not implemented\n");
+            break;
+#endif
+        case SERVERCALL_ISHANDLED:
+        default:
+            break;
+        }
+    }
+
+    /* invoke the method */
+
+    /* save the old causality ID - note: any calls executed while processing
+     * messages received during the SendReceive will appear to originate from
+     * this call - this should be checked with what Windows does */
+    old_causality_id = tlsdata->causality_id;
+    tlsdata->causality_id = orpcthis.cid;
+    tlsdata->pending_call_count_server++;
+    params->hr = IRpcStubBuffer_Invoke(params->stub, params->msg, params->chan);
+    tlsdata->pending_call_count_server--;
+    tlsdata->causality_id = old_causality_id;
+
+    /* the invoke allocated a new buffer, so free the old one */
+    if (message_state->bypass_rpcrt && original_buffer != msg->Buffer)
+        HeapFree(GetProcessHeap(), 0, original_buffer);
+
+exit_reset_state:
+    message_state = msg->Handle;
+    msg->Handle = message_state->binding_handle;
+    msg->Buffer = (char *)msg->Buffer - message_state->prefix_data_len;
+    msg->BufferLength += message_state->prefix_data_len;
+
+exit:
+    HeapFree(GetProcessHeap(), 0, message_state);
+    if (params->handle) SetEvent(params->handle);
+}
+
+static void __RPC_STUB dispatch_rpc(RPC_MESSAGE *msg)
+{
+    struct dispatch_params *params;
+    struct stub_manager *stub_manager;
+    struct apartment *apt;
+    IPID ipid;
+    HRESULT hr;
+
+    RpcBindingInqObject(msg->Handle, &ipid);
+
+    TRACE("ipid = %s, iMethod = %d\n", debugstr_guid(&ipid), msg->ProcNum);
+
+    params = HeapAlloc(GetProcessHeap(), 0, sizeof(*params));
+    if (!params)
+    {
+        RpcRaiseException(E_OUTOFMEMORY);
+        return;
+    }
+
+    hr = ipid_get_dispatch_params(&ipid, &apt, &stub_manager, &params->stub, &params->chan,
+                                  &params->iid, &params->iface);
+    if (hr != S_OK)
+    {
+        ERR("no apartment found for ipid %s\n", debugstr_guid(&ipid));
+        HeapFree(GetProcessHeap(), 0, params);
+        RpcRaiseException(hr);
+        return;
+    }
+
+    params->msg = (RPCOLEMESSAGE *)msg;
+    params->status = RPC_S_OK;
+    params->hr = S_OK;
+    params->handle = NULL;
+    params->bypass_rpcrt = FALSE;
+
+    /* Note: this is the important difference between STAs and MTAs - we
+     * always execute RPCs to STAs in the thread that originally created the
+     * apartment (i.e. the one that pumps messages to the window) */
+    if (!apt->multi_threaded)
+    {
+        params->handle = CreateEventW(NULL, FALSE, FALSE, NULL);
+
+        TRACE("Calling apartment thread 0x%08x...\n", apt->tid);
+
+        if (PostMessageW(apartment_getwindow(apt), DM_EXECUTERPC, 0, (LPARAM)params))
+            WaitForSingleObject(params->handle, INFINITE);
+        else
+        {
+            ERR("PostMessage failed with error %u\n", GetLastError());
+            IRpcChannelBuffer_Release(params->chan);
+            IRpcStubBuffer_Release(params->stub);
+        }
+        CloseHandle(params->handle);
+    }
+    else
+    {
+        BOOL joined = FALSE;
+        struct tlsdata *tlsdata;
+
+        com_get_tlsdata(&tlsdata);
+
+        if (!tlsdata->apt)
+        {
+            enter_apartment(tlsdata, COINIT_MULTITHREADED);
+            joined = TRUE;
+        }
+        rpc_execute_call(params);
+        if (joined)
+        {
+            leave_apartment(tlsdata);
+        }
+    }
+
+    hr = params->hr;
+    if (params->chan)
+        IRpcChannelBuffer_Release(params->chan);
+    if (params->stub)
+        IRpcStubBuffer_Release(params->stub);
+    HeapFree(GetProcessHeap(), 0, params);
+
+    stub_manager_int_release(stub_manager);
+    apartment_release(apt);
+
+    /* if IRpcStubBuffer_Invoke fails, we should raise an exception to tell
+     * the RPC runtime that the call failed */
+    if (hr != S_OK) RpcRaiseException(hr);
+}
+
+/* stub registration */
+HRESULT rpc_register_interface(REFIID riid)
+{
+    struct registered_if *rif;
+    BOOL found = FALSE;
+    HRESULT hr = S_OK;
+
+    TRACE("(%s)\n", debugstr_guid(riid));
+
+    EnterCriticalSection(&csRegIf);
+    LIST_FOR_EACH_ENTRY(rif, &registered_interfaces, struct registered_if, entry)
+    {
+        if (IsEqualGUID(&rif->If.InterfaceId.SyntaxGUID, riid))
+        {
+            rif->refs++;
+            found = TRUE;
+            break;
+        }
+    }
+    if (!found)
+    {
+        TRACE("Creating new interface\n");
+
+        rif = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*rif));
+        if (rif)
+        {
+            RPC_STATUS status;
+
+            rif->refs = 1;
+            rif->If.Length = sizeof(RPC_SERVER_INTERFACE);
+            /* RPC interface ID = COM interface ID */
+            rif->If.InterfaceId.SyntaxGUID = *riid;
+            rif->If.DispatchTable = &rpc_dispatch;
+            /* all other fields are 0, including the version asCOM objects
+             * always have a version of 0.0 */
+            status = RpcServerRegisterIfEx(
+                (RPC_IF_HANDLE)&rif->If,
+                NULL, NULL,
+                RPC_IF_OLE | RPC_IF_AUTOLISTEN,
+                RPC_C_LISTEN_MAX_CALLS_DEFAULT,
+                NULL);
+            if (status == RPC_S_OK)
+                list_add_tail(&registered_interfaces, &rif->entry);
+            else
+            {
+                ERR("RpcServerRegisterIfEx failed with error %d\n", status);
+                HeapFree(GetProcessHeap(), 0, rif);
+                hr = HRESULT_FROM_WIN32(status);
+            }
+        }
+        else
+            hr = E_OUTOFMEMORY;
+    }
+    LeaveCriticalSection(&csRegIf);
+    return hr;
+}
+
+/* stub unregistration */
+void rpc_unregister_interface(REFIID riid, BOOL wait)
+{
+    struct registered_if *rif;
+    EnterCriticalSection(&csRegIf);
+    LIST_FOR_EACH_ENTRY(rif, &registered_interfaces, struct registered_if, entry)
+    {
+        if (IsEqualGUID(&rif->If.InterfaceId.SyntaxGUID, riid))
+        {
+            if (!--rif->refs)
+            {
+                RpcServerUnregisterIf((RPC_IF_HANDLE)&rif->If, NULL, wait);
+                list_remove(&rif->entry);
+                HeapFree(GetProcessHeap(), 0, rif);
+            }
+            break;
+        }
+    }
+    LeaveCriticalSection(&csRegIf);
+}
+
+/* get the info for an OXID, including the IPID for the rem unknown interface
+ * and the string binding */
+HRESULT rpc_resolve_oxid(OXID oxid, OXID_INFO *oxid_info)
+{
+    TRACE("%s\n", wine_dbgstr_longlong(oxid));
+
+    oxid_info->dwTid = 0;
+    oxid_info->dwPid = 0;
+    oxid_info->dwAuthnHint = RPC_C_AUTHN_LEVEL_NONE;
+    /* FIXME: this is a hack around not having an OXID resolver yet -
+     * this function should contact the machine's OXID resolver and then it
+     * should give us the IPID of the IRemUnknown interface */
+    oxid_info->ipidRemUnknown.Data1 = 0xffffffff;
+    oxid_info->ipidRemUnknown.Data2 = 0xffff;
+    oxid_info->ipidRemUnknown.Data3 = 0xffff;
+    memcpy(oxid_info->ipidRemUnknown.Data4, &oxid, sizeof(OXID));
+    oxid_info->psa = NULL /* FIXME */;
+
+    return S_OK;
+}
+
+/* make the apartment reachable by other threads and processes and create the
+ * IRemUnknown object */
+void rpc_start_remoting(struct apartment *apt)
+{
+    if (!InterlockedExchange(&apt->remoting_started, TRUE))
+    {
+        WCHAR endpoint[200];
+        RPC_STATUS status;
+
+        get_rpc_endpoint(endpoint, &apt->oxid);
+
+        status = RpcServerUseProtseqEpW(
+            rpctransportW,
+            RPC_C_PROTSEQ_MAX_REQS_DEFAULT,
+            endpoint,
+            NULL);
+        if (status != RPC_S_OK)
+            ERR("Couldn't register endpoint %s\n", debugstr_w(endpoint));
+
+        /* FIXME: move remote unknown exporting into this function */
+    }
+    start_apartment_remote_unknown(apt);
+}
+
+/******************************************************************************
+ *            DllDebugObjectRPCHook    (combase.@)
+ */
+BOOL WINAPI DllDebugObjectRPCHook(BOOL trace, /* ORPC_INIT_ARGS * */ void *args)
+{
+    FIXME("%d, %p: stub\n", trace, args);
+
+    return TRUE;
+}
diff --git a/wrappers/new-dlls/combase/string.c b/wrappers/new-dlls/combase_/string.c
similarity index 100%
rename from wrappers/new-dlls/combase/string.c
rename to wrappers/new-dlls/combase_/string.c
diff --git a/wrappers/new-dlls/combase/stubmanager.c b/wrappers/new-dlls/combase_/stubmanager.c
similarity index 100%
rename from wrappers/new-dlls/combase/stubmanager.c
rename to wrappers/new-dlls/combase_/stubmanager.c
diff --git a/wrappers/new-dlls/combase/usrmarshal.c b/wrappers/new-dlls/combase_/usrmarshal.c
similarity index 100%
rename from wrappers/new-dlls/combase/usrmarshal.c
rename to wrappers/new-dlls/combase_/usrmarshal.c
diff --git a/wrappers/sdk/include/wsdk/CMakeLists.txt b/wrappers/sdk/include/wsdk/CMakeLists.txt
index 929d83dad6..3b66d439bf 100644
--- a/wrappers/sdk/include/wsdk/CMakeLists.txt
+++ b/wrappers/sdk/include/wsdk/CMakeLists.txt
@@ -21,6 +21,7 @@ list(APPEND SOURCE
 	d3d12sdklayers.idl 
 	d3d12shader.idl 
 	d3dcommon.idl 
+	dcom.idl 
 	dcommon.idl 
 	dxgi.idl 
 	dxgi1_2.idl 
diff --git a/wrappers/sdk/include/wsdk/dcom.idl b/wrappers/sdk/include/wsdk/dcom.idl
new file mode 100644
index 0000000000..c3d090a9cb
--- /dev/null
+++ b/wrappers/sdk/include/wsdk/dcom.idl
@@ -0,0 +1,306 @@
+/*
+ * Copyright 2003 Ove Kåven, TransGaming Technologies
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+/* see the official DCOM specification
+ * (there's a copy at http://www.grimes.demon.co.uk/DCOM/DCOMSpec.htm) */
+
+#pragma makedep proxy
+#pragma makedep register
+
+import "unknwn.idl";
+
+[
+    threading(both),
+    uuid(00000320-0000-0000-c000-000000000046)
+]
+coclass PSFactoryBuffer { interface IFactoryBuffer; }
+
+[
+  uuid(99fcfe60-5260-101b-bbcb-00aa0021347a),
+  pointer_default(unique)
+]
+interface ObjectRpcBaseTypes
+{
+  typedef unsigned hyper ID;
+  typedef ID MID;
+  typedef ID OXID;
+  typedef ID OID;
+  typedef ID SETID;
+  typedef GUID IPID;
+  typedef GUID CID;
+  typedef REFGUID REFIPID;
+
+  const unsigned short COM_MINOR_VERSION_1 = 1;
+  const unsigned short COM_MINOR_VERSION_2 = 2;
+
+  const unsigned short COM_MAJOR_VERSION = 5;
+  const unsigned short COM_MINOR_VERSION = 3;
+
+  typedef struct tagCOMVERSION {
+    unsigned short MajorVersion;
+    unsigned short MinorVersion;
+  } COMVERSION;
+
+  const unsigned long ORPCF_NULL = 0;
+  const unsigned long ORPCF_LOCAL = 1;
+  const unsigned long ORPCF_RESERVED1 = 2;
+  const unsigned long ORPCF_RESERVED2 = 4;
+  const unsigned long ORPCF_RESERVED3 = 8;
+  const unsigned long ORPCF_RESERVED4 = 16;
+
+  typedef struct tagORPC_EXTENT {
+    GUID id;
+    unsigned long size;
+    [size_is((size+7)&~7)] byte data[];
+  } ORPC_EXTENT;
+
+  typedef struct tagORPC_EXTENT_ARRAY {
+    unsigned long size;
+    unsigned long reserved;
+    [size_is((size+1)&~1,), unique] ORPC_EXTENT **extent;
+  } ORPC_EXTENT_ARRAY;
+
+  typedef struct tagORPCTHIS {
+    COMVERSION version;
+    unsigned long flags;
+    unsigned long reserved1;
+    CID cid;
+    [unique] ORPC_EXTENT_ARRAY *extensions;
+  } ORPCTHIS;
+
+  typedef struct tagORPCTHAT {
+    unsigned long flags;
+    [unique] ORPC_EXTENT_ARRAY *extensions;
+  } ORPCTHAT;
+
+  const unsigned short NCADG_IP_UDP = 0x08;
+  const unsigned short NCACN_IP_TCP = 0x07;
+  const unsigned short NCADG_IPX = 0x0E;
+  const unsigned short NCACN_SPX = 0x0C;
+  const unsigned short NCACN_NB_NB = 0x12;
+  const unsigned short NCACN_NB_IPX = 0x0D;
+  const unsigned short NCACN_DNET_NSP = 0x04;
+  const unsigned short NCACN_HTTP = 0x1F;
+
+  typedef struct tagSTRINGBINDING {
+    unsigned short wTowerId;
+    [string] WCHAR aNetworkAddr[];
+  } STRINGBINDING;
+
+  const unsigned short COM_C_AUTHZ_NONE = 0xffff;
+
+  typedef struct tagSECURITYBINDING {
+    unsigned short wAuthnSvc;
+    unsigned short wAuthzSvc;
+    [string] WCHAR aPrincName[];
+  } SECURITYBINDING;
+
+  typedef struct tagDUALSTRINGARRAY {
+    unsigned short wNumEntries;
+    unsigned short wSecurityOffset;
+    [size_is(wNumEntries)] unsigned short aStringArray[];
+  } DUALSTRINGARRAY;
+
+  typedef struct tagOXID_INFO {
+    DWORD dwTid;
+    DWORD dwPid;
+    IPID ipidRemUnknown;
+    DWORD dwAuthnHint;
+    DUALSTRINGARRAY *psa;
+  } OXID_INFO;
+
+  const unsigned long OBJREF_SIGNATURE = 0x574f454d; /* "MEOW" */
+  const unsigned long OBJREF_STANDARD = 0x1;
+  const unsigned long OBJREF_HANDLER = 0x2;
+  const unsigned long OBJREF_CUSTOM = 0x4;
+  const unsigned long SORF_OXRES1 = 0x1;
+  const unsigned long SORF_OXRES2 = 0x20;
+  const unsigned long SORF_OXRES3 = 0x40;
+  const unsigned long SORF_OXRES4 = 0x80;
+  const unsigned long SORF_OXRES5 = 0x100;
+  const unsigned long SORF_OXRES6 = 0x200;
+  const unsigned long SORF_OXRES7 = 0x400;
+  const unsigned long SORF_OXRES8 = 0x800;
+  const unsigned long SORF_NULL = 0x0;
+  const unsigned long SORF_NOPING = 0x1000;
+
+  typedef struct tagSTDOBJREF {
+    unsigned long flags;
+    unsigned long cPublicRefs;
+    OXID oxid;
+    OID oid;
+    IPID ipid;
+  } STDOBJREF;
+
+  typedef struct tagOBJREF {
+    unsigned long signature;
+    unsigned long flags;
+    GUID iid;
+    [switch_is(flags)] union {
+    [case(OBJREF_STANDARD)] struct OR_STANDARD {
+        STDOBJREF std;
+        DUALSTRINGARRAY saResAddr;
+      } u_standard;
+    [case(OBJREF_HANDLER)] struct OR_HANDLER {
+        STDOBJREF std;
+        CLSID clsid;
+        DUALSTRINGARRAY saResAddr;
+      } u_handler;
+    [case(OBJREF_CUSTOM)] struct OR_CUSTOM {
+        CLSID clsid;
+        unsigned long cbExtension;
+        ULONG size;
+        [size_is(size), ref] byte *pData;
+      } u_custom;
+    } u_objref;
+  } OBJREF;
+
+  typedef struct tagMInterfacePointer {
+    ULONG ulCntData;
+    [size_is(ulCntData)] BYTE abData[];
+  } MInterfacePointer;
+
+  typedef [unique] MInterfacePointer *PMInterfacePointer;
+
+} /* interface ObjectRpcBaseTypes */
+
+[
+  object,
+  uuid(00000131-0000-0000-C000-000000000046)
+]
+interface IRemUnknown : IUnknown
+{
+  typedef [unique] IRemUnknown *LPREMUNKNOWN;
+
+  typedef struct tagREMQIRESULT {
+    HRESULT hResult;
+    STDOBJREF std;
+  } REMQIRESULT;
+
+  typedef struct tagREMINTERFACEREF {
+    IPID ipid;
+    unsigned long cPublicRefs;
+    unsigned long cPrivateRefs;
+  } REMINTERFACEREF; 
+
+  HRESULT RemQueryInterface(
+    [in] REFIPID ripid,
+    [in] ULONG cRefs,
+    [in] unsigned short cIids,
+    [in, size_is(cIids)] IID *iids,
+    [out, size_is(,cIids)] REMQIRESULT **ppQIResults);
+
+  HRESULT RemAddRef(
+    [in] unsigned short cInterfaceRefs,
+    [in, size_is(cInterfaceRefs)] REMINTERFACEREF* InterfaceRefs,
+    [out, size_is(cInterfaceRefs)] HRESULT *pResults);
+
+  HRESULT RemRelease(
+    [in] unsigned short cInterfaceRefs,
+    [in, size_is(cInterfaceRefs)] REMINTERFACEREF* InterfaceRefs);
+}
+
+[
+  object,
+  uuid(00000142-0000-0000-C000-000000000046)
+]
+interface IRemUnknown2 : IRemUnknown
+{
+  typedef [unique] IRemUnknown2 *LPREMUNKNOWN2;
+
+  HRESULT RemQueryInterface2(
+    [in] REFIPID ripid,
+    [in] unsigned short cIids,
+    [in, size_is(cIids)] IID *iids,
+    [out, size_is(cIids)] HRESULT *phr,
+    [out, size_is(cIids)] MInterfacePointer **ppMIF);
+}
+
+[
+  uuid(99fcfec4-5260-101b-bbcb-00aa0021347a),
+  pointer_default(unique)
+]
+interface IOXIDResolver
+{
+  [idempotent] error_status_t ResolveOxid(
+    [in] handle_t hRpc,
+    [in] OXID *pOxid,
+    [in] unsigned short cRequestedProtseqs,
+    [in, ref, size_is(cRequestedProtseqs)] unsigned short arRequestedProtseqs[],
+    [out, ref] DUALSTRINGARRAY **ppdsaOxidBindings,
+    [out, ref] IPID *pipidRemUnknown,
+    [out, ref] DWORD *pAuthnHint);
+
+  [idempotent] error_status_t SimplePing(
+    [in] handle_t hRpc,
+    [in] SETID *pSetId);
+
+  [idempotent] error_status_t ComplexPing(
+    [in] handle_t hRpc,
+    [in, out] SETID *pSetId,
+    [in] unsigned short SequenceNum,
+    [in] unsigned short cAddToSet,
+    [in] unsigned short cDelFromSet,
+    [in, unique, size_is(cAddToSet)] OID AddToSet[],
+    [in, unique, size_is(cDelFromSet)] OID DelFromSet[],
+    [out] unsigned short *pPingBackoffFactor);
+
+  [idempotent] error_status_t ServerAlive(
+    [in] handle_t hRpc);
+
+  [idempotent] error_status_t ResolveOxid2(
+    [in] handle_t hRpc,
+    [in] OXID *pOxid,
+    [in] unsigned short cRequestedProtseqs,
+    [in, ref, size_is(cRequestedProtseqs)] unsigned short arRequestedProtseqs[],
+    [out, ref] DUALSTRINGARRAY **ppdsaOxidBindings,
+    [out, ref] IPID *pipidRemUnknown,
+    [out, ref] DWORD *pAuthnHint,
+    [out, ref] COMVERSION *pComVersion); 
+}
+
+[
+  uuid(4d9f4ab8-7d1c-11cf-861e-0020af6e7c57),
+  pointer_default(unique)
+]
+interface IRemoteActivation
+{
+  const unsigned long MODE_GET_CLASS_OBJECT = 0xffffffff;
+
+  HRESULT RemoteActivation(
+    [in] handle_t hRpc,
+    [in] ORPCTHIS *ORPCthis,
+    [out] ORPCTHAT *ORPCthat,
+    [in] GUID *Clsid,
+    [in, string, unique] WCHAR *pwszObjectName,
+    [in, unique] MInterfacePointer *pObjectStorage,
+    [in] DWORD ClientImpLevel,
+    [in] DWORD Mode,
+    [in] DWORD Interfaces,
+    [in, unique, size_is(Interfaces)] IID *pIIDs,
+    [in] unsigned short cRequestedProtseqs,
+    [in, size_is(cRequestedProtseqs)] unsigned short RequestedProtseqs[],
+    [out] OXID *pOxid,
+    [out] DUALSTRINGARRAY **ppdsaOxidBindings,
+    [out] IPID *pipidRemUnknown,
+    [out] DWORD *pAuthnHint,
+    [out] COMVERSION *pServerVersion,
+    [out] HRESULT *phr,
+    [out,size_is(Interfaces)] MInterfacePointer **ppInterfaceData,
+    [out,size_is(Interfaces)] HRESULT *pResults);
+}
diff --git a/wrappers/sdk/include/wsdk/ntdllbase.h b/wrappers/sdk/include/wsdk/ntdllbase.h
index 88ed322867..0a1e501d21 100644
--- a/wrappers/sdk/include/wsdk/ntdllbase.h
+++ b/wrappers/sdk/include/wsdk/ntdllbase.h
@@ -728,9 +728,11 @@ NTSTATUS NTAPI RtlInitializeExtendedContext2( void *context, ULONG context_flags
 ULONG64 NTAPI RtlGetExtendedFeaturesMask( CONTEXT_EX *context_ex );
 
 #ifdef __i386__
+#define CONTEXT_I386_XSTATE             (CONTEXT_i386 | 0x0040)
 #define CONTEXT_XSTATE CONTEXT_I386_XSTATE
 #endif  /* __i386__ */
 
 #ifdef __x86_64__
+#define CONTEXT_AMD64_XSTATE          (CONTEXT_AMD64 | 0x0040)
 #define CONTEXT_XSTATE CONTEXT_AMD64_XSTATE
 #endif /* __x86_64__ */