[ros-diffs] [gvg] 17675: And now import to the correct directory

And now import to the correct directory
Deleted: vendor/wine/dlls/objsel/Makefile.in
Added: vendor/wine/dlls/objsel/current/
Added: vendor/wine/dlls/objsel/current/Makefile.in
Added: vendor/wine/dlls/objsel/current/factory.c
Added: vendor/wine/dlls/objsel/current/objsel.c
Added: vendor/wine/dlls/objsel/current/objsel.rc
Added: vendor/wine/dlls/objsel/current/objsel.spec
Added: vendor/wine/dlls/objsel/current/objsel_private.h
Added: vendor/wine/dlls/objsel/current/regsvr.c
Deleted: vendor/wine/dlls/objsel/factory.c
Deleted: vendor/wine/dlls/objsel/objsel.c
Deleted: vendor/wine/dlls/objsel/objsel.rc
Deleted: vendor/wine/dlls/objsel/objsel.spec
Deleted: vendor/wine/dlls/objsel/objsel_private.h
Deleted: vendor/wine/dlls/objsel/regsvr.c
  _____  

Deleted: vendor/wine/dlls/objsel/Makefile.in
--- vendor/wine/dlls/objsel/Makefile.in	2005-09-05 21:39:59 UTC (rev
17674)
+++ vendor/wine/dlls/objsel/Makefile.in	2005-09-05 21:42:33 UTC (rev
17675)
@@ -1,18 +0,0 @@

-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ../..
-SRCDIR    = @srcdir@
-VPATH     = @srcdir@
-MODULE    = objsel.dll
-IMPORTS   = ole32 oleaut32 user32 advapi32 kernel32
-EXTRALIBS = -lstrmiids -luuid $(LIBUNICODE)
-
-C_SRCS = \
-	factory.c \
-	objsel.c \
-	regsvr.c
-
-RC_SRCS = objsel.rc
-
-@MAKE_DLL_RULES@
-
-### Dependencies:
  _____  

Copied: vendor/wine/dlls/objsel/current/Makefile.in (from rev 17673,
vendor/wine/dlls/objsel/Makefile.in)
  _____  

Copied: vendor/wine/dlls/objsel/current/factory.c (from rev 17673,
vendor/wine/dlls/objsel/factory.c)
  _____  

Copied: vendor/wine/dlls/objsel/current/objsel.c (from rev 17673,
vendor/wine/dlls/objsel/objsel.c)
  _____  

Copied: vendor/wine/dlls/objsel/current/objsel.rc (from rev 17673,
vendor/wine/dlls/objsel/objsel.rc)
  _____  

Copied: vendor/wine/dlls/objsel/current/objsel.spec (from rev 17673,
vendor/wine/dlls/objsel/objsel.spec)
  _____  

Copied: vendor/wine/dlls/objsel/current/objsel_private.h (from rev
17673, vendor/wine/dlls/objsel/objsel_private.h)
  _____  

Copied: vendor/wine/dlls/objsel/current/regsvr.c (from rev 17673,
vendor/wine/dlls/objsel/regsvr.c)
  _____  

Deleted: vendor/wine/dlls/objsel/factory.c
--- vendor/wine/dlls/objsel/factory.c	2005-09-05 21:39:59 UTC (rev
17674)
+++ vendor/wine/dlls/objsel/factory.c	2005-09-05 21:42:33 UTC (rev
17675)
@@ -1,163 +0,0 @@

-/*
- *	ClassFactory implementation for OBJSEL.dll
- *
- * Copyright (C) 2002 John K. Hohm
- * Copyright (C) 2002 Robert Shearman
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307
USA
- */
-
-#include "objsel_private.h"
-
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(objsel);
-
-
-/**********************************************************************
- * OBJSEL_IClassFactory_QueryInterface (also IUnknown)
- */
-static HRESULT WINAPI OBJSEL_IClassFactory_QueryInterface(
-    LPCLASSFACTORY iface,
-    REFIID riid,
-    LPVOID *ppvObj)
-{
-    TRACE("\n\tIID:\t%s\n",debugstr_guid(riid));
-
-    if (ppvObj == NULL) return E_POINTER;
-
-    if (IsEqualGUID(riid, &IID_IUnknown) ||
-	IsEqualGUID(riid, &IID_IClassFactory))
-    {
-	*ppvObj = (LPVOID)iface;
-	IClassFactory_AddRef(iface);
-	return S_OK;
-    }
-    else if (IsEqualGUID(riid, &IID_IDsObjectPicker))
-    {
-        return IClassFactory_CreateInstance(iface, NULL, riid, ppvObj);
-    }
-
-    FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid));
-    return E_NOINTERFACE;
-}
-
-
-/**********************************************************************
- * OBJSEL_IClassFactory_AddRef (also IUnknown)
- */
-static ULONG WINAPI OBJSEL_IClassFactory_AddRef(LPCLASSFACTORY iface)
-{
-    ClassFactoryImpl *This = (ClassFactoryImpl *)iface;
-    ULONG ref;
-    
-    TRACE("\n");
-
-    if (This == NULL) return E_POINTER;
-    
-    ref = InterlockedIncrement(&This->ref);
-    
-    if (ref == 1)
-    {
-        InterlockedIncrement(&dll_refs);
-    }
-
-    return ref;
-}
-
-
-/**********************************************************************
- * OBJSEL_IClassFactory_Release (also IUnknown)
- */
-static ULONG WINAPI OBJSEL_IClassFactory_Release(LPCLASSFACTORY iface)
-{
-    ClassFactoryImpl *This = (ClassFactoryImpl *)iface;
-    ULONG ref;
-    
-    TRACE("\n");
-
-    if (This == NULL) return E_POINTER;
-    
-    ref = InterlockedDecrement(&This->ref);
-    
-    if (ref == 0)
-    {
-        InterlockedDecrement(&dll_refs);
-    }
-
-    return ref;
-}
-
-
-/**********************************************************************
- * OBJSEL_IClassFactory_CreateInstance
- */
-static HRESULT WINAPI OBJSEL_IClassFactory_CreateInstance(
-    LPCLASSFACTORY iface,
-    LPUNKNOWN pUnkOuter,
-    REFIID riid,
-    LPVOID *ppvObj)
-{
-    TRACE("\n\tIID:\t%s\n",debugstr_guid(riid));
-
-    if (ppvObj == NULL) return E_POINTER;
-
-    /* Don't support aggregation (Windows doesn't) */
-    if (pUnkOuter != NULL) return CLASS_E_NOAGGREGATION;
-
-    if (IsEqualGUID(&IID_IDsObjectPicker, riid))
-    {
-        return OBJSEL_IDsObjectPicker_Create(ppvObj);
-    }
-
-    return CLASS_E_CLASSNOTAVAILABLE;
-}
-
-
-/**********************************************************************
- * OBJSEL_IClassFactory_LockServer
- */
-static HRESULT WINAPI OBJSEL_IClassFactory_LockServer(
-    LPCLASSFACTORY iface,
-    BOOL fLock)
-{
-    TRACE("\n");
-
-    if (fLock)
-        IClassFactory_AddRef(iface);
-    else
-        IClassFactory_Release(iface);
-    return S_OK;
-}
-
-
-/**********************************************************************
- * IClassFactory_Vtbl
- */
-static IClassFactoryVtbl IClassFactory_Vtbl =
-{
-    OBJSEL_IClassFactory_QueryInterface,
-    OBJSEL_IClassFactory_AddRef,
-    OBJSEL_IClassFactory_Release,
-    OBJSEL_IClassFactory_CreateInstance,
-    OBJSEL_IClassFactory_LockServer
-};
-
-
-/**********************************************************************
- * static ClassFactory instance
- */
-
-ClassFactoryImpl OBJSEL_ClassFactory = { &IClassFactory_Vtbl, 0 };
  _____  

Deleted: vendor/wine/dlls/objsel/objsel.c
--- vendor/wine/dlls/objsel/objsel.c	2005-09-05 21:39:59 UTC (rev
17674)
+++ vendor/wine/dlls/objsel/objsel.c	2005-09-05 21:42:33 UTC (rev
17675)
@@ -1,211 +0,0 @@

-/*
- * Object Picker Dialog
- *
- * Copyright 2005 Thomas Weidenmueller <w3seek(a)reactos.com>
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307
USA
- */
-
-#include "objsel_private.h"
-
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(objsel);
-
-LONG dll_refs = 0;
-HINSTANCE hInstance;
-
-/**********************************************************************
*
- *		DllEntryPoint
- */
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID
fImpLoad)
-{
-    switch(fdwReason)
-    {
-        case DLL_PROCESS_ATTACH:
-            hInstance = hinstDLL;
-            DisableThreadLibraryCalls(hInstance);
-            break;
-    }
-    return TRUE;
-}
-
-
-/**********************************************************************
*
- *		DllGetClassObject (OBJSEL.@)
- */
-HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID
*ppv)
-{
-    TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(iid),
ppv);
-
-    *ppv = NULL;
-
-    if (IsEqualGUID(rclsid, &CLSID_DsObjectPicker))
-        return
IClassFactory_QueryInterface((IClassFactory*)&OBJSEL_ClassFactory, iid,
ppv);
-
-
FIXME("\n\tCLSID:\t%s,\n\tIID:\t%s\n",debugstr_guid(rclsid),debugstr_gui
d(iid));
-    return CLASS_E_CLASSNOTAVAILABLE;
-}
-
-
-/**********************************************************************
*
- *		DllCanUnloadNow (OBJSEL.@)
- */
-HRESULT WINAPI DllCanUnloadNow(void)
-{
-    return dll_refs != 0 ? S_FALSE : S_OK;
-}
-
-
-/**********************************************************************
- * OBJSEL_IDsObjectPicker_Destroy (also IUnknown)
- */
-static VOID WINAPI OBJSEL_IDsObjectPicker_Destroy(IDsObjectPickerImpl
*This)
-{
-    HeapFree(GetProcessHeap(),
-             0,
-             This);
-}
-
-
-/**********************************************************************
- * OBJSEL_IDsObjectPicker_AddRef (also IUnknown)
- */
-static ULONG WINAPI OBJSEL_IDsObjectPicker_AddRef(IDsObjectPicker *
iface)
-{
-    IDsObjectPickerImpl *This = (IDsObjectPickerImpl *)iface;
-    ULONG ref;
-
-    TRACE("\n");
-
-    if (This == NULL) return E_POINTER;
-
-    ref = InterlockedIncrement(&This->ref);
-
-    if (ref == 1)
-    {
-        InterlockedIncrement(&dll_refs);
-    }
-
-    return ref;
-}
-
-
-/**********************************************************************
- * OBJSEL_IDsObjectPicker_Release (also IUnknown)
- */
-static ULONG WINAPI OBJSEL_IDsObjectPicker_Release(IDsObjectPicker *
iface)
-{
-    IDsObjectPickerImpl *This = (IDsObjectPickerImpl *)iface;
-    ULONG ref;
-
-    TRACE("\n");
-
-    if (This == NULL) return E_POINTER;
-
-    ref = InterlockedDecrement(&This->ref);
-
-    if (ref == 0)
-    {
-        InterlockedDecrement(&dll_refs);
-        OBJSEL_IDsObjectPicker_Destroy(This);
-    }
-
-    return ref;
-}
-
-
-/**********************************************************************
- * OBJSEL_IDsObjectPicker_QueryInterface (also IUnknown)
- */
-static HRESULT WINAPI OBJSEL_IDsObjectPicker_QueryInterface(
-    IDsObjectPicker * iface,
-    REFIID riid,
-    LPVOID *ppvObj)
-{
-    TRACE("\n\tIID:\t%s\n",debugstr_guid(riid));
-
-    if (ppvObj == NULL) return E_POINTER;
-
-    if (IsEqualGUID(riid, &IID_IUnknown) ||
-	IsEqualGUID(riid, &IID_IDsObjectPicker))
-    {
-	*ppvObj = (LPVOID)iface;
-	OBJSEL_IDsObjectPicker_AddRef(iface);
-	return S_OK;
-    }
-
-    FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid));
-    return E_NOINTERFACE;
-}
-
-
-/**********************************************************************
- * OBJSEL_IDsObjectPicker_Initialize
- */
-static HRESULT WINAPI OBJSEL_IDsObjectPicker_Initialize(
-    IDsObjectPicker * iface,
-    PDSOP_INIT_INFO pInitInfo)
-{
-    FIXME("stub!\n");
-    return S_OK;
-}
-
-
-/**********************************************************************
- * OBJSEL_IDsObjectPicker_InvokeDialog
- */
-static HRESULT WINAPI OBJSEL_IDsObjectPicker_InvokeDialog(
-    IDsObjectPicker * iface,
-    HWND hwndParent,
-    IDataObject** ppdoSelections)
-{
-    FIXME("stub!\n");
-    return S_FALSE;
-}
-
-
-/**********************************************************************
- * IDsObjectPicker_Vtbl
- */
-static IDsObjectPickerVtbl IDsObjectPicker_Vtbl =
-{
-    OBJSEL_IDsObjectPicker_QueryInterface,
-    OBJSEL_IDsObjectPicker_AddRef,
-    OBJSEL_IDsObjectPicker_Release,
-    OBJSEL_IDsObjectPicker_Initialize,
-    OBJSEL_IDsObjectPicker_InvokeDialog
-};
-
-
-/**********************************************************************
- * OBJSEL_IDsObjectPicker_Create
- */
-HRESULT WINAPI OBJSEL_IDsObjectPicker_Create(LPVOID *ppvObj)
-{
-    IDsObjectPickerImpl *Instance = HeapAlloc(GetProcessHeap(),
-                                              HEAP_ZERO_MEMORY,
-
sizeof(IDsObjectPickerImpl));
-    if (Instance != NULL)
-    {
-        Instance->lpVtbl = &IDsObjectPicker_Vtbl;
-        OBJSEL_IDsObjectPicker_AddRef((IDsObjectPicker *)Instance);
-        
-        *ppvObj = Instance;
-        return S_OK;
-    }
-    else
-        return E_OUTOFMEMORY;
-}
  _____  

Deleted: vendor/wine/dlls/objsel/objsel.rc
--- vendor/wine/dlls/objsel/objsel.rc	2005-09-05 21:39:59 UTC (rev
17674)
+++ vendor/wine/dlls/objsel/objsel.rc	2005-09-05 21:42:33 UTC (rev
17675)
@@ -1,28 +0,0 @@

-/*
- * Object Picker Dialog
- *
- * Copyright 2005 Thomas Weidenmueller <w3seek(a)reactos.com>
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307
USA
- */
-
-#include "windef.h"
-#include "winbase.h"
-
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-
-#define WINE_FILENAME_STR "objsel.dll"
-
-#include "wine/wine_common_ver.rc"
  _____  

Deleted: vendor/wine/dlls/objsel/objsel.spec
--- vendor/wine/dlls/objsel/objsel.spec	2005-09-05 21:39:59 UTC (rev
17674)
+++ vendor/wine/dlls/objsel/objsel.spec	2005-09-05 21:42:33 UTC (rev
17675)
@@ -1,4 +0,0 @@

-@ stdcall -private DllCanUnloadNow()
-@ stdcall -private DllGetClassObject(ptr ptr ptr)
-@ stdcall -private DllRegisterServer()
-@ stdcall -private DllUnregisterServer()
  _____  

Deleted: vendor/wine/dlls/objsel/objsel_private.h
--- vendor/wine/dlls/objsel/objsel_private.h	2005-09-05 21:39:59 UTC
(rev 17674)
+++ vendor/wine/dlls/objsel/objsel_private.h	2005-09-05 21:42:33 UTC
(rev 17675)
@@ -1,65 +0,0 @@

-/*
- * Object Picker Dialog Includes
- *
- * Copyright 2005 Thomas Weidenmueller <w3seek(a)reactos.com>
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307
USA
- */
-
-#include <string.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include "winerror.h"
-#include "windef.h"
-#include "winbase.h"
-#include "winreg.h"
-#include "wingdi.h"
-#include "winuser.h"
-
-#define COBJMACROS
-#define COM_NO_WINDOWS_H
-
-#include "ole2.h"
-#include "strmif.h"
-#include "olectl.h"
-#include "unknwn.h"
-#include "objsel.h"
-#include "wine/unicode.h"
-#include "uuids.h"
-
-/**********************************************************************
- * Dll lifetime tracking declaration for objsel.dll
- */
-
-extern LONG dll_refs;
-
-/**********************************************************************
- * ClassFactory declaration for objsel.dll
- */
-typedef struct
-{
-    IClassFactoryVtbl *lpVtbl;
-    LONG ref;
-} ClassFactoryImpl;
-
-typedef struct
-{
-    IDsObjectPickerVtbl *lpVtbl;
-    LONG ref;
-} IDsObjectPickerImpl;
-
-HRESULT WINAPI OBJSEL_IDsObjectPicker_Create(LPVOID *ppvObj);
-
-extern ClassFactoryImpl OBJSEL_ClassFactory;
  _____  

Deleted: vendor/wine/dlls/objsel/regsvr.c
--- vendor/wine/dlls/objsel/regsvr.c	2005-09-05 21:39:59 UTC (rev
17674)
+++ vendor/wine/dlls/objsel/regsvr.c	2005-09-05 21:42:33 UTC (rev
17675)
@@ -1,567 +0,0 @@

-/*
- *	self-registerable dll functions for objsel.dll
- *
- * Copyright (C) 2004 Raphael Junqueira
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307
USA
- */
-
-#include "config.h"
-
-#include <stdarg.h>
-#include <string.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "winreg.h"
-#include "winerror.h"
-
-#include "objbase.h"
-#include "unknwn.h"
-#include "objsel.h"
-
-#include "wine/debug.h"
-
-#include "initguid.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(objsel);
-
-/*
- * Near the bottom of this file are the exported DllRegisterServer and
- * DllUnregisterServer, which make all this worthwhile.
- */
-
-/**********************************************************************
*
- *		interface for self-registering
- */
-struct regsvr_interface {
-    IID const *iid;		/* NULL for end of list */
-    LPCSTR name;		/* can be NULL to omit */
-    IID const *base_iid;	/* can be NULL to omit */
-    int num_methods;		/* can be <0 to omit */
-    CLSID const *ps_clsid;	/* can be NULL to omit */
-    CLSID const *ps_clsid32;	/* can be NULL to omit */
-};
-
-static HRESULT register_interfaces(struct regsvr_interface const
*list);
-static HRESULT unregister_interfaces(struct regsvr_interface const
*list);
-
-/**
- * @todo: maybe adding typelibs support here
- *
[Software\\Classes\\CLSID\\{000C1090-0000-0000-C000-000000000046}\\TypeL
ib] 1080380217
- * @="{000C1092-0000-0000-C000-000000000046}"
- */
-struct regsvr_coclass {
-    CLSID const *clsid;		/* NULL for end of list */
-    LPCSTR name;		/* can be NULL to omit */
-    LPCSTR iph32;		/* can be NULL to omit */
-    LPCSTR ips;			/* can be NULL to omit */
-    LPCSTR ips32;		/* can be NULL to omit */
-    LPCSTR ips32_tmodel;	/* can be NULL to omit, if apartment,
iph32 must be set */
-    LPCSTR progid;		/* can be NULL to omit */
-    LPCSTR viprogid;		/* can be NULL to omit */
-    LPCSTR progid_extra;	/* can be NULL to omit */
-};
-
-static HRESULT register_coclasses(struct regsvr_coclass const *list);
-static HRESULT unregister_coclasses(struct regsvr_coclass const *list);
-
-/**********************************************************************
*
- *		static string constants
- */
-static WCHAR const interface_keyname[10] = {
-    'I', 'n', 't', 'e', 'r', 'f',
'a', 'c', 'e', 0 };
-static WCHAR const base_ifa_keyname[14] = {
-    'B', 'a', 's', 'e', 'I', 'n',
't', 'e', 'r', 'f', 'a', 'c',
-    'e', 0 };
-static WCHAR const num_methods_keyname[11] = {
-    'N', 'u', 'm', 'M', 'e', 't',
'h', 'o', 'd', 's', 0 };
-static WCHAR const ps_clsid_keyname[15] = {
-    'P', 'r', 'o', 'x', 'y', 'S',
't', 'u', 'b', 'C', 'l', 's',
-    'i', 'd', 0 };
-static WCHAR const ps_clsid32_keyname[17] = {
-    'P', 'r', 'o', 'x', 'y', 'S',
't', 'u', 'b', 'C', 'l', 's',
-    'i', 'd', '3', '2', 0 };
-static WCHAR const clsid_keyname[6] = {
-    'C', 'L', 'S', 'I', 'D', 0 };
-static WCHAR const curver_keyname[7] = {
-    'C', 'u', 'r', 'V', 'e', 'r', 0 };
-static WCHAR const iph32_keyname[] = {
-    'I', 'n', 'P', 'r', 'o', 'c',
'H', 'a', 'n', 'd', 'l', 'e',
'r',
-    '3', '2', 0 };
-static WCHAR const ips_keyname[13] = {
-    'I', 'n', 'P', 'r', 'o', 'c',
'S', 'e', 'r', 'v', 'e', 'r',
-    0 };
-static WCHAR const ips32_keyname[15] = {
-    'I', 'n', 'P', 'r', 'o', 'c',
'S', 'e', 'r', 'v', 'e', 'r',
-    '3', '2', 0 };
-static WCHAR const progid_keyname[7] = {
-    'P', 'r', 'o', 'g', 'I', 'D', 0 };
-static WCHAR const viprogid_keyname[25] = {
-    'V', 'e', 'r', 's', 'i', 'o',
'n', 'I', 'n', 'd', 'e', 'p',
-    'e', 'n', 'd', 'e', 'n', 't',
'P', 'r', 'o', 'g', 'I', 'D',
-    0 };
-static char const tmodel_valuename[] = "ThreadingModel";
-
-/**********************************************************************
*
- *		static helper functions
- */
-static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const
*guid);
-static LONG register_key_defvalueW(HKEY base, WCHAR const *name,
-				   WCHAR const *value);
-static LONG register_key_defvalueA(HKEY base, WCHAR const *name,
-				   char const *value);
-static LONG register_progid(WCHAR const *clsid,
-			    char const *progid, char const
*curver_progid,
-			    char const *name, char const *extra);
-static LONG recursive_delete_key(HKEY key);
-static LONG recursive_delete_keyA(HKEY base, char const *name);
-static LONG recursive_delete_keyW(HKEY base, WCHAR const *name);
-
-/**********************************************************************
*
- *		register_interfaces
- */
-static HRESULT register_interfaces(struct regsvr_interface const *list)
{
-    LONG res = ERROR_SUCCESS;
-    HKEY interface_key;
-
-    res = RegCreateKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0,
NULL, 0,
-			  KEY_READ | KEY_WRITE, NULL, &interface_key,
NULL);
-    if (res != ERROR_SUCCESS) goto error_return;
-
-    for (; res == ERROR_SUCCESS && list->iid; ++list) {
-	WCHAR buf[39];
-	HKEY iid_key;
-
-	StringFromGUID2(list->iid, buf, 39);
-	res = RegCreateKeyExW(interface_key, buf, 0, NULL, 0,
-			      KEY_READ | KEY_WRITE, NULL, &iid_key,
NULL);
-	if (res != ERROR_SUCCESS) goto error_close_interface_key;
-
-	if (list->name) {
-	    res = RegSetValueExA(iid_key, NULL, 0, REG_SZ,
-				 (CONST BYTE*)(list->name),
-				 strlen(list->name) + 1);
-	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
-	}
-
-	if (list->base_iid) {
-	    register_key_guid(iid_key, base_ifa_keyname,
list->base_iid);
-	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
-	}
-
-	if (0 <= list->num_methods) {
-	    static WCHAR const fmt[3] = { '%', 'd', 0 };
-	    HKEY key;
-
-	    res = RegCreateKeyExW(iid_key, num_methods_keyname, 0, NULL,
0,
-				  KEY_READ | KEY_WRITE, NULL, &key,
NULL);
-	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
-
-	    wsprintfW(buf, fmt, list->num_methods);
-	    res = RegSetValueExW(key, NULL, 0, REG_SZ,
-				 (CONST BYTE*)buf,
-				 (lstrlenW(buf) + 1) * sizeof(WCHAR));
-	    RegCloseKey(key);
-
-	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
-	}
-
-	if (list->ps_clsid) {
-	    register_key_guid(iid_key, ps_clsid_keyname,
list->ps_clsid);
-	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
-	}
-
-	if (list->ps_clsid32) {
-	    register_key_guid(iid_key, ps_clsid32_keyname,
list->ps_clsid32);
-	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
-	}
-
-    error_close_iid_key:
-	RegCloseKey(iid_key);
-    }
-
-error_close_interface_key:
-    RegCloseKey(interface_key);
-error_return:
-    return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
-}
-
-/**********************************************************************
*
- *		unregister_interfaces
- */
-static HRESULT unregister_interfaces(struct regsvr_interface const
*list) {
-    LONG res = ERROR_SUCCESS;
-    HKEY interface_key;
-
-    res = RegOpenKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0,
-			KEY_READ | KEY_WRITE, &interface_key);
-    if (res == ERROR_FILE_NOT_FOUND) return S_OK;
-    if (res != ERROR_SUCCESS) goto error_return;
-
-    for (; res == ERROR_SUCCESS && list->iid; ++list) {
-	WCHAR buf[39];
-
-	StringFromGUID2(list->iid, buf, 39);
-	res = recursive_delete_keyW(interface_key, buf);
-    }
-
-    RegCloseKey(interface_key);
-error_return:
-    return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
-}
-
-/**********************************************************************
*
- *		register_coclasses
- */
-static HRESULT register_coclasses(struct regsvr_coclass const *list) {
-    LONG res = ERROR_SUCCESS;
-    HKEY coclass_key;
-
-    res = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, NULL, 0,
-			  KEY_READ | KEY_WRITE, NULL, &coclass_key,
NULL);
-    if (res != ERROR_SUCCESS) goto error_return;
-
-    for (; res == ERROR_SUCCESS && list->clsid; ++list) {
-	WCHAR buf[39];
-	HKEY clsid_key;
-
-	StringFromGUID2(list->clsid, buf, 39);
-	res = RegCreateKeyExW(coclass_key, buf, 0, NULL, 0,
-			      KEY_READ | KEY_WRITE, NULL, &clsid_key,
NULL);
-	if (res != ERROR_SUCCESS) goto error_close_coclass_key;
-
-	if (list->name) {
-	    res = RegSetValueExA(clsid_key, NULL, 0, REG_SZ,
-				 (CONST BYTE*)(list->name),
-				 strlen(list->name) + 1);
-	    if (res != ERROR_SUCCESS) goto error_close_clsid_key;
-	}
-
-	if (list->iph32) {
-	    HKEY iph32_key;
-
-	    res = RegCreateKeyExW(clsid_key, iph32_keyname, 0, NULL, 0,
-				  KEY_READ | KEY_WRITE, NULL,
-				  &iph32_key, NULL);
-	    if (res != ERROR_SUCCESS) goto error_close_clsid_key;
-
-	    res = RegSetValueExA(iph32_key, NULL, 0, REG_SZ,
-				 (CONST BYTE*)list->iph32,
-				 lstrlenA(list->iph32) + 1);
-	    RegCloseKey(iph32_key);
-	    if (res != ERROR_SUCCESS) goto error_close_clsid_key;
-	}
-
-	if (list->ips) {
-	    res = register_key_defvalueA(clsid_key, ips_keyname,
list->ips);
-	    if (res != ERROR_SUCCESS) goto error_close_clsid_key;
-	}
-
-	if (list->ips32) {
-	    HKEY ips32_key;
-
-	    res = RegCreateKeyExW(clsid_key, ips32_keyname, 0, NULL, 0,
-				  KEY_READ | KEY_WRITE, NULL,
-				  &ips32_key, NULL);
-	    if (res != ERROR_SUCCESS) goto error_close_clsid_key;
-
-	    res = RegSetValueExA(ips32_key, NULL, 0, REG_SZ,
-				 (CONST BYTE*)list->ips32,
-				 lstrlenA(list->ips32) + 1);
-	    if (res == ERROR_SUCCESS && list->ips32_tmodel)
-		res = RegSetValueExA(ips32_key, tmodel_valuename, 0,
REG_SZ,
-				     (CONST BYTE*)list->ips32_tmodel,
-				     strlen(list->ips32_tmodel) + 1);
-	    RegCloseKey(ips32_key);
-	    if (res != ERROR_SUCCESS) goto error_close_clsid_key;
-	}
-
-	if (list->progid) {
-	    res = register_key_defvalueA(clsid_key, progid_keyname,
-					 list->progid);
-	    if (res != ERROR_SUCCESS) goto error_close_clsid_key;
-
-	    res = register_progid(buf, list->progid, NULL,
-				  list->name, list->progid_extra);
-	    if (res != ERROR_SUCCESS) goto error_close_clsid_key;
-	}
-
-	if (list->viprogid) {
-	    res = register_key_defvalueA(clsid_key, viprogid_keyname,
-					 list->viprogid);
-	    if (res != ERROR_SUCCESS) goto error_close_clsid_key;
-
-	    res = register_progid(buf, list->viprogid, list->progid,
-				  list->name, list->progid_extra);
-	    if (res != ERROR_SUCCESS) goto error_close_clsid_key;
-	}
-
-    error_close_clsid_key:
-	RegCloseKey(clsid_key);
-    }
-
-error_close_coclass_key:
-    RegCloseKey(coclass_key);
-error_return:
-    return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
-}
-
-/**********************************************************************
*
- *		unregister_coclasses
- */
-static HRESULT unregister_coclasses(struct regsvr_coclass const *list)
{
-    LONG res = ERROR_SUCCESS;
-    HKEY coclass_key;
-
-    res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0,
-			KEY_READ | KEY_WRITE, &coclass_key);
-    if (res == ERROR_FILE_NOT_FOUND) return S_OK;
-    if (res != ERROR_SUCCESS) goto error_return;
-
-    for (; res == ERROR_SUCCESS && list->clsid; ++list) {
-	WCHAR buf[39];
-
-	StringFromGUID2(list->clsid, buf, 39);
-	res = recursive_delete_keyW(coclass_key, buf);
-	if (res != ERROR_SUCCESS) goto error_close_coclass_key;
-
-	if (list->progid) {
-	    res = recursive_delete_keyA(HKEY_CLASSES_ROOT,
list->progid);
-	    if (res != ERROR_SUCCESS) goto error_close_coclass_key;
-	}
-
-	if (list->viprogid) {
-	    res = recursive_delete_keyA(HKEY_CLASSES_ROOT,
list->viprogid);
-	    if (res != ERROR_SUCCESS) goto error_close_coclass_key;
-	}
-    }
-
-error_close_coclass_key:
-    RegCloseKey(coclass_key);
-error_return:
-    return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
-}
-
-/**********************************************************************
*
- *		regsvr_key_guid
- */
-static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const
*guid) {
-    WCHAR buf[39];
-
-    StringFromGUID2(guid, buf, 39);
-    return register_key_defvalueW(base, name, buf);
-}
-
-/**********************************************************************
*
- *		regsvr_key_defvalueW
- */
-static LONG register_key_defvalueW(
-    HKEY base,
-    WCHAR const *name,
-    WCHAR const *value) {
-    LONG res;
-    HKEY key;
-
-    res = RegCreateKeyExW(base, name, 0, NULL, 0,
-			  KEY_READ | KEY_WRITE, NULL, &key, NULL);
-    if (res != ERROR_SUCCESS) return res;
-    res = RegSetValueExW(key, NULL, 0, REG_SZ, (CONST BYTE*)value,
-			 (lstrlenW(value) + 1) * sizeof(WCHAR));
-    RegCloseKey(key);
-    return res;
-}
-
-/**********************************************************************
*
- *		regsvr_key_defvalueA
- */
-static LONG register_key_defvalueA(
-    HKEY base,
-    WCHAR const *name,
-    char const *value) {
-    LONG res;
-    HKEY key;
-
-    res = RegCreateKeyExW(base, name, 0, NULL, 0,
-			  KEY_READ | KEY_WRITE, NULL, &key, NULL);
-    if (res != ERROR_SUCCESS) return res;
-    res = RegSetValueExA(key, NULL, 0, REG_SZ, (CONST BYTE*)value,
-			 lstrlenA(value) + 1);
-    RegCloseKey(key);
-    return res;
-}
-
-/**********************************************************************
*
- *		regsvr_progid
- */
-static LONG register_progid(
-    WCHAR const *clsid,
-    char const *progid,
-    char const *curver_progid,
-    char const *name,
-    char const *extra) {
-    LONG res;
-    HKEY progid_key;
-
-    res = RegCreateKeyExA(HKEY_CLASSES_ROOT, progid, 0,
-			  NULL, 0, KEY_READ | KEY_WRITE, NULL,
-			  &progid_key, NULL);
-    if (res != ERROR_SUCCESS) return res;
-
-    if (name) {
-	res = RegSetValueExA(progid_key, NULL, 0, REG_SZ,
-			     (CONST BYTE*)name, strlen(name) + 1);
-	if (res != ERROR_SUCCESS) goto error_close_progid_key;
-    }
-
-    if (clsid) {
-	res = register_key_defvalueW(progid_key, clsid_keyname, clsid);
-	if (res != ERROR_SUCCESS) goto error_close_progid_key;
-    }
-
-    if (curver_progid) {
-	res = register_key_defvalueA(progid_key, curver_keyname,
-				     curver_progid);
-	if (res != ERROR_SUCCESS) goto error_close_progid_key;
-    }
-
-    if (extra) {
-	HKEY extra_key;
-
-	res = RegCreateKeyExA(progid_key, extra, 0,
-			      NULL, 0, KEY_READ | KEY_WRITE, NULL,
-			      &extra_key, NULL);
-	if (res == ERROR_SUCCESS)
-	    RegCloseKey(extra_key);
-    }
-
-error_close_progid_key:
-    RegCloseKey(progid_key);
-    return res;
-}
-
-/**********************************************************************
*
- *		recursive_delete_key
- */
-static LONG recursive_delete_key(HKEY key) {
-    LONG res;
-    WCHAR subkey_name[MAX_PATH];
-    DWORD cName;
-    HKEY subkey;
-
-    for (;;) {
-	cName = sizeof(subkey_name) / sizeof(WCHAR);
-	res = RegEnumKeyExW(key, 0, subkey_name, &cName,
-			    NULL, NULL, NULL, NULL);
-	if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) {
[truncated at 1000 lines; 98 more skipped]