[ros-diffs] [akhaldi] 55267: [OBJSEL] * Sync to Wine 1.3.37.

Author: akhaldi
Date: Fri Jan 27 22:24:01 2012
New Revision: 55267

URL: http://svn.reactos.org/svn/reactos?rev=55267&view=rev
Log:
[OBJSEL]
* Sync to Wine 1.3.37.

Added:
    trunk/reactos/dll/win32/objsel/objsel.rgs   (with props)
    trunk/reactos/dll/win32/objsel/objsel_classes.idl   (with props)
Removed:
    trunk/reactos/dll/win32/objsel/regsvr.c
Modified:
    trunk/reactos/dll/win32/objsel/CMakeLists.txt
    trunk/reactos/dll/win32/objsel/factory.c
    trunk/reactos/dll/win32/objsel/objsel.c
    trunk/reactos/dll/win32/objsel/objsel.rbuild
    trunk/reactos/dll/win32/objsel/objsel.rc
    trunk/reactos/dll/win32/objsel/objsel_private.h
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/objsel/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/CMakeList…
==============================================================================
--- trunk/reactos/dll/win32/objsel/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/objsel/CMakeLists.txt [iso-8859-1] Fri Jan 27 22:24:01 2012
@@ -6,12 +6,12 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+set_rc_compiler()
 spec2def(objsel.dll objsel.spec)
 
 list(APPEND SOURCE
     factory.c
     objsel.c
-    regsvr.c
     objsel.rc
     ${CMAKE_CURRENT_BINARY_DIR}/objsel.def)
 

Modified: trunk/reactos/dll/win32/objsel/factory.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/factory.c…
==============================================================================
--- trunk/reactos/dll/win32/objsel/factory.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/objsel/factory.c [iso-8859-1] Fri Jan 27 22:24:01 2012
@@ -25,6 +25,11 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(objsel);
 
+
+static inline ClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface)
+{
+    return CONTAINING_RECORD(iface, ClassFactoryImpl, IClassFactory_iface);
+}
 
 /**********************************************************************
  * OBJSEL_IClassFactory_QueryInterface (also IUnknown)
@@ -60,7 +65,7 @@
  */
 static ULONG WINAPI OBJSEL_IClassFactory_AddRef(LPCLASSFACTORY iface)
 {
-    ClassFactoryImpl *This = (ClassFactoryImpl *)iface;
+    ClassFactoryImpl *This = impl_from_IClassFactory(iface);
     ULONG ref;
     
     TRACE("\n");
@@ -83,7 +88,7 @@
  */
 static ULONG WINAPI OBJSEL_IClassFactory_Release(LPCLASSFACTORY iface)
 {
-    ClassFactoryImpl *This = (ClassFactoryImpl *)iface;
+    ClassFactoryImpl *This = impl_from_IClassFactory(iface);
     ULONG ref;
     
     TRACE("\n");
@@ -160,4 +165,4 @@
  * static ClassFactory instance
  */
 
-ClassFactoryImpl OBJSEL_ClassFactory = { &IClassFactory_Vtbl, 0 };
+ClassFactoryImpl OBJSEL_ClassFactory = { { &IClassFactory_Vtbl }, 0 };

Modified: trunk/reactos/dll/win32/objsel/objsel.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/objsel.c?…
==============================================================================
--- trunk/reactos/dll/win32/objsel/objsel.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/objsel/objsel.c [iso-8859-1] Fri Jan 27 22:24:01 2012
@@ -19,6 +19,7 @@
  */
 
 #include "objsel_private.h"
+#include "rpcproxy.h"
 
 #include "wine/debug.h"
 
@@ -53,7 +54,7 @@
     *ppv = NULL;
 
     if (IsEqualGUID(rclsid, &CLSID_DsObjectPicker))
-        return IClassFactory_QueryInterface((IClassFactory*)&OBJSEL_ClassFactory,
iid, ppv);
+        return IClassFactory_QueryInterface(&OBJSEL_ClassFactory.IClassFactory_iface,
iid, ppv);
 
     FIXME("CLSID: %s, IID: %s\n", debugstr_guid(rclsid), debugstr_guid(iid));
     return CLASS_E_CLASSNOTAVAILABLE;
@@ -66,6 +67,24 @@
 HRESULT WINAPI DllCanUnloadNow(void)
 {
     return dll_refs != 0 ? S_FALSE : S_OK;
+}
+
+
+/***********************************************************************
+ *		DllRegisterServer (OBJSEL.@)
+ */
+HRESULT WINAPI DllRegisterServer(void)
+{
+    return __wine_register_resources( hInstance );
+}
+
+
+/***********************************************************************
+ *		DllUnregisterServer (OBJSEL.@)
+ */
+HRESULT WINAPI DllUnregisterServer(void)
+{
+    return __wine_unregister_resources( hInstance );
 }
 
 
@@ -80,12 +99,17 @@
 }
 
 
+static inline IDsObjectPickerImpl *impl_from_IDsObjectPicker(IDsObjectPicker *iface)
+{
+    return CONTAINING_RECORD(iface, IDsObjectPickerImpl, IDsObjectPicker_iface);
+}
+
 /**********************************************************************
  * OBJSEL_IDsObjectPicker_AddRef (also IUnknown)
  */
 static ULONG WINAPI OBJSEL_IDsObjectPicker_AddRef(IDsObjectPicker * iface)
 {
-    IDsObjectPickerImpl *This = (IDsObjectPickerImpl *)iface;
+    IDsObjectPickerImpl *This = impl_from_IDsObjectPicker(iface);
     ULONG ref;
 
     TRACE("\n");
@@ -108,7 +132,7 @@
  */
 static ULONG WINAPI OBJSEL_IDsObjectPicker_Release(IDsObjectPicker * iface)
 {
-    IDsObjectPickerImpl *This = (IDsObjectPickerImpl *)iface;
+    IDsObjectPickerImpl *This = impl_from_IDsObjectPicker(iface);
     ULONG ref;
 
     TRACE("\n");
@@ -200,9 +224,9 @@
                                               sizeof(IDsObjectPickerImpl));
     if (Instance != NULL)
     {
-        Instance->lpVtbl = &IDsObjectPicker_Vtbl;
-        OBJSEL_IDsObjectPicker_AddRef((IDsObjectPicker *)Instance);
-        
+        Instance->IDsObjectPicker_iface.lpVtbl = &IDsObjectPicker_Vtbl;
+        OBJSEL_IDsObjectPicker_AddRef(&Instance->IDsObjectPicker_iface);
+
         *ppvObj = Instance;
         return S_OK;
     }

Modified: trunk/reactos/dll/win32/objsel/objsel.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/objsel.rb…
==============================================================================
--- trunk/reactos/dll/win32/objsel/objsel.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/objsel/objsel.rbuild [iso-8859-1] Fri Jan 27 22:24:01 2012
@@ -16,7 +16,6 @@
 	<library>ntdll</library>
 	<file>factory.c</file>
 	<file>objsel.c</file>
-	<file>regsvr.c</file>
 	<file>objsel.rc</file>
 	<pch>objsel_private.h</pch>
 </module>

Modified: trunk/reactos/dll/win32/objsel/objsel.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/objsel.rc…
==============================================================================
--- trunk/reactos/dll/win32/objsel/objsel.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/objsel/objsel.rc [iso-8859-1] Fri Jan 27 22:24:01 2012
@@ -23,6 +23,8 @@
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
+1 WINE_REGISTRY objsel.rgs
+
 #define WINE_FILENAME_STR "objsel.dll"
 
 #include "wine/wine_common_ver.rc"

Added: trunk/reactos/dll/win32/objsel/objsel.rgs
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/objsel.rg…
==============================================================================
--- trunk/reactos/dll/win32/objsel/objsel.rgs (added)
+++ trunk/reactos/dll/win32/objsel/objsel.rgs [iso-8859-1] Fri Jan 27 22:24:01 2012
@@ -1,0 +1,13 @@
+HKCR
+{
+    NoRemove Interface
+    {
+    }
+    NoRemove CLSID
+    {
+        '{17D6CCD8-3B7B-11D2-B9E0-00C04FD8DBF7}' = s 'DsObjectPicker'
+        {
+            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both'
}
+        }
+    }
+}

Propchange: trunk/reactos/dll/win32/objsel/objsel.rgs
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/dll/win32/objsel/objsel_classes.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/objsel_cl…
==============================================================================
--- trunk/reactos/dll/win32/objsel/objsel_classes.idl (added)
+++ trunk/reactos/dll/win32/objsel/objsel_classes.idl [iso-8859-1] Fri Jan 27 22:24:01
2012
@@ -1,0 +1,25 @@
+/*
+ * COM Classes for objsel
+ *
+ * Copyright 2010 Alexandre Julliard
+ *
+ * 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
+ */
+
+[
+    threading(both),
+    uuid(17d6ccd8-3b7b-11d2-b9e0-00c04fd8dbf7)
+]
+coclass DsObjectPicker { interface IDsObjectPicker; }

Propchange: trunk/reactos/dll/win32/objsel/objsel_classes.idl
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/dll/win32/objsel/objsel_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/objsel_pr…
==============================================================================
--- trunk/reactos/dll/win32/objsel/objsel_private.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/objsel/objsel_private.h [iso-8859-1] Fri Jan 27 22:24:01 2012
@@ -42,23 +42,23 @@
  * Dll lifetime tracking declaration for objsel.dll
  */
 
-extern LONG dll_refs;
+extern LONG dll_refs DECLSPEC_HIDDEN;
 
 /**********************************************************************
  * ClassFactory declaration for objsel.dll
  */
 typedef struct
 {
-    IClassFactoryVtbl *lpVtbl;
+    IClassFactory IClassFactory_iface;
     LONG ref;
 } ClassFactoryImpl;
 
 typedef struct
 {
-    IDsObjectPickerVtbl *lpVtbl;
+    IDsObjectPicker IDsObjectPicker_iface;
     LONG ref;
 } IDsObjectPickerImpl;
 
-HRESULT WINAPI OBJSEL_IDsObjectPicker_Create(LPVOID *ppvObj);
+HRESULT WINAPI OBJSEL_IDsObjectPicker_Create(LPVOID *ppvObj) DECLSPEC_HIDDEN;
 
-extern ClassFactoryImpl OBJSEL_ClassFactory;
+extern ClassFactoryImpl OBJSEL_ClassFactory DECLSPEC_HIDDEN;

Removed: trunk/reactos/dll/win32/objsel/regsvr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/regsvr.c?…
==============================================================================
--- trunk/reactos/dll/win32/objsel/regsvr.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/objsel/regsvr.c (removed)
@@ -1,508 +1,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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, 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 "wine/unicode.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}\\TypeLib]
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);
-
-/***********************************************************************
- *		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) {
-	    res = 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;
-
-	    sprintfW(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) {
-	    res = register_key_guid(iid_key, ps_clsid_keyname, list->ps_clsid);
-	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
-	}
-
-	if (list->ps_clsid32) {
-	    res = 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 = RegDeleteTreeW(interface_key, buf);
-	if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
-    }
-
-    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 = RegDeleteTreeW(coclass_key, buf);
-	if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
-	if (res != ERROR_SUCCESS) goto error_close_coclass_key;
-
-	if (list->progid) {
-	    res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid);
-	    if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
-	    if (res != ERROR_SUCCESS) goto error_close_coclass_key;
-	}
-
-	if (list->viprogid) {
-	    res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid);
-	    if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
-	    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;
-}
-
-/***********************************************************************
- *		coclass list
- */
-static struct regsvr_coclass const coclass_list[] = {
-    {     
-        &CLSID_DsObjectPicker,
-	"DsObjectPicker",
-	NULL,
-	NULL,
-	"objsel.dll",
-	"Both",
-	NULL,
-	NULL
-    },    
-    { NULL }			/* list terminator */
-};
-
-/***********************************************************************
- *		interface list
- */
-static struct regsvr_interface const interface_list[] = {
-    { NULL }			/* list terminator */
-};
-
-/***********************************************************************
- *		DllRegisterServer
- */
-HRESULT WINAPI DllRegisterServer(void) {
-    HRESULT hr;
-
-    TRACE("\n");
-
-    hr = register_coclasses(coclass_list);
-    if (SUCCEEDED(hr))
-	hr = register_interfaces(interface_list);
-    return hr;
-}
-
-/***********************************************************************
- *		DllUnregisterServer
- */
-HRESULT WINAPI DllUnregisterServer(void) {
-    HRESULT hr;
-
-    TRACE("\n");
-
-    hr = unregister_coclasses(coclass_list);
-    if (SUCCEEDED(hr))
-	hr = unregister_interfaces(interface_list);
-    return hr;
-}

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri Jan 27 22:24:01 2012
@@ -119,7 +119,7 @@
 reactos/dll/win32/netapi32        # Autosync
 reactos/dll/win32/ntdsapi         # Autosync
 reactos/dll/win32/ntprint         # Autosync
-reactos/dll/win32/objsel          # Autosync
+reactos/dll/win32/objsel          # Synced to Wine-1.3.37
 reactos/dll/win32/odbc32          # Out of sync. Depends on port of Linux ODBC.
 reactos/dll/win32/odbccp32        # Autosync
 reactos/dll/win32/ole32           # Autosync